diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs b/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs index 5de5cbe2..f01502ec 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs @@ -157,16 +157,17 @@ namespace VEPROMS this.tcFolder = new DevComponents.DotNetBar.TabControl(); this.tcpRefObjs = new DevComponents.DotNetBar.TabControlPanel(); this.tiRefObj = 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.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components); + this.tcpFmtSettings = new DevComponents.DotNetBar.TabControlPanel(); + this.tiFmtSettings = new DevComponents.DotNetBar.TabItem(this.components); this.tcpEdSettings = new DevComponents.DotNetBar.TabControlPanel(); this.tiEditSettings = new DevComponents.DotNetBar.TabItem(this.components); this.tcpStMsg = new DevComponents.DotNetBar.TabControlPanel(); this.tiStMsg = new DevComponents.DotNetBar.TabItem(this.components); this.tcpOutputSettings = new DevComponents.DotNetBar.TabControlPanel(); this.tiOutputSettings = new DevComponents.DotNetBar.TabItem(this.components); + this.formatInfoListBindingSource = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.folderConfigBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.imageCodecInfoBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ppNumUpDwnOvrdPrnPenWidth)).BeginInit(); @@ -185,11 +186,12 @@ namespace VEPROMS ((System.ComponentModel.ISupportInitialize)(this.tcFolder)).BeginInit(); this.tcFolder.SuspendLayout(); this.tcpRefObjs.SuspendLayout(); - this.tcpFmtSettings.SuspendLayout(); this.tcpGeneral.SuspendLayout(); + this.tcpFmtSettings.SuspendLayout(); this.tcpEdSettings.SuspendLayout(); this.tcpStMsg.SuspendLayout(); this.tcpOutputSettings.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.formatInfoListBindingSource)).BeginInit(); this.SuspendLayout(); // // ppBtnOK @@ -752,7 +754,6 @@ namespace VEPROMS // ppCmbxFormat // this.ppCmbxFormat.DataBindings.Add(new System.Windows.Forms.Binding("SelectedValue", this.folderConfigBindingSource, "FormatSelection", true)); - this.ppCmbxFormat.DisplayMember = "Description"; this.ppCmbxFormat.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxFormat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxFormat.FormattingEnabled = true; @@ -762,7 +763,6 @@ namespace VEPROMS this.ppCmbxFormat.Size = new System.Drawing.Size(577, 23); this.superTooltip1.SetSuperTooltip(this.ppCmbxFormat, new DevComponents.DotNetBar.SuperTooltipInfo("Format Selection", "", resources.GetString("ppCmbxFormat.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppCmbxFormat.TabIndex = 44; - this.ppCmbxFormat.ValueMember = "Description"; this.ppCmbxFormat.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppCmbxFormat.WatermarkText = "Select a Format"; this.ppCmbxFormat.SelectedValueChanged += new System.EventHandler(this.ppCmbxFormat_SelectedValueChanged); @@ -1042,28 +1042,24 @@ namespace VEPROMS // ppColorPickerViewModebckgnd // this.ppColorPickerViewModebckgnd.GlobalItem = false; - this.ppColorPickerViewModebckgnd.ImagePaddingHorizontal = 8; this.ppColorPickerViewModebckgnd.Name = "ppColorPickerViewModebckgnd"; this.ppColorPickerViewModebckgnd.Text = "Non Active Edit Window Background"; // // ppColorPickerEditModeBckGnd // this.ppColorPickerEditModeBckGnd.GlobalItem = false; - this.ppColorPickerEditModeBckGnd.ImagePaddingHorizontal = 8; this.ppColorPickerEditModeBckGnd.Name = "ppColorPickerEditModeBckGnd"; this.ppColorPickerEditModeBckGnd.Text = "Active Edit Window Background"; // // ppColorPickerTransition // this.ppColorPickerTransition.GlobalItem = false; - this.ppColorPickerTransition.ImagePaddingHorizontal = 8; this.ppColorPickerTransition.Name = "ppColorPickerTransition"; this.ppColorPickerTransition.Text = "Transitions"; // // ppColorPickerRO // this.ppColorPickerRO.GlobalItem = false; - this.ppColorPickerRO.ImagePaddingHorizontal = 8; this.ppColorPickerRO.Name = "ppColorPickerRO"; this.ppColorPickerRO.Text = "Referenced Objects"; // @@ -1351,7 +1347,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, 25); + this.procPropChangeBarPositionCombo.Size = new System.Drawing.Size(248, 24); this.procPropChangeBarPositionCombo.TabIndex = 10; // // label18 @@ -1368,7 +1364,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, 25); + this.procPropChangeBarTextTypeCombo.Size = new System.Drawing.Size(248, 24); this.procPropChangeBarTextTypeCombo.TabIndex = 7; // // procPropPaginationCombo @@ -1376,7 +1372,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, 25); + this.procPropPaginationCombo.Size = new System.Drawing.Size(165, 24); this.procPropPaginationCombo.TabIndex = 33; // // label19 @@ -1393,7 +1389,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, 25); + this.procPropWatermarkCombo.Size = new System.Drawing.Size(178, 24); this.procPropWatermarkCombo.TabIndex = 31; // // label20 @@ -1410,7 +1406,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, 25); + this.procPropDefaultFormatCombo.Size = new System.Drawing.Size(526, 24); this.procPropDefaultFormatCombo.TabIndex = 29; // // label21 @@ -1432,7 +1428,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, 25); + this.procPropChangeBarTypeCombo.Size = new System.Drawing.Size(293, 24); this.procPropChangeBarTypeCombo.TabIndex = 27; // // label22 @@ -1737,12 +1733,12 @@ namespace VEPROMS | System.Windows.Forms.AnchorStyles.Right))); this.tcFolder.BackColor = System.Drawing.Color.White; this.tcFolder.CanReorderTabs = true; - this.tcFolder.Controls.Add(this.tcpRefObjs); - this.tcFolder.Controls.Add(this.tcpGeneral); this.tcFolder.Controls.Add(this.tcpFmtSettings); - this.tcFolder.Controls.Add(this.tcpEdSettings); this.tcFolder.Controls.Add(this.tcpStMsg); this.tcFolder.Controls.Add(this.tcpOutputSettings); + this.tcFolder.Controls.Add(this.tcpGeneral); + this.tcFolder.Controls.Add(this.tcpRefObjs); + this.tcFolder.Controls.Add(this.tcpEdSettings); this.tcFolder.Location = new System.Drawing.Point(173, 7); this.tcFolder.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcFolder.Name = "tcFolder"; @@ -1791,6 +1787,39 @@ namespace VEPROMS this.tiRefObj.Name = "tiRefObj"; this.tiRefObj.Text = "Referenced Objects"; // + // 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.ppRTxtTitle); + this.tcpGeneral.Controls.Add(this.ppRTxtName); + this.tcpGeneral.Controls.Add(this.label4); + this.tcpGeneral.Controls.Add(this.label1); + this.tcpGeneral.Controls.Add(this.label2); + this.tcpGeneral.Dock = System.Windows.Forms.DockStyle.Fill; + this.tcpGeneral.Location = new System.Drawing.Point(0, 24); + 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(685, 282); + 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; @@ -1826,39 +1855,6 @@ namespace VEPROMS this.tiFmtSettings.Name = "tiFmtSettings"; this.tiFmtSettings.Text = "Format Settings"; // - // 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.ppRTxtTitle); - this.tcpGeneral.Controls.Add(this.ppRTxtName); - this.tcpGeneral.Controls.Add(this.label4); - this.tcpGeneral.Controls.Add(this.label1); - this.tcpGeneral.Controls.Add(this.label2); - this.tcpGeneral.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpGeneral.Location = new System.Drawing.Point(0, 24); - 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(685, 282); - 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"; - // // tcpEdSettings // this.tcpEdSettings.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; @@ -1962,6 +1958,10 @@ namespace VEPROMS this.tiOutputSettings.Name = "tiOutputSettings"; this.tiOutputSettings.Text = "Output Settings"; // + // formatInfoListBindingSource + // + this.formatInfoListBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.FormatInfoList); + // // frmFolderProperties // this.AcceptButton = this.ppBtnOK; @@ -2013,16 +2013,17 @@ namespace VEPROMS this.tcFolder.ResumeLayout(false); this.tcpRefObjs.ResumeLayout(false); this.tcpRefObjs.PerformLayout(); - this.tcpFmtSettings.ResumeLayout(false); - this.tcpFmtSettings.PerformLayout(); this.tcpGeneral.ResumeLayout(false); this.tcpGeneral.PerformLayout(); + this.tcpFmtSettings.ResumeLayout(false); + this.tcpFmtSettings.PerformLayout(); this.tcpEdSettings.ResumeLayout(false); this.tcpEdSettings.PerformLayout(); this.tcpStMsg.ResumeLayout(false); this.tcpStMsg.PerformLayout(); this.tcpOutputSettings.ResumeLayout(false); this.tcpOutputSettings.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.formatInfoListBindingSource)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -2167,6 +2168,7 @@ namespace VEPROMS private DevComponents.DotNetBar.Controls.GroupPanel ppGpbxUserSpecTxt; private DevComponents.DotNetBar.Controls.GroupPanel groupPanel2; private DevComponents.DotNetBar.Controls.GroupPanel groupPanel6; + private System.Windows.Forms.BindingSource formatInfoListBindingSource; //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 8132a457..d6ee8339 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.cs +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.cs @@ -485,7 +485,7 @@ namespace VEPROMS /// EventArgs private void ppCmbxFormat_SelectedValueChanged(object sender, EventArgs e) { - if (!_Initializing) + //if (!_Initializing) ProcessCmbxSelectedValueChange(ppCmbxFormat, _DefaultFormatName, ppBtnDefaultFmt, ppLblFormatDefault); } diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.resx b/PROMS/VEPROMS User Interface/frmFolderProperties.resx index dd99e12f..ed4dc3bc 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.resx +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.resx @@ -131,6 +131,9 @@ Check "Show Default Settings" to display the "default" graphic file extension se 17, 57 + + 17, 57 + This will revert the Disable Automatic Duplexing selection back to using the parent's (default) setting. @@ -179,8 +182,8 @@ Check "Show Default Settings" to display the "default" Change Bar Custom Message iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCgAA - CwoBv0NmUwAAAr5JREFUOE+lk21IE3Ecx0/fBPUi6pVZyzELCalXhWEg0XMvipYLVOzJhyxTWlkippGl + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCQAA + CwkBEvpHPgAAAr5JREFUOE+lk21IE3Ecx0/fBPUi6pVZyzELCalXhWEg0XMvipYLVOzJhyxTWlkippGl lLjS0qEpmpBmNsnhdPRAL1SwpuFwHtO5pbGle3Duwfvf3R7a/bodTGcaBB18j+PPfT/3/X//94sAAOy/ riAgJNrZWUDpShCpLfSR+K0Aqb3jR+oLbnKupjb8vfDnMPPbakKd5qUsDT88biWERJmf/0R4ng9psq0W vPz2nyAOwH65COHX/ZSt2UG7u9EKgOO1l7K1Ohc0YtPCkMhDmqUpqxKQk8UeytYyFzRCdz5AzTkAeT6X @@ -226,6 +229,9 @@ We also found that the various printer drivers can differ in the starting positi 263, 57 + + 401, 57 + 102 diff --git a/PROMS/VEPROMS User Interface/frmProcedureProperties.Designer.cs b/PROMS/VEPROMS User Interface/frmProcedureProperties.Designer.cs index 1e22ec1b..6da3e070 100644 --- a/PROMS/VEPROMS User Interface/frmProcedureProperties.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmProcedureProperties.Designer.cs @@ -406,8 +406,6 @@ namespace VEPROMS // ppCmbxFormat // this.ppCmbxFormat.DataBindings.Add(new System.Windows.Forms.Binding("SelectedValue", this.procedureConfigBindingSource, "FormatSelection", true)); - this.ppCmbxFormat.DataSource = this.formatInfoListBindingSource; - this.ppCmbxFormat.DisplayMember = "Description"; this.ppCmbxFormat.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxFormat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxFormat.FormattingEnabled = true; @@ -416,7 +414,6 @@ namespace VEPROMS this.ppCmbxFormat.Size = new System.Drawing.Size(573, 23); this.superTooltip1.SetSuperTooltip(this.ppCmbxFormat, new DevComponents.DotNetBar.SuperTooltipInfo("Format Selection", "", resources.GetString("ppCmbxFormat.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppCmbxFormat.TabIndex = 39; - this.ppCmbxFormat.ValueMember = "Description"; this.ppCmbxFormat.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppCmbxFormat.WatermarkText = "select a format"; this.ppCmbxFormat.SelectedValueChanged += new System.EventHandler(this.ppCmbxFormat_SelectedValueChanged); @@ -1010,7 +1007,7 @@ namespace VEPROMS this.versionsPropChangeBarPositionCombo.FormattingEnabled = true; this.versionsPropChangeBarPositionCombo.Location = new System.Drawing.Point(86, 39); this.versionsPropChangeBarPositionCombo.Name = "versionsPropChangeBarPositionCombo"; - this.versionsPropChangeBarPositionCombo.Size = new System.Drawing.Size(248, 24); + this.versionsPropChangeBarPositionCombo.Size = new System.Drawing.Size(248, 25); this.versionsPropChangeBarPositionCombo.TabIndex = 10; // // label12 @@ -1027,7 +1024,7 @@ namespace VEPROMS this.versionsPropChangeBarTextTypeCombo.FormattingEnabled = true; this.versionsPropChangeBarTextTypeCombo.Location = new System.Drawing.Point(86, 82); this.versionsPropChangeBarTextTypeCombo.Name = "versionsPropChangeBarTextTypeCombo"; - this.versionsPropChangeBarTextTypeCombo.Size = new System.Drawing.Size(248, 24); + this.versionsPropChangeBarTextTypeCombo.Size = new System.Drawing.Size(248, 25); this.versionsPropChangeBarTextTypeCombo.TabIndex = 7; // // versionsPropPaginationCombo @@ -1581,8 +1578,8 @@ namespace VEPROMS | System.Windows.Forms.AnchorStyles.Right))); this.tcProcProp.BackColor = System.Drawing.Color.Transparent; this.tcProcProp.CanReorderTabs = true; - this.tcProcProp.Controls.Add(this.tabControlPanel1); this.tcProcProp.Controls.Add(this.tabControlPanel2); + this.tcProcProp.Controls.Add(this.tabControlPanel1); this.tcProcProp.Controls.Add(this.tabControlPanel4); this.tcProcProp.Controls.Add(this.tabControlPanel3); this.tcProcProp.Location = new System.Drawing.Point(180, 7); @@ -1622,10 +1619,10 @@ namespace VEPROMS this.tabControlPanel1.Name = "tabControlPanel1"; this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); this.tabControlPanel1.Size = new System.Drawing.Size(672, 332); - this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.tabControlPanel1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(195)))), ((int)(((byte)(195))))); + 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)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); + 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; @@ -1641,7 +1638,7 @@ namespace VEPROMS this.ppProcNumStpRTB.CheckBelow = "|?"; this.ppProcNumStpRTB.CheckLeft = "-?????????"; this.ppProcNumStpRTB.CheckRight = "-??"; - this.ppProcNumStpRTB.ContentsRectangle = new System.Drawing.Rectangle(254, 27, 153, 16); + this.ppProcNumStpRTB.ContentsRectangle = new System.Drawing.Rectangle(89, 29, 153, 16); this.ppProcNumStpRTB.EpMode = VEPROMS.CSLA.Library.E_EditPrintMode.Edit; this.ppProcNumStpRTB.FieldToEdit = Volian.Controls.Library.E_FieldToEdit.StepText; this.ppProcNumStpRTB.Location = new System.Drawing.Point(89, 29); @@ -1710,10 +1707,10 @@ namespace VEPROMS this.tabControlPanel2.Name = "tabControlPanel2"; this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1); this.tabControlPanel2.Size = new System.Drawing.Size(672, 332); - this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.tabControlPanel2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(195)))), ((int)(((byte)(195))))); + 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)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); + 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; @@ -1739,10 +1736,10 @@ namespace VEPROMS this.tabControlPanel4.Name = "tabControlPanel4"; this.tabControlPanel4.Padding = new System.Windows.Forms.Padding(1); this.tabControlPanel4.Size = new System.Drawing.Size(672, 332); - this.tabControlPanel4.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.tabControlPanel4.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(195)))), ((int)(((byte)(195))))); + 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; - this.tabControlPanel4.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); + this.tabControlPanel4.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); this.tabControlPanel4.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanel4.Style.GradientAngle = 90; @@ -1774,10 +1771,10 @@ namespace VEPROMS this.tabControlPanel3.Name = "tabControlPanel3"; this.tabControlPanel3.Padding = new System.Windows.Forms.Padding(1); this.tabControlPanel3.Size = new System.Drawing.Size(672, 332); - this.tabControlPanel3.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.tabControlPanel3.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(195)))), ((int)(((byte)(195))))); + 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)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); + 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; @@ -1843,6 +1840,7 @@ namespace VEPROMS this.Controls.Add(this.ppLblDefSettingsInfo); this.Controls.Add(this.ppBtnCancel); this.Controls.Add(this.ppBtnOK); + this.DoubleBuffered = true; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Name = "frmProcedureProperties"; this.ShowIcon = false; diff --git a/PROMS/VEPROMS User Interface/frmProcedureProperties.cs b/PROMS/VEPROMS User Interface/frmProcedureProperties.cs index 1bd69646..46fd88a6 100644 --- a/PROMS/VEPROMS User Interface/frmProcedureProperties.cs +++ b/PROMS/VEPROMS User Interface/frmProcedureProperties.cs @@ -132,7 +132,12 @@ namespace VEPROMS _Initializing = true; procedureConfigBindingSource.DataSource = _ProcedureConfig; - formatInfoListBindingSource.DataSource = FormatInfoList.Get(); + //formatInfoListBindingSource.DataSource = FormatInfoList.Get(); + + ppCmbxFormat.DataSource = null; + ppCmbxFormat.DisplayMember = "FullName"; + ppCmbxFormat.ValueMember = "FullName"; + ppCmbxFormat.DataSource = FormatInfoList.SortedFormatInfoList; // Get the saved settings for this user // diff --git a/PROMS/VEPROMS User Interface/frmProcedureProperties.resx b/PROMS/VEPROMS User Interface/frmProcedureProperties.resx index ef9b9bc1..7c1a13d2 100644 --- a/PROMS/VEPROMS User Interface/frmProcedureProperties.resx +++ b/PROMS/VEPROMS User Interface/frmProcedureProperties.resx @@ -123,9 +123,6 @@ 752, 17 - - 520, 17 - Allows you to specify the default format to use for this procedure. @@ -136,6 +133,9 @@ When a format other than the inherited one is selected, a button labeled "Defaul Pressing the "Default" button will revert back to using the inherited format. + + 520, 17 + This will revert the Change Bar Text Type selection back to using the parent's (default) setting. diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs b/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs index f8a24023..16b774b4 100644 --- a/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs @@ -30,8 +30,8 @@ namespace VEPROMS { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmVersionsProperties)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.ppBtnCancel = new System.Windows.Forms.Button(); this.ppBtnOK = new System.Windows.Forms.Button(); this.ppBtnDefaultChgBar = new DevComponents.DotNetBar.ButtonX(); @@ -96,7 +96,6 @@ namespace VEPROMS this.ppChbxDisAutoDuplex = new System.Windows.Forms.CheckBox(); this.label16 = new System.Windows.Forms.Label(); this.label17 = new System.Windows.Forms.Label(); - //this.ppGrdLibDocList = new C1.Win.C1FlexGrid.C1FlexGrid(); this.documentInfoListBindingSource = new System.Windows.Forms.BindingSource(this.components); this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip(); this.ppCbShwDefSettings = new DevComponents.DotNetBar.Controls.CheckBoxX(); @@ -105,6 +104,18 @@ namespace VEPROMS this.ppLblDefSettingsInfo = new System.Windows.Forms.Label(); this.dlgROFolder = new System.Windows.Forms.FolderBrowserDialog(); this.tcVersions = new DevComponents.DotNetBar.TabControl(); + this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); + this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components); + this.tabControlPanel5 = new DevComponents.DotNetBar.TabControlPanel(); + this.ppGrdLibDocList = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.documentEntryCountDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.libTitleDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.tiLibDocs = new DevComponents.DotNetBar.TabItem(this.components); + this.tabControlPanel4 = new DevComponents.DotNetBar.TabControlPanel(); + this.tiFmtSettings = new DevComponents.DotNetBar.TabItem(this.components); + this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel(); + this.ppGrpbxPrnAdj = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.tiOutputSettings = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel(); this.tbRoDb = new System.Windows.Forms.TextBox(); this.ppBtnRoDbBrowse = new System.Windows.Forms.Button(); @@ -112,15 +123,6 @@ namespace VEPROMS this.cmbRoDb = new System.Windows.Forms.ComboBox(); this.ppGpbxUpROvals = new DevComponents.DotNetBar.Controls.GroupPanel(); this.tiRefObjs = new DevComponents.DotNetBar.TabItem(this.components); - this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); - this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components); - this.tabControlPanel5 = new DevComponents.DotNetBar.TabControlPanel(); - this.tiLibDocs = new DevComponents.DotNetBar.TabItem(this.components); - this.tabControlPanel4 = new DevComponents.DotNetBar.TabControlPanel(); - this.tiFmtSettings = new DevComponents.DotNetBar.TabItem(this.components); - this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel(); - this.ppGrpbxPrnAdj = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.tiOutputSettings = new DevComponents.DotNetBar.TabItem(this.components); this.panVerBtns = new System.Windows.Forms.Panel(); this.btnLibDocs = new DevComponents.DotNetBar.ButtonX(); this.btnFmtSettings = new DevComponents.DotNetBar.ButtonX(); @@ -128,9 +130,7 @@ namespace VEPROMS this.btnRefObjs = new DevComponents.DotNetBar.ButtonX(); this.btnGeneral = new DevComponents.DotNetBar.ButtonX(); this.ROPrefixBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.ppGrdLibDocList = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.documentEntryCountDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.libTitleDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.PDFLocationBrowserDialog = new System.Windows.Forms.FolderBrowserDialog(); ((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.formatInfoListBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.imageCodecInfoBindingSource)).BeginInit(); @@ -138,19 +138,19 @@ namespace VEPROMS ((System.ComponentModel.ISupportInitialize)(this.ppNumUpDwnOverdPrnPenBoldWidth)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ppNumUpDwnOvrdPrnPenULineWidth)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ppNumUpDwnAdjPrnStartPos)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.ppGrdLibDocList)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.documentInfoListBindingSource)).BeginInit(); this.ppGpbxUserSpecCB.SuspendLayout(); this.ppGpbxUserSpecTxt.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tcVersions)).BeginInit(); this.tcVersions.SuspendLayout(); - this.tabControlPanel2.SuspendLayout(); - this.ppGpbxUpROvals.SuspendLayout(); this.tabControlPanel1.SuspendLayout(); this.tabControlPanel5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.ppGrdLibDocList)).BeginInit(); this.tabControlPanel4.SuspendLayout(); this.tabControlPanel3.SuspendLayout(); this.ppGrpbxPrnAdj.SuspendLayout(); + this.tabControlPanel2.SuspendLayout(); + this.ppGpbxUpROvals.SuspendLayout(); this.panVerBtns.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.ROPrefixBindingSource)).BeginInit(); this.SuspendLayout(); @@ -234,8 +234,6 @@ namespace VEPROMS // ppCmbxFormat // this.ppCmbxFormat.DataBindings.Add(new System.Windows.Forms.Binding("SelectedValue", this.docVersionConfigBindingSource, "FormatSelection", true)); - this.ppCmbxFormat.DataSource = this.formatInfoListBindingSource; - this.ppCmbxFormat.DisplayMember = "Description"; this.ppCmbxFormat.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxFormat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxFormat.FormattingEnabled = true; @@ -245,7 +243,6 @@ namespace VEPROMS this.ppCmbxFormat.Size = new System.Drawing.Size(561, 23); this.superTooltip1.SetSuperTooltip(this.ppCmbxFormat, new DevComponents.DotNetBar.SuperTooltipInfo("Format Selection", "", resources.GetString("ppCmbxFormat.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppCmbxFormat.TabIndex = 28; - this.ppCmbxFormat.ValueMember = "Description"; this.ppCmbxFormat.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppCmbxFormat.WatermarkText = "Select a Format"; this.ppCmbxFormat.SelectedValueChanged += new System.EventHandler(this.ppCmbxFormat_SelectedValueChanged); @@ -661,6 +658,7 @@ namespace VEPROMS this.ppBtnPDFLoc.Name = "ppBtnPDFLoc"; this.ppBtnPDFLoc.Size = new System.Drawing.Size(21, 23); this.ppBtnPDFLoc.TabIndex = 64; + this.ppBtnPDFLoc.Click += new System.EventHandler(this.ppBtnPDFLoc_Click); // // ppNumUpDwnOvrdPrnPenWidth // @@ -852,6 +850,7 @@ namespace VEPROMS // // ppTxtBxPDFLoc // + this.ppTxtBxPDFLoc.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.docVersionConfigBindingSource, "Print_PDFLocation", true)); this.ppTxtBxPDFLoc.Location = new System.Drawing.Point(107, 15); this.ppTxtBxPDFLoc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppTxtBxPDFLoc.Name = "ppTxtBxPDFLoc"; @@ -917,20 +916,6 @@ namespace VEPROMS this.label17.Size = new System.Drawing.Size(77, 17); this.label17.TabIndex = 27; this.label17.Text = "Watermark"; - // - // ppGrdLibDocList - // - //this.ppGrdLibDocList.AutoGenerateColumns = false; - //this.ppGrdLibDocList.ColumnInfo = resources.GetString("ppGrdLibDocList.ColumnInfo"); - //this.ppGrdLibDocList.DataSource = this.documentInfoListBindingSource; - //this.ppGrdLibDocList.ExtendLastCol = true; - //this.ppGrdLibDocList.Location = new System.Drawing.Point(15, 15); - //this.ppGrdLibDocList.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - //this.ppGrdLibDocList.Name = "ppGrdLibDocList"; - //this.ppGrdLibDocList.Rows.Count = 1; - //this.ppGrdLibDocList.Rows.DefaultSize = 19; - //this.ppGrdLibDocList.Size = new System.Drawing.Size(628, 240); - //this.ppGrdLibDocList.TabIndex = 0; // // documentInfoListBindingSource // @@ -1055,11 +1040,11 @@ namespace VEPROMS | System.Windows.Forms.AnchorStyles.Right))); this.tcVersions.BackColor = System.Drawing.Color.Transparent; this.tcVersions.CanReorderTabs = true; + this.tcVersions.Controls.Add(this.tabControlPanel4); + this.tcVersions.Controls.Add(this.tabControlPanel3); this.tcVersions.Controls.Add(this.tabControlPanel2); this.tcVersions.Controls.Add(this.tabControlPanel1); this.tcVersions.Controls.Add(this.tabControlPanel5); - this.tcVersions.Controls.Add(this.tabControlPanel4); - this.tcVersions.Controls.Add(this.tabControlPanel3); this.tcVersions.Location = new System.Drawing.Point(173, 4); this.tcVersions.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcVersions.Name = "tcVersions"; @@ -1077,109 +1062,6 @@ namespace VEPROMS this.tcVersions.TabsVisible = false; this.tcVersions.Text = "tabControl1"; // - // tabControlPanel2 - // - this.tabControlPanel2.Controls.Add(this.tbRoDb); - this.tabControlPanel2.Controls.Add(this.ppBtnRoDbBrowse); - this.tabControlPanel2.Controls.Add(this.btnRoDbProperties); - this.tabControlPanel2.Controls.Add(this.cmbRoDb); - this.tabControlPanel2.Controls.Add(this.ppGpbxUpROvals); - this.tabControlPanel2.Controls.Add(this.label6); - 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(657, 321); - 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.tiRefObjs; - this.tabControlPanel2.Click += new System.EventHandler(this.tabpage_Enter); - // - // tbRoDb - // - this.tbRoDb.Enabled = false; - this.tbRoDb.Location = new System.Drawing.Point(107, 16); - this.tbRoDb.Name = "tbRoDb"; - this.tbRoDb.Size = new System.Drawing.Size(423, 22); - this.tbRoDb.TabIndex = 50; - // - // ppBtnRoDbBrowse - // - this.ppBtnRoDbBrowse.Location = new System.Drawing.Point(543, 12); - this.ppBtnRoDbBrowse.Name = "ppBtnRoDbBrowse"; - this.ppBtnRoDbBrowse.Size = new System.Drawing.Size(68, 24); - this.ppBtnRoDbBrowse.TabIndex = 49; - this.ppBtnRoDbBrowse.Text = "Browse..."; - this.ppBtnRoDbBrowse.UseVisualStyleBackColor = true; - this.ppBtnRoDbBrowse.Click += new System.EventHandler(this.ppBtnRoDbBrowse_Click); - // - // btnRoDbProperties - // - this.btnRoDbProperties.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnRoDbProperties.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnRoDbProperties.Image = ((System.Drawing.Image)(resources.GetObject("btnRoDbProperties.Image"))); - this.btnRoDbProperties.Location = new System.Drawing.Point(542, 12); - this.btnRoDbProperties.Name = "btnRoDbProperties"; - this.btnRoDbProperties.Size = new System.Drawing.Size(44, 28); - this.btnRoDbProperties.TabIndex = 48; - this.btnRoDbProperties.Click += new System.EventHandler(this.btnRoDbProperties_Click); - // - // cmbRoDb - // - this.cmbRoDb.FormattingEnabled = true; - this.cmbRoDb.Location = new System.Drawing.Point(107, 16); - this.cmbRoDb.Name = "cmbRoDb"; - this.cmbRoDb.Size = new System.Drawing.Size(423, 24); - this.cmbRoDb.TabIndex = 47; - this.cmbRoDb.SelectedIndexChanged += new System.EventHandler(this.cmbRoDb_SelectedIndexChanged); - // - // ppGpbxUpROvals - // - this.ppGpbxUpROvals.BackColor = System.Drawing.Color.Transparent; - this.ppGpbxUpROvals.CanvasColor = System.Drawing.SystemColors.Control; - this.ppGpbxUpROvals.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.ppGpbxUpROvals.Controls.Add(this.ppBtnResetRoVals); - this.ppGpbxUpROvals.Controls.Add(this.ppBtnUpRoVals); - this.ppGpbxUpROvals.Location = new System.Drawing.Point(46, 85); - this.ppGpbxUpROvals.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.ppGpbxUpROvals.Name = "ppGpbxUpROvals"; - this.ppGpbxUpROvals.Size = new System.Drawing.Size(149, 190); - // - // - // - this.ppGpbxUpROvals.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.ppGpbxUpROvals.Style.BackColorGradientAngle = 90; - this.ppGpbxUpROvals.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.ppGpbxUpROvals.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.ppGpbxUpROvals.Style.BorderBottomWidth = 1; - this.ppGpbxUpROvals.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.ppGpbxUpROvals.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.ppGpbxUpROvals.Style.BorderLeftWidth = 1; - this.ppGpbxUpROvals.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.ppGpbxUpROvals.Style.BorderRightWidth = 1; - this.ppGpbxUpROvals.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.ppGpbxUpROvals.Style.BorderTopWidth = 1; - this.ppGpbxUpROvals.Style.CornerDiameter = 4; - this.ppGpbxUpROvals.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.ppGpbxUpROvals.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.ppGpbxUpROvals.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.ppGpbxUpROvals.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - this.ppGpbxUpROvals.TabIndex = 46; - this.ppGpbxUpROvals.Text = "RO Values"; - // - // tiRefObjs - // - this.tiRefObjs.AttachedControl = this.tabControlPanel2; - this.tiRefObjs.Name = "tiRefObjs"; - this.tiRefObjs.Text = "Referenced Objects"; - // // tabControlPanel1 // this.tabControlPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; @@ -1235,6 +1117,52 @@ namespace VEPROMS this.tabControlPanel5.TabIndex = 5; this.tabControlPanel5.TabItem = this.tiLibDocs; // + // ppGrdLibDocList + // + this.ppGrdLibDocList.AllowUserToAddRows = false; + this.ppGrdLibDocList.AutoGenerateColumns = false; + this.ppGrdLibDocList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.ppGrdLibDocList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.documentEntryCountDataGridViewTextBoxColumn, + this.libTitleDataGridViewTextBoxColumn}); + this.ppGrdLibDocList.DataSource = this.documentInfoListBindingSource; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.ppGrdLibDocList.DefaultCellStyle = dataGridViewCellStyle2; + this.ppGrdLibDocList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.ppGrdLibDocList.HighlightSelectedColumnHeaders = false; + this.ppGrdLibDocList.Location = new System.Drawing.Point(5, 4); + this.ppGrdLibDocList.Name = "ppGrdLibDocList"; + this.ppGrdLibDocList.RowHeadersVisible = false; + this.ppGrdLibDocList.RowTemplate.Height = 24; + this.ppGrdLibDocList.SelectAllSignVisible = false; + this.ppGrdLibDocList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.ppGrdLibDocList.Size = new System.Drawing.Size(647, 300); + this.ppGrdLibDocList.TabIndex = 1; + // + // documentEntryCountDataGridViewTextBoxColumn + // + this.documentEntryCountDataGridViewTextBoxColumn.DataPropertyName = "DocumentEntryCount"; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.documentEntryCountDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1; + this.documentEntryCountDataGridViewTextBoxColumn.HeaderText = "Number of Usages"; + this.documentEntryCountDataGridViewTextBoxColumn.Name = "documentEntryCountDataGridViewTextBoxColumn"; + this.documentEntryCountDataGridViewTextBoxColumn.ReadOnly = true; + this.documentEntryCountDataGridViewTextBoxColumn.Width = 95; + // + // libTitleDataGridViewTextBoxColumn + // + this.libTitleDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.libTitleDataGridViewTextBoxColumn.DataPropertyName = "LibTitle"; + this.libTitleDataGridViewTextBoxColumn.HeaderText = "Library Document Title"; + this.libTitleDataGridViewTextBoxColumn.Name = "libTitleDataGridViewTextBoxColumn"; + this.libTitleDataGridViewTextBoxColumn.ReadOnly = true; + // // tiLibDocs // this.tiLibDocs.AttachedControl = this.tabControlPanel5; @@ -1355,6 +1283,109 @@ namespace VEPROMS this.tiOutputSettings.Name = "tiOutputSettings"; this.tiOutputSettings.Text = "Output Settings"; // + // tabControlPanel2 + // + this.tabControlPanel2.Controls.Add(this.tbRoDb); + this.tabControlPanel2.Controls.Add(this.ppBtnRoDbBrowse); + this.tabControlPanel2.Controls.Add(this.btnRoDbProperties); + this.tabControlPanel2.Controls.Add(this.cmbRoDb); + this.tabControlPanel2.Controls.Add(this.ppGpbxUpROvals); + this.tabControlPanel2.Controls.Add(this.label6); + 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(657, 321); + 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.tiRefObjs; + this.tabControlPanel2.Click += new System.EventHandler(this.tabpage_Enter); + // + // tbRoDb + // + this.tbRoDb.Enabled = false; + this.tbRoDb.Location = new System.Drawing.Point(107, 16); + this.tbRoDb.Name = "tbRoDb"; + this.tbRoDb.Size = new System.Drawing.Size(423, 22); + this.tbRoDb.TabIndex = 50; + // + // ppBtnRoDbBrowse + // + this.ppBtnRoDbBrowse.Location = new System.Drawing.Point(543, 12); + this.ppBtnRoDbBrowse.Name = "ppBtnRoDbBrowse"; + this.ppBtnRoDbBrowse.Size = new System.Drawing.Size(68, 24); + this.ppBtnRoDbBrowse.TabIndex = 49; + this.ppBtnRoDbBrowse.Text = "Browse..."; + this.ppBtnRoDbBrowse.UseVisualStyleBackColor = true; + this.ppBtnRoDbBrowse.Click += new System.EventHandler(this.ppBtnRoDbBrowse_Click); + // + // btnRoDbProperties + // + this.btnRoDbProperties.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnRoDbProperties.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnRoDbProperties.Image = ((System.Drawing.Image)(resources.GetObject("btnRoDbProperties.Image"))); + this.btnRoDbProperties.Location = new System.Drawing.Point(542, 12); + this.btnRoDbProperties.Name = "btnRoDbProperties"; + this.btnRoDbProperties.Size = new System.Drawing.Size(44, 28); + this.btnRoDbProperties.TabIndex = 48; + this.btnRoDbProperties.Click += new System.EventHandler(this.btnRoDbProperties_Click); + // + // cmbRoDb + // + this.cmbRoDb.FormattingEnabled = true; + this.cmbRoDb.Location = new System.Drawing.Point(107, 16); + this.cmbRoDb.Name = "cmbRoDb"; + this.cmbRoDb.Size = new System.Drawing.Size(423, 24); + this.cmbRoDb.TabIndex = 47; + this.cmbRoDb.SelectedIndexChanged += new System.EventHandler(this.cmbRoDb_SelectedIndexChanged); + // + // ppGpbxUpROvals + // + this.ppGpbxUpROvals.BackColor = System.Drawing.Color.Transparent; + this.ppGpbxUpROvals.CanvasColor = System.Drawing.SystemColors.Control; + this.ppGpbxUpROvals.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.ppGpbxUpROvals.Controls.Add(this.ppBtnResetRoVals); + this.ppGpbxUpROvals.Controls.Add(this.ppBtnUpRoVals); + this.ppGpbxUpROvals.Location = new System.Drawing.Point(46, 85); + this.ppGpbxUpROvals.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ppGpbxUpROvals.Name = "ppGpbxUpROvals"; + this.ppGpbxUpROvals.Size = new System.Drawing.Size(149, 190); + // + // + // + this.ppGpbxUpROvals.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.ppGpbxUpROvals.Style.BackColorGradientAngle = 90; + this.ppGpbxUpROvals.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.ppGpbxUpROvals.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGpbxUpROvals.Style.BorderBottomWidth = 1; + this.ppGpbxUpROvals.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.ppGpbxUpROvals.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGpbxUpROvals.Style.BorderLeftWidth = 1; + this.ppGpbxUpROvals.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGpbxUpROvals.Style.BorderRightWidth = 1; + this.ppGpbxUpROvals.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGpbxUpROvals.Style.BorderTopWidth = 1; + this.ppGpbxUpROvals.Style.CornerDiameter = 4; + this.ppGpbxUpROvals.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.ppGpbxUpROvals.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.ppGpbxUpROvals.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.ppGpbxUpROvals.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + this.ppGpbxUpROvals.TabIndex = 46; + this.ppGpbxUpROvals.Text = "RO Values"; + // + // tiRefObjs + // + this.tiRefObjs.AttachedControl = this.tabControlPanel2; + this.tiRefObjs.Name = "tiRefObjs"; + this.tiRefObjs.Text = "Referenced Objects"; + // // panVerBtns // this.panVerBtns.BackColor = System.Drawing.Color.Transparent; @@ -1433,52 +1464,6 @@ namespace VEPROMS this.btnGeneral.TabIndex = 0; this.btnGeneral.Text = "General"; this.btnGeneral.Click += new System.EventHandler(this.btnGeneral_Click); - // - // ppGrdLibDocList - // - this.ppGrdLibDocList.AllowUserToAddRows = false; - this.ppGrdLibDocList.AutoGenerateColumns = false; - this.ppGrdLibDocList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.ppGrdLibDocList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.documentEntryCountDataGridViewTextBoxColumn, - this.libTitleDataGridViewTextBoxColumn}); - this.ppGrdLibDocList.DataSource = this.documentInfoListBindingSource; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.ppGrdLibDocList.DefaultCellStyle = dataGridViewCellStyle2; - this.ppGrdLibDocList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.ppGrdLibDocList.HighlightSelectedColumnHeaders = false; - this.ppGrdLibDocList.Location = new System.Drawing.Point(5, 4); - this.ppGrdLibDocList.Name = "ppGrdLibDocList"; - this.ppGrdLibDocList.RowHeadersVisible = false; - this.ppGrdLibDocList.RowTemplate.Height = 24; - this.ppGrdLibDocList.SelectAllSignVisible = false; - this.ppGrdLibDocList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.ppGrdLibDocList.Size = new System.Drawing.Size(647, 300); - this.ppGrdLibDocList.TabIndex = 1; - // - // documentEntryCountDataGridViewTextBoxColumn - // - this.documentEntryCountDataGridViewTextBoxColumn.DataPropertyName = "DocumentEntryCount"; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.documentEntryCountDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1; - this.documentEntryCountDataGridViewTextBoxColumn.HeaderText = "Number of Usages"; - this.documentEntryCountDataGridViewTextBoxColumn.Name = "documentEntryCountDataGridViewTextBoxColumn"; - this.documentEntryCountDataGridViewTextBoxColumn.ReadOnly = true; - this.documentEntryCountDataGridViewTextBoxColumn.Width = 95; - // - // libTitleDataGridViewTextBoxColumn - // - this.libTitleDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.libTitleDataGridViewTextBoxColumn.DataPropertyName = "LibTitle"; - this.libTitleDataGridViewTextBoxColumn.HeaderText = "Library Document Title"; - this.libTitleDataGridViewTextBoxColumn.Name = "libTitleDataGridViewTextBoxColumn"; - this.libTitleDataGridViewTextBoxColumn.ReadOnly = true; // // frmVersionsProperties // @@ -1508,7 +1493,6 @@ namespace VEPROMS ((System.ComponentModel.ISupportInitialize)(this.ppNumUpDwnOverdPrnPenBoldWidth)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ppNumUpDwnOvrdPrnPenULineWidth)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ppNumUpDwnAdjPrnStartPos)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.ppGrdLibDocList)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.documentInfoListBindingSource)).EndInit(); this.ppGpbxUserSpecCB.ResumeLayout(false); this.ppGpbxUserSpecCB.PerformLayout(); @@ -1516,18 +1500,19 @@ namespace VEPROMS this.ppGpbxUserSpecTxt.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.tcVersions)).EndInit(); this.tcVersions.ResumeLayout(false); - this.tabControlPanel2.ResumeLayout(false); - this.tabControlPanel2.PerformLayout(); - this.ppGpbxUpROvals.ResumeLayout(false); this.tabControlPanel1.ResumeLayout(false); this.tabControlPanel1.PerformLayout(); this.tabControlPanel5.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.ppGrdLibDocList)).EndInit(); this.tabControlPanel4.ResumeLayout(false); this.tabControlPanel4.PerformLayout(); this.tabControlPanel3.ResumeLayout(false); this.tabControlPanel3.PerformLayout(); this.ppGrpbxPrnAdj.ResumeLayout(false); this.ppGrpbxPrnAdj.PerformLayout(); + this.tabControlPanel2.ResumeLayout(false); + this.tabControlPanel2.PerformLayout(); + this.ppGpbxUpROvals.ResumeLayout(false); this.panVerBtns.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.ROPrefixBindingSource)).EndInit(); this.ResumeLayout(false); @@ -1636,5 +1621,6 @@ namespace VEPROMS private DevComponents.DotNetBar.Controls.DataGridViewX ppGrdLibDocList; private System.Windows.Forms.DataGridViewTextBoxColumn documentEntryCountDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn libTitleDataGridViewTextBoxColumn; + private System.Windows.Forms.FolderBrowserDialog PDFLocationBrowserDialog; } } \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs index 52925d0c..30dfa537 100644 --- a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs +++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs @@ -159,9 +159,14 @@ namespace VEPROMS { docVersionConfigBindingSource.DataSource = _DocVersionConfig; - formatInfoListBindingSource.DataSource = FormatInfoList.Get(); + //formatInfoListBindingSource.DataSource = FormatInfoList.Get(); imageCodecInfoBindingSource.DataSource = ImageCodecInfo.GetImageDecoders(); + ppCmbxFormat.DataSource = null; + ppCmbxFormat.DisplayMember = "FullName"; + ppCmbxFormat.ValueMember = "FullName"; + ppCmbxFormat.DataSource = FormatInfoList.SortedFormatInfoList; + // Get the saved settings for this user // // Get setting telling us whether to display the default values on this property page @@ -738,6 +743,14 @@ namespace VEPROMS } } + private void ppBtnPDFLoc_Click(object sender, EventArgs e) + { + PDFLocationBrowserDialog.SelectedPath = ppTxtBxPDFLoc.Text; + DialogResult dr = PDFLocationBrowserDialog.ShowDialog(); + if (dr == DialogResult.OK) + ppTxtBxPDFLoc.Text = PDFLocationBrowserDialog.SelectedPath; + } + } } \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.resx b/PROMS/VEPROMS User Interface/frmVersionsProperties.resx index d2df80c1..19aa6aa1 100644 --- a/PROMS/VEPROMS User Interface/frmVersionsProperties.resx +++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.resx @@ -123,9 +123,6 @@ 227, 17 - - 17, 60 - Allows you to specify the default format to use for all procedures in this set. @@ -136,6 +133,9 @@ When a format other than the inherited one is selected, a button labeled "Defaul Pressing the "Default" button will revert back to using the inherited format. + + 883, 17 + This will revert the Change Bar Text Type selection back to using the parent's (default) setting. @@ -157,14 +157,14 @@ 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). - 263, 60 + 17, 60 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALBQAA - CwUByY3ISQAAAn9JREFUOE+lk2tI01EYxhf0oU8WqVEIRpaIBWJgSPUhROmippS3QkkTylsXDMW8ts3b + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALAQAA + CwEBNnBPWwAAAn9JREFUOE+lk2tI01EYxhf0oU8WqVEIRpaIBWJgSPUhROmippS3QkkTylsXDMW8ts3b 1G06daVibuqaOq0sxbBCKBSJ0PJCialZUFSKqaGSt1//TbIsww8deOBwznl+5zkv71kHiP5rGAFrKb1Q 5ypR6bmaVU6m2kCiXJv007Om2XgwJEaNT4QiyDi/GF9mKRVgsWkav+CYQkR1utwAQfypphqZ4l/JIhOL jvtGKfCOyDMB6O/WMjNea9L3MT1zIxoM5QrqdWnS1SA+kUq8w1V4hhUgqq1QMj1WtcK88KmIud5oqsqy @@ -192,11 +192,8 @@ Fixed - pagination is done only when you select to do so. This information is s Auto - pagination is done when VE-PROMS senses a change was made to the procedure since the last time the procedure was repaginated. - - 13,0,0,0,0,95,Columns:0{Width:98;Name:"DocumentTitle";Caption:"DocumentTitle";Visible:False;AllowEditing:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 1{Width:153;Name:"LibraryDocumentUsage";Caption:"LibraryDocumentUsage";Visible:False;AllowEditing:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 2{Width:96;Name:"ErrorMessage";Caption:"ErrorMessage";Visible:False;AllowEditing:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 3{Width:49;Name:"DocID";Caption:"DocID";Visible:False;AllowEditing:False;Style:"DataType:System.Int32;TextAlign:RightCenter;";} 4{Width:140;Name:"DocumentEntryCount";Caption:"Number of Usages";AllowEditing:False;Style:"DataType:System.Int32;TextAlign:RightCenter;";} 5{Width:426;Name:"LibTitle";Caption:"Library Document Title";AllowEditing:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 6{Name:"DocContent";Caption:"DocContent";Visible:False;AllowEditing:False;Style:"DataType:System.Byte[];TextAlign:GeneralCenter;";} 7{Width:64;Name:"DocAscii";Caption:"DocAscii";Visible:False;AllowEditing:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 8{Width:51;Name:"Config";Caption:"Config";Visible:False;AllowEditing:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 9{Width:39;Name:"DTS";Caption:"DTS";Visible:False;AllowEditing:False;Style:"Format:""d"";DataType:System.DateTime;TextAlign:LeftCenter;";} 10{Width:53;Name:"UserID";Caption:"UserID";Visible:False;AllowEditing:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 11{Name:"DocumentEntries";Caption:"DocumentEntries";Visible:False;AllowEditing:False;Style:"TextAlign:GeneralCenter;";} 12{Width:156;Name:"MyDocumentInfoUnique";Caption:"MyDocumentInfoUnique";Visible:False;AllowEditing:False;Style:"DataType:System.Int32;TextAlign:RightCenter;";} - - 17, 103 + 418, 60 - Select the position of the change bar with respect to the changed text @@ -206,13 +203,13 @@ Auto - pagination is done when VE-PROMS senses a change was made to the procedur - Type in your own text to be placed next to the change bars. - 526, 60 + 280, 60 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALBwAA - CwcBtnMLwAAAAg9JREFUOE+lk91LU2EAxo9/QV4kgSiBXYggXhS7sBIUiUgHCd4UZTG0u9Ka9sEuumgS + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALAwAA + CwMBSY6M0gAAAg9JREFUOE+lk91LU2EAxo9/QV4kgSiBXYggXhS7sBIUiUgHCd4UZTG0u9Ka9sEuumgS homLcOwcTqGuc5bh59lcM1K3VNoqERoIFjnaVNwEB0sGDbfH933nhLlTBA0eDpzD7/c8nLM3DwD3Xz8q UMvwq95KEgwNPIUkdqHfbIRgeghzt4HGILp4yJ7Rv8Pxn0ZksvP9PmJfb2BJuc4kFBb8z3MFmWYK6q9U M0EGjvoasDV7BmFnGYzSPTxwN4GzOb+ARp78BHl8GnQ2hW7r6tm1/fJZ1pyB15RSLFuL0NrXgpuORnDy @@ -227,4 +224,7 @@ Auto - pagination is done when VE-PROMS senses a change was made to the procedur 17, 17 + + 647, 17 + \ No newline at end of file