diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index c6d030aa..c9b153c6 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -72,16 +72,21 @@ namespace VEPROMS this.btnItemInfo = new DevComponents.DotNetBar.ButtonItem(); this.lblItemID = new DevComponents.DotNetBar.LabelItem(); 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(); @@ -93,24 +98,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.bottomBar.SuspendLayout(); this.epAnnotations.SuspendLayout(); @@ -138,6 +138,7 @@ namespace VEPROMS // // this.ribbonControl1.BackgroundStyle.Class = ""; + this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.CaptionVisible = true; this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -225,6 +226,7 @@ namespace VEPROMS // // this.itemContainer1.BackgroundStyle.Class = "RibbonFileMenuContainer"; + this.itemContainer1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.itemContainer1.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical; this.itemContainer1.Name = "itemContainer1"; this.itemContainer1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -237,6 +239,7 @@ namespace VEPROMS // // this.itemContainer2.BackgroundStyle.Class = "RibbonFileMenuTwoColumnContainer"; + this.itemContainer2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.itemContainer2.ItemSpacing = 0; this.itemContainer2.Name = "itemContainer2"; this.itemContainer2.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -249,6 +252,7 @@ namespace VEPROMS // // this.itemContainer3.BackgroundStyle.Class = "RibbonFileMenuColumnOneContainer"; + this.itemContainer3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.itemContainer3.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical; this.itemContainer3.MinimumSize = new System.Drawing.Size(120, 0); this.itemContainer3.Name = "itemContainer3"; @@ -336,6 +340,7 @@ namespace VEPROMS // // this.icRecentDocs.BackgroundStyle.Class = "RibbonFileMenuColumnTwoContainer"; + this.icRecentDocs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.icRecentDocs.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical; this.icRecentDocs.MinimumSize = new System.Drawing.Size(180, 0); this.icRecentDocs.Name = "icRecentDocs"; @@ -359,6 +364,7 @@ namespace VEPROMS // // this.itemContainer5.BackgroundStyle.Class = "RibbonFileMenuBottomContainer"; + this.itemContainer5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.itemContainer5.HorizontalItemAlignment = DevComponents.DotNetBar.eHorizontalItemsAlignment.Right; this.itemContainer5.Name = "itemContainer5"; this.itemContainer5.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -438,7 +444,7 @@ namespace VEPROMS this.labelItem11, this.btnItemInfo, this.lblItemID}); - this.bottomBar.Location = new System.Drawing.Point(5, 716); + this.bottomBar.Location = new System.Drawing.Point(5, 714); this.bottomBar.Name = "bottomBar"; this.bottomBar.Size = new System.Drawing.Size(1185, 29); this.bottomBar.Stretch = true; @@ -469,6 +475,7 @@ namespace VEPROMS // // this.bottomProgBar.BackStyle.Class = ""; + this.bottomProgBar.BackStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.bottomProgBar.ChunkGradientAngle = 0F; this.bottomProgBar.MenuVisibility = DevComponents.DotNetBar.eMenuVisibility.VisibleAlways; this.bottomProgBar.Name = "bottomProgBar"; @@ -531,7 +538,7 @@ namespace VEPROMS this.epAnnotations.Expanded = false; this.epAnnotations.ExpandedBounds = new System.Drawing.Rectangle(4, 544, 1187, 202); this.epAnnotations.ExpandOnTitleClick = true; - this.epAnnotations.Location = new System.Drawing.Point(5, 690); + this.epAnnotations.Location = new System.Drawing.Point(5, 688); this.epAnnotations.Name = "epAnnotations"; this.epAnnotations.Size = new System.Drawing.Size(1185, 26); this.epAnnotations.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -555,6 +562,20 @@ 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(1185, 0); + this.ctrlAnnotationDetails.TabIndex = 15; + // // btnAnnoDetailsPushPin // this.btnAnnoDetailsPushPin.AccessibleRole = System.Windows.Forms.AccessibleRole.CheckButton; @@ -587,7 +608,7 @@ namespace VEPROMS this.epProcedures.ExpandOnTitleClick = true; this.epProcedures.Location = new System.Drawing.Point(5, 57); this.epProcedures.Name = "epProcedures"; - this.epProcedures.Size = new System.Drawing.Size(30, 633); + this.epProcedures.Size = new System.Drawing.Size(30, 631); this.epProcedures.Style.Alignment = System.Drawing.StringAlignment.Center; this.epProcedures.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.epProcedures.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -608,6 +629,21 @@ namespace VEPROMS this.epProcedures.Resize += new System.EventHandler(this.resizeVerticalExpandedPanel); this.epProcedures.ExpandedChanging += new DevComponents.DotNetBar.ExpandChangeEventHandler(this.expandPanelExpandedChanging); // + // 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, 607); + this.tv.TabIndex = 1; + this.tv.MouseUp += new System.Windows.Forms.MouseEventHandler(this.tv_MouseUp); + this.tv.WordSectionDeleted += new Volian.Controls.Library.WordSectionDeletedEvent(this.tv_WordSectionDeleted); + this.tv.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.tv_BeforeExpand); + this.tv.SectionShouldClose += new Volian.Controls.Library.vlnTreeViewSectionInfoEvent(this.tv_SectionShouldClose); + // // infoPanel // this.infoPanel.CanvasColor = System.Drawing.SystemColors.Control; @@ -620,7 +656,7 @@ namespace VEPROMS this.infoPanel.ExpandOnTitleClick = true; this.infoPanel.Location = new System.Drawing.Point(1127, 57); this.infoPanel.Name = "infoPanel"; - this.infoPanel.Size = new System.Drawing.Size(30, 633); + this.infoPanel.Size = new System.Drawing.Size(30, 631); 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; @@ -698,6 +734,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; @@ -724,6 +772,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; @@ -749,6 +811,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; @@ -800,7 +877,7 @@ namespace VEPROMS this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter1.Location = new System.Drawing.Point(35, 57); this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(3, 633); + this.expandableSplitter1.Size = new System.Drawing.Size(3, 631); this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter1.TabIndex = 5; this.expandableSplitter1.TabStop = false; @@ -832,7 +909,7 @@ namespace VEPROMS this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter2.Location = new System.Drawing.Point(38, 687); + this.expandableSplitter2.Location = new System.Drawing.Point(38, 685); this.expandableSplitter2.Name = "expandableSplitter2"; this.expandableSplitter2.Size = new System.Drawing.Size(1089, 3); this.expandableSplitter2.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; @@ -868,7 +945,7 @@ namespace VEPROMS this.expandableSplitter3.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter3.Location = new System.Drawing.Point(1124, 57); this.expandableSplitter3.Name = "expandableSplitter3"; - this.expandableSplitter3.Size = new System.Drawing.Size(3, 630); + this.expandableSplitter3.Size = new System.Drawing.Size(3, 628); this.expandableSplitter3.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter3.TabIndex = 7; this.expandableSplitter3.TabStop = false; @@ -890,11 +967,11 @@ namespace VEPROMS 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.ExpandedBounds = new System.Drawing.Rectangle(847, 57, 343, 631); this.toolsPanel.ExpandOnTitleClick = true; this.toolsPanel.Location = new System.Drawing.Point(1160, 57); this.toolsPanel.Name = "toolsPanel"; - this.toolsPanel.Size = new System.Drawing.Size(30, 633); + this.toolsPanel.Size = new System.Drawing.Size(30, 631); 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; @@ -919,15 +996,15 @@ namespace VEPROMS // this.toolsTabs.BackColor = System.Drawing.Color.Transparent; this.toolsTabs.CanReorderTabs = true; - this.toolsTabs.Controls.Add(this.annotationSearch); this.toolsTabs.Controls.Add(this.tabControlPanel2); + this.toolsTabs.Controls.Add(this.annotationSearch); this.toolsTabs.Controls.Add(this.tabControlPanelLD); this.toolsTabs.Dock = System.Windows.Forms.DockStyle.Fill; this.toolsTabs.Location = new System.Drawing.Point(0, 26); 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(30, 637); + this.toolsTabs.Size = new System.Drawing.Size(30, 605); this.toolsTabs.TabAlignment = DevComponents.DotNetBar.eTabStripAlignment.Right; this.toolsTabs.TabIndex = 1; this.toolsTabs.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -944,7 +1021,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(3, 637); + this.annotationSearch.Size = new System.Drawing.Size(316, 605); 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) @@ -954,6 +1031,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(314, 603); + this.displaySearch1.TabIndex = 0; + // // toolstabResults // this.toolstabResults.AttachedControl = this.annotationSearch; @@ -968,7 +1060,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(3, 637); + this.tabControlPanel2.Size = new System.Drawing.Size(3, 605); 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) @@ -987,7 +1079,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(1, 635); + this.panelEx3.Size = new System.Drawing.Size(1, 603); 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; @@ -996,11 +1088,22 @@ 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.Margin = new System.Windows.Forms.Padding(2); + this.displayBookMarks.MyDisplayTabControl = null; + this.displayBookMarks.MyRTB = null; + this.displayBookMarks.Name = "displayBookMarks"; + this.displayBookMarks.Size = new System.Drawing.Size(1, 603); + this.displayBookMarks.TabIndex = 0; + // // toolsTabBookMarks // this.toolsTabBookMarks.AttachedControl = this.tabControlPanel2; this.toolsTabBookMarks.Name = "toolsTabBookMarks"; - this.toolsTabBookMarks.Text = "BookMarks"; + this.toolsTabBookMarks.Text = "Bookmarks"; // // tabControlPanelLD // @@ -1009,7 +1112,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(3, 637); + this.tabControlPanelLD.Size = new System.Drawing.Size(3, 605); 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) @@ -1019,6 +1122,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, 603); + this.displayLibDocs.TabIndex = 0; + // // tabItemLibDocs // this.tabItemLibDocs.AttachedControl = this.tabControlPanelLD; @@ -1056,7 +1171,7 @@ namespace VEPROMS this.expandableSplitter4.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter4.Location = new System.Drawing.Point(1157, 57); this.expandableSplitter4.Name = "expandableSplitter4"; - this.expandableSplitter4.Size = new System.Drawing.Size(3, 633); + this.expandableSplitter4.Size = new System.Drawing.Size(3, 631); this.expandableSplitter4.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter4.TabIndex = 3; this.expandableSplitter4.TabStop = false; @@ -1082,7 +1197,7 @@ namespace VEPROMS this.tc.Name = "tc"; this.tc.RibbonExpanded = true; this.tc.SelectedDisplayTabItem = null; - this.tc.Size = new System.Drawing.Size(1086, 630); + this.tc.Size = new System.Drawing.Size(1086, 628); this.tc.TabIndex = 8; this.tc.PanelTabDisplay += new Volian.Controls.Library.StepPanelTabDisplayEvent(this.tc_PanelTabDisplay); this.tc.WordSectionClose += new Volian.Controls.Library.StepPanelWordSectionCloseEvent(this.tc_WordSectionClose); @@ -1092,120 +1207,12 @@ namespace VEPROMS this.tc.WordSectionDeleted += new Volian.Controls.Library.StepPanelWordSectionDeletedEvent(this.tc_WordSectionDeleted); 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.Margin = new System.Windows.Forms.Padding(2); - 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, 607); - this.tv.TabIndex = 1; - this.tv.MouseUp += new System.Windows.Forms.MouseEventHandler(this.tv_MouseUp); - this.tv.WordSectionDeleted += new Volian.Controls.Library.WordSectionDeletedEvent(this.tv_WordSectionDeleted); - this.tv.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.tv_BeforeExpand); - 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(1185, 0); - this.ctrlAnnotationDetails.TabIndex = 15; - // // frmVEPROMS // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScroll = true; - this.ClientSize = new System.Drawing.Size(1195, 747); + this.ClientSize = new System.Drawing.Size(1195, 745); this.Controls.Add(this.tc); this.Controls.Add(this.expandableSplitter3); this.Controls.Add(this.expandableSplitter2); diff --git a/PROMS/Volian.Controls.Library/DisplayText.cs b/PROMS/Volian.Controls.Library/DisplayText.cs index 8e943b9d..ee4ad4a9 100644 --- a/PROMS/Volian.Controls.Library/DisplayText.cs +++ b/PROMS/Volian.Controls.Library/DisplayText.cs @@ -1027,36 +1027,57 @@ namespace Volian.Controls.Library // with the ReplaceWith string as is if ((rs.Flag & E_ReplaceFlags.CaseInsens) > 0) { - string res = ""; - string fortest = Text.ToUpper(); - string pat = @"(?<=\W|^)" + rs.ReplaceWord.ToUpper() + @"(?=\W|$)"; - int cpindx = 0; - foreach (Match m in Regex.Matches(fortest, pat)) + //string res = ""; + //string fortest = Text.ToUpper(); + ////string pat = @"(?<=\W|^)" + rs.ReplaceWord.ToUpper() + @"(?=\W|$)"; + //// jsj 07Jun2010 HardSpaces defeat replaceword logic + //string pat = @"(?<=\W|^)(? 0) { - // not in hlp + // only in Maine Yankee - we don't need to do this one. } // CASEINSENSFIRST: Do ReplaceWords for all words that exactly match the ReplaceWord, // except the case where the first character may be different else if ((rs.Flag & E_ReplaceFlags.CaseInsensFirst) > 0) { - // not in hlp + // only used in V.C. Summer - we don't need to do this either. } else { // If there are Regex Control Characters '\[]()' prefix them with backslash - string replaceWord = Regex.Replace(rs.ReplaceWord, @"[[\]\\()]", @"\$0"); - string pat = @"(?<=\W|^)" + replaceWord + @"(?=\W|$)"; + string replaceWord = Regex.Replace(rs.ReplaceWord, @"[[\]\\()]", @"\$0"); + //string pat = @"(?<=\W|^)" + replaceWord + @"(?=\W|$)"; + // jsj 07Jun2010 HardSpaces defeat replaceword logic + //string pat = @"(?<=\W|^)(? 0 && SelectionStart==0 && _LinkLocations.Count>0 && _LinkLocations[0].Start==7) @@ -2625,7 +2632,7 @@ namespace Volian.Controls.Library private void StepRTB_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e) { - Console.WriteLine("StepRTB_PreviewKeyDown"); + //Console.WriteLine("StepRTB_PreviewKeyDown"); if ((e.KeyCode == Keys.Tab) && (!e.Alt && !e.Control)) e.IsInputKey = true; } diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index e3415922..f11bae58 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -173,6 +173,7 @@ namespace Volian.Controls.Library // expand/hide the ribbon. // Note: the QAT menu is to the right of the V start button in the upper left _RibbonControl.AutoExpand = false; + _RibbonControl.Items[0].RaiseClick(); // initially default to HOME tab } void _RibbonControl_SizeChanged(object sender, EventArgs e) @@ -1084,7 +1085,7 @@ namespace Volian.Controls.Library MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlUp); // jump to HLS ShortCutContextMenu("InsHLS"); // prompt for new HLS } - else if (deletedRNO) + else if (deletedRNO || MyItemInfo.IsEquipmentList) InsertSiblingBeforeOrAfter("after"); else if (MyStepItem.MyRNOStepItems != null && MyStepItem.MyRNOStepItems.Count > 0) MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlRight); // jump to RNO diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs index 43496596..72a2b2ba 100644 Binary files a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs and b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs differ diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.resx b/PROMS/Volian.Controls.Library/StepTabRibbon.resx index 32d2c907..513f5f0c 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.resx +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.resx @@ -117,7 +117,34 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA + EnEB89x6jgAAASBJREFUOE+lU7ERwjAMFCOwQmbJCKFIQQtFGorccS5oUnApU9B4hayQFViBFVgh/Ecm + Z8cmcAd3wlEkvaV/ZTOOo/z1I8DbRIoBtvXfLeJ2GZuLtZMCf9c2BYDYgfEfACxATBYlSvEUOX0FaEUI + YPtF62ft7rY+go5hHgrS7NxYWy2uCRzxE3DgCnKRjskP56Orkv45yU2asKMbpcPJ2839ozKfJTMgbSKU + t0ekztKvaA7ibixOyvoLADqYiGMXHIUWy7uQa+cSuZGUDb7FswWYwclx9oES/hqzGAmV1UTdSPiQ8Uqw + DCdiNtgFHwAtVpjbIvESaA4ZqUrP2xELFPEBUMwlqmH7iDiNNQAph2DskIMaIF16YfCVIoZOmtyveQF9 + 2CVVWYKhQwAAAABJRU5ErkJggg== + + + + 17, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA + EnEB89x6jgAAAIBJREFUOE/FU9ESgCAIy///aAMU0DDYSxecV6KOObB1squRs3VyNY1Z4OWHATYTFHI1 + gp0RXdm+vlGoLC5zPowCHDeiAGkmhMHnAEFpDwwRjcFKV++/6xyLVgEk2UfhnuVTNsVBa5Njk8xV6c1k + hNwGBmaHAP5n4G8q6gFdoZLjBpE7j5KJdaRlAAAAAElFTkSuQmCC + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -166,30 +193,6 @@ EnEB89x6jgAAAIBJREFUOE/FU9ESgCAIy///aAMU0DDYSxecV6KOObB1squRs3VyNY1Z4OWHATYTFHI1 gp0RXdm+vlGoLC5zPowCHDeiAGkmhMHnAEFpDwwRjcFKV++/6xyLVgEk2UfhnuVTNsVBa5Njk8xV6c1k hNwGBmaHAP5n4G8q6gFdoZLjBpE7j5KJdaRlAAAAAElFTkSuQmCC - - - - 17, 17 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAASBJREFUOE+lU7ERwjAMFCOwQmbJCKFIQQtFGorccS5oUnApU9B4hayQFViBFVgh/Ecm - Z8cmcAd3wlEkvaV/ZTOOo/z1I8DbRIoBtvXfLeJ2GZuLtZMCf9c2BYDYgfEfACxATBYlSvEUOX0FaEUI - YPtF62ft7rY+go5hHgrS7NxYWy2uCRzxE3DgCnKRjskP56Orkv45yU2asKMbpcPJ2839ozKfJTMgbSKU - t0ekztKvaA7ibixOyvoLADqYiGMXHIUWy7uQa+cSuZGUDb7FswWYwclx9oES/hqzGAmV1UTdSPiQ8Uqw - DCdiNtgFHwAtVpjbIvESaA4ZqUrP2xELFPEBUMwlqmH7iDiNNQAph2DskIMaIF16YfCVIoZOmtyveQF9 - 2CVVWYKhQwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAIBJREFUOE/FU9ESgCAIy///aAMU0DDYSxecV6KOObB1squRs3VyNY1Z4OWHATYTFHI1 - gp0RXdm+vlGoLC5zPowCHDeiAGkmhMHnAEFpDwwRjcFKV++/6xyLVgEk2UfhnuVTNsVBa5Njk8xV6c1k - hNwGBmaHAP5n4G8q6gFdoZLjBpE7j5KJdaRlAAAAAElFTkSuQmCC