diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index 79b157e0..c88dc5b4 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -110,7 +110,9 @@ 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.cmbFont = new System.Windows.Forms.ComboBox(); ((System.ComponentModel.ISupportInitialize)(this.bottomBar)).BeginInit(); + this.bottomBar.SuspendLayout(); this.epAnnotations.SuspendLayout(); this.epProcedures.SuspendLayout(); this.infoPanel.SuspendLayout(); @@ -132,10 +134,6 @@ namespace VEPROMS // // ribbonControl1 // - // - // - // - this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.CaptionVisible = true; this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -424,6 +422,7 @@ namespace VEPROMS // // bottomBar // + this.bottomBar.Controls.Add(this.cmbFont); this.bottomBar.Dock = System.Windows.Forms.DockStyle.Bottom; this.bottomBar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem10, @@ -435,9 +434,9 @@ namespace VEPROMS this.labelItem11, this.btnItemInfo, this.lblItemID}); - this.bottomBar.Location = new System.Drawing.Point(4, 745); + this.bottomBar.Location = new System.Drawing.Point(4, 749); this.bottomBar.Name = "bottomBar"; - this.bottomBar.Size = new System.Drawing.Size(1187, 29); + this.bottomBar.Size = new System.Drawing.Size(1187, 25); this.bottomBar.Stretch = true; this.bottomBar.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.bottomBar.TabIndex = 1; @@ -452,10 +451,6 @@ namespace VEPROMS // // bottomProgBar // - // - // - // - this.bottomProgBar.BackStyle.Class = ""; this.bottomProgBar.ChunkGradientAngle = 0F; this.bottomProgBar.MenuVisibility = DevComponents.DotNetBar.eMenuVisibility.VisibleAlways; this.bottomProgBar.Name = "bottomProgBar"; @@ -518,7 +513,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(4, 719); + this.epAnnotations.Location = new System.Drawing.Point(4, 723); this.epAnnotations.Name = "epAnnotations"; this.epAnnotations.Size = new System.Drawing.Size(1187, 26); this.epAnnotations.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -545,13 +540,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; @@ -572,7 +567,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; // @@ -588,7 +583,7 @@ namespace VEPROMS this.epProcedures.ExpandOnTitleClick = true; this.epProcedures.Location = new System.Drawing.Point(4, 57); this.epProcedures.Name = "epProcedures"; - this.epProcedures.Size = new System.Drawing.Size(30, 662); + this.epProcedures.Size = new System.Drawing.Size(30, 666); 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; @@ -636,7 +631,7 @@ namespace VEPROMS this.infoPanel.ExpandOnTitleClick = true; this.infoPanel.Location = new System.Drawing.Point(1128, 57); this.infoPanel.Name = "infoPanel"; - this.infoPanel.Size = new System.Drawing.Size(30, 662); + this.infoPanel.Size = new System.Drawing.Size(30, 666); 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; @@ -691,7 +686,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; @@ -719,7 +714,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); + this.displayTags.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.displayTags.MinimumSize = new System.Drawing.Size(100, 630); this.displayTags.MyRTB = null; this.displayTags.Name = "displayTags"; @@ -745,7 +740,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; @@ -785,7 +780,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; @@ -857,7 +852,7 @@ namespace VEPROMS this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter1.Location = new System.Drawing.Point(34, 57); this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(3, 662); + this.expandableSplitter1.Size = new System.Drawing.Size(3, 666); this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter1.TabIndex = 5; this.expandableSplitter1.TabStop = false; @@ -889,7 +884,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(37, 716); + this.expandableSplitter2.Location = new System.Drawing.Point(37, 720); this.expandableSplitter2.Name = "expandableSplitter2"; this.expandableSplitter2.Size = new System.Drawing.Size(1091, 3); this.expandableSplitter2.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; @@ -925,7 +920,7 @@ namespace VEPROMS this.expandableSplitter3.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter3.Location = new System.Drawing.Point(1125, 57); this.expandableSplitter3.Name = "expandableSplitter3"; - this.expandableSplitter3.Size = new System.Drawing.Size(3, 659); + this.expandableSplitter3.Size = new System.Drawing.Size(3, 663); this.expandableSplitter3.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter3.TabIndex = 7; this.expandableSplitter3.TabStop = false; @@ -951,7 +946,7 @@ namespace VEPROMS this.toolsPanel.ExpandOnTitleClick = true; this.toolsPanel.Location = new System.Drawing.Point(1161, 57); this.toolsPanel.Name = "toolsPanel"; - this.toolsPanel.Size = new System.Drawing.Size(30, 662); + this.toolsPanel.Size = new System.Drawing.Size(30, 666); 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; @@ -1005,7 +1000,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; @@ -1044,7 +1039,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.toolsTabBookMarks; @@ -1072,6 +1067,7 @@ namespace VEPROMS // 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, 2, 2, 2); this.displayBookMarks.MyDisplayTabControl = null; this.displayBookMarks.MyRTB = null; this.displayBookMarks.Name = "displayBookMarks"; @@ -1095,7 +1091,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; @@ -1150,7 +1146,7 @@ namespace VEPROMS this.expandableSplitter4.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter4.Location = new System.Drawing.Point(1158, 57); this.expandableSplitter4.Name = "expandableSplitter4"; - this.expandableSplitter4.Size = new System.Drawing.Size(3, 662); + this.expandableSplitter4.Size = new System.Drawing.Size(3, 666); this.expandableSplitter4.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter4.TabIndex = 3; this.expandableSplitter4.TabStop = false; @@ -1171,11 +1167,11 @@ 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(1088, 659); + this.tc.Size = new System.Drawing.Size(1088, 663); 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); @@ -1185,9 +1181,18 @@ namespace VEPROMS this.tc.WordSectionDeleted += new Volian.Controls.Library.StepPanelWordSectionDeletedEvent(this.tc_WordSectionDeleted); this.tc.LinkModifyRO += new Volian.Controls.Library.StepPanelLinkEvent(this.tc_LinkModifyRO); // + // cmbFont + // + this.cmbFont.FormattingEnabled = true; + this.cmbFont.Location = new System.Drawing.Point(388, 2); + this.cmbFont.Name = "cmbFont"; + this.cmbFont.Size = new System.Drawing.Size(172, 23); + this.cmbFont.TabIndex = 0; + this.cmbFont.SelectedIndexChanged += new System.EventHandler(this.cmbFont_SelectedIndexChanged); + // // 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, 776); @@ -1208,6 +1213,7 @@ namespace VEPROMS this.Load += new System.EventHandler(this.frmVEPROMS_Load); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmVEPROMS_FormClosing); ((System.ComponentModel.ISupportInitialize)(this.bottomBar)).EndInit(); + this.bottomBar.ResumeLayout(false); this.epAnnotations.ResumeLayout(false); this.epProcedures.ResumeLayout(false); this.infoPanel.ResumeLayout(false); @@ -1337,6 +1343,7 @@ namespace VEPROMS private DevComponents.DotNetBar.LabelItem lblLocked; private DevComponents.DotNetBar.ButtonItem btnShortCuts; private DevComponents.DotNetBar.LabelItem lblItemID; + private System.Windows.Forms.ComboBox cmbFont; } } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index d4e23438..bcc5ae62 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -115,7 +115,9 @@ namespace VEPROMS //if (Settings.Default["UseTitleOnTreeNode"]) //{ //} - + cmbFont.DataSource = FontFamily.Families; + cmbFont.DisplayMember = "Name"; + cmbFont.SelectedIndex = -1; VETreeNode tn = VETreeNode.GetFolder(1); tv.Nodes.Add(tn); tv.NodeOpenProperty += new vlnTreeViewPropertyEvent(tv_NodeOpenProperty); @@ -181,6 +183,7 @@ namespace VEPROMS #else lblItemID.Visible = false; btnItemInfo.Visible = false; + cmbFont.Visible = false; #endif } #region MRU @@ -1232,6 +1235,11 @@ namespace VEPROMS scListdlg.Show(); } + private void cmbFont_SelectedIndexChanged(object sender, EventArgs e) + { + StepRTB.MyFontFamily = cmbFont.SelectedValue as FontFamily; + } + //protected override void WndProc(ref Message m) //{ // base.WndProc(ref m);