diff --git a/PROMS/DataLoader/frmLoader.Designer.cs b/PROMS/DataLoader/frmLoader.Designer.cs index 794d5155..139ccc58 100644 --- a/PROMS/DataLoader/frmLoader.Designer.cs +++ b/PROMS/DataLoader/frmLoader.Designer.cs @@ -30,6 +30,8 @@ namespace DataLoader private void InitializeComponent() { this.sc = new System.Windows.Forms.SplitContainer(); + this.lblCurSetFolder = new System.Windows.Forms.Label(); + this.lblProcessing = new System.Windows.Forms.Label(); this.cbFormatsOnly = new System.Windows.Forms.CheckBox(); this.btnBrowseVeProms = new System.Windows.Forms.Button(); this.tbVePromsPath = new System.Windows.Forms.TextBox(); @@ -61,6 +63,7 @@ namespace DataLoader this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.tsslError = new System.Windows.Forms.ToolStripStatusLabel(); + this.btnFixTransitions = new System.Windows.Forms.Button(); this.sc.Panel1.SuspendLayout(); this.sc.Panel2.SuspendLayout(); this.sc.SuspendLayout(); @@ -71,12 +74,15 @@ namespace DataLoader // this.sc.Dock = System.Windows.Forms.DockStyle.Fill; this.sc.Location = new System.Drawing.Point(0, 0); - this.sc.Margin = new System.Windows.Forms.Padding(2); + this.sc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.sc.Name = "sc"; this.sc.Orientation = System.Windows.Forms.Orientation.Horizontal; // // sc.Panel1 // + this.sc.Panel1.Controls.Add(this.btnFixTransitions); + this.sc.Panel1.Controls.Add(this.lblCurSetFolder); + this.sc.Panel1.Controls.Add(this.lblProcessing); this.sc.Panel1.Controls.Add(this.cbFormatsOnly); this.sc.Panel1.Controls.Add(this.btnBrowseVeProms); this.sc.Panel1.Controls.Add(this.tbVePromsPath); @@ -107,28 +113,49 @@ namespace DataLoader // sc.Panel2 // this.sc.Panel2.Controls.Add(this.tv); - this.sc.Size = new System.Drawing.Size(622, 440); - this.sc.SplitterDistance = 220; - this.sc.SplitterWidth = 3; + this.sc.Size = new System.Drawing.Size(829, 547); + this.sc.SplitterDistance = 273; this.sc.TabIndex = 46; // + // lblCurSetFolder + // + this.lblCurSetFolder.AutoSize = true; + this.lblCurSetFolder.ForeColor = System.Drawing.Color.Blue; + this.lblCurSetFolder.Location = new System.Drawing.Point(222, 244); + this.lblCurSetFolder.Name = "lblCurSetFolder"; + this.lblCurSetFolder.Size = new System.Drawing.Size(20, 17); + this.lblCurSetFolder.TabIndex = 75; + this.lblCurSetFolder.Text = "..."; + this.lblCurSetFolder.Visible = false; + // + // lblProcessing + // + this.lblProcessing.AutoSize = true; + this.lblProcessing.Location = new System.Drawing.Point(4, 244); + this.lblProcessing.Name = "lblProcessing"; + this.lblProcessing.Size = new System.Drawing.Size(221, 17); + this.lblProcessing.TabIndex = 74; + this.lblProcessing.Text = "Processing Procedure Set Folder:"; + this.lblProcessing.Visible = false; + // // cbFormatsOnly // this.cbFormatsOnly.AutoSize = true; - this.cbFormatsOnly.Location = new System.Drawing.Point(477, 195); - this.cbFormatsOnly.Margin = new System.Windows.Forms.Padding(2); + this.cbFormatsOnly.Location = new System.Drawing.Point(636, 240); + this.cbFormatsOnly.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbFormatsOnly.Name = "cbFormatsOnly"; - this.cbFormatsOnly.Size = new System.Drawing.Size(87, 17); + this.cbFormatsOnly.Size = new System.Drawing.Size(114, 21); this.cbFormatsOnly.TabIndex = 73; this.cbFormatsOnly.Text = "Formats Only"; this.cbFormatsOnly.UseVisualStyleBackColor = true; + this.cbFormatsOnly.Visible = false; // // btnBrowseVeProms // - this.btnBrowseVeProms.Location = new System.Drawing.Point(478, 29); - this.btnBrowseVeProms.Margin = new System.Windows.Forms.Padding(2); + this.btnBrowseVeProms.Location = new System.Drawing.Point(637, 36); + this.btnBrowseVeProms.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnBrowseVeProms.Name = "btnBrowseVeProms"; - this.btnBrowseVeProms.Size = new System.Drawing.Size(119, 19); + this.btnBrowseVeProms.Size = new System.Drawing.Size(159, 23); this.btnBrowseVeProms.TabIndex = 72; this.btnBrowseVeProms.Text = "Browse for VeProms..."; this.btnBrowseVeProms.UseVisualStyleBackColor = true; @@ -136,79 +163,94 @@ namespace DataLoader // // tbVePromsPath // - this.tbVePromsPath.Location = new System.Drawing.Point(2, 29); - this.tbVePromsPath.Margin = new System.Windows.Forms.Padding(2); + this.tbVePromsPath.Location = new System.Drawing.Point(3, 36); + this.tbVePromsPath.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tbVePromsPath.Name = "tbVePromsPath"; - this.tbVePromsPath.Size = new System.Drawing.Size(464, 20); + this.tbVePromsPath.Size = new System.Drawing.Size(617, 22); this.tbVePromsPath.TabIndex = 71; + this.tbVePromsPath.Text = "C:\\16bit\\VE-PROMS"; + this.tbVePromsPath.TextChanged += new System.EventHandler(this.tbVePromsPath_TextChanged); // // btnCtTok // - this.btnCtTok.Location = new System.Drawing.Point(482, 0); + this.btnCtTok.Location = new System.Drawing.Point(643, 0); + this.btnCtTok.Margin = new System.Windows.Forms.Padding(4); this.btnCtTok.Name = "btnCtTok"; - this.btnCtTok.Size = new System.Drawing.Size(96, 20); + this.btnCtTok.Size = new System.Drawing.Size(128, 25); this.btnCtTok.TabIndex = 70; this.btnCtTok.Text = "Count Tokens"; this.btnCtTok.UseVisualStyleBackColor = true; + this.btnCtTok.Visible = false; this.btnCtTok.Click += new System.EventHandler(this.btnCtTok_Click); // // btnGroup // - this.btnGroup.Location = new System.Drawing.Point(387, -3); + this.btnGroup.Location = new System.Drawing.Point(516, -4); + this.btnGroup.Margin = new System.Windows.Forms.Padding(4); this.btnGroup.Name = "btnGroup"; - this.btnGroup.Size = new System.Drawing.Size(89, 23); + this.btnGroup.Size = new System.Drawing.Size(119, 28); this.btnGroup.TabIndex = 69; this.btnGroup.Text = "Group/Security"; this.btnGroup.UseVisualStyleBackColor = true; + this.btnGroup.Visible = false; this.btnGroup.Click += new System.EventHandler(this.btnGroup_Click); // // btnVETree_CSLA // - this.btnVETree_CSLA.Location = new System.Drawing.Point(248, -1); + this.btnVETree_CSLA.Location = new System.Drawing.Point(331, -1); + this.btnVETree_CSLA.Margin = new System.Windows.Forms.Padding(4); this.btnVETree_CSLA.Name = "btnVETree_CSLA"; - this.btnVETree_CSLA.Size = new System.Drawing.Size(133, 21); + this.btnVETree_CSLA.Size = new System.Drawing.Size(177, 26); this.btnVETree_CSLA.TabIndex = 68; this.btnVETree_CSLA.Text = "Load VETree from CSLA"; this.btnVETree_CSLA.UseVisualStyleBackColor = true; + this.btnVETree_CSLA.Visible = false; this.btnVETree_CSLA.Click += new System.EventHandler(this.btnVETree_CSLA_Click); // // btnBrowseVesam // - this.btnBrowseVesam.Location = new System.Drawing.Point(478, 58); - this.btnBrowseVesam.Margin = new System.Windows.Forms.Padding(2); + this.btnBrowseVesam.Location = new System.Drawing.Point(637, 71); + this.btnBrowseVesam.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnBrowseVesam.Name = "btnBrowseVesam"; - this.btnBrowseVesam.Size = new System.Drawing.Size(119, 19); + this.btnBrowseVesam.Size = new System.Drawing.Size(159, 23); this.btnBrowseVesam.TabIndex = 67; this.btnBrowseVesam.Text = "Browse for Vesam..."; this.btnBrowseVesam.UseVisualStyleBackColor = true; + this.btnBrowseVesam.Visible = false; this.btnBrowseVesam.Click += new System.EventHandler(this.btnBrowseVesam_Click); // // tbVesamPath // - this.tbVesamPath.Location = new System.Drawing.Point(113, 58); + this.tbVesamPath.Location = new System.Drawing.Point(151, 71); + this.tbVesamPath.Margin = new System.Windows.Forms.Padding(4); this.tbVesamPath.Name = "tbVesamPath"; - this.tbVesamPath.Size = new System.Drawing.Size(353, 20); + this.tbVesamPath.Size = new System.Drawing.Size(469, 22); this.tbVesamPath.TabIndex = 66; this.tbVesamPath.Text = "C:\\16bit\\Ve-proms\\vesam.opt"; + this.tbVesamPath.Visible = false; // // btnVesam // - this.btnVesam.Location = new System.Drawing.Point(2, 56); + this.btnVesam.Location = new System.Drawing.Point(3, 69); + this.btnVesam.Margin = new System.Windows.Forms.Padding(4); this.btnVesam.Name = "btnVesam"; - this.btnVesam.Size = new System.Drawing.Size(108, 21); + this.btnVesam.Size = new System.Drawing.Size(144, 26); this.btnVesam.TabIndex = 65; this.btnVesam.Text = "Convert Security"; this.btnVesam.UseVisualStyleBackColor = true; + this.btnVesam.Visible = false; this.btnVesam.Click += new System.EventHandler(this.btnVesam_Click); // // btnLoadTreeCSLA // - this.btnLoadTreeCSLA.Location = new System.Drawing.Point(123, 0); + this.btnLoadTreeCSLA.Location = new System.Drawing.Point(164, 0); + this.btnLoadTreeCSLA.Margin = new System.Windows.Forms.Padding(4); this.btnLoadTreeCSLA.Name = "btnLoadTreeCSLA"; - this.btnLoadTreeCSLA.Size = new System.Drawing.Size(119, 20); + this.btnLoadTreeCSLA.Size = new System.Drawing.Size(159, 25); this.btnLoadTreeCSLA.TabIndex = 64; this.btnLoadTreeCSLA.Text = "Load Tree from CSLA"; this.btnLoadTreeCSLA.UseVisualStyleBackColor = true; + this.btnLoadTreeCSLA.Visible = false; this.btnLoadTreeCSLA.Click += new System.EventHandler(this.btnLoadTreeCSLA_Click); // // cbLazy @@ -216,34 +258,37 @@ namespace DataLoader this.cbLazy.AutoSize = true; this.cbLazy.Checked = true; this.cbLazy.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbLazy.Location = new System.Drawing.Point(477, 174); - this.cbLazy.Margin = new System.Windows.Forms.Padding(2); + this.cbLazy.Location = new System.Drawing.Point(636, 214); + this.cbLazy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbLazy.Name = "cbLazy"; - this.cbLazy.Size = new System.Drawing.Size(75, 17); + this.cbLazy.Size = new System.Drawing.Size(96, 21); this.cbLazy.TabIndex = 63; this.cbLazy.Text = "Lazy Load"; this.cbLazy.UseVisualStyleBackColor = true; + this.cbLazy.Visible = false; // // btnConvertSelected // - this.btnConvertSelected.Location = new System.Drawing.Point(2, 197); - this.btnConvertSelected.Margin = new System.Windows.Forms.Padding(2); + this.btnConvertSelected.Location = new System.Drawing.Point(225, 212); + this.btnConvertSelected.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnConvertSelected.Name = "btnConvertSelected"; - this.btnConvertSelected.Size = new System.Drawing.Size(160, 19); + this.btnConvertSelected.Size = new System.Drawing.Size(201, 23); this.btnConvertSelected.TabIndex = 62; this.btnConvertSelected.Text = "Convert Dbf Selected In Tree"; this.btnConvertSelected.UseVisualStyleBackColor = true; + this.btnConvertSelected.Visible = false; this.btnConvertSelected.Click += new System.EventHandler(this.btnConvertSelected_Click); // // btnLoadTreeDB // this.btnLoadTreeDB.Location = new System.Drawing.Point(0, 0); - this.btnLoadTreeDB.Margin = new System.Windows.Forms.Padding(2); + this.btnLoadTreeDB.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnLoadTreeDB.Name = "btnLoadTreeDB"; - this.btnLoadTreeDB.Size = new System.Drawing.Size(118, 19); + this.btnLoadTreeDB.Size = new System.Drawing.Size(157, 23); this.btnLoadTreeDB.TabIndex = 60; this.btnLoadTreeDB.Text = "Convert Top Folders"; this.btnLoadTreeDB.UseVisualStyleBackColor = true; + this.btnLoadTreeDB.Visible = false; this.btnLoadTreeDB.Click += new System.EventHandler(this.btnLoadTreeDB_Click); // // cbPurgeData @@ -251,45 +296,45 @@ namespace DataLoader this.cbPurgeData.AutoSize = true; this.cbPurgeData.Checked = true; this.cbPurgeData.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbPurgeData.Location = new System.Drawing.Point(477, 153); - this.cbPurgeData.Margin = new System.Windows.Forms.Padding(2); + this.cbPurgeData.Location = new System.Drawing.Point(636, 188); + this.cbPurgeData.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbPurgeData.Name = "cbPurgeData"; - this.cbPurgeData.Size = new System.Drawing.Size(119, 17); + this.cbPurgeData.Size = new System.Drawing.Size(154, 21); this.cbPurgeData.TabIndex = 59; this.cbPurgeData.Text = "Purge Existing Data"; this.cbPurgeData.UseVisualStyleBackColor = true; + this.cbPurgeData.Visible = false; // // lblTime // this.lblTime.BackColor = System.Drawing.SystemColors.ButtonShadow; - this.lblTime.Location = new System.Drawing.Point(69, 167); - this.lblTime.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblTime.Location = new System.Drawing.Point(92, 206); this.lblTime.Name = "lblTime"; - this.lblTime.Size = new System.Drawing.Size(84, 20); + this.lblTime.Size = new System.Drawing.Size(112, 25); this.lblTime.TabIndex = 58; // // pbStep // - this.pbStep.Location = new System.Drawing.Point(159, 150); - this.pbStep.Margin = new System.Windows.Forms.Padding(2); + this.pbStep.Location = new System.Drawing.Point(212, 185); + this.pbStep.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pbStep.Name = "pbStep"; - this.pbStep.Size = new System.Drawing.Size(308, 15); + this.pbStep.Size = new System.Drawing.Size(411, 18); this.pbStep.TabIndex = 57; // // pbSect // - this.pbSect.Location = new System.Drawing.Point(159, 131); - this.pbSect.Margin = new System.Windows.Forms.Padding(2); + this.pbSect.Location = new System.Drawing.Point(212, 161); + this.pbSect.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pbSect.Name = "pbSect"; - this.pbSect.Size = new System.Drawing.Size(307, 15); + this.pbSect.Size = new System.Drawing.Size(409, 18); this.pbSect.TabIndex = 56; // // pbProc // - this.pbProc.Location = new System.Drawing.Point(159, 111); - this.pbProc.Margin = new System.Windows.Forms.Padding(2); + this.pbProc.Location = new System.Drawing.Point(212, 137); + this.pbProc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pbProc.Name = "pbProc"; - this.pbProc.Size = new System.Drawing.Size(308, 15); + this.pbProc.Size = new System.Drawing.Size(411, 18); this.pbProc.TabIndex = 55; // // cbSaveDoc @@ -297,93 +342,94 @@ namespace DataLoader this.cbSaveDoc.AutoSize = true; this.cbSaveDoc.Checked = true; this.cbSaveDoc.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbSaveDoc.Location = new System.Drawing.Point(478, 111); - this.cbSaveDoc.Margin = new System.Windows.Forms.Padding(2); + this.cbSaveDoc.Location = new System.Drawing.Point(637, 137); + this.cbSaveDoc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbSaveDoc.Name = "cbSaveDoc"; - this.cbSaveDoc.Size = new System.Drawing.Size(77, 17); + this.cbSaveDoc.Size = new System.Drawing.Size(96, 21); this.cbSaveDoc.TabIndex = 54; this.cbSaveDoc.Text = "Save DOC"; this.cbSaveDoc.UseVisualStyleBackColor = true; + this.cbSaveDoc.Visible = false; this.cbSaveDoc.Click += new System.EventHandler(this.cbSaveDoc_Click); // // cbSaveRTF // this.cbSaveRTF.AutoSize = true; - this.cbSaveRTF.Location = new System.Drawing.Point(478, 132); - this.cbSaveRTF.Margin = new System.Windows.Forms.Padding(2); + this.cbSaveRTF.Location = new System.Drawing.Point(637, 162); + this.cbSaveRTF.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbSaveRTF.Name = "cbSaveRTF"; - this.cbSaveRTF.Size = new System.Drawing.Size(75, 17); + this.cbSaveRTF.Size = new System.Drawing.Size(93, 21); this.cbSaveRTF.TabIndex = 53; this.cbSaveRTF.Text = "Save RTF"; this.cbSaveRTF.UseVisualStyleBackColor = true; + this.cbSaveRTF.Visible = false; this.cbSaveRTF.Click += new System.EventHandler(this.cbSaveRTF_Click); // // btnBrowse // - this.btnBrowse.Location = new System.Drawing.Point(478, 84); - this.btnBrowse.Margin = new System.Windows.Forms.Padding(2); + this.btnBrowse.Location = new System.Drawing.Point(637, 103); + this.btnBrowse.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnBrowse.Name = "btnBrowse"; - this.btnBrowse.Size = new System.Drawing.Size(56, 19); + this.btnBrowse.Size = new System.Drawing.Size(75, 23); this.btnBrowse.TabIndex = 52; this.btnBrowse.Text = "Browse..."; this.btnBrowse.UseVisualStyleBackColor = true; + this.btnBrowse.Visible = false; this.btnBrowse.Click += new System.EventHandler(this.btnBrowse_Click); // // tbSource // - this.tbSource.Location = new System.Drawing.Point(70, 84); - this.tbSource.Margin = new System.Windows.Forms.Padding(2); + this.tbSource.Location = new System.Drawing.Point(93, 103); + this.tbSource.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tbSource.Name = "tbSource"; - this.tbSource.Size = new System.Drawing.Size(397, 20); + this.tbSource.Size = new System.Drawing.Size(528, 22); this.tbSource.TabIndex = 51; this.tbSource.Text = "i:\\vedata\\vewcnfp\\fp.prc"; + this.tbSource.Visible = false; this.tbSource.TextChanged += new System.EventHandler(this.tbSource_TextChanged); // // lblStep // this.lblStep.BackColor = System.Drawing.SystemColors.ButtonShadow; - this.lblStep.Location = new System.Drawing.Point(69, 147); - this.lblStep.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblStep.Location = new System.Drawing.Point(92, 181); this.lblStep.Name = "lblStep"; - this.lblStep.Size = new System.Drawing.Size(84, 20); + this.lblStep.Size = new System.Drawing.Size(112, 25); this.lblStep.TabIndex = 49; // // lblSection // this.lblSection.BackColor = System.Drawing.SystemColors.ButtonShadow; - this.lblSection.Location = new System.Drawing.Point(69, 128); - this.lblSection.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblSection.Location = new System.Drawing.Point(92, 158); this.lblSection.Name = "lblSection"; - this.lblSection.Size = new System.Drawing.Size(84, 19); + this.lblSection.Size = new System.Drawing.Size(112, 23); this.lblSection.TabIndex = 48; // // lblProc // this.lblProc.BackColor = System.Drawing.SystemColors.ButtonShadow; - this.lblProc.Location = new System.Drawing.Point(69, 109); - this.lblProc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblProc.Location = new System.Drawing.Point(92, 134); this.lblProc.Name = "lblProc"; - this.lblProc.Size = new System.Drawing.Size(84, 19); + this.lblProc.Size = new System.Drawing.Size(112, 23); this.lblProc.TabIndex = 47; // // btnConvert // - this.btnConvert.Location = new System.Drawing.Point(2, 85); - this.btnConvert.Margin = new System.Windows.Forms.Padding(2); + this.btnConvert.Location = new System.Drawing.Point(7, 134); + this.btnConvert.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnConvert.Name = "btnConvert"; - this.btnConvert.Size = new System.Drawing.Size(56, 40); + this.btnConvert.Size = new System.Drawing.Size(75, 49); this.btnConvert.TabIndex = 46; - this.btnConvert.Text = "Convert Dbf"; + this.btnConvert.Text = "Convert Data"; this.btnConvert.Click += new System.EventHandler(this.btnConvert_Click); // // tv // this.tv.CheckBoxes = true; this.tv.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tv.Location = new System.Drawing.Point(0, 7); - this.tv.Margin = new System.Windows.Forms.Padding(2); + this.tv.Location = new System.Drawing.Point(0, 12); + this.tv.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tv.Name = "tv"; - this.tv.Size = new System.Drawing.Size(622, 210); + this.tv.Size = new System.Drawing.Size(829, 258); this.tv.TabIndex = 24; this.tv.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.tv_BeforeExpand); this.tv.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tv_AfterSelect); @@ -393,9 +439,10 @@ namespace DataLoader this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripStatusLabel1, this.tsslError}); - this.statusStrip1.Location = new System.Drawing.Point(0, 400); + this.statusStrip1.Location = new System.Drawing.Point(0, 502); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(622, 40); + this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0); + this.statusStrip1.Size = new System.Drawing.Size(829, 45); this.statusStrip1.TabIndex = 47; this.statusStrip1.Text = "statusStrip1"; // @@ -404,7 +451,7 @@ namespace DataLoader this.toolStripStatusLabel1.AutoSize = false; this.toolStripStatusLabel1.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; - this.toolStripStatusLabel1.Size = new System.Drawing.Size(300, 35); + this.toolStripStatusLabel1.Size = new System.Drawing.Size(500, 40); this.toolStripStatusLabel1.Text = "Status Information"; this.toolStripStatusLabel1.TextAlign = System.Drawing.ContentAlignment.TopLeft; // @@ -412,18 +459,28 @@ namespace DataLoader // this.tsslError.AutoSize = false; this.tsslError.Name = "tsslError"; - this.tsslError.Size = new System.Drawing.Size(300, 35); + this.tsslError.Size = new System.Drawing.Size(300, 40); this.tsslError.Text = "No Errors"; this.tsslError.TextAlign = System.Drawing.ContentAlignment.TopLeft; // + // btnFixTransitions + // + this.btnFixTransitions.Location = new System.Drawing.Point(3, 187); + this.btnFixTransitions.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnFixTransitions.Name = "btnFixTransitions"; + this.btnFixTransitions.Size = new System.Drawing.Size(87, 44); + this.btnFixTransitions.TabIndex = 76; + this.btnFixTransitions.Text = "Fix Transitions"; + this.btnFixTransitions.Click += new System.EventHandler(this.btnFixTransitions_Click); + // // frmLoader // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(622, 440); + this.ClientSize = new System.Drawing.Size(829, 547); this.Controls.Add(this.statusStrip1); this.Controls.Add(this.sc); - this.Margin = new System.Windows.Forms.Padding(2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "frmLoader"; this.Text = "PROMS-2010 Data Loader"; this.Load += new System.EventHandler(this.frmLoader_Load); @@ -473,5 +530,8 @@ namespace DataLoader private System.Windows.Forms.TextBox tbVePromsPath; private System.Windows.Forms.CheckBox cbFormatsOnly; private System.Windows.Forms.ToolStripStatusLabel tsslError; + private System.Windows.Forms.Label lblCurSetFolder; + private System.Windows.Forms.Label lblProcessing; + private System.Windows.Forms.Button btnFixTransitions; } } \ No newline at end of file diff --git a/PROMS/DataLoader/frmLoader.cs b/PROMS/DataLoader/frmLoader.cs index 9db096a9..acd2f1e5 100644 --- a/PROMS/DataLoader/frmLoader.cs +++ b/PROMS/DataLoader/frmLoader.cs @@ -24,6 +24,7 @@ using vlnObjectLibrary; using vlnServerLibrary; using VEPROMS.CSLA.Library; using Config; +using Volian.Controls.Library; [assembly: log4net.Config.XmlConfigurator(Watch = true)] @@ -239,7 +240,7 @@ namespace DataLoader if (wordProcesses.Length > 0) { AddError("{0} copies of MS Word are running", wordProcesses.Length); - if (MessageBox.Show("MS Word is Running and must be stopped", "MS Word is Running", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + if (MessageBox.Show("MS Word is Running and must be stopped before proceeding.\n\nStop MS Word?", "MS Word is Running", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { TerminateProcesses(wordProcesses); MyFrmErrors.Clear(); @@ -274,18 +275,22 @@ namespace DataLoader DocVersion v = null; foreach (DocVersionInfo vi in vl) { - if (vi.Title.ToUpper() == tbSource.Text.ToUpper()) // is this the procedure set we want to convert? - { + //if (vi.Title.ToUpper() == tbSource.Text.ToUpper()) // is this the procedure set we want to convert? + //{ v = DocVersion.Get(vi.VersionID); Status = "Load " + v.Title + " - " + v.Name; + lblCurSetFolder.Text = v.Title; + lblCurSetFolder.Visible = true; + lblProcessing.Visible = true; ts += ldr.MigrateDocVersion(v, true); - } + //} //v = DocVersion.Get(vi.VersionID); //bool convertProcedures = (vi.Title.ToUpper() == tbSource.Text.ToUpper()); //Item itm = ldr.MigrateDocVersion(v, convertProcedures); } - MessageBox.Show(string.Format("{0} seconds", ts.TotalSeconds)); + MessageBox.Show(string.Format("Conversion completion time: {0:D2}:{1:D2}:{2:D2}.{3}\r\n\n({4} Total Seconds)", ts.Hours, ts.Minutes, ts.Seconds, ts.Milliseconds, ts.TotalSeconds)); + //MessageBox.Show(string.Format("{0} seconds", ts.TotalSeconds)); //TextConvert.ListSpecialCharacters(); } } @@ -454,6 +459,7 @@ namespace DataLoader private void frmLoader_FormClosing(object sender, FormClosingEventArgs e) { + TextConvert.MyGlitches.Save(@"C:\Temp\ConversionGlitches.xml"); Properties.Settings.Default.VeSamFilename = tbVesamPath.Text; Properties.Settings.Default.DbfPathname = tbSource.Text; Properties.Settings.Default.LoadWordDoc = cbSaveDoc.CheckState; @@ -468,5 +474,24 @@ namespace DataLoader if (fbd.ShowDialog() == DialogResult.OK) tbVePromsPath.Text = fbd.SelectedPath; } + + private void tbVePromsPath_TextChanged(object sender, EventArgs e) + { + tbVesamPath.Text = tbVePromsPath.Text + @"\vesam.opt"; + } + + private void btnFixTransitions_Click(object sender, EventArgs e) + { + StepRTB rtb = new StepRTB(); + TransitionFixer myFixer = new TransitionFixer(rtb); + myFixer.StatusChanged += new TransitionFixerEvent(myFixer_StatusChanged); + TimeSpan howlong = myFixer.Process(); + MessageBox.Show(string.Format("Fix Transitions completion time: {0:D2}:{1:D2}:{2:D2}.{3}\r\n\n({4} Total Seconds)", howlong.Hours, howlong.Minutes, howlong.Seconds, howlong.Milliseconds, howlong.TotalSeconds)); + } + + void myFixer_StatusChanged(object sender, TransitionFixerEventArgs args) + { + Status = args.MyStatus; + } } -} \ No newline at end of file +}