diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs b/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs index 6222eb83..5de5cbe2 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs @@ -41,23 +41,11 @@ namespace VEPROMS this.ppDTPicker = new System.Windows.Forms.DateTimePicker(); this.ppRTxtName = new System.Windows.Forms.RichTextBox(); this.ppRTxtTitle = new System.Windows.Forms.RichTextBox(); - this.label6 = new System.Windows.Forms.Label(); - this.ppLblROFldrLocDefault = new System.Windows.Forms.Label(); - this.ppBtnFldrDlg = new DevComponents.DotNetBar.ButtonX(); - this.ppTxbxRoFoldLoc = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.label8 = new System.Windows.Forms.Label(); - this.ppBtnDefaultROPrefix = new DevComponents.DotNetBar.ButtonX(); - this.label7 = new System.Windows.Forms.Label(); - this.ppBtnDefaultImgPrefix = new DevComponents.DotNetBar.ButtonX(); - this.ppLblImagePrefixDefault = new System.Windows.Forms.Label(); - this.ppLblROPrefixDefault = new System.Windows.Forms.Label(); - this.ppCmbxDefROPrefix = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.ppCmbxDefImgPrefix = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.ppBtnDefaultGrfExt = new DevComponents.DotNetBar.ButtonX(); + this.ppBtnDefaultGrphFileExt = new DevComponents.DotNetBar.ButtonX(); this.ppCmbxGrphFileExt = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.imageCodecInfoBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.ppLblGraphicFileExtDefault = new System.Windows.Forms.Label(); - this.label37 = new System.Windows.Forms.Label(); + this.ppLblGrphFileExtDefault = new System.Windows.Forms.Label(); + this.lblGrphFileExt = new System.Windows.Forms.Label(); this.ppBtnDeftDisAutoDuplx = new DevComponents.DotNetBar.ButtonX(); this.ppBtnDefWatermark = new DevComponents.DotNetBar.ButtonX(); this.ppBtnDefPagination = new DevComponents.DotNetBar.ButtonX(); @@ -154,7 +142,6 @@ namespace VEPROMS this.ppLblDefSettingsInfo = new System.Windows.Forms.Label(); this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip(); this.ppCbShwDefSettings = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.groupPanel2 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.ppGpbxUserSpecCB = new DevComponents.DotNetBar.Controls.GroupPanel(); this.ppGpbxUserSpecTxt = new DevComponents.DotNetBar.Controls.GroupPanel(); @@ -168,18 +155,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); ((System.ComponentModel.ISupportInitialize)(this.folderConfigBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.imageCodecInfoBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ppNumUpDwnOvrdPrnPenWidth)).BeginInit(); @@ -190,7 +177,6 @@ namespace VEPROMS this.ppPanelViewSample.SuspendLayout(); this.groupBox3.SuspendLayout(); this.groupBox4.SuspendLayout(); - this.groupPanel1.SuspendLayout(); this.groupPanel2.SuspendLayout(); this.ppGpbxUserSpecCB.SuspendLayout(); this.ppGpbxUserSpecTxt.SuspendLayout(); @@ -198,12 +184,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.SuspendLayout(); // // ppBtnOK @@ -324,175 +310,19 @@ namespace VEPROMS this.ppRTxtTitle.Text = ""; this.ppRTxtTitle.Visible = false; // - // label6 + // ppBtnDefaultGrphFileExt // - this.label6.AutoSize = true; - this.label6.BackColor = System.Drawing.Color.Transparent; - this.label6.Location = new System.Drawing.Point(17, 15); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(73, 17); - this.label6.TabIndex = 38; - this.label6.Text = "RO Folder"; - // - // ppLblROFldrLocDefault - // - this.ppLblROFldrLocDefault.AutoSize = true; - this.ppLblROFldrLocDefault.BackColor = System.Drawing.Color.Transparent; - this.ppLblROFldrLocDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ppLblROFldrLocDefault.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.ppLblROFldrLocDefault.Location = new System.Drawing.Point(92, 38); - this.ppLblROFldrLocDefault.Name = "ppLblROFldrLocDefault"; - this.ppLblROFldrLocDefault.Size = new System.Drawing.Size(364, 17); - this.ppLblROFldrLocDefault.TabIndex = 37; - this.ppLblROFldrLocDefault.Text = "(..\\RO ) - not visible right now... there is no default saved"; - this.ppLblROFldrLocDefault.Visible = false; - // - // ppBtnFldrDlg - // - this.ppBtnFldrDlg.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnFldrDlg.BackColor = System.Drawing.Color.Transparent; - this.ppBtnFldrDlg.Image = ((System.Drawing.Image)(resources.GetObject("ppBtnFldrDlg.Image"))); - this.ppBtnFldrDlg.Location = new System.Drawing.Point(631, 12); - this.ppBtnFldrDlg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.ppBtnFldrDlg.Name = "ppBtnFldrDlg"; - this.ppBtnFldrDlg.Size = new System.Drawing.Size(21, 23); - this.ppBtnFldrDlg.TabIndex = 36; - this.ppBtnFldrDlg.Click += new System.EventHandler(this.ppBtnFldrDlg_Click); - // - // ppTxbxRoFoldLoc - // - // - // - // - this.ppTxbxRoFoldLoc.Border.Class = "TextBoxBorder"; - this.ppTxbxRoFoldLoc.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.folderConfigBindingSource, "RODefaults_ropath", true)); - this.ppTxbxRoFoldLoc.Location = new System.Drawing.Point(93, 14); - this.ppTxbxRoFoldLoc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.ppTxbxRoFoldLoc.Name = "ppTxbxRoFoldLoc"; - this.ppTxbxRoFoldLoc.Size = new System.Drawing.Size(531, 22); - this.ppTxbxRoFoldLoc.TabIndex = 35; - this.ppTxbxRoFoldLoc.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ppTxbxRoFoldLoc.WatermarkText = "Enter Path to default RO folder"; - this.ppTxbxRoFoldLoc.TextChanged += new System.EventHandler(this.ppTxbxRoFoldLoc_TextChanged); - // - // label8 - // - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(4, 10); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(117, 17); - this.label8.TabIndex = 17; - this.label8.Text = "Default RO Prefix"; - // - // ppBtnDefaultROPrefix - // - this.ppBtnDefaultROPrefix.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDefaultROPrefix.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ppBtnDefaultROPrefix.Location = new System.Drawing.Point(261, 30); - this.ppBtnDefaultROPrefix.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.ppBtnDefaultROPrefix.Name = "ppBtnDefaultROPrefix"; - this.ppBtnDefaultROPrefix.Size = new System.Drawing.Size(53, 23); - this.superTooltip1.SetSuperTooltip(this.ppBtnDefaultROPrefix, new DevComponents.DotNetBar.SuperTooltipInfo("Default RO Prefix", "", "Reset back to the default RO Prefix shown in italics", null, null, DevComponents.DotNetBar.eTooltipColor.System)); - this.ppBtnDefaultROPrefix.TabIndex = 29; - this.ppBtnDefaultROPrefix.Text = "Default"; - this.ppBtnDefaultROPrefix.ThemeAware = true; - this.ppBtnDefaultROPrefix.Visible = false; - this.ppBtnDefaultROPrefix.Click += new System.EventHandler(this.ppBtnDefaultROPrefix_Click); - // - // label7 - // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(324, 10); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(134, 17); - this.label7.TabIndex = 15; - this.label7.Text = "Default Image Prefix"; - // - // ppBtnDefaultImgPrefix - // - this.ppBtnDefaultImgPrefix.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDefaultImgPrefix.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ppBtnDefaultImgPrefix.Location = new System.Drawing.Point(581, 30); - this.ppBtnDefaultImgPrefix.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.ppBtnDefaultImgPrefix.Name = "ppBtnDefaultImgPrefix"; - this.ppBtnDefaultImgPrefix.Size = new System.Drawing.Size(55, 23); - this.superTooltip1.SetSuperTooltip(this.ppBtnDefaultImgPrefix, new DevComponents.DotNetBar.SuperTooltipInfo("Default Image Prefix", "", "Reset back to the default Image Prefix shown in italics", null, null, DevComponents.DotNetBar.eTooltipColor.System)); - this.ppBtnDefaultImgPrefix.TabIndex = 28; - this.ppBtnDefaultImgPrefix.Text = "Default"; - this.ppBtnDefaultImgPrefix.ThemeAware = true; - this.ppBtnDefaultImgPrefix.Visible = false; - this.ppBtnDefaultImgPrefix.Click += new System.EventHandler(this.ppBtnDefaultImgPrefix_Click); - // - // ppLblImagePrefixDefault - // - this.ppLblImagePrefixDefault.AutoSize = true; - this.ppLblImagePrefixDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ppLblImagePrefixDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.ppLblImagePrefixDefault.Location = new System.Drawing.Point(324, 57); - this.ppLblImagePrefixDefault.Name = "ppLblImagePrefixDefault"; - this.ppLblImagePrefixDefault.Size = new System.Drawing.Size(61, 17); - this.ppLblImagePrefixDefault.TabIndex = 22; - this.ppLblImagePrefixDefault.Text = "(default)"; - this.ppLblImagePrefixDefault.Visible = false; - // - // ppLblROPrefixDefault - // - this.ppLblROPrefixDefault.AutoSize = true; - this.ppLblROPrefixDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ppLblROPrefixDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.ppLblROPrefixDefault.Location = new System.Drawing.Point(4, 57); - this.ppLblROPrefixDefault.Name = "ppLblROPrefixDefault"; - this.ppLblROPrefixDefault.Size = new System.Drawing.Size(61, 17); - this.ppLblROPrefixDefault.TabIndex = 23; - this.ppLblROPrefixDefault.Text = "(default)"; - this.ppLblROPrefixDefault.Visible = false; - // - // ppCmbxDefROPrefix - // - this.ppCmbxDefROPrefix.DataBindings.Add(new System.Windows.Forms.Binding("SelectedValue", this.folderConfigBindingSource, "Default_SPPrefix", true)); - this.ppCmbxDefROPrefix.DisplayMember = "Text"; - this.ppCmbxDefROPrefix.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.ppCmbxDefROPrefix.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ppCmbxDefROPrefix.FormattingEnabled = true; - this.ppCmbxDefROPrefix.Location = new System.Drawing.Point(3, 30); - this.ppCmbxDefROPrefix.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.ppCmbxDefROPrefix.Name = "ppCmbxDefROPrefix"; - this.ppCmbxDefROPrefix.Size = new System.Drawing.Size(253, 23); - this.ppCmbxDefROPrefix.TabIndex = 26; - this.ppCmbxDefROPrefix.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ppCmbxDefROPrefix.WatermarkText = "Select RO Prefix"; - this.ppCmbxDefROPrefix.SelectedValueChanged += new System.EventHandler(this.ppBtnDefaultROPrefix_Click); - // - // ppCmbxDefImgPrefix - // - this.ppCmbxDefImgPrefix.DataBindings.Add(new System.Windows.Forms.Binding("SelectedValue", this.folderConfigBindingSource, "Default_IMPrefix", true)); - this.ppCmbxDefImgPrefix.DisplayMember = "Text"; - this.ppCmbxDefImgPrefix.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.ppCmbxDefImgPrefix.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ppCmbxDefImgPrefix.FormattingEnabled = true; - this.ppCmbxDefImgPrefix.Location = new System.Drawing.Point(325, 30); - this.ppCmbxDefImgPrefix.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.ppCmbxDefImgPrefix.Name = "ppCmbxDefImgPrefix"; - this.ppCmbxDefImgPrefix.Size = new System.Drawing.Size(253, 23); - this.ppCmbxDefImgPrefix.TabIndex = 25; - this.ppCmbxDefImgPrefix.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ppCmbxDefImgPrefix.WatermarkText = "Select Image Prefix"; - this.ppCmbxDefImgPrefix.SelectedValueChanged += new System.EventHandler(this.ppCmbxDefImgPrefix_SelectedValueChanged); - // - // ppBtnDefaultGrfExt - // - this.ppBtnDefaultGrfExt.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDefaultGrfExt.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ppBtnDefaultGrfExt.Location = new System.Drawing.Point(432, 75); - this.ppBtnDefaultGrfExt.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.ppBtnDefaultGrfExt.Name = "ppBtnDefaultGrfExt"; - this.ppBtnDefaultGrfExt.Size = new System.Drawing.Size(53, 23); - this.superTooltip1.SetSuperTooltip(this.ppBtnDefaultGrfExt, new DevComponents.DotNetBar.SuperTooltipInfo("The Default Button", "", resources.GetString("ppBtnDefaultGrfExt.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(265, 155))); - this.ppBtnDefaultGrfExt.TabIndex = 27; - this.ppBtnDefaultGrfExt.Text = "Default"; - this.ppBtnDefaultGrfExt.ThemeAware = true; - this.ppBtnDefaultGrfExt.Visible = false; - this.ppBtnDefaultGrfExt.Click += new System.EventHandler(this.ppBtnDefaultGrfExt_Click); + this.ppBtnDefaultGrphFileExt.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.ppBtnDefaultGrphFileExt.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.ppBtnDefaultGrphFileExt.Location = new System.Drawing.Point(431, 38); + this.ppBtnDefaultGrphFileExt.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ppBtnDefaultGrphFileExt.Name = "ppBtnDefaultGrphFileExt"; + this.ppBtnDefaultGrphFileExt.Size = new System.Drawing.Size(53, 23); + this.superTooltip1.SetSuperTooltip(this.ppBtnDefaultGrphFileExt, new DevComponents.DotNetBar.SuperTooltipInfo("The Default Button", "", resources.GetString("ppBtnDefaultGrphFileExt.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(265, 155))); + this.ppBtnDefaultGrphFileExt.TabIndex = 27; + this.ppBtnDefaultGrphFileExt.Text = "Default"; + this.ppBtnDefaultGrphFileExt.ThemeAware = true; + this.ppBtnDefaultGrphFileExt.Click += new System.EventHandler(this.ppBtnDefaultGrfExt_Click); // // ppCmbxGrphFileExt // @@ -501,7 +331,7 @@ namespace VEPROMS this.ppCmbxGrphFileExt.DisplayMember = "FilenameExtension"; this.ppCmbxGrphFileExt.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxGrphFileExt.FormattingEnabled = true; - this.ppCmbxGrphFileExt.Location = new System.Drawing.Point(172, 74); + this.ppCmbxGrphFileExt.Location = new System.Drawing.Point(171, 37); this.ppCmbxGrphFileExt.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxGrphFileExt.Name = "ppCmbxGrphFileExt"; this.ppCmbxGrphFileExt.Size = new System.Drawing.Size(255, 23); @@ -515,28 +345,28 @@ namespace VEPROMS // this.imageCodecInfoBindingSource.DataSource = typeof(System.Drawing.Imaging.ImageCodecInfo); // - // ppLblGraphicFileExtDefault + // ppLblGrphFileExtDefault // - this.ppLblGraphicFileExtDefault.AutoSize = true; - this.ppLblGraphicFileExtDefault.BackColor = System.Drawing.Color.Transparent; - this.ppLblGraphicFileExtDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ppLblGraphicFileExtDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.ppLblGraphicFileExtDefault.Location = new System.Drawing.Point(173, 103); - this.ppLblGraphicFileExtDefault.Name = "ppLblGraphicFileExtDefault"; - this.ppLblGraphicFileExtDefault.Size = new System.Drawing.Size(61, 17); - this.ppLblGraphicFileExtDefault.TabIndex = 21; - this.ppLblGraphicFileExtDefault.Text = "(default)"; - this.ppLblGraphicFileExtDefault.Visible = false; + this.ppLblGrphFileExtDefault.AutoSize = true; + this.ppLblGrphFileExtDefault.BackColor = System.Drawing.Color.Transparent; + this.ppLblGrphFileExtDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.ppLblGrphFileExtDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.ppLblGrphFileExtDefault.Location = new System.Drawing.Point(172, 66); + this.ppLblGrphFileExtDefault.Name = "ppLblGrphFileExtDefault"; + this.ppLblGrphFileExtDefault.Size = new System.Drawing.Size(61, 17); + this.ppLblGrphFileExtDefault.TabIndex = 21; + this.ppLblGrphFileExtDefault.Text = "(default)"; + this.ppLblGrphFileExtDefault.Visible = false; // - // label37 + // lblGrphFileExt // - this.label37.AutoSize = true; - this.label37.BackColor = System.Drawing.Color.Transparent; - this.label37.Location = new System.Drawing.Point(19, 76); - this.label37.Name = "label37"; - this.label37.Size = new System.Drawing.Size(149, 17); - this.label37.TabIndex = 19; - this.label37.Text = "Graphic File Extension"; + this.lblGrphFileExt.AutoSize = true; + this.lblGrphFileExt.BackColor = System.Drawing.Color.Transparent; + this.lblGrphFileExt.Location = new System.Drawing.Point(18, 39); + this.lblGrphFileExt.Name = "lblGrphFileExt"; + this.lblGrphFileExt.Size = new System.Drawing.Size(149, 17); + this.lblGrphFileExt.TabIndex = 19; + this.lblGrphFileExt.Text = "Graphic File Extension"; // // ppBtnDeftDisAutoDuplx // @@ -1212,7 +1042,6 @@ namespace VEPROMS // ppColorPickerViewModebckgnd // this.ppColorPickerViewModebckgnd.GlobalItem = false; - this.ppColorPickerViewModebckgnd.ImageListSizeSelection = DevComponents.DotNetBar.eButtonImageListSelection.NotSet; this.ppColorPickerViewModebckgnd.ImagePaddingHorizontal = 8; this.ppColorPickerViewModebckgnd.Name = "ppColorPickerViewModebckgnd"; this.ppColorPickerViewModebckgnd.Text = "Non Active Edit Window Background"; @@ -1220,7 +1049,6 @@ namespace VEPROMS // ppColorPickerEditModeBckGnd // this.ppColorPickerEditModeBckGnd.GlobalItem = false; - this.ppColorPickerEditModeBckGnd.ImageListSizeSelection = DevComponents.DotNetBar.eButtonImageListSelection.NotSet; this.ppColorPickerEditModeBckGnd.ImagePaddingHorizontal = 8; this.ppColorPickerEditModeBckGnd.Name = "ppColorPickerEditModeBckGnd"; this.ppColorPickerEditModeBckGnd.Text = "Active Edit Window Background"; @@ -1228,7 +1056,6 @@ namespace VEPROMS // ppColorPickerTransition // this.ppColorPickerTransition.GlobalItem = false; - this.ppColorPickerTransition.ImageListSizeSelection = DevComponents.DotNetBar.eButtonImageListSelection.NotSet; this.ppColorPickerTransition.ImagePaddingHorizontal = 8; this.ppColorPickerTransition.Name = "ppColorPickerTransition"; this.ppColorPickerTransition.Text = "Transitions"; @@ -1236,7 +1063,6 @@ namespace VEPROMS // ppColorPickerRO // this.ppColorPickerRO.GlobalItem = false; - this.ppColorPickerRO.ImageListSizeSelection = DevComponents.DotNetBar.eButtonImageListSelection.NotSet; this.ppColorPickerRO.ImagePaddingHorizontal = 8; this.ppColorPickerRO.Name = "ppColorPickerRO"; this.ppColorPickerRO.Text = "Referenced Objects"; @@ -1646,49 +1472,6 @@ namespace VEPROMS this.ppCbShwDefSettings.Text = "Show Default Settings"; this.ppCbShwDefSettings.CheckedChanged += new System.EventHandler(this.tabpage_Enter); // - // groupPanel1 - // - this.groupPanel1.BackColor = System.Drawing.Color.Transparent; - this.groupPanel1.CanvasColor = System.Drawing.SystemColors.Control; - this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.groupPanel1.Controls.Add(this.label8); - this.groupPanel1.Controls.Add(this.ppBtnDefaultROPrefix); - this.groupPanel1.Controls.Add(this.ppCmbxDefImgPrefix); - this.groupPanel1.Controls.Add(this.label7); - this.groupPanel1.Controls.Add(this.ppCmbxDefROPrefix); - this.groupPanel1.Controls.Add(this.ppBtnDefaultImgPrefix); - this.groupPanel1.Controls.Add(this.ppLblROPrefixDefault); - this.groupPanel1.Controls.Add(this.ppLblImagePrefixDefault); - this.groupPanel1.Location = new System.Drawing.Point(20, 132); - this.groupPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(645, 106); - // - // - // - this.groupPanel1.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.groupPanel1.Style.BackColorGradientAngle = 90; - this.groupPanel1.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.groupPanel1.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanel1.Style.BorderBottomWidth = 1; - this.groupPanel1.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.groupPanel1.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanel1.Style.BorderLeftWidth = 1; - this.groupPanel1.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanel1.Style.BorderRightWidth = 1; - this.groupPanel1.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanel1.Style.BorderTopWidth = 1; - this.groupPanel1.Style.CornerDiameter = 4; - this.groupPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.groupPanel1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.groupPanel1.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel1.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - this.superTooltip1.SetSuperTooltip(this.groupPanel1, new DevComponents.DotNetBar.SuperTooltipInfo("Default Accessory Page ID", "", "The default Accessory Page ID is used to enter and thus track Referenced Objects " + - "on non-procedure step editor sections.\r\n\r\nNote that Graphics ROs have a separat" + - "e Accessory Page ID.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 140))); - this.groupPanel1.TabIndex = 39; - this.groupPanel1.Text = "Default Accessory Page ID"; - // // groupPanel2 // this.groupPanel2.BackColor = System.Drawing.Color.Transparent; @@ -1954,12 +1737,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.tcpEdSettings); 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.tcpRefObjs); 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"; @@ -1978,6 +1761,71 @@ namespace VEPROMS this.tcFolder.TabsVisible = false; this.tcFolder.Text = "tabControl2"; // + // tcpRefObjs + // + this.tcpRefObjs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.tcpRefObjs.Controls.Add(this.ppBtnDefaultGrphFileExt); + this.tcpRefObjs.Controls.Add(this.ppCmbxGrphFileExt); + this.tcpRefObjs.Controls.Add(this.ppLblGrphFileExtDefault); + this.tcpRefObjs.Controls.Add(this.lblGrphFileExt); + this.tcpRefObjs.Dock = System.Windows.Forms.DockStyle.Fill; + this.tcpRefObjs.Location = new System.Drawing.Point(0, 24); + this.tcpRefObjs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tcpRefObjs.Name = "tcpRefObjs"; + this.tcpRefObjs.Padding = new System.Windows.Forms.Padding(1); + this.tcpRefObjs.Size = new System.Drawing.Size(685, 282); + 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"; + // + // 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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tcpFmtSettings.Name = "tcpFmtSettings"; + this.tcpFmtSettings.Padding = new System.Windows.Forms.Padding(1); + this.tcpFmtSettings.Size = new System.Drawing.Size(685, 282); + 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.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"; + // // tcpGeneral // this.tcpGeneral.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; @@ -2042,41 +1890,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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.tcpFmtSettings.Name = "tcpFmtSettings"; - this.tcpFmtSettings.Padding = new System.Windows.Forms.Padding(1); - this.tcpFmtSettings.Size = new System.Drawing.Size(685, 282); - 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.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; @@ -2149,41 +1962,6 @@ 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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.tcpRefObjs.Name = "tcpRefObjs"; - this.tcpRefObjs.Padding = new System.Windows.Forms.Padding(1); - this.tcpRefObjs.Size = new System.Drawing.Size(685, 282); - 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"; - // // frmFolderProperties // this.AcceptButton = this.ppBtnOK; @@ -2200,6 +1978,7 @@ namespace VEPROMS this.Controls.Add(this.ppLblDefSettingsInfo); this.Controls.Add(this.ppBtnCancel); this.Controls.Add(this.ppBtnOK); + this.DoubleBuffered = true; this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "frmFolderProperties"; this.ShowIcon = false; @@ -2221,8 +2000,6 @@ namespace VEPROMS this.groupBox3.PerformLayout(); this.groupBox4.ResumeLayout(false); this.groupBox4.PerformLayout(); - this.groupPanel1.ResumeLayout(false); - this.groupPanel1.PerformLayout(); this.groupPanel2.ResumeLayout(false); this.groupPanel2.PerformLayout(); this.ppGpbxUserSpecCB.ResumeLayout(false); @@ -2234,18 +2011,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.ResumeLayout(false); this.PerformLayout(); @@ -2263,8 +2040,6 @@ namespace VEPROMS private System.Windows.Forms.DateTimePicker ppDTPicker; private System.Windows.Forms.RichTextBox ppRTxtTitle; private System.Windows.Forms.RichTextBox ppRTxtName; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.Label label7; private System.Windows.Forms.Label label9; private System.Windows.Forms.Label label12; private System.Windows.Forms.NumericUpDown ppNumUpDwnOvrdPrnPenULineWidth; @@ -2304,10 +2079,8 @@ namespace VEPROMS private System.Windows.Forms.Label label28; private System.Windows.Forms.Label label29; private System.Windows.Forms.BindingSource folderConfigBindingSource; - private System.Windows.Forms.Label label37; - private System.Windows.Forms.Label ppLblGraphicFileExtDefault; - private System.Windows.Forms.Label ppLblImagePrefixDefault; - private System.Windows.Forms.Label ppLblROPrefixDefault; + private System.Windows.Forms.Label lblGrphFileExt; + private System.Windows.Forms.Label ppLblGrphFileExtDefault; private System.Windows.Forms.Label ppLblDefSettingsInfo; private System.Windows.Forms.Label ppLblFormatDefault; private System.Windows.Forms.Label ppLblChangeBarTypeDefault; @@ -2329,12 +2102,8 @@ namespace VEPROMS private DevComponents.DotNetBar.Controls.ComboBoxEx ppCmbxWatermark; private DevComponents.DotNetBar.Controls.ComboBoxEx ppCmbxStpEditorCols; private DevComponents.DotNetBar.Controls.ComboBoxEx ppCmbxGrphFileExt; - private DevComponents.DotNetBar.Controls.ComboBoxEx ppCmbxDefImgPrefix; - private DevComponents.DotNetBar.Controls.ComboBoxEx ppCmbxDefROPrefix; private System.Windows.Forms.BindingSource imageCodecInfoBindingSource; - private DevComponents.DotNetBar.ButtonX ppBtnDefaultGrfExt; - private DevComponents.DotNetBar.ButtonX ppBtnDefaultROPrefix; - private DevComponents.DotNetBar.ButtonX ppBtnDefaultImgPrefix; + private DevComponents.DotNetBar.ButtonX ppBtnDefaultGrphFileExt; private DevComponents.DotNetBar.ButtonX ppBtnDefaultChgBar; private DevComponents.DotNetBar.ButtonX ppBtnDefCbTxtTyp; private DevComponents.DotNetBar.ButtonX ppBtnDefaultCbPos; @@ -2364,9 +2133,6 @@ namespace VEPROMS private System.Windows.Forms.Label ppLblViewTrans; private System.Windows.Forms.Label ppLblViewRO; private System.Windows.Forms.Label ppLblViewTx1; - private DevComponents.DotNetBar.ButtonX ppBtnFldrDlg; - private DevComponents.DotNetBar.Controls.TextBoxX ppTxbxRoFoldLoc; - private System.Windows.Forms.Label ppLblROFldrLocDefault; private System.Windows.Forms.RichTextBox ppRTxtStMsg; private DevComponents.DotNetBar.ButtonX ppBtnStMsgPreview; private DevComponents.DotNetBar.ButtonX ppBtnStMsgSave; @@ -2377,7 +2143,6 @@ namespace VEPROMS private System.Windows.Forms.Label label5; private DevComponents.DotNetBar.Controls.CheckBoxX ppChkbxStMsgActive; private DevComponents.DotNetBar.ButtonX ppBtnDefWatermark; - private System.Windows.Forms.Label label6; private System.Windows.Forms.Panel panButtons; private DevComponents.DotNetBar.ButtonX btnRefObjs; private DevComponents.DotNetBar.ButtonX btnGeneral; @@ -2398,7 +2163,6 @@ namespace VEPROMS private DevComponents.DotNetBar.ButtonX btnStMsg; private DevComponents.DotNetBar.ButtonX btnFormatSettings; private DevComponents.DotNetBar.ButtonX btnEdSettings; - private DevComponents.DotNetBar.Controls.GroupPanel groupPanel1; private DevComponents.DotNetBar.Controls.GroupPanel ppGpbxUserSpecCB; private DevComponents.DotNetBar.Controls.GroupPanel ppGpbxUserSpecTxt; private DevComponents.DotNetBar.Controls.GroupPanel groupPanel2; diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.cs b/PROMS/VEPROMS User Interface/frmFolderProperties.cs index b7bbd913..8132a457 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.cs +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.cs @@ -92,15 +92,7 @@ namespace VEPROMS ppCmbxGrphFileExt.SelectedIndex = 5; _DefaultROGraficFileExtension = ppCmbxGrphFileExt.Text; } - SetupDefault(_DefaultROGraficFileExtension, ppLblGraphicFileExtDefault, ppCmbxGrphFileExt); - - // Get the default Referenced Objects prefix - _DefaultROPrefix = _FolderConfig.Default_SPPrefix; - SetupDefault(_DefaultROPrefix, ppLblROPrefixDefault, ppCmbxDefROPrefix); - - // Get the default RO Graphics prefix - _DefaultImagePrefix = _FolderConfig.Default_IMPrefix; - SetupDefault(_DefaultImagePrefix, ppLblImagePrefixDefault, ppCmbxDefImgPrefix); + SetupDefault(_DefaultROGraficFileExtension, ppLblGrphFileExtDefault, ppCmbxGrphFileExt); // Get the default Print Pagination _DefaultPagination = _FolderConfig.Print_Pagination.ToString(); @@ -163,7 +155,6 @@ namespace VEPROMS // - the first (top) tree node shows different "tabs" than the // other folder type of tree nodes if (!_FolderConfig.HasParent()) - //if (_FolderConfig.Name.Equals("VEPROMS")) { // if we are at the top node of the tree, remove the Folder Property page tabs // that do not pertain to this level (top of tree) @@ -180,12 +171,21 @@ namespace VEPROMS // TODO: later on, not needed for initial release. this.tcFolder.Tabs.Remove(tiStMsg); this.btnStMsg.Visible = false; + + // Also, for the referenced object tab, the top node (veproms system level) should + // allow setting of the default graphics file extension. No other folder level allows this. + ppCmbxGrphFileExt.Visible = true; + ppLblGrphFileExtDefault.Visible = true; + lblGrphFileExt.Visible = true; + ppBtnDefaultGrphFileExt.Visible = true; } else { - // don't show Start Message tab if not at top level + // don't show Start Message or ref obj tab if not at top level this.tcFolder.Tabs.Remove(tiStMsg); + this.tcFolder.Tabs.Remove(tiRefObj); this.btnStMsg.Visible = false; + this.btnRefObjs.Visible = false; /* This color settings property page is currently no visible... * @@ -234,6 +234,12 @@ namespace VEPROMS ppCmbxStpEditorCols.SelectedValue = -1; ppCbShwDefSettings.Visible = true; // display check box for showing default values + + // Also, for the referenced object tab, the top node (veproms system level) should + // allow setting of the default graphics file extension. No other folder level allows this. + ppCmbxGrphFileExt.Visible = false; + ppLblGrphFileExtDefault.Visible = false; + this.lblGrphFileExt.Visible = false; } _Initializing = false; } @@ -304,7 +310,7 @@ namespace VEPROMS private void ppCmbxGrphFileExt_SelectedValueChanged(object sender, EventArgs e) { if (!_Initializing) - ProcessCmbxSelectedValueChange(ppCmbxGrphFileExt, _DefaultROGraficFileExtension, ppBtnDefaultGrfExt, ppLblGraphicFileExtDefault); + ProcessCmbxSelectedValueChange(ppCmbxGrphFileExt, _DefaultROGraficFileExtension, ppBtnDefaultGrphFileExt, ppLblGrphFileExtDefault); } /// @@ -322,58 +328,6 @@ namespace VEPROMS ppCmbxGrphFileExt.SelectedIndex = -1; //reset to the default Graphic File Extension setting } - /// - /// Selection in Default RO Prefix combo box changed. - /// - /// object - /// EventArgs - private void ppCmbxDefROPrefix_SelectedValueChanged(object sender, EventArgs e) - { - if (!_Initializing) - ProcessCmbxSelectedValueChange(ppCmbxDefROPrefix, _DefaultROPrefix, ppBtnDefaultROPrefix, ppLblROPrefixDefault); - } - - /// - /// Reset to the parent setting. - /// Find the parent setting and assign it to _FolderConfig.Default_SPPrefix. - /// This will force the database to be updated. - /// - /// - /// - private void ppBtnDefaultROPrefix_Click(object sender, EventArgs e) - { - // Compare parent setting with current setting - if ( _DefaultROPrefix.Equals(_FolderConfig.Default_SPPrefix)) - _FolderConfig.Default_SPPrefix = _DefaultROPrefix;// this will force a database update (write) - ppCmbxDefROPrefix.SelectedIndex = -1; //reset to the default RO Prefix setting - } - - /// - /// Selection in Default Image Prefix combo box changed. - /// - /// object - /// EventArgs - private void ppCmbxDefImgPrefix_SelectedValueChanged(object sender, EventArgs e) - { - if (!_Initializing) - ProcessCmbxSelectedValueChange(ppCmbxDefImgPrefix, _DefaultImagePrefix, ppBtnDefaultImgPrefix, ppLblImagePrefixDefault); - } - - /// - /// Reset to the parent setting. - /// Find the parent setting and assign it to _FolderConfig.Default_IMPrefix. - /// This will force the database to be updated. - /// - /// - /// - private void ppBtnDefaultImgPrefix_Click(object sender, EventArgs e) - { - // Compare parent setting with current setting - if (_DefaultImagePrefix.Equals(_FolderConfig.Default_IMPrefix)) - _FolderConfig.Default_IMPrefix = _DefaultImagePrefix;// this will force a database update (write) - ppCmbxDefImgPrefix.SelectedIndex = -1; //reset to the default Image Prefix setting - } - /// /// TEMPORARY - TO PROVIDE DEMO FUNCTIONALITY /// An RO Folder was selected, find the RO.FST file and populate the RO and Image database combo boxes @@ -382,46 +336,30 @@ namespace VEPROMS /// EventArgs private void ppTxbxRoFoldLoc_TextChanged(object sender, EventArgs e) { - string tpath = ppTxbxRoFoldLoc.Text + "\\RO.FST"; - if (File.Exists(tpath)) - { + //TODO: + //string tpath = ppTxbxRoFoldLoc.Text + "\\RO.FST"; + //if (File.Exists(tpath)) + //{ // build a list of available RO Accessory Page ID's - ROFST rofst = new ROFST(tpath, null); - ROFST.rodbi[] rodblist = rofst.GetRODatabaseList(); - for (int i = 0; i < rodblist.Length; i++) - { - string mitem = string.Format("{0} - {1}", rodblist[i].dbiTitle, rodblist[i].dbiAP); - switch (rodblist[i].dbiType) - { - case 7: ppCmbxDefROPrefix.Items.Add(mitem); // setpoint - break; - case 8: ppCmbxDefImgPrefix.Items.Add(mitem); // graphic - break; - default: // user defined - ppCmbxDefROPrefix.Items.Add(mitem); - ppCmbxDefImgPrefix.Items.Add(mitem); - break; - } - } - } + //ROFst rofst = ROFst.Get(_DocVersionConfig.MyDocVersion.DocVersionDocVersionROFsts[0].MyROFst.ROFstID);//new ROFst(tpath, null); + //ROFst.rodbi[] rodblist = rofst.GetRODatabaseList(); + //for (int i = 0; i < rodblist.Length; i++) + //{ + // string mitem = string.Format("{0} - {1}", rodblist[i].dbiTitle, rodblist[i].dbiAP); + // switch (rodblist[i].dbiType) + // { + // case 7: ppCmbxDefROPrefix.Items.Add(mitem); // setpoint + // break; + // case 8: ppCmbxDefImgPrefix.Items.Add(mitem); // graphic + // break; + // default: // user defined + // ppCmbxDefROPrefix.Items.Add(mitem); + // ppCmbxDefImgPrefix.Items.Add(mitem); + // break; + // } + //} + //} } - - /// - /// This is a temporary function for demo purposes... - /// Display the standard folder selection dialog to have the user select the location of the Referenced Objects folder. - /// From this, we will use the RO.FST to populate the RO and Image Accessory ID cobmo boxes. - /// - /// - /// - private void ppBtnFldrDlg_Click(object sender, EventArgs e) - { - dlgROFolder = new FolderBrowserDialog(); - if (dlgROFolder.ShowDialog() == DialogResult.OK) - { - ppTxbxRoFoldLoc.Text = dlgROFolder.SelectedPath; - } - } - #endregion #region Output Settings tab @@ -979,10 +917,8 @@ namespace VEPROMS ppLblDefSettingsInfo.Visible = ppCbShwDefSettings.Checked; ppLblAutoDuplexDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDeftDisAutoDuplx.Visible; - ppLblROPrefixDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDefaultROPrefix.Visible; - ppLblImagePrefixDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDefaultImgPrefix.Visible; ppLblStpEditorColsDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDefEdCols.Visible; - ppLblGraphicFileExtDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDefaultGrfExt.Visible; + ppLblGrphFileExtDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDefaultGrphFileExt.Visible; ppLblWatermarkDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDefWatermark.Visible; ppLblPaginationDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDefPagination.Visible; ppLblChgBarTxtTypeDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDefCbTxtTyp.Visible; @@ -1005,7 +941,7 @@ namespace VEPROMS button.Focus(); button.PerformClick(); } - button.Visible = (!_FolderConfig.Name.Equals("VEPROMS")) && (cmbx.SelectedValue != null); + button.Visible = (cmbx.SelectedValue != null);//(!_FolderConfig.Name.Equals("VEPROMS")) && (cmbx.SelectedValue != null); deflabel.Visible = ppCbShwDefSettings.Checked && button.Visible; } @@ -1036,7 +972,9 @@ namespace VEPROMS private void ProcessButtonClick(TabItem tab, ButtonX button) { ClearAllCheckedButtons(); + _Initializing = true; tcFolder.SelectedTab = tab; + _Initializing = false; button.Checked = true; } diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.resx b/PROMS/VEPROMS User Interface/frmFolderProperties.resx index 272f348b..dd99e12f 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.resx +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.resx @@ -120,29 +120,10 @@ 590, 17 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEAAA - CxABrSO9dQAAAn9JREFUOE+lk2tI01EYxhf0oU8WqVEIRpaIBWJgSPUhROmippS3QkkTylsXDMW8ts3b - 1G06daVibuqaOq0sxbBCKBSJ0PJCialZUFSKqaGSt1//TbIsww8deOBwznl+5zkv71kHiP5rGAFrKb1Q - 5ypR6bmaVU6m2kCiXJv007Om2XgwJEaNT4QiyDi/GF9mKRVgsWkav+CYQkR1utwAQfypphqZ4l/JIhOL - jvtGKfCOyDMB6O/WMjNea9L3MT1zIxoM5QrqdWnS1SA+kUq8w1V4hhUgqq1QMj1WtcK88KmIud5oqsqy - qCzOQFMopSQvhRvyBApkcQLzV91E1docpr9ol29eFMz0J0Bv2Kr6C3CrVMa3jyWm2EZzc12OSQ8M2TTo - ZdytzMCgSUVfIqFcfY2bqiSKlQmoc+JNaUSVJRlMvsvHGHuoVUx9lZKFIQkMp63UW2FtMBH6YuBVFF01 - /lwO9aoQadSpTAxkwXs596oVtD+ULx36/Qkvg6HDl/k2D2YeufCmwoELZ45MCIA9olKVmK+vJQy3JVOv - l7M4KIae8CVAV6hgPMV8uxczLYeZbDrIaN1eJBG2nHazyDN1cZEymdHueG7rcuh8KiTpixYA56AziMVn - J5h9coyp5kOM1TvxudqejvRNBHrY4GRnZmcCqLMT6GlJ4Y4uGwZS4IUQ97kfs62eTD12YbzBmRGDAx+0 - u+iVmyMO24njbqvG5VbOz4yjtjyL3vuRdOSKltUuX0+LbAON0o3UJFmiibPi+pXtBLrvWHR2tHZfBuSm - xZIrPk9mfAiJlwKMleWsvxsnj+7H9YAD+xxssbexwnqbBVs2m7HV3GxlI631E9fa/wGRpaRpa3TTbQAA - AABJRU5ErkJggg== - - 809, 17 - + This will revert the Graphic File Extension selection back to using the parent's (default) setting. Check "Show Default Settings" to display the "default" graphic file extension setting (below the Graphic File Extension selection box). @@ -194,11 +175,12 @@ Check "Show Default Settings" to display the "default" Change Bar Custom Message Check "Show Default Settings" to display the "default" Change Bar Custom Message (below the Line One selection box). + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEAAA - CxABrSO9dQAAAr5JREFUOE+lk21IE3Ecx0/fBPUi6pVZyzELCalXhWEg0XMvipYLVOzJhyxTWlkippGl + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCgAA + CwoBv0NmUwAAAr5JREFUOE+lk21IE3Ecx0/fBPUi6pVZyzELCalXhWEg0XMvipYLVOzJhyxTWlkippGl lLjS0qEpmpBmNsnhdPRAL1SwpuFwHtO5pbGle3Duwfvf3R7a/bodTGcaBB18j+PPfT/3/X//94sAAOy/ riAgJNrZWUDpShCpLfSR+K0Aqb3jR+oLbnKupjb8vfDnMPPbakKd5qUsDT88biWERJmf/0R4ng9psq0W vPz2nyAOwH65COHX/ZSt2UG7u9EKgOO1l7K1Ohc0YtPCkMhDmqUpqxKQk8UeytYyFzRCdz5AzTkAeT6X diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index d502cc86..7f529970 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -29,18 +29,54 @@ namespace VEPROMS #endregion Color _CommentTitleBckColor; VETreeNode _PrevBookMark = null; - string _PathToROs = @"\\Volian-server\04 ve-proms files\PROMS_2010\vehlp\ro\ro.fst";//@"G:\promsdat\vehlp\ro\ro.fst";//@"G:\VEHLP\RO\RO.FST"; - //string _PathToROs = @"G:\debugdat\vebyron\RO\ro.fst";//@"G:\VEHLP\RO\RO.FST"; + DocVersionInfo _SelectedDVI = null; + StepTabPanel _SelectedStepTabPanel=null; + public StepTabPanel SelectedStepTabPanel + { + get + { + return _SelectedStepTabPanel; + } + set + { + _SelectedStepTabPanel = value; + if (value == null) // DSO Tab Panel + SelectedDVI = (DocVersionInfo)tc.SelectedDisplayTabItem.MyItemInfo.MyActiveParent.ActiveParent; + else // Step Tab Panel + SelectedDVI = (DocVersionInfo)value.MyStepPanel.MyProcedureItemInfo.MyProcedure.MyActiveParent; + } + } + public DocVersionInfo SelectedDVI + { + get { return _SelectedDVI; } + set + { + if (_SelectedDVI != value) + { + _SelectedDVI = value; + _SelectedROFst = null; + } + } + } + // TODO: Should the following be an info + // For the initial release, we are assuming there will be only one rofst fro a docversion. Changes + // will be needed here if more than 1. + private ROFstInfo _SelectedROFst; + public ROFstInfo SelectedROFst + { + get + { + if(_SelectedROFst == null) + _SelectedROFst = SelectedDVI.DocVersionAssociations[0].MyROFst; + return _SelectedROFst; + } + set { _SelectedROFst = value; } + } public frmVEPROMS() { InitializeComponent(); - // TEMPORARY - FOR INSTALL OF DEMO ON MACHINE OTHER THAN AT VOLIAN - // TODO: REMOVE ONCE RO.FST INFO IS PLACE IN SQL DATABASE - if (!System.IO.File.Exists(_PathToROs)) - _PathToROs = @"C:\proms2010\vehlp\ro\ro.fst"; - // set the color of the ribbon RibbonPredefinedColorSchemes.ChangeOffice2007ColorTable((eOffice2007ColorScheme)Settings.Default.SystemColor); @@ -624,8 +660,7 @@ namespace VEPROMS /// private void btnSetBookMrk_Click(object sender, EventArgs e) { - StepTabPanel dtp = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; - _MyBookMarks.Add(dtp.SelectedStepItem.MyItemInfo); + _MyBookMarks.Add(SelectedStepTabPanel.SelectedStepItem.MyItemInfo); RefreshBookMarkData(); } private void lbxBookMarks_Click(object sender, EventArgs e) @@ -802,18 +837,12 @@ namespace VEPROMS { infoPanel.Expanded = true; infoTabs.SelectedTab = infotabRO; - StepTabPanel dtp = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; - //DocVersionInfo dvi = (DocVersionInfo)dtp.MyStepPanel.MyProcedureItemInfo.MyProcedure.MyActiveParent; - DocVersionInfo dvi; - if (dtp == null) - dvi = (DocVersionInfo)tc.SelectedDisplayTabItem.MyItemInfo.MyActiveParent.ActiveParent; - else - dvi = (DocVersionInfo)dtp.MyStepPanel.MyProcedureItemInfo.MyProcedure.MyActiveParent; //if (dtp == null) return; - ROFST rofst = new ROFST(_PathToROs, dvi); //"g:\\vehlp\\ro\\ro.fst"); - displayRO.MyROFST = rofst; - displayRO.MyRTB = (dtp == null) ? null : dtp.MyStepPanel.SelectedStepItem.MyStepRTB; - displayRO.Mydvi = dvi; + + displayRO.Mydvi = SelectedDVI; + displayRO.MyROFST = SelectedROFst; + displayRO.MyRTB = (SelectedStepTabPanel == null) ? null : SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; + displayRO.ProgressBar = bottomProgBar; } #endregion @@ -821,9 +850,8 @@ namespace VEPROMS private void infotabTransition_Click(object sender, EventArgs e) { if (tc == null || tc.SelectedDisplayTabItem == null) return; - StepTabPanel dtp = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; - if (dtp == null) return; - displayTransition.MyRTB = dtp.MyStepPanel.SelectedStepItem.MyStepRTB; + if (SelectedStepTabPanel == null) return; + displayTransition.MyRTB = SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; displayTransition.CurTrans = null; } private void btnInsTrans_Click(object sender, EventArgs e) @@ -831,8 +859,8 @@ namespace VEPROMS infoPanel.Expanded = true; infoTabs.SelectedTab = infotabTransition; StepTabPanel dtp = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; - if (dtp == null) return; - displayTransition.MyRTB = (dtp == null) ? null : dtp.MyStepPanel.SelectedStepItem.MyStepRTB; + if (SelectedStepTabPanel == null) return; + displayTransition.MyRTB = (SelectedStepTabPanel == null) ? null : dtp.MyStepPanel.SelectedStepItem.MyStepRTB; displayTransition.CurTrans = null; } #endregion @@ -851,8 +879,7 @@ namespace VEPROMS { infoPanel.Expanded = true; infoTabs.SelectedTab = infotabTags; - StepTabPanel dtp = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; - displayTags.MyRTB = (dtp == null) ? null : dtp.MyStepPanel.SelectedStepItem.MyStepRTB; + displayTags.MyRTB = (SelectedStepTabPanel == null) ? null : SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; } #endregion private ItemInfo _CurrentItem = null; @@ -864,6 +891,7 @@ namespace VEPROMS ctrlAnnotationDetails.CurrentAnnotation = null; ctrlAnnotationDetails.Annotations = null; infotabRO.Visible = infotabTransition.Visible = infotabTags.Visible = false; + SelectedStepTabPanel = null; } else { @@ -888,6 +916,7 @@ namespace VEPROMS displayTags.MyRTB = args.MyStepItem.MyStepRTB; displayRO.ProgressBar = bottomProgBar; } + SelectedStepTabPanel = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; } ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem); AnnotationPanelView(); @@ -935,43 +964,24 @@ namespace VEPROMS displayTransition.CurTrans = null; } - // This doesn't seem to be used... - // - //private void tc_LinkInsertRO(object sender, StepPanelLinkEventArgs args) - //{ - // infoPanel.Expanded = true; - // infoTabs.SelectedTab = infotabRO; - // ROFST rofst = new ROFST(_PathToROs, _LastDocVersionInfo); //"g:\\vehlp\\ro\\ro.fst"); - // displayRO.MyROFST = rofst; - // StepTabPanel dtp = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; - // if (dtp == null) return; - // displayRO.MyRTB = dtp.MyStepPanel.SelectedStepItem.MyStepRTB; - // displayRO.CurROLink = null; - // //displayRO.Mydvi = dvi; - //} - private void tc_LinkModifyTran(object sender, StepPanelLinkEventArgs args) { infoPanel.Expanded = true; infoTabs.SelectedTab = infotabTransition; - StepTabPanel dtp = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; - if (dtp == null) return; - displayTransition.MyRTB = dtp.MyStepPanel.SelectedStepItem.MyStepRTB; + if (SelectedStepTabPanel == null) return; + displayTransition.MyRTB = SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; displayTransition.CurTrans = args.MyLinkText.MyTransitionInfo; } private void tc_LinkModifyRO(object sender, StepPanelLinkEventArgs args) { infoPanel.Expanded = true; infoTabs.SelectedTab = infotabRO; - - StepTabPanel dtp = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; - DocVersionInfo dvi = (DocVersionInfo)dtp.MyStepPanel.MyProcedureItemInfo.MyProcedure.MyActiveParent; - if (dtp == null) return; - ROFST rofst = new ROFST(_PathToROs, dvi); //_LastDocVersionInfo); //"g:\\vehlp\\ro\\ro.fst"); - displayRO.MyROFST = rofst; - displayRO.MyRTB = dtp.MyStepPanel.SelectedStepItem.MyStepRTB; + + if (SelectedStepTabPanel == null) return; + displayRO.MyROFST = SelectedROFst; + displayRO.MyRTB = SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; displayRO.CurROLink = args.MyLinkText.RoUsageid; // TODO: this is wrong - use for now. - displayRO.Mydvi = dvi; + displayRO.Mydvi = SelectedDVI; displayRO.ProgressBar = bottomProgBar; displayRO.CurROLink = args.MyLinkText.RoUsageid; // this is wrong - use for now. } @@ -1155,8 +1165,7 @@ namespace VEPROMS private void infoPanel_Click(object sender, EventArgs e) { - StepTabPanel dtp = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; - displayTags.MyRTB = (dtp == null) ? null : dtp.MyStepPanel.SelectedStepItem.MyStepRTB; + displayTags.MyRTB = (SelectedStepTabPanel == null) ? null : SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; } } }