diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index f661c059..2f08ff69 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -76,13 +76,13 @@ namespace VEPROMS this.tv = new Volian.Controls.Library.vlnTreeView(); this.infoPanel = new DevComponents.DotNetBar.ExpandablePanel(); this.infoTabs = new DevComponents.DotNetBar.TabControl(); + this.infotabControlPanelTransitions = new DevComponents.DotNetBar.TabControlPanel(); + this.displayTransition = new Volian.Controls.Library.DisplayTransition(); + this.infotabTransition = 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.infotabControlPanelRO = new DevComponents.DotNetBar.TabControlPanel(); this.displayRO = new Volian.Controls.Library.DisplayRO(); this.infotabRO = new DevComponents.DotNetBar.TabItem(this.components); @@ -116,9 +116,9 @@ namespace VEPROMS this.infoPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.infoTabs)).BeginInit(); this.infoTabs.SuspendLayout(); + this.infotabControlPanelTransitions.SuspendLayout(); this.infotabControlPanelTags.SuspendLayout(); this.panelEx1.SuspendLayout(); - this.infotabControlPanelTransitions.SuspendLayout(); this.infotabControlPanelRO.SuspendLayout(); this.toolsPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.toolsTabs)).BeginInit(); @@ -419,7 +419,7 @@ namespace VEPROMS this.btnItemInfo, this.lblItemID, this.lblResolution}); - this.bottomBar.Location = new System.Drawing.Point(5, 646); + this.bottomBar.Location = new System.Drawing.Point(5, 642); this.bottomBar.Name = "bottomBar"; this.bottomBar.Size = new System.Drawing.Size(1185, 29); this.bottomBar.Stretch = true; @@ -521,7 +521,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, 620); + this.epAnnotations.Location = new System.Drawing.Point(5, 616); this.epAnnotations.Name = "epAnnotations"; this.epAnnotations.Size = new System.Drawing.Size(1185, 26); this.epAnnotations.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -592,7 +592,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, 563); + this.epProcedures.Size = new System.Drawing.Size(30, 559); 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; @@ -635,12 +635,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(928, 57, 230, 663); 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, 563); + this.infoPanel.Size = new System.Drawing.Size(230, 559); 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; @@ -674,7 +672,7 @@ namespace VEPROMS 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, 637); + this.infoTabs.Size = new System.Drawing.Size(230, 533); this.infoTabs.TabAlignment = DevComponents.DotNetBar.eTabStripAlignment.Right; this.infoTabs.TabIndex = 1; this.infoTabs.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -683,60 +681,7 @@ namespace VEPROMS this.infoTabs.Tabs.Add(this.infotabTransition); this.infoTabs.Text = "tabControl1"; this.infoTabs.ThemeAware = true; - // - // infotabControlPanelTags - // - this.infotabControlPanelTags.Controls.Add(this.panelEx1); - this.infotabControlPanelTags.Dock = System.Windows.Forms.DockStyle.Fill; - 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, 637); - 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))); - this.infotabControlPanelTags.Style.GradientAngle = 180; - this.infotabControlPanelTags.TabIndex = 1; - this.infotabControlPanelTags.TabItem = this.infotabTags; - this.infotabControlPanelTags.ThemeAware = true; - // - // panelEx1 - // - this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; - this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.panelEx1.Controls.Add(this.displayTags); - 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, 635); - 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; - this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.Gray; - this.panelEx1.Style.ForeColor.Color = System.Drawing.Color.Transparent; - this.panelEx1.TabIndex = 1; - // - // displayTags - // - this.displayTags.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.displayTags.Dock = System.Windows.Forms.DockStyle.Top; - this.displayTags.Location = new System.Drawing.Point(0, 0); - this.displayTags.Margin = new System.Windows.Forms.Padding(2); - this.displayTags.MinimumSize = new System.Drawing.Size(100, 630); - this.displayTags.MyRTB = null; - this.displayTags.Name = "displayTags"; - this.displayTags.Size = new System.Drawing.Size(100, 630); - this.displayTags.TabIndex = 0; - // - // infotabTags - // - this.infotabTags.AttachedControl = this.infotabControlPanelTags; - this.infotabTags.Name = "infotabTags"; - this.infotabTags.Text = "Tags"; - this.infotabTags.Visible = false; - this.infotabTags.Click += new System.EventHandler(this.infotabTags_Click); + this.infoTabs.Visible = false; // // infotabControlPanelTransitions // @@ -745,7 +690,7 @@ namespace VEPROMS 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, 637); + this.infotabControlPanelTransitions.Size = new System.Drawing.Size(203, 533); 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) @@ -767,7 +712,7 @@ namespace VEPROMS this.displayTransition.MyRTB = null; this.displayTransition.Name = "displayTransition"; this.displayTransition.RangeColor = global::VEPROMS.Properties.Settings.Default.TransitionRangeColor; - this.displayTransition.Size = new System.Drawing.Size(1, 635); + this.displayTransition.Size = new System.Drawing.Size(201, 531); this.displayTransition.TabIndex = 0; // // infotabTransition @@ -778,6 +723,60 @@ namespace VEPROMS this.infotabTransition.Visible = false; this.infotabTransition.Click += new System.EventHandler(this.infotabTransition_Click); // + // infotabControlPanelTags + // + this.infotabControlPanelTags.Controls.Add(this.panelEx1); + this.infotabControlPanelTags.Dock = System.Windows.Forms.DockStyle.Fill; + 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(203, 533); + 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))); + this.infotabControlPanelTags.Style.GradientAngle = 180; + this.infotabControlPanelTags.TabIndex = 1; + this.infotabControlPanelTags.TabItem = this.infotabTags; + this.infotabControlPanelTags.ThemeAware = true; + // + // panelEx1 + // + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.panelEx1.Controls.Add(this.displayTags); + 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(201, 531); + 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; + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.Gray; + this.panelEx1.Style.ForeColor.Color = System.Drawing.Color.Transparent; + this.panelEx1.TabIndex = 1; + // + // displayTags + // + this.displayTags.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.displayTags.Dock = System.Windows.Forms.DockStyle.Top; + this.displayTags.Location = new System.Drawing.Point(0, 0); + this.displayTags.Margin = new System.Windows.Forms.Padding(2); + this.displayTags.MinimumSize = new System.Drawing.Size(100, 630); + this.displayTags.MyRTB = null; + this.displayTags.Name = "displayTags"; + this.displayTags.Size = new System.Drawing.Size(201, 630); + this.displayTags.TabIndex = 0; + // + // infotabTags + // + this.infotabTags.AttachedControl = this.infotabControlPanelTags; + this.infotabTags.Name = "infotabTags"; + this.infotabTags.Text = "Tags"; + this.infotabTags.Visible = false; + this.infotabTags.Click += new System.EventHandler(this.infotabTags_Click); + // // infotabControlPanelRO // this.infotabControlPanelRO.Controls.Add(this.displayRO); @@ -785,7 +784,7 @@ 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, 637); + this.infotabControlPanelRO.Size = new System.Drawing.Size(203, 533); 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) @@ -806,7 +805,7 @@ namespace VEPROMS this.displayRO.MyRTB = null; this.displayRO.Name = "displayRO"; this.displayRO.ProgressBar = null; - this.displayRO.Size = new System.Drawing.Size(1, 635); + this.displayRO.Size = new System.Drawing.Size(201, 531); this.displayRO.TabControl = null; this.displayRO.TabIndex = 0; // @@ -861,7 +860,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, 563); + this.expandableSplitter1.Size = new System.Drawing.Size(3, 559); this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter1.TabIndex = 5; this.expandableSplitter1.TabStop = false; @@ -893,9 +892,9 @@ namespace VEPROMS this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter2.Location = new System.Drawing.Point(38, 617); + this.expandableSplitter2.Location = new System.Drawing.Point(38, 613); 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; @@ -927,9 +926,9 @@ namespace VEPROMS this.expandableSplitter3.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter3.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); 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, 560); + this.expandableSplitter3.Size = new System.Drawing.Size(3, 556); this.expandableSplitter3.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter3.TabIndex = 7; this.expandableSplitter3.TabStop = false; @@ -955,7 +954,7 @@ namespace VEPROMS 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, 563); + this.toolsPanel.Size = new System.Drawing.Size(30, 559); 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; @@ -1157,7 +1156,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, 563); + this.expandableSplitter4.Size = new System.Drawing.Size(3, 559); this.expandableSplitter4.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter4.TabIndex = 3; this.expandableSplitter4.TabStop = false; @@ -1183,7 +1182,7 @@ namespace VEPROMS this.tc.Name = "tc"; this.tc.RibbonExpanded = true; this.tc.SelectedDisplayTabItem = null; - this.tc.Size = new System.Drawing.Size(1086, 560); + this.tc.Size = new System.Drawing.Size(886, 556); 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); @@ -1198,7 +1197,7 @@ namespace VEPROMS this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScroll = true; - this.ClientSize = new System.Drawing.Size(1195, 677); + this.ClientSize = new System.Drawing.Size(1195, 673); this.Controls.Add(this.tc); this.Controls.Add(this.expandableSplitter3); this.Controls.Add(this.expandableSplitter2); @@ -1223,10 +1222,10 @@ namespace VEPROMS this.infoPanel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.infoTabs)).EndInit(); this.infoTabs.ResumeLayout(false); - this.infotabControlPanelTags.ResumeLayout(false); - this.panelEx1.ResumeLayout(false); this.infotabControlPanelTransitions.ResumeLayout(false); this.infotabControlPanelTransitions.PerformLayout(); + this.infotabControlPanelTags.ResumeLayout(false); + this.panelEx1.ResumeLayout(false); this.infotabControlPanelRO.ResumeLayout(false); this.toolsPanel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.toolsTabs)).EndInit(); diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index b6fe49fa..3e36d3a5 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -149,6 +149,7 @@ namespace VEPROMS epAnnotations.Expanded = false; infoPanel.Expanded = false; toolsPanel.Expanded = false; + displayTags.Visible = false; ribbonControl1.ExpandedChanged += new EventHandler(ribbonControl1_ExpandedChanged); dlgFindReplace = new FindReplace(); SpellChecker = new VlnSpellCheck(); @@ -904,6 +905,7 @@ namespace VEPROMS infotabRO.Visible = infotabTransition.Visible = infotabTags.Visible = false; // When infotabTags is set to InVisible, the matching panel also needs to be set to invisible infotabControlPanelTags.Visible = false; + displayTags.Visible = false; SelectedStepTabPanel = null; lblItemID.Text = "No Item Selected"; lblItemID.ForeColor = Color.Yellow; @@ -923,7 +925,7 @@ namespace VEPROMS infotabTransition.Visible = false; infotabRO.Visible = true; displayRO.MyRTB = null; - infotabTags.Visible = true; + infotabTags.Visible = false; displayBookMarks.MyRTB = null; //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); } @@ -932,21 +934,25 @@ namespace VEPROMS if (args.MyStepItem.MyItemInfo.IsSection || args.MyStepItem.MyItemInfo.IsProcedure) { infotabRO.Visible = infotabTransition.Visible = false; - infotabTags.Visible = true; + infotabTags.Visible = false; + displayTags.Visible = false; } else + { infotabRO.Visible = infotabTransition.Visible = infotabTags.Visible = true; - - //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); - // When infotabTags is set to Visible, the matching panel also needs to be set to visible - // the other panels will appear as they are selected by the user. - infotabControlPanelTags.Visible = true; + // When infotabTags is set to Visible, the matching panel also needs to be set to visible + // the other panels will appear as they are selected by the user. + infotabControlPanelTags.Visible = true; + displayTags.Visible = true; + } + // When infotabTags is set to Visible, it is given focus. The next line returns focus to the StepRTB args.MyStepItem.MyStepRTB.Focus(); displayTransition.MyRTB = args.MyStepItem.MyStepRTB; displayRO.MyRTB = args.MyStepItem.MyStepRTB; displayTags.MyRTB = args.MyStepItem.MyStepRTB; displayBookMarks.MyRTB = args.MyStepItem.MyStepRTB; + displayRO.ProgressBar = bottomProgBar; lblEditView.Text = args.MyStepItem.MyStepRTB.ViewRTB ? "View" : "Edit"; _CurrentItem.Deleted += new ItemInfoEvent(_CurrentItem_Deleted);