diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs b/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs index fd206ea1..0af99c19 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs @@ -169,18 +169,18 @@ namespace VEPROMS this.btnRefObjs = new DevComponents.DotNetBar.ButtonX(); this.btnGeneral = new DevComponents.DotNetBar.ButtonX(); 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.tcpEdSettings = new DevComponents.DotNetBar.TabControlPanel(); this.tiEditSettings = new DevComponents.DotNetBar.TabItem(this.components); - this.tcpFmtSettings = new DevComponents.DotNetBar.TabControlPanel(); - this.tiFmtSettings = 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.tcpRefObjs = new DevComponents.DotNetBar.TabControlPanel(); + this.tiRefObj = new DevComponents.DotNetBar.TabItem(this.components); + this.tcpStMsg = new DevComponents.DotNetBar.TabControlPanel(); + this.tiStMsg = new DevComponents.DotNetBar.TabItem(this.components); ((System.ComponentModel.ISupportInitialize)(this.folderConfigBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.imageCodecInfoBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ppNumUpDwnOvrdPrnPenWidth)).BeginInit(); @@ -200,12 +200,12 @@ namespace VEPROMS this.panButtons.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tcFolder)).BeginInit(); this.tcFolder.SuspendLayout(); - this.tcpRefObjs.SuspendLayout(); + this.tcpFmtSettings.SuspendLayout(); this.tcpGeneral.SuspendLayout(); this.tcpEdSettings.SuspendLayout(); - this.tcpFmtSettings.SuspendLayout(); - this.tcpStMsg.SuspendLayout(); this.tcpOutputSettings.SuspendLayout(); + this.tcpRefObjs.SuspendLayout(); + this.tcpStMsg.SuspendLayout(); this.SuspendLayout(); // // ppBtnOK @@ -240,6 +240,7 @@ namespace VEPROMS this.label1.Size = new System.Drawing.Size(35, 17); this.label1.TabIndex = 3; this.label1.Text = "Title"; + this.label1.Visible = false; // // label2 // @@ -260,6 +261,7 @@ namespace VEPROMS this.label3.Size = new System.Drawing.Size(55, 17); this.label3.TabIndex = 5; this.label3.Text = "User ID"; + this.label3.Visible = false; // // label4 // @@ -270,6 +272,7 @@ namespace VEPROMS this.label4.Size = new System.Drawing.Size(73, 17); this.label4.TabIndex = 6; this.label4.Text = "Date/Time"; + this.label4.Visible = false; // // ppTxtBxUserID // @@ -278,6 +281,7 @@ namespace VEPROMS this.ppTxtBxUserID.Name = "ppTxtBxUserID"; this.ppTxtBxUserID.Size = new System.Drawing.Size(154, 22); this.ppTxtBxUserID.TabIndex = 10; + this.ppTxtBxUserID.Visible = false; // // folderConfigBindingSource // @@ -292,6 +296,7 @@ namespace VEPROMS this.ppDTPicker.Name = "ppDTPicker"; this.ppDTPicker.Size = new System.Drawing.Size(172, 22); this.ppDTPicker.TabIndex = 12; + this.ppDTPicker.Visible = false; // // ppRTxtName // @@ -312,6 +317,7 @@ namespace VEPROMS this.ppRTxtTitle.Size = new System.Drawing.Size(436, 22); this.ppRTxtTitle.TabIndex = 13; this.ppRTxtTitle.Text = ""; + this.ppRTxtTitle.Visible = false; // // label6 // @@ -560,6 +566,7 @@ namespace VEPROMS // // ppCmbxWatermark // + this.ppCmbxWatermark.DataBindings.Add(new System.Windows.Forms.Binding("SelectedValue", this.folderConfigBindingSource, "Print_Watermark", true)); this.ppCmbxWatermark.DisplayMember = "Text"; this.ppCmbxWatermark.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxWatermark.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -574,6 +581,7 @@ namespace VEPROMS // // ppCmbxPagination // + this.ppCmbxPagination.DataBindings.Add(new System.Windows.Forms.Binding("SelectedValue", this.folderConfigBindingSource, "Print_Pagination", true)); this.ppCmbxPagination.DisplayMember = "Text"; this.ppCmbxPagination.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxPagination.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -953,6 +961,7 @@ namespace VEPROMS // // ppCmbxChgBarTxtType // + this.ppCmbxChgBarTxtType.DataBindings.Add(new System.Windows.Forms.Binding("SelectedValue", this.folderConfigBindingSource, "Print_ChangeBarText", true)); this.ppCmbxChgBarTxtType.DisplayMember = "Text"; this.ppCmbxChgBarTxtType.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxChgBarTxtType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -967,6 +976,7 @@ namespace VEPROMS // // ppCmbxChgBarPos // + this.ppCmbxChgBarPos.DataBindings.Add(new System.Windows.Forms.Binding("SelectedValue", this.folderConfigBindingSource, "Print_ChangeBarLoc", true)); this.ppCmbxChgBarPos.DisplayMember = "Text"; this.ppCmbxChgBarPos.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxChgBarPos.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -1163,9 +1173,6 @@ namespace VEPROMS this.ppColorPickerViewModebckgnd.ImagePaddingHorizontal = 8; this.ppColorPickerViewModebckgnd.Name = "ppColorPickerViewModebckgnd"; this.ppColorPickerViewModebckgnd.Text = "Non Active Edit Window Background"; - this.ppColorPickerViewModebckgnd.PopupFinalized += new System.EventHandler(this.ppColorPickerViewModebckgnd_PopupFinalized); - this.ppColorPickerViewModebckgnd.SelectedColorChanged += new System.EventHandler(this.ppColorPickerViewModebckgnd_SelectedColorChanged); - this.ppColorPickerViewModebckgnd.ColorPreview += new DevComponents.DotNetBar.ColorPreviewEventHandler(this.ppColorPickerViewModebckgnd_ColorPreview); // // ppColorPickerEditModeBckGnd // @@ -1173,9 +1180,6 @@ namespace VEPROMS this.ppColorPickerEditModeBckGnd.ImagePaddingHorizontal = 8; this.ppColorPickerEditModeBckGnd.Name = "ppColorPickerEditModeBckGnd"; this.ppColorPickerEditModeBckGnd.Text = "Active Edit Window Background"; - this.ppColorPickerEditModeBckGnd.PopupFinalized += new System.EventHandler(this.ppColorPickerEditModeBckGnd_PopupFinalized); - this.ppColorPickerEditModeBckGnd.SelectedColorChanged += new System.EventHandler(this.ppColorPickerEditModeBckGnd_SelectedColorChanged); - this.ppColorPickerEditModeBckGnd.ColorPreview += new DevComponents.DotNetBar.ColorPreviewEventHandler(this.ppColorPickerEditModeBckGnd_ColorPreview); // // ppColorPickerTransition // @@ -1183,9 +1187,6 @@ namespace VEPROMS this.ppColorPickerTransition.ImagePaddingHorizontal = 8; this.ppColorPickerTransition.Name = "ppColorPickerTransition"; this.ppColorPickerTransition.Text = "Transitions"; - this.ppColorPickerTransition.PopupFinalized += new System.EventHandler(this.ppColorPickerTransition_PopupFinalized); - this.ppColorPickerTransition.SelectedColorChanged += new System.EventHandler(this.ppColorPickerTransition_SelectedColorChanged); - this.ppColorPickerTransition.ColorPreview += new DevComponents.DotNetBar.ColorPreviewEventHandler(this.ppColorPickerTransition_ColorPreview); // // ppColorPickerRO // @@ -1193,9 +1194,6 @@ namespace VEPROMS this.ppColorPickerRO.ImagePaddingHorizontal = 8; this.ppColorPickerRO.Name = "ppColorPickerRO"; this.ppColorPickerRO.Text = "Referenced Objects"; - this.ppColorPickerRO.PopupFinalized += new System.EventHandler(this.ppColorPickerRO_PopupFinalized); - this.ppColorPickerRO.SelectedColorChanged += new System.EventHandler(this.ppColorPickerRO_SelectedColorChanged); - this.ppColorPickerRO.ColorPreview += new DevComponents.DotNetBar.ColorPreviewEventHandler(this.ppColorPickerRO_ColorPreview); // // label36 // @@ -1794,6 +1792,7 @@ namespace VEPROMS this.superTooltip1.SetSuperTooltip(this.groupPanel6, new DevComponents.DotNetBar.SuperTooltipInfo("Step Editor Text Color", "", resources.GetString("groupPanel6.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 180))); this.groupPanel6.TabIndex = 51; this.groupPanel6.Text = "Step Editor Text Colors"; + this.groupPanel6.Visible = false; // // dlgROFolder // @@ -1892,12 +1891,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.tcpOutputSettings); - this.tcFolder.Controls.Add(this.tcpStMsg); this.tcFolder.Controls.Add(this.tcpFmtSettings); + this.tcFolder.Controls.Add(this.tcpGeneral); this.tcFolder.Controls.Add(this.tcpEdSettings); + this.tcFolder.Controls.Add(this.tcpOutputSettings); + this.tcFolder.Controls.Add(this.tcpRefObjs); + this.tcFolder.Controls.Add(this.tcpStMsg); this.tcFolder.Location = new System.Drawing.Point(173, 7); this.tcFolder.Name = "tcFolder"; this.tcFolder.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold); @@ -1915,39 +1914,39 @@ namespace VEPROMS this.tcFolder.TabsVisible = false; this.tcFolder.Text = "tabControl2"; // - // tcpRefObjs + // tcpFmtSettings // - this.tcpRefObjs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.tcpRefObjs.Controls.Add(this.groupPanel1); - this.tcpRefObjs.Controls.Add(this.ppBtnFldrDlg); - this.tcpRefObjs.Controls.Add(this.label6); - this.tcpRefObjs.Controls.Add(this.ppTxbxRoFoldLoc); - this.tcpRefObjs.Controls.Add(this.ppBtnDefaultGrfExt); - this.tcpRefObjs.Controls.Add(this.ppLblROFldrLocDefault); - this.tcpRefObjs.Controls.Add(this.ppCmbxGrphFileExt); - this.tcpRefObjs.Controls.Add(this.ppLblGraphicFileExtDefault); - this.tcpRefObjs.Controls.Add(this.label37); - this.tcpRefObjs.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpRefObjs.Location = new System.Drawing.Point(0, 24); - this.tcpRefObjs.Name = "tcpRefObjs"; - this.tcpRefObjs.Padding = new System.Windows.Forms.Padding(1); - this.tcpRefObjs.Size = new System.Drawing.Size(686, 283); - this.tcpRefObjs.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.tcpRefObjs.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(195)))), ((int)(((byte)(195))))); - this.tcpRefObjs.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tcpRefObjs.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); - this.tcpRefObjs.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + this.tcpFmtSettings.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.tcpFmtSettings.Controls.Add(this.ppGpbxUserSpecCB); + this.tcpFmtSettings.Controls.Add(this.ppBtnDefaultChgBar); + this.tcpFmtSettings.Controls.Add(this.ppCmbxChangeBarType); + this.tcpFmtSettings.Controls.Add(this.label23); + this.tcpFmtSettings.Controls.Add(this.ppBtnDefaultFmt); + this.tcpFmtSettings.Controls.Add(this.label30); + this.tcpFmtSettings.Controls.Add(this.ppCmbxFormat); + this.tcpFmtSettings.Controls.Add(this.ppLblChangeBarTypeDefault); + this.tcpFmtSettings.Controls.Add(this.ppLblFormatDefault); + this.tcpFmtSettings.Dock = System.Windows.Forms.DockStyle.Fill; + this.tcpFmtSettings.Location = new System.Drawing.Point(0, 24); + this.tcpFmtSettings.Name = "tcpFmtSettings"; + this.tcpFmtSettings.Padding = new System.Windows.Forms.Padding(1); + this.tcpFmtSettings.Size = new System.Drawing.Size(686, 283); + 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; + this.tcpFmtSettings.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); + this.tcpFmtSettings.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tcpRefObjs.Style.GradientAngle = 90; - this.tcpRefObjs.TabIndex = 2; - this.tcpRefObjs.TabItem = this.tiRefObj; - this.tcpRefObjs.Enter += new System.EventHandler(this.tabpage_Enter); + this.tcpFmtSettings.Style.GradientAngle = 90; + this.tcpFmtSettings.TabIndex = 5; + this.tcpFmtSettings.TabItem = this.tiFmtSettings; + this.tcpFmtSettings.Enter += new System.EventHandler(this.tabpage_Enter); // - // tiRefObj + // tiFmtSettings // - this.tiRefObj.AttachedControl = this.tcpRefObjs; - this.tiRefObj.Name = "tiRefObj"; - this.tiRefObj.Text = "Referenced Objects"; + this.tiFmtSettings.AttachedControl = this.tcpFmtSettings; + this.tiFmtSettings.Name = "tiFmtSettings"; + this.tiFmtSettings.Text = "Format Settings"; // // tcpGeneral // @@ -1965,10 +1964,10 @@ namespace VEPROMS this.tcpGeneral.Name = "tcpGeneral"; this.tcpGeneral.Padding = new System.Windows.Forms.Padding(1); this.tcpGeneral.Size = new System.Drawing.Size(686, 283); - this.tcpGeneral.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.tcpGeneral.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(195)))), ((int)(((byte)(195))))); + 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)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); + 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; @@ -1994,10 +1993,10 @@ namespace VEPROMS this.tcpEdSettings.Name = "tcpEdSettings"; this.tcpEdSettings.Padding = new System.Windows.Forms.Padding(1); this.tcpEdSettings.Size = new System.Drawing.Size(686, 283); - this.tcpEdSettings.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.tcpEdSettings.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(195)))), ((int)(((byte)(195))))); + 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; - this.tcpEdSettings.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); + this.tcpEdSettings.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); this.tcpEdSettings.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tcpEdSettings.Style.GradientAngle = 90; @@ -2011,73 +2010,6 @@ namespace VEPROMS this.tiEditSettings.Name = "tiEditSettings"; this.tiEditSettings.Text = "Editor Settings"; // - // tcpFmtSettings - // - this.tcpFmtSettings.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.tcpFmtSettings.Controls.Add(this.ppGpbxUserSpecCB); - this.tcpFmtSettings.Controls.Add(this.ppBtnDefaultChgBar); - this.tcpFmtSettings.Controls.Add(this.ppCmbxChangeBarType); - this.tcpFmtSettings.Controls.Add(this.label23); - this.tcpFmtSettings.Controls.Add(this.ppBtnDefaultFmt); - this.tcpFmtSettings.Controls.Add(this.label30); - this.tcpFmtSettings.Controls.Add(this.ppCmbxFormat); - this.tcpFmtSettings.Controls.Add(this.ppLblChangeBarTypeDefault); - this.tcpFmtSettings.Controls.Add(this.ppLblFormatDefault); - this.tcpFmtSettings.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpFmtSettings.Location = new System.Drawing.Point(0, 24); - this.tcpFmtSettings.Name = "tcpFmtSettings"; - this.tcpFmtSettings.Padding = new System.Windows.Forms.Padding(1); - this.tcpFmtSettings.Size = new System.Drawing.Size(686, 283); - this.tcpFmtSettings.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.tcpFmtSettings.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(195)))), ((int)(((byte)(195))))); - this.tcpFmtSettings.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tcpFmtSettings.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); - this.tcpFmtSettings.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tcpFmtSettings.Style.GradientAngle = 90; - this.tcpFmtSettings.TabIndex = 5; - this.tcpFmtSettings.TabItem = this.tiFmtSettings; - this.tcpFmtSettings.Enter += new System.EventHandler(this.tabpage_Enter); - // - // tiFmtSettings - // - this.tiFmtSettings.AttachedControl = this.tcpFmtSettings; - this.tiFmtSettings.Name = "tiFmtSettings"; - this.tiFmtSettings.Text = "Format Settings"; - // - // tcpStMsg - // - this.tcpStMsg.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.tcpStMsg.Controls.Add(this.ppChkbxStMsgActive); - this.tcpStMsg.Controls.Add(this.label5); - this.tcpStMsg.Controls.Add(this.ppRTxtStMsg); - this.tcpStMsg.Controls.Add(this.ppCmbxStMsgList); - this.tcpStMsg.Controls.Add(this.ppBtnStMsgPreview); - this.tcpStMsg.Controls.Add(this.ppBtnStMsgNew); - this.tcpStMsg.Controls.Add(this.ppBtnStMsgSave); - this.tcpStMsg.Controls.Add(this.ppBtnStMsgEdit); - this.tcpStMsg.Controls.Add(this.ppBtnStMsgDelete); - this.tcpStMsg.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpStMsg.Location = new System.Drawing.Point(0, 24); - this.tcpStMsg.Name = "tcpStMsg"; - this.tcpStMsg.Padding = new System.Windows.Forms.Padding(1); - this.tcpStMsg.Size = new System.Drawing.Size(686, 283); - this.tcpStMsg.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.tcpStMsg.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(195)))), ((int)(((byte)(195))))); - this.tcpStMsg.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tcpStMsg.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); - this.tcpStMsg.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tcpStMsg.Style.GradientAngle = 90; - this.tcpStMsg.TabIndex = 4; - this.tcpStMsg.TabItem = this.tiStMsg; - // - // tiStMsg - // - this.tiStMsg.AttachedControl = this.tcpStMsg; - this.tiStMsg.Name = "tiStMsg"; - this.tiStMsg.Text = "Startup Message"; - // // tcpOutputSettings // this.tcpOutputSettings.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; @@ -2098,10 +2030,10 @@ namespace VEPROMS this.tcpOutputSettings.Name = "tcpOutputSettings"; this.tcpOutputSettings.Padding = new System.Windows.Forms.Padding(1); this.tcpOutputSettings.Size = new System.Drawing.Size(686, 283); - this.tcpOutputSettings.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.tcpOutputSettings.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(195)))), ((int)(((byte)(195))))); + 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; - this.tcpOutputSettings.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); + this.tcpOutputSettings.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); this.tcpOutputSettings.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tcpOutputSettings.Style.GradientAngle = 90; @@ -2115,6 +2047,73 @@ namespace VEPROMS this.tiOutputSettings.Name = "tiOutputSettings"; this.tiOutputSettings.Text = "Output Settings"; // + // tcpRefObjs + // + this.tcpRefObjs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.tcpRefObjs.Controls.Add(this.groupPanel1); + this.tcpRefObjs.Controls.Add(this.ppBtnFldrDlg); + this.tcpRefObjs.Controls.Add(this.label6); + this.tcpRefObjs.Controls.Add(this.ppTxbxRoFoldLoc); + this.tcpRefObjs.Controls.Add(this.ppBtnDefaultGrfExt); + this.tcpRefObjs.Controls.Add(this.ppLblROFldrLocDefault); + this.tcpRefObjs.Controls.Add(this.ppCmbxGrphFileExt); + this.tcpRefObjs.Controls.Add(this.ppLblGraphicFileExtDefault); + this.tcpRefObjs.Controls.Add(this.label37); + this.tcpRefObjs.Dock = System.Windows.Forms.DockStyle.Fill; + this.tcpRefObjs.Location = new System.Drawing.Point(0, 24); + this.tcpRefObjs.Name = "tcpRefObjs"; + this.tcpRefObjs.Padding = new System.Windows.Forms.Padding(1); + this.tcpRefObjs.Size = new System.Drawing.Size(686, 283); + 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; + this.tcpRefObjs.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); + this.tcpRefObjs.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tcpRefObjs.Style.GradientAngle = 90; + this.tcpRefObjs.TabIndex = 2; + this.tcpRefObjs.TabItem = this.tiRefObj; + this.tcpRefObjs.Enter += new System.EventHandler(this.tabpage_Enter); + // + // tiRefObj + // + this.tiRefObj.AttachedControl = this.tcpRefObjs; + this.tiRefObj.Name = "tiRefObj"; + this.tiRefObj.Text = "Referenced Objects"; + // + // tcpStMsg + // + this.tcpStMsg.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.tcpStMsg.Controls.Add(this.ppChkbxStMsgActive); + this.tcpStMsg.Controls.Add(this.label5); + this.tcpStMsg.Controls.Add(this.ppRTxtStMsg); + this.tcpStMsg.Controls.Add(this.ppCmbxStMsgList); + this.tcpStMsg.Controls.Add(this.ppBtnStMsgPreview); + this.tcpStMsg.Controls.Add(this.ppBtnStMsgNew); + this.tcpStMsg.Controls.Add(this.ppBtnStMsgSave); + this.tcpStMsg.Controls.Add(this.ppBtnStMsgEdit); + this.tcpStMsg.Controls.Add(this.ppBtnStMsgDelete); + this.tcpStMsg.Dock = System.Windows.Forms.DockStyle.Fill; + this.tcpStMsg.Location = new System.Drawing.Point(0, 24); + this.tcpStMsg.Name = "tcpStMsg"; + this.tcpStMsg.Padding = new System.Windows.Forms.Padding(1); + this.tcpStMsg.Size = new System.Drawing.Size(686, 283); + 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; + this.tcpStMsg.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); + this.tcpStMsg.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tcpStMsg.Style.GradientAngle = 90; + this.tcpStMsg.TabIndex = 4; + this.tcpStMsg.TabItem = this.tiStMsg; + // + // tiStMsg + // + this.tiStMsg.AttachedControl = this.tcpStMsg; + this.tiStMsg.Name = "tiStMsg"; + this.tiStMsg.Text = "Startup Message"; + // // frmFolderProperties // this.AcceptButton = this.ppBtnOK; @@ -2165,18 +2164,18 @@ namespace VEPROMS this.panButtons.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.tcFolder)).EndInit(); 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.tcpEdSettings.ResumeLayout(false); this.tcpEdSettings.PerformLayout(); - this.tcpFmtSettings.ResumeLayout(false); - this.tcpFmtSettings.PerformLayout(); - this.tcpStMsg.ResumeLayout(false); - this.tcpStMsg.PerformLayout(); this.tcpOutputSettings.ResumeLayout(false); this.tcpOutputSettings.PerformLayout(); + this.tcpRefObjs.ResumeLayout(false); + this.tcpRefObjs.PerformLayout(); + this.tcpStMsg.ResumeLayout(false); + this.tcpStMsg.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -2335,5 +2334,6 @@ namespace VEPROMS private DevComponents.DotNetBar.Controls.GroupPanel ppGpbxUserSpecTxt; private DevComponents.DotNetBar.Controls.GroupPanel groupPanel2; private DevComponents.DotNetBar.Controls.GroupPanel groupPanel6; + //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 579890f2..44916922 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.cs +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.cs @@ -86,6 +86,12 @@ namespace VEPROMS // Get the default RO Graphic file extension _DefaultROGraficFileExtension = _FolderConfig.Graphics_defaultext; + // if no graphic file extension was saved, use Tif + if (_DefaultROGraficFileExtension.Equals("")) + { + ppCmbxGrphFileExt.SelectedIndex = 5; + _DefaultROGraficFileExtension = ppCmbxGrphFileExt.Text; + } SetupDefault(_DefaultROGraficFileExtension, ppLblGraphicFileExtDefault, ppCmbxGrphFileExt); // Get the default Referenced Objects prefix @@ -164,6 +170,11 @@ namespace VEPROMS this.btnEdSettings.Visible = false; ppLblDefSettingsInfo.Visible = false; ppCbShwDefSettings.Visible = false; // hide check box for showing default values for top node + ppCbShwDefSettings.Checked = false; + // FOR NOW, don't show Start Message tab + // TODO: later on, not needed for initial release. + this.tcFolder.Tabs.Remove(tiStMsg); + this.btnStMsg.Visible = false; } else { @@ -171,6 +182,8 @@ namespace VEPROMS this.tcFolder.Tabs.Remove(tiStMsg); this.btnStMsg.Visible = false; + /* This color settings property page is currently no visible... + * // this was coded for demo purposes... setup the text colors for the sample text // of the Step Editor Text Colors property _ROcolor = _FolderConfig.Color_ro; @@ -182,11 +195,14 @@ namespace VEPROMS _TransColor = _FolderConfig.Color_transition; if (_TransColor == string.Empty) _TransColor = "Orange"; SetupSampleTextBoxes(); + * */ // Assign the data sources to the combo boxes ppCmbxChangeBarType.DataSource = EnumDetail.Details(); ppCmbxChangeBarType.DisplayMember = "Name"; + //ppCmbxChgBarPos.DisplayMember = "Description"; ppCmbxChangeBarType.ValueMember = "EValue"; + ppCmbxChangeBarType.SelectedValue = -1; ppCmbxChgBarPos.DataSource = EnumDetail.Details(); ppCmbxChgBarPos.DisplayMember = "Name"; @@ -371,6 +387,7 @@ namespace VEPROMS /// EventArgs private void ppCmbxPagination_SelectedValueChanged(object sender, EventArgs e) { + //ProcessCmbxSelectedValueChange(ppCmbxPagination, _DefaultPagination, ppBtnDefPagination, ppLblPaginationDefault); FolderConfig.PrintPagination pgtn = (FolderConfig.PrintPagination)Enum.Parse(typeof(FolderConfig.PrintPagination), _DefaultPagination); ProcessCmbxSelectionEnumChanged(ppCmbxPagination, pgtn, ppBtnDefPagination, ppLblPaginationDefault); } @@ -471,13 +488,23 @@ namespace VEPROMS /// EventArgs private void ppCmbxChangeBarType_SelectedValueChanged(object sender, EventArgs e) { - FolderConfig.PrintChangeBar pcb = (FolderConfig.PrintChangeBar)Enum.Parse(typeof(FolderConfig.PrintChangeBar), _DefaultChgBarType); - ProcessCmbxSelectionEnumChanged(ppCmbxChangeBarType, pcb, ppBtnDefaultChgBar, ppLblChangeBarTypeDefault); - setEnabledUserSpecifiedChgBarCombos(pcb); + if (!_Initializing) + { + FolderConfig.PrintChangeBar pcb = (FolderConfig.PrintChangeBar)Enum.Parse(typeof(FolderConfig.PrintChangeBar), _DefaultChgBarType); + ProcessCmbxSelectionEnumChanged(ppCmbxChangeBarType, pcb, ppBtnDefaultChgBar, ppLblChangeBarTypeDefault); + setEnabledUserSpecifiedChgBarCombos(pcb); + } } private void ppBtnDefaultChgBar_Click(object sender, EventArgs e) { + // Find the parent setting and assign it to _FolderConfig.PrintChangeBar. This will force the database + // to be updated. Prior to adding this logic, if we were saving a setting identical to the parent setting, + // the database was not being updated, because it didn't see it as being different. + // + FolderConfig.PrintChangeBar pcb = (FolderConfig.PrintChangeBar)Enum.Parse(typeof(FolderConfig.PrintChangeBar), _DefaultChgBarType); + if (pcb!= _FolderConfig.Print_ChangeBar) + _FolderConfig.Print_ChangeBar = pcb; // t ppCmbxChangeBarType.SelectedIndex = -1; //reset to the default Change Bar setting } @@ -562,6 +589,9 @@ namespace VEPROMS ProcessButtonClick(tiEditSettings, btnEdSettings); } + #region Editor Color Property Page Settings + /** The property page for these color settings is not visible for now. + * /// /// Set the text and background colors for the sample text for the Step Editor Text Colors /// on the Editor Settings property page @@ -712,6 +742,8 @@ namespace VEPROMS ppLblViewRO.ForeColor = cGetColor(_ROcolor); ppLblEditRO.ForeColor = cGetColor(_ROcolor); } +**/ + #endregion /// /// Selection in Step Editor Columns combo box changed. @@ -844,14 +876,14 @@ namespace VEPROMS /// label containing the default private void ProcessCmbxSelectionEnumChanged(ComboBoxEx cmbx, object enumval, ButtonX button, Label deflabel) { - if ((cmbx.SelectedIndex != -1) && - cmbx.SelectedValue.Equals(enumval)) - { - button.Focus(); - button.PerformClick(); - } - button.Visible = ((!_FolderConfig.Name.Equals("VEPROMS")) && (cmbx.SelectedValue != null)); - deflabel.Visible = ppCbShwDefSettings.Checked && button.Visible; + if ((cmbx.SelectedIndex != -1) && + cmbx.SelectedValue.Equals(enumval)) + { + button.Focus(); + button.PerformClick(); + } + button.Visible = ((!_FolderConfig.Name.Equals("VEPROMS")) && (cmbx.SelectedValue != null)); + deflabel.Visible = ppCbShwDefSettings.Checked && button.Visible; } /// diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.resx b/PROMS/VEPROMS User Interface/frmFolderProperties.resx index b9338356..f4369e5d 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.resx +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.resx @@ -247,4 +247,7 @@ We also found that the various printer drivers can differ in the starting positi 263, 57 + + 102 + \ No newline at end of file