diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index e10bc705..5973cfe2 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -63,37 +63,29 @@ namespace VEPROMS this.labelItem10 = new DevComponents.DotNetBar.LabelItem(); this.bottomProgBar = new DevComponents.DotNetBar.ProgressBarItem(); this.labelItem20 = new DevComponents.DotNetBar.LabelItem(); - this.btnViewTypes = new DevComponents.DotNetBar.ButtonItem(); - this.btnViewPrcStp = new DevComponents.DotNetBar.ButtonItem(); - this.btnViewBckgnd = new DevComponents.DotNetBar.ButtonItem(); - this.btnViewDev = new DevComponents.DotNetBar.ButtonItem(); - this.labelItem29 = new DevComponents.DotNetBar.LabelItem(); - this.btnLckUlck = new DevComponents.DotNetBar.ButtonItem(); - this.btnSetLock = new DevComponents.DotNetBar.ButtonItem(); - this.btnReleaseLck = new DevComponents.DotNetBar.ButtonItem(); - this.labelItem13 = new DevComponents.DotNetBar.LabelItem(); - this.btnInsOvr = new DevComponents.DotNetBar.ButtonItem(); - this.btnInsertMode = new DevComponents.DotNetBar.ButtonItem(); - this.btnOverstrikeMode = new DevComponents.DotNetBar.ButtonItem(); + this.lblLocked = new DevComponents.DotNetBar.LabelItem(); this.labelItem9 = new DevComponents.DotNetBar.LabelItem(); this.lblEditView = new DevComponents.DotNetBar.LabelItem(); this.labelItem11 = new DevComponents.DotNetBar.LabelItem(); - this.btnBookMark = new DevComponents.DotNetBar.ButtonItem(); - this.labelItem2 = new DevComponents.DotNetBar.LabelItem(); - this.btnGetRoVals = new DevComponents.DotNetBar.ButtonItem(); + this.lblROVal = new DevComponents.DotNetBar.LabelItem(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.btnItemInfo = new DevComponents.DotNetBar.ButtonItem(); this.epAnnotations = new DevComponents.DotNetBar.ExpandablePanel(); + this.ctrlAnnotationDetails = new Volian.Controls.Library.AnnotationDetails(); this.btnAnnoDetailsPushPin = new DevComponents.DotNetBar.ButtonX(); this.expandablePanel2 = new DevComponents.DotNetBar.ExpandablePanel(); + this.tv = new Volian.Controls.Library.vlnTreeView(); this.infoPanel = new DevComponents.DotNetBar.ExpandablePanel(); this.infoTabs = new DevComponents.DotNetBar.TabControl(); 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); this.navigationPanePanel2 = new DevComponents.DotNetBar.NavigationPanePanel(); this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); @@ -105,24 +97,19 @@ namespace VEPROMS this.toolsPanel = new DevComponents.DotNetBar.ExpandablePanel(); this.toolsTabs = new DevComponents.DotNetBar.TabControl(); this.annotationSearch = new DevComponents.DotNetBar.TabControlPanel(); + this.displaySearch1 = new Volian.Controls.Library.DisplaySearch(); this.toolstabResults = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); + this.displayBookMarks = new Volian.Controls.Library.DisplayBookMarks(); this.toolsTabBookMarks = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanelLD = new DevComponents.DotNetBar.TabControlPanel(); + this.displayLibDocs = new Volian.Controls.Library.DisplayLibDocs(); this.tabItemLibDocs = new DevComponents.DotNetBar.TabItem(this.components); this.expandableSplitter4 = new DevComponents.DotNetBar.ExpandableSplitter(); this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); this.itemAnnotationsBindingSource = new System.Windows.Forms.BindingSource(this.components); this.tc = new Volian.Controls.Library.DisplayTabControl(); - this.displayTags = new Volian.Controls.Library.DisplayTags(); - this.displayTransition = new Volian.Controls.Library.DisplayTransition(); - this.displayRO = new Volian.Controls.Library.DisplayRO(); - this.displaySearch1 = new Volian.Controls.Library.DisplaySearch(); - this.displayBookMarks = new Volian.Controls.Library.DisplayBookMarks(); - this.displayLibDocs = new Volian.Controls.Library.DisplayLibDocs(); - this.tv = new Volian.Controls.Library.vlnTreeView(); - this.ctrlAnnotationDetails = new Volian.Controls.Library.AnnotationDetails(); ((System.ComponentModel.ISupportInitialize)(this.bottomBar)).BeginInit(); this.epAnnotations.SuspendLayout(); this.expandablePanel2.SuspendLayout(); @@ -425,17 +412,11 @@ namespace VEPROMS this.labelItem10, this.bottomProgBar, this.labelItem20, - this.btnViewTypes, - this.labelItem29, - this.btnLckUlck, - this.labelItem13, - this.btnInsOvr, + this.lblLocked, this.labelItem9, this.lblEditView, this.labelItem11, - this.btnBookMark, - this.labelItem2, - this.btnGetRoVals, + this.lblROVal, this.labelItem1, this.btnItemInfo}); this.bottomBar.Location = new System.Drawing.Point(4, 746); @@ -467,106 +448,13 @@ namespace VEPROMS this.labelItem20.BorderType = DevComponents.DotNetBar.eBorderType.Bump; this.labelItem20.Name = "labelItem20"; // - // btnViewTypes + // lblLocked // - this.btnViewTypes.AutoExpandOnClick = true; - this.btnViewTypes.ForeColor = System.Drawing.Color.Black; - this.btnViewTypes.Name = "btnViewTypes"; - this.btnViewTypes.PopupSide = DevComponents.DotNetBar.ePopupSide.Top; - this.btnViewTypes.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btnViewPrcStp, - this.btnViewBckgnd, - this.btnViewDev}); - this.btnViewTypes.Text = "Procedure Steps"; - // - // btnViewPrcStp - // - this.btnViewPrcStp.Name = "btnViewPrcStp"; - this.btnViewPrcStp.Text = "Procedure Steps"; - this.btnViewPrcStp.Click += new System.EventHandler(this.btnViewPrcStp_Click); - // - // btnViewBckgnd - // - this.btnViewBckgnd.Name = "btnViewBckgnd"; - this.btnViewBckgnd.Text = "Background"; - this.btnViewBckgnd.Click += new System.EventHandler(this.btnViewBckgnd_Click); - // - // btnViewDev - // - this.btnViewDev.Name = "btnViewDev"; - this.btnViewDev.Text = "Deviation"; - this.btnViewDev.Click += new System.EventHandler(this.btnViewDev_Click); - // - // labelItem29 - // - this.labelItem29.BorderSide = DevComponents.DotNetBar.eBorderSide.Left; - this.labelItem29.BorderType = DevComponents.DotNetBar.eBorderType.Bump; - this.labelItem29.Name = "labelItem29"; - // - // btnLckUlck - // - this.btnLckUlck.AutoExpandOnClick = true; - this.btnLckUlck.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btnLckUlck.ForeColor = System.Drawing.Color.Black; - this.btnLckUlck.Image = ((System.Drawing.Image)(resources.GetObject("btnLckUlck.Image"))); - this.btnLckUlck.Name = "btnLckUlck"; - this.btnLckUlck.PopupSide = DevComponents.DotNetBar.ePopupSide.Top; - this.btnLckUlck.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btnSetLock, - this.btnReleaseLck}); - this.superTooltip1.SetSuperTooltip(this.btnLckUlck, new DevComponents.DotNetBar.SuperTooltipInfo("Procedure Lock", "", "This will allow you to set or remove a lock on the current procedure. The button" + - " tells you the current lock status.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); - this.btnLckUlck.Text = "Unlocked"; - // - // btnSetLock - // - this.btnSetLock.ForeColor = System.Drawing.Color.Black; - this.btnSetLock.Image = ((System.Drawing.Image)(resources.GetObject("btnSetLock.Image"))); - this.btnSetLock.Name = "btnSetLock"; - this.btnSetLock.Text = "Set a Lock"; - this.btnSetLock.Click += new System.EventHandler(this.btnSetLock_Click); - // - // btnReleaseLck - // - this.btnReleaseLck.ForeColor = System.Drawing.Color.Black; - this.btnReleaseLck.Image = ((System.Drawing.Image)(resources.GetObject("btnReleaseLck.Image"))); - this.btnReleaseLck.Name = "btnReleaseLck"; - this.btnReleaseLck.Text = "Release Lock"; - this.btnReleaseLck.Click += new System.EventHandler(this.btnReleaseLck_Click); - // - // labelItem13 - // - this.labelItem13.BorderSide = DevComponents.DotNetBar.eBorderSide.Left; - this.labelItem13.BorderType = DevComponents.DotNetBar.eBorderType.Bump; - this.labelItem13.Name = "labelItem13"; - // - // btnInsOvr - // - this.btnInsOvr.AutoExpandOnClick = true; - this.btnInsOvr.CanCustomize = false; - this.btnInsOvr.Description = "Toggle Insert / Overwrite"; - this.btnInsOvr.ForeColor = System.Drawing.Color.Black; - this.btnInsOvr.Name = "btnInsOvr"; - this.btnInsOvr.PopupSide = DevComponents.DotNetBar.ePopupSide.Top; - this.btnInsOvr.SplitButton = true; - this.btnInsOvr.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btnInsertMode, - this.btnOverstrikeMode}); - this.superTooltip1.SetSuperTooltip(this.btnInsOvr, new DevComponents.DotNetBar.SuperTooltipInfo("Insert / Overstrke Modes", "", "Select Insert or Overstrike Text Editing Modes", null, null, DevComponents.DotNetBar.eTooltipColor.System)); - this.btnInsOvr.Text = "INS"; - this.btnInsOvr.Visible = false; - // - // btnInsertMode - // - this.btnInsertMode.Name = "btnInsertMode"; - this.btnInsertMode.Text = "INS"; - this.btnInsertMode.Click += new System.EventHandler(this.btnInsertMode_Click); - // - // btnOverstrikeMode - // - this.btnOverstrikeMode.Name = "btnOverstrikeMode"; - this.btnOverstrikeMode.Text = "OVR"; - this.btnOverstrikeMode.Click += new System.EventHandler(this.btnOverstrikeMode_Click); + this.lblLocked.BackColor = System.Drawing.Color.Transparent; + this.lblLocked.ForeColor = System.Drawing.SystemColors.MenuText; + this.lblLocked.Image = global::VEPROMS.Properties.Resources.UnProtectFormHS; + this.lblLocked.Name = "lblLocked"; + this.lblLocked.Text = "Unlocked"; // // labelItem9 // @@ -587,35 +475,11 @@ namespace VEPROMS this.labelItem11.BorderType = DevComponents.DotNetBar.eBorderType.Bump; this.labelItem11.Name = "labelItem11"; // - // btnBookMark + // lblROVal // - this.btnBookMark.AutoExpandOnClick = true; - this.btnBookMark.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btnBookMark.ForeColor = System.Drawing.Color.Black; - this.btnBookMark.GlobalName = "SetBookMark"; - this.btnBookMark.Image = ((System.Drawing.Image)(resources.GetObject("btnBookMark.Image"))); - this.btnBookMark.Name = "btnBookMark"; - this.btnBookMark.PopupSide = DevComponents.DotNetBar.ePopupSide.Top; - this.superTooltip1.SetSuperTooltip(this.btnBookMark, new DevComponents.DotNetBar.SuperTooltipInfo("Bookmark", "", "Adds the the current position to the list of bookmarks and displays the bookmark " + - "list if it is not currently displayed.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); - this.btnBookMark.Text = "BookMark"; - this.btnBookMark.Click += new System.EventHandler(this.btnBookMark_Click); - // - // labelItem2 - // - this.labelItem2.BorderSide = DevComponents.DotNetBar.eBorderSide.Left; - this.labelItem2.BorderType = DevComponents.DotNetBar.eBorderType.Bump; - this.labelItem2.Name = "labelItem2"; - // - // btnGetRoVals - // - this.btnGetRoVals.Enabled = false; - this.btnGetRoVals.ForeColor = System.Drawing.Color.Black; - this.btnGetRoVals.Name = "btnGetRoVals"; - this.superTooltip1.SetSuperTooltip(this.btnGetRoVals, new DevComponents.DotNetBar.SuperTooltipInfo("Update Referenced Object Values", "", "This will update the RO Values in this procedure set.\r\n\r\nThis button will become " + - "active when new Referenced Object Values are available.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); - this.btnGetRoVals.Text = "Update RO Values"; - this.btnGetRoVals.Click += new System.EventHandler(this.btnGetRoVals_Click); + this.lblROVal.ForeColor = System.Drawing.SystemColors.MenuText; + this.lblROVal.Name = "lblROVal"; + this.lblROVal.Text = "New RO Values Available"; // // labelItem1 // @@ -639,7 +503,7 @@ namespace VEPROMS this.epAnnotations.Controls.Add(this.btnAnnoDetailsPushPin); this.epAnnotations.Dock = System.Windows.Forms.DockStyle.Bottom; this.epAnnotations.Expanded = false; - this.epAnnotations.ExpandedBounds = new System.Drawing.Rectangle(4, 547, 1114, 202); + this.epAnnotations.ExpandedBounds = new System.Drawing.Rectangle(4, 544, 1187, 202); this.epAnnotations.ExpandOnTitleClick = true; this.epAnnotations.Location = new System.Drawing.Point(4, 720); this.epAnnotations.Name = "epAnnotations"; @@ -662,6 +526,20 @@ namespace VEPROMS this.epAnnotations.TitleStyle.GradientAngle = 90; this.epAnnotations.TitleText = "Annotation Details"; // + // 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"; + this.ctrlAnnotationDetails.Annotations = null; + this.ctrlAnnotationDetails.AnnotationText = ""; + this.ctrlAnnotationDetails.CurrentAnnotation = null; + this.ctrlAnnotationDetails.Dock = System.Windows.Forms.DockStyle.Fill; + this.ctrlAnnotationDetails.Location = new System.Drawing.Point(0, 26); + this.ctrlAnnotationDetails.Margin = new System.Windows.Forms.Padding(2); + this.ctrlAnnotationDetails.Name = "ctrlAnnotationDetails"; + this.ctrlAnnotationDetails.Size = new System.Drawing.Size(1187, 0); + this.ctrlAnnotationDetails.TabIndex = 15; + // // btnAnnoDetailsPushPin // this.btnAnnoDetailsPushPin.AccessibleRole = System.Windows.Forms.AccessibleRole.CheckButton; @@ -690,7 +568,7 @@ namespace VEPROMS this.expandablePanel2.Controls.Add(this.tv); this.expandablePanel2.Dock = System.Windows.Forms.DockStyle.Left; this.expandablePanel2.Expanded = false; - this.expandablePanel2.ExpandedBounds = new System.Drawing.Rectangle(4, 57, 251, 663); + this.expandablePanel2.ExpandedBounds = new System.Drawing.Rectangle(4, 57, 326, 663); this.expandablePanel2.ExpandOnTitleClick = true; this.expandablePanel2.Location = new System.Drawing.Point(4, 57); this.expandablePanel2.Name = "expandablePanel2"; @@ -712,6 +590,20 @@ namespace VEPROMS this.expandablePanel2.TitleStyle.GradientAngle = 90; this.expandablePanel2.TitleText = "Procedures"; // + // tv + // + this.tv.AllowDrop = true; + this.tv.Dock = System.Windows.Forms.DockStyle.Fill; + this.tv.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + 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, 637); + this.tv.TabIndex = 1; + this.tv.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.tv_BeforeExpand); + this.tv.Click += new System.EventHandler(this.tv_Click); + this.tv.SectionShouldClose += new Volian.Controls.Library.vlnTreeViewSectionInfoEvent(this.tv_SectionShouldClose); + // // infoPanel // this.infoPanel.CanvasColor = System.Drawing.SystemColors.Control; @@ -719,10 +611,12 @@ 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(615, 57); + this.infoPanel.Location = new System.Drawing.Point(1128, 57); this.infoPanel.Name = "infoPanel"; - this.infoPanel.Size = new System.Drawing.Size(230, 663); + this.infoPanel.Size = new System.Drawing.Size(30, 663); 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; @@ -753,7 +647,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, 637); + this.infoTabs.Size = new System.Drawing.Size(30, 637); this.infoTabs.TabAlignment = DevComponents.DotNetBar.eTabStripAlignment.Right; this.infoTabs.TabIndex = 1; this.infoTabs.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -770,7 +664,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, 637); + 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) @@ -788,7 +682,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, 635); + 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; @@ -797,6 +691,18 @@ namespace VEPROMS 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; @@ -812,7 +718,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(203, 637); + this.infotabControlPanelTransitions.Size = new System.Drawing.Size(3, 637); 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) @@ -823,6 +729,20 @@ namespace VEPROMS 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(1, 635); + this.displayTransition.TabIndex = 0; + // // infotabTransition // this.infotabTransition.AttachedControl = this.infotabControlPanelTransitions; @@ -838,7 +758,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, 637); + this.infotabControlPanelRO.Size = new System.Drawing.Size(3, 637); 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) @@ -848,6 +768,21 @@ namespace VEPROMS this.infotabControlPanelRO.TabItem = this.infotabRO; this.infotabControlPanelRO.ThemeAware = true; // + // displayRO + // + this.displayRO.CurROLink = null; + this.displayRO.Dock = System.Windows.Forms.DockStyle.Fill; + this.displayRO.Location = new System.Drawing.Point(1, 1); + this.displayRO.Margin = new System.Windows.Forms.Padding(4); + this.displayRO.Mydvi = null; + this.displayRO.MyROFST = null; + this.displayRO.MyRTB = null; + this.displayRO.Name = "displayRO"; + this.displayRO.ProgressBar = null; + this.displayRO.Size = new System.Drawing.Size(1, 635); + this.displayRO.TabControl = null; + this.displayRO.TabIndex = 0; + // // infotabRO // this.infotabRO.AttachedControl = this.infotabControlPanelRO; @@ -876,6 +811,7 @@ namespace VEPROMS this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.expandableSplitter1.Enabled = false; this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -931,7 +867,7 @@ namespace VEPROMS this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter2.Location = new System.Drawing.Point(37, 717); this.expandableSplitter2.Name = "expandableSplitter2"; - this.expandableSplitter2.Size = new System.Drawing.Size(578, 3); + this.expandableSplitter2.Size = new System.Drawing.Size(1091, 3); this.expandableSplitter2.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter2.TabIndex = 6; this.expandableSplitter2.TabStop = false; @@ -962,7 +898,7 @@ 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(612, 57); + this.expandableSplitter3.Location = new System.Drawing.Point(1125, 57); this.expandableSplitter3.Name = "expandableSplitter3"; this.expandableSplitter3.Size = new System.Drawing.Size(3, 660); this.expandableSplitter3.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; @@ -985,10 +921,12 @@ namespace VEPROMS this.toolsPanel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; 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(848, 57, 343, 663); this.toolsPanel.ExpandOnTitleClick = true; - this.toolsPanel.Location = new System.Drawing.Point(848, 57); + this.toolsPanel.Location = new System.Drawing.Point(1161, 57); this.toolsPanel.Name = "toolsPanel"; - this.toolsPanel.Size = new System.Drawing.Size(343, 663); + this.toolsPanel.Size = new System.Drawing.Size(30, 663); 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; @@ -1019,7 +957,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(343, 637); + this.toolsTabs.Size = new System.Drawing.Size(30, 637); this.toolsTabs.TabAlignment = DevComponents.DotNetBar.eTabStripAlignment.Right; this.toolsTabs.TabIndex = 1; this.toolsTabs.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -1036,7 +974,7 @@ 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(316, 637); + this.annotationSearch.Size = new System.Drawing.Size(3, 637); 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) @@ -1046,6 +984,21 @@ namespace VEPROMS this.annotationSearch.TabItem = this.toolstabResults; this.annotationSearch.ThemeAware = true; // + // displaySearch1 + // + this.displaySearch1.Dock = System.Windows.Forms.DockStyle.Fill; + this.displaySearch1.LoadingList = false; + this.displaySearch1.Location = new System.Drawing.Point(1, 1); + this.displaySearch1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.displaySearch1.Mydocversion = null; + this.displaySearch1.MyROFSTLookup = null; + this.displaySearch1.Name = "displaySearch1"; + this.displaySearch1.ProgressBar = null; + this.displaySearch1.RightToLeft = System.Windows.Forms.RightToLeft.Yes; + this.displaySearch1.SearchResults = null; + this.displaySearch1.Size = new System.Drawing.Size(1, 635); + this.displaySearch1.TabIndex = 0; + // // toolstabResults // this.toolstabResults.AttachedControl = this.annotationSearch; @@ -1060,7 +1013,7 @@ 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(316, 637); + this.tabControlPanel2.Size = new System.Drawing.Size(3, 637); 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) @@ -1079,7 +1032,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(314, 635); + this.panelEx3.Size = new System.Drawing.Size(1, 635); 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; @@ -1088,6 +1041,16 @@ namespace VEPROMS this.panelEx3.Style.ForeColor.Color = System.Drawing.Color.Transparent; this.panelEx3.TabIndex = 3; // + // displayBookMarks + // + this.displayBookMarks.Dock = System.Windows.Forms.DockStyle.Fill; + this.displayBookMarks.Location = new System.Drawing.Point(0, 0); + this.displayBookMarks.MyDisplayTabControl = null; + this.displayBookMarks.MyRTB = null; + this.displayBookMarks.Name = "displayBookMarks"; + this.displayBookMarks.Size = new System.Drawing.Size(1, 635); + this.displayBookMarks.TabIndex = 0; + // // toolsTabBookMarks // this.toolsTabBookMarks.AttachedControl = this.tabControlPanel2; @@ -1101,7 +1064,7 @@ namespace VEPROMS 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(316, 637); + this.tabControlPanelLD.Size = new System.Drawing.Size(3, 637); 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) @@ -1111,6 +1074,18 @@ namespace VEPROMS 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, 635); + this.displayLibDocs.TabIndex = 0; + // // tabItemLibDocs // this.tabItemLibDocs.AttachedControl = this.tabControlPanelLD; @@ -1145,7 +1120,7 @@ namespace VEPROMS this.expandableSplitter4.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter4.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); this.expandableSplitter4.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter4.Location = new System.Drawing.Point(845, 57); + this.expandableSplitter4.Location = new System.Drawing.Point(1158, 57); this.expandableSplitter4.Name = "expandableSplitter4"; this.expandableSplitter4.Size = new System.Drawing.Size(3, 663); this.expandableSplitter4.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; @@ -1172,117 +1147,14 @@ namespace VEPROMS this.tc.Name = "tc"; this.tc.RibbonExpanded = true; this.tc.SelectedDisplayTabItem = null; - this.tc.Size = new System.Drawing.Size(575, 660); + this.tc.Size = new System.Drawing.Size(1088, 660); this.tc.TabIndex = 8; + this.tc.PanelTabDisplay += new Volian.Controls.Library.StepPanelTabDisplayEvent(this.tc_PanelTabDisplay); this.tc.ItemSelectedChanged += new Volian.Controls.Library.ItemSelectedChangedEvent(this.tc_ItemSelectedChanged); this.tc.ModeChange += new Volian.Controls.Library.StepPanelModeChangeEvent(this.tc_StepPanelModeChange); this.tc.LinkModifyTran += new Volian.Controls.Library.StepPanelLinkEvent(this.tc_LinkModifyTran); this.tc.LinkModifyRO += new Volian.Controls.Library.StepPanelLinkEvent(this.tc_LinkModifyRO); // - // 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.MyRTB = null; - this.displayTags.Name = "displayTags"; - this.displayTags.Size = new System.Drawing.Size(201, 500); - this.displayTags.TabIndex = 0; - // - // 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, 635); - this.displayTransition.TabIndex = 0; - // - // displayRO - // - this.displayRO.CurROLink = null; - this.displayRO.Dock = System.Windows.Forms.DockStyle.Fill; - this.displayRO.Location = new System.Drawing.Point(1, 1); - this.displayRO.Margin = new System.Windows.Forms.Padding(4); - this.displayRO.Mydvi = null; - this.displayRO.MyROFST = null; - this.displayRO.MyRTB = null; - this.displayRO.Name = "displayRO"; - this.displayRO.ProgressBar = null; - this.displayRO.Size = new System.Drawing.Size(201, 635); - this.displayRO.TabIndex = 0; - // - // displaySearch1 - // - this.displaySearch1.Dock = System.Windows.Forms.DockStyle.Fill; - this.displaySearch1.LoadingList = false; - this.displaySearch1.Location = new System.Drawing.Point(1, 1); - this.displaySearch1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.displaySearch1.Mydocversion = null; - this.displaySearch1.MyROFSTLookup = null; - this.displaySearch1.Name = "displaySearch1"; - this.displaySearch1.ProgressBar = null; - this.displaySearch1.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.displaySearch1.SearchResults = null; - this.displaySearch1.Size = new System.Drawing.Size(314, 635); - this.displaySearch1.TabIndex = 0; - // - // displayBookMarks - // - this.displayBookMarks.Dock = System.Windows.Forms.DockStyle.Fill; - this.displayBookMarks.Location = new System.Drawing.Point(0, 0); - this.displayBookMarks.MyDisplayTabControl = null; - this.displayBookMarks.MyRTB = null; - this.displayBookMarks.Name = "displayBookMarks"; - this.displayBookMarks.Size = new System.Drawing.Size(314, 635); - this.displayBookMarks.TabIndex = 0; - // - // 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(314, 635); - this.displayLibDocs.TabIndex = 0; - // - // tv - // - this.tv.AllowDrop = true; - this.tv.Dock = System.Windows.Forms.DockStyle.Fill; - this.tv.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - 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, 637); - this.tv.TabIndex = 1; - this.tv.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.tv_BeforeExpand); - this.tv.Click += new System.EventHandler(this.tv_Click); - this.tv.SectionShouldClose += new Volian.Controls.Library.vlnTreeViewSectionInfoEvent(this.tv_SectionShouldClose); - // - // 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"; - this.ctrlAnnotationDetails.Annotations = null; - this.ctrlAnnotationDetails.AnnotationText = ""; - this.ctrlAnnotationDetails.CurrentAnnotation = null; - this.ctrlAnnotationDetails.Dock = System.Windows.Forms.DockStyle.Fill; - this.ctrlAnnotationDetails.Location = new System.Drawing.Point(0, 26); - this.ctrlAnnotationDetails.Margin = new System.Windows.Forms.Padding(2); - this.ctrlAnnotationDetails.Name = "ctrlAnnotationDetails"; - this.ctrlAnnotationDetails.Size = new System.Drawing.Size(1187, 0); - this.ctrlAnnotationDetails.TabIndex = 15; - // // frmVEPROMS // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); @@ -1365,20 +1237,10 @@ namespace VEPROMS private System.Windows.Forms.CheckedListBox checkedListBox1; //private System.Windows.Forms.PropertyGrid pg; - private DevComponents.DotNetBar.ButtonItem btnInsOvr; - private DevComponents.DotNetBar.ButtonItem btnInsertMode; - private DevComponents.DotNetBar.ButtonItem btnOverstrikeMode; private DevComponents.DotNetBar.LabelItem labelItem9; private DevComponents.DotNetBar.LabelItem labelItem10; private DevComponents.DotNetBar.LabelItem labelItem11; private DevComponents.DotNetBar.SuperTooltip superTooltip1; - private DevComponents.DotNetBar.ButtonItem btnBookMark; - private DevComponents.DotNetBar.LabelItem labelItem2; - private DevComponents.DotNetBar.LabelItem labelItem13; - private DevComponents.DotNetBar.ButtonItem btnLckUlck; - private DevComponents.DotNetBar.ButtonItem btnSetLock; - private DevComponents.DotNetBar.ButtonItem btnReleaseLck; - private DevComponents.DotNetBar.ButtonItem btnGetRoVals; private System.Windows.Forms.BindingSource itemAnnotationsBindingSource; private System.Windows.Forms.CheckBox checkBox1; @@ -1395,13 +1257,7 @@ namespace VEPROMS private DevComponents.DotNetBar.GalleryGroup galleryGroup3; //private DevComponents.DotNetBar.Controls.GroupPanel groupPanel4; - private DevComponents.DotNetBar.Controls.ComboBoxEx comboBoxEx1; - - private DevComponents.DotNetBar.LabelItem labelItem29; - private DevComponents.DotNetBar.ButtonItem btnViewTypes; - private DevComponents.DotNetBar.ButtonItem btnViewPrcStp; - private DevComponents.DotNetBar.ButtonItem btnViewBckgnd; - private DevComponents.DotNetBar.ButtonItem btnViewDev; + private DevComponents.DotNetBar.Controls.ComboBoxEx comboBoxEx1; private DevComponents.DotNetBar.NavigationPanePanel navigationPanePanel2; private DevComponents.DotNetBar.TabControlPanel infotabControlPanelRO; private DevComponents.DotNetBar.TabItem infotabRO; @@ -1449,6 +1305,8 @@ namespace VEPROMS private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.ButtonItem btnItemInfo; private Volian.Controls.Library.DisplayBookMarks displayBookMarks; + private DevComponents.DotNetBar.LabelItem lblLocked; + private DevComponents.DotNetBar.LabelItem lblROVal; } } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index df9e39d1..b32fa7a3 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -28,6 +28,7 @@ namespace VEPROMS #region Log4Net private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); #endregion + #region PropertiesVariables Color _CommentTitleBckColor; DocVersionInfo _SelectedDVI = null; StepTabPanel _SelectedStepTabPanel=null; @@ -78,7 +79,7 @@ namespace VEPROMS } set { _SelectedROFst = value; } } - + #endregion public frmVEPROMS() { InitializeComponent(); @@ -431,54 +432,6 @@ namespace VEPROMS // // newtable.Show(); // //} //} - #endregion - #region Bottom Button Modes - - /// - /// Insert button on the bottom tool bar - /// - /// - /// - private void btnInsertMode_Click(object sender, EventArgs e) - { - btnInsOvr.Text = btnInsertMode.Text; - } - - /// - /// Overwrite button on the bottom tool bar - /// - /// - /// - private void btnOverstrikeMode_Click(object sender, EventArgs e) - { - btnInsOvr.Text = btnOverstrikeMode.Text; - } - - #endregion - #region Multi User - - /// - /// Set Lock button on the bottom tool bar - /// - /// - /// - private void btnSetLock_Click(object sender, EventArgs e) - { - btnLckUlck.Image = btnSetLock.Image; - btnLckUlck.Text = "Locked"; - } - - /// - /// Release Lock button on the bottom tool bar - /// - /// - /// - private void btnReleaseLck_Click(object sender, EventArgs e) - { - btnLckUlck.Image = btnReleaseLck.Image; - btnLckUlck.Text = "Unlocked"; - } - #endregion #region Progress Bar @@ -549,63 +502,6 @@ namespace VEPROMS } } - #endregion - #region Views: Procedure Background Deviation - /// - /// Procedure Step View button on the bottom tool bar - /// - /// - /// - private void btnViewPrcStp_Click(object sender, EventArgs e) - { - btnViewTypes.Text = btnViewPrcStp.Text; - } - - /// - /// Background Text View button on the bottom tool bar - /// - /// - /// - private void btnViewBckgnd_Click(object sender, EventArgs e) - { - btnViewTypes.Text = btnViewBckgnd.Text; - } - - /// - /// Deviation Text View button on the bottom tool bar - /// - /// - /// - private void btnViewDev_Click(object sender, EventArgs e) - { - btnViewTypes.Text = btnViewDev.Text; - } - #endregion - #region Bookmarks - - /// - /// Mark Position button on bottom tool bar - /// - /// - /// - private void btnBookMark_Click(object sender, EventArgs e) - { - if (SelectedStepTabPanel == null||SelectedStepTabPanel.MyStepPanel==null||SelectedStepTabPanel.MyStepPanel.SelectedStepItem==null) return; - displayBookMarks.AddBookMark(SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB.MyItemInfo); - if (toolsPanel.Expanded == false) toolsPanel.Expanded = true; - toolsTabs.SelectedTab = toolsTabBookMarks; - } - - /// - /// Adds the given tree node to the list of bookmarks - /// TODO: Add a menu item to tree view context menu for adding to book mark list. - /// - /// - //private void AddToBookMarkList(VETreeNode bkmrk) - //{ - // if (!(lbxBookMarks.Items.Contains(bkmrk))) - // lbxBookMarks.Items.Add(bkmrk); - //} #endregion #region Find/Replace and Search @@ -615,11 +511,11 @@ namespace VEPROMS /// /// /// - private void btnFindRplDlg_Click_1(object sender, EventArgs e) - { - FindReplace frmFindRepl = new FindReplace(); - frmFindRepl.Show(); - } + //private void btnFindRplDlg_Click_1(object sender, EventArgs e) + //{ + // FindReplace frmFindRepl = new FindReplace(); + // frmFindRepl.Show(); + //} /// /// Global Search button on the ribbon @@ -627,11 +523,11 @@ namespace VEPROMS /// /// /// - private void btnGlbSrch_Click(object sender, EventArgs e) - { - toolsPanel.Expanded = true; - toolsTabs.SelectedTab = toolstabResults; - } + //private void btnGlbSrch_Click(object sender, EventArgs e) + //{ + // toolsPanel.Expanded = true; + // toolsTabs.SelectedTab = toolstabResults; + //} #endregion #region Similar Steps @@ -727,24 +623,7 @@ namespace VEPROMS // All other types are handled with sub-menus. } - // TODO: DeleteMe - //private void OpenNode(VETreeNode tn) - //{ - // if (tn != null) - // { - // if (tn.VEObject.GetType() == typeof(FolderInfo) || tn.VEObject.GetType() == typeof(DocVersionInfo)) - // { - // if (tn.Nodes.Count > 0) - // { - // tn.Expand(); - // tv.SelectedNode = tn.Nodes[0]; - // tv.Focus(); - // } - // } - // else - // SetupNodes(tn); - // } - //} + /// /// Options button on the dialog that appears when the V icon is clicked (top left of application window) /// note that the "V icon" is also called the Office 2007 Start Button @@ -757,7 +636,6 @@ namespace VEPROMS VeSysOpts.ShowDialog(); } - /// /// Exit button on the dialog that appears when the V icon is clicked (top left of application window) /// note that the "V icon" is also called the Office 2007 Start Button @@ -792,15 +670,6 @@ namespace VEPROMS displayTransition.MyRTB = SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; displayTransition.CurTrans = null; } - private void btnInsTrans_Click(object sender, EventArgs e) - { - infoPanel.Expanded = true; - infoTabs.SelectedTab = infotabTransition; - StepTabPanel dtp = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; - if (SelectedStepTabPanel == null) return; - displayTransition.MyRTB = (SelectedStepTabPanel == null) ? null : dtp.MyStepPanel.SelectedStepItem.MyStepRTB; - displayTransition.CurTrans = null; - } #endregion #region InfoTabLibDocs private void tabItemLibDocs_Click(object sender, EventArgs e) @@ -828,6 +697,36 @@ namespace VEPROMS displayTags.MyRTB = (SelectedStepTabPanel == null) ? null : SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; } #endregion + #region PanelSupport + private void tc_PanelTabDisplay(object sender, StepPanelTabDisplayEventArgs args) + { + if (args.PanelTabName == "Bookmarks") + { + toolsPanel.Expanded = true; + toolsTabs.SelectedTab = toolsTabBookMarks; + if (_CurrentItem != null) displayBookMarks.AddBookMark(_CurrentItem); + } + else if (args.PanelTabName == "Global Search") + { + toolsPanel.Expanded = true; + toolsTabs.SelectedTab = toolstabResults; + } + else if (args.PanelTabName == "LibDocs") + { + toolsPanel.Expanded = true; + toolsTabs.SelectedTab = tabItemLibDocs; + } + else if (args.PanelTabName == "Annots") + { + epAnnotations.Expanded = true; + } + else if (args.PanelTabName == "Change Step Type") + { + infoPanel.Expanded = true; + infoTabs.SelectedTab = infotabTags; + displayTags.HighlightChangeStep(); + } + } private void tc_StepPanelModeChange(object sender, StepRTBModeChangeEventArgs args) { this.lblEditView.Text = args.ViewMode == E_ViewMode.Edit ? "Edit" : "View"; @@ -846,7 +745,6 @@ namespace VEPROMS // When infotabTags is set to InVisible, the matching panel also needs to be set to invisible infotabControlPanelTags.Visible = false; SelectedStepTabPanel = null; - btnGetRoVals.Enabled = false; } else { @@ -855,13 +753,11 @@ namespace VEPROMS //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); if (args.MyStepItem == null) { - //infotabRO.Visible = infotabTransition.Visible = false; infotabTransition.Visible = false; infotabRO.Visible = true; displayRO.MyRTB = null; infotabTags.Visible = true; displayBookMarks.MyRTB = null; - btnGetRoVals.Enabled = false; //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); } else @@ -886,7 +782,6 @@ namespace VEPROMS displayBookMarks.MyRTB = args.MyStepItem.MyStepRTB; displayRO.ProgressBar = bottomProgBar; lblEditView.Text = args.MyStepItem.MyStepRTB.ViewRTB ? "View" : "Edit"; - btnGetRoVals.Enabled = true; } if(tc.SelectedDisplayTabItem != null) SelectedStepTabPanel = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; @@ -894,7 +789,7 @@ namespace VEPROMS ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem); AnnotationPanelView(); } - + #endregion #region Annotations /// /// Display or hide the Annotation Details panel @@ -917,9 +812,6 @@ namespace VEPROMS } } #endregion - private void btnSave_Click(object sender, EventArgs e) - { - } #region LinkSupport private void tc_LinkActiveChanged(object sender, StepPanelLinkEventArgs args) { @@ -930,13 +822,6 @@ namespace VEPROMS displayTransition.CurTrans = null; } } - private void tc_LinkInsertTran(object sender, StepPanelLinkEventArgs args) - { - infoPanel.Expanded = true; - infoTabs.SelectedTab = infotabTransition; - displayTransition.CurTrans = null; - } - private void tc_LinkModifyTran(object sender, StepPanelLinkEventArgs args) { infoPanel.Expanded = true; @@ -959,7 +844,7 @@ namespace VEPROMS displayRO.TabControl = tc; } #endregion - #region VButton_New + #region VButton private void office2007StartButton1_Click(object sender, EventArgs e) { // If the V-Button is clicked, check to see what tree node is s selected @@ -1134,8 +1019,11 @@ namespace VEPROMS { tv.tv_NodeNew(vlnTreeView.MenuSelections.Folder); } + private void btnSave_Click(object sender, EventArgs e) + { + } #endregion - + #region PanelEvents private void infoPanel_Click(object sender, EventArgs e) { displayTags.MyRTB = (SelectedStepTabPanel == null) ? null : SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; @@ -1149,23 +1037,22 @@ namespace VEPROMS { toolsPanel.Expanded = true; InitiateSearch(true); - } - - private void InitiateSearch(bool searchFocus) - { - if (toolsPanel.Expanded) + } + private void InitiateSearch(bool searchFocus) + { + if (toolsPanel.Expanded) + { + if (displaySearch1.Mydocversion == null)//!displaySearch1.OpenDocFromSearch) + { + if (SelectedDVI != null) { - if (displaySearch1.Mydocversion == null)//!displaySearch1.OpenDocFromSearch) - { - if (SelectedDVI != null) - { - displaySearch1.Mydocversion = SelectedDVI; - displaySearch1.advTreeStepTypesFillIn(); - } - displaySearch1.advTreeProcSetsFillIn(searchFocus); - } + displaySearch1.Mydocversion = SelectedDVI; + displaySearch1.advTreeStepTypesFillIn(); } - } + displaySearch1.advTreeProcSetsFillIn(searchFocus); + } + } + } private void toolsPanel_ExpandedChanged(object sender, ExpandedChangeEventArgs e) { @@ -1184,64 +1071,10 @@ namespace VEPROMS frmPropGrid pg = new frmPropGrid(tc.SelectedDisplayTabItem.SelectedItemInfo, tc.SelectedDisplayTabItem.SelectedItemInfo.Path); pg.Show(); } - - private void btnGetRoVals_Click(object sender, EventArgs e) + private void expandablePanel2_ExpandedChanged(object sender, ExpandedChangeEventArgs e) { - if (_CurrentItem == null) - { - MessageBox.Show("A step item is not selected, cannot update the RO Values."); - return; - } - ItemInfo pi = _CurrentItem.MyProcedure as ItemInfo; - if (pi == null) - { - MessageBox.Show("Cannot find the procedure that this step item is assocaited with, cannot update the RO Values."); - return; - } - DocVersionInfo mydocversion = pi.ActiveParent as DocVersionInfo; - if (mydocversion == null) - { - MessageBox.Show("Cannot find document version for this selection, cannot update the RO Values."); - return; - } - - // use rodb directory path of the first rofst for the this document version. Bring up a file - // selection dialog starting with this path. The user can select another path. - // RHM question - we talked about just using the current path, but what is the current path when - // a docversion can have more than one rofst (for now, just use first?) - should I bring up a dialog? - if (mydocversion.DocVersionAssociations.Count < 1) - { - MessageBox.Show("Error Updating ro.fst. No associated ro.fst"); - return; - } - using (DocVersion dv = DocVersion.Get(mydocversion.VersionID)) - { - foreach (DocVersionAssociation dva in dv.DocVersionAssociations) - { - RODbInfo rdi = RODbInfo.Get(dva.ROFst_RODbID); - - string rofstPath = rdi.FolderPath + @"\ro.fst"; - if (!File.Exists(rofstPath)) - { - MessageBox.Show("No existing ro.fst in path " + rdi.FolderPath + ". Check for invalid path"); - break; - } - FileInfo fiRofst = new FileInfo(rofstPath); - if (SelectedROFst.DTS == fiRofst.LastWriteTime) - { - MessageBox.Show("ro.fst files are same for path " + rdi.FolderPath + ", import of that ro.fst will not be done"); - break; - } - if (SelectedROFst.DTS > fiRofst.LastWriteTime) - { - MessageBox.Show("Cannot copy older ro.fst from " + rdi.FolderPath + ", import of that ro.fst will not be done"); - break; - } - Cursor = Cursors.WaitCursor; - ROFst newrofst = ROFstInfo.UpdateRoFst(rdi, dva, dv, SelectedROFst); - Cursor = Cursors.Default; - } - } + expandableSplitter1.Enabled = expandablePanel2.Expanded; } + #endregion } } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.resx b/PROMS/VEPROMS User Interface/frmVEPROMS.resx index 8dea02a9..79a394e2 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.resx +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.resx @@ -402,75 +402,6 @@ 17, 17 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbgAA - Em4BzAbEXgAAAghJREFUOE+lk9tLk2Ecx+u/6SJC6qbsACkRkUKUB7KxuVGapB1M8iKLlo1dlGHHQVrY - ykPmheTmYW2NuSydx3awZUg0DKqli9mmNbdPe15h8XaAjV743rw8n+/v9/3yPGuBNf/1CYN0ND3uOPJ+ - xsOMx8WrEVsSWeXSgr2j9vJZ3xjR+TfEwz4SoZHMDPxTQ0SCXgK+fq6cr0B3RpWZwYTTTOKrC+2pkhSY - UYRB0wMI9lOj3v13A6fJmGXvvovl0S162xrpMTbQbbxMV5OezmYd7YaLPLx9AeP1c7Q0nhXKkm1gfWxg - MTAACw5JiS924p+trHwcIPbBTPyTJfV/zt3JjfoqeQd97ddW4deniXuqiE2UsTysJDJYyNKLZG5/DXHv - CWKTR3n7pIC6Y/vlBj3GqzDvYMVdyY/xwyy9VDDcugdV8XqedWpS8LJLhb8rj9qyfLmByJsI2vg+qiE6 - dJBF+z6UhevQlG5Naps0WcARZxHTbblUl/4qU7pIXc16KW/0eTFhWz6h3lzJ7Hc4bM3D05LNcUWOfIMO - Qz2xORPhp3tZMO3km+MAHTcLUCu30KTfJU0WcMicw9SdjVSW7JAbtBq0BMaMuO9txnt/O+8samb7FFJh - IrNYW0wWsFm3gYqi7D8MNjXUlaOvVUm6VH0I7cliqW1RmMgs1haTBZyU/B6k8xr/deYna7rBU0DWSCIA - AAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASawAA - EmsB4byhqAAAAm5JREFUOE/V1N9PklEYB3D7j5oX4kYujUSwCeTCMBnzZy5/IqYU+PKC/MjUV0HBH6kY - hgqJFWWOdM1y1hxUyua8SC9aF82buugmHB6/Hd/WRbr2XuRN5+y5OtvnPM95zp4zADJOdR2BpxknsQx6 - wV+2rKAAR/HH+bGE/kPQ631P3O446e1ZIw/DOyQY3CKBQJJMTn4g4+MJMjq6Try+14jFNsje3jdy/P1P - lNzdvUJGRzbhsMcQjf7A2PgXDHo/oYf7CLtzG2Z2E7V1r6gD6HQjwqDLtUwGBtZhZZ9ibu47BnwU69uB - 484WOqybuGmMo7x6iQfLrvmEwU7bIuF6V2E2zSM4/ZVmtgu7axsd7AbabifQqF+DRvucB0s1HmHQwjwh - LucS2ttDmPDvwUExhmbGY4Y3qK5bgUr9iAdL1JwwyDDzxGZbgEE/Bd/QZ77MNlOcx2oopq16AbkixIPF - l+8KgywboWAUzU1+9Pbvot30Dk2Gt7hOG6GrWoK67Bkk8gdIp9NQKbuEQQsTJlZrBIYWP5xd22hupVj9 - L6xEuwCF+jHEEj/29/ehKHIJg2bTNGE6Zik4AYstidoGitGu/sZkyjCycu7xYGFhpzB4yzhFjMYAGhuG - YbIkUV7zEhrdIlRXo5ApI5BcCuGsaAipVAoyqSUt+LGrK93pqgo31MV2FF+ZhLTwPvLyxyA+PwyReBCZ - Ig8ys4ZxeEiQLzEJg522MKms6IfNMwOWmwbTNwOGOxZ9s1hNbOFCnlG45IMDQgwtgygrdUOj4aBU2VFU - xEIuN0NaYMRFSStyc/XIOVeP7OwbwuC/DttTndZHyfwEqUAcJPrJM0kAAAAASUVORK5CYII= - - - - 17, 17 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK+wAA - CvsBy58dkAAAAlRJREFUOE+lk+lLVFEYxuu/6UOE5IfKFkiJkJSiXMjEUUtN0solxTLJrflghq1TaWbj - mg4hOeNuw7iUe+bMuIVEYpBNaoy51Dj315wbqXeSCLrwfjmc5/c8z8u5W4Et//UJwMYZGTBFfZgwM2Hu - 5W1PG10tz2nQFVFTnBfgflc233ho6TPGTFr7WZodx2m3Is33INlamB0t5UnBZQrzkg+7QxSAsaEuFm0W - pqyN3MiIJTdFRVbiKaa7c5jpyyAnKcSlVyZWAAY7DEhfe8lMCCElym+XuHzptK9n2cPrSONppMUc/Tug - XV8KtkaSI0TSdafyB2qk0UQSVD6bAzr0Wg9j7WOan92jvqKAOm0+tdo8dIVqqotyqdRkUXb/GtrbVykp - uCLG47eBXKG1RsPCVBPMmeSRvhhxfm5l9VMTjo8GnDPNa+fTw9XcyY5fSyIDGipv/RKPJuE0x+MYjGal - O4zF9kCWX7kWN5aM03IBx5uzvHsRQPq540pAnfYmzJpYHY7jx8AZll+H0l3uiyp4Oy+rI9fEK70qxnR+ - pEb7KwGir2Rr43tfJEtdJ1kwHiMscBuR4Xtds092FuLFjiBGKnxIDF9fslxBV6SW+y51BmNv82e+3keG - uYvtrX6YS7w4H+qtTFClycYxrcfecoQ5/UG+mU5QdTeAiLA9FKoPyc5CPG/wZujRTuJCDigB5ZpMpvq1 - DBfvxvJ0P++bI5hsCJUXJjqL2MJZiA25O4gN8voD4JmfHoM6VSVPjuv5Zl4MlrctFiY6i9jCWYhdo3wH - m/1l/3r2Ey4iunsWz150AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASbgAA - Em4BzAbEXgAAAghJREFUOE+lk9tLk2Ecx+u/6SJC6qbsACkRkUKUB7KxuVGapB1M8iKLlo1dlGHHQVrY - ykPmheTmYW2NuSydx3awZUg0DKqli9mmNbdPe15h8XaAjV743rw8n+/v9/3yPGuBNf/1CYN0ND3uOPJ+ - xsOMx8WrEVsSWeXSgr2j9vJZ3xjR+TfEwz4SoZHMDPxTQ0SCXgK+fq6cr0B3RpWZwYTTTOKrC+2pkhSY - UYRB0wMI9lOj3v13A6fJmGXvvovl0S162xrpMTbQbbxMV5OezmYd7YaLPLx9AeP1c7Q0nhXKkm1gfWxg - MTAACw5JiS924p+trHwcIPbBTPyTJfV/zt3JjfoqeQd97ddW4deniXuqiE2UsTysJDJYyNKLZG5/DXHv - CWKTR3n7pIC6Y/vlBj3GqzDvYMVdyY/xwyy9VDDcugdV8XqedWpS8LJLhb8rj9qyfLmByJsI2vg+qiE6 - dJBF+z6UhevQlG5Naps0WcARZxHTbblUl/4qU7pIXc16KW/0eTFhWz6h3lzJ7Hc4bM3D05LNcUWOfIMO - Qz2xORPhp3tZMO3km+MAHTcLUCu30KTfJU0WcMicw9SdjVSW7JAbtBq0BMaMuO9txnt/O+8samb7FFJh - IrNYW0wWsFm3gYqi7D8MNjXUlaOvVUm6VH0I7cliqW1RmMgs1haTBZyU/B6k8xr/deYna7rBU0DWSCIA - AAAASUVORK5CYII= - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -506,6 +437,9 @@ rkJggg== + + 17, 17 + 402, 17