diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index 231f88f9..3b4bea6b 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -76,6 +76,7 @@ namespace VEPROMS this.btnInsertMode = new DevComponents.DotNetBar.ButtonItem(); this.btnOverstrikeMode = new DevComponents.DotNetBar.ButtonItem(); this.labelItem9 = new DevComponents.DotNetBar.LabelItem(); + this.lblEditView = new DevComponents.DotNetBar.LabelItem(); this.labelItem11 = new DevComponents.DotNetBar.LabelItem(); this.btnMarkPrevPos = new DevComponents.DotNetBar.ButtonItem(); this.labelItem2 = new DevComponents.DotNetBar.LabelItem(); @@ -125,7 +126,8 @@ namespace VEPROMS this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); this.itemAnnotationsBindingSource = new System.Windows.Forms.BindingSource(this.components); this.tc = new Volian.Controls.Library.DisplayTabControl(); - this.lblEditView = new DevComponents.DotNetBar.LabelItem(); + this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); + this.btnItemInfo = new DevComponents.DotNetBar.ButtonItem(); ((System.ComponentModel.ISupportInitialize)(this.bottomBar)).BeginInit(); this.epAnnotations.SuspendLayout(); this.expandablePanel2.SuspendLayout(); @@ -440,7 +442,9 @@ namespace VEPROMS this.labelItem2, this.btnPrevPos, this.labelItem14, - this.btnGetRoVals}); + this.btnGetRoVals, + this.labelItem1, + this.btnItemInfo}); this.bottomBar.Location = new System.Drawing.Point(4, 746); this.bottomBar.Name = "bottomBar"; this.bottomBar.Size = new System.Drawing.Size(1187, 29); @@ -518,7 +522,7 @@ namespace VEPROMS 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)); + " tells you the current lock status.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.btnLckUlck.Text = "Unlocked"; // // btnSetLock @@ -576,6 +580,13 @@ namespace VEPROMS this.labelItem9.BorderType = DevComponents.DotNetBar.eBorderType.Bump; this.labelItem9.Name = "labelItem9"; // + // lblEditView + // + this.lblEditView.BackColor = System.Drawing.Color.Transparent; + this.lblEditView.ForeColor = System.Drawing.SystemColors.MenuText; + this.lblEditView.Name = "lblEditView"; + this.lblEditView.Text = "Edit"; + // // labelItem11 // this.labelItem11.BorderSide = DevComponents.DotNetBar.eBorderSide.Left; @@ -592,7 +603,7 @@ namespace VEPROMS this.btnMarkPrevPos.Name = "btnMarkPrevPos"; this.btnMarkPrevPos.PopupSide = DevComponents.DotNetBar.ePopupSide.Top; this.superTooltip1.SetSuperTooltip(this.btnMarkPrevPos, new DevComponents.DotNetBar.SuperTooltipInfo("Simple Bookmark", "", "Mark your current positon and/or jump to the previously marked position. Note th" + - "at markking the the current position will also add to the list of bookmarks", null, null, DevComponents.DotNetBar.eTooltipColor.System)); + "at markking the the current position will also add to the list of bookmarks", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.btnMarkPrevPos.Text = "BookMark"; this.btnMarkPrevPos.Click += new System.EventHandler(this.btnMarkPrevPos_Click); // @@ -612,7 +623,7 @@ namespace VEPROMS this.btnPrevPos.Name = "btnPrevPos"; this.btnPrevPos.PopupSide = DevComponents.DotNetBar.ePopupSide.Top; this.superTooltip1.SetSuperTooltip(this.btnPrevPos, new DevComponents.DotNetBar.SuperTooltipInfo("Simple Bookmark", "", "Mark your current positon and/or jump to the previously marked position. Note th" + - "at markking the the current position will also add to the list of bookmarks", null, null, DevComponents.DotNetBar.eTooltipColor.System)); + "at markking the the current position will also add to the list of bookmarks", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.btnPrevPos.Text = "Previous Positon"; this.btnPrevPos.Click += new System.EventHandler(this.btnPrevPos_Click); // @@ -628,7 +639,7 @@ namespace VEPROMS 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)); + "active when new Referenced Object Values are available.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.btnGetRoVals.Text = "Update RO Values"; // // epAnnotations @@ -666,13 +677,13 @@ namespace VEPROMS // ctrlAnnotationDetails // this.ctrlAnnotationDetails.AnnotationRTFText = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 Microsoft S" + - "ans Serif;}}\r\n\\viewkind4\\uc1\\pard\\f0\\fs20\\par\r\n}\r\n"; + "ans Serif;}}\r\n\\viewkind4\\uc1\\pard\\f0\\fs20\\par\r\n}\r\n"; this.ctrlAnnotationDetails.Annotations = null; this.ctrlAnnotationDetails.AnnotationText = ""; this.ctrlAnnotationDetails.CurrentAnnotation = null; 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.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.ctrlAnnotationDetails.Name = "ctrlAnnotationDetails"; this.ctrlAnnotationDetails.Size = new System.Drawing.Size(1187, 0); this.ctrlAnnotationDetails.TabIndex = 15; @@ -693,7 +704,7 @@ namespace VEPROMS this.btnAnnoDetailsPushPin.ShowSubItems = false; this.btnAnnoDetailsPushPin.Size = new System.Drawing.Size(27, 23); this.superTooltip1.SetSuperTooltip(this.btnAnnoDetailsPushPin, new DevComponents.DotNetBar.SuperTooltipInfo("Annotation Details Push Pin", "", "This will toggle between keeping the Annotation Details window opened or to open/" + - "close automatically.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + "close automatically.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnAnnoDetailsPushPin.TabIndex = 14; this.btnAnnoDetailsPushPin.ThemeAware = true; // @@ -802,7 +813,7 @@ namespace VEPROMS this.infotabControlPanelTags.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.infotabControlPanelTags.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.infotabControlPanelTags.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.infotabControlPanelTags.Style.GradientAngle = 180; this.infotabControlPanelTags.TabIndex = 1; this.infotabControlPanelTags.TabItem = this.infotabTags; @@ -830,6 +841,7 @@ namespace VEPROMS 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, 2, 2, 2); this.displayTags.MyRTB = null; this.displayTags.Name = "displayTags"; this.displayTags.Size = new System.Drawing.Size(201, 500); @@ -854,7 +866,7 @@ namespace VEPROMS 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))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.infotabControlPanelTransitions.Style.GradientAngle = 180; this.infotabControlPanelTransitions.TabIndex = 5; this.infotabControlPanelTransitions.TabItem = this.infotabTransition; @@ -894,7 +906,7 @@ namespace VEPROMS this.infotabControlPanelRO.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.infotabControlPanelRO.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.infotabControlPanelRO.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.infotabControlPanelRO.Style.GradientAngle = 180; this.infotabControlPanelRO.TabIndex = 4; this.infotabControlPanelRO.TabItem = this.infotabRO; @@ -1106,7 +1118,7 @@ namespace VEPROMS this.annotationSearch.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.annotationSearch.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.annotationSearch.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.annotationSearch.Style.GradientAngle = 180; this.annotationSearch.TabIndex = 3; this.annotationSearch.TabItem = this.toolstabResults; @@ -1145,7 +1157,7 @@ namespace VEPROMS this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanel2.Style.GradientAngle = 180; this.tabControlPanel2.TabIndex = 2; this.tabControlPanel2.TabItem = this.infotabBookMarks; @@ -1177,10 +1189,9 @@ namespace VEPROMS this.lbxBookMarks.Dock = System.Windows.Forms.DockStyle.Fill; this.lbxBookMarks.FormattingEnabled = true; this.lbxBookMarks.HorizontalScrollbar = true; - this.lbxBookMarks.ItemHeight = 16; this.lbxBookMarks.Location = new System.Drawing.Point(0, 87); this.lbxBookMarks.Name = "lbxBookMarks"; - this.lbxBookMarks.Size = new System.Drawing.Size(314, 548); + this.lbxBookMarks.Size = new System.Drawing.Size(314, 537); this.lbxBookMarks.TabIndex = 3; this.lbxBookMarks.Click += new System.EventHandler(this.lbxBookMarks_Click); // @@ -1237,7 +1248,7 @@ namespace VEPROMS this.tabControlPanelLD.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.tabControlPanelLD.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.tabControlPanelLD.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanelLD.Style.GradientAngle = 180; this.tabControlPanelLD.TabIndex = 4; this.tabControlPanelLD.TabItem = this.tabItemLibDocs; @@ -1312,27 +1323,33 @@ namespace VEPROMS this.tc.Dock = System.Windows.Forms.DockStyle.Fill; this.tc.ForeColor = System.Drawing.SystemColors.ControlText; this.tc.Location = new System.Drawing.Point(37, 57); - this.tc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tc.Margin = new System.Windows.Forms.Padding(4); this.tc.Name = "tc"; this.tc.RibbonExpanded = true; this.tc.SelectedDisplayTabItem = null; this.tc.Size = new System.Drawing.Size(575, 660); this.tc.TabIndex = 8; 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); - this.tc.ModeChange += new Volian.Controls.Library.StepPanelModeChangeEvent(this.tc_StepPanelModeChange); // - // lblEditView + // labelItem1 // - this.lblEditView.BackColor = System.Drawing.Color.Transparent; - this.lblEditView.ForeColor = System.Drawing.SystemColors.MenuText; - this.lblEditView.Name = "lblEditView"; - this.lblEditView.Text = "Edit"; + this.labelItem1.BorderSide = DevComponents.DotNetBar.eBorderSide.Left; + this.labelItem1.BorderType = DevComponents.DotNetBar.eBorderType.Bump; + this.labelItem1.Name = "labelItem1"; + // + // btnItemInfo + // + this.btnItemInfo.ForeColor = System.Drawing.Color.Blue; + this.btnItemInfo.Name = "btnItemInfo"; + this.btnItemInfo.Text = "ItemInfo"; + this.btnItemInfo.Click += new System.EventHandler(this.btnItemInfo_Click); // // frmVEPROMS // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScroll = true; this.ClientSize = new System.Drawing.Size(1195, 777); @@ -1499,6 +1516,8 @@ namespace VEPROMS private Volian.Controls.Library.DisplayTags displayTags; private Volian.Controls.Library.DisplaySearch displaySearch1; private DevComponents.DotNetBar.LabelItem lblEditView; + private DevComponents.DotNetBar.LabelItem labelItem1; + private DevComponents.DotNetBar.ButtonItem btnItemInfo; } } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 5c3412d8..7bc79a76 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -133,9 +133,16 @@ namespace VEPROMS _MyBookMarks = MostRecentItemList.GetMRILst((System.Collections.Specialized.StringCollection)(Properties.Settings.Default["BookMarks"])); SetupMRU(); SetupBookMarks(); - displaySearch1.SetupAnnotationSearch(ctrlAnnotationDetails, tc); - ctrlAnnotationDetails.SetupAnnotations(displaySearch1); - + displaySearch1.SetupAnnotationSearch(ctrlAnnotationDetails, tc); + ctrlAnnotationDetails.SetupAnnotations(displaySearch1); + SetupButtons(); + } + private void SetupButtons() + { +#if (DEBUG) +#else + labelItem1.Visible = btnItemInfo.Visible = false; +#endif } #region MRU private MostRecentItemList _MyMRIList; @@ -1214,5 +1221,11 @@ namespace VEPROMS // TODO: Need to send message to all StepTabPanels and tell them to minimize their ribbons. tc.RibbonExpanded = ribbonControl1.Expanded; } + + private void btnItemInfo_Click(object sender, EventArgs e) + { + frmPropGrid pg = new frmPropGrid(tc.SelectedDisplayTabItem.SelectedItemInfo, tc.SelectedDisplayTabItem.SelectedItemInfo.Path); + pg.Show(); + } } } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.resx b/PROMS/VEPROMS User Interface/frmVEPROMS.resx index 6858b74b..4a7f4a72 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.resx +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.resx @@ -546,6 +546,6 @@ 156, 17 - 41 + 64 \ No newline at end of file