diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index aea3d35c..8396b19f 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -76,9 +76,6 @@ namespace VEPROMS this.btnInsertMode = new DevComponents.DotNetBar.ButtonItem(); this.btnOverstrikeMode = new DevComponents.DotNetBar.ButtonItem(); this.labelItem9 = new DevComponents.DotNetBar.LabelItem(); - this.btnEditView = new DevComponents.DotNetBar.ButtonItem(); - this.btnEditMode = new DevComponents.DotNetBar.ButtonItem(); - this.btnViewMode = new DevComponents.DotNetBar.ButtonItem(); this.labelItem11 = new DevComponents.DotNetBar.LabelItem(); this.btnMarkPrevPos = new DevComponents.DotNetBar.ButtonItem(); this.labelItem2 = new DevComponents.DotNetBar.LabelItem(); @@ -128,6 +125,7 @@ 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(); ((System.ComponentModel.ISupportInitialize)(this.bottomBar)).BeginInit(); this.epAnnotations.SuspendLayout(); this.expandablePanel2.SuspendLayout(); @@ -450,7 +448,7 @@ namespace VEPROMS this.labelItem13, this.btnInsOvr, this.labelItem9, - this.btnEditView, + this.lblEditView, this.labelItem11, this.btnMarkPrevPos, this.labelItem2, @@ -602,34 +600,6 @@ namespace VEPROMS this.labelItem9.BorderType = DevComponents.DotNetBar.eBorderType.Bump; this.labelItem9.Name = "labelItem9"; // - // btnEditView - // - this.btnEditView.AutoExpandOnClick = true; - this.btnEditView.CanCustomize = false; - this.btnEditView.Description = "Toggle Edit / View Modes"; - this.btnEditView.ForeColor = System.Drawing.Color.Black; - this.btnEditView.ImagePaddingHorizontal = 8; - this.btnEditView.Name = "btnEditView"; - this.btnEditView.PopupSide = DevComponents.DotNetBar.ePopupSide.Top; - this.btnEditView.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btnEditMode, - this.btnViewMode}); - this.btnEditView.Text = "Edit"; - // - // btnEditMode - // - this.btnEditMode.ImagePaddingHorizontal = 8; - this.btnEditMode.Name = "btnEditMode"; - this.btnEditMode.Text = "Edit"; - this.btnEditMode.Click += new System.EventHandler(this.btnEditMode_Click); - // - // btnViewMode - // - this.btnViewMode.ImagePaddingHorizontal = 8; - this.btnViewMode.Name = "btnViewMode"; - this.btnViewMode.Text = "View"; - this.btnViewMode.Click += new System.EventHandler(this.btnViewMode_Click); - // // labelItem11 // this.labelItem11.BorderSide = DevComponents.DotNetBar.eBorderSide.Left; @@ -1370,15 +1340,25 @@ namespace VEPROMS // tc // 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.Name = "tc"; + this.tc.RibbonExpanded = true; this.tc.SelectedDisplayTabItem = null; this.tc.Size = new System.Drawing.Size(775, 660); this.tc.TabIndex = 8; this.tc.ItemSelectedChanged += new Volian.Controls.Library.ItemSelectedChangedEvent(this.tc_ItemSelectedChanged); 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 + // + this.lblEditView.BackColor = System.Drawing.Color.Transparent; + this.lblEditView.ForeColor = System.Drawing.SystemColors.MenuText; + this.lblEditView.Name = "lblEditView"; + this.lblEditView.Text = "Edit"; // // frmVEPROMS // @@ -1465,9 +1445,6 @@ namespace VEPROMS private DevComponents.DotNetBar.ButtonItem btnInsOvr; private DevComponents.DotNetBar.ButtonItem btnInsertMode; private DevComponents.DotNetBar.ButtonItem btnOverstrikeMode; - private DevComponents.DotNetBar.ButtonItem btnEditView; - private DevComponents.DotNetBar.ButtonItem btnEditMode; - private DevComponents.DotNetBar.ButtonItem btnViewMode; private DevComponents.DotNetBar.LabelItem labelItem9; private DevComponents.DotNetBar.LabelItem labelItem10; private DevComponents.DotNetBar.LabelItem labelItem11; @@ -1550,7 +1527,8 @@ namespace VEPROMS private Volian.Controls.Library.DisplayLibDocs displayLibDocs; private DevComponents.DotNetBar.TabItem tabItemLibDocs; private Volian.Controls.Library.DisplayTags displayTags; - private Volian.Controls.Library.DisplaySearch displaySearch1; + private Volian.Controls.Library.DisplaySearch displaySearch1; + private DevComponents.DotNetBar.LabelItem lblEditView; } } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 65658c5b..ad94a3d2 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -42,7 +42,7 @@ namespace VEPROMS _SelectedStepTabPanel = value; if (value == null) // DSO Tab Panel { - if (tc.SelectedDisplayTabItem != null) + if (tc.SelectedDisplayTabItem != null && tc.SelectedDisplayTabItem.MyItemInfo != null) // 2nd part is for unassociated libdocs SelectedDVI = tc.SelectedDisplayTabItem.MyItemInfo.MyActiveParent.ActiveParent as DocVersionInfo; else SelectedDVI = null; @@ -425,26 +425,7 @@ namespace VEPROMS // //} //} #endregion - #region Edit/View Modes - /// - /// Edit Mode button on the bottom tool bar - /// - /// - /// - private void btnEditMode_Click(object sender, EventArgs e) - { - btnEditView.Text = btnEditMode.Text; - } - - /// - /// View Mode button on the bottom tool bar - /// - /// - /// - private void btnViewMode_Click(object sender, EventArgs e) - { - btnEditView.Text = btnViewMode.Text; - } + #region Bottom Button Modes /// /// Insert button on the bottom tool bar @@ -889,9 +870,14 @@ namespace VEPROMS displayTags.MyRTB = (SelectedStepTabPanel == null) ? null : SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; } #endregion + private void tc_StepPanelModeChange(object sender, StepRTBModeChangeEventArgs args) + { + this.lblEditView.Text = args.ViewMode == E_ViewMode.Edit ? "Edit" : "View"; + } private ItemInfo _CurrentItem = null; private void tc_ItemSelectedChanged(object sender, ItemSelectedChangedEventArgs args) { + lblEditView.Text = " "; if (args == null) { _CurrentItem = null; @@ -936,6 +922,7 @@ namespace VEPROMS displayRO.MyRTB = args.MyStepItem.MyStepRTB; displayTags.MyRTB = args.MyStepItem.MyStepRTB; displayRO.ProgressBar = bottomProgBar; + lblEditView.Text = args.MyStepItem.MyStepRTB.ViewRTB ? "View" : "Edit"; } if(tc.SelectedDisplayTabItem != null) SelectedStepTabPanel = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.resx b/PROMS/VEPROMS User Interface/frmVEPROMS.resx index aea6c9bf..6858b74b 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.resx +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.resx @@ -399,6 +399,9 @@ bCVV/V4Ishh0HwgcBM6/gDFhmSjTv+IXqagSRZEQ5zgAAAAASUVORK5CYII= + + 17, 17 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -415,42 +418,6 @@ AAAASUVORK5CYII= - - - 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= - - - - 17, 17 - iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -484,6 +451,39 @@ JhfngEQ8Q7IRS9R4hGQRllZKUGwe3mFynP0TcQ1KwltVy5mQWGHwsqSUVZOFyZlldF1GNNpB5PdrCE0s 4IRPHEddRESnF6J81oi6Xk9b7xiFqmaCYxTCYHh6CeEZjwhNLcIvKhf/KNsLBiZz0vcqx89Gcsw9zHZG 4xKQjJsoHR+xHFGs4t+go2biAc5DB03uX5vZMUQuZEGBAAAAAElFTkSuQmCC + + + + + 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= @@ -521,6 +521,9 @@ rkJggg== + + 17, 17 + 402, 17 @@ -530,6 +533,9 @@ True + + True + R0lGODlhFAAUAPEAAAAAAP///////wAAACH5BAEAAAIALAAAAAAUABQAAAIjlI+py20AoUOxThFPdpKC