diff --git a/PROMS/AdjustBuildRevision/Program.cs b/PROMS/AdjustBuildRevision/Program.cs index 39539c0d..f5cd283d 100644 --- a/PROMS/AdjustBuildRevision/Program.cs +++ b/PROMS/AdjustBuildRevision/Program.cs @@ -34,7 +34,7 @@ namespace AdjustBuildRevision if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ")) outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.0.yyMM.dHH") + "\")"); else - outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("1.7.yyMM.dHH") + "\")"); + outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("1.8.yyMM.dHH") + "\")"); // if (outline != line) // { // Console.WriteLine("Before: '{0}'", line); diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs b/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs index 9e911827..0cb038ff 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs @@ -160,10 +160,12 @@ namespace VEPROMS this.btnRefObjs = new DevComponents.DotNetBar.ButtonX(); this.btnGeneral = new DevComponents.DotNetBar.ButtonX(); this.tcFolder = new DevComponents.DotNetBar.TabControl(); - this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel(); - this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components); this.tcpFmtSettings = new DevComponents.DotNetBar.TabControlPanel(); this.tiFmtSettings = new DevComponents.DotNetBar.TabItem(this.components); + this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel(); + this.lblIncTrans = new System.Windows.Forms.Label(); + this.cbIncTranCvtPerm = new System.Windows.Forms.CheckBox(); + this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); this.btnAnnoTypeApply = new DevComponents.DotNetBar.ButtonX(); this.txbxRemoveMsg = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -210,8 +212,8 @@ namespace VEPROMS this.panButtons.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tcFolder)).BeginInit(); this.tcFolder.SuspendLayout(); - this.tcpGeneral.SuspendLayout(); this.tcpFmtSettings.SuspendLayout(); + this.tcpGeneral.SuspendLayout(); this.tabControlPanel1.SuspendLayout(); this.tcpRefObjs.SuspendLayout(); this.tcpEdSettings.SuspendLayout(); @@ -226,10 +228,10 @@ namespace VEPROMS // ppBtnOK // this.ppBtnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.ppBtnOK.Location = new System.Drawing.Point(525, 268); - this.ppBtnOK.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnOK.Location = new System.Drawing.Point(700, 330); + this.ppBtnOK.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnOK.Name = "ppBtnOK"; - this.ppBtnOK.Size = new System.Drawing.Size(56, 25); + this.ppBtnOK.Size = new System.Drawing.Size(75, 31); this.ppBtnOK.TabIndex = 90; this.ppBtnOK.Text = "OK"; this.ppBtnOK.UseVisualStyleBackColor = true; @@ -239,10 +241,10 @@ namespace VEPROMS // this.ppBtnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.ppBtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.ppBtnCancel.Location = new System.Drawing.Point(596, 268); - this.ppBtnCancel.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnCancel.Location = new System.Drawing.Point(795, 330); + this.ppBtnCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnCancel.Name = "ppBtnCancel"; - this.ppBtnCancel.Size = new System.Drawing.Size(56, 25); + this.ppBtnCancel.Size = new System.Drawing.Size(75, 31); this.ppBtnCancel.TabIndex = 91; this.ppBtnCancel.Text = "Cancel"; this.ppBtnCancel.UseVisualStyleBackColor = true; @@ -254,10 +256,9 @@ namespace VEPROMS // this.lblHeading.AutoSize = true; this.lblHeading.BackColor = System.Drawing.Color.Transparent; - this.lblHeading.Location = new System.Drawing.Point(10, 59); - this.lblHeading.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblHeading.Location = new System.Drawing.Point(13, 73); this.lblHeading.Name = "lblHeading"; - this.lblHeading.Size = new System.Drawing.Size(129, 13); + this.lblHeading.Size = new System.Drawing.Size(164, 16); this.lblHeading.TabIndex = 3; this.lblHeading.Text = "Procedure Panel Heading"; this.lblHeading.Visible = false; @@ -266,10 +267,9 @@ namespace VEPROMS // this.label2.AutoSize = true; this.label2.BackColor = System.Drawing.Color.Transparent; - this.label2.Location = new System.Drawing.Point(53, 23); - this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label2.Location = new System.Drawing.Point(71, 28); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(35, 13); + this.label2.Size = new System.Drawing.Size(45, 16); this.label2.TabIndex = 4; this.label2.Text = "Name"; // @@ -277,10 +277,9 @@ namespace VEPROMS // this.label3.AutoSize = true; this.label3.BackColor = System.Drawing.Color.Transparent; - this.label3.Location = new System.Drawing.Point(46, 122); - this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label3.Location = new System.Drawing.Point(61, 150); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(43, 13); + this.label3.Size = new System.Drawing.Size(53, 16); this.label3.TabIndex = 5; this.label3.Text = "User ID"; this.label3.Visible = false; @@ -289,10 +288,9 @@ namespace VEPROMS // this.label4.AutoSize = true; this.label4.BackColor = System.Drawing.Color.Transparent; - this.label4.Location = new System.Drawing.Point(32, 89); - this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label4.Location = new System.Drawing.Point(43, 110); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(58, 13); + this.label4.Size = new System.Drawing.Size(72, 16); this.label4.TabIndex = 6; this.label4.Text = "Date/Time"; this.label4.Visible = false; @@ -300,10 +298,10 @@ namespace VEPROMS // ppTxtBxUserID // this.ppTxtBxUserID.Enabled = false; - this.ppTxtBxUserID.Location = new System.Drawing.Point(92, 119); - this.ppTxtBxUserID.Margin = new System.Windows.Forms.Padding(2); + this.ppTxtBxUserID.Location = new System.Drawing.Point(123, 146); + this.ppTxtBxUserID.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppTxtBxUserID.Name = "ppTxtBxUserID"; - this.ppTxtBxUserID.Size = new System.Drawing.Size(116, 20); + this.ppTxtBxUserID.Size = new System.Drawing.Size(153, 22); this.ppTxtBxUserID.TabIndex = 13; this.ppTxtBxUserID.TabStop = false; this.ppTxtBxUserID.Visible = false; @@ -317,10 +315,10 @@ namespace VEPROMS this.ppDTPicker.CustomFormat = "MM\'/\'dd\'/\'yyyy hh\':\'mm:ss tt"; this.ppDTPicker.Enabled = false; this.ppDTPicker.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.ppDTPicker.Location = new System.Drawing.Point(92, 86); - this.ppDTPicker.Margin = new System.Windows.Forms.Padding(2); + this.ppDTPicker.Location = new System.Drawing.Point(123, 106); + this.ppDTPicker.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppDTPicker.Name = "ppDTPicker"; - this.ppDTPicker.Size = new System.Drawing.Size(130, 20); + this.ppDTPicker.Size = new System.Drawing.Size(172, 22); this.ppDTPicker.TabIndex = 12; this.ppDTPicker.TabStop = false; this.ppDTPicker.Visible = false; @@ -328,11 +326,11 @@ namespace VEPROMS // ppRTxtName // this.ppRTxtName.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.folderConfigBindingSource, "Name", true)); - this.ppRTxtName.Location = new System.Drawing.Point(92, 20); - this.ppRTxtName.Margin = new System.Windows.Forms.Padding(2); + this.ppRTxtName.Location = new System.Drawing.Point(123, 25); + this.ppRTxtName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppRTxtName.Multiline = false; this.ppRTxtName.Name = "ppRTxtName"; - this.ppRTxtName.Size = new System.Drawing.Size(328, 19); + this.ppRTxtName.Size = new System.Drawing.Size(436, 22); this.ppRTxtName.TabIndex = 0; this.ppRTxtName.Text = ""; this.ppRTxtName.Leave += new System.EventHandler(this.ppRTxtName_Leave); @@ -340,55 +338,51 @@ namespace VEPROMS // ppRTxtHeading // this.ppRTxtHeading.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.folderConfigBindingSource, "Title", true)); - this.ppRTxtHeading.Location = new System.Drawing.Point(143, 56); - this.ppRTxtHeading.Margin = new System.Windows.Forms.Padding(2); + this.ppRTxtHeading.Location = new System.Drawing.Point(191, 69); + this.ppRTxtHeading.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppRTxtHeading.Multiline = false; this.ppRTxtHeading.Name = "ppRTxtHeading"; - this.ppRTxtHeading.Size = new System.Drawing.Size(328, 19); + this.ppRTxtHeading.Size = new System.Drawing.Size(436, 22); this.ppRTxtHeading.TabIndex = 1; this.ppRTxtHeading.Text = ""; this.ppRTxtHeading.Visible = false; // // tbSqlTimeout // - this.tbSqlTimeout.Location = new System.Drawing.Point(400, 90); - this.tbSqlTimeout.Margin = new System.Windows.Forms.Padding(2); - this.tbSqlTimeout.Multiline = false; + this.tbSqlTimeout.Location = new System.Drawing.Point(533, 111); + this.tbSqlTimeout.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tbSqlTimeout.Name = "tbSqlTimeout"; - this.tbSqlTimeout.Size = new System.Drawing.Size(71, 19); + this.tbSqlTimeout.Size = new System.Drawing.Size(93, 22); this.tbSqlTimeout.TabIndex = 10; - this.tbSqlTimeout.Text = ""; - // - // lblSqlTimeout - // - this.lblSqlTimeoutDefault.AutoSize = true; - this.lblSqlTimeoutDefault.BackColor = System.Drawing.Color.Transparent; - this.lblSqlTimeoutDefault.Location = new System.Drawing.Point(300, 120); - this.lblSqlTimeoutDefault.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.lblSqlTimeoutDefault.Name = "lblSqlTimeout"; - this.lblSqlTimeoutDefault.Size = new System.Drawing.Size(300, 13); - this.lblSqlTimeoutDefault.TabIndex = 19; - this.lblSqlTimeoutDefault.Text = "If not specified 30 sec will be used"; // // lblSqlTimeout // this.lblSqlTimeout.AutoSize = true; this.lblSqlTimeout.BackColor = System.Drawing.Color.Transparent; - this.lblSqlTimeout.Location = new System.Drawing.Point(300, 90); - this.lblSqlTimeout.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblSqlTimeout.Location = new System.Drawing.Point(400, 111); this.lblSqlTimeout.Name = "lblSqlTimeout"; - this.lblSqlTimeout.Size = new System.Drawing.Size(100, 13); + this.lblSqlTimeout.Size = new System.Drawing.Size(119, 16); this.lblSqlTimeout.TabIndex = 19; this.lblSqlTimeout.Text = "SQL Timeout (sec)"; // + // lblSqlTimeoutDefault + // + this.lblSqlTimeoutDefault.AutoSize = true; + this.lblSqlTimeoutDefault.BackColor = System.Drawing.Color.Transparent; + this.lblSqlTimeoutDefault.Location = new System.Drawing.Point(400, 148); + this.lblSqlTimeoutDefault.Name = "lblSqlTimeoutDefault"; + this.lblSqlTimeoutDefault.Size = new System.Drawing.Size(208, 16); + this.lblSqlTimeoutDefault.TabIndex = 19; + this.lblSqlTimeoutDefault.Text = "If not specified 30 sec will be used"; + // // ppBtnDefaultGrphFileExt // this.ppBtnDefaultGrphFileExt.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.ppBtnDefaultGrphFileExt.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ppBtnDefaultGrphFileExt.Location = new System.Drawing.Point(323, 31); - this.ppBtnDefaultGrphFileExt.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnDefaultGrphFileExt.Location = new System.Drawing.Point(431, 38); + this.ppBtnDefaultGrphFileExt.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnDefaultGrphFileExt.Name = "ppBtnDefaultGrphFileExt"; - this.ppBtnDefaultGrphFileExt.Size = new System.Drawing.Size(40, 19); + this.ppBtnDefaultGrphFileExt.Size = new System.Drawing.Size(53, 23); this.superTooltip1.SetSuperTooltip(this.ppBtnDefaultGrphFileExt, new DevComponents.DotNetBar.SuperTooltipInfo("The Default Button", "", resources.GetString("ppBtnDefaultGrphFileExt.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(265, 155))); this.ppBtnDefaultGrphFileExt.TabIndex = 21; this.ppBtnDefaultGrphFileExt.Text = "Default"; @@ -403,10 +397,10 @@ namespace VEPROMS this.ppCmbxGrphFileExt.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxGrphFileExt.FormattingEnabled = true; this.ppCmbxGrphFileExt.ItemHeight = 14; - this.ppCmbxGrphFileExt.Location = new System.Drawing.Point(128, 30); - this.ppCmbxGrphFileExt.Margin = new System.Windows.Forms.Padding(2); + this.ppCmbxGrphFileExt.Location = new System.Drawing.Point(171, 37); + this.ppCmbxGrphFileExt.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxGrphFileExt.Name = "ppCmbxGrphFileExt"; - this.ppCmbxGrphFileExt.Size = new System.Drawing.Size(192, 20); + this.ppCmbxGrphFileExt.Size = new System.Drawing.Size(255, 20); this.ppCmbxGrphFileExt.TabIndex = 20; this.ppCmbxGrphFileExt.ValueMember = "FormatDescription"; this.ppCmbxGrphFileExt.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -423,8 +417,7 @@ namespace VEPROMS this.ppLblGrphFileExtDefault.BackColor = System.Drawing.Color.Transparent; this.ppLblGrphFileExtDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblGrphFileExtDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.ppLblGrphFileExtDefault.Location = new System.Drawing.Point(129, 54); - this.ppLblGrphFileExtDefault.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblGrphFileExtDefault.Location = new System.Drawing.Point(172, 66); this.ppLblGrphFileExtDefault.Name = "ppLblGrphFileExtDefault"; this.ppLblGrphFileExtDefault.Size = new System.Drawing.Size(45, 13); this.ppLblGrphFileExtDefault.TabIndex = 21; @@ -435,20 +428,19 @@ namespace VEPROMS // this.lblGrphFileExt.AutoSize = true; this.lblGrphFileExt.BackColor = System.Drawing.Color.Transparent; - this.lblGrphFileExt.Location = new System.Drawing.Point(14, 32); - this.lblGrphFileExt.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblGrphFileExt.Location = new System.Drawing.Point(19, 39); this.lblGrphFileExt.Name = "lblGrphFileExt"; - this.lblGrphFileExt.Size = new System.Drawing.Size(112, 13); + this.lblGrphFileExt.Size = new System.Drawing.Size(141, 16); this.lblGrphFileExt.TabIndex = 19; this.lblGrphFileExt.Text = "Graphic File Extension"; // // ppBtnDeftDisAutoDuplx // this.ppBtnDeftDisAutoDuplx.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDeftDisAutoDuplx.Location = new System.Drawing.Point(446, 18); - this.ppBtnDeftDisAutoDuplx.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnDeftDisAutoDuplx.Location = new System.Drawing.Point(595, 22); + this.ppBtnDeftDisAutoDuplx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnDeftDisAutoDuplx.Name = "ppBtnDeftDisAutoDuplx"; - this.ppBtnDeftDisAutoDuplx.Size = new System.Drawing.Size(44, 20); + this.ppBtnDeftDisAutoDuplx.Size = new System.Drawing.Size(59, 25); this.superTooltip1.SetSuperTooltip(this.ppBtnDeftDisAutoDuplx, new DevComponents.DotNetBar.SuperTooltipInfo("The Default Button", "", resources.GetString("ppBtnDeftDisAutoDuplx.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(255, 150))); this.ppBtnDeftDisAutoDuplx.TabIndex = 33; this.ppBtnDeftDisAutoDuplx.Text = "Default"; @@ -459,10 +451,10 @@ namespace VEPROMS // ppBtnDefWatermark // this.ppBtnDefWatermark.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDefWatermark.Location = new System.Drawing.Point(205, 17); - this.ppBtnDefWatermark.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnDefWatermark.Location = new System.Drawing.Point(273, 21); + this.ppBtnDefWatermark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnDefWatermark.Name = "ppBtnDefWatermark"; - this.ppBtnDefWatermark.Size = new System.Drawing.Size(40, 20); + this.ppBtnDefWatermark.Size = new System.Drawing.Size(53, 25); this.superTooltip1.SetSuperTooltip(this.ppBtnDefWatermark, new DevComponents.DotNetBar.SuperTooltipInfo("The Default Button", "", "This will revert the watermark selection back to using the parent\'s (default) set" + "ting.\r\n\r\nCheck \"Show Default Settings\" to display the \"default\" watermark (below" + " the Watermark selection box).", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(255, 145))); @@ -479,10 +471,10 @@ namespace VEPROMS this.ppCmbxWatermark.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxWatermark.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxWatermark.ItemHeight = 14; - this.ppCmbxWatermark.Location = new System.Drawing.Point(79, 16); - this.ppCmbxWatermark.Margin = new System.Windows.Forms.Padding(2); + this.ppCmbxWatermark.Location = new System.Drawing.Point(105, 20); + this.ppCmbxWatermark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxWatermark.Name = "ppCmbxWatermark"; - this.ppCmbxWatermark.Size = new System.Drawing.Size(123, 20); + this.ppCmbxWatermark.Size = new System.Drawing.Size(163, 20); this.ppCmbxWatermark.TabIndex = 30; this.ppCmbxWatermark.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppCmbxWatermark.WatermarkText = "select watermark option"; @@ -494,8 +486,7 @@ namespace VEPROMS this.ppLblAutoDuplexDefault.BackColor = System.Drawing.Color.Transparent; this.ppLblAutoDuplexDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblAutoDuplexDefault.ForeColor = System.Drawing.Color.Gray; - this.ppLblAutoDuplexDefault.Location = new System.Drawing.Point(300, 37); - this.ppLblAutoDuplexDefault.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblAutoDuplexDefault.Location = new System.Drawing.Point(400, 46); this.ppLblAutoDuplexDefault.Name = "ppLblAutoDuplexDefault"; this.ppLblAutoDuplexDefault.Size = new System.Drawing.Size(64, 13); this.superTooltip1.SetSuperTooltip(this.ppLblAutoDuplexDefault, new DevComponents.DotNetBar.SuperTooltipInfo("This is the Automatic Duplex default setting", "", "Pressing the Default Button (to the right)\r\nwill reset the Automatic Duplex setti" + @@ -509,8 +500,7 @@ namespace VEPROMS this.ppLblWatermarkDefault.BackColor = System.Drawing.Color.Transparent; this.ppLblWatermarkDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblWatermarkDefault.ForeColor = System.Drawing.Color.Gray; - this.ppLblWatermarkDefault.Location = new System.Drawing.Point(82, 37); - this.ppLblWatermarkDefault.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblWatermarkDefault.Location = new System.Drawing.Point(109, 46); this.ppLblWatermarkDefault.Name = "ppLblWatermarkDefault"; this.ppLblWatermarkDefault.Size = new System.Drawing.Size(45, 13); this.superTooltip1.SetSuperTooltip(this.ppLblWatermarkDefault, new DevComponents.DotNetBar.SuperTooltipInfo("This is the default Watermark setting", "", "Pressing the Default Button (to the right)\r\nwill reset the watermark setting back" + @@ -521,10 +511,10 @@ namespace VEPROMS // ppNumUpDwnOvrdPrnPenWidth // this.ppNumUpDwnOvrdPrnPenWidth.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.folderConfigBindingSource, "SysPrint_StrokeWidth", true)); - this.ppNumUpDwnOvrdPrnPenWidth.Location = new System.Drawing.Point(180, 11); - this.ppNumUpDwnOvrdPrnPenWidth.Margin = new System.Windows.Forms.Padding(2); + this.ppNumUpDwnOvrdPrnPenWidth.Location = new System.Drawing.Point(240, 14); + this.ppNumUpDwnOvrdPrnPenWidth.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppNumUpDwnOvrdPrnPenWidth.Name = "ppNumUpDwnOvrdPrnPenWidth"; - this.ppNumUpDwnOvrdPrnPenWidth.Size = new System.Drawing.Size(35, 20); + this.ppNumUpDwnOvrdPrnPenWidth.Size = new System.Drawing.Size(47, 22); this.superTooltip1.SetSuperTooltip(this.ppNumUpDwnOvrdPrnPenWidth, new DevComponents.DotNetBar.SuperTooltipInfo("Normal Pen Width", "", "This will allow you to override pen width used for normal text and line drawing.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppNumUpDwnOvrdPrnPenWidth.TabIndex = 34; this.ppNumUpDwnOvrdPrnPenWidth.TabStop = false; @@ -532,30 +522,28 @@ namespace VEPROMS // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(9, 13); - this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label9.Location = new System.Drawing.Point(12, 16); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(165, 13); + this.label9.Size = new System.Drawing.Size(208, 16); this.label9.TabIndex = 0; this.label9.Text = "Override Normal Pen Width (dots)"; // // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(9, 48); - this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label10.Location = new System.Drawing.Point(12, 59); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(153, 13); + this.label10.Size = new System.Drawing.Size(192, 16); this.label10.TabIndex = 2; this.label10.Text = "Override Bold Pen Width (dots)"; // // ppNumUpDwnOverdPrnPenBoldWidth // this.ppNumUpDwnOverdPrnPenBoldWidth.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.folderConfigBindingSource, "SysPrint_StrokeWidthBold", true)); - this.ppNumUpDwnOverdPrnPenBoldWidth.Location = new System.Drawing.Point(180, 46); - this.ppNumUpDwnOverdPrnPenBoldWidth.Margin = new System.Windows.Forms.Padding(2); + this.ppNumUpDwnOverdPrnPenBoldWidth.Location = new System.Drawing.Point(240, 57); + this.ppNumUpDwnOverdPrnPenBoldWidth.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppNumUpDwnOverdPrnPenBoldWidth.Name = "ppNumUpDwnOverdPrnPenBoldWidth"; - this.ppNumUpDwnOverdPrnPenBoldWidth.Size = new System.Drawing.Size(35, 20); + this.ppNumUpDwnOverdPrnPenBoldWidth.Size = new System.Drawing.Size(47, 22); this.superTooltip1.SetSuperTooltip(this.ppNumUpDwnOverdPrnPenBoldWidth, new DevComponents.DotNetBar.SuperTooltipInfo("Bold Pen Width", "", "This will allow you to override the width used for bold text.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppNumUpDwnOverdPrnPenBoldWidth.TabIndex = 35; this.ppNumUpDwnOverdPrnPenBoldWidth.TabStop = false; @@ -563,10 +551,10 @@ namespace VEPROMS // ppNumUpDwnOvrdPrnPenULineWidth // this.ppNumUpDwnOvrdPrnPenULineWidth.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.folderConfigBindingSource, "SysPrint_UWidth", true)); - this.ppNumUpDwnOvrdPrnPenULineWidth.Location = new System.Drawing.Point(424, 11); - this.ppNumUpDwnOvrdPrnPenULineWidth.Margin = new System.Windows.Forms.Padding(2); + this.ppNumUpDwnOvrdPrnPenULineWidth.Location = new System.Drawing.Point(565, 14); + this.ppNumUpDwnOvrdPrnPenULineWidth.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppNumUpDwnOvrdPrnPenULineWidth.Name = "ppNumUpDwnOvrdPrnPenULineWidth"; - this.ppNumUpDwnOvrdPrnPenULineWidth.Size = new System.Drawing.Size(35, 20); + this.ppNumUpDwnOvrdPrnPenULineWidth.Size = new System.Drawing.Size(47, 22); this.superTooltip1.SetSuperTooltip(this.ppNumUpDwnOvrdPrnPenULineWidth, new DevComponents.DotNetBar.SuperTooltipInfo("Underline Thickness", "", "This will allow you to change the thickness of the uderline.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppNumUpDwnOvrdPrnPenULineWidth.TabIndex = 36; this.ppNumUpDwnOvrdPrnPenULineWidth.TabStop = false; @@ -574,25 +562,24 @@ namespace VEPROMS // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(242, 13); - this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label11.Location = new System.Drawing.Point(323, 16); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(176, 13); + this.label11.Size = new System.Drawing.Size(223, 16); this.label11.TabIndex = 4; this.label11.Text = "Override Underline Thickness (dots)"; // // ppNumUpDwnAdjPrnStartPos // this.ppNumUpDwnAdjPrnStartPos.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.folderConfigBindingSource, "SysPrint_VOffset", true)); - this.ppNumUpDwnAdjPrnStartPos.Location = new System.Drawing.Point(424, 46); - this.ppNumUpDwnAdjPrnStartPos.Margin = new System.Windows.Forms.Padding(2); + this.ppNumUpDwnAdjPrnStartPos.Location = new System.Drawing.Point(565, 57); + this.ppNumUpDwnAdjPrnStartPos.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppNumUpDwnAdjPrnStartPos.Maximum = new decimal(new int[] { 500, 0, 0, 0}); this.ppNumUpDwnAdjPrnStartPos.Name = "ppNumUpDwnAdjPrnStartPos"; - this.ppNumUpDwnAdjPrnStartPos.Size = new System.Drawing.Size(35, 20); + this.ppNumUpDwnAdjPrnStartPos.Size = new System.Drawing.Size(47, 22); this.superTooltip1.SetSuperTooltip(this.ppNumUpDwnAdjPrnStartPos, new DevComponents.DotNetBar.SuperTooltipInfo("Starting Print Position", "", "Allows you to move the starting point on the page of where text and boarder begin" + " printing.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppNumUpDwnAdjPrnStartPos.TabIndex = 37; @@ -601,10 +588,9 @@ namespace VEPROMS // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(230, 48); - this.label12.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label12.Location = new System.Drawing.Point(307, 59); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(187, 13); + this.label12.Size = new System.Drawing.Size(235, 16); this.label12.TabIndex = 6; this.label12.Text = "Adjust Starting Position on Page (dots)"; // @@ -613,10 +599,10 @@ namespace VEPROMS this.ppChbxDisAutoDuplex.AutoSize = true; this.ppChbxDisAutoDuplex.BackColor = System.Drawing.Color.Transparent; this.ppChbxDisAutoDuplex.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.folderConfigBindingSource, "Print_DisableDuplex", true)); - this.ppChbxDisAutoDuplex.Location = new System.Drawing.Point(285, 18); - this.ppChbxDisAutoDuplex.Margin = new System.Windows.Forms.Padding(2); + this.ppChbxDisAutoDuplex.Location = new System.Drawing.Point(380, 22); + this.ppChbxDisAutoDuplex.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppChbxDisAutoDuplex.Name = "ppChbxDisAutoDuplex"; - this.ppChbxDisAutoDuplex.Size = new System.Drawing.Size(161, 17); + this.ppChbxDisAutoDuplex.Size = new System.Drawing.Size(199, 20); this.superTooltip1.SetSuperTooltip(this.ppChbxDisAutoDuplex, new DevComponents.DotNetBar.SuperTooltipInfo("Disable Automatic Duplex", "", "Checking this box will turn OFF the automatic duplexing used in some formats for " + "Foldout pages.", null, null, DevComponents.DotNetBar.eTooltipColor.System, true, false, new System.Drawing.Size(0, 0))); this.ppChbxDisAutoDuplex.TabIndex = 32; @@ -628,10 +614,9 @@ namespace VEPROMS // this.label29.AutoSize = true; this.label29.BackColor = System.Drawing.Color.Transparent; - this.label29.Location = new System.Drawing.Point(18, 20); - this.label29.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label29.Location = new System.Drawing.Point(24, 25); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(59, 13); + this.label29.Size = new System.Drawing.Size(74, 16); this.label29.TabIndex = 43; this.label29.Text = "Watermark"; // @@ -642,20 +627,20 @@ namespace VEPROMS // // this.ppChkbxStMsgActive.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ppChkbxStMsgActive.Location = new System.Drawing.Point(424, 194); - this.ppChkbxStMsgActive.Margin = new System.Windows.Forms.Padding(2); + this.ppChkbxStMsgActive.Location = new System.Drawing.Point(565, 239); + this.ppChkbxStMsgActive.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppChkbxStMsgActive.Name = "ppChkbxStMsgActive"; - this.ppChkbxStMsgActive.Size = new System.Drawing.Size(56, 19); + this.ppChkbxStMsgActive.Size = new System.Drawing.Size(75, 23); this.ppChkbxStMsgActive.TabIndex = 47; this.ppChkbxStMsgActive.Text = "Activate"; // // ppRTxtStMsg // this.ppRTxtStMsg.AutoWordSelection = true; - this.ppRTxtStMsg.Location = new System.Drawing.Point(13, 56); - this.ppRTxtStMsg.Margin = new System.Windows.Forms.Padding(2); + this.ppRTxtStMsg.Location = new System.Drawing.Point(17, 69); + this.ppRTxtStMsg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppRTxtStMsg.Name = "ppRTxtStMsg"; - this.ppRTxtStMsg.Size = new System.Drawing.Size(380, 153); + this.ppRTxtStMsg.Size = new System.Drawing.Size(505, 187); this.ppRTxtStMsg.TabIndex = 41; this.ppRTxtStMsg.Text = ""; this.ppRTxtStMsg.WordWrap = false; @@ -663,20 +648,20 @@ namespace VEPROMS // ppBtnStMsgPreview // this.ppBtnStMsgPreview.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnStMsgPreview.Location = new System.Drawing.Point(424, 133); - this.ppBtnStMsgPreview.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnStMsgPreview.Location = new System.Drawing.Point(565, 164); + this.ppBtnStMsgPreview.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnStMsgPreview.Name = "ppBtnStMsgPreview"; - this.ppBtnStMsgPreview.Size = new System.Drawing.Size(56, 19); + this.ppBtnStMsgPreview.Size = new System.Drawing.Size(75, 23); this.ppBtnStMsgPreview.TabIndex = 45; this.ppBtnStMsgPreview.Text = "Preview"; // // ppBtnStMsgSave // this.ppBtnStMsgSave.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnStMsgSave.Location = new System.Drawing.Point(424, 102); - this.ppBtnStMsgSave.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnStMsgSave.Location = new System.Drawing.Point(565, 126); + this.ppBtnStMsgSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnStMsgSave.Name = "ppBtnStMsgSave"; - this.ppBtnStMsgSave.Size = new System.Drawing.Size(56, 19); + this.ppBtnStMsgSave.Size = new System.Drawing.Size(75, 23); this.ppBtnStMsgSave.TabIndex = 44; this.ppBtnStMsgSave.Text = "Save"; // @@ -684,30 +669,30 @@ namespace VEPROMS // this.ppBtnStMsgDelete.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.ppBtnStMsgDelete.Enabled = false; - this.ppBtnStMsgDelete.Location = new System.Drawing.Point(424, 166); - this.ppBtnStMsgDelete.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnStMsgDelete.Location = new System.Drawing.Point(565, 204); + this.ppBtnStMsgDelete.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnStMsgDelete.Name = "ppBtnStMsgDelete"; - this.ppBtnStMsgDelete.Size = new System.Drawing.Size(56, 19); + this.ppBtnStMsgDelete.Size = new System.Drawing.Size(75, 23); this.ppBtnStMsgDelete.TabIndex = 46; this.ppBtnStMsgDelete.Text = "Delete"; // // ppBtnStMsgEdit // this.ppBtnStMsgEdit.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnStMsgEdit.Location = new System.Drawing.Point(424, 79); - this.ppBtnStMsgEdit.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnStMsgEdit.Location = new System.Drawing.Point(565, 97); + this.ppBtnStMsgEdit.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnStMsgEdit.Name = "ppBtnStMsgEdit"; - this.ppBtnStMsgEdit.Size = new System.Drawing.Size(56, 19); + this.ppBtnStMsgEdit.Size = new System.Drawing.Size(75, 23); this.ppBtnStMsgEdit.TabIndex = 43; this.ppBtnStMsgEdit.Text = "Edit"; // // ppBtnStMsgNew // this.ppBtnStMsgNew.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnStMsgNew.Location = new System.Drawing.Point(424, 55); - this.ppBtnStMsgNew.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnStMsgNew.Location = new System.Drawing.Point(565, 68); + this.ppBtnStMsgNew.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnStMsgNew.Name = "ppBtnStMsgNew"; - this.ppBtnStMsgNew.Size = new System.Drawing.Size(56, 19); + this.ppBtnStMsgNew.Size = new System.Drawing.Size(75, 23); this.ppBtnStMsgNew.TabIndex = 42; this.ppBtnStMsgNew.Text = "New"; // @@ -717,10 +702,10 @@ namespace VEPROMS this.ppCmbxStMsgList.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxStMsgList.FormattingEnabled = true; this.ppCmbxStMsgList.ItemHeight = 14; - this.ppCmbxStMsgList.Location = new System.Drawing.Point(13, 27); - this.ppCmbxStMsgList.Margin = new System.Windows.Forms.Padding(2); + this.ppCmbxStMsgList.Location = new System.Drawing.Point(17, 33); + this.ppCmbxStMsgList.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxStMsgList.Name = "ppCmbxStMsgList"; - this.ppCmbxStMsgList.Size = new System.Drawing.Size(468, 20); + this.ppCmbxStMsgList.Size = new System.Drawing.Size(623, 20); this.ppCmbxStMsgList.TabIndex = 40; this.ppCmbxStMsgList.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppCmbxStMsgList.WatermarkText = "select a startup message or press \"new\" to create one"; @@ -729,20 +714,19 @@ namespace VEPROMS // this.label5.AutoSize = true; this.label5.BackColor = System.Drawing.Color.Transparent; - this.label5.Location = new System.Drawing.Point(10, 8); - this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label5.Location = new System.Drawing.Point(13, 10); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(87, 13); + this.label5.Size = new System.Drawing.Size(110, 16); this.label5.TabIndex = 9; this.label5.Text = "Startup Message"; // // ppBtnDefaultChgBar // this.ppBtnDefaultChgBar.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDefaultChgBar.Location = new System.Drawing.Point(331, 62); - this.ppBtnDefaultChgBar.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnDefaultChgBar.Location = new System.Drawing.Point(441, 76); + this.ppBtnDefaultChgBar.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnDefaultChgBar.Name = "ppBtnDefaultChgBar"; - this.ppBtnDefaultChgBar.Size = new System.Drawing.Size(44, 20); + this.ppBtnDefaultChgBar.Size = new System.Drawing.Size(59, 25); this.superTooltip1.SetSuperTooltip(this.ppBtnDefaultChgBar, new DevComponents.DotNetBar.SuperTooltipInfo("The Default Button", "", "This will revert the Change Bar selection back to using the parent\'s (default) se" + "tting.\r\n\r\nCheck \"Show Default Settings\" to display the \"default\" Change Bar (bel" + "ow the Change Bars selection box).", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(250, 145))); @@ -760,10 +744,10 @@ namespace VEPROMS this.ppCmbxChangeBarType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxChangeBarType.FormattingEnabled = true; this.ppCmbxChangeBarType.ItemHeight = 14; - this.ppCmbxChangeBarType.Location = new System.Drawing.Point(81, 62); - this.ppCmbxChangeBarType.Margin = new System.Windows.Forms.Padding(2); + this.ppCmbxChangeBarType.Location = new System.Drawing.Point(108, 76); + this.ppCmbxChangeBarType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxChangeBarType.Name = "ppCmbxChangeBarType"; - this.ppCmbxChangeBarType.Size = new System.Drawing.Size(240, 20); + this.ppCmbxChangeBarType.Size = new System.Drawing.Size(319, 20); this.ppCmbxChangeBarType.TabIndex = 52; this.ppCmbxChangeBarType.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppCmbxChangeBarType.WatermarkText = "select change bar setting"; @@ -772,10 +756,10 @@ namespace VEPROMS // ppBtnDefaultFmt // this.ppBtnDefaultFmt.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDefaultFmt.Location = new System.Drawing.Point(454, 21); - this.ppBtnDefaultFmt.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnDefaultFmt.Location = new System.Drawing.Point(605, 26); + this.ppBtnDefaultFmt.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnDefaultFmt.Name = "ppBtnDefaultFmt"; - this.ppBtnDefaultFmt.Size = new System.Drawing.Size(44, 20); + this.ppBtnDefaultFmt.Size = new System.Drawing.Size(59, 25); this.superTooltip1.SetSuperTooltip(this.ppBtnDefaultFmt, new DevComponents.DotNetBar.SuperTooltipInfo("Default Button", "", "This will revert the format selection back to using the parent\'s format.\r\n\r\nCheck" + " \"Show Default Settings\" to display the \"default\" format name (below the format " + "selection box).", null, null, DevComponents.DotNetBar.eTooltipColor.System, true, true, new System.Drawing.Size(200, 150))); @@ -792,10 +776,10 @@ namespace VEPROMS this.ppCmbxFormat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxFormat.FormattingEnabled = true; this.ppCmbxFormat.ItemHeight = 14; - this.ppCmbxFormat.Location = new System.Drawing.Point(15, 22); - this.ppCmbxFormat.Margin = new System.Windows.Forms.Padding(2); + this.ppCmbxFormat.Location = new System.Drawing.Point(20, 27); + this.ppCmbxFormat.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxFormat.Name = "ppCmbxFormat"; - this.ppCmbxFormat.Size = new System.Drawing.Size(434, 20); + this.ppCmbxFormat.Size = new System.Drawing.Size(577, 20); this.superTooltip1.SetSuperTooltip(this.ppCmbxFormat, new DevComponents.DotNetBar.SuperTooltipInfo("Format Selection", "", resources.GetString("ppCmbxFormat.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppCmbxFormat.TabIndex = 50; this.ppCmbxFormat.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -810,8 +794,7 @@ namespace VEPROMS this.ppLblChangeBarTypeDefault.BackColor = System.Drawing.Color.Transparent; this.ppLblChangeBarTypeDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblChangeBarTypeDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.ppLblChangeBarTypeDefault.Location = new System.Drawing.Point(80, 83); - this.ppLblChangeBarTypeDefault.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblChangeBarTypeDefault.Location = new System.Drawing.Point(107, 102); this.ppLblChangeBarTypeDefault.Name = "ppLblChangeBarTypeDefault"; this.ppLblChangeBarTypeDefault.Size = new System.Drawing.Size(79, 13); this.superTooltip1.SetSuperTooltip(this.ppLblChangeBarTypeDefault, new DevComponents.DotNetBar.SuperTooltipInfo("This is the default Change Bar setting", "", "Pressing the Default Button (to the right)\r\nwill set the Change Bar setting back " + @@ -825,8 +808,7 @@ namespace VEPROMS this.ppLblFormatDefault.BackColor = System.Drawing.Color.Transparent; this.ppLblFormatDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblFormatDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.ppLblFormatDefault.Location = new System.Drawing.Point(13, 43); - this.ppLblFormatDefault.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblFormatDefault.Location = new System.Drawing.Point(17, 53); this.ppLblFormatDefault.Name = "ppLblFormatDefault"; this.ppLblFormatDefault.Size = new System.Drawing.Size(77, 13); this.superTooltip1.SetSuperTooltip(this.ppLblFormatDefault, new DevComponents.DotNetBar.SuperTooltipInfo("This is the default Format setting", "", "Pressing the Default Button (to the right)\r\nwill set the format setting back to t" + @@ -838,10 +820,10 @@ namespace VEPROMS // ppBtnDefCbTxtTyp // this.ppBtnDefCbTxtTyp.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDefCbTxtTyp.Location = new System.Drawing.Point(229, 21); - this.ppBtnDefCbTxtTyp.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnDefCbTxtTyp.Location = new System.Drawing.Point(305, 26); + this.ppBtnDefCbTxtTyp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnDefCbTxtTyp.Name = "ppBtnDefCbTxtTyp"; - this.ppBtnDefCbTxtTyp.Size = new System.Drawing.Size(44, 20); + this.ppBtnDefCbTxtTyp.Size = new System.Drawing.Size(59, 25); this.superTooltip1.SetSuperTooltip(this.ppBtnDefCbTxtTyp, new DevComponents.DotNetBar.SuperTooltipInfo("The Default Button", "", resources.GetString("ppBtnDefCbTxtTyp.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(230, 150))); this.ppBtnDefCbTxtTyp.TabIndex = 55; this.ppBtnDefCbTxtTyp.Text = "Default"; @@ -852,10 +834,10 @@ namespace VEPROMS // ppBtnDefaultCbPos // this.ppBtnDefaultCbPos.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDefaultCbPos.Location = new System.Drawing.Point(203, 72); - this.ppBtnDefaultCbPos.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnDefaultCbPos.Location = new System.Drawing.Point(271, 89); + this.ppBtnDefaultCbPos.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnDefaultCbPos.Name = "ppBtnDefaultCbPos"; - this.ppBtnDefaultCbPos.Size = new System.Drawing.Size(44, 20); + this.ppBtnDefaultCbPos.Size = new System.Drawing.Size(59, 25); this.superTooltip1.SetSuperTooltip(this.ppBtnDefaultCbPos, new DevComponents.DotNetBar.SuperTooltipInfo("The Default Button", "", resources.GetString("ppBtnDefaultCbPos.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(250, 145))); this.ppBtnDefaultCbPos.TabIndex = 62; this.ppBtnDefaultCbPos.TabStop = false; @@ -872,10 +854,10 @@ namespace VEPROMS this.ppCmbxChgBarTxtType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxChgBarTxtType.FormattingEnabled = true; this.ppCmbxChgBarTxtType.ItemHeight = 14; - this.ppCmbxChgBarTxtType.Location = new System.Drawing.Point(64, 21); - this.ppCmbxChgBarTxtType.Margin = new System.Windows.Forms.Padding(2); + this.ppCmbxChgBarTxtType.Location = new System.Drawing.Point(85, 26); + this.ppCmbxChgBarTxtType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxChgBarTxtType.Name = "ppCmbxChgBarTxtType"; - this.ppCmbxChgBarTxtType.Size = new System.Drawing.Size(161, 20); + this.ppCmbxChgBarTxtType.Size = new System.Drawing.Size(213, 20); this.ppCmbxChgBarTxtType.TabIndex = 54; this.ppCmbxChgBarTxtType.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppCmbxChgBarTxtType.WatermarkText = "select change bar text type"; @@ -889,10 +871,10 @@ namespace VEPROMS this.ppCmbxChgBarPos.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxChgBarPos.FormattingEnabled = true; this.ppCmbxChgBarPos.ItemHeight = 14; - this.ppCmbxChgBarPos.Location = new System.Drawing.Point(62, 72); - this.ppCmbxChgBarPos.Margin = new System.Windows.Forms.Padding(2); + this.ppCmbxChgBarPos.Location = new System.Drawing.Point(83, 89); + this.ppCmbxChgBarPos.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxChgBarPos.Name = "ppCmbxChgBarPos"; - this.ppCmbxChgBarPos.Size = new System.Drawing.Size(139, 20); + this.ppCmbxChgBarPos.Size = new System.Drawing.Size(184, 20); this.ppCmbxChgBarPos.TabIndex = 61; this.ppCmbxChgBarPos.TabStop = false; this.ppCmbxChgBarPos.Visible = false; @@ -905,8 +887,7 @@ namespace VEPROMS this.ppLblChgBarTxtTypeDefault.AutoSize = true; this.ppLblChgBarTxtTypeDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblChgBarTxtTypeDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.ppLblChgBarTxtTypeDefault.Location = new System.Drawing.Point(61, 42); - this.ppLblChgBarTxtTypeDefault.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblChgBarTxtTypeDefault.Location = new System.Drawing.Point(81, 52); this.ppLblChgBarTxtTypeDefault.Name = "ppLblChgBarTxtTypeDefault"; this.ppLblChgBarTxtTypeDefault.Size = new System.Drawing.Size(79, 13); this.superTooltip1.SetSuperTooltip(this.ppLblChgBarTxtTypeDefault, new DevComponents.DotNetBar.SuperTooltipInfo("This is the default Custom Change Bar Text Type", "", "Pressing the Default Button (to the right) will set the Cusotom Change Bar Text T" + @@ -919,8 +900,7 @@ namespace VEPROMS this.ppLblChgBarPosDefault.AutoSize = true; this.ppLblChgBarPosDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblChgBarPosDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.ppLblChgBarPosDefault.Location = new System.Drawing.Point(60, 90); - this.ppLblChgBarPosDefault.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblChgBarPosDefault.Location = new System.Drawing.Point(80, 111); this.ppLblChgBarPosDefault.Name = "ppLblChgBarPosDefault"; this.ppLblChgBarPosDefault.Size = new System.Drawing.Size(79, 13); this.superTooltip1.SetSuperTooltip(this.ppLblChgBarPosDefault, new DevComponents.DotNetBar.SuperTooltipInfo("This is the default Custom Change Bar Position", "", "Pressing the Default Button (to the right) will set the Cusotom Change Bar Positi" + @@ -932,10 +912,10 @@ namespace VEPROMS // ppBtnDefCbTxt2 // this.ppBtnDefCbTxt2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDefCbTxt2.Location = new System.Drawing.Point(118, 41); - this.ppBtnDefCbTxt2.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnDefCbTxt2.Location = new System.Drawing.Point(157, 50); + this.ppBtnDefCbTxt2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnDefCbTxt2.Name = "ppBtnDefCbTxt2"; - this.ppBtnDefCbTxt2.Size = new System.Drawing.Size(44, 20); + this.ppBtnDefCbTxt2.Size = new System.Drawing.Size(59, 25); this.superTooltip1.SetSuperTooltip(this.ppBtnDefCbTxt2, new DevComponents.DotNetBar.SuperTooltipInfo("The Default Button", "", resources.GetString("ppBtnDefCbTxt2.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150))); this.ppBtnDefCbTxt2.TabIndex = 59; this.ppBtnDefCbTxt2.Text = "Default"; @@ -946,10 +926,10 @@ namespace VEPROMS // ppBtnDefCbTxt1 // this.ppBtnDefCbTxt1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDefCbTxt1.Location = new System.Drawing.Point(118, 2); - this.ppBtnDefCbTxt1.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnDefCbTxt1.Location = new System.Drawing.Point(157, 2); + this.ppBtnDefCbTxt1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnDefCbTxt1.Name = "ppBtnDefCbTxt1"; - this.ppBtnDefCbTxt1.Size = new System.Drawing.Size(44, 20); + this.ppBtnDefCbTxt1.Size = new System.Drawing.Size(59, 25); this.superTooltip1.SetSuperTooltip(this.ppBtnDefCbTxt1, new DevComponents.DotNetBar.SuperTooltipInfo("The Default Button", "", resources.GetString("ppBtnDefCbTxt1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150))); this.ppBtnDefCbTxt1.TabIndex = 57; this.ppBtnDefCbTxt1.Text = "Default"; @@ -962,8 +942,7 @@ namespace VEPROMS this.ppLblChgBarUserMsgTwoDefault.AutoSize = true; this.ppLblChgBarUserMsgTwoDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblChgBarUserMsgTwoDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.ppLblChgBarUserMsgTwoDefault.Location = new System.Drawing.Point(66, 60); - this.ppLblChgBarUserMsgTwoDefault.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblChgBarUserMsgTwoDefault.Location = new System.Drawing.Point(88, 74); this.ppLblChgBarUserMsgTwoDefault.Name = "ppLblChgBarUserMsgTwoDefault"; this.ppLblChgBarUserMsgTwoDefault.Size = new System.Drawing.Size(39, 13); this.superTooltip1.SetSuperTooltip(this.ppLblChgBarUserMsgTwoDefault, new DevComponents.DotNetBar.SuperTooltipInfo("This is the default Custom Message Line Two", "", "Pressing the Default Button (to the right) will set the Cusotom Change Bar Messag" + @@ -977,8 +956,7 @@ namespace VEPROMS this.ppLblChgBarUserMsgOneDefault.AutoSize = true; this.ppLblChgBarUserMsgOneDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblChgBarUserMsgOneDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.ppLblChgBarUserMsgOneDefault.Location = new System.Drawing.Point(68, 24); - this.ppLblChgBarUserMsgOneDefault.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblChgBarUserMsgOneDefault.Location = new System.Drawing.Point(91, 30); this.ppLblChgBarUserMsgOneDefault.Name = "ppLblChgBarUserMsgOneDefault"; this.ppLblChgBarUserMsgOneDefault.Size = new System.Drawing.Size(39, 13); this.superTooltip1.SetSuperTooltip(this.ppLblChgBarUserMsgOneDefault, new DevComponents.DotNetBar.SuperTooltipInfo("This is the default Custom Message Line One", "", "Pressing the Default Button (to the right) will set the Cusotom Change Bar Messag" + @@ -990,20 +968,18 @@ namespace VEPROMS // label24 // this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(16, 43); - this.label24.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label24.Location = new System.Drawing.Point(21, 53); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(47, 13); + this.label24.Size = new System.Drawing.Size(56, 16); this.label24.TabIndex = 5; this.label24.Text = "Line two"; // // label25 // this.label25.AutoSize = true; - this.label25.Location = new System.Drawing.Point(16, 5); - this.label25.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label25.Location = new System.Drawing.Point(21, 6); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(48, 13); + this.label25.Size = new System.Drawing.Size(59, 16); this.label25.TabIndex = 4; this.label25.Text = "Line one"; // @@ -1011,11 +987,11 @@ namespace VEPROMS // this.ppTxbxChgBarUserMsgTwo.AcceptsTab = true; this.ppTxbxChgBarUserMsgTwo.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.folderConfigBindingSource, "Print_UserCBMess2", true)); - this.ppTxbxChgBarUserMsgTwo.Location = new System.Drawing.Point(68, 41); - this.ppTxbxChgBarUserMsgTwo.Margin = new System.Windows.Forms.Padding(2); + this.ppTxbxChgBarUserMsgTwo.Location = new System.Drawing.Point(91, 50); + this.ppTxbxChgBarUserMsgTwo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppTxbxChgBarUserMsgTwo.Multiline = false; this.ppTxbxChgBarUserMsgTwo.Name = "ppTxbxChgBarUserMsgTwo"; - this.ppTxbxChgBarUserMsgTwo.Size = new System.Drawing.Size(44, 20); + this.ppTxbxChgBarUserMsgTwo.Size = new System.Drawing.Size(57, 24); this.superTooltip1.SetSuperTooltip(this.ppTxbxChgBarUserMsgTwo, new DevComponents.DotNetBar.SuperTooltipInfo("User Defined Message", "", "This message will appear on all change bars", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppTxbxChgBarUserMsgTwo.TabIndex = 58; this.ppTxbxChgBarUserMsgTwo.Text = ""; @@ -1025,11 +1001,11 @@ namespace VEPROMS // this.ppTxbxChangeBarUserMsgOne.AcceptsTab = true; this.ppTxbxChangeBarUserMsgOne.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.folderConfigBindingSource, "Print_UserCBMess1", true)); - this.ppTxbxChangeBarUserMsgOne.Location = new System.Drawing.Point(68, 2); - this.ppTxbxChangeBarUserMsgOne.Margin = new System.Windows.Forms.Padding(2); + this.ppTxbxChangeBarUserMsgOne.Location = new System.Drawing.Point(91, 2); + this.ppTxbxChangeBarUserMsgOne.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppTxbxChangeBarUserMsgOne.Multiline = false; this.ppTxbxChangeBarUserMsgOne.Name = "ppTxbxChangeBarUserMsgOne"; - this.ppTxbxChangeBarUserMsgOne.Size = new System.Drawing.Size(44, 20); + this.ppTxbxChangeBarUserMsgOne.Size = new System.Drawing.Size(57, 24); this.superTooltip1.SetSuperTooltip(this.ppTxbxChangeBarUserMsgOne, new DevComponents.DotNetBar.SuperTooltipInfo("User DefinedMessage", "", "This message will appear on all change bars", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppTxbxChangeBarUserMsgOne.TabIndex = 56; this.ppTxbxChangeBarUserMsgOne.Text = ""; @@ -1038,20 +1014,18 @@ namespace VEPROMS // label26 // this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(5, 21); - this.label26.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label26.Location = new System.Drawing.Point(7, 26); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(55, 13); + this.label26.Size = new System.Drawing.Size(69, 16); this.label26.TabIndex = 8; this.label26.Text = "Text Type"; // // label27 // this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(14, 75); - this.label27.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label27.Location = new System.Drawing.Point(19, 92); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(44, 13); + this.label27.Size = new System.Drawing.Size(56, 16); this.label27.TabIndex = 9; this.label27.Text = "Position"; this.label27.Visible = false; @@ -1060,10 +1034,9 @@ namespace VEPROMS // this.label30.AutoSize = true; this.label30.BackColor = System.Drawing.Color.Transparent; - this.label30.Location = new System.Drawing.Point(16, 64); - this.label30.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label30.Location = new System.Drawing.Point(21, 79); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(63, 13); + this.label30.Size = new System.Drawing.Size(79, 16); this.label30.TabIndex = 35; this.label30.Text = "Change Bar"; // @@ -1071,10 +1044,9 @@ namespace VEPROMS // this.label23.AutoSize = true; this.label23.BackColor = System.Drawing.Color.Transparent; - this.label23.Location = new System.Drawing.Point(13, 4); - this.label23.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label23.Location = new System.Drawing.Point(17, 5); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(39, 13); + this.label23.Size = new System.Drawing.Size(50, 16); this.label23.TabIndex = 30; this.label23.Text = "Format"; // @@ -1083,10 +1055,10 @@ namespace VEPROMS this.ppBtnChgTextColors.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.ppBtnChgTextColors.Image = ((System.Drawing.Image)(resources.GetObject("ppBtnChgTextColors.Image"))); this.ppBtnChgTextColors.ImagePosition = DevComponents.DotNetBar.eImagePosition.Right; - this.ppBtnChgTextColors.Location = new System.Drawing.Point(286, 47); - this.ppBtnChgTextColors.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnChgTextColors.Location = new System.Drawing.Point(381, 58); + this.ppBtnChgTextColors.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnChgTextColors.Name = "ppBtnChgTextColors"; - this.ppBtnChgTextColors.Size = new System.Drawing.Size(122, 25); + this.ppBtnChgTextColors.Size = new System.Drawing.Size(163, 31); this.ppBtnChgTextColors.SplitButton = true; this.ppBtnChgTextColors.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.ppColorPickerViewModebckgnd, @@ -1125,8 +1097,7 @@ namespace VEPROMS // this.label36.AutoSize = true; this.label36.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label36.Location = new System.Drawing.Point(21, 58); - this.label36.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label36.Location = new System.Drawing.Point(28, 71); this.label36.Name = "label36"; this.label36.Size = new System.Drawing.Size(161, 15); this.label36.TabIndex = 39; @@ -1141,20 +1112,19 @@ namespace VEPROMS this.ppPanelEditSample.Controls.Add(this.ppLblEditTrans); this.ppPanelEditSample.Controls.Add(this.ppLblEditRO); this.ppPanelEditSample.Controls.Add(this.ppLblEditTx1); - this.ppPanelEditSample.Location = new System.Drawing.Point(16, 75); - this.ppPanelEditSample.Margin = new System.Windows.Forms.Padding(2); + this.ppPanelEditSample.Location = new System.Drawing.Point(21, 92); + this.ppPanelEditSample.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppPanelEditSample.Name = "ppPanelEditSample"; - this.ppPanelEditSample.Size = new System.Drawing.Size(240, 23); + this.ppPanelEditSample.Size = new System.Drawing.Size(319, 28); this.ppPanelEditSample.TabIndex = 38; // // ppLblEditTx3 // this.ppLblEditTx3.AutoSize = true; this.ppLblEditTx3.BackColor = System.Drawing.Color.Transparent; - this.ppLblEditTx3.Location = new System.Drawing.Point(163, 4); - this.ppLblEditTx3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblEditTx3.Location = new System.Drawing.Point(217, 5); this.ppLblEditTx3.Name = "ppLblEditTx3"; - this.ppLblEditTx3.Size = new System.Drawing.Size(80, 13); + this.ppLblEditTx3.Size = new System.Drawing.Size(98, 16); this.ppLblEditTx3.TabIndex = 32; this.ppLblEditTx3.Text = "AND start over."; // @@ -1162,10 +1132,9 @@ namespace VEPROMS // this.ppLblEditTx2.AutoSize = true; this.ppLblEditTx2.BackColor = System.Drawing.Color.Transparent; - this.ppLblEditTx2.Location = new System.Drawing.Point(68, 4); - this.ppLblEditTx2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblEditTx2.Location = new System.Drawing.Point(91, 5); this.ppLblEditTx2.Name = "ppLblEditTx2"; - this.ppLblEditTx2.Size = new System.Drawing.Size(65, 13); + this.ppLblEditTx2.Size = new System.Drawing.Size(80, 16); this.ppLblEditTx2.TabIndex = 30; this.ppLblEditTx2.Text = "Then Go To"; // @@ -1173,10 +1142,9 @@ namespace VEPROMS // this.ppLblEditTrans.AutoSize = true; this.ppLblEditTrans.BackColor = System.Drawing.Color.Transparent; - this.ppLblEditTrans.Location = new System.Drawing.Point(129, 4); - this.ppLblEditTrans.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblEditTrans.Location = new System.Drawing.Point(172, 5); this.ppLblEditTrans.Name = "ppLblEditTrans"; - this.ppLblEditTrans.Size = new System.Drawing.Size(38, 13); + this.ppLblEditTrans.Size = new System.Drawing.Size(46, 16); this.ppLblEditTrans.TabIndex = 31; this.ppLblEditTrans.Text = "Step 1"; // @@ -1184,10 +1152,9 @@ namespace VEPROMS // this.ppLblEditRO.AutoSize = true; this.ppLblEditRO.BackColor = System.Drawing.Color.Transparent; - this.ppLblEditRO.Location = new System.Drawing.Point(37, 4); - this.ppLblEditRO.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblEditRO.Location = new System.Drawing.Point(49, 5); this.ppLblEditRO.Name = "ppLblEditRO"; - this.ppLblEditRO.Size = new System.Drawing.Size(33, 13); + this.ppLblEditRO.Size = new System.Drawing.Size(41, 16); this.ppLblEditRO.TabIndex = 29; this.ppLblEditRO.Text = "100%"; // @@ -1195,10 +1162,9 @@ namespace VEPROMS // this.ppLblEditTx1.AutoSize = true; this.ppLblEditTx1.BackColor = System.Drawing.Color.Transparent; - this.ppLblEditTx1.Location = new System.Drawing.Point(2, 4); - this.ppLblEditTx1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblEditTx1.Location = new System.Drawing.Point(3, 5); this.ppLblEditTx1.Name = "ppLblEditTx1"; - this.ppLblEditTx1.Size = new System.Drawing.Size(39, 13); + this.ppLblEditTx1.Size = new System.Drawing.Size(46, 16); this.ppLblEditTx1.TabIndex = 28; this.ppLblEditTx1.Text = "If NOT"; // @@ -1206,8 +1172,7 @@ namespace VEPROMS // this.label35.AutoSize = true; this.label35.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label35.Location = new System.Drawing.Point(19, 6); - this.label35.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label35.Location = new System.Drawing.Point(25, 7); this.label35.Name = "label35"; this.label35.Size = new System.Drawing.Size(187, 15); this.label35.TabIndex = 37; @@ -1222,20 +1187,19 @@ namespace VEPROMS this.ppPanelViewSample.Controls.Add(this.ppLblViewTrans); this.ppPanelViewSample.Controls.Add(this.ppLblViewRO); this.ppPanelViewSample.Controls.Add(this.ppLblViewTx1); - this.ppPanelViewSample.Location = new System.Drawing.Point(16, 23); - this.ppPanelViewSample.Margin = new System.Windows.Forms.Padding(2); + this.ppPanelViewSample.Location = new System.Drawing.Point(21, 28); + this.ppPanelViewSample.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppPanelViewSample.Name = "ppPanelViewSample"; - this.ppPanelViewSample.Size = new System.Drawing.Size(240, 24); + this.ppPanelViewSample.Size = new System.Drawing.Size(319, 29); this.ppPanelViewSample.TabIndex = 36; // // ppLblViewTx3 // this.ppLblViewTx3.AutoSize = true; this.ppLblViewTx3.BackColor = System.Drawing.Color.Transparent; - this.ppLblViewTx3.Location = new System.Drawing.Point(163, 4); - this.ppLblViewTx3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblViewTx3.Location = new System.Drawing.Point(217, 5); this.ppLblViewTx3.Name = "ppLblViewTx3"; - this.ppLblViewTx3.Size = new System.Drawing.Size(80, 13); + this.ppLblViewTx3.Size = new System.Drawing.Size(98, 16); this.ppLblViewTx3.TabIndex = 32; this.ppLblViewTx3.Text = "AND start over."; // @@ -1243,10 +1207,9 @@ namespace VEPROMS // this.ppLblViewTx2.AutoSize = true; this.ppLblViewTx2.BackColor = System.Drawing.Color.Transparent; - this.ppLblViewTx2.Location = new System.Drawing.Point(68, 4); - this.ppLblViewTx2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblViewTx2.Location = new System.Drawing.Point(91, 5); this.ppLblViewTx2.Name = "ppLblViewTx2"; - this.ppLblViewTx2.Size = new System.Drawing.Size(65, 13); + this.ppLblViewTx2.Size = new System.Drawing.Size(80, 16); this.ppLblViewTx2.TabIndex = 30; this.ppLblViewTx2.Text = "Then Go To"; // @@ -1254,10 +1217,9 @@ namespace VEPROMS // this.ppLblViewTrans.AutoSize = true; this.ppLblViewTrans.BackColor = System.Drawing.Color.Transparent; - this.ppLblViewTrans.Location = new System.Drawing.Point(129, 4); - this.ppLblViewTrans.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblViewTrans.Location = new System.Drawing.Point(172, 5); this.ppLblViewTrans.Name = "ppLblViewTrans"; - this.ppLblViewTrans.Size = new System.Drawing.Size(38, 13); + this.ppLblViewTrans.Size = new System.Drawing.Size(46, 16); this.ppLblViewTrans.TabIndex = 31; this.ppLblViewTrans.Text = "Step 1"; // @@ -1265,10 +1227,9 @@ namespace VEPROMS // this.ppLblViewRO.AutoSize = true; this.ppLblViewRO.BackColor = System.Drawing.Color.Transparent; - this.ppLblViewRO.Location = new System.Drawing.Point(37, 4); - this.ppLblViewRO.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblViewRO.Location = new System.Drawing.Point(49, 5); this.ppLblViewRO.Name = "ppLblViewRO"; - this.ppLblViewRO.Size = new System.Drawing.Size(33, 13); + this.ppLblViewRO.Size = new System.Drawing.Size(41, 16); this.ppLblViewRO.TabIndex = 29; this.ppLblViewRO.Text = "100%"; // @@ -1276,20 +1237,19 @@ namespace VEPROMS // this.ppLblViewTx1.AutoSize = true; this.ppLblViewTx1.BackColor = System.Drawing.Color.Transparent; - this.ppLblViewTx1.Location = new System.Drawing.Point(2, 4); - this.ppLblViewTx1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblViewTx1.Location = new System.Drawing.Point(3, 5); this.ppLblViewTx1.Name = "ppLblViewTx1"; - this.ppLblViewTx1.Size = new System.Drawing.Size(39, 13); + this.ppLblViewTx1.Size = new System.Drawing.Size(46, 16); this.ppLblViewTx1.TabIndex = 28; this.ppLblViewTx1.Text = "If NOT"; // // ppBtnDefEdCols // this.ppBtnDefEdCols.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDefEdCols.Location = new System.Drawing.Point(276, 20); - this.ppBtnDefEdCols.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnDefEdCols.Location = new System.Drawing.Point(368, 25); + this.ppBtnDefEdCols.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnDefEdCols.Name = "ppBtnDefEdCols"; - this.ppBtnDefEdCols.Size = new System.Drawing.Size(44, 20); + this.ppBtnDefEdCols.Size = new System.Drawing.Size(59, 25); this.superTooltip1.SetSuperTooltip(this.ppBtnDefEdCols, new DevComponents.DotNetBar.SuperTooltipInfo("The Default Button", "", resources.GetString("ppBtnDefEdCols.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 140))); this.ppBtnDefEdCols.TabIndex = 61; this.ppBtnDefEdCols.Text = "Default"; @@ -1305,10 +1265,10 @@ namespace VEPROMS this.ppCmbxStpEditorCols.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxStpEditorCols.FormattingEnabled = true; this.ppCmbxStpEditorCols.ItemHeight = 14; - this.ppCmbxStpEditorCols.Location = new System.Drawing.Point(145, 21); - this.ppCmbxStpEditorCols.Margin = new System.Windows.Forms.Padding(2); + this.ppCmbxStpEditorCols.Location = new System.Drawing.Point(193, 26); + this.ppCmbxStpEditorCols.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxStpEditorCols.Name = "ppCmbxStpEditorCols"; - this.ppCmbxStpEditorCols.Size = new System.Drawing.Size(128, 20); + this.ppCmbxStpEditorCols.Size = new System.Drawing.Size(169, 20); this.superTooltip1.SetSuperTooltip(this.ppCmbxStpEditorCols, new DevComponents.DotNetBar.SuperTooltipInfo("Step Editor Columns", "", "This will be the default number of columns pre-selected when a new step editor se" + "ction is created.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppCmbxStpEditorCols.TabIndex = 60; @@ -1322,8 +1282,7 @@ namespace VEPROMS this.ppLblStpEditorColsDefault.BackColor = System.Drawing.Color.Transparent; this.ppLblStpEditorColsDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblStpEditorColsDefault.ForeColor = System.Drawing.Color.Gray; - this.ppLblStpEditorColsDefault.Location = new System.Drawing.Point(149, 45); - this.ppLblStpEditorColsDefault.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblStpEditorColsDefault.Location = new System.Drawing.Point(199, 55); this.ppLblStpEditorColsDefault.Name = "ppLblStpEditorColsDefault"; this.ppLblStpEditorColsDefault.Size = new System.Drawing.Size(45, 13); this.superTooltip1.SetSuperTooltip(this.ppLblStpEditorColsDefault, new DevComponents.DotNetBar.SuperTooltipInfo("This is the default Step Editor Columns setting", "", "Pressing the Default Button (to the right) will set the Step Editor Columns setti" + @@ -1335,10 +1294,9 @@ namespace VEPROMS // this.label31.AutoSize = true; this.label31.BackColor = System.Drawing.Color.Transparent; - this.label31.Location = new System.Drawing.Point(38, 23); - this.label31.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label31.Location = new System.Drawing.Point(51, 28); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(102, 13); + this.label31.Size = new System.Drawing.Size(129, 16); this.label31.TabIndex = 45; this.label31.Text = "Step Editor Columns"; // @@ -1374,7 +1332,7 @@ namespace VEPROMS this.label15.AutoSize = true; this.label15.Location = new System.Drawing.Point(134, 29); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(47, 13); + this.label15.Size = new System.Drawing.Size(56, 16); this.label15.TabIndex = 5; this.label15.Text = "Line two"; // @@ -1383,7 +1341,7 @@ namespace VEPROMS this.label16.AutoSize = true; this.label16.Location = new System.Drawing.Point(17, 29); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(48, 13); + this.label16.Size = new System.Drawing.Size(59, 16); this.label16.TabIndex = 4; this.label16.Text = "Line one"; // @@ -1412,7 +1370,7 @@ namespace VEPROMS this.label17.AutoSize = true; this.label17.Location = new System.Drawing.Point(9, 85); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(55, 13); + this.label17.Size = new System.Drawing.Size(69, 16); this.label17.TabIndex = 8; this.label17.Text = "Text Type"; // @@ -1421,7 +1379,7 @@ namespace VEPROMS this.procPropChangeBarPositionCombo.FormattingEnabled = true; this.procPropChangeBarPositionCombo.Location = new System.Drawing.Point(86, 39); this.procPropChangeBarPositionCombo.Name = "procPropChangeBarPositionCombo"; - this.procPropChangeBarPositionCombo.Size = new System.Drawing.Size(248, 21); + this.procPropChangeBarPositionCombo.Size = new System.Drawing.Size(248, 24); this.procPropChangeBarPositionCombo.TabIndex = 10; // // label18 @@ -1429,7 +1387,7 @@ namespace VEPROMS this.label18.AutoSize = true; this.label18.Location = new System.Drawing.Point(22, 42); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(44, 13); + this.label18.Size = new System.Drawing.Size(56, 16); this.label18.TabIndex = 9; this.label18.Text = "Position"; // @@ -1438,7 +1396,7 @@ namespace VEPROMS this.procPropChangeBarTextTypeCombo.FormattingEnabled = true; this.procPropChangeBarTextTypeCombo.Location = new System.Drawing.Point(86, 82); this.procPropChangeBarTextTypeCombo.Name = "procPropChangeBarTextTypeCombo"; - this.procPropChangeBarTextTypeCombo.Size = new System.Drawing.Size(248, 21); + this.procPropChangeBarTextTypeCombo.Size = new System.Drawing.Size(248, 24); this.procPropChangeBarTextTypeCombo.TabIndex = 7; // // procPropPaginationCombo @@ -1446,7 +1404,7 @@ namespace VEPROMS this.procPropPaginationCombo.FormattingEnabled = true; this.procPropPaginationCombo.Location = new System.Drawing.Point(104, 73); this.procPropPaginationCombo.Name = "procPropPaginationCombo"; - this.procPropPaginationCombo.Size = new System.Drawing.Size(165, 21); + this.procPropPaginationCombo.Size = new System.Drawing.Size(165, 24); this.procPropPaginationCombo.TabIndex = 33; // // label19 @@ -1463,7 +1421,7 @@ namespace VEPROMS this.procPropWatermarkCombo.FormattingEnabled = true; this.procPropWatermarkCombo.Location = new System.Drawing.Point(411, 73); this.procPropWatermarkCombo.Name = "procPropWatermarkCombo"; - this.procPropWatermarkCombo.Size = new System.Drawing.Size(178, 21); + this.procPropWatermarkCombo.Size = new System.Drawing.Size(178, 24); this.procPropWatermarkCombo.TabIndex = 31; // // label20 @@ -1480,7 +1438,7 @@ namespace VEPROMS this.procPropDefaultFormatCombo.FormattingEnabled = true; this.procPropDefaultFormatCombo.Location = new System.Drawing.Point(10, 26); this.procPropDefaultFormatCombo.Name = "procPropDefaultFormatCombo"; - this.procPropDefaultFormatCombo.Size = new System.Drawing.Size(526, 21); + this.procPropDefaultFormatCombo.Size = new System.Drawing.Size(526, 24); this.procPropDefaultFormatCombo.TabIndex = 29; // // label21 @@ -1502,7 +1460,7 @@ namespace VEPROMS "Override Format Defined Change Bars"}); this.procPropChangeBarTypeCombo.Location = new System.Drawing.Point(103, 118); this.procPropChangeBarTypeCombo.Name = "procPropChangeBarTypeCombo"; - this.procPropChangeBarTypeCombo.Size = new System.Drawing.Size(293, 21); + this.procPropChangeBarTypeCombo.Size = new System.Drawing.Size(293, 24); this.procPropChangeBarTypeCombo.TabIndex = 27; // // label22 @@ -1520,8 +1478,7 @@ namespace VEPROMS this.ppLblDefSettingsInfo.AutoSize = true; this.ppLblDefSettingsInfo.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblDefSettingsInfo.ForeColor = System.Drawing.Color.MidnightBlue; - this.ppLblDefSettingsInfo.Location = new System.Drawing.Point(1, 348); - this.ppLblDefSettingsInfo.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblDefSettingsInfo.Location = new System.Drawing.Point(1, 428); this.ppLblDefSettingsInfo.Name = "ppLblDefSettingsInfo"; this.ppLblDefSettingsInfo.Size = new System.Drawing.Size(179, 13); this.ppLblDefSettingsInfo.TabIndex = 24; @@ -1540,10 +1497,10 @@ namespace VEPROMS // // this.ppCbShwDefSettings.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ppCbShwDefSettings.Location = new System.Drawing.Point(3, 363); - this.ppCbShwDefSettings.Margin = new System.Windows.Forms.Padding(2); + this.ppCbShwDefSettings.Location = new System.Drawing.Point(4, 447); + this.ppCbShwDefSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCbShwDefSettings.Name = "ppCbShwDefSettings"; - this.ppCbShwDefSettings.Size = new System.Drawing.Size(177, 19); + this.ppCbShwDefSettings.Size = new System.Drawing.Size(236, 23); this.ppCbShwDefSettings.Style = DevComponents.DotNetBar.eDotNetBarStyle.VS2005; this.superTooltip1.SetSuperTooltip(this.ppCbShwDefSettings, new DevComponents.DotNetBar.SuperTooltipInfo("Show Default Settings", "", "When checked, the default (parent\'s) setting will appear below the overridden sel" + "ection.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); @@ -1565,10 +1522,10 @@ namespace VEPROMS this.groupPanel2.Controls.Add(this.ppNumUpDwnOverdPrnPenBoldWidth); this.groupPanel2.Controls.Add(this.ppNumUpDwnOvrdPrnPenULineWidth); this.groupPanel2.DisabledBackColor = System.Drawing.Color.Empty; - this.groupPanel2.Location = new System.Drawing.Point(16, 68); - this.groupPanel2.Margin = new System.Windows.Forms.Padding(2); + this.groupPanel2.Location = new System.Drawing.Point(21, 84); + this.groupPanel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.groupPanel2.Name = "groupPanel2"; - this.groupPanel2.Size = new System.Drawing.Size(477, 93); + this.groupPanel2.Size = new System.Drawing.Size(636, 114); // // // @@ -1617,10 +1574,10 @@ namespace VEPROMS this.ppGpbxUserSpecCB.Controls.Add(this.label27); this.ppGpbxUserSpecCB.Controls.Add(this.ppLblChgBarPosDefault); this.ppGpbxUserSpecCB.DisabledBackColor = System.Drawing.Color.Empty; - this.ppGpbxUserSpecCB.Location = new System.Drawing.Point(5, 101); - this.ppGpbxUserSpecCB.Margin = new System.Windows.Forms.Padding(2); + this.ppGpbxUserSpecCB.Location = new System.Drawing.Point(7, 124); + this.ppGpbxUserSpecCB.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppGpbxUserSpecCB.Name = "ppGpbxUserSpecCB"; - this.ppGpbxUserSpecCB.Size = new System.Drawing.Size(476, 125); + this.ppGpbxUserSpecCB.Size = new System.Drawing.Size(635, 154); // // // @@ -1666,10 +1623,10 @@ namespace VEPROMS this.ppGpbxUserSpecTxt.Controls.Add(this.ppLblChgBarUserMsgOneDefault); this.ppGpbxUserSpecTxt.Controls.Add(this.label24); this.ppGpbxUserSpecTxt.DisabledBackColor = System.Drawing.Color.Empty; - this.ppGpbxUserSpecTxt.Location = new System.Drawing.Point(277, 5); - this.ppGpbxUserSpecTxt.Margin = new System.Windows.Forms.Padding(2); + this.ppGpbxUserSpecTxt.Location = new System.Drawing.Point(369, 6); + this.ppGpbxUserSpecTxt.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppGpbxUserSpecTxt.Name = "ppGpbxUserSpecTxt"; - this.ppGpbxUserSpecTxt.Size = new System.Drawing.Size(186, 93); + this.ppGpbxUserSpecTxt.Size = new System.Drawing.Size(248, 114); // // // @@ -1712,10 +1669,10 @@ namespace VEPROMS this.groupPanel6.Controls.Add(this.ppPanelViewSample); this.groupPanel6.Controls.Add(this.ppPanelEditSample); this.groupPanel6.DisabledBackColor = System.Drawing.Color.Empty; - this.groupPanel6.Location = new System.Drawing.Point(21, 91); - this.groupPanel6.Margin = new System.Windows.Forms.Padding(2); + this.groupPanel6.Location = new System.Drawing.Point(28, 112); + this.groupPanel6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.groupPanel6.Name = "groupPanel6"; - this.groupPanel6.Size = new System.Drawing.Size(455, 122); + this.groupPanel6.Size = new System.Drawing.Size(607, 150); // // // @@ -1757,9 +1714,10 @@ namespace VEPROMS // this.rbWorkflowStage.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.rbWorkflowStage.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.rbWorkflowStage.Location = new System.Drawing.Point(3, 5); + this.rbWorkflowStage.Location = new System.Drawing.Point(4, 6); + this.rbWorkflowStage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.rbWorkflowStage.Name = "rbWorkflowStage"; - this.rbWorkflowStage.Size = new System.Drawing.Size(200, 23); + this.rbWorkflowStage.Size = new System.Drawing.Size(267, 28); this.rbWorkflowStage.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.rbWorkflowStage, new DevComponents.DotNetBar.SuperTooltipInfo("Workflow Stage", "", resources.GetString("rbWorkflowStage.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(320, 115))); this.rbWorkflowStage.TabIndex = 6; @@ -1776,9 +1734,10 @@ namespace VEPROMS // this.rbApprovalStage.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.rbApprovalStage.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.rbApprovalStage.Location = new System.Drawing.Point(3, 31); + this.rbApprovalStage.Location = new System.Drawing.Point(4, 38); + this.rbApprovalStage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.rbApprovalStage.Name = "rbApprovalStage"; - this.rbApprovalStage.Size = new System.Drawing.Size(222, 23); + this.rbApprovalStage.Size = new System.Drawing.Size(296, 28); this.rbApprovalStage.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.rbApprovalStage, new DevComponents.DotNetBar.SuperTooltipInfo("Approval Stage", "", "When the approval function is run:\r\n - Change Bars are REMOVED in the Working Dra" + "ft\r\n - The resulting PDF will NOT have a watermark on each page.\r\n - Procedure H" + @@ -1791,10 +1750,10 @@ namespace VEPROMS // // txbPrntLoc // - this.txbPrntLoc.Location = new System.Drawing.Point(334, 76); - this.txbPrntLoc.Margin = new System.Windows.Forms.Padding(2); + this.txbPrntLoc.Location = new System.Drawing.Point(445, 94); + this.txbPrntLoc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txbPrntLoc.Name = "txbPrntLoc"; - this.txbPrntLoc.Size = new System.Drawing.Size(67, 20); + this.txbPrntLoc.Size = new System.Drawing.Size(88, 22); this.superTooltip1.SetSuperTooltip(this.txbPrntLoc, new DevComponents.DotNetBar.SuperTooltipInfo("Printable Text - X Location", "", "Enter how far from the left edge of the paper that the printable annotation text " + "should be placed.\r\n\r\nA value of 72 will place the text one inch from the left ed" + "ge of the paper.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 110))); @@ -1806,10 +1765,9 @@ namespace VEPROMS // this.lblPrintTxt.AutoSize = true; this.lblPrintTxt.BackColor = System.Drawing.Color.Transparent; - this.lblPrintTxt.Location = new System.Drawing.Point(196, 79); - this.lblPrintTxt.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblPrintTxt.Location = new System.Drawing.Point(261, 97); this.lblPrintTxt.Name = "lblPrintTxt"; - this.lblPrintTxt.Size = new System.Drawing.Size(135, 13); + this.lblPrintTxt.Size = new System.Drawing.Size(165, 16); this.superTooltip1.SetSuperTooltip(this.lblPrintTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Printable Text - X Location", "", "Enter how far from the left edge of the paper that the printable annotation text " + "should be placed.\r\n\r\nA value of 72 will place the text one inch from the left ed" + "ge of the paper.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 110))); @@ -1832,10 +1790,10 @@ namespace VEPROMS this.panButtons.Controls.Add(this.btnOutputSettings); this.panButtons.Controls.Add(this.btnRefObjs); this.panButtons.Controls.Add(this.btnGeneral); - this.panButtons.Location = new System.Drawing.Point(4, 6); - this.panButtons.Margin = new System.Windows.Forms.Padding(2); + this.panButtons.Location = new System.Drawing.Point(5, 7); + this.panButtons.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panButtons.Name = "panButtons"; - this.panButtons.Size = new System.Drawing.Size(122, 235); + this.panButtons.Size = new System.Drawing.Size(163, 289); this.panButtons.TabIndex = 26; // // btnRevisionStages @@ -1843,10 +1801,10 @@ namespace VEPROMS this.btnRevisionStages.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnRevisionStages.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnRevisionStages.Dock = System.Windows.Forms.DockStyle.Top; - this.btnRevisionStages.Location = new System.Drawing.Point(0, 133); - this.btnRevisionStages.Margin = new System.Windows.Forms.Padding(2); + this.btnRevisionStages.Location = new System.Drawing.Point(0, 161); + this.btnRevisionStages.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnRevisionStages.Name = "btnRevisionStages"; - this.btnRevisionStages.Size = new System.Drawing.Size(122, 19); + this.btnRevisionStages.Size = new System.Drawing.Size(163, 23); this.btnRevisionStages.TabIndex = 10; this.btnRevisionStages.Text = "Revision Stages"; this.btnRevisionStages.Click += new System.EventHandler(this.btnApprvStages_Click); @@ -1856,10 +1814,10 @@ namespace VEPROMS this.btnAnnoTypes.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnAnnoTypes.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnAnnoTypes.Dock = System.Windows.Forms.DockStyle.Top; - this.btnAnnoTypes.Location = new System.Drawing.Point(0, 114); - this.btnAnnoTypes.Margin = new System.Windows.Forms.Padding(2); + this.btnAnnoTypes.Location = new System.Drawing.Point(0, 138); + this.btnAnnoTypes.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnAnnoTypes.Name = "btnAnnoTypes"; - this.btnAnnoTypes.Size = new System.Drawing.Size(122, 19); + this.btnAnnoTypes.Size = new System.Drawing.Size(163, 23); this.btnAnnoTypes.TabIndex = 9; this.btnAnnoTypes.Text = "Annotation Types"; this.btnAnnoTypes.Click += new System.EventHandler(this.btnAnnoTypes_Click); @@ -1869,10 +1827,10 @@ namespace VEPROMS this.btnEdSettings.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnEdSettings.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnEdSettings.Dock = System.Windows.Forms.DockStyle.Top; - this.btnEdSettings.Location = new System.Drawing.Point(0, 95); - this.btnEdSettings.Margin = new System.Windows.Forms.Padding(2); + this.btnEdSettings.Location = new System.Drawing.Point(0, 115); + this.btnEdSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnEdSettings.Name = "btnEdSettings"; - this.btnEdSettings.Size = new System.Drawing.Size(122, 19); + this.btnEdSettings.Size = new System.Drawing.Size(163, 23); this.btnEdSettings.TabIndex = 8; this.btnEdSettings.Text = "Editor Settings"; this.btnEdSettings.Click += new System.EventHandler(this.btnEdSettings_Click); @@ -1882,10 +1840,10 @@ namespace VEPROMS this.btnFormatSettings.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnFormatSettings.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnFormatSettings.Dock = System.Windows.Forms.DockStyle.Top; - this.btnFormatSettings.Location = new System.Drawing.Point(0, 76); - this.btnFormatSettings.Margin = new System.Windows.Forms.Padding(2); + this.btnFormatSettings.Location = new System.Drawing.Point(0, 92); + this.btnFormatSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnFormatSettings.Name = "btnFormatSettings"; - this.btnFormatSettings.Size = new System.Drawing.Size(122, 19); + this.btnFormatSettings.Size = new System.Drawing.Size(163, 23); this.btnFormatSettings.TabIndex = 7; this.btnFormatSettings.Text = "Format Settings"; this.btnFormatSettings.Click += new System.EventHandler(this.btnFormatSettings_Click); @@ -1895,10 +1853,10 @@ namespace VEPROMS this.btnStMsg.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnStMsg.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnStMsg.Dock = System.Windows.Forms.DockStyle.Top; - this.btnStMsg.Location = new System.Drawing.Point(0, 57); - this.btnStMsg.Margin = new System.Windows.Forms.Padding(2); + this.btnStMsg.Location = new System.Drawing.Point(0, 69); + this.btnStMsg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnStMsg.Name = "btnStMsg"; - this.btnStMsg.Size = new System.Drawing.Size(122, 19); + this.btnStMsg.Size = new System.Drawing.Size(163, 23); this.btnStMsg.TabIndex = 6; this.btnStMsg.Text = "Startup Message"; this.btnStMsg.Click += new System.EventHandler(this.btnStMsg_Click); @@ -1908,10 +1866,10 @@ namespace VEPROMS this.btnOutputSettings.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnOutputSettings.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnOutputSettings.Dock = System.Windows.Forms.DockStyle.Top; - this.btnOutputSettings.Location = new System.Drawing.Point(0, 38); - this.btnOutputSettings.Margin = new System.Windows.Forms.Padding(2); + this.btnOutputSettings.Location = new System.Drawing.Point(0, 46); + this.btnOutputSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnOutputSettings.Name = "btnOutputSettings"; - this.btnOutputSettings.Size = new System.Drawing.Size(122, 19); + this.btnOutputSettings.Size = new System.Drawing.Size(163, 23); this.btnOutputSettings.TabIndex = 5; this.btnOutputSettings.Text = "Output Settings"; this.btnOutputSettings.Click += new System.EventHandler(this.btnOutputSettings_Click); @@ -1921,10 +1879,10 @@ namespace VEPROMS this.btnRefObjs.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnRefObjs.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnRefObjs.Dock = System.Windows.Forms.DockStyle.Top; - this.btnRefObjs.Location = new System.Drawing.Point(0, 19); - this.btnRefObjs.Margin = new System.Windows.Forms.Padding(2); + this.btnRefObjs.Location = new System.Drawing.Point(0, 23); + this.btnRefObjs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnRefObjs.Name = "btnRefObjs"; - this.btnRefObjs.Size = new System.Drawing.Size(122, 19); + this.btnRefObjs.Size = new System.Drawing.Size(163, 23); this.btnRefObjs.TabIndex = 4; this.btnRefObjs.Text = "Referenced Objects"; this.btnRefObjs.Click += new System.EventHandler(this.btnRefObjs_Click); @@ -1935,9 +1893,9 @@ namespace VEPROMS this.btnGeneral.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnGeneral.Dock = System.Windows.Forms.DockStyle.Top; this.btnGeneral.Location = new System.Drawing.Point(0, 0); - this.btnGeneral.Margin = new System.Windows.Forms.Padding(2); + this.btnGeneral.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnGeneral.Name = "btnGeneral"; - this.btnGeneral.Size = new System.Drawing.Size(122, 19); + this.btnGeneral.Size = new System.Drawing.Size(163, 23); this.btnGeneral.TabIndex = 3; this.btnGeneral.Text = "General"; this.btnGeneral.Click += new System.EventHandler(this.btnGeneral_Click); @@ -1947,20 +1905,20 @@ namespace VEPROMS this.tcFolder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.tcFolder.BackColor = System.Drawing.Color.Transparent; this.tcFolder.CanReorderTabs = true; - this.tcFolder.Controls.Add(this.tcpFmtSettings); this.tcFolder.Controls.Add(this.tcpGeneral); + this.tcFolder.Controls.Add(this.tcpFmtSettings); this.tcFolder.Controls.Add(this.tabControlPanel1); this.tcFolder.Controls.Add(this.tcpRefObjs); this.tcFolder.Controls.Add(this.tcpEdSettings); this.tcFolder.Controls.Add(this.tcpStMsg); this.tcFolder.Controls.Add(this.tcpOutputSettings); this.tcFolder.Controls.Add(this.tabControlPanel2); - this.tcFolder.Location = new System.Drawing.Point(142, 6); - this.tcFolder.Margin = new System.Windows.Forms.Padding(2); + this.tcFolder.Location = new System.Drawing.Point(189, 7); + this.tcFolder.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcFolder.Name = "tcFolder"; this.tcFolder.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold); this.tcFolder.SelectedTabIndex = 0; - this.tcFolder.Size = new System.Drawing.Size(510, 258); + this.tcFolder.Size = new System.Drawing.Size(680, 318); this.tcFolder.Style = DevComponents.DotNetBar.eTabStripStyle.Office2007Dock; this.tcFolder.TabIndex = 27; this.tcFolder.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -1975,43 +1933,6 @@ namespace VEPROMS this.tcFolder.TabsVisible = false; this.tcFolder.Text = "tabControl2"; // - // tcpGeneral - // - this.tcpGeneral.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.tcpGeneral.Controls.Add(this.ppTxtBxUserID); - this.tcpGeneral.Controls.Add(this.ppDTPicker); - this.tcpGeneral.Controls.Add(this.label3); - this.tcpGeneral.Controls.Add(this.ppRTxtHeading); - this.tcpGeneral.Controls.Add(this.ppRTxtName); - this.tcpGeneral.Controls.Add(this.tbSqlTimeout); - this.tcpGeneral.Controls.Add(this.lblSqlTimeout); - this.tcpGeneral.Controls.Add(this.lblSqlTimeoutDefault); - this.tcpGeneral.Controls.Add(this.label4); - this.tcpGeneral.Controls.Add(this.lblHeading); - this.tcpGeneral.Controls.Add(this.label2); - this.tcpGeneral.DisabledBackColor = System.Drawing.Color.Empty; - this.tcpGeneral.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpGeneral.Location = new System.Drawing.Point(0, 22); - this.tcpGeneral.Margin = new System.Windows.Forms.Padding(2); - this.tcpGeneral.Name = "tcpGeneral"; - this.tcpGeneral.Padding = new System.Windows.Forms.Padding(1); - this.tcpGeneral.Size = new System.Drawing.Size(510, 236); - this.tcpGeneral.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); - this.tcpGeneral.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); - this.tcpGeneral.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tcpGeneral.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); - this.tcpGeneral.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tcpGeneral.Style.GradientAngle = 90; - this.tcpGeneral.TabIndex = 1; - this.tcpGeneral.TabItem = this.tiGeneral; - // - // tiGeneral - // - this.tiGeneral.AttachedControl = this.tcpGeneral; - this.tiGeneral.Name = "tiGeneral"; - this.tiGeneral.Text = "General"; - // // tcpFmtSettings // this.tcpFmtSettings.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; @@ -2026,11 +1947,11 @@ namespace VEPROMS this.tcpFmtSettings.Controls.Add(this.ppLblFormatDefault); this.tcpFmtSettings.DisabledBackColor = System.Drawing.Color.Empty; this.tcpFmtSettings.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpFmtSettings.Location = new System.Drawing.Point(0, 22); - this.tcpFmtSettings.Margin = new System.Windows.Forms.Padding(2); + this.tcpFmtSettings.Location = new System.Drawing.Point(0, 25); + this.tcpFmtSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpFmtSettings.Name = "tcpFmtSettings"; this.tcpFmtSettings.Padding = new System.Windows.Forms.Padding(1); - this.tcpFmtSettings.Size = new System.Drawing.Size(510, 236); + this.tcpFmtSettings.Size = new System.Drawing.Size(680, 293); this.tcpFmtSettings.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tcpFmtSettings.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tcpFmtSettings.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -2048,6 +1969,68 @@ namespace VEPROMS this.tiFmtSettings.Name = "tiFmtSettings"; this.tiFmtSettings.Text = "Format Settings"; // + // tcpGeneral + // + this.tcpGeneral.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.tcpGeneral.Controls.Add(this.lblIncTrans); + this.tcpGeneral.Controls.Add(this.cbIncTranCvtPerm); + this.tcpGeneral.Controls.Add(this.ppTxtBxUserID); + this.tcpGeneral.Controls.Add(this.ppDTPicker); + this.tcpGeneral.Controls.Add(this.label3); + this.tcpGeneral.Controls.Add(this.ppRTxtHeading); + this.tcpGeneral.Controls.Add(this.ppRTxtName); + this.tcpGeneral.Controls.Add(this.tbSqlTimeout); + this.tcpGeneral.Controls.Add(this.lblSqlTimeout); + this.tcpGeneral.Controls.Add(this.lblSqlTimeoutDefault); + this.tcpGeneral.Controls.Add(this.label4); + this.tcpGeneral.Controls.Add(this.lblHeading); + this.tcpGeneral.Controls.Add(this.label2); + this.tcpGeneral.DisabledBackColor = System.Drawing.Color.Empty; + this.tcpGeneral.Dock = System.Windows.Forms.DockStyle.Fill; + this.tcpGeneral.Location = new System.Drawing.Point(0, 25); + this.tcpGeneral.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tcpGeneral.Name = "tcpGeneral"; + this.tcpGeneral.Padding = new System.Windows.Forms.Padding(1); + this.tcpGeneral.Size = new System.Drawing.Size(680, 293); + this.tcpGeneral.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); + this.tcpGeneral.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); + this.tcpGeneral.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tcpGeneral.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); + this.tcpGeneral.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tcpGeneral.Style.GradientAngle = 90; + this.tcpGeneral.TabIndex = 1; + this.tcpGeneral.TabItem = this.tiGeneral; + // + // lblIncTrans + // + this.lblIncTrans.AutoSize = true; + this.lblIncTrans.BackColor = System.Drawing.Color.Transparent; + this.lblIncTrans.Location = new System.Drawing.Point(19, 186); + this.lblIncTrans.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblIncTrans.Name = "lblIncTrans"; + this.lblIncTrans.Size = new System.Drawing.Size(552, 64); + this.lblIncTrans.TabIndex = 11; + this.lblIncTrans.Text = resources.GetString("lblIncTrans.Text"); + // + // cbIncTranCvtPerm + // + this.cbIncTranCvtPerm.AutoSize = true; + this.cbIncTranCvtPerm.BackColor = System.Drawing.Color.Transparent; + this.cbIncTranCvtPerm.Location = new System.Drawing.Point(61, 271); + this.cbIncTranCvtPerm.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.cbIncTranCvtPerm.Name = "cbIncTranCvtPerm"; + this.cbIncTranCvtPerm.Size = new System.Drawing.Size(384, 20); + this.cbIncTranCvtPerm.TabIndex = 20; + this.cbIncTranCvtPerm.Text = "Override Security for Converting Incoming Transitions to Text"; + this.cbIncTranCvtPerm.UseVisualStyleBackColor = false; + // + // tiGeneral + // + this.tiGeneral.AttachedControl = this.tcpGeneral; + this.tiGeneral.Name = "tiGeneral"; + this.tiGeneral.Text = "General"; + // // tabControlPanel1 // this.tabControlPanel1.Controls.Add(this.txbPrntLoc); @@ -2062,11 +2045,11 @@ namespace VEPROMS this.tabControlPanel1.Controls.Add(this.lbAnnotationTypes); this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty; this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel1.Location = new System.Drawing.Point(0, 22); - this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(2); + this.tabControlPanel1.Location = new System.Drawing.Point(0, 25); + this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabControlPanel1.Name = "tabControlPanel1"; this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel1.Size = new System.Drawing.Size(510, 236); + this.tabControlPanel1.Size = new System.Drawing.Size(680, 293); this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tabControlPanel1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -2082,10 +2065,10 @@ namespace VEPROMS this.btnAnnoTypeApply.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnAnnoTypeApply.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnAnnoTypeApply.Enabled = false; - this.btnAnnoTypeApply.Location = new System.Drawing.Point(318, 47); - this.btnAnnoTypeApply.Margin = new System.Windows.Forms.Padding(2); + this.btnAnnoTypeApply.Location = new System.Drawing.Point(424, 58); + this.btnAnnoTypeApply.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnAnnoTypeApply.Name = "btnAnnoTypeApply"; - this.btnAnnoTypeApply.Size = new System.Drawing.Size(56, 19); + this.btnAnnoTypeApply.Size = new System.Drawing.Size(75, 23); this.btnAnnoTypeApply.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnAnnoTypeApply.TabIndex = 8; this.btnAnnoTypeApply.Text = "Apply"; @@ -2099,12 +2082,12 @@ namespace VEPROMS // this.txbxRemoveMsg.Border.Class = "TextBoxBorder"; this.txbxRemoveMsg.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txbxRemoveMsg.Location = new System.Drawing.Point(198, 128); - this.txbxRemoveMsg.Margin = new System.Windows.Forms.Padding(2); + this.txbxRemoveMsg.Location = new System.Drawing.Point(264, 158); + this.txbxRemoveMsg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txbxRemoveMsg.Multiline = true; this.txbxRemoveMsg.Name = "txbxRemoveMsg"; this.txbxRemoveMsg.ReadOnly = true; - this.txbxRemoveMsg.Size = new System.Drawing.Size(276, 75); + this.txbxRemoveMsg.Size = new System.Drawing.Size(368, 92); this.txbxRemoveMsg.TabIndex = 7; this.txbxRemoveMsg.TabStop = false; this.txbxRemoveMsg.Text = resources.GetString("txbxRemoveMsg.Text"); @@ -2115,10 +2098,10 @@ namespace VEPROMS this.btnAnnoTypeUndo.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnAnnoTypeUndo.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnAnnoTypeUndo.Enabled = false; - this.btnAnnoTypeUndo.Location = new System.Drawing.Point(378, 47); - this.btnAnnoTypeUndo.Margin = new System.Windows.Forms.Padding(2); + this.btnAnnoTypeUndo.Location = new System.Drawing.Point(504, 58); + this.btnAnnoTypeUndo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnAnnoTypeUndo.Name = "btnAnnoTypeUndo"; - this.btnAnnoTypeUndo.Size = new System.Drawing.Size(56, 19); + this.btnAnnoTypeUndo.Size = new System.Drawing.Size(75, 23); this.btnAnnoTypeUndo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnAnnoTypeUndo.TabIndex = 5; this.btnAnnoTypeUndo.Text = "Undo"; @@ -2129,10 +2112,10 @@ namespace VEPROMS this.btnAnnoTypeRemove.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnAnnoTypeRemove.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnAnnoTypeRemove.Enabled = false; - this.btnAnnoTypeRemove.Location = new System.Drawing.Point(258, 47); - this.btnAnnoTypeRemove.Margin = new System.Windows.Forms.Padding(2); + this.btnAnnoTypeRemove.Location = new System.Drawing.Point(344, 58); + this.btnAnnoTypeRemove.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnAnnoTypeRemove.Name = "btnAnnoTypeRemove"; - this.btnAnnoTypeRemove.Size = new System.Drawing.Size(56, 19); + this.btnAnnoTypeRemove.Size = new System.Drawing.Size(75, 23); this.btnAnnoTypeRemove.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnAnnoTypeRemove.TabIndex = 4; this.btnAnnoTypeRemove.Text = "Remove"; @@ -2144,10 +2127,10 @@ namespace VEPROMS // this.btnAnnoTypeNew.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnAnnoTypeNew.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnAnnoTypeNew.Location = new System.Drawing.Point(198, 48); - this.btnAnnoTypeNew.Margin = new System.Windows.Forms.Padding(2); + this.btnAnnoTypeNew.Location = new System.Drawing.Point(264, 59); + this.btnAnnoTypeNew.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnAnnoTypeNew.Name = "btnAnnoTypeNew"; - this.btnAnnoTypeNew.Size = new System.Drawing.Size(56, 19); + this.btnAnnoTypeNew.Size = new System.Drawing.Size(75, 23); this.btnAnnoTypeNew.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnAnnoTypeNew.TabIndex = 3; this.btnAnnoTypeNew.Text = "New"; @@ -2157,19 +2140,18 @@ namespace VEPROMS // this.lblAnnoTypeCntMessage.AutoSize = true; this.lblAnnoTypeCntMessage.BackColor = System.Drawing.Color.Transparent; - this.lblAnnoTypeCntMessage.Location = new System.Drawing.Point(195, 104); - this.lblAnnoTypeCntMessage.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblAnnoTypeCntMessage.Location = new System.Drawing.Point(260, 128); this.lblAnnoTypeCntMessage.Name = "lblAnnoTypeCntMessage"; - this.lblAnnoTypeCntMessage.Size = new System.Drawing.Size(80, 13); + this.lblAnnoTypeCntMessage.Size = new System.Drawing.Size(102, 16); this.lblAnnoTypeCntMessage.TabIndex = 2; this.lblAnnoTypeCntMessage.Text = "Count message"; // // tbxAnnotationDescription // - this.tbxAnnotationDescription.Location = new System.Drawing.Point(198, 15); - this.tbxAnnotationDescription.Margin = new System.Windows.Forms.Padding(2); + this.tbxAnnotationDescription.Location = new System.Drawing.Point(264, 18); + this.tbxAnnotationDescription.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tbxAnnotationDescription.Name = "tbxAnnotationDescription"; - this.tbxAnnotationDescription.Size = new System.Drawing.Size(235, 20); + this.tbxAnnotationDescription.Size = new System.Drawing.Size(312, 22); this.tbxAnnotationDescription.TabIndex = 1; this.tbxAnnotationDescription.TextChanged += new System.EventHandler(this.tbxAnnotationDescription_TextChanged); this.tbxAnnotationDescription.Validating += new System.ComponentModel.CancelEventHandler(this.tbxAnnotationDescription_Validating); @@ -2178,10 +2160,11 @@ namespace VEPROMS // this.lbAnnotationTypes.Dock = System.Windows.Forms.DockStyle.Left; this.lbAnnotationTypes.FormattingEnabled = true; + this.lbAnnotationTypes.ItemHeight = 16; this.lbAnnotationTypes.Location = new System.Drawing.Point(1, 1); - this.lbAnnotationTypes.Margin = new System.Windows.Forms.Padding(2); + this.lbAnnotationTypes.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lbAnnotationTypes.Name = "lbAnnotationTypes"; - this.lbAnnotationTypes.Size = new System.Drawing.Size(181, 234); + this.lbAnnotationTypes.Size = new System.Drawing.Size(240, 291); this.lbAnnotationTypes.TabIndex = 0; this.lbAnnotationTypes.SelectedIndexChanged += new System.EventHandler(this.lbAnnotationTypes_SelectedIndexChanged); // @@ -2201,11 +2184,11 @@ namespace VEPROMS this.tcpRefObjs.Controls.Add(this.lblGrphFileExt); this.tcpRefObjs.DisabledBackColor = System.Drawing.Color.Empty; this.tcpRefObjs.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpRefObjs.Location = new System.Drawing.Point(0, 22); - this.tcpRefObjs.Margin = new System.Windows.Forms.Padding(2); + this.tcpRefObjs.Location = new System.Drawing.Point(0, 25); + this.tcpRefObjs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpRefObjs.Name = "tcpRefObjs"; this.tcpRefObjs.Padding = new System.Windows.Forms.Padding(1); - this.tcpRefObjs.Size = new System.Drawing.Size(510, 236); + this.tcpRefObjs.Size = new System.Drawing.Size(680, 293); this.tcpRefObjs.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tcpRefObjs.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tcpRefObjs.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -2233,11 +2216,11 @@ namespace VEPROMS this.tcpEdSettings.Controls.Add(this.ppCmbxStpEditorCols); this.tcpEdSettings.DisabledBackColor = System.Drawing.Color.Empty; this.tcpEdSettings.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpEdSettings.Location = new System.Drawing.Point(0, 22); - this.tcpEdSettings.Margin = new System.Windows.Forms.Padding(2); + this.tcpEdSettings.Location = new System.Drawing.Point(0, 25); + this.tcpEdSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpEdSettings.Name = "tcpEdSettings"; this.tcpEdSettings.Padding = new System.Windows.Forms.Padding(1); - this.tcpEdSettings.Size = new System.Drawing.Size(510, 236); + this.tcpEdSettings.Size = new System.Drawing.Size(680, 293); this.tcpEdSettings.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tcpEdSettings.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tcpEdSettings.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -2269,11 +2252,11 @@ namespace VEPROMS this.tcpStMsg.Controls.Add(this.ppBtnStMsgDelete); this.tcpStMsg.DisabledBackColor = System.Drawing.Color.Empty; this.tcpStMsg.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpStMsg.Location = new System.Drawing.Point(0, 22); - this.tcpStMsg.Margin = new System.Windows.Forms.Padding(2); + this.tcpStMsg.Location = new System.Drawing.Point(0, 25); + this.tcpStMsg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpStMsg.Name = "tcpStMsg"; this.tcpStMsg.Padding = new System.Windows.Forms.Padding(1); - this.tcpStMsg.Size = new System.Drawing.Size(510, 236); + this.tcpStMsg.Size = new System.Drawing.Size(680, 293); this.tcpStMsg.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tcpStMsg.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tcpStMsg.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -2303,11 +2286,11 @@ namespace VEPROMS this.tcpOutputSettings.Controls.Add(this.ppLblWatermarkDefault); this.tcpOutputSettings.DisabledBackColor = System.Drawing.Color.Empty; this.tcpOutputSettings.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpOutputSettings.Location = new System.Drawing.Point(0, 22); - this.tcpOutputSettings.Margin = new System.Windows.Forms.Padding(2); + this.tcpOutputSettings.Location = new System.Drawing.Point(0, 25); + this.tcpOutputSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpOutputSettings.Name = "tcpOutputSettings"; this.tcpOutputSettings.Padding = new System.Windows.Forms.Padding(1); - this.tcpOutputSettings.Size = new System.Drawing.Size(510, 236); + this.tcpOutputSettings.Size = new System.Drawing.Size(680, 293); this.tcpOutputSettings.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tcpOutputSettings.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tcpOutputSettings.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -2336,11 +2319,11 @@ namespace VEPROMS this.tabControlPanel2.Controls.Add(this.lbRevisionStages); this.tabControlPanel2.DisabledBackColor = System.Drawing.Color.Empty; this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel2.Location = new System.Drawing.Point(0, 22); - this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(2); + this.tabControlPanel2.Location = new System.Drawing.Point(0, 25); + this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabControlPanel2.Name = "tabControlPanel2"; this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel2.Size = new System.Drawing.Size(510, 236); + this.tabControlPanel2.Size = new System.Drawing.Size(680, 293); this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tabControlPanel2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -2356,10 +2339,10 @@ namespace VEPROMS this.btnRevisionStageApply.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnRevisionStageApply.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnRevisionStageApply.Enabled = false; - this.btnRevisionStageApply.Location = new System.Drawing.Point(331, 140); - this.btnRevisionStageApply.Margin = new System.Windows.Forms.Padding(2); + this.btnRevisionStageApply.Location = new System.Drawing.Point(441, 172); + this.btnRevisionStageApply.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnRevisionStageApply.Name = "btnRevisionStageApply"; - this.btnRevisionStageApply.Size = new System.Drawing.Size(56, 19); + this.btnRevisionStageApply.Size = new System.Drawing.Size(75, 23); this.btnRevisionStageApply.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnRevisionStageApply.TabIndex = 9; this.btnRevisionStageApply.Text = "Apply"; @@ -2373,9 +2356,10 @@ namespace VEPROMS this.gpApprvStageTypes.Controls.Add(this.rbWorkflowStage); this.gpApprvStageTypes.Controls.Add(this.rbApprovalStage); this.gpApprvStageTypes.DisabledBackColor = System.Drawing.Color.Empty; - this.gpApprvStageTypes.Location = new System.Drawing.Point(211, 45); + this.gpApprvStageTypes.Location = new System.Drawing.Point(281, 55); + this.gpApprvStageTypes.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.gpApprvStageTypes.Name = "gpApprvStageTypes"; - this.gpApprvStageTypes.Size = new System.Drawing.Size(227, 82); + this.gpApprvStageTypes.Size = new System.Drawing.Size(303, 101); // // // @@ -2412,10 +2396,10 @@ namespace VEPROMS this.btnRevisoinStageUndo.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnRevisoinStageUndo.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnRevisoinStageUndo.Enabled = false; - this.btnRevisoinStageUndo.Location = new System.Drawing.Point(390, 140); - this.btnRevisoinStageUndo.Margin = new System.Windows.Forms.Padding(2); + this.btnRevisoinStageUndo.Location = new System.Drawing.Point(520, 172); + this.btnRevisoinStageUndo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnRevisoinStageUndo.Name = "btnRevisoinStageUndo"; - this.btnRevisoinStageUndo.Size = new System.Drawing.Size(56, 19); + this.btnRevisoinStageUndo.Size = new System.Drawing.Size(75, 23); this.btnRevisoinStageUndo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnRevisoinStageUndo.TabIndex = 5; this.btnRevisoinStageUndo.Text = "Undo"; @@ -2425,10 +2409,10 @@ namespace VEPROMS // this.btnRevisionStageRemove.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnRevisionStageRemove.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnRevisionStageRemove.Location = new System.Drawing.Point(271, 140); - this.btnRevisionStageRemove.Margin = new System.Windows.Forms.Padding(2); + this.btnRevisionStageRemove.Location = new System.Drawing.Point(361, 172); + this.btnRevisionStageRemove.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnRevisionStageRemove.Name = "btnRevisionStageRemove"; - this.btnRevisionStageRemove.Size = new System.Drawing.Size(56, 19); + this.btnRevisionStageRemove.Size = new System.Drawing.Size(75, 23); this.btnRevisionStageRemove.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnRevisionStageRemove.TabIndex = 4; this.btnRevisionStageRemove.Text = "Remove"; @@ -2440,10 +2424,10 @@ namespace VEPROMS // this.btnRevisionStageNew.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnRevisionStageNew.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnRevisionStageNew.Location = new System.Drawing.Point(211, 140); - this.btnRevisionStageNew.Margin = new System.Windows.Forms.Padding(2); + this.btnRevisionStageNew.Location = new System.Drawing.Point(281, 172); + this.btnRevisionStageNew.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnRevisionStageNew.Name = "btnRevisionStageNew"; - this.btnRevisionStageNew.Size = new System.Drawing.Size(56, 19); + this.btnRevisionStageNew.Size = new System.Drawing.Size(75, 23); this.btnRevisionStageNew.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnRevisionStageNew.TabIndex = 3; this.btnRevisionStageNew.Text = "New"; @@ -2451,10 +2435,10 @@ namespace VEPROMS // // tbRevisionStage // - this.tbRevisionStage.Location = new System.Drawing.Point(218, 16); - this.tbRevisionStage.Margin = new System.Windows.Forms.Padding(2); + this.tbRevisionStage.Location = new System.Drawing.Point(291, 20); + this.tbRevisionStage.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tbRevisionStage.Name = "tbRevisionStage"; - this.tbRevisionStage.Size = new System.Drawing.Size(213, 20); + this.tbRevisionStage.Size = new System.Drawing.Size(283, 22); this.tbRevisionStage.TabIndex = 2; this.tbRevisionStage.TextChanged += new System.EventHandler(this.tbRevisionStage_TextChanged); this.tbRevisionStage.Validating += new System.ComponentModel.CancelEventHandler(this.tbRevisionStage_Validating); @@ -2463,10 +2447,11 @@ namespace VEPROMS // this.lbRevisionStages.Dock = System.Windows.Forms.DockStyle.Left; this.lbRevisionStages.FormattingEnabled = true; + this.lbRevisionStages.ItemHeight = 16; this.lbRevisionStages.Location = new System.Drawing.Point(1, 1); - this.lbRevisionStages.Margin = new System.Windows.Forms.Padding(2); + this.lbRevisionStages.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lbRevisionStages.Name = "lbRevisionStages"; - this.lbRevisionStages.Size = new System.Drawing.Size(181, 234); + this.lbRevisionStages.Size = new System.Drawing.Size(240, 291); this.lbRevisionStages.TabIndex = 0; this.lbRevisionStages.SelectedIndexChanged += new System.EventHandler(this.lbRevisionStages_SelectedIndexChanged); // @@ -2487,12 +2472,12 @@ namespace VEPROMS // // frmFolderProperties // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.CancelButton = this.ppBtnCancel; this.CaptionFont = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ClientSize = new System.Drawing.Size(663, 299); + this.ClientSize = new System.Drawing.Size(879, 363); this.ControlBox = false; this.Controls.Add(this.tcFolder); this.Controls.Add(this.panButtons); @@ -2502,7 +2487,7 @@ namespace VEPROMS this.Controls.Add(this.ppBtnOK); this.DoubleBuffered = true; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Margin = new System.Windows.Forms.Padding(2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "frmFolderProperties"; @@ -2536,10 +2521,10 @@ namespace VEPROMS this.panButtons.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.tcFolder)).EndInit(); this.tcFolder.ResumeLayout(false); - this.tcpGeneral.ResumeLayout(false); - this.tcpGeneral.PerformLayout(); this.tcpFmtSettings.ResumeLayout(false); this.tcpFmtSettings.PerformLayout(); + this.tcpGeneral.ResumeLayout(false); + this.tcpGeneral.PerformLayout(); this.tabControlPanel1.ResumeLayout(false); this.tabControlPanel1.PerformLayout(); this.tcpRefObjs.ResumeLayout(false); @@ -2727,6 +2712,8 @@ namespace VEPROMS private DevComponents.DotNetBar.ButtonX btnAnnoTypeApply; private System.Windows.Forms.TextBox txbPrntLoc; private System.Windows.Forms.Label lblPrintTxt; - //private System.Windows.Forms.ComboBox ppCmbxChangeBarType; - } + private System.Windows.Forms.CheckBox cbIncTranCvtPerm; + private System.Windows.Forms.Label lblIncTrans; + //private System.Windows.Forms.ComboBox ppCmbxChangeBarType; + } } \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.cs b/PROMS/VEPROMS User Interface/frmFolderProperties.cs index 93bd8cbf..0f5729a7 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.cs +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.cs @@ -232,6 +232,9 @@ namespace VEPROMS tbSqlTimeout.Visible = true; lblSqlTimeout.Visible = true; lblSqlTimeoutDefault.Visible = true; + this.cbIncTranCvtPerm.Visible = true; + this.cbIncTranCvtPerm.Checked = _FolderConfig.General_IncTranCvtPerm; // C2020-033: defaults to does not have permission + this.lblIncTrans.Visible = true; } else { @@ -244,6 +247,8 @@ namespace VEPROMS this.btnRefObjs.Visible = false; this.btnAnnoTypes.Visible = false; this.btnRevisionStages.Visible = false; + this.cbIncTranCvtPerm.Visible = false; + this.lblIncTrans.Visible = false; /* This color settings property page is currently no visible... * @@ -376,6 +381,9 @@ namespace VEPROMS Settings.Default.ShowDefaultFolderProp = ppCbShwDefSettings.Checked; Settings.Default.Save(); _FolderConfig.Timeout = tbSqlTimeout.Text; + + // C2020-033: Handling of external transitions - let admin decide who can convert transitions to text + if (_FolderConfig.MyFolder.FolderID == 1)_FolderConfig.General_IncTranCvtPerm = cbIncTranCvtPerm.Checked; // only do top folder _FolderConfig.MyFolder.Config = _FolderConfig.ToString(); _FolderConfig.MyFolder.Save().Dispose(); SaveApprStages(); diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.resx b/PROMS/VEPROMS User Interface/frmFolderProperties.resx index db33b23c..7c610a64 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.resx +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.resx @@ -112,15 +112,15 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 282, 17 - + 518, 17 @@ -128,10 +128,7 @@ Check "Show Default Settings" to display the "default" graphic file extension setting (below the Graphic File Extension selection box). - - 665, 17 - - + 665, 17 @@ -169,24 +166,23 @@ Check "Show Default Settings" to display the "default" Change Bar Custom Message Check "Show Default Settings" to display the "default" Change Bar Custom Message (below the Line One selection box). - + - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK9gAA - CvYBwq9wAwAAArVJREFUOE+lkV1IU2EYx0/eBHURdWXWcsxCQuqqMAwk+u6iaLlAxb78yDKllSViGllK - iSstHZpiCWm2Jjmcjj7oQgVrGg7nYTq3NLZ0H859eN5zzj7aeTpntLXhVXTxg/d53+f/43nfFwOA/yKm - oF2yUkpfiUhdmZ/EbwZJ3e0A0pz3kIuNTdF90UQWtOttA6HJ9lHW1h9ejwrCUJZnPxFe7EfaApsVr7kV - Heb4E5aVI/xagLJ3OGlPH4oROF/7KHuna1krNi+PirykRZq5SkDOVHgp+4tFLgB9JQCNZwEUJSEB7ehm - aEcPQ1paPXrFSfL7p3NyNF9zIFaAi4F29y6FBI0i0AswyGSPvO5+aFENQP5jJUjkKnBMlVvVbXsdBpWw - YZWAWu4KTUBk7YQKdtuQiAFla4J8iQKwNBbsEqC5UmQeyZl7V53sWpnKT48IiHGRjzQ/0XACDvY6DBem - rM2QlKUEbANLipwTBFzTec6BGp53oiO5OSJAxrKrxoH9NDLVD9KWNiu1KGUoq5QhzRJA5lo2KAZkvALI - UAQuPAd9qOfT6haB/K/AVMdnH+bg8HNeUN2VCkvDR8GNFwSI2cuMxJAOpz9iUCjHgNDnwdK4kBVs836V - 8npCAjR/Pw4ZK9dyBQeBFxX3V28MWsfOMMRsLtzQJ0HKUwywi5wgFxZGTrgU9zYxE+1bSiMTEDPiuLDA - ohQw6patFtuYEFamL0Chch1g1zHY8QgD52SG/9vL3c7eqnjm88P1oUwotKLNWxMW2Ab5YFDsmXBrs9hr - 5LASFl120KERBqbfpSLZnfigujkh9hujManSjg1JBB778CGwjBwHh/oUmIYOk19e7QvIKxN8k+2bH0T3 - Rxbu0SORKXTdu0S9d7cvvK9LDL6pSvzVV5vk13bwO+dlvIxwT5iY4t8B7Dezkt2u9ZJf+wAAAABJRU5E - rkJggg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACtUlE + QVQ4T6WRXUhTYRjHT94EdRF1ZdZyzEJC6qowDCT67qJouUDFvvzIMqWVJWIaWUqJKy0dmmIJabYmOZyO + PuhCBWsaDudhOrc0tnQfzn143nPOPtp5Ome0teFVdPGD93nf5//jed8XA4D/IqagXbJSSl+JSF2Zn8Rv + Bknd7QDSnPeQi41N0X3RRBa0620Docn2UdbWH16PCsJQlmc/EV7sR9oCmxWvuRUd5vgTlpUj/FqAsnc4 + aU8fihE4X/soe6drWSs2L4+KvKRFmrlKQM5UeCn7i0UuAH0lAI1nARQlIQHt6GZoRw9DWlo9esVJ8vun + c3I0X3MgVoCLgXb3LoUEjSLQCzDIZI+87n5oUQ1A/mMlSOQqcEyVW9Vtex0GlbBhlYBa7gpNQGTthAp2 + 25CIAWVrgnyJArA0FuwSoLlSZB7JmXtXnexamcpPjwiIcZGPND/RcAIO9joMF6aszZCUpQRsA0uKnBME + XNN5zoEanneiI7k5IkDGsqvGgf00MtUP0pY2K7UoZSirlCHNEkDmWjYoBmS8AshQBC48B32o59PqFoH8 + r8BUx2cf5uDwc15Q3ZUKS8NHwY0XBIjZy4zEkA6nP2JQKMeA0OfB0riQFWzzfpXyekICNH8/Dhkr13IF + B4EXFfdXbwxax84wxGwu3NAnQcpTDLCLnCAXFkZOuBT3NjET7VtKIxMQM+K4sMCiFDDqlq0W25gQVqYv + QKFyHWDXMdjxCAPnZIb/28vdzt6qeObzw/WhTCi0os1bExbYBvlgUOyZcGuz2GvksBIWXXbQoREGpt+l + Itmd+KC6OSH2G6MxqdKODUkEHvvwIbCMHAeH+hSYhg6TX17tC8grE3yT7ZsfRPdHFu7RI5EpdN27RL13 + ty+8r0sMvqlK/NVXm+TXdvA752W8jHBPmJji3wHsN7OS3a71kl/7AAAAAElFTkSuQmCC @@ -225,21 +221,27 @@ We also found that the various printer drivers can differ in the starting positi * The text of the Watermark will be the approval stage description text. - + 928, 17 + + PROMS has the capability to convert incoming transition links to text when steps, sections, or +procedures are deleted.  If PROMS security does not permit the user to write to the set that +contains the incoming transition, PROMS will not allow the transition to be converted to text.  +If you want to override security in these cases, use the checkbox below. + For the Remove button to be active, you must first clear all occurences of this Annotation Type. We suggest using the Search function where you can search for the usage of a selected Annotation Type. - + 1066, 17 - + 17, 17 - + 102 \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index 18466f59..94849f14 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -1365,7 +1365,7 @@ namespace VEPROMS this.displaySearch1.Size = new System.Drawing.Size(314, 462); this.displaySearch1.TabIndex = 0; this.displaySearch1.TopFolderID = 1; - this.displaySearch1.TypesSelected = null; + this.displaySearch1.TypesSelected = ""; // // toolstabResults // diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 42014965..079660a2 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -387,6 +387,8 @@ namespace VEPROMS tv.InsertItemInfo += new vlnTreeViewItemInfoInsertEvent(tv_InsertItemInfo); tv.NodeInsert += new vlnTreeViewEvent(tv_NodeInsert); tv.PasteItemInfo += new vlnTreeViewItemInfoPasteEvent(tv_PasteItemInfo); + tv.SearchIncTrans += new vlnTreeViewSearchIncTransEvent(tv_SearchIncTrans); + tc.SearchIncTrans += new DisplayTabControlEditorSearchIncTransEvent(tc_SearchIncTrans); tv.GetChangeId += new vlnTreeViewGetChangeIdEvent(tv_GetChangeId); tv.NodeCopy += new vlnTreeViewEvent(tv_NodeCopy); tv.ClipboardStatus += new vlnTreeViewClipboardStatusEvent(tv_ClipboardStatus); @@ -1198,6 +1200,22 @@ namespace VEPROMS { return tc.PasteRTBItem(args.MyItemInfo, args.CopyStartID, args.PasteType, (int)args.Type); } + // C2020-033: Display the search panel with Incoming Transition info for the tree view + // and for the editor. + private ItemInfo tv_SearchIncTrans(object sender, vlnTreeItemInfoEventArgs args) + { + displaySearch1.SearchIncTransII = args.MyItemInfo; + toolsPanel.Expanded = true; + displaySearch1.UpdateSearchIncTransResults(); + return args.MyItemInfo; + } + private ItemInfo tc_SearchIncTrans(object sender, vlnTreeItemInfoEventArgs args) + { + displaySearch1.SearchIncTransII = args.MyItemInfo; + toolsPanel.Expanded = true; + displaySearch1.UpdateSearchIncTransResults(); + return args.MyItemInfo; + } private bool _RemoveFromPROMSWindowForms = true; public bool ClosingWithError = false; // B2019-098: prevent looping between error & exit dialog private bool _WeAreExitingPROMS = false; // B2019-101 if exiting PROMS from main window don't prompt on each child window (separate windows) @@ -1636,6 +1654,7 @@ namespace VEPROMS StepTabRibbon.MyUserInfo = MyUserInfo; // set the user's security information in the ribbon DisplayTransition.MyUserInfo = MyUserInfo; // set the user's security information in the Transition panel DisplayTags.MyUserInfo = MyUserInfo; // set the user's security information in the Tags panel + DisplaySearch.MyUserInfo = MyUserInfo; // set the user's security information in the Search panel DisplayHistory.MyUserInfo = MyUserInfo; // set the user's security information in the History panel DisplayApplicability.MyUserInfo = MyUserInfo; // set the user's security information in the Applicability panel StepRTB.MyUserInfo = MyUserInfo; // set the user's security information in the StepRTB diff --git a/PROMS/VEPROMS.CSLA.Library/Config/FolderConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/FolderConfig.cs index fafe9b0c..75abf38e 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/FolderConfig.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/FolderConfig.cs @@ -149,6 +149,29 @@ namespace VEPROMS.CSLA.Library get { return (_Folder != null ? _Folder.ShortName : _FolderInfo.ShortName); } set { if (_Folder != null)_Folder.ShortName = value; } } + // C2020-033: Handling of external transitions - let admin decide who can convert transitions to text + [Category("General")] + [DisplayName("Non-Admin Convert Incoming Transitions To Text")] + [RefreshProperties(RefreshProperties.All)] + [Description("Non-Admin Convert Incoming Transitions To Text")] + public bool General_IncTranCvtPerm + { + get + { + string s = _Xp["General", "IncTranCvtPemr"];// get the saved value + + //Dont't bother getting parent value, this is stored on 'top' node + if (s == string.Empty) + return false; + if (s.ToUpper() == "TRUE") return true; + return false; + } + set + { + _Xp["General", "IncTranCvtPemr"] = value ? "TRUE" : "FALSE"; + OnPropertyChanged("General_IncTranCvtPerm"); + } + } [Category("Format Settings")] [DisplayName("Format")] [Description("Format")] diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 5befcbd6..278cf368 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -5431,7 +5431,7 @@ namespace VEPROMS.CSLA.Library } } #endregion - // C2020-018 used for a more descriptive warning message when deleting Procedures, Sections, Steps that have external transitions pointing to them + // C2020-018 used for a more descriptive warning message when deleting Procedures, Sections, Steps that have incoming transitions pointing to them public string GetTypeDescription() { if (this != null) @@ -5535,7 +5535,7 @@ namespace VEPROMS.CSLA.Library // itemInfo.ToXml(xn); // } //} - internal ItemInfoList(ItemInfo itemInfo) + public ItemInfoList(ItemInfo itemInfo) { AddItem(itemInfo); } @@ -5928,7 +5928,7 @@ namespace VEPROMS.CSLA.Library } this.RaiseListChangedEvents = true; } - internal void AddItem(ItemInfo itemInfo) + public void AddItem(ItemInfo itemInfo) { IsReadOnly = false; this.Add(itemInfo); diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs index 7b0c9412..e18920a4 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs @@ -36,6 +36,9 @@ namespace VEPROMS.CSLA.Library { public ItemInfo HandleSqlExceptionOnDelete(Exception ex) { + // C2020-033: The dialog message has been changed to reference the Tools/Search/Incoming Transitions tab and + // the return value was changed to return null (this was returning first in list, but now user gets all + // listed in the search dialog). This comment is for each of the dialogs below. string itemDesc = this.GetTypeDescription(); // C2020-018 made the message more accurate when deleting a Procedure, Section, or Step if (ex.Message.Contains("has External Transitions and has no next step")) { @@ -44,14 +47,8 @@ namespace VEPROMS.CSLA.Library //C2020-018 build the message based on the type description string msg1 = string.Format("Transitions exist to this {0} and cannot be adjusted automatically.", itemDesc); DialogResult ans = FlexibleMessageBox.Show(msg1 + - "\r\n\r\nDo you want to be placed at the " + (exTrans.Count > 1 ? "first " : "") + "location with the problem Transition?" + - "\r\n\r\nLocations with Problem Transitions" + - exTrans.Summarize(), - "Cannot Delete This " + itemDesc, MessageBoxButtons.YesNo, MessageBoxIcon.Question); - if (ans == DialogResult.Yes) - { - return exTrans[0].MyContent.ContentItems[0]; - } + "\r\n\r\nThe list of all locations are shown in the Tools/Search/Incoming Transitions tab.", + "Cannot Delete This " + itemDesc, MessageBoxButtons.OK, MessageBoxIcon.Information); } } else if (ex.Message.Contains("has External Transitions to Procedure")) @@ -59,14 +56,8 @@ namespace VEPROMS.CSLA.Library using (TransitionInfoList exTrans = TransitionInfoList.GetExternalTransitionsToChildren(ItemID)) { DialogResult ans = FlexibleMessageBox.Show("Transitions exist to this procedure and cannot be adjusted automatically." + - "\r\n\r\nDo you want to be placed at the " + (exTrans.Count > 1 ? "first " : "") + "location with the problem Transition?" + - "\r\n\r\nLocations with Problem Transitions" + - exTrans.Summarize(), - "Cannot Delete This Procedure", MessageBoxButtons.YesNo, MessageBoxIcon.Question); - if (ans == DialogResult.Yes) - { - return exTrans[0].MyContent.ContentItems[0]; - } + "\r\n\r\nThe list of all locations are shown in the Tools/Search/Incoming Transitions tab.", + "Cannot Delete This Procedure", MessageBoxButtons.OK, MessageBoxIcon.Information); } } // B2020-091: If deleting a section that has transitions pointing to it, show list: @@ -75,14 +66,8 @@ namespace VEPROMS.CSLA.Library using (TransitionInfoList exTrans = TransitionInfoList.GetExternalTransitionsToChildren(ItemID)) { DialogResult ans = FlexibleMessageBox.Show("Transitions exist to this section and cannot be adjusted automatically." + - "\r\n\r\nDo you want to be placed at the " + (exTrans.Count > 1 ? "first " : "") + "location with the problem Transition?" + - "\r\n\r\nLocations with Problem Transitions" + - exTrans.Summarize(), - "Cannot Delete This Section", MessageBoxButtons.YesNo, MessageBoxIcon.Question); - if (ans == DialogResult.Yes) - { - return exTrans[0].MyContent.ContentItems[0]; - } + "\r\n\r\nThe list of all locations are shown in the Tools/Search/Incoming Transitions tab.", + "Cannot Delete This Section", MessageBoxButtons.OK, MessageBoxIcon.Information); } } else if (ex.Message.Contains("has External Transitions to it's children")) @@ -92,15 +77,8 @@ namespace VEPROMS.CSLA.Library //C2020-018 build the message based on the type description string msg1 = string.Format("Transitions exist to {0} this {1} and cannot be adjusted automatically.", (this.IsSection) ? "steps in" : "children of", itemDesc); DialogResult ans = FlexibleMessageBox.Show(msg1 + - "\r\n\r\nDo you want to be placed at the " + (exTrans.Count > 1 ? "first " : "") + "location with the problem Transition?" + - "\r\n\r\nLocations with Problem Transitions:" + - exTrans.Summarize(), - "Cannot Delete This "+itemDesc, MessageBoxButtons.YesNo, MessageBoxIcon.Question); - if (ans == DialogResult.No) return this;// If answer "NO" then return self - if (ans == DialogResult.Yes) - { - return exTrans[0].MyContent.ContentItems[0]; - } + "\r\n\r\nThe list of all locations are shown in the Tools/Search/Incoming Transitions tab.", + "Cannot Delete This " + itemDesc, MessageBoxButtons.OK, MessageBoxIcon.Information); } } else diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs index 5d96030d..ba50e946 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs @@ -50,6 +50,15 @@ namespace Volian.Controls.Library this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DisplaySearch)); this.tabSearchTypes = new DevComponents.DotNetBar.TabControl(); + this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); + this.btnTranCvtSelToTxt = new System.Windows.Forms.Button(); + this.lblIncTran = new System.Windows.Forms.Label(); + this.btnTranCvtAllToTxt = new System.Windows.Forms.Button(); + this.lblSrchIncTran = new System.Windows.Forms.Label(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.rbFromEditor = new System.Windows.Forms.RadioButton(); + this.rbFromTree = new System.Windows.Forms.RadioButton(); + this.tabIncTrans = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel4 = new DevComponents.DotNetBar.TabControlPanel(); this.gpSrchText = new DevComponents.DotNetBar.Controls.GroupPanel(); this.panel1 = new System.Windows.Forms.Panel(); @@ -63,21 +72,6 @@ namespace Volian.Controls.Library this.rbtnSrchTxt = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.cbxSrchTypeUsage = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.tabStepTypeSearch = new DevComponents.DotNetBar.TabItem(this.components); - this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel(); - this.gpFindROs = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.lblSrchRoMsg = new DevComponents.DotNetBar.LabelX(); - this.cbxFndUnLnkROVals = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.cmboTreeROs = new DevComponents.DotNetBar.Controls.ComboTree(); - this.tabROSearch = new DevComponents.DotNetBar.TabItem(this.components); - this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel(); - this.gpSrchAnnoText = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.panel4 = new System.Windows.Forms.Panel(); - this.cbxBooleanAnoTxtSrch = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.cbxCaseSensitiveAnnoText = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.cbxTextSearchAnnotation = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.label2 = new System.Windows.Forms.Label(); - this.cbxAnnoTypes = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.tabAnnotationSearch = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel5 = new DevComponents.DotNetBar.TabControlPanel(); this.pnlTranCategory = new System.Windows.Forms.Panel(); this.cbxTranCategory = new DevComponents.DotNetBar.Controls.ComboBoxEx(); @@ -89,6 +83,21 @@ namespace Volian.Controls.Library this.cbxTranVersion = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.lblTranVersion = new System.Windows.Forms.Label(); this.tabTranSearch = new DevComponents.DotNetBar.TabItem(this.components); + this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel(); + this.gpSrchAnnoText = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.panel4 = new System.Windows.Forms.Panel(); + this.cbxBooleanAnoTxtSrch = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbxCaseSensitiveAnnoText = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbxTextSearchAnnotation = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.label2 = new System.Windows.Forms.Label(); + this.cbxAnnoTypes = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.tabAnnotationSearch = new DevComponents.DotNetBar.TabItem(this.components); + this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel(); + this.gpFindROs = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.lblSrchRoMsg = new DevComponents.DotNetBar.LabelX(); + this.cbxFndUnLnkROVals = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cmboTreeROs = new DevComponents.DotNetBar.Controls.ComboTree(); + this.tabROSearch = new DevComponents.DotNetBar.TabItem(this.components); this.contextMenuBar1 = new DevComponents.DotNetBar.ContextMenuBar(); this.btnCMIFindText = new DevComponents.DotNetBar.ButtonItem(); this.btnCMEdit = new DevComponents.DotNetBar.ButtonItem(); @@ -117,6 +126,7 @@ namespace Volian.Controls.Library this.nodeConnector2 = new DevComponents.AdvTree.NodeConnector(); this.grpPanSearchResults = new DevComponents.DotNetBar.Controls.GroupPanel(); this.lbSrchResults = new System.Windows.Forms.ListBox(); + this.lbSrchResultsIncTrans = new DevComponents.DotNetBar.ListBoxAdv(); this.panSearchButtons = new DevComponents.DotNetBar.PanelEx(); this.btnClearSearchResults = new DevComponents.DotNetBar.ButtonX(); this.btnCopySearchResults = new DevComponents.DotNetBar.ButtonX(); @@ -137,21 +147,24 @@ namespace Volian.Controls.Library this.xpStepTypes = new DevComponents.DotNetBar.ExpandablePanel(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip(); + this.checkedListBox1 = new System.Windows.Forms.CheckedListBox(); ((System.ComponentModel.ISupportInitialize)(this.tabSearchTypes)).BeginInit(); this.tabSearchTypes.SuspendLayout(); + this.tabControlPanel1.SuspendLayout(); + this.groupBox1.SuspendLayout(); this.tabControlPanel4.SuspendLayout(); this.gpSrchText.SuspendLayout(); this.panel1.SuspendLayout(); this.panel3.SuspendLayout(); - this.tabControlPanel2.SuspendLayout(); - this.gpFindROs.SuspendLayout(); - this.tabControlPanel3.SuspendLayout(); - this.gpSrchAnnoText.SuspendLayout(); - this.panel4.SuspendLayout(); this.tabControlPanel5.SuspendLayout(); this.pnlTranCategory.SuspendLayout(); this.pnlTranFormat.SuspendLayout(); this.pnlTranVersion.SuspendLayout(); + this.tabControlPanel3.SuspendLayout(); + this.gpSrchAnnoText.SuspendLayout(); + this.panel4.SuspendLayout(); + this.tabControlPanel2.SuspendLayout(); + this.gpFindROs.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.advTreeProcSets)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.advTreeStepTypes)).BeginInit(); @@ -166,10 +179,11 @@ namespace Volian.Controls.Library this.tabSearchTypes.CanReorderTabs = false; this.tabSearchTypes.CloseButtonOnTabsAlwaysDisplayed = false; this.tabSearchTypes.CloseButtonPosition = DevComponents.DotNetBar.eTabCloseButtonPosition.Right; + this.tabSearchTypes.Controls.Add(this.tabControlPanel1); this.tabSearchTypes.Controls.Add(this.tabControlPanel4); - this.tabSearchTypes.Controls.Add(this.tabControlPanel2); - this.tabSearchTypes.Controls.Add(this.tabControlPanel3); this.tabSearchTypes.Controls.Add(this.tabControlPanel5); + this.tabSearchTypes.Controls.Add(this.tabControlPanel3); + this.tabSearchTypes.Controls.Add(this.tabControlPanel2); this.tabSearchTypes.Controls.Add(this.contextMenuBar1); this.tabSearchTypes.Dock = System.Windows.Forms.DockStyle.Top; this.tabSearchTypes.Location = new System.Drawing.Point(0, 0); @@ -179,7 +193,7 @@ namespace Volian.Controls.Library this.tabSearchTypes.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold); this.tabSearchTypes.SelectedTabIndex = 0; this.tabSearchTypes.ShowFocusRectangle = false; - this.tabSearchTypes.Size = new System.Drawing.Size(369, 138); + this.tabSearchTypes.Size = new System.Drawing.Size(369, 153); this.tabSearchTypes.Style = DevComponents.DotNetBar.eTabStripStyle.Office2007Document; this.tabSearchTypes.TabIndex = 0; this.tabSearchTypes.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -187,9 +201,130 @@ namespace Volian.Controls.Library this.tabSearchTypes.Tabs.Add(this.tabAnnotationSearch); this.tabSearchTypes.Tabs.Add(this.tabROSearch); this.tabSearchTypes.Tabs.Add(this.tabTranSearch); + this.tabSearchTypes.Tabs.Add(this.tabIncTrans); this.tabSearchTypes.Text = "tabControl1"; this.tabSearchTypes.ThemeAware = true; // + // tabControlPanel1 + // + this.tabControlPanel1.Controls.Add(this.btnTranCvtSelToTxt); + this.tabControlPanel1.Controls.Add(this.lblIncTran); + this.tabControlPanel1.Controls.Add(this.btnTranCvtAllToTxt); + this.tabControlPanel1.Controls.Add(this.lblSrchIncTran); + this.tabControlPanel1.Controls.Add(this.groupBox1); + this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty; + this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControlPanel1.Location = new System.Drawing.Point(0, 40); + this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(4); + this.tabControlPanel1.Name = "tabControlPanel1"; + this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); + this.tabControlPanel1.Size = new System.Drawing.Size(369, 113); + this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); + this.tabControlPanel1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); + this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tabControlPanel1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); + this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tabControlPanel1.Style.GradientAngle = 90; + this.tabControlPanel1.TabIndex = 17; + this.tabControlPanel1.TabItem = this.tabIncTrans; + // + // btnTranCvtSelToTxt + // + this.btnTranCvtSelToTxt.Enabled = false; + this.btnTranCvtSelToTxt.Location = new System.Drawing.Point(161, 78); + this.btnTranCvtSelToTxt.Margin = new System.Windows.Forms.Padding(4); + this.btnTranCvtSelToTxt.Name = "btnTranCvtSelToTxt"; + this.btnTranCvtSelToTxt.Size = new System.Drawing.Size(193, 27); + this.superTooltip1.SetSuperTooltip(this.btnTranCvtSelToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert Selected Incoming Transitions To Text", "", "Converts selected transitions in the results list to text unless the user does no" + + "t have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90))); + this.btnTranCvtSelToTxt.TabIndex = 3; + this.btnTranCvtSelToTxt.Text = "Convert Selected To Text"; + this.btnTranCvtSelToTxt.UseVisualStyleBackColor = true; + this.btnTranCvtSelToTxt.Click += new System.EventHandler(this.btnTranCvtSelToTxt_Click); + // + // lblIncTran + // + this.lblIncTran.AutoSize = true; + this.lblIncTran.Location = new System.Drawing.Point(5, 11); + this.lblIncTran.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblIncTran.Name = "lblIncTran"; + this.lblIncTran.Size = new System.Drawing.Size(28, 16); + this.lblIncTran.TabIndex = 2; + this.lblIncTran.Text = "To:"; + // + // btnTranCvtAllToTxt + // + this.btnTranCvtAllToTxt.Enabled = false; + this.btnTranCvtAllToTxt.Location = new System.Drawing.Point(8, 78); + this.btnTranCvtAllToTxt.Margin = new System.Windows.Forms.Padding(4); + this.btnTranCvtAllToTxt.Name = "btnTranCvtAllToTxt"; + this.btnTranCvtAllToTxt.Size = new System.Drawing.Size(145, 27); + this.superTooltip1.SetSuperTooltip(this.btnTranCvtAllToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert All Incoming Transitions To Text", "", "Converts all of the transitions in the results list to text unless the user does " + + "not have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90))); + this.btnTranCvtAllToTxt.TabIndex = 1; + this.btnTranCvtAllToTxt.Text = "Convert All To Text"; + this.btnTranCvtAllToTxt.UseVisualStyleBackColor = true; + this.btnTranCvtAllToTxt.Click += new System.EventHandler(this.btnTranCvtAllToTxt_Click); + // + // lblSrchIncTran + // + this.lblSrchIncTran.BackColor = System.Drawing.Color.Transparent; + this.lblSrchIncTran.Location = new System.Drawing.Point(45, 11); + this.lblSrchIncTran.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblSrchIncTran.Name = "lblSrchIncTran"; + this.lblSrchIncTran.Size = new System.Drawing.Size(319, 49); + this.superTooltip1.SetSuperTooltip(this.lblSrchIncTran, new DevComponents.DotNetBar.SuperTooltipInfo("Incoming Transitions", "", "This is the step, section, or procedure for which incoming transitions to it are " + + "shown in the list.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 80))); + this.lblSrchIncTran.TabIndex = 1; + // + // groupBox1 + // + this.groupBox1.BackColor = System.Drawing.Color.Transparent; + this.groupBox1.Controls.Add(this.rbFromEditor); + this.groupBox1.Controls.Add(this.rbFromTree); + this.groupBox1.Location = new System.Drawing.Point(196, 5); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Padding = new System.Windows.Forms.Padding(4); + this.groupBox1.Size = new System.Drawing.Size(173, 70); + this.groupBox1.TabIndex = 0; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Search Selection"; + this.groupBox1.Visible = false; + // + // rbFromEditor + // + this.rbFromEditor.AutoSize = true; + this.rbFromEditor.Location = new System.Drawing.Point(29, 42); + this.rbFromEditor.Margin = new System.Windows.Forms.Padding(4); + this.rbFromEditor.Name = "rbFromEditor"; + this.rbFromEditor.Size = new System.Drawing.Size(95, 20); + this.rbFromEditor.TabIndex = 1; + this.rbFromEditor.TabStop = true; + this.rbFromEditor.Text = "From Editor"; + this.rbFromEditor.UseVisualStyleBackColor = true; + // + // rbFromTree + // + this.rbFromTree.AutoSize = true; + this.rbFromTree.Location = new System.Drawing.Point(29, 20); + this.rbFromTree.Margin = new System.Windows.Forms.Padding(4); + this.rbFromTree.Name = "rbFromTree"; + this.rbFromTree.Size = new System.Drawing.Size(89, 20); + this.rbFromTree.TabIndex = 0; + this.rbFromTree.TabStop = true; + this.rbFromTree.Text = "From Tree"; + this.rbFromTree.UseVisualStyleBackColor = true; + // + // tabNISearch + // + this.tabIncTrans.AttachedControl = this.tabControlPanel1; + this.tabIncTrans.Name = "tabNISearch"; + this.superTooltip1.SetSuperTooltip(this.tabIncTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Incoming Transitions", "", "Allows you to search for Incoming transitions that point to the current item and " + + "convert the transition(s) to text if desired and if have permissions.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 120))); + this.tabIncTrans.Text = "Incoming\nTransitions"; + // // tabControlPanel4 // this.tabControlPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; @@ -198,11 +333,11 @@ namespace Volian.Controls.Library this.tabControlPanel4.Controls.Add(this.cbxSrchTypeUsage); this.tabControlPanel4.DisabledBackColor = System.Drawing.Color.Empty; this.tabControlPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel4.Location = new System.Drawing.Point(0, 24); + this.tabControlPanel4.Location = new System.Drawing.Point(0, 40); this.tabControlPanel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabControlPanel4.Name = "tabControlPanel4"; this.tabControlPanel4.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel4.Size = new System.Drawing.Size(369, 114); + this.tabControlPanel4.Size = new System.Drawing.Size(369, 113); this.tabControlPanel4.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tabControlPanel4.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tabControlPanel4.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -226,7 +361,7 @@ namespace Volian.Controls.Library this.gpSrchText.Location = new System.Drawing.Point(30, 1); this.gpSrchText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gpSrchText.Name = "gpSrchText"; - this.gpSrchText.Size = new System.Drawing.Size(338, 90); + this.gpSrchText.Size = new System.Drawing.Size(338, 89); // // // @@ -264,7 +399,7 @@ namespace Volian.Controls.Library this.panel1.Controls.Add(this.cbxTextSearchText); this.panel1.Controls.Add(this.label1); this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel1.Location = new System.Drawing.Point(0, 2); + this.panel1.Location = new System.Drawing.Point(0, 1); this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(332, 28); @@ -279,10 +414,10 @@ namespace Volian.Controls.Library this.cbxTextSearchText.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxTextSearchText.FormattingEnabled = true; this.cbxTextSearchText.ItemHeight = 16; - this.cbxTextSearchText.Location = new System.Drawing.Point(39, 0); + this.cbxTextSearchText.Location = new System.Drawing.Point(30, 0); this.cbxTextSearchText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxTextSearchText.Name = "cbxTextSearchText"; - this.cbxTextSearchText.Size = new System.Drawing.Size(293, 22); + this.cbxTextSearchText.Size = new System.Drawing.Size(302, 22); this.superTooltip1.SetSuperTooltip(this.cbxTextSearchText, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Text", "", resources.GetString("cbxTextSearchText.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cbxTextSearchText.TabIndex = 2; this.cbxTextSearchText.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -299,7 +434,7 @@ namespace Volian.Controls.Library this.label1.Location = new System.Drawing.Point(0, 0); this.label1.Name = "label1"; this.label1.Padding = new System.Windows.Forms.Padding(0, 6, 0, 0); - this.label1.Size = new System.Drawing.Size(39, 23); + this.label1.Size = new System.Drawing.Size(30, 19); this.superTooltip1.SetSuperTooltip(this.label1, new DevComponents.DotNetBar.SuperTooltipInfo("Search For Text", "", resources.GetString("label1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.label1.TabIndex = 4; this.label1.Text = "Find:"; @@ -312,7 +447,7 @@ namespace Volian.Controls.Library this.panel3.Controls.Add(this.cbxIncROTextSrch); this.panel3.Controls.Add(this.cbxCaseSensitive); this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel3.Location = new System.Drawing.Point(0, 30); + this.panel3.Location = new System.Drawing.Point(0, 29); this.panel3.Margin = new System.Windows.Forms.Padding(4); this.panel3.Name = "panel3"; this.panel3.Size = new System.Drawing.Size(332, 54); @@ -326,10 +461,10 @@ namespace Volian.Controls.Library // this.cbxByWord.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.cbxByWord.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxByWord.Location = new System.Drawing.Point(142, 7); + this.cbxByWord.Location = new System.Drawing.Point(141, 7); this.cbxByWord.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxByWord.Name = "cbxByWord"; - this.cbxByWord.Size = new System.Drawing.Size(74, 18); + this.cbxByWord.Size = new System.Drawing.Size(75, 18); this.superTooltip1.SetSuperTooltip(this.cbxByWord, new DevComponents.DotNetBar.SuperTooltipInfo("Case Sensitive", "", "When this box is checked, Search will find only exact matches of the search text " + "you had entered.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100))); this.cbxByWord.TabIndex = 7; @@ -400,7 +535,7 @@ namespace Volian.Controls.Library this.rbtnSrchTxt.Location = new System.Drawing.Point(1, 1); this.rbtnSrchTxt.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.rbtnSrchTxt.Name = "rbtnSrchTxt"; - this.rbtnSrchTxt.Size = new System.Drawing.Size(29, 90); + this.rbtnSrchTxt.Size = new System.Drawing.Size(29, 89); this.rbtnSrchTxt.TabIndex = 6; this.rbtnSrchTxt.CheckedChanged += new System.EventHandler(this.rbtnSrchTxt_CheckedChanged); // @@ -414,7 +549,7 @@ namespace Volian.Controls.Library this.cbxSrchTypeUsage.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.cbxSrchTypeUsage.Dock = System.Windows.Forms.DockStyle.Bottom; this.cbxSrchTypeUsage.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxSrchTypeUsage.Location = new System.Drawing.Point(1, 91); + this.cbxSrchTypeUsage.Location = new System.Drawing.Point(1, 90); this.cbxSrchTypeUsage.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxSrchTypeUsage.Name = "cbxSrchTypeUsage"; this.cbxSrchTypeUsage.Size = new System.Drawing.Size(367, 22); @@ -432,307 +567,6 @@ namespace Volian.Controls.Library this.tabStepTypeSearch.Text = "Text"; this.tabStepTypeSearch.Click += new System.EventHandler(this.tabStepTypeSearch_Click); // - // tabControlPanel2 - // - this.tabControlPanel2.Controls.Add(this.gpFindROs); - this.tabControlPanel2.Controls.Add(this.cmboTreeROs); - this.tabControlPanel2.DisabledBackColor = System.Drawing.Color.Empty; - this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel2.Location = new System.Drawing.Point(0, 24); - this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.tabControlPanel2.Name = "tabControlPanel2"; - this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel2.Size = new System.Drawing.Size(369, 114); - this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); - this.tabControlPanel2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); - this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tabControlPanel2.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); - this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tabControlPanel2.Style.GradientAngle = 90; - this.tabControlPanel2.TabIndex = 2; - this.tabControlPanel2.TabItem = this.tabROSearch; - // - // gpFindROs - // - this.gpFindROs.CanvasColor = System.Drawing.SystemColors.Control; - this.gpFindROs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.gpFindROs.Controls.Add(this.lblSrchRoMsg); - this.gpFindROs.Controls.Add(this.cbxFndUnLnkROVals); - this.gpFindROs.DisabledBackColor = System.Drawing.Color.Empty; - this.gpFindROs.Dock = System.Windows.Forms.DockStyle.Fill; - this.gpFindROs.Location = new System.Drawing.Point(1, 26); - this.gpFindROs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.gpFindROs.Name = "gpFindROs"; - this.gpFindROs.Size = new System.Drawing.Size(367, 87); - // - // - // - this.gpFindROs.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.gpFindROs.Style.BackColorGradientAngle = 90; - this.gpFindROs.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.gpFindROs.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpFindROs.Style.BorderBottomWidth = 1; - this.gpFindROs.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.gpFindROs.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpFindROs.Style.BorderLeftWidth = 1; - this.gpFindROs.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpFindROs.Style.BorderRightWidth = 1; - this.gpFindROs.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpFindROs.Style.BorderTopWidth = 1; - this.gpFindROs.Style.CornerDiameter = 4; - this.gpFindROs.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.gpFindROs.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.gpFindROs.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.gpFindROs.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.gpFindROs.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gpFindROs.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gpFindROs.TabIndex = 3; - this.gpFindROs.EnabledChanged += new System.EventHandler(this.gpFindROs_EnabledChanged); - // - // lblSrchRoMsg - // - this.lblSrchRoMsg.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.lblSrchRoMsg.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.lblSrchRoMsg.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblSrchRoMsg.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.lblSrchRoMsg.Location = new System.Drawing.Point(9, 28); - this.lblSrchRoMsg.Name = "lblSrchRoMsg"; - this.lblSrchRoMsg.Size = new System.Drawing.Size(349, 49); - this.lblSrchRoMsg.TabIndex = 3; - this.lblSrchRoMsg.Text = "This folder(s) ROs are incompatible with the currently selected folder(s). This " + - "may be due to the RO values needing to be updated."; - this.lblSrchRoMsg.Visible = false; - this.lblSrchRoMsg.WordWrap = true; - // - // cbxFndUnLnkROVals - // - this.cbxFndUnLnkROVals.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.cbxFndUnLnkROVals.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbxFndUnLnkROVals.Enabled = false; - this.cbxFndUnLnkROVals.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxFndUnLnkROVals.Location = new System.Drawing.Point(0, 4); - this.cbxFndUnLnkROVals.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.cbxFndUnLnkROVals.Name = "cbxFndUnLnkROVals"; - this.cbxFndUnLnkROVals.Size = new System.Drawing.Size(235, 23); - this.superTooltip1.SetSuperTooltip(this.cbxFndUnLnkROVals, new DevComponents.DotNetBar.SuperTooltipInfo("Find Linked Values", "", "Finding unlinked values does the search for a specific RO.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.cbxFndUnLnkROVals.TabIndex = 2; - this.cbxFndUnLnkROVals.Text = "Find Unlinked Values of Selected RO"; - // - // cmboTreeROs - // - this.cmboTreeROs.BackColor = System.Drawing.SystemColors.Window; - // - // - // - this.cmboTreeROs.BackgroundStyle.Class = "TextBoxBorder"; - this.cmboTreeROs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cmboTreeROs.ButtonDropDown.Visible = true; - this.cmboTreeROs.Dock = System.Windows.Forms.DockStyle.Top; - this.cmboTreeROs.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cmboTreeROs.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; - this.cmboTreeROs.Location = new System.Drawing.Point(1, 1); - this.cmboTreeROs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.cmboTreeROs.Name = "cmboTreeROs"; - this.cmboTreeROs.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cmboTreeROs.Size = new System.Drawing.Size(367, 25); - this.superTooltip1.SetSuperTooltip(this.cmboTreeROs, new DevComponents.DotNetBar.SuperTooltipInfo("Select the RO to Search", "", "Select the Referenced Object to search for.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.cmboTreeROs.TabIndex = 1; - this.cmboTreeROs.ThemeAware = true; - this.cmboTreeROs.WatermarkText = "Select an RO to seach"; - this.cmboTreeROs.SelectedIndexChanged += new System.EventHandler(this.cmboTreeROs_SelectedIndexChanged); - // - // tabROSearch - // - this.tabROSearch.AttachedControl = this.tabControlPanel2; - this.tabROSearch.Name = "tabROSearch"; - this.tabROSearch.Text = "Referenced Objects"; - // - // tabControlPanel3 - // - this.tabControlPanel3.Controls.Add(this.gpSrchAnnoText); - this.tabControlPanel3.Controls.Add(this.cbxAnnoTypes); - this.tabControlPanel3.DisabledBackColor = System.Drawing.Color.Empty; - this.tabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel3.Location = new System.Drawing.Point(0, 24); - this.tabControlPanel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.tabControlPanel3.Name = "tabControlPanel3"; - this.tabControlPanel3.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel3.Size = new System.Drawing.Size(369, 114); - this.tabControlPanel3.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); - this.tabControlPanel3.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); - this.tabControlPanel3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tabControlPanel3.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); - this.tabControlPanel3.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tabControlPanel3.Style.GradientAngle = 90; - this.tabControlPanel3.TabIndex = 5; - this.tabControlPanel3.TabItem = this.tabAnnotationSearch; - // - // gpSrchAnnoText - // - this.gpSrchAnnoText.AutoSize = true; - this.gpSrchAnnoText.CanvasColor = System.Drawing.SystemColors.Control; - this.gpSrchAnnoText.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.gpSrchAnnoText.Controls.Add(this.panel4); - this.gpSrchAnnoText.DisabledBackColor = System.Drawing.Color.Empty; - this.gpSrchAnnoText.Dock = System.Windows.Forms.DockStyle.Fill; - this.gpSrchAnnoText.Enabled = false; - this.gpSrchAnnoText.Location = new System.Drawing.Point(1, 23); - this.gpSrchAnnoText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.gpSrchAnnoText.Name = "gpSrchAnnoText"; - this.gpSrchAnnoText.Size = new System.Drawing.Size(367, 90); - // - // - // - this.gpSrchAnnoText.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.gpSrchAnnoText.Style.BackColorGradientAngle = 90; - this.gpSrchAnnoText.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.gpSrchAnnoText.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpSrchAnnoText.Style.BorderBottomWidth = 1; - this.gpSrchAnnoText.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.gpSrchAnnoText.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpSrchAnnoText.Style.BorderLeftWidth = 1; - this.gpSrchAnnoText.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpSrchAnnoText.Style.BorderRightWidth = 1; - this.gpSrchAnnoText.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpSrchAnnoText.Style.BorderTopWidth = 1; - this.gpSrchAnnoText.Style.CornerDiameter = 4; - this.gpSrchAnnoText.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.gpSrchAnnoText.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.gpSrchAnnoText.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.gpSrchAnnoText.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.gpSrchAnnoText.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gpSrchAnnoText.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gpSrchAnnoText.TabIndex = 6; - this.gpSrchAnnoText.EnabledChanged += new System.EventHandler(this.gpSrchAnnoText_EnabledChanged); - // - // panel4 - // - this.panel4.BackColor = System.Drawing.Color.Transparent; - this.panel4.Controls.Add(this.cbxBooleanAnoTxtSrch); - this.panel4.Controls.Add(this.cbxCaseSensitiveAnnoText); - this.panel4.Controls.Add(this.cbxTextSearchAnnotation); - this.panel4.Controls.Add(this.label2); - this.panel4.Dock = System.Windows.Forms.DockStyle.Top; - this.panel4.Location = new System.Drawing.Point(0, 0); - this.panel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(361, 76); - this.panel4.TabIndex = 9; - // - // cbxBooleanAnoTxtSrch - // - // - // - // - this.cbxBooleanAnoTxtSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbxBooleanAnoTxtSrch.Location = new System.Drawing.Point(16, 50); - this.cbxBooleanAnoTxtSrch.Margin = new System.Windows.Forms.Padding(4); - this.cbxBooleanAnoTxtSrch.Name = "cbxBooleanAnoTxtSrch"; - this.cbxBooleanAnoTxtSrch.Size = new System.Drawing.Size(148, 21); - this.cbxBooleanAnoTxtSrch.TabIndex = 8; - this.cbxBooleanAnoTxtSrch.Text = "Boolean Search"; - this.cbxBooleanAnoTxtSrch.Visible = false; - this.cbxBooleanAnoTxtSrch.CheckedChanged += new System.EventHandler(this.cbxBooleanAnoTxtSrch_CheckedChanged); - // - // cbxCaseSensitiveAnnoText - // - this.cbxCaseSensitiveAnnoText.AutoSize = true; - this.cbxCaseSensitiveAnnoText.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.cbxCaseSensitiveAnnoText.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbxCaseSensitiveAnnoText.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxCaseSensitiveAnnoText.Location = new System.Drawing.Point(16, 31); - this.cbxCaseSensitiveAnnoText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.cbxCaseSensitiveAnnoText.Name = "cbxCaseSensitiveAnnoText"; - this.cbxCaseSensitiveAnnoText.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cbxCaseSensitiveAnnoText.Size = new System.Drawing.Size(109, 17); - this.superTooltip1.SetSuperTooltip(this.cbxCaseSensitiveAnnoText, new DevComponents.DotNetBar.SuperTooltipInfo("Case Sensitive", "", "When this box is checked, Search will find only exact mactches of the search text" + - " you had entered.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100))); - this.cbxCaseSensitiveAnnoText.TabIndex = 5; - this.cbxCaseSensitiveAnnoText.Text = "Case Sensitive"; - // - // cbxTextSearchAnnotation - // - this.contextMenuBar1.SetContextMenuEx(this.cbxTextSearchAnnotation, this.btnCMIFindText); - this.cbxTextSearchAnnotation.DisplayMember = "Text"; - this.cbxTextSearchAnnotation.Dock = System.Windows.Forms.DockStyle.Fill; - this.cbxTextSearchAnnotation.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.cbxTextSearchAnnotation.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxTextSearchAnnotation.FormattingEnabled = true; - this.cbxTextSearchAnnotation.ItemHeight = 16; - this.cbxTextSearchAnnotation.Location = new System.Drawing.Point(39, 0); - this.cbxTextSearchAnnotation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.cbxTextSearchAnnotation.Name = "cbxTextSearchAnnotation"; - this.cbxTextSearchAnnotation.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cbxTextSearchAnnotation.Size = new System.Drawing.Size(322, 22); - this.superTooltip1.SetSuperTooltip(this.cbxTextSearchAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Search For Annotaion Text", "", "Enter Annotation text to search for or select from the dropdown list.\r\n\r\nLeave Bl" + - "ank to search for occurences of the selected annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 140))); - this.cbxTextSearchAnnotation.TabIndex = 6; - this.cbxTextSearchAnnotation.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxTextSearchAnnotation.WatermarkText = "Enter Search Text Here"; - this.cbxTextSearchAnnotation.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.ProcessEnterKey); - this.cbxTextSearchAnnotation.Leave += new System.EventHandler(this.cbxTextSearchAnnotation_Leave); - // - // label2 - // - this.label2.AutoSize = true; - this.label2.BackColor = System.Drawing.Color.Transparent; - this.label2.Dock = System.Windows.Forms.DockStyle.Left; - this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(0, 0); - this.label2.Name = "label2"; - this.label2.Padding = new System.Windows.Forms.Padding(0, 6, 0, 0); - this.label2.Size = new System.Drawing.Size(39, 23); - this.label2.TabIndex = 7; - this.label2.Text = "Find:"; - // - // cbxAnnoTypes - // - this.cbxAnnoTypes.DisplayMember = "Text"; - this.cbxAnnoTypes.Dock = System.Windows.Forms.DockStyle.Top; - this.cbxAnnoTypes.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.cbxAnnoTypes.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cbxAnnoTypes.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxAnnoTypes.FormattingEnabled = true; - this.cbxAnnoTypes.ItemHeight = 16; - this.cbxAnnoTypes.Location = new System.Drawing.Point(1, 1); - this.cbxAnnoTypes.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.cbxAnnoTypes.Name = "cbxAnnoTypes"; - this.cbxAnnoTypes.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cbxAnnoTypes.Size = new System.Drawing.Size(367, 22); - this.superTooltip1.SetSuperTooltip(this.cbxAnnoTypes, new DevComponents.DotNetBar.SuperTooltipInfo("Select Annotation Type", "", "Select the type of annotation to search for.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(192, 61))); - this.cbxAnnoTypes.TabIndex = 0; - this.cbxAnnoTypes.WatermarkText = "Select AnnotationType to Search"; - // - // tabAnnotationSearch - // - this.tabAnnotationSearch.AttachedControl = this.tabControlPanel3; - this.tabAnnotationSearch.Name = "tabAnnotationSearch"; - this.tabAnnotationSearch.Text = "Annotations"; - this.tabAnnotationSearch.Click += new System.EventHandler(this.tabAnnotationSearch_Click); - // // tabControlPanel5 // this.tabControlPanel5.Controls.Add(this.pnlTranCategory); @@ -740,11 +574,11 @@ namespace Volian.Controls.Library this.tabControlPanel5.Controls.Add(this.pnlTranVersion); this.tabControlPanel5.DisabledBackColor = System.Drawing.Color.Empty; this.tabControlPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel5.Location = new System.Drawing.Point(0, 24); + this.tabControlPanel5.Location = new System.Drawing.Point(0, 40); this.tabControlPanel5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabControlPanel5.Name = "tabControlPanel5"; this.tabControlPanel5.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel5.Size = new System.Drawing.Size(369, 114); + this.tabControlPanel5.Size = new System.Drawing.Size(369, 113); this.tabControlPanel5.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tabControlPanel5.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tabControlPanel5.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -858,8 +692,315 @@ namespace Volian.Controls.Library // this.tabTranSearch.AttachedControl = this.tabControlPanel5; this.tabTranSearch.Name = "tabTranSearch"; + this.superTooltip1.SetSuperTooltip(this.tabTranSearch, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Transition From", "", "Allows you to search for transitions of the selected type that point from selecte" + + "d procedure set(s).", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 110))); this.tabTranSearch.Text = "Transitions"; // + // tabControlPanel3 + // + this.tabControlPanel3.Controls.Add(this.gpSrchAnnoText); + this.tabControlPanel3.Controls.Add(this.cbxAnnoTypes); + this.tabControlPanel3.DisabledBackColor = System.Drawing.Color.Empty; + this.tabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControlPanel3.Location = new System.Drawing.Point(0, 40); + this.tabControlPanel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tabControlPanel3.Name = "tabControlPanel3"; + this.tabControlPanel3.Padding = new System.Windows.Forms.Padding(1); + this.tabControlPanel3.Size = new System.Drawing.Size(369, 113); + this.tabControlPanel3.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); + this.tabControlPanel3.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); + this.tabControlPanel3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tabControlPanel3.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); + this.tabControlPanel3.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tabControlPanel3.Style.GradientAngle = 90; + this.tabControlPanel3.TabIndex = 5; + this.tabControlPanel3.TabItem = this.tabAnnotationSearch; + // + // gpSrchAnnoText + // + this.gpSrchAnnoText.AutoSize = true; + this.gpSrchAnnoText.CanvasColor = System.Drawing.SystemColors.Control; + this.gpSrchAnnoText.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpSrchAnnoText.Controls.Add(this.panel4); + this.gpSrchAnnoText.DisabledBackColor = System.Drawing.Color.Empty; + this.gpSrchAnnoText.Dock = System.Windows.Forms.DockStyle.Fill; + this.gpSrchAnnoText.Enabled = false; + this.gpSrchAnnoText.Location = new System.Drawing.Point(1, 23); + this.gpSrchAnnoText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.gpSrchAnnoText.Name = "gpSrchAnnoText"; + this.gpSrchAnnoText.Size = new System.Drawing.Size(367, 89); + // + // + // + this.gpSrchAnnoText.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.gpSrchAnnoText.Style.BackColorGradientAngle = 90; + this.gpSrchAnnoText.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.gpSrchAnnoText.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpSrchAnnoText.Style.BorderBottomWidth = 1; + this.gpSrchAnnoText.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.gpSrchAnnoText.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpSrchAnnoText.Style.BorderLeftWidth = 1; + this.gpSrchAnnoText.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpSrchAnnoText.Style.BorderRightWidth = 1; + this.gpSrchAnnoText.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpSrchAnnoText.Style.BorderTopWidth = 1; + this.gpSrchAnnoText.Style.CornerDiameter = 4; + this.gpSrchAnnoText.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.gpSrchAnnoText.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.gpSrchAnnoText.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.gpSrchAnnoText.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.gpSrchAnnoText.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gpSrchAnnoText.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gpSrchAnnoText.TabIndex = 6; + this.gpSrchAnnoText.EnabledChanged += new System.EventHandler(this.gpSrchAnnoText_EnabledChanged); + // + // panel4 + // + this.panel4.BackColor = System.Drawing.Color.Transparent; + this.panel4.Controls.Add(this.cbxBooleanAnoTxtSrch); + this.panel4.Controls.Add(this.cbxCaseSensitiveAnnoText); + this.panel4.Controls.Add(this.cbxTextSearchAnnotation); + this.panel4.Controls.Add(this.label2); + this.panel4.Dock = System.Windows.Forms.DockStyle.Top; + this.panel4.Location = new System.Drawing.Point(0, 0); + this.panel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(361, 76); + this.panel4.TabIndex = 9; + // + // cbxBooleanAnoTxtSrch + // + // + // + // + this.cbxBooleanAnoTxtSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbxBooleanAnoTxtSrch.Location = new System.Drawing.Point(16, 50); + this.cbxBooleanAnoTxtSrch.Margin = new System.Windows.Forms.Padding(4); + this.cbxBooleanAnoTxtSrch.Name = "cbxBooleanAnoTxtSrch"; + this.cbxBooleanAnoTxtSrch.Size = new System.Drawing.Size(148, 21); + this.cbxBooleanAnoTxtSrch.TabIndex = 8; + this.cbxBooleanAnoTxtSrch.Text = "Boolean Search"; + this.cbxBooleanAnoTxtSrch.Visible = false; + this.cbxBooleanAnoTxtSrch.CheckedChanged += new System.EventHandler(this.cbxBooleanAnoTxtSrch_CheckedChanged); + // + // cbxCaseSensitiveAnnoText + // + this.cbxCaseSensitiveAnnoText.AutoSize = true; + this.cbxCaseSensitiveAnnoText.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbxCaseSensitiveAnnoText.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbxCaseSensitiveAnnoText.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxCaseSensitiveAnnoText.Location = new System.Drawing.Point(16, 31); + this.cbxCaseSensitiveAnnoText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxCaseSensitiveAnnoText.Name = "cbxCaseSensitiveAnnoText"; + this.cbxCaseSensitiveAnnoText.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.cbxCaseSensitiveAnnoText.Size = new System.Drawing.Size(98, 18); + this.superTooltip1.SetSuperTooltip(this.cbxCaseSensitiveAnnoText, new DevComponents.DotNetBar.SuperTooltipInfo("Case Sensitive", "", "When this box is checked, Search will find only exact mactches of the search text" + + " you had entered.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100))); + this.cbxCaseSensitiveAnnoText.TabIndex = 5; + this.cbxCaseSensitiveAnnoText.Text = "Case Sensitive"; + // + // cbxTextSearchAnnotation + // + this.contextMenuBar1.SetContextMenuEx(this.cbxTextSearchAnnotation, this.btnCMIFindText); + this.cbxTextSearchAnnotation.DisplayMember = "Text"; + this.cbxTextSearchAnnotation.Dock = System.Windows.Forms.DockStyle.Fill; + this.cbxTextSearchAnnotation.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbxTextSearchAnnotation.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxTextSearchAnnotation.FormattingEnabled = true; + this.cbxTextSearchAnnotation.ItemHeight = 16; + this.cbxTextSearchAnnotation.Location = new System.Drawing.Point(30, 0); + this.cbxTextSearchAnnotation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxTextSearchAnnotation.Name = "cbxTextSearchAnnotation"; + this.cbxTextSearchAnnotation.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.cbxTextSearchAnnotation.Size = new System.Drawing.Size(331, 22); + this.superTooltip1.SetSuperTooltip(this.cbxTextSearchAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Search For Annotaion Text", "", "Enter Annotation text to search for or select from the dropdown list.\r\n\r\nLeave Bl" + + "ank to search for occurences of the selected annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 140))); + this.cbxTextSearchAnnotation.TabIndex = 6; + this.cbxTextSearchAnnotation.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxTextSearchAnnotation.WatermarkText = "Enter Search Text Here"; + this.cbxTextSearchAnnotation.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.ProcessEnterKey); + this.cbxTextSearchAnnotation.Leave += new System.EventHandler(this.cbxTextSearchAnnotation_Leave); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Dock = System.Windows.Forms.DockStyle.Left; + this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(0, 0); + this.label2.Name = "label2"; + this.label2.Padding = new System.Windows.Forms.Padding(0, 6, 0, 0); + this.label2.Size = new System.Drawing.Size(30, 19); + this.label2.TabIndex = 7; + this.label2.Text = "Find:"; + // + // cbxAnnoTypes + // + this.cbxAnnoTypes.DisplayMember = "Text"; + this.cbxAnnoTypes.Dock = System.Windows.Forms.DockStyle.Top; + this.cbxAnnoTypes.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbxAnnoTypes.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbxAnnoTypes.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxAnnoTypes.FormattingEnabled = true; + this.cbxAnnoTypes.ItemHeight = 16; + this.cbxAnnoTypes.Location = new System.Drawing.Point(1, 1); + this.cbxAnnoTypes.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxAnnoTypes.Name = "cbxAnnoTypes"; + this.cbxAnnoTypes.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.cbxAnnoTypes.Size = new System.Drawing.Size(367, 22); + this.superTooltip1.SetSuperTooltip(this.cbxAnnoTypes, new DevComponents.DotNetBar.SuperTooltipInfo("Select Annotation Type", "", "Select the type of annotation to search for.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(192, 61))); + this.cbxAnnoTypes.TabIndex = 0; + this.cbxAnnoTypes.WatermarkText = "Select AnnotationType to Search"; + // + // tabAnnotationSearch + // + this.tabAnnotationSearch.AttachedControl = this.tabControlPanel3; + this.tabAnnotationSearch.Name = "tabAnnotationSearch"; + this.superTooltip1.SetSuperTooltip(this.tabAnnotationSearch, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Annotations", "", "Allows you to search for types and text for annotations in the selected procedure" + + " set(s).", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 110))); + this.tabAnnotationSearch.Text = "Annotations"; + this.tabAnnotationSearch.Click += new System.EventHandler(this.tabAnnotationSearch_Click); + // + // tabControlPanel2 + // + this.tabControlPanel2.Controls.Add(this.gpFindROs); + this.tabControlPanel2.Controls.Add(this.cmboTreeROs); + this.tabControlPanel2.DisabledBackColor = System.Drawing.Color.Empty; + this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControlPanel2.Location = new System.Drawing.Point(0, 40); + this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tabControlPanel2.Name = "tabControlPanel2"; + this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1); + this.tabControlPanel2.Size = new System.Drawing.Size(369, 113); + this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); + this.tabControlPanel2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); + this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tabControlPanel2.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); + this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tabControlPanel2.Style.GradientAngle = 90; + this.tabControlPanel2.TabIndex = 2; + this.tabControlPanel2.TabItem = this.tabROSearch; + // + // gpFindROs + // + this.gpFindROs.CanvasColor = System.Drawing.SystemColors.Control; + this.gpFindROs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpFindROs.Controls.Add(this.lblSrchRoMsg); + this.gpFindROs.Controls.Add(this.cbxFndUnLnkROVals); + this.gpFindROs.DisabledBackColor = System.Drawing.Color.Empty; + this.gpFindROs.Dock = System.Windows.Forms.DockStyle.Fill; + this.gpFindROs.Location = new System.Drawing.Point(1, 26); + this.gpFindROs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.gpFindROs.Name = "gpFindROs"; + this.gpFindROs.Size = new System.Drawing.Size(367, 86); + // + // + // + this.gpFindROs.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.gpFindROs.Style.BackColorGradientAngle = 90; + this.gpFindROs.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.gpFindROs.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpFindROs.Style.BorderBottomWidth = 1; + this.gpFindROs.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.gpFindROs.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpFindROs.Style.BorderLeftWidth = 1; + this.gpFindROs.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpFindROs.Style.BorderRightWidth = 1; + this.gpFindROs.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpFindROs.Style.BorderTopWidth = 1; + this.gpFindROs.Style.CornerDiameter = 4; + this.gpFindROs.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.gpFindROs.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.gpFindROs.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.gpFindROs.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.gpFindROs.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gpFindROs.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gpFindROs.TabIndex = 3; + this.gpFindROs.EnabledChanged += new System.EventHandler(this.gpFindROs_EnabledChanged); + // + // lblSrchRoMsg + // + this.lblSrchRoMsg.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.lblSrchRoMsg.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.lblSrchRoMsg.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblSrchRoMsg.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.lblSrchRoMsg.Location = new System.Drawing.Point(9, 28); + this.lblSrchRoMsg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.lblSrchRoMsg.Name = "lblSrchRoMsg"; + this.lblSrchRoMsg.Size = new System.Drawing.Size(349, 49); + this.lblSrchRoMsg.TabIndex = 3; + this.lblSrchRoMsg.Text = "This folder(s) ROs are incompatible with the currently selected folder(s). This " + + "may be due to the RO values needing to be updated."; + this.lblSrchRoMsg.Visible = false; + this.lblSrchRoMsg.WordWrap = true; + // + // cbxFndUnLnkROVals + // + this.cbxFndUnLnkROVals.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbxFndUnLnkROVals.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbxFndUnLnkROVals.Enabled = false; + this.cbxFndUnLnkROVals.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxFndUnLnkROVals.Location = new System.Drawing.Point(0, 4); + this.cbxFndUnLnkROVals.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxFndUnLnkROVals.Name = "cbxFndUnLnkROVals"; + this.cbxFndUnLnkROVals.Size = new System.Drawing.Size(235, 23); + this.superTooltip1.SetSuperTooltip(this.cbxFndUnLnkROVals, new DevComponents.DotNetBar.SuperTooltipInfo("Find Linked Values", "", "Finding unlinked values does the search for a specific RO.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.cbxFndUnLnkROVals.TabIndex = 2; + this.cbxFndUnLnkROVals.Text = "Find Unlinked Values of Selected RO"; + // + // cmboTreeROs + // + this.cmboTreeROs.BackColor = System.Drawing.SystemColors.Window; + // + // + // + this.cmboTreeROs.BackgroundStyle.Class = "TextBoxBorder"; + this.cmboTreeROs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cmboTreeROs.ButtonDropDown.Visible = true; + this.cmboTreeROs.Dock = System.Windows.Forms.DockStyle.Top; + this.cmboTreeROs.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cmboTreeROs.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; + this.cmboTreeROs.Location = new System.Drawing.Point(1, 1); + this.cmboTreeROs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cmboTreeROs.Name = "cmboTreeROs"; + this.cmboTreeROs.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.cmboTreeROs.Size = new System.Drawing.Size(367, 25); + this.superTooltip1.SetSuperTooltip(this.cmboTreeROs, new DevComponents.DotNetBar.SuperTooltipInfo("Select the RO to Search", "", "Select the Referenced Object to search for.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.cmboTreeROs.TabIndex = 1; + this.cmboTreeROs.ThemeAware = true; + this.cmboTreeROs.WatermarkText = "Select an RO to seach"; + this.cmboTreeROs.SelectedIndexChanged += new System.EventHandler(this.cmboTreeROs_SelectedIndexChanged); + // + // tabROSearch + // + this.tabROSearch.AttachedControl = this.tabControlPanel2; + this.tabROSearch.Name = "tabROSearch"; + this.superTooltip1.SetSuperTooltip(this.tabROSearch, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Referenced Objects", "", "Allows you to search for referenced objects used in selected procedure set(s).", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 110))); + this.tabROSearch.Text = "Reference\nObjects"; + // // contextMenuBar1 // this.contextMenuBar1.DockSide = DevComponents.DotNetBar.eDockSide.Top; @@ -1122,12 +1263,13 @@ namespace Volian.Controls.Library this.grpPanSearchResults.CanvasColor = System.Drawing.SystemColors.Control; this.grpPanSearchResults.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.grpPanSearchResults.Controls.Add(this.lbSrchResults); + this.grpPanSearchResults.Controls.Add(this.lbSrchResultsIncTrans); this.grpPanSearchResults.DisabledBackColor = System.Drawing.Color.Empty; this.grpPanSearchResults.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpPanSearchResults.Location = new System.Drawing.Point(0, 549); + this.grpPanSearchResults.Location = new System.Drawing.Point(0, 564); this.grpPanSearchResults.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.grpPanSearchResults.Name = "grpPanSearchResults"; - this.grpPanSearchResults.Size = new System.Drawing.Size(369, 283); + this.grpPanSearchResults.Size = new System.Drawing.Size(369, 268); // // // @@ -1162,18 +1304,38 @@ namespace Volian.Controls.Library // lbSrchResults // this.lbSrchResults.Dock = System.Windows.Forms.DockStyle.Fill; - this.lbSrchResults.FormattingEnabled = true; - this.lbSrchResults.HorizontalScrollbar = true; this.lbSrchResults.ItemHeight = 16; this.lbSrchResults.Location = new System.Drawing.Point(0, 0); this.lbSrchResults.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lbSrchResults.Name = "lbSrchResults"; this.lbSrchResults.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.lbSrchResults.Size = new System.Drawing.Size(363, 260); + this.lbSrchResults.Size = new System.Drawing.Size(363, 245); this.lbSrchResults.TabIndex = 0; this.lbSrchResults.SelectedIndexChanged += new System.EventHandler(this.lbSrchResults_SelectedValueChanged); this.lbSrchResults.MouseMove += new System.Windows.Forms.MouseEventHandler(this.lbSrchResults_MouseMove); // + // lbSrchResultsIncTrans + // + // + // + // + this.lbSrchResultsIncTrans.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.lbSrchResultsIncTrans.CheckBoxesVisible = true; + this.lbSrchResultsIncTrans.CheckStateMember = null; + this.lbSrchResultsIncTrans.ContainerControlProcessDialogKey = true; + this.lbSrchResultsIncTrans.Dock = System.Windows.Forms.DockStyle.Fill; + //this.lbSrchResultsIncTrans.DragDropSupport = true; + this.lbSrchResultsIncTrans.ItemHeight = 16; + this.lbSrchResultsIncTrans.Location = new System.Drawing.Point(0, 0); + this.lbSrchResultsIncTrans.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.lbSrchResultsIncTrans.Name = "lbSrchResultsIncTrans"; + this.lbSrchResultsIncTrans.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.lbSrchResultsIncTrans.Size = new System.Drawing.Size(363, 200); + this.lbSrchResultsIncTrans.TabIndex = 0; + this.lbSrchResultsIncTrans.SelectedIndexChanged += new System.EventHandler(this.lbSrchResults_SelectedValueChanged); + this.lbSrchResultsIncTrans.ItemClick += new System.EventHandler(this.lbSrchResultsIncTrans_ItemClicked); + this.lbSrchResultsIncTrans.MouseMove += new System.Windows.Forms.MouseEventHandler(this.lbSrchResults_MouseMove); + // // panSearchButtons // this.panSearchButtons.CanvasColor = System.Drawing.SystemColors.Control; @@ -1188,7 +1350,7 @@ namespace Volian.Controls.Library this.panSearchButtons.Controls.Add(this.btnPrnSrchRslts); this.panSearchButtons.DisabledBackColor = System.Drawing.Color.Empty; this.panSearchButtons.Dock = System.Windows.Forms.DockStyle.Top; - this.panSearchButtons.Location = new System.Drawing.Point(0, 476); + this.panSearchButtons.Location = new System.Drawing.Point(0, 491); this.panSearchButtons.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panSearchButtons.Name = "panSearchButtons"; this.panSearchButtons.Size = new System.Drawing.Size(369, 73); @@ -1286,7 +1448,7 @@ namespace Volian.Controls.Library this.labelX1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.labelX1.Name = "labelX1"; this.labelX1.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.labelX1.Size = new System.Drawing.Size(82, 17); + this.labelX1.Size = new System.Drawing.Size(66, 14); this.superTooltip1.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("Results Style", "", "The Search Results list can be formatted in one of four styles: Document Path, St" + "ep Path, Annotation Text and Document Text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.labelX1.TabIndex = 9; @@ -1343,7 +1505,7 @@ namespace Volian.Controls.Library this.cbSorted.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbSorted.Name = "cbSorted"; this.cbSorted.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cbSorted.Size = new System.Drawing.Size(46, 17); + this.cbSorted.Size = new System.Drawing.Size(48, 18); this.superTooltip1.SetSuperTooltip(this.cbSorted, new DevComponents.DotNetBar.SuperTooltipInfo("Sort Results", "", "Sorts results that are output into the Search Results list shown below.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cbSorted.TabIndex = 7; this.cbSorted.Text = "Sort"; @@ -1404,7 +1566,7 @@ namespace Volian.Controls.Library this.xpSetToSearch.DisabledBackColor = System.Drawing.Color.Empty; this.xpSetToSearch.Dock = System.Windows.Forms.DockStyle.Top; this.xpSetToSearch.ExpandOnTitleClick = true; - this.xpSetToSearch.Location = new System.Drawing.Point(0, 138); + this.xpSetToSearch.Location = new System.Drawing.Point(0, 153); this.xpSetToSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.xpSetToSearch.Name = "xpSetToSearch"; this.xpSetToSearch.RightToLeft = System.Windows.Forms.RightToLeft.No; @@ -1438,7 +1600,7 @@ namespace Volian.Controls.Library this.xpStepTypes.DisabledBackColor = System.Drawing.Color.Empty; this.xpStepTypes.Dock = System.Windows.Forms.DockStyle.Top; this.xpStepTypes.ExpandOnTitleClick = true; - this.xpStepTypes.Location = new System.Drawing.Point(0, 296); + this.xpStepTypes.Location = new System.Drawing.Point(0, 311); this.xpStepTypes.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.xpStepTypes.Name = "xpStepTypes"; this.xpStepTypes.RightToLeft = System.Windows.Forms.RightToLeft.No; @@ -1470,6 +1632,14 @@ namespace Volian.Controls.Library this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; // + // checkedListBox1 + // + this.checkedListBox1.FormattingEnabled = true; + this.checkedListBox1.Location = new System.Drawing.Point(110, 46); + this.checkedListBox1.Name = "checkedListBox1"; + this.checkedListBox1.Size = new System.Drawing.Size(120, 89); + this.checkedListBox1.TabIndex = 1; + // // DisplaySearch // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); @@ -1485,22 +1655,26 @@ namespace Volian.Controls.Library this.Size = new System.Drawing.Size(369, 832); ((System.ComponentModel.ISupportInitialize)(this.tabSearchTypes)).EndInit(); this.tabSearchTypes.ResumeLayout(false); + this.tabControlPanel1.ResumeLayout(false); + this.tabControlPanel1.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.tabControlPanel4.ResumeLayout(false); this.gpSrchText.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); this.panel3.ResumeLayout(false); - this.tabControlPanel2.ResumeLayout(false); - this.gpFindROs.ResumeLayout(false); + this.tabControlPanel5.ResumeLayout(false); + this.pnlTranCategory.ResumeLayout(false); + this.pnlTranFormat.ResumeLayout(false); + this.pnlTranVersion.ResumeLayout(false); this.tabControlPanel3.ResumeLayout(false); this.tabControlPanel3.PerformLayout(); this.gpSrchAnnoText.ResumeLayout(false); this.panel4.ResumeLayout(false); this.panel4.PerformLayout(); - this.tabControlPanel5.ResumeLayout(false); - this.pnlTranCategory.ResumeLayout(false); - this.pnlTranFormat.ResumeLayout(false); - this.pnlTranVersion.ResumeLayout(false); + this.tabControlPanel2.ResumeLayout(false); + this.gpFindROs.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.advTreeProcSets)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.advTreeStepTypes)).EndInit(); @@ -1539,8 +1713,9 @@ namespace Volian.Controls.Library private DevComponents.DotNetBar.ExpandablePanel xpSetToSearch; private DevComponents.DotNetBar.ExpandablePanel xpStepTypes; private System.Windows.Forms.ToolTip toolTip1; - private System.Windows.Forms.ListBox lbSrchResults; - private DevComponents.DotNetBar.SuperTooltip superTooltip1; + private System.Windows.Forms.ListBox lbSrchResults; + private DevComponents.DotNetBar.ListBoxAdv lbSrchResultsIncTrans; + private DevComponents.DotNetBar.SuperTooltip superTooltip1; private DevComponents.DotNetBar.Controls.CheckBoxX cbxCaseSensitive; private DevComponents.DotNetBar.Controls.CheckBoxX cbSorted; private DevComponents.DotNetBar.LabelX labelX1; @@ -1604,6 +1779,17 @@ namespace Volian.Controls.Library private DevComponents.DotNetBar.Controls.ComboBoxEx cbxTranCategory; private DevComponents.DotNetBar.LabelX lblSrchRoMsg; private DevComponents.DotNetBar.Controls.CheckBoxX cbxByWord; - //end transition search controls - } + private DevComponents.DotNetBar.TabControlPanel tabControlPanel1; + //private DevComponents.DotNetBar.TabItem tabIncTrans; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.RadioButton rbFromEditor; + private System.Windows.Forms.RadioButton rbFromTree; + private System.Windows.Forms.Button btnTranCvtAllToTxt; + private System.Windows.Forms.Label lblSrchIncTran; + private System.Windows.Forms.Label lblIncTran; + private System.Windows.Forms.CheckedListBox checkedListBox1; + private System.Windows.Forms.Button btnTranCvtSelToTxt; + private DevComponents.DotNetBar.TabItem tabIncTrans; + //end transition search controls + } } diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 8dc60eac..f5d8d6d9 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -31,6 +31,28 @@ namespace Volian.Controls.Library } #endregion #region Properties + // C2020-033: SearchIncTransII represents the item that the transitions go to. It can be either the item the user + // tried to delete or that the user selected to get Incoming Transitions from tree view or ribbon. + private ItemInfo _SearchIncTransII = null; + public ItemInfo SearchIncTransII + { + get + { + return _SearchIncTransII; + } + set + { + _SearchIncTransII = value; + if (_SearchIncTransII != null) lblSrchIncTran.Text = _SearchIncTransII.Path; + else lblSrchIncTran.Text = ""; + } + } + private static UserInfo _MyUserInfo = null; + public static UserInfo MyUserInfo + { + get { return _MyUserInfo; } + set { _MyUserInfo = value; } + } private string _strSrchText = ""; private List lstCheckedDocVersions = new List(); private List lstCheckedStepTypes = new List(); @@ -61,6 +83,7 @@ namespace Volian.Controls.Library void _SearchResults_ListChanged(object sender, ListChangedEventArgs e) { lbSrchResults.SelectedIndex = -1; // Don't select an item from the new list + lbSrchResultsIncTrans.SelectedIndex = -1; } private string _DisplayMember = "SearchPath"; @@ -167,7 +190,20 @@ namespace Volian.Controls.Library if(wordSectionTreeNode != null) //B2020-070 NULL reference check wordSectionTreeNode.Enabled = true; btnSearch.Enabled = true; - if (e.NewTab == tabROSearch) + xpSetToSearch.Enabled = true; + xpStepTypes.Enabled = true; + lbSrchResults.Visible = true; + lbSrchResultsIncTrans.Visible = false; + if (e.NewTab == tabIncTrans) // C2020-033: Incoming transitions + { + xpSetToSearch.Enabled = false; + xpStepTypes.Enabled = false; + lbSrchResults.Visible = false; + lbSrchResultsIncTrans.Visible = true; + lbSrchResultsIncTrans.CheckBoxesVisible = true; + lbSrchResultsIncTrans.AutoScroll = true; + } + else if (e.NewTab == tabROSearch) { LoadROComboTree(); } @@ -175,7 +211,7 @@ namespace Volian.Controls.Library { if (wordSectionTreeNode != null) //B2020-070 NULL reference check { - wordSectionTreeNode.Enabled = false; // C2020-010: Disable Word Section choice for Transition search + wordSectionTreeNode.Enabled = false; // C2020-010: Disable Word Section choice for Transition search wordSectionTreeNode.Checked = false; } btnSearch.Enabled = (cbxTranCategory.Items.Count > 0); // B2017-038 disable search button if no format selected @@ -187,7 +223,7 @@ namespace Volian.Controls.Library foreach (DevComponents.AdvTree.Node n in dicExpandedFolderNodes.Keys) { DocVersionInfo dvi = (DocVersionInfo)n.Tag; - if(cbxTranVersion.Tag.ToString().Contains(dvi.VersionID.ToString())) + if (cbxTranVersion.Tag.ToString().Contains(dvi.VersionID.ToString())) n.Enabled = true; else n.Enabled = false; @@ -1036,18 +1072,27 @@ namespace Volian.Controls.Library private void DisplayResults() { _LoadingList = true; - lbSrchResults.DisplayMember = _DisplayMember; + // C2020-033: Incoming Transition tab. Note that this tab uses a different control for the search + // results, it uses the dotnetbar list that has check boxes. Because of this, various places throughout + // the code will check for what tab is displayed and will work eith the associated list box, either + // lbSrchResults or lbSrchResultsIncTrans + if (tabSearchTypes.SelectedTab != tabSearchTypes.Tabs[4]) lbSrchResults.DisplayMember = _DisplayMember; + else lbSrchResultsIncTrans.DisplayMember = _DisplayMember; if (_SearchResults != null) { if (cbSorted.Checked) { Csla.SortedBindingList sortedResults = new Csla.SortedBindingList(_SearchResults); sortedResults.ApplySort(_DisplayMember, ListSortDirection.Ascending); - lbSrchResults.DataSource = sortedResults; + if (tabSearchTypes.SelectedTab != tabSearchTypes.Tabs[4]) lbSrchResults.DataSource = sortedResults; + else lbSrchResultsIncTrans.DataSource = sortedResults; } else + { //PopulatelbSrcResults(_SearchResults); - lbSrchResults.DataSource = _SearchResults; + if (tabSearchTypes.SelectedTab != tabSearchTypes.Tabs[4]) lbSrchResults.DataSource = _SearchResults; + else lbSrchResultsIncTrans.DataSource = _SearchResults; + } grpPanSearchResults.Text = string.Format("Search Results Found: {0}", _SearchResults.Count); grpPanSearchResults.Style.BackColor = Color.LightGreen;// Color.YellowGreen; Color.DarkSeaGreen; } @@ -1057,7 +1102,7 @@ namespace Volian.Controls.Library grpPanSearchResults.Style.BackColor = saveGrpPanSearchResults; } // Turn Print and Results display style on/off based on whether there are search results - if (lbSrchResults.Items.Count > 0) + if (_SearchResults != null && _SearchResults.Count > 0) { btnPrnSrchRslts.Enabled = true; btnClearSearchResults.Enabled = true; @@ -1075,6 +1120,7 @@ namespace Volian.Controls.Library } lbSrchResults.SelectedIndex = -1; + lbSrchResultsIncTrans.SelectedIndex = -1; LastResultsMouseOverIndex = -1; _LoadingList = false; @@ -1125,24 +1171,56 @@ namespace Volian.Controls.Library LastResultsMouseOverIndex = ResultsMouseOverIndex; } } + // C2020-033: lbSrchResultsIncTrans_ItemClicked is used to check permissions of a selection before allowing an + // item to be clicked and to turn on/off the btnTranCvtSelToTxt button for converting selected to test. + // Two variables are used to keep track if items are checked in the list box: + // JustDidSelection - selecting an item event goes into both SelectedValueChanged & ItemClicked + // but need to keep track of itemclicked which is event for checking/unchecking of Incoming Transition + // items in lbSrchResultsIncTrans + // IncTransSelectedCount is used to keep track if any items are checked + private int IncTransSelectedCount = 0; + bool JustDidSelection = false; + private void lbSrchResultsIncTrans_ItemClicked(object sender, EventArgs e) + { + ListBoxItem lbi = sender as ListBoxItem; + ItemBindingData ibd = lbi.Tag as ItemBindingData; + ItemInfo ii = ibd.DataItem as ItemInfo; + bool allowNonAdmin = IncTranCvtPerm(); + if (lbi.CheckState == CheckState.Checked && ii != null) + { + if (!allowNonAdmin && !UserInfo.CanEdit(MyUserInfo, ii.MyDocVersion)) + { + FlexibleMessageBox.Show("You do not have permission to edit the procedure, section, or step.", + "Convert Transition to Text", MessageBoxButtons.OK, MessageBoxIcon.Information); + lbi.CheckState = CheckState.Unchecked; + } + else + if (!JustDidSelection) IncTransSelectedCount++; + } + else + if (!JustDidSelection && IncTransSelectedCount > 0) IncTransSelectedCount--; // user unchecked an item + if (!JustDidSelection) btnTranCvtSelToTxt.Enabled = IncTransSelectedCount > 0; + JustDidSelection = false; + } private bool _ProcessingSelectedValueChanged = false; private void lbSrchResults_SelectedValueChanged(object sender, EventArgs e) { if (_LoadingList) return; if (_ProcessingSelectedValueChanged) return; _ProcessingSelectedValueChanged = true; + JustDidSelection = true; // If the list is being refreshed, then set the selection index to -1 (no selection) if (_SearchResults.RefreshingList && lbSrchResults.SelectedIndex != -1) - lbSrchResults.SelectedIndex = -1; + lbSrchResultsIncTrans.SelectedIndex = lbSrchResults.SelectedIndex = -1; else { - _ItemInfo = lbSrchResults.SelectedValue as ItemInfo; + _ItemInfo = (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[4])? lbSrchResultsIncTrans.SelectedValue as ItemInfo : lbSrchResults.SelectedValue as ItemInfo; if ((tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[1]) && (_ItemInfo != null)) { // B2020-019: Don't set the CurrentAnnotation to an annotation in a procedure that cannot be opened. AnnotationInfo tmpca = AnnotationInfo.Get(_ItemInfo.SearchAnnotationID); DisplayTabItem dti = null; - if (tmpca != null) dti = _TabControl.OpenItem(tmpca.MyItem); // open the corresponding procedure text + if (tmpca != null) dti = _TabControl.OpenItem(tmpca.MyItem); // open the corresponding procedure text if (dti != null) { _AnnotationDetails.CurrentAnnotation = tmpca; @@ -1359,6 +1437,7 @@ namespace Volian.Controls.Library private void btnSearch_Click(object sender, EventArgs e) { + IncTransSelectedCount = 0; _fromLoad = false; DateTime start = DateTime.Now; Cursor savcursor = Cursor; @@ -1368,9 +1447,18 @@ namespace Volian.Controls.Library try { LastSearchWasAnnotations = false; // B2019-119 only refresh annotation search results if an annotation search was done - lbSrchResults.DataSource = null; - lbSrchResults.Items.Clear(); - toolTip1.SetToolTip(lbSrchResults, null); + if (tabSearchTypes.SelectedTab != tabSearchTypes.Tabs[4]) + { + lbSrchResults.DataSource = null; + lbSrchResults.Items.Clear(); + toolTip1.SetToolTip(lbSrchResults, null); + } + else // C2020-033: Incoming Transiiotns + { + lbSrchResultsIncTrans.DataSource = null; + lbSrchResultsIncTrans.Items.Clear(); + toolTip1.SetToolTip(lbSrchResultsIncTrans, null); + } Cursor = Cursors.WaitCursor; SearchResults = null; bool includeRTFformat = false; @@ -1407,7 +1495,7 @@ namespace Volian.Controls.Library ReportTitle = "Step Element Report"; //"Proms - Search by Type: " + typstr; TypesSelected = "Filtered By: " + typstr; SearchString = null; - SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, "", cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, ItemSearchIncludeLinks.Value, includeRTFformat, includeSpecialChars, unitPrefix,"",""); + SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, "", cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, ItemSearchIncludeLinks.Value, includeRTFformat, includeSpecialChars, unitPrefix, "", ""); cmbResultsStyleIndex = 1; //display step locations in results } } @@ -1433,19 +1521,19 @@ namespace Volian.Controls.Library // does not allow the preceding/following text to have a number, '.', letter or other rtf // commands. If the search string starts/ends with a letter, then use an expression that does not // find the preceding/following text that is text, i.e. a letter. - if (Regex.IsMatch(TextSearchString, @"^[\d\.]")) // starts with a number or '.' decimal pt + if (Regex.IsMatch(TextSearchString, @"^[\d\.]")) // starts with a number or '.' decimal pt { byWordPrefix = @"[^0-9a-zA-Z.vbpi:\\-]"; } - else if (Regex.IsMatch(TextSearchString, @"^[a-zA-Z]")) // starts with a letter + else if (Regex.IsMatch(TextSearchString, @"^[a-zA-Z]")) // starts with a letter { byWordPrefix = @"[^a-zA-Z]"; } - if (Regex.IsMatch(TextSearchString, @"[\d\.]$")) // ends with a number or decimal + if (Regex.IsMatch(TextSearchString, @"[\d\.]$")) // ends with a number or decimal { byWordSuffix = @"[^0-9a-zA-Z.vbpi:\\-]"; } - else if (Regex.IsMatch(TextSearchString, @"[a-zA-Z]$")) // ends with a letter + else if (Regex.IsMatch(TextSearchString, @"[a-zA-Z]$")) // ends with a letter { byWordSuffix = @"[^a-zA-Z]"; } @@ -1465,7 +1553,7 @@ namespace Volian.Controls.Library //ReportTitle = string.Format("Proms - Annotation Search for '{0}'", cbxTextSearchAnnotation.Text); if (cbxTextSearchAnnotation.Text == null || cbxTextSearchAnnotation.Text == "") { - ReportTitle = string.Format("Find {0}{1}", cbxAnnoTypes.Text, (cbxAnnoTypes.SelectedIndex > 0)?" Annotations" : "" ); + ReportTitle = string.Format("Find {0}{1}", cbxAnnoTypes.Text, (cbxAnnoTypes.SelectedIndex > 0) ? " Annotations" : ""); } else { @@ -1477,7 +1565,7 @@ namespace Volian.Controls.Library //SearchResults = ItemInfoList.GetListFromAnnotationSearch(dviSearchList, typeSearchList, textSearchString, srchStr, cbxCaseSensitiveAnnoText.Checked); - SearchResults = ItemInfoList.GetListFromAnnotationSearch(DVISearchList, TypeSearchList, AnnotationSearchType, cbxTextSearchAnnotation.Text, cbxCaseSensitiveAnnoText.Checked,unitPrefix); + SearchResults = ItemInfoList.GetListFromAnnotationSearch(DVISearchList, TypeSearchList, AnnotationSearchType, cbxTextSearchAnnotation.Text, cbxCaseSensitiveAnnoText.Checked, unitPrefix); //UpdateAnnotationSearchResults(); cmbResultsStyleIndex = 2; // display annotation text in results } @@ -1498,7 +1586,7 @@ namespace Volian.Controls.Library cmbResultsStyleIndex = 3; // display step text in results } } - else if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[3]) //Transition Search + else if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[3]) //Transition Search { ReportTitle = string.Format("Search For Transitions: Transition Type: {0}, Transition Category: {1}", cbxTranFormat.SelectedItem, cbxTranCategory.SelectedItem); string docVersionList = string.Empty; @@ -1520,6 +1608,44 @@ namespace Volian.Controls.Library SearchResults = ItemInfoList.GetListFromTransitionSearch(docVersionList, cbxTranFormat.SelectedIndex - 1, cbxTranCategory.SelectedItem.ToString() == "All" ? "" : cbxTranCategory.SelectedItem.ToString(), TypeSearchList); cmbResultsStyleIndex = 3; // display step text in results } + else if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[4]) + { + // C2020-033: Incoming Transitions: Make an iteminfolist from the list returned from + // GetExternalTransitionsToChildren (also gets transitions to the item itself) + ItemInfo trII = SearchIncTransII; + if (trII != null) + { + ReportTitle = string.Format("Search For Incoming Transitions to {0}: ", trII.Path); + TypesSelected = "Filtered By: " + typstr; + using (TransitionInfoList exTrans = TransitionInfoList.GetExternalTransitionsToChildren(trII.ItemID)) + { + ItemInfoList iil = null; + bool first = true; + foreach (TransitionInfo ti in exTrans) + { + if (first) + { + ContentInfo ci = ContentInfo.Get(ti.FromID); + ItemInfo tmp = ci.ContentItems[0]; + iil = new ItemInfoList(tmp); + first = false; + } + else + { + ContentInfo ci = ContentInfo.Get(ti.FromID); + ItemInfo tmp = ci.ContentItems[0]; + iil.AddItem(tmp); + } + } + SearchResults = iil; + if (SearchResults == null || SearchResults.Count == 0) + { + FlexibleMessageBox.Show("No Matches Found.", "Search"); + } + cmbResultsStyleIndex = 1; //display step locations in results + } + } + } if (SearchResults != null) { AddMessageForEmptyAnnotations(); @@ -1531,6 +1657,7 @@ namespace Volian.Controls.Library FlexibleMessageBox.Show("No Matches Found.", "Search"); } } + btnTranCvtAllToTxt.Enabled = IncTransCvtAllToTextPerm(); // C2020-033: does user have access to at least one item } catch (Exception ex) { @@ -1556,7 +1683,7 @@ namespace Volian.Controls.Library bool hasAnnot = false; foreach (ItemInfo ii in SearchResults) { - if (ii.ItemAnnotationCount > 0) + if (ii.ItemAnnotations != null && ii.ItemAnnotationCount > 0) { // RHM - can an iteminfo have an itemannotationcount>0 and not have searchannotationtext. if (ii.SearchAnnotationText == null) ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText; @@ -2153,9 +2280,16 @@ namespace Volian.Controls.Library } private void btnClearSearchResults_Click(object sender, EventArgs e) { - lbSrchResults.DataSource = null; + if (tabSearchTypes.SelectedTab == tabIncTrans) // C2020-033: Clear the Incoming Transitions list box + { + lbSrchResultsIncTrans.DataSource = null; + lbSrchResultsIncTrans.Items.Clear(); + } + else + lbSrchResults.DataSource = null; _SearchResults = null; DisplayResults(); + btnTranCvtAllToTxt.Enabled = false; } // A timer updated the step type tree but if it was loaded from xml the timer update overwrite what @@ -2163,6 +2297,7 @@ namespace Volian.Controls.Library private bool _fromLoad = false; private void btnLoadSearchResults_Click(object sender, System.EventArgs e) { + IncTransSelectedCount = 0; _fromLoad = true; _LoadingList = true; ofdSearchResults.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS"; @@ -2290,7 +2425,27 @@ namespace Volian.Controls.Library break; } case 2: //referenced object + case 3: // transitions { + FlexibleMessageBox.Show(this, "Loading Referenced Objects and Transitions searches is under construction.", "Under Construction", MessageBoxButtons.OK); + break; + } + case 4: // Incoming transitions + { + tabSearchTypes.SelectedTab = tabIncTrans; + cmbResultsStyle.Text = xd.SelectSingleNode("search/results/@style").InnerText; + string tmpi = xd.SelectSingleNode("search/results/@toid").InnerText; + SearchIncTransII = ItemInfo.Get(Convert.ToInt32(tmpi)); + System.Xml.XmlNodeList nl = xd.SelectNodes("search/results/item"); + foreach (System.Xml.XmlNode nd in nl) + { + int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText); + ItemInfo ii = ItemInfo.Get(itemID); + if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null) ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText; + SearchResults.AddItemInfo(ii); + } + lbSrchResultsIncTrans.DataSource = SearchResults; + DisplayResults(); break; } } @@ -2311,12 +2466,14 @@ namespace Volian.Controls.Library } Cursor = Cursors.Default; } + btnTranCvtAllToTxt.Enabled = IncTransCvtAllToTextPerm(); // C2020-033: does user have access to at least one item _LoadingList = false; } private void btnSaveSearchResults_Click(object sender, System.EventArgs e) { ICollection myList = lbSrchResults.DataSource as ICollection; + if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[4]) myList = lbSrchResultsIncTrans.DataSource as ICollection; // C2020-033: use Incoming transition list if (tabSearchTypes.SelectedTabIndex == 2 || tabSearchTypes.SelectedTabIndex == 3) // ROs & Transitions are not coded yet { FlexibleMessageBox.Show(this, "Saving Referenced Objects and Transitions searches is under construction.", "Under Construction", MessageBoxButtons.OK); @@ -2342,32 +2499,34 @@ namespace Volian.Controls.Library // B2020-107: save procedures sets & step types // do procsets selected System.Xml.XmlElement xp = null; - if (lstCheckedDocVersions != null && lstCheckedDocVersions.Count > 0) - { - xp = xd.CreateElement("procsets"); - foreach (DocVersionInfo dvi in lstCheckedDocVersions) - { - System.Xml.XmlElement xee = xd.CreateElement("set"); - xa = xd.CreateAttribute("fid"); - xa.InnerText = dvi.MyFolder.FolderID.ToString(); - xee.Attributes.SetNamedItem(xa); - xp.AppendChild(xee); - } - } System.Xml.XmlElement xst = null; - if (lstCheckedStepTypesStr != null && lstCheckedStepTypesStr.Count > 0) + if (sti != 4) // C2020-033: no procsets or step types for Incoming transitions { - xst = xd.CreateElement("StepType"); - foreach (string str in lstCheckedStepTypesStr) // Limited by step types + if (lstCheckedDocVersions != null && lstCheckedDocVersions.Count > 0) { - System.Xml.XmlElement xee = xd.CreateElement("type"); - xa = xd.CreateAttribute("str"); - xa.InnerText = str; - xee.Attributes.SetNamedItem(xa); - xst.AppendChild(xee); + xp = xd.CreateElement("procsets"); + foreach (DocVersionInfo dvi in lstCheckedDocVersions) + { + System.Xml.XmlElement xee = xd.CreateElement("set"); + xa = xd.CreateAttribute("fid"); + xa.InnerText = dvi.MyFolder.FolderID.ToString(); + xee.Attributes.SetNamedItem(xa); + xp.AppendChild(xee); + } + } + if (lstCheckedStepTypesStr != null && lstCheckedStepTypesStr.Count > 0) + { + xst = xd.CreateElement("StepType"); + foreach (string str in lstCheckedStepTypesStr) // Limited by step types + { + System.Xml.XmlElement xee = xd.CreateElement("type"); + xa = xd.CreateAttribute("str"); + xa.InnerText = str; + xee.Attributes.SetNamedItem(xa); + xst.AppendChild(xee); + } } } - switch (sti) { case 0: //text @@ -2439,6 +2598,34 @@ namespace Volian.Controls.Library xd.Save(sfdSearchResults.FileName); break; } + case 2: // ro + case 3: // transitions + { + FlexibleMessageBox.Show(this, "Saving Search Results for this search type is under construction.", "Under Construction", MessageBoxButtons.OK); + break; + } + case 4: // C2020-033: Incoming Transitions + { + // do results + xe = xd.CreateElement("results"); + xa = xd.CreateAttribute("style"); + xa.InnerText = cmbResultsStyle.Text; + xe.Attributes.SetNamedItem(xa); + xa = xd.CreateAttribute("toid"); + xa.InnerText = SearchIncTransII.ItemID.ToString(); + xe.Attributes.SetNamedItem(xa); + foreach (ItemInfo ii in myList) + { + System.Xml.XmlElement xee = xd.CreateElement("item"); + xa = xd.CreateAttribute("id"); + xa.InnerText = ii.ItemID.ToString(); + xee.Attributes.SetNamedItem(xa); + xe.AppendChild(xee); + } + xd.DocumentElement.AppendChild(xe); + xd.Save(sfdSearchResults.FileName); + break; + } } break; } @@ -2470,6 +2657,7 @@ namespace Volian.Controls.Library private void btnCopySearchResults_Click(object sender, EventArgs e) { ICollection myList = lbSrchResults.DataSource as ICollection; + if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[4]) myList = lbSrchResultsIncTrans.DataSource as ICollection; StringBuilder sb = new StringBuilder(); sb.Append("\"Location\"\t\"Type\"\t\"Text\"\t\"High-Level\"\t\"Annotations\""); List ItemsProcessed = new List(); @@ -2513,18 +2701,188 @@ namespace Volian.Controls.Library string sortedBy = ""; if (cbSorted.Checked) sortedBy = string.Format("Sorted By: {0}", cmbResultsStyle.Text); //C2019-013 pass in sorted by information - OnPrintRequest(new DisplaySearchEventArgs(ReportTitle, TypesSelected, SearchString, lbSrchResults.DataSource as ICollection,sortedBy)); + ICollection srchres = lbSrchResults.DataSource as ICollection; + // C2020-033: If on the Incoming Transitions tab, use that list. + if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[4]) srchres = lbSrchResultsIncTrans.DataSource as ICollection; + OnPrintRequest(new DisplaySearchEventArgs(ReportTitle, TypesSelected, SearchString, srchres,sortedBy)); } private void panSearchButtons_Resize(object sender, EventArgs e) { cmbResultsStyle.Left = labelX1.Right + 3; cmbResultsStyle.Width = btnClearSearchResults.Left - cmbResultsStyle.Left - 3; } + // C2020-033: Convert All (that have permissions) Incoming Transitions to text + private void btnTranCvtAllToTxt_Click(object sender, EventArgs e) + { + List itmsEditable = TranCvtCheckPermission(true); // Get list based on permissions + if (itmsEditable == null || itmsEditable.Count == 0) return; + TranCvtToTxt(itmsEditable); + } + // C22020-033: Use IncTransCvtAllToTextPerm to see if user has at least edit permissions to 1 in list. This + // is used to see if Convert All button is enabled. + private bool IncTransCvtAllToTextPerm() + { + if (_SearchResults == null) return false; + int cnt = 0; + bool allowNonAdmin = IncTranCvtPerm(); + foreach (ItemInfo ii in _SearchResults) + { + if (allowNonAdmin || UserInfo.CanEdit(MyUserInfo, ii.MyDocVersion)) return true; + } + return false; + } + // C2020-033: Update the search panel for Incoming transitions. This gets called from the tree view & the ribbon + public void UpdateSearchIncTransResults() + { + IncTransSelectedCount = 0; + tabSearchTypes.SelectedTab = tabSearchTypes.Tabs[4]; + + lbSrchResultsIncTrans.DataSource = null; + lbSrchResultsIncTrans.Items.Clear(); + // Get item to do search for, either from tree or from editor + ItemInfo trII = SearchIncTransII; + if (trII != null) + { + ReportTitle = string.Format("Search For Incoming Transitions to {0}: ", trII.Path); + + using (TransitionInfoList exTrans = TransitionInfoList.GetExternalTransitionsToChildren(trII.ItemID)) + { + ItemInfoList iil = null; + bool first = true; + foreach (TransitionInfo ti in exTrans) + { + if (first) + { + ContentInfo ci = ContentInfo.Get(ti.FromID); + ItemInfo tmp = ci.ContentItems[0]; + iil = new ItemInfoList(tmp); + first = false; + } + else + { + ContentInfo ci = ContentInfo.Get(ti.FromID); + ItemInfo tmp = ci.ContentItems[0]; + iil.AddItem(tmp); + } + } + SearchResults = iil; + } + } + if (SearchResults != null && SearchResults.Count > 0) + { + AddMessageForEmptyAnnotations(); + cmbResultsStyle.SelectedIndex = 1; //display step locations in results + DisplayResults(); + } + else + { + btnPrnSrchRslts.Enabled = false; + btnClearSearchResults.Enabled = false; + btnCopySearchResults.Enabled = false; + btnSaveSearchResults.Enabled = false; + cmbResultsStyle.Enabled = false; + FlexibleMessageBox.Show("No Matches Found.", "Search"); + } + btnTranCvtAllToTxt.Enabled = IncTransCvtAllToTextPerm(); + btnTranCvtSelToTxt.Enabled = false; + } + public bool IncTranCvtPerm() + { + FolderInfo topFolder = FolderInfo.Get(1); + FolderConfig fc = topFolder.MyConfig as FolderConfig; + return fc.General_IncTranCvtPerm; + } + // C2020-033: Before allowing conversion of Incoming Transitions to text, get list of results that the user has permission edit. + private List TranCvtCheckPermission(bool all) + { + // check if a non-reader can convert transitions to text even if a reader - this is set by an administrator on the top + // folder properties dialog + bool allowNonAdmin = IncTranCvtPerm(); + List itmsEditable = new List(); // return this list + int listCount = 0; + if (all) // Check all in list + { + listCount = _SearchResults.Count; + foreach (ItemInfo ii in _SearchResults) + { + if (allowNonAdmin || UserInfo.CanEdit(MyUserInfo, ii.MyDocVersion)) itmsEditable.Add(ii.ContentID); + } + } + else // check only the items selected + { + listCount = lbSrchResultsIncTrans.CheckedItems.Count; + List lbis = lbSrchResultsIncTrans.CheckedItems; + foreach (ListBoxItem lbi in lbis) + { + ItemBindingData tmpii = lbi.Tag as ItemBindingData; + ItemInfo ii = tmpii.DataItem as ItemInfo; + if (allowNonAdmin || UserInfo.CanEdit(MyUserInfo, ii.MyDocVersion)) itmsEditable.Add(ii.ContentID); + } + } + // Prompt user if convert to text should continue. If some items cannot be edited, also state that + // not all can be converted to text. If count of itmsEditable & lbis are different some cannot be edited. + if (itmsEditable.Count == 0) + { + FlexibleMessageBox.Show("You do not have permission to edit any of the procedures, sections, and/or steps" + (all ? "." : " that are selected."), + "Convert Transition to Text", MessageBoxButtons.OK, MessageBoxIcon.Information); + return null; + } + else if (itmsEditable.Count != listCount) + { + DialogResult ans = FlexibleMessageBox.Show("You only have permission to edit some of the procedures, sections, and/or steps that are selected.procedures, sections, and/or steps" + (all ? "." : " that are selected.") + + "\r\n\r\n Should the conversion of the transitions to text continue?", + "Convert Transition to Text", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + if (ans == DialogResult.No) return null; + } + else + { + DialogResult ans = FlexibleMessageBox.Show("Are you sure you want to convert the transitions to text?", + "Convert Transition to Text", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + if (ans == DialogResult.No) return null; + } + return itmsEditable; + } + // C2020-033: convert selected transitions to text + private void btnTranCvtSelToTxt_Click(object sender, EventArgs e) + { + // First see if all selected can be converted, i.e. user has permission to edit + List lbis = lbSrchResultsIncTrans.CheckedItems; + List itmsEditable = TranCvtCheckPermission(false); + if (itmsEditable == null || itmsEditable.Count == 0) return; + TranCvtToTxt(itmsEditable); + } + // C2020-033: For items in list, do the actual conversion of the Incoming Transition to text + private void TranCvtToTxt(List itmsEditable) + { + ItemInfo trII = SearchIncTransII; + if (trII != null) + { + using (TransitionInfoList exTrans = TransitionInfoList.GetExternalTransitionsToChildren(trII.ItemID)) + { + foreach (TransitionInfo ti in exTrans) + { + // See if the 'item to' id is to be converted and if so do it. To figure this out, + // see if it is in the list itmsEditable. + if (itmsEditable.Contains(ti.FromID)) + { + ContentInfo ci = ContentInfo.Get(ti.FromID); + ItemInfo tmp = ci.ContentItems[0]; + using (Content content = Content.Get(tmp.ContentID)) + { + content.FixTransitionText(ti, true); + content.Save(); + } + } + } + + } + } + } } - #region Annoation Search Type Class - // this class is used to generate the list of annotations to search. - // this also allow us to add a dummy type which is used to search for all annotations - public class AnnotationTypeSearch + #region Annoation Search Type Class + // this class is used to generate the list of annotations to search. + // this also allow us to add a dummy type which is used to search for all annotations + public class AnnotationTypeSearch { private string _Name; public string Name diff --git a/PROMS/Volian.Controls.Library/DisplayTabControl.cs b/PROMS/Volian.Controls.Library/DisplayTabControl.cs index e380f647..2fb45f46 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabControl.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabControl.cs @@ -13,6 +13,7 @@ using Volian.Base.Library; namespace Volian.Controls.Library { + public delegate ItemInfo DisplayTabControlEditorSearchIncTransEvent(object sender, vlnTreeItemInfoEventArgs args); public delegate void DisplayTabControlEvent(object sender,EventArgs args); public delegate void DisplayTabControlStatusEvent(object sender, DisplayTabControlStatusEventArgs args); public partial class DisplayTabControlStatusEventArgs : EventArgs @@ -150,6 +151,13 @@ namespace Volian.Controls.Library if (OpenInSeparateWindow != null) OpenInSeparateWindow(this, args); } + // C2020-033: Provide way to expand/fill in Search/Incoming Transition panel + public event DisplayTabControlEditorSearchIncTransEvent SearchIncTrans; + public ItemInfo OnSearchIncTrans(object sender, vlnTreeItemInfoEventArgs args) + { + if (SearchIncTrans != null) return SearchIncTrans(sender, args); + return args.MyItemInfo; + } public event ItemSelectedChangedEvent RefreshEnhancedDocument; public void OnRefreshEnhancedDocument(ItemSelectedChangedEventArgs args) { diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs index 6d515747..0f15f76e 100644 --- a/PROMS/Volian.Controls.Library/EditItem.cs +++ b/PROMS/Volian.Controls.Library/EditItem.cs @@ -1030,114 +1030,51 @@ namespace Volian.Controls.Library private void HandleSqlExceptionOnDelete(Exception ex) { // C2020-018 made the messaging consistent in the message boxes + // C2020-033: Expand/fill in the Search/Incoming Transition panel. Also, the dialog message was changed + // to give message to view panel and eliminate list in the dialog. This is done for each of cases. if (ex.Message.Contains("has External Transitions and has no next step")) { + MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OnSearchIncTrans(this, new vlnTreeItemInfoEventArgs(MyStepRTB.MyItemInfo)); using (TransitionInfoList exTrans = TransitionInfoList.GetExternalTransitionsToChildren(MyID)) // B2020-109: look at substeps too { DialogResult ans = FlexibleMessageBox.Show("Transitions exist to this step and cannot be adjusted automatically." + - "\r\n\r\nDo you want to be placed at the " + (exTrans.Count > 1 ? "first " : "") + "location with the problem Transition?" + - "\r\n\r\nLocations with Problem Transitions" + - exTrans.Summarize(), - "Cannot Delete This Step", MessageBoxButtons.YesNo, MessageBoxIcon.Question); - if (ans == DialogResult.Yes) - { - if (MyStepRTB.Text == "") - { - this.MyStepRTB.InsertSymbol(@"\u160?"); // since text was deleted, insert a hard space to prevent a looping effect B2016-082 - using (Item itm = MyStepRTB.MyItemInfo.Get()) - { - Annotation x = Annotation.MakeAnnotation(itm, AnnotationType.GetByName("Verification Required"), null, "A Hard Space was put in to keep the Transitions referencing here valid. \nPlease remove or re-assign these transitions before deleting this step.", null); - } - } - MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OpenItem(exTrans[0].MyContent.ContentItems[0]); - } - else - SetFocus(); + "\r\n\r\nThe list of all locations are shown in the Tools/Search/Incoming Transitions tab.", + "Cannot Delete This Step", MessageBoxButtons.OK, MessageBoxIcon.Information); + SetFocus(); } } else if (ex.Message.Contains("has External Transitions to Procedure")) { + MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OnSearchIncTrans(this, new vlnTreeItemInfoEventArgs(MyStepRTB.MyItemInfo)); using (TransitionInfoList exTrans = TransitionInfoList.GetExternalTransitionsToChildren(MyID)) { DialogResult ans = FlexibleMessageBox.Show("Transitions exist to this procedure." + - "\r\n\r\nDo you want to be placed at the " + (exTrans.Count > 1 ? "first " : "") + "location with the problem Transition?" + - "\r\n\r\nLocations with Problem Transitions" + - exTrans.Summarize(), - "Cannot Delete This Procedure", MessageBoxButtons.YesNo, MessageBoxIcon.Question); - if (ans == DialogResult.Yes) - { - if (MyStepRTB.Text == "") - { - this.MyStepRTB.InsertSymbol(@"\u160?"); // since text was deleted, insert a hard space to prevent a looping effect B2016-082 - using (Item itm = MyStepRTB.MyItemInfo.Get()) - { - Annotation x = Annotation.MakeAnnotation(itm, AnnotationType.GetByName("Verification Required"), null, "A Hard Space was put in to keep the Transitions referencing here valid. \nPlease remove or re-assign these transitions before deleting this step.", null); - } - } - MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OpenItem(exTrans[0].MyContent.ContentItems[0]); - - } - else - SetFocus(); + "\r\n\r\nThe list of all locations are shown in the Tools/Search/Incoming Transitions tab.", + "Cannot Delete This Procedure", MessageBoxButtons.OK, MessageBoxIcon.Information); + SetFocus(); } } // B2020-097: If deleting a section that has transitions pointing to it, show list: // B2020-098: If deleting a section that has transitions & select to remove 1st transition, crash on trying to delete section again else if (ex.Message.Contains("has External Transitions to Section")) { + MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OnSearchIncTrans(this, new vlnTreeItemInfoEventArgs(MyStepRTB.MyItemInfo)); using (TransitionInfoList exTrans = TransitionInfoList.GetExternalTransitionsToChildren(MyID)) { DialogResult ans = FlexibleMessageBox.Show("Transitions exist to this section and cannot be adjusted automatically." + - "\r\n\r\nDo you want to be placed at the " + (exTrans.Count > 1 ? "first " : "") + "location with the problem Transition?" + - "\r\n\r\nLocations with Problem Transitions" + - exTrans.Summarize(), - "Cannot Delete This Section", MessageBoxButtons.YesNo, MessageBoxIcon.Question); - if (ans == DialogResult.Yes) - { - if (MyStepRTB.Text == "") - { - this.MyStepRTB.InsertSymbol(@"\u160?"); // since text was deleted, insert a hard space to prevent a looping effect B2016-082 - using (Item itm = MyStepRTB.MyItemInfo.Get()) - { - Annotation x = Annotation.MakeAnnotation(itm, AnnotationType.GetByName("Verification Required"), null, "A Hard Space was put in to keep the Transitions referencing here valid. \nPlease remove or re-assign these transitions before deleting this step.", null); - } - } - MyStepPanel.SelectedEditItem = this; - MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OpenItem(exTrans[0].MyContent.ContentItems[0]); - } - else - MyStepPanel.SelectedEditItem = this; + "\r\n\r\nThe list of all locations are shown in the Tools/Search/Incoming Transitions tab.", + "Cannot Delete This Section", MessageBoxButtons.OK, MessageBoxIcon.Information); + MyStepPanel.SelectedEditItem = this; } } else if (ex.Message.Contains("has External Transitions to it's children")) { + MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OnSearchIncTrans(this, new vlnTreeItemInfoEventArgs(MyStepRTB.MyItemInfo)); using (TransitionInfoList exTrans = TransitionInfoList.GetExternalTransitionsToChildren(MyID)) { - //DialogResult ans = FlexibleMessageBox.Show("Transitions exist to substeps of this step and cannot be adjusted automatically." + - // "\r\n\r\nDo you want to be placed on the " + (exTrans.Count > 1 ? "first " : "") + "substep with the problem Transition?" + - // "\r\n\r\nLocations with Problem Transitions:" + - // exTrans.Summarize(), - // "Cannot Delete This Step", MessageBoxButtons.YesNo, MessageBoxIcon.Question); DialogResult ans = FlexibleMessageBox.Show("Transitions exist to the substeps of this step and cannot be adjusted automatically." + - "\r\n\r\nDo you want to be placed at the " + (exTrans.Count > 1 ? "first " : "") + "location with the problem Transition?" + - "\r\n\r\nLocations with Problem Transitions:" + - exTrans.Summarize(), - "Cannot Delete This Step", MessageBoxButtons.YesNo, MessageBoxIcon.Question); - if (ans == DialogResult.Yes) - { - // B2017-182: The following code was moved from top of this method to here (and to each if/else case and only done if the text was removed, - // not when the step was deleted) - if (MyStepRTB.Text == "") - { - this.MyStepRTB.InsertSymbol(@"\u160?"); // since text was deleted, insert a hard space to prevent a looping effect B2016-082 - using (Item itm = MyStepRTB.MyItemInfo.Get()) - { - Annotation x = Annotation.MakeAnnotation(itm, AnnotationType.GetByName("Verification Required"), null, "A Hard Space was put in to keep the Transitions referencing here valid. \nPlease remove or re-assign these transitions before deleting this step.", null); - } - } - MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OpenItem(exTrans[0].MyContent.ContentItems[0]); - } - else + "\r\n\r\nThe list of all locations are shown in the Tools/Search/Incoming Transitions tab.", + "Cannot Delete This Step", MessageBoxButtons.OK, MessageBoxIcon.Information); SetFocus(); } } diff --git a/PROMS/Volian.Controls.Library/Properties/Resources.Designer.cs b/PROMS/Volian.Controls.Library/Properties/Resources.Designer.cs index 5219a0f5..1db0ad66 100644 --- a/PROMS/Volian.Controls.Library/Properties/Resources.Designer.cs +++ b/PROMS/Volian.Controls.Library/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Volian.Controls.Library.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -270,6 +270,16 @@ namespace Volian.Controls.Library.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ChkRef { + get { + object obj = ResourceManager.GetObject("ChkRef", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/PROMS/Volian.Controls.Library/Properties/Resources.resx b/PROMS/Volian.Controls.Library/Properties/Resources.resx index 91ce8e03..99b75e75 100644 --- a/PROMS/Volian.Controls.Library/Properties/Resources.resx +++ b/PROMS/Volian.Controls.Library/Properties/Resources.resx @@ -2031,22 +2031,30 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADySURBVDhP1VGrDoMwFO0n7A/Gt+BRUzgEyczEND9BsEt9 - JQI1NTE9h189ooIAsutpLlDIumEmdpKTnN4X53LZT9H3fWmoiSWFl3AKFlRK7Zqm0WEYWkIjRm0zTLHa - H4VmB24JjdgwDElVVdMAaMSobUbXdefrQ04DoBEzQ8osy6YB0IhR2xKm4Xa63DUI7dpP01THcWy1dw1j - LYBtsh649oUQuigKq71rrOHal1Lquq6t/rjGCNd+FEWac26JN+hdY4Rr/x2/rrG2b96Wm9aANRTDOv5+ - 27ZPSjFoXAM51PiukYxfJOaUgrPczW26xj+AsRf1SGVLeHvqDQAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAPJJREFUOE/VUasOgzAU7SfsD8a34FFTOATJzMQ0P0GwS30lAjU1MT2HXz2iggCy + 62kuUMi6YSZ2kpOc3hfnctlP0fd9aaiJJYWXcAoWVErtmqbRYRhaQiNGbTNMsdofhWYHbgmN2DAMSVVV + 0wBoxKhtRtd15+tDTgOgETNDyizLpgHQiFHbEqbhdrrcNQjt2k/TVMdxbLV3DWMtgG2yHrj2hRC6KAqr + vWus4dqXUuq6rq3+uMYI134URZpzbok36F1jhGv/Hb+usbZv3pab1oA1FMM6/n7btk9KMWhcAznU+K6R + jF8k5pSCs9zNbbrGP4CxF/VIZUt4e+oNAAAAAElFTkSuQmCC + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAO9JREFUOE+1UTEOgkAQvCf4BF/gI+hJTPyATzCW2PMKW0tjQY+tvsAXWFFcBZTn + zbF7LOtBYeIkkwyzsMzcmb/CWrvqus5JwqPxiL7v135oQWiy4e/runZZlgVCw6PxiLZt76fL04HQZBu/ + 8FaWZVwADY/GA/wHh8fr7czuHAgNj+PneR4XQMOb1EDszfEaF0DD0/GZXzWwcYYxflEUgdDJGhq+whZL + OH5VVYHQyRoaOn7TNIH8PHsbDBk/xcUaqdPXXKyh4+NFSfZna/iXJqePZxqF2eJt6Pg4efkXaH0bNBqA + F2BKyp78A0ka/QpjPuRAtoD1VSrCAAAAAElFTkSuQmCC + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADvSURBVDhPtVExDoJAELwn+ARf4CPoSUz8gE8wltjzCltL - Y0GPrb7AF1hRXAWU582xeyzrQWHiJJMMs7DM3Jm/wlq76rrOScKj8Yi+79d+aEFosuHv67p2WZYFQsOj - 8Yi2be+ny9OB0GQbv/BWlmVcAA2PxgP8B4fH6+3M7hwIDY/j53keF0DDm9RA7M3xGhdAw9PxmV81sHGG - MX5RFIHQyRoavsIWSzh+VVWB0MkaGjp+0zSB/Dx7GwwZP8XFGqnT11ysoePjRUn2Z2v4lyanj2cahdni - bej4OHn5F2h9GzQagBdgSsqe/ANJGv0KYz7kQLaA9VUqwgAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACASURBVDhPtY9LDoAgDAU5kmfgcOw5oUdgAWGLvqSNoJRv + nKQxKDOp6ldCCEeM0d2TakPX6rBsjEla6880Az0ZIwakta21Y4EcxLz3J2+Sb9QNvH8DT0hDAUnmAJ0d + XS8RZEfvizMpDy0Z3xFYlsGWDLZkkTwwLTMcWZIZiPOyUhdBN2onEKujgwAAAABJRU5ErkJggg== \ No newline at end of file diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 22fbc8b0..c9cce6ce 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -838,9 +838,10 @@ namespace Volian.Controls.Library void _MyStepRTB_SelectionChanged(object sender, EventArgs e) { + if (_MyStepRTB == null) return; _TimeActivity.Open(); //B2019-154 This will prevent duplicate processing of the ribbon menu and refresh of step items, speeding up the editing experience - if (_MyStepRTB.MyItemInfo == lastItem && _MyStepRTB.SelectionStart == lastStart && _MyStepRTB.SelectionLength == lastLength && _MyStepRTB.SelectedText == lastText) + if (_MyStepRTB != null && _MyStepRTB.MyItemInfo == lastItem && _MyStepRTB.SelectionStart == lastStart && _MyStepRTB.SelectionLength == lastLength && _MyStepRTB.SelectedText == lastText) return; lastItem = _MyStepRTB.MyItemInfo; lastStart = _MyStepRTB.SelectionStart; @@ -3333,7 +3334,11 @@ namespace Volian.Controls.Library StepPanelTabDisplayEventArgs args = new StepPanelTabDisplayEventArgs("LibDocs"); MyEditItem.MyStepPanel.OnTabDisplay(sender, args); } - + // C2020-033: Support the Review/Incoming Transition button to bring up Search/Incoming Transitions panel + private void btnSearchIncTrans_Click(object sender, EventArgs e) + { + MyEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OnSearchIncTrans(this, new vlnTreeItemInfoEventArgs(MyStepRTB.MyItemInfo)); + } public void btnAnnots_Click(object sender, EventArgs e) { StepPanelTabDisplayEventArgs args = new StepPanelTabDisplayEventArgs("Annots"); diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs index 9a7fa503..c11bba1c 100644 Binary files a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs and b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs differ diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index 4a87335b..13afe44d 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -36,6 +36,7 @@ namespace Volian.Controls.Library public delegate void WordSectionDeletedEvent(object sender, WordSectionEventArgs args); public delegate void vlnTreeViewPdfEvent(object sender, vlnTreeViewPdfArgs args); public delegate string vlnTreeViewGetChangeIdEvent(object sender, vlnTreeItemInfoEventArgs args); + public delegate ItemInfo vlnTreeViewSearchIncTransEvent(object sender, vlnTreeItemInfoEventArgs args); public partial class vlnTreeSectionInfoEventArgs { private bool _IsDeleting = false; @@ -443,13 +444,13 @@ namespace Volian.Controls.Library { if (NodeMove != null) NodeMove(sender, args); } - public event vlnTreeViewClipboardStatusEvent ClipboardStatus; - private ItemInfo OnClipboardStatus(object sender, vlnTreeEventArgs args) - { - ItemInfo rv = null; - if (ClipboardStatus != null) rv = ClipboardStatus(sender, args); - return rv; - } + public event vlnTreeViewClipboardStatusEvent ClipboardStatus; + private ItemInfo OnClipboardStatus(object sender, vlnTreeEventArgs args) + { + ItemInfo rv = null; + if (ClipboardStatus != null) rv = ClipboardStatus(sender, args); + return rv; + } public event vlnTreeViewEvent NodeCopy; private void OnNodeCopy(object sender, vlnTreeEventArgs args) { @@ -467,6 +468,13 @@ namespace Volian.Controls.Library if (NodePSI != null) return NodePSI(sender, args); return DialogResult.Cancel; } + // C2020-033: Support the menu item to bring up Search/Incoming Transitions panel + public event vlnTreeViewSearchIncTransEvent SearchIncTrans; + private ItemInfo OnSearchIncTransIn(object sender, vlnTreeItemInfoEventArgs args) + { + if (SearchIncTrans != null) return SearchIncTrans(sender, args); + return args.MyItemInfo; + } public event vlnTreeViewSIEvent NodeSI; private DialogResult OnNodeSI(object sender, vlnTreeEventArgs args) { @@ -1003,12 +1011,19 @@ namespace Volian.Controls.Library } #endregion //_MyLog.WarnFormat("Context Menu 6 - {0}", GC.GetTotalMemory(true)); - + #region Menu_ExternalTransitions + // C2020-033: Support the menu item to bring up Search/Incoming Transitions panel + ItemInfo iix = tn.VEObject as ItemInfo; + if (iix != null) + { + cm.MenuItems.Add("Incoming Transitions", new EventHandler(mi_Click)); + } + #endregion #region Menu_Properties // Add Properties to the menu unless at the very 'top' node or on a grouping (partinfo) // node (RNOs, Steps, Cautions, Notes) or at the step level. // B2020-105 Allow Set Administrators to rename folder's (sets of procedures) to which they have been given access. - if( tn.VEObject is FolderInfo) ok = (ui.IsAdministrator() || ui.IsSetAdministrator(tn.VEObject as FolderInfo)); + if ( tn.VEObject is FolderInfo) ok = (ui.IsAdministrator() || ui.IsSetAdministrator(tn.VEObject as FolderInfo)); else ok = (tn.VEObject is DocVersionInfo) ? (ui.IsAdministrator() || ui.IsSetAdministrator(tn.VEObject as DocVersionInfo)) : (ui.IsAdministrator() || (tn.VEObject is ItemInfo) && (ui.IsSetAdministrator((tn.VEObject as ItemInfo).MyProcedure.MyDocVersion) || ui.IsWriter((tn.VEObject as ItemInfo).MyProcedure.MyDocVersion))); @@ -1782,6 +1797,11 @@ namespace Volian.Controls.Library OnNodeSelect(this, new vlnTreeEventArgs(SelectedNode)); } break; + case "Incoming Transitions": // C2020-033: Support the menu item to bring up Search/Incoming Transitions panel + VETreeNode tnx = SelectedNode as VETreeNode; + ItemInfo iii = tnx.VEObject as ItemInfo; + if (iii != null) OnSearchIncTransIn(this, new vlnTreeItemInfoEventArgs(iii)); + break; case "Properties..."://Show the properties for the selected node SetLastValues((VETreeNode)SelectedNode); SetupNodeProperties(); @@ -3257,8 +3277,18 @@ namespace Volian.Controls.Library { OnProcessing(false,"Delete Failed"); OnProcessingComplete(dtStart,"Delete Failed"); - ItemInfo iii = ii.HandleSqlExceptionOnDelete(ex); - if(iii != null) OnOpenItem(this, new vlnTreeItemInfoEventArgs(iii)); + // C2020-033: Support delete to bring up Search/Incoming Transitions panel + if (ex.Message.Contains("has External Transitions")) + { + ItemInfo iis = ItemInfo.Get(ii.ItemID); + OnSearchIncTransIn(this, new vlnTreeItemInfoEventArgs(iis)); + iis = ii.HandleSqlExceptionOnDelete(ex); + } + else + { + ItemInfo iii = ii.HandleSqlExceptionOnDelete(ex); + if (iii != null) OnOpenItem(this, new vlnTreeItemInfoEventArgs(iii)); + } return false; } }