diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index 2f08ff69..1c239d04 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(); @@ -294,6 +294,7 @@ namespace VEPROMS // this.btnPrepare.BeginGroup = true; this.btnPrepare.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btnPrepare.CanCustomize = false; this.btnPrepare.Image = ((System.Drawing.Image)(resources.GetObject("btnPrepare.Image"))); this.btnPrepare.Name = "btnPrepare"; this.btnPrepare.SubItemsExpandWidth = 24; @@ -303,6 +304,7 @@ namespace VEPROMS // btnAdmin // this.btnAdmin.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btnAdmin.CanCustomize = false; this.btnAdmin.Image = global::VEPROMS.Properties.Resources.Admin; this.btnAdmin.Name = "btnAdmin"; this.btnAdmin.Text = "A&dministration"; @@ -419,7 +421,7 @@ namespace VEPROMS this.btnItemInfo, this.lblItemID, this.lblResolution}); - this.bottomBar.Location = new System.Drawing.Point(5, 642); + this.bottomBar.Location = new System.Drawing.Point(5, 636); this.bottomBar.Name = "bottomBar"; this.bottomBar.Size = new System.Drawing.Size(1185, 29); this.bottomBar.Stretch = true; @@ -521,7 +523,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, 616); + this.epAnnotations.Location = new System.Drawing.Point(5, 610); this.epAnnotations.Name = "epAnnotations"; this.epAnnotations.Size = new System.Drawing.Size(1185, 26); this.epAnnotations.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -592,7 +594,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, 559); + this.epProcedures.Size = new System.Drawing.Size(30, 553); 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; @@ -638,7 +640,7 @@ namespace VEPROMS this.infoPanel.ExpandOnTitleClick = true; this.infoPanel.Location = new System.Drawing.Point(927, 57); this.infoPanel.Name = "infoPanel"; - this.infoPanel.Size = new System.Drawing.Size(230, 559); + this.infoPanel.Size = new System.Drawing.Size(230, 553); 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; @@ -672,7 +674,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(230, 533); + this.infoTabs.Size = new System.Drawing.Size(230, 527); this.infoTabs.TabAlignment = DevComponents.DotNetBar.eTabStripAlignment.Right; this.infoTabs.TabIndex = 1; this.infoTabs.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -683,46 +685,6 @@ namespace VEPROMS this.infoTabs.ThemeAware = true; this.infoTabs.Visible = false; // - // 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, 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) - | 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 = global::VEPROMS.Properties.Settings.Default.TransitionRangeColor; - this.displayTransition.Size = new System.Drawing.Size(201, 531); - 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); - // // infotabControlPanelTags // this.infotabControlPanelTags.Controls.Add(this.panelEx1); @@ -730,7 +692,7 @@ 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(203, 533); + this.infotabControlPanelTags.Size = new System.Drawing.Size(203, 527); 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) @@ -748,7 +710,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(201, 531); + this.panelEx1.Size = new System.Drawing.Size(201, 525); 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; @@ -777,6 +739,46 @@ namespace VEPROMS this.infotabTags.Visible = false; this.infotabTags.Click += new System.EventHandler(this.infotabTags_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, 527); + 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, 525); + 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); + // // infotabControlPanelRO // this.infotabControlPanelRO.Controls.Add(this.displayRO); @@ -784,7 +786,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(203, 533); + this.infotabControlPanelRO.Size = new System.Drawing.Size(203, 527); 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) @@ -805,7 +807,7 @@ namespace VEPROMS this.displayRO.MyRTB = null; this.displayRO.Name = "displayRO"; this.displayRO.ProgressBar = null; - this.displayRO.Size = new System.Drawing.Size(201, 531); + this.displayRO.Size = new System.Drawing.Size(201, 525); this.displayRO.TabControl = null; this.displayRO.TabIndex = 0; // @@ -860,7 +862,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, 559); + this.expandableSplitter1.Size = new System.Drawing.Size(3, 553); this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter1.TabIndex = 5; this.expandableSplitter1.TabStop = false; @@ -892,7 +894,7 @@ 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, 613); + this.expandableSplitter2.Location = new System.Drawing.Point(38, 607); this.expandableSplitter2.Name = "expandableSplitter2"; this.expandableSplitter2.Size = new System.Drawing.Size(889, 3); this.expandableSplitter2.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; @@ -928,7 +930,7 @@ namespace VEPROMS this.expandableSplitter3.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter3.Location = new System.Drawing.Point(924, 57); this.expandableSplitter3.Name = "expandableSplitter3"; - this.expandableSplitter3.Size = new System.Drawing.Size(3, 556); + this.expandableSplitter3.Size = new System.Drawing.Size(3, 550); this.expandableSplitter3.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter3.TabIndex = 7; this.expandableSplitter3.TabStop = false; @@ -954,7 +956,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, 559); + this.toolsPanel.Size = new System.Drawing.Size(30, 553); 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; @@ -1156,7 +1158,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, 559); + this.expandableSplitter4.Size = new System.Drawing.Size(3, 553); this.expandableSplitter4.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter4.TabIndex = 3; this.expandableSplitter4.TabStop = false; @@ -1182,7 +1184,7 @@ namespace VEPROMS this.tc.Name = "tc"; this.tc.RibbonExpanded = true; this.tc.SelectedDisplayTabItem = null; - this.tc.Size = new System.Drawing.Size(886, 556); + this.tc.Size = new System.Drawing.Size(886, 550); 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); @@ -1197,7 +1199,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, 673); + this.ClientSize = new System.Drawing.Size(1195, 667); this.Controls.Add(this.tc); this.Controls.Add(this.expandableSplitter3); this.Controls.Add(this.expandableSplitter2); @@ -1222,10 +1224,10 @@ namespace VEPROMS this.infoPanel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.infoTabs)).EndInit(); this.infoTabs.ResumeLayout(false); - this.infotabControlPanelTransitions.ResumeLayout(false); - this.infotabControlPanelTransitions.PerformLayout(); this.infotabControlPanelTags.ResumeLayout(false); this.panelEx1.ResumeLayout(false); + this.infotabControlPanelTransitions.ResumeLayout(false); + this.infotabControlPanelTransitions.PerformLayout(); 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 3e36d3a5..53077626 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -278,7 +278,7 @@ namespace VEPROMS /// Get the selected tree node's properties /// /// VETreeNode - void SetupNodes(VETreeNode node) + bool SetupNodes(VETreeNode node) { if (_MyMRIList.Add(node.VEObject) != null) SetupMRU(); @@ -303,6 +303,7 @@ namespace VEPROMS ItemInfo ii = node.VEObject as ItemInfo; if (ii != null) tc.OpenItem(ii); SetCaption(node); + return (ii != null); // return if successful on opening item in step editor or word } // The following code is used to setup the user interface depending on what // is selected on the tree view (see vlnTreeView.cs) @@ -384,10 +385,12 @@ namespace VEPROMS /// private void tmrTreeView_Tick(object sender, EventArgs e) { + bool giveTvFocus = true; tmrTreeView.Enabled = false; // Timer has now fired VETreeNode tn = tv.SelectedNode as VETreeNode; - if (tn != null) SetupNodes(tn); + if (tn != null) giveTvFocus = !SetupNodes(tn); tv.Enabled = true; + if (giveTvFocus) tv.Focus(); } private void tv_BeforeExpand(object sender, TreeViewCancelEventArgs e) { @@ -773,7 +776,7 @@ namespace VEPROMS if (tc == null || tc.SelectedDisplayTabItem == null) return; if (SelectedStepTabPanel == null) return; displayTransition.MyRTB = SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; - displayTransition.RangeColor = global::VEPROMS.Properties.Settings.Default.TransitionRangeColor; + //displayTransition.RangeColor = global::VEPROMS.Properties.Settings.Default.TransitionRangeColor; displayTransition.CurTrans = null; } #endregion @@ -1009,7 +1012,7 @@ namespace VEPROMS infoPanel.Expanded = true; infoTabs.SelectedTab = infotabTransition; if (SelectedStepTabPanel == null) return; - displayTransition.RangeColor = global::VEPROMS.Properties.Settings.Default.TransitionRangeColor; + //displayTransition.RangeColor = global::VEPROMS.Properties.Settings.Default.TransitionRangeColor; displayTransition.MyRTB = SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; displayTransition.CurTrans = args.MyLinkText.MyTransitionInfo; }