diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index 8db2b961..5bdb073c 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -80,19 +80,22 @@ namespace VEPROMS this.tv = new Volian.Controls.Library.vlnTreeView(); this.infoPanel = new DevComponents.DotNetBar.ExpandablePanel(); this.infoTabs = new DevComponents.DotNetBar.TabControl(); - this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); - this.displayHistory = new Volian.Controls.Library.DisplayHistory(); - this.infotabHistory = new DevComponents.DotNetBar.TabItem(this.components); this.infotabControlPanelTags = new DevComponents.DotNetBar.TabControlPanel(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.displayTags = new Volian.Controls.Library.DisplayTags(); this.infotabTags = new DevComponents.DotNetBar.TabItem(this.components); - this.infotabControlPanelTransitions = new DevComponents.DotNetBar.TabControlPanel(); - this.displayTransition = new Volian.Controls.Library.DisplayTransition(); - this.infotabTransition = new DevComponents.DotNetBar.TabItem(this.components); + this.tcpApplicability = new DevComponents.DotNetBar.TabControlPanel(); + this.displayApplicability = new Volian.Controls.Library.DisplayApplicability(); + this.infotabApplicability = new DevComponents.DotNetBar.TabItem(this.components); + this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); + this.displayHistory = new Volian.Controls.Library.DisplayHistory(); + this.infotabHistory = new DevComponents.DotNetBar.TabItem(this.components); this.infotabControlPanelRO = new DevComponents.DotNetBar.TabControlPanel(); this.displayRO = new Volian.Controls.Library.DisplayRO(); this.infotabRO = new DevComponents.DotNetBar.TabItem(this.components); + this.infotabControlPanelTransitions = new DevComponents.DotNetBar.TabControlPanel(); + this.displayTransition = new Volian.Controls.Library.DisplayTransition(); + this.infotabTransition = new DevComponents.DotNetBar.TabItem(this.components); this.navigationPanePanel2 = new DevComponents.DotNetBar.NavigationPanePanel(); this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.expandableSplitter2 = new DevComponents.DotNetBar.ExpandableSplitter(); @@ -117,10 +120,10 @@ namespace VEPROMS this.displayBookMarks = new Volian.Controls.Library.DisplayBookMarks(); this.toolsTabBookMarks = new DevComponents.DotNetBar.TabItem(this.components); this.expandableSplitter4 = new DevComponents.DotNetBar.ExpandableSplitter(); - this.fbd = new System.Windows.Forms.FolderBrowserDialog(); this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); this.itemAnnotationsBindingSource = new System.Windows.Forms.BindingSource(this.components); this.tc = new Volian.Controls.Library.DisplayTabControl(); + this.fbd = new System.Windows.Forms.FolderBrowserDialog(); ((System.ComponentModel.ISupportInitialize)(this.bottomBar)).BeginInit(); this.bottomBar.SuspendLayout(); this.epAnnotations.SuspendLayout(); @@ -128,11 +131,12 @@ namespace VEPROMS this.infoPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.infoTabs)).BeginInit(); this.infoTabs.SuspendLayout(); - this.tabControlPanel1.SuspendLayout(); this.infotabControlPanelTags.SuspendLayout(); this.panelEx1.SuspendLayout(); - this.infotabControlPanelTransitions.SuspendLayout(); + this.tcpApplicability.SuspendLayout(); + this.tabControlPanel1.SuspendLayout(); this.infotabControlPanelRO.SuspendLayout(); + this.infotabControlPanelTransitions.SuspendLayout(); this.toolsPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.toolsTabs)).BeginInit(); this.toolsTabs.SuspendLayout(); @@ -265,10 +269,6 @@ namespace VEPROMS this.itemContainer1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.itemContainer2, this.itemContainer5}); - // - // - // - //this.itemContainer1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // itemContainer2 // @@ -282,10 +282,6 @@ namespace VEPROMS this.itemContainer2.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.itemContainer3, this.icRecentDocs}); - // - // - // - //this.itemContainer2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // itemContainer3 // @@ -303,10 +299,6 @@ namespace VEPROMS this.btnPrint, this.btnPrepare, this.btnAdmin}); - // - // - // - //this.itemContainer3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // btnNew // @@ -376,10 +368,6 @@ namespace VEPROMS this.icRecentDocs.Name = "icRecentDocs"; this.icRecentDocs.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem8}); - // - // - // - //this.icRecentDocs.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // labelItem8 // @@ -404,10 +392,6 @@ namespace VEPROMS this.itemContainer5.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnOptions, this.btnExit}); - // - // - // - //this.itemContainer5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // btnOptions // @@ -488,7 +472,7 @@ namespace VEPROMS this.btnFixMSWord}); this.bottomBar.Location = new System.Drawing.Point(5, 552); this.bottomBar.Name = "bottomBar"; - this.bottomBar.Size = new System.Drawing.Size(1185, 29); + this.bottomBar.Size = new System.Drawing.Size(1185, 25); this.bottomBar.Stretch = true; this.bottomBar.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.bottomBar.TabIndex = 1; @@ -501,7 +485,7 @@ namespace VEPROMS this.cmbFont.FormattingEnabled = true; this.cmbFont.Location = new System.Drawing.Point(1013, 0); this.cmbFont.Name = "cmbFont"; - this.cmbFont.Size = new System.Drawing.Size(172, 28); + this.cmbFont.Size = new System.Drawing.Size(172, 23); this.cmbFont.TabIndex = 0; this.cmbFont.SelectedIndexChanged += new System.EventHandler(this.cmbFont_SelectedIndexChanged); // @@ -602,7 +586,7 @@ namespace VEPROMS this.epAnnotations.Expanded = false; this.epAnnotations.ExpandedBounds = new System.Drawing.Rectangle(4, 544, 1187, 202); this.epAnnotations.ExpandOnTitleClick = true; - this.epAnnotations.Location = new System.Drawing.Point(5, 526); + this.epAnnotations.Location = new System.Drawing.Point(5, 571); this.epAnnotations.Name = "epAnnotations"; this.epAnnotations.Size = new System.Drawing.Size(1185, 26); this.epAnnotations.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -629,7 +613,7 @@ namespace VEPROMS // ctrlAnnotationDetails // this.ctrlAnnotationDetails.AnnotationRTFText = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 Microsoft S" + - "ans Serif;}}\r\n\\viewkind4\\uc1\\pard\\f0\\fs20\\par\r\n}\r\n"; + "ans Serif;}}\r\n\\viewkind4\\uc1\\pard\\f0\\fs20\\par\r\n}\r\n"; this.ctrlAnnotationDetails.Annotations = null; this.ctrlAnnotationDetails.AnnotationText = ""; this.ctrlAnnotationDetails.CurrentAnnotation = null; @@ -656,7 +640,7 @@ namespace VEPROMS this.btnAnnoDetailsPushPin.ShowSubItems = false; this.btnAnnoDetailsPushPin.Size = new System.Drawing.Size(27, 23); this.superTooltip1.SetSuperTooltip(this.btnAnnoDetailsPushPin, new DevComponents.DotNetBar.SuperTooltipInfo("Annotation Details Push Pin", "", "This will toggle between keeping the Annotation Details window opened or to open/" + - "close automatically.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + "close automatically.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnAnnoDetailsPushPin.TabIndex = 14; this.btnAnnoDetailsPushPin.ThemeAware = true; // @@ -672,7 +656,7 @@ namespace VEPROMS this.epProcedures.ExpandOnTitleClick = true; this.epProcedures.Location = new System.Drawing.Point(5, 57); this.epProcedures.Name = "epProcedures"; - this.epProcedures.Size = new System.Drawing.Size(30, 469); + this.epProcedures.Size = new System.Drawing.Size(30, 514); this.epProcedures.Style.Alignment = System.Drawing.StringAlignment.Center; this.epProcedures.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.epProcedures.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -701,7 +685,7 @@ namespace VEPROMS this.tv.HideSelection = false; this.tv.Location = new System.Drawing.Point(0, 26); this.tv.Name = "tv"; - this.tv.Size = new System.Drawing.Size(30, 443); + this.tv.Size = new System.Drawing.Size(30, 508); this.tv.TabIndex = 1; this.tv.MouseUp += new System.Windows.Forms.MouseEventHandler(this.tv_MouseUp); this.tv.SectionShouldClose += new Volian.Controls.Library.vlnTreeViewSectionInfoEvent(this.tv_SectionShouldClose); @@ -715,12 +699,10 @@ namespace VEPROMS this.infoPanel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.infoPanel.Controls.Add(this.infoTabs); this.infoPanel.Dock = System.Windows.Forms.DockStyle.Right; - this.infoPanel.Expanded = false; - this.infoPanel.ExpandedBounds = new System.Drawing.Rectangle(927, 57, 230, 471); this.infoPanel.ExpandOnTitleClick = true; - this.infoPanel.Location = new System.Drawing.Point(1127, 57); + this.infoPanel.Location = new System.Drawing.Point(927, 57); this.infoPanel.Name = "infoPanel"; - this.infoPanel.Size = new System.Drawing.Size(30, 469); + this.infoPanel.Size = new System.Drawing.Size(230, 514); this.infoPanel.Style.Alignment = System.Drawing.StringAlignment.Center; this.infoPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.infoPanel.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -747,15 +729,16 @@ namespace VEPROMS this.infoTabs.BackColor = System.Drawing.Color.Transparent; this.infoTabs.CanReorderTabs = true; this.infoTabs.Controls.Add(this.infotabControlPanelTags); + this.infoTabs.Controls.Add(this.tcpApplicability); this.infoTabs.Controls.Add(this.tabControlPanel1); - this.infoTabs.Controls.Add(this.infotabControlPanelTransitions); this.infoTabs.Controls.Add(this.infotabControlPanelRO); + this.infoTabs.Controls.Add(this.infotabControlPanelTransitions); this.infoTabs.Dock = System.Windows.Forms.DockStyle.Fill; this.infoTabs.Location = new System.Drawing.Point(0, 26); this.infoTabs.Name = "infoTabs"; this.infoTabs.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold); this.infoTabs.SelectedTabIndex = 0; - this.infoTabs.Size = new System.Drawing.Size(30, 443); + this.infoTabs.Size = new System.Drawing.Size(230, 488); this.infoTabs.TabAlignment = DevComponents.DotNetBar.eTabStripAlignment.Right; this.infoTabs.TabIndex = 1; this.infoTabs.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -763,46 +746,11 @@ namespace VEPROMS this.infoTabs.Tabs.Add(this.infotabRO); this.infoTabs.Tabs.Add(this.infotabTransition); this.infoTabs.Tabs.Add(this.infotabHistory); + this.infoTabs.Tabs.Add(this.infotabApplicability); this.infoTabs.Text = "tabControl1"; this.infoTabs.ThemeAware = true; this.infoTabs.Visible = false; // - // tabControlPanel1 - // - this.tabControlPanel1.Controls.Add(this.displayHistory); - this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel1.Location = new System.Drawing.Point(0, 0); - this.tabControlPanel1.Name = "tabControlPanel1"; - this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel1.Size = new System.Drawing.Size(3, 443); - this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.SystemColors.Control; - this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tabControlPanel1.Style.GradientAngle = 180; - this.tabControlPanel1.TabIndex = 6; - this.tabControlPanel1.TabItem = this.infotabHistory; - this.tabControlPanel1.ThemeAware = true; - // - // displayHistory - // - this.displayHistory.Dock = System.Windows.Forms.DockStyle.Fill; - this.displayHistory.Location = new System.Drawing.Point(1, 1); - this.displayHistory.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.displayHistory.MyEditItem = null; - this.displayHistory.MyItemInfo = null; - this.displayHistory.MyProcedureInfo = null; - this.displayHistory.Name = "displayHistory"; - this.displayHistory.Size = new System.Drawing.Size(1, 509); - this.displayHistory.TabIndex = 0; - // - // infotabHistory - // - this.infotabHistory.AttachedControl = this.tabControlPanel1; - this.infotabHistory.Name = "infotabHistory"; - this.infotabHistory.Text = "History"; - this.infotabHistory.Visible = false; - // // infotabControlPanelTags // this.infotabControlPanelTags.Controls.Add(this.panelEx1); @@ -810,11 +758,11 @@ namespace VEPROMS this.infotabControlPanelTags.Location = new System.Drawing.Point(0, 0); this.infotabControlPanelTags.Name = "infotabControlPanelTags"; this.infotabControlPanelTags.Padding = new System.Windows.Forms.Padding(1); - this.infotabControlPanelTags.Size = new System.Drawing.Size(3, 443); + this.infotabControlPanelTags.Size = new System.Drawing.Size(203, 488); this.infotabControlPanelTags.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.infotabControlPanelTags.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.infotabControlPanelTags.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.infotabControlPanelTags.Style.GradientAngle = 180; this.infotabControlPanelTags.TabIndex = 1; this.infotabControlPanelTags.TabItem = this.infotabTags; @@ -828,7 +776,7 @@ namespace VEPROMS this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Location = new System.Drawing.Point(1, 1); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(1, 441); + this.panelEx1.Size = new System.Drawing.Size(201, 486); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.Transparent; this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.SlateGray; @@ -844,7 +792,7 @@ namespace VEPROMS this.displayTags.Dock = System.Windows.Forms.DockStyle.Top; this.displayTags.IsVisible = false; this.displayTags.Location = new System.Drawing.Point(0, 0); - this.displayTags.Margin = new System.Windows.Forms.Padding(2); + this.displayTags.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.displayTags.MinimumSize = new System.Drawing.Size(100, 630); this.displayTags.MyEditItem = null; this.displayTags.Name = "displayTags"; @@ -860,45 +808,75 @@ namespace VEPROMS this.infotabTags.Visible = false; this.infotabTags.Click += new System.EventHandler(this.infotabTags_Click); // - // infotabControlPanelTransitions + // tcpApplicability // - this.infotabControlPanelTransitions.Controls.Add(this.displayTransition); - this.infotabControlPanelTransitions.Dock = System.Windows.Forms.DockStyle.Fill; - this.infotabControlPanelTransitions.Location = new System.Drawing.Point(0, 0); - this.infotabControlPanelTransitions.Name = "infotabControlPanelTransitions"; - this.infotabControlPanelTransitions.Padding = new System.Windows.Forms.Padding(1); - this.infotabControlPanelTransitions.Size = new System.Drawing.Size(3, 443); - this.infotabControlPanelTransitions.Style.BackColor1.Color = System.Drawing.SystemColors.Control; - this.infotabControlPanelTransitions.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.infotabControlPanelTransitions.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.infotabControlPanelTransitions.Style.GradientAngle = 180; - this.infotabControlPanelTransitions.TabIndex = 5; - this.infotabControlPanelTransitions.TabItem = this.infotabTransition; - this.infotabControlPanelTransitions.ThemeAware = true; - this.infotabControlPanelTransitions.Click += new System.EventHandler(this.infotabTransition_Click); + this.tcpApplicability.Controls.Add(this.displayApplicability); + this.tcpApplicability.Dock = System.Windows.Forms.DockStyle.Fill; + this.tcpApplicability.Location = new System.Drawing.Point(0, 0); + this.tcpApplicability.Name = "tcpApplicability"; + this.tcpApplicability.Padding = new System.Windows.Forms.Padding(1); + this.tcpApplicability.Size = new System.Drawing.Size(203, 488); + this.tcpApplicability.Style.BackColor1.Color = System.Drawing.SystemColors.Control; + this.tcpApplicability.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tcpApplicability.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tcpApplicability.Style.GradientAngle = 180; + this.tcpApplicability.TabIndex = 7; + this.tcpApplicability.TabItem = this.infotabApplicability; + this.tcpApplicability.ThemeAware = true; // - // displayTransition + // displayApplicability // - this.displayTransition.AutoSize = true; - this.displayTransition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.displayTransition.CurTrans = null; - this.displayTransition.Dock = System.Windows.Forms.DockStyle.Fill; - this.displayTransition.Location = new System.Drawing.Point(1, 1); - this.displayTransition.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.displayTransition.MyRTB = null; - this.displayTransition.Name = "displayTransition"; - this.displayTransition.RangeColor = System.Drawing.Color.LightGray; - this.displayTransition.Size = new System.Drawing.Size(1, 441); - this.displayTransition.TabIndex = 0; + this.displayApplicability.Dock = System.Windows.Forms.DockStyle.Fill; + this.displayApplicability.Location = new System.Drawing.Point(1, 1); + this.displayApplicability.MyApplicability = ""; + this.displayApplicability.MyItemInfo = null; + this.displayApplicability.Name = "displayApplicability"; + this.displayApplicability.Size = new System.Drawing.Size(201, 486); + this.displayApplicability.TabIndex = 2; // - // infotabTransition + // infotabApplicability // - this.infotabTransition.AttachedControl = this.infotabControlPanelTransitions; - this.infotabTransition.Name = "infotabTransition"; - this.infotabTransition.Text = "Transition"; - this.infotabTransition.Visible = false; - this.infotabTransition.Click += new System.EventHandler(this.infotabTransition_Click); + this.infotabApplicability.AttachedControl = this.tcpApplicability; + this.infotabApplicability.Name = "infotabApplicability"; + this.infotabApplicability.Text = "Applicability"; + this.infotabApplicability.Visible = false; + // + // tabControlPanel1 + // + this.tabControlPanel1.Controls.Add(this.displayHistory); + this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControlPanel1.Location = new System.Drawing.Point(0, 0); + this.tabControlPanel1.Name = "tabControlPanel1"; + this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); + this.tabControlPanel1.Size = new System.Drawing.Size(203, 488); + this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.SystemColors.Control; + this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tabControlPanel1.Style.GradientAngle = 180; + this.tabControlPanel1.TabIndex = 6; + this.tabControlPanel1.TabItem = this.infotabHistory; + this.tabControlPanel1.ThemeAware = true; + // + // displayHistory + // + this.displayHistory.Dock = System.Windows.Forms.DockStyle.Fill; + this.displayHistory.Location = new System.Drawing.Point(1, 1); + this.displayHistory.Margin = new System.Windows.Forms.Padding(4); + this.displayHistory.MyEditItem = null; + this.displayHistory.MyItemInfo = null; + this.displayHistory.MyProcedureInfo = null; + this.displayHistory.Name = "displayHistory"; + this.displayHistory.Size = new System.Drawing.Size(1, 509); + this.displayHistory.TabIndex = 0; + // + // infotabHistory + // + this.infotabHistory.AttachedControl = this.tabControlPanel1; + this.infotabHistory.Name = "infotabHistory"; + this.infotabHistory.Text = "History"; + this.infotabHistory.Visible = false; // // infotabControlPanelRO // @@ -907,11 +885,11 @@ namespace VEPROMS this.infotabControlPanelRO.Location = new System.Drawing.Point(0, 0); this.infotabControlPanelRO.Name = "infotabControlPanelRO"; this.infotabControlPanelRO.Padding = new System.Windows.Forms.Padding(1); - this.infotabControlPanelRO.Size = new System.Drawing.Size(3, 443); + this.infotabControlPanelRO.Size = new System.Drawing.Size(203, 488); this.infotabControlPanelRO.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.infotabControlPanelRO.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.infotabControlPanelRO.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.infotabControlPanelRO.Style.GradientAngle = 180; this.infotabControlPanelRO.TabIndex = 4; this.infotabControlPanelRO.TabItem = this.infotabRO; @@ -929,7 +907,7 @@ namespace VEPROMS this.displayRO.Name = "displayRO"; this.displayRO.ProgressBar = null; this.displayRO.ROTypeFilter = VEPROMS.CSLA.Library.E_ROValueType.All; - this.displayRO.Size = new System.Drawing.Size(1, 441); + this.displayRO.Size = new System.Drawing.Size(201, 486); this.displayRO.TabControl = null; this.displayRO.TabIndex = 0; // @@ -941,6 +919,46 @@ namespace VEPROMS this.infotabRO.Visible = false; this.infotabRO.Click += new System.EventHandler(this.infotabRO_Click); // + // infotabControlPanelTransitions + // + this.infotabControlPanelTransitions.Controls.Add(this.displayTransition); + this.infotabControlPanelTransitions.Dock = System.Windows.Forms.DockStyle.Fill; + this.infotabControlPanelTransitions.Location = new System.Drawing.Point(0, 0); + this.infotabControlPanelTransitions.Name = "infotabControlPanelTransitions"; + this.infotabControlPanelTransitions.Padding = new System.Windows.Forms.Padding(1); + this.infotabControlPanelTransitions.Size = new System.Drawing.Size(203, 488); + this.infotabControlPanelTransitions.Style.BackColor1.Color = System.Drawing.SystemColors.Control; + this.infotabControlPanelTransitions.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.infotabControlPanelTransitions.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.infotabControlPanelTransitions.Style.GradientAngle = 180; + this.infotabControlPanelTransitions.TabIndex = 5; + this.infotabControlPanelTransitions.TabItem = this.infotabTransition; + this.infotabControlPanelTransitions.ThemeAware = true; + this.infotabControlPanelTransitions.Click += new System.EventHandler(this.infotabTransition_Click); + // + // displayTransition + // + this.displayTransition.AutoSize = true; + this.displayTransition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.displayTransition.CurTrans = null; + this.displayTransition.Dock = System.Windows.Forms.DockStyle.Fill; + this.displayTransition.Location = new System.Drawing.Point(1, 1); + this.displayTransition.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.displayTransition.MyRTB = null; + this.displayTransition.Name = "displayTransition"; + this.displayTransition.RangeColor = System.Drawing.Color.LightGray; + this.displayTransition.Size = new System.Drawing.Size(201, 486); + this.displayTransition.TabIndex = 0; + // + // infotabTransition + // + this.infotabTransition.AttachedControl = this.infotabControlPanelTransitions; + this.infotabTransition.Name = "infotabTransition"; + this.infotabTransition.Text = "Transition"; + this.infotabTransition.Visible = false; + this.infotabTransition.Click += new System.EventHandler(this.infotabTransition_Click); + // // navigationPanePanel2 // this.navigationPanePanel2.Dock = System.Windows.Forms.DockStyle.Fill; @@ -984,7 +1002,7 @@ namespace VEPROMS this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter1.Location = new System.Drawing.Point(35, 57); this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(3, 469); + this.expandableSplitter1.Size = new System.Drawing.Size(3, 514); this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter1.TabIndex = 5; this.expandableSplitter1.TabStop = false; @@ -1016,9 +1034,9 @@ namespace VEPROMS this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter2.Location = new System.Drawing.Point(38, 523); + this.expandableSplitter2.Location = new System.Drawing.Point(38, 568); this.expandableSplitter2.Name = "expandableSplitter2"; - this.expandableSplitter2.Size = new System.Drawing.Size(1089, 3); + this.expandableSplitter2.Size = new System.Drawing.Size(889, 3); this.expandableSplitter2.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter2.TabIndex = 6; this.expandableSplitter2.TabStop = false; @@ -1050,9 +1068,9 @@ namespace VEPROMS this.expandableSplitter3.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter3.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255))))); this.expandableSplitter3.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter3.Location = new System.Drawing.Point(1124, 57); + this.expandableSplitter3.Location = new System.Drawing.Point(924, 57); this.expandableSplitter3.Name = "expandableSplitter3"; - this.expandableSplitter3.Size = new System.Drawing.Size(3, 466); + this.expandableSplitter3.Size = new System.Drawing.Size(3, 511); this.expandableSplitter3.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter3.TabIndex = 7; this.expandableSplitter3.TabStop = false; @@ -1079,11 +1097,11 @@ namespace VEPROMS this.toolsPanel.Controls.Add(this.toolsTabs); this.toolsPanel.Dock = System.Windows.Forms.DockStyle.Right; this.toolsPanel.Expanded = false; - this.toolsPanel.ExpandedBounds = new System.Drawing.Rectangle(847, 57, 343, 471); + this.toolsPanel.ExpandedBounds = new System.Drawing.Rectangle(847, 57, 343, 631); this.toolsPanel.ExpandOnTitleClick = true; this.toolsPanel.Location = new System.Drawing.Point(1160, 57); this.toolsPanel.Name = "toolsPanel"; - this.toolsPanel.Size = new System.Drawing.Size(30, 469); + this.toolsPanel.Size = new System.Drawing.Size(30, 514); this.toolsPanel.Style.Alignment = System.Drawing.StringAlignment.Center; this.toolsPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.toolsPanel.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -1117,7 +1135,7 @@ namespace VEPROMS this.toolsTabs.Name = "toolsTabs"; this.toolsTabs.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold); this.toolsTabs.SelectedTabIndex = 0; - this.toolsTabs.Size = new System.Drawing.Size(30, 443); + this.toolsTabs.Size = new System.Drawing.Size(30, 605); this.toolsTabs.TabAlignment = DevComponents.DotNetBar.eTabStripAlignment.Right; this.toolsTabs.TabIndex = 1; this.toolsTabs.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -1135,11 +1153,11 @@ namespace VEPROMS this.annotationSearch.Location = new System.Drawing.Point(0, 0); this.annotationSearch.Name = "annotationSearch"; this.annotationSearch.Padding = new System.Windows.Forms.Padding(1); - this.annotationSearch.Size = new System.Drawing.Size(3, 443); + this.annotationSearch.Size = new System.Drawing.Size(3, 605); this.annotationSearch.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.annotationSearch.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.annotationSearch.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.annotationSearch.Style.GradientAngle = 180; this.annotationSearch.TabIndex = 3; this.annotationSearch.TabItem = this.toolstabResults; @@ -1159,7 +1177,7 @@ namespace VEPROMS this.displaySearch1.RightToLeft = System.Windows.Forms.RightToLeft.Yes; this.displaySearch1.SearchResults = null; this.displaySearch1.SearchString = null; - this.displaySearch1.Size = new System.Drawing.Size(1, 441); + this.displaySearch1.Size = new System.Drawing.Size(1, 603); this.displaySearch1.TabIndex = 0; this.displaySearch1.TypesSelected = null; // @@ -1250,11 +1268,11 @@ namespace VEPROMS this.tabControlPanel2.Location = new System.Drawing.Point(0, 0); this.tabControlPanel2.Name = "tabControlPanel2"; this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel2.Size = new System.Drawing.Size(3, 443); + this.tabControlPanel2.Size = new System.Drawing.Size(3, 605); this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanel2.Style.GradientAngle = 180; this.tabControlPanel2.TabIndex = 2; this.tabControlPanel2.TabItem = this.toolsTabBookMarks; @@ -1269,7 +1287,7 @@ namespace VEPROMS this.panelEx3.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx3.Location = new System.Drawing.Point(1, 1); this.panelEx3.Name = "panelEx3"; - this.panelEx3.Size = new System.Drawing.Size(1, 441); + this.panelEx3.Size = new System.Drawing.Size(1, 603); this.panelEx3.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx3.Style.BackColor1.Color = System.Drawing.Color.Transparent; this.panelEx3.Style.BackColor2.Color = System.Drawing.Color.SlateGray; @@ -1282,11 +1300,11 @@ namespace VEPROMS // this.displayBookMarks.Dock = System.Windows.Forms.DockStyle.Fill; this.displayBookMarks.Location = new System.Drawing.Point(0, 0); - this.displayBookMarks.Margin = new System.Windows.Forms.Padding(2); + this.displayBookMarks.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.displayBookMarks.MyDisplayTabControl = null; this.displayBookMarks.MyEditItem = null; this.displayBookMarks.Name = "displayBookMarks"; - this.displayBookMarks.Size = new System.Drawing.Size(1, 441); + this.displayBookMarks.Size = new System.Drawing.Size(1, 603); this.displayBookMarks.TabIndex = 0; // // toolsTabBookMarks @@ -1295,6 +1313,42 @@ namespace VEPROMS this.toolsTabBookMarks.Name = "toolsTabBookMarks"; this.toolsTabBookMarks.Text = "Bookmarks"; // + // tabControlPanelLD + // + this.tabControlPanelLD.Controls.Add(this.displayLibDocs); + this.tabControlPanelLD.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControlPanelLD.Location = new System.Drawing.Point(0, 0); + this.tabControlPanelLD.Name = "tabControlPanelLD"; + this.tabControlPanelLD.Padding = new System.Windows.Forms.Padding(1); + this.tabControlPanelLD.Size = new System.Drawing.Size(3, 605); + this.tabControlPanelLD.Style.BackColor1.Color = System.Drawing.SystemColors.Control; + this.tabControlPanelLD.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tabControlPanelLD.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tabControlPanelLD.Style.GradientAngle = 180; + this.tabControlPanelLD.TabIndex = 4; + this.tabControlPanelLD.TabItem = this.tabItemLibDocs; + this.tabControlPanelLD.ThemeAware = true; + // + // displayLibDocs + // + this.displayLibDocs.AutoScroll = true; + this.displayLibDocs.CurLibDoc = null; + this.displayLibDocs.Dock = System.Windows.Forms.DockStyle.Fill; + this.displayLibDocs.LibDocList = null; + this.displayLibDocs.Location = new System.Drawing.Point(1, 1); + this.displayLibDocs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.displayLibDocs.Name = "displayLibDocs"; + this.displayLibDocs.Size = new System.Drawing.Size(1, 603); + this.displayLibDocs.TabIndex = 0; + // + // tabItemLibDocs + // + this.tabItemLibDocs.AttachedControl = this.tabControlPanelLD; + this.tabItemLibDocs.Name = "tabItemLibDocs"; + this.tabItemLibDocs.Text = "Library Documents"; + this.tabItemLibDocs.Click += new System.EventHandler(this.tabItemLibDocs_Click); + // // expandableSplitter4 // this.expandableSplitter4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255))))); @@ -1325,7 +1379,7 @@ namespace VEPROMS this.expandableSplitter4.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter4.Location = new System.Drawing.Point(1157, 57); this.expandableSplitter4.Name = "expandableSplitter4"; - this.expandableSplitter4.Size = new System.Drawing.Size(3, 469); + this.expandableSplitter4.Size = new System.Drawing.Size(3, 514); this.expandableSplitter4.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter4.TabIndex = 3; this.expandableSplitter4.TabStop = false; @@ -1346,12 +1400,12 @@ namespace VEPROMS this.tc.Dock = System.Windows.Forms.DockStyle.Fill; this.tc.ForeColor = System.Drawing.SystemColors.ControlText; this.tc.Location = new System.Drawing.Point(38, 57); - this.tc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tc.Margin = new System.Windows.Forms.Padding(4); this.tc.MyCopyStep = null; this.tc.Name = "tc"; this.tc.RibbonExpanded = true; this.tc.SelectedDisplayTabItem = null; - this.tc.Size = new System.Drawing.Size(1086, 466); + this.tc.Size = new System.Drawing.Size(886, 511); this.tc.TabIndex = 8; this.tc.PanelTabDisplay += new Volian.Controls.Library.StepPanelTabDisplayEvent(this.tc_PanelTabDisplay); this.tc.WordSectionClose += new Volian.Controls.Library.StepPanelWordSectionCloseEvent(this.tc_WordSectionClose); @@ -1364,10 +1418,10 @@ namespace VEPROMS // // frmVEPROMS // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScroll = true; - this.ClientSize = new System.Drawing.Size(1195, 583); + this.ClientSize = new System.Drawing.Size(1195, 624); this.Controls.Add(this.tc); this.Controls.Add(this.expandableSplitter3); this.Controls.Add(this.expandableSplitter2); @@ -1394,12 +1448,13 @@ namespace VEPROMS this.infoPanel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.infoTabs)).EndInit(); this.infoTabs.ResumeLayout(false); - this.tabControlPanel1.ResumeLayout(false); this.infotabControlPanelTags.ResumeLayout(false); this.panelEx1.ResumeLayout(false); + this.tcpApplicability.ResumeLayout(false); + this.tabControlPanel1.ResumeLayout(false); + this.infotabControlPanelRO.ResumeLayout(false); this.infotabControlPanelTransitions.ResumeLayout(false); this.infotabControlPanelTransitions.PerformLayout(); - this.infotabControlPanelRO.ResumeLayout(false); this.toolsPanel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.toolsTabs)).EndInit(); this.toolsTabs.ResumeLayout(false); @@ -1526,6 +1581,9 @@ namespace VEPROMS private Volian.Controls.Library.DisplayHistory displayHistory; private DevComponents.DotNetBar.ButtonItem btnUpdateFormats; private System.Windows.Forms.FolderBrowserDialog fbd; + private DevComponents.DotNetBar.TabControlPanel tcpApplicability; + private DevComponents.DotNetBar.TabItem infotabApplicability; + private Volian.Controls.Library.DisplayApplicability displayApplicability; private DevComponents.DotNetBar.ButtonItem btnSendErrorLog; private DevComponents.DotNetBar.TabControlPanel tabControlPanel3; private DevComponents.DotNetBar.TabItem toosTabReports; diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index f5545a83..f49be7f0 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -190,8 +190,8 @@ namespace VEPROMS if (Database.LastDatabase != Database.SelectedDatabase) { Properties.Settings.Default.MRIList = null; - Properties.Settings.Default.DefaultDB = Database.SelectedDatabase; - Properties.Settings.Default.Save(); + Properties.Settings.Default.DefaultDB = Database.SelectedDatabase; + Properties.Settings.Default.Save(); } DateTime dtSunday = DateTime.Now.AddDays(-((int)DateTime.Now.DayOfWeek)); ChangeLogFileName("LogFileAppender", Database.SelectedDatabase + " " + dtSunday.ToString("yyyyMMdd") + " ErrorLog.txt"); @@ -238,6 +238,7 @@ namespace VEPROMS tv.ApproveSomeProcedures += new vlnTreeViewEvent(tv_ApproveSomeProcedures); tv.ReportAllProceduresInconsistencies += new vlnTreeViewEvent(tv_ReportAllProceduresInconsistencies); tv.ViewPDF += new vlnTreeViewPdfEvent(tv_ViewPDF); + displayApplicability.ApplicabilityViewModeChanged += new DisplayApplicability.DisplayApplicabilityEvent(displayApplicability_ApplicabilityViewModeChanged); } private void MakeDatabaseChanges() @@ -296,6 +297,19 @@ namespace VEPROMS } return false; } + + void displayApplicability_ApplicabilityViewModeChanged(object sender, EventArgs args) + { + if (tc.SelectedDisplayTabItem == null) return; + StepPanel pnl = tc.SelectedDisplayTabItem.MyStepTabPanel.MyStepPanel; + if (pnl != null) + { + pnl.ApplDisplayMode = displayApplicability.ViewMode; + displayHistory.ApplDisplayMode = pnl.ApplDisplayMode; + + } + } + void tv_ViewPDF(object sender, vlnTreeViewPdfArgs args) { byte[] buffer; @@ -331,9 +345,11 @@ namespace VEPROMS DocVersionInfo dvi = (args.Node as VETreeNode).VEObject as DocVersionInfo; if (dvi == null) return; tc.SaveCurrentEditItem(); + dvi.DocVersionConfig.SelectedSlave = args.UnitIndex; dlgApproveProcedure dlg = new dlgApproveProcedure(dvi, true); dlg.ShowDialog(this); displayHistory.RefreshList(); + dvi.DocVersionConfig.SelectedSlave = 0; } void tv_ApproveAllProcedures(object sender, vlnTreeEventArgs args) @@ -341,19 +357,23 @@ namespace VEPROMS DocVersionInfo dvi = (args.Node as VETreeNode).VEObject as DocVersionInfo; if (dvi == null) return; tc.SaveCurrentEditItem(); + dvi.DocVersionConfig.SelectedSlave = args.UnitIndex; dlgApproveProcedure dlg = new dlgApproveProcedure(dvi); dlg.ShowDialog(this); displayHistory.RefreshList(); + dvi.DocVersionConfig.SelectedSlave = 0; } void tv_ApproveProcedure(object sender, vlnTreeEventArgs args) { ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo; + pi.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex; if (pi == null) return; tc.SaveCurrentEditItem(pi); dlgApproveProcedure dlg = new dlgApproveProcedure(pi); dlg.ShowDialog(this); displayHistory.RefreshList(); + pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0; } void tv_PrintAllProcedures(object sender, vlnTreeEventArgs args) @@ -362,15 +382,20 @@ namespace VEPROMS if (dvi == null) return; tc.SaveCurrentEditItem(); DlgPrintProcedure prnDlg = new DlgPrintProcedure(dvi); - prnDlg.Show(this); // RHM 20120925 - Center dialog over PROMS window + prnDlg.SelectedSlave = args.UnitIndex; + prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window } void tv_PrintProcedure(object sender, vlnTreeEventArgs args) { ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo; + pi.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex; if (pi == null) return; tc.SaveCurrentEditItem(pi); DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi); - prnDlg.Show(this); // RHM 20120925 - Center dialog over PROMS window + prnDlg.SelectedSlave = args.UnitIndex; +// prnDlg.Show(this); // RHM 20120925 - Center dialog over PROMS window + prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window + pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0; } void RefreshDisplayHistory(object sender) { @@ -422,7 +447,7 @@ namespace VEPROMS ProcedureInfo pi = args.Proc as ProcedureInfo; if (pi == null) return; DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi); - prnDlg.Show(this); // RHM 20120925 - Center dialog over PROMS window + prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window } void displaySearch1_PrintRequest(object sender, DisplaySearchEventArgs args) { @@ -1387,6 +1412,7 @@ namespace VEPROMS tv.AdjustTree(tc.SelectedDisplayTabItem.MyItemInfo); } SetCaption(tv.SelectedNode as VETreeNode); + displayApplicability.MyDisplayTabItem = tc.SelectedDisplayTabItem; } private void tc_StepPanelModeChange(object sender, StepRTBModeChangeEventArgs args) { @@ -1408,7 +1434,7 @@ namespace VEPROMS _CurrentItem = null; ctrlAnnotationDetails.CurrentAnnotation = null; ctrlAnnotationDetails.Annotations = null; - infotabRO.Visible = infotabTransition.Visible = infotabTags.Visible = infotabHistory.Visible = false; + infotabRO.Visible = infotabTransition.Visible = infotabTags.Visible = infotabHistory.Visible = infotabApplicability.Visible = false; // When infotabTags is set to InVisible, the matching panel also needs to be set to invisible infotabControlPanelTags.Visible = false; displayTags.Visible = false; @@ -1461,6 +1487,11 @@ namespace VEPROMS displayTags.IsVisible = true; } infotabHistory.Visible = true; + if (args.MyItemInfo.MyDocVersion.MultiUnitCount > 1) + { + infotabApplicability.Visible = true; + displayApplicability.MyItemInfo = args.MyEditItem.MyItemInfo; + } // When infotabTags is set to Visible, it is given focus. The next line returns focus to the StepRTB args.MyEditItem.SetFocus(); displayTransition.MyRTB = args.MyEditItem.MyStepRTB; @@ -1921,7 +1952,7 @@ namespace VEPROMS //} //string pnum = DisplayText.StaticStripRtfCommands(this._CurrentItem.MyProcedure.ProcedureConfig.Number).Replace("\\u8209?", "-"); DlgPrintProcedure prnDlg = new DlgPrintProcedure(this._CurrentItem.MyProcedure);//dvi.DocVersionConfig,pnum); - prnDlg.Show(this); // RHM 20120925 - Center dialog over PROMS window + prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window } private void lblResolution_Click(object sender, EventArgs e) @@ -1992,7 +2023,16 @@ namespace VEPROMS void Format_FormatLoaded(object sender, FormatEventArgs args) { + if (args.Status.EndsWith("Formats to Load")) + { + bottomProgBar.Value = 0; + bottomProgBar.Maximum = int.Parse(args.Status.Split(" ".ToCharArray())[0]); + } + else + bottomProgBar.Value++; bottomProgBar.Text = args.Status; + bottomProgBar.TextVisible = true; + Application.DoEvents(); } private void btnSendErrorLog_Click(object sender, EventArgs e)