diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index f56fc7e3..7134c01c 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -35,6 +35,7 @@ namespace VEPROMS this.btnHelpManual = new DevComponents.DotNetBar.ButtonItem(); this.btnHelpAbout = new DevComponents.DotNetBar.ButtonItem(); this.btnHelpVWeb = new DevComponents.DotNetBar.ButtonItem(); + this.btnShortCuts = new DevComponents.DotNetBar.ButtonItem(); this.office2007StartButton1 = new DevComponents.DotNetBar.Office2007StartButton(); this.itemContainer1 = new DevComponents.DotNetBar.ItemContainer(); this.itemContainer2 = new DevComponents.DotNetBar.ItemContainer(); @@ -69,21 +70,16 @@ namespace VEPROMS this.labelItem11 = 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.epProcedures = 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(); @@ -95,19 +91,24 @@ 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.epProcedures.SuspendLayout(); @@ -134,6 +135,7 @@ namespace VEPROMS this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnHelp}); + this.ribbonControl1.KeyTipsEnabled = false; this.ribbonControl1.KeyTipsFont = new System.Drawing.Font("Tahoma", 7F); this.ribbonControl1.Location = new System.Drawing.Point(4, 1); this.ribbonControl1.Name = "ribbonControl1"; @@ -150,14 +152,17 @@ namespace VEPROMS // // btnHelp // + this.btnHelp.AutoExpandOnClick = true; this.btnHelp.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; this.btnHelp.Image = ((System.Drawing.Image)(resources.GetObject("btnHelp.Image"))); this.btnHelp.ItemAlignment = DevComponents.DotNetBar.eItemAlignment.Far; + this.btnHelp.KeyTips = "?"; this.btnHelp.Name = "btnHelp"; this.btnHelp.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnHelpManual, this.btnHelpAbout, - this.btnHelpVWeb}); + this.btnHelpVWeb, + this.btnShortCuts}); this.btnHelp.Text = "Help"; // // btnHelpManual @@ -183,6 +188,13 @@ namespace VEPROMS this.btnHelpVWeb.Text = "Volian Web"; this.btnHelpVWeb.Click += new System.EventHandler(this.btnVlnWeb_Click); // + // btnShortCuts + // + this.btnShortCuts.Image = global::VEPROMS.Properties.Resources.GotoShortcutsHS; + this.btnShortCuts.Name = "btnShortCuts"; + this.btnShortCuts.Text = "Shortcut List"; + this.btnShortCuts.Click += new System.EventHandler(this.btnShortCuts_Click); + // // office2007StartButton1 // this.office2007StartButton1.AutoExpandOnClick = true; @@ -192,6 +204,7 @@ namespace VEPROMS this.office2007StartButton1.Image = ((System.Drawing.Image)(resources.GetObject("office2007StartButton1.Image"))); this.office2007StartButton1.ImagePaddingHorizontal = 2; this.office2007StartButton1.ImagePaddingVertical = 2; + this.office2007StartButton1.KeyTips = "V"; this.office2007StartButton1.Name = "office2007StartButton1"; this.office2007StartButton1.ShowSubItems = false; this.office2007StartButton1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -514,20 +527,6 @@ namespace VEPROMS this.epAnnotations.Resize += new System.EventHandler(this.epAnnotations_Resize); this.epAnnotations.ExpandedChanging += new DevComponents.DotNetBar.ExpandChangeEventHandler(this.expandPanelExpandedChanging); // - // 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; @@ -686,18 +685,6 @@ 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; @@ -724,20 +711,6 @@ 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; @@ -763,21 +736,6 @@ 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; @@ -983,21 +941,6 @@ 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; @@ -1040,16 +983,6 @@ 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; @@ -1073,18 +1006,6 @@ 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; @@ -1157,6 +1078,112 @@ namespace VEPROMS 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.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; + // + // 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; + // + // 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; + // + // 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; + // + // 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; + // + // 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; + // + // 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); @@ -1307,6 +1334,7 @@ namespace VEPROMS private DevComponents.DotNetBar.ButtonItem btnItemInfo; private Volian.Controls.Library.DisplayBookMarks displayBookMarks; private DevComponents.DotNetBar.LabelItem lblLocked; + private DevComponents.DotNetBar.ButtonItem btnShortCuts; } } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 2dbfd44f..3af04adf 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -1204,6 +1204,12 @@ namespace VEPROMS } #endregion + private void btnShortCuts_Click(object sender, EventArgs e) + { + ShortcutLists scListdlg = new ShortcutLists(); + scListdlg.Show(); + } + //protected override void WndProc(ref Message m) //{ // base.WndProc(ref m);