From 72ca2597715d11a7e7979f407ee9af4bf7d96144 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Tue, 23 Sep 2025 11:25:34 -0400 Subject: [PATCH] B2025-050 Fixed settings that required restarting PROMS and the toggle of Sync Navigation --- .../frmSysOptions.Designer.cs | 96 ++++++++----------- PROMS/VEPROMS User Interface/frmSysOptions.cs | 2 +- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 3 +- .../Extension/DisplayText.cs | 4 +- .../Format/PlantFormat.cs | 2 +- PROMS/Volian.Base.Library/VlnSettings.cs | 2 +- PROMS/Volian.Controls.Library/EditItem.cs | 10 +- PROMS/Volian.Controls.Library/GridItem.cs | 6 +- PROMS/Volian.Controls.Library/ImageItem.cs | 11 ++- PROMS/Volian.Controls.Library/RTBItem.cs | 6 ++ PROMS/Volian.Controls.Library/RtfRawItem.cs | 5 + 11 files changed, 81 insertions(+), 66 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs b/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs index 077d4430..dbb0210e 100644 --- a/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs @@ -30,7 +30,6 @@ namespace VEPROMS { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmSysOptions)); - //this.btnCancel = new DevComponents.DotNetBar.ButtonX(); this.btnOK = new DevComponents.DotNetBar.ButtonX(); this.gpSystemColor = new DevComponents.DotNetBar.Controls.GroupPanel(); this.cbRibonBlack = new DevComponents.DotNetBar.Controls.CheckBoxX(); @@ -50,6 +49,7 @@ namespace VEPROMS this.gpShwRplWords = new DevComponents.DotNetBar.Controls.GroupPanel(); this.cbShwRplWrdsColor = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.gpAnnoTypeFilter = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.cbShwAnnoFilter = new DevComponents.DotNetBar.ButtonX(); this.gpVisioPath = new DevComponents.DotNetBar.Controls.GroupPanel(); this.txbxVisioPath = new DevComponents.DotNetBar.Controls.TextBoxX(); this.gpSeparateWindows = new DevComponents.DotNetBar.Controls.GroupPanel(); @@ -72,10 +72,10 @@ namespace VEPROMS this.cbTabbedIntrFace = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.cbButtonIntrFace = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.tiIntrFaceStngs = new DevComponents.DotNetBar.TabItem(this.components); - this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); - this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel(); this.tiStUpMsg = new DevComponents.DotNetBar.TabItem(this.components); + this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); + this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components); this.cbUCFLForSetOnly = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.cbUCFLUseAll = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.cbUCFLOnlyImport = new DevComponents.DotNetBar.Controls.CheckBoxX(); @@ -83,7 +83,6 @@ namespace VEPROMS this.cbUCFIgnore = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.btnReset = new DevComponents.DotNetBar.ButtonX(); this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip(); - this.cbShwAnnoFilter = new DevComponents.DotNetBar.ButtonX(); this.gpSystemColor.SuspendLayout(); this.panButtons.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).BeginInit(); @@ -103,18 +102,6 @@ namespace VEPROMS this.gpTransRangeColor.SuspendLayout(); this.gpPropPageStyle.SuspendLayout(); this.SuspendLayout(); - //// - //// btnCancel - //// - //this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - //this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - //this.btnCancel.Location = new System.Drawing.Point(616, 591); - //this.btnCancel.Margin = new System.Windows.Forms.Padding(2); - //this.btnCancel.Name = "btnCancel"; - //this.btnCancel.Size = new System.Drawing.Size(56, 19); - //this.btnCancel.TabIndex = 0; - //this.btnCancel.Text = "Cancel"; - //this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); // // btnOK // @@ -564,6 +551,18 @@ namespace VEPROMS this.gpAnnoTypeFilter.TabIndex = 13; this.gpAnnoTypeFilter.Text = "Filter Annotation Types"; // + // cbShwAnnoFilter + // + this.cbShwAnnoFilter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.cbShwAnnoFilter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.cbShwAnnoFilter.Location = new System.Drawing.Point(25, 13); + this.cbShwAnnoFilter.Name = "cbShwAnnoFilter"; + this.cbShwAnnoFilter.Size = new System.Drawing.Size(91, 23); + this.cbShwAnnoFilter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbShwAnnoFilter.TabIndex = 0; + this.cbShwAnnoFilter.Text = "Open"; + this.cbShwAnnoFilter.Click += new System.EventHandler(this.cbShwAnnoFilter_Click); + // // gpVisioPath // this.gpVisioPath.BackColor = System.Drawing.Color.Transparent; @@ -741,6 +740,7 @@ namespace VEPROMS this.cbEnhancedDocumentSync.Size = new System.Drawing.Size(99, 19); this.cbEnhancedDocumentSync.TabIndex = 9; this.cbEnhancedDocumentSync.Text = "Sync Navigation"; + this.cbEnhancedDocumentSync.CheckedChanged += new System.EventHandler(this.cbEnhancedDocumentSync_CheckedChanged); // // gpPasteSettings // @@ -1147,31 +1147,6 @@ namespace VEPROMS this.tiIntrFaceStngs.Name = "tiIntrFaceStngs"; this.tiIntrFaceStngs.Text = "My Interface Settings"; // - // tabControlPanel1 - // - this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty; - this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel1.Location = new System.Drawing.Point(0, 27); - this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(2); - this.tabControlPanel1.Name = "tabControlPanel1"; - this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel1.Size = new System.Drawing.Size(645, 528); - this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.SystemColors.Control; - this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tabControlPanel1.Style.GradientAngle = 90; - this.tabControlPanel1.TabIndex = 1; - this.tabControlPanel1.TabItem = this.tiGeneral; - this.tabControlPanel1.ThemeAware = true; - // - // tiGeneral - // - this.tiGeneral.AttachedControl = this.tabControlPanel1; - this.tiGeneral.Name = "tiGeneral"; - this.tiGeneral.Text = "General"; - this.tiGeneral.Visible = false; - // // tabControlPanel2 // this.tabControlPanel2.DisabledBackColor = System.Drawing.Color.Empty; @@ -1197,6 +1172,31 @@ namespace VEPROMS this.tiStUpMsg.Text = "Startup Message"; this.tiStUpMsg.Visible = false; // + // tabControlPanel1 + // + this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty; + this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControlPanel1.Location = new System.Drawing.Point(0, 27); + this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(2); + this.tabControlPanel1.Name = "tabControlPanel1"; + this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); + this.tabControlPanel1.Size = new System.Drawing.Size(645, 528); + this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.SystemColors.Control; + this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tabControlPanel1.Style.GradientAngle = 90; + this.tabControlPanel1.TabIndex = 1; + this.tabControlPanel1.TabItem = this.tiGeneral; + this.tabControlPanel1.ThemeAware = true; + // + // tiGeneral + // + this.tiGeneral.AttachedControl = this.tabControlPanel1; + this.tiGeneral.Name = "tiGeneral"; + this.tiGeneral.Text = "General"; + this.tiGeneral.Visible = false; + // // cbUCFLForSetOnly // this.cbUCFLForSetOnly.BackColor = System.Drawing.Color.Transparent; @@ -1291,31 +1291,17 @@ namespace VEPROMS this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; // - // cbShwAnnoFilter - // - this.cbShwAnnoFilter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.cbShwAnnoFilter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.cbShwAnnoFilter.Location = new System.Drawing.Point(25, 13); - this.cbShwAnnoFilter.Name = "cbShwAnnoFilter"; - this.cbShwAnnoFilter.Size = new System.Drawing.Size(91, 23); - this.cbShwAnnoFilter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.cbShwAnnoFilter.TabIndex = 0; - this.cbShwAnnoFilter.Text = "Open"; - this.cbShwAnnoFilter.Click += new System.EventHandler(this.cbShwAnnoFilter_Click); - // // frmSysOptions // this.AcceptButton = this.btnOK; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - //this.CancelButton = this.btnCancel; this.ClientSize = new System.Drawing.Size(699, 620); this.ControlBox = false; this.Controls.Add(this.btnReset); this.Controls.Add(this.tcSysOpts); this.Controls.Add(this.panButtons); this.Controls.Add(this.btnOK); - //this.Controls.Add(this.btnCancel); this.DoubleBuffered = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Margin = new System.Windows.Forms.Padding(2); diff --git a/PROMS/VEPROMS User Interface/frmSysOptions.cs b/PROMS/VEPROMS User Interface/frmSysOptions.cs index 10c695f5..7d6fd3a2 100644 --- a/PROMS/VEPROMS User Interface/frmSysOptions.cs +++ b/PROMS/VEPROMS User Interface/frmSysOptions.cs @@ -270,7 +270,7 @@ namespace VEPROMS private void cbStepTypeToolTip_CheckedChanged(object sender, EventArgs e) { Settings.Default.StepTypeToolTip = cbStepTypeToolTip.Checked; - VlnSettings.StepTypeToolType = cbStepTypeToolTip.Checked; + VlnSettings.StepTypeToolTip = cbStepTypeToolTip.Checked; } private void cbTVExpand_CheckedChanged(object sender, EventArgs e) { diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 4e8c5079..2dc29d4b 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -524,7 +524,7 @@ namespace VEPROMS this.Activated += new EventHandler(frmVEPROMS_Activated); - VlnSettings.StepTypeToolType = Settings.Default.StepTypeToolTip; + VlnSettings.StepTypeToolTip = Settings.Default.StepTypeToolTip; VlnSettings.cbShwRplWrdsColor = Settings.Default.cbShwRplWrdsColor; displayLibDocs.PrintRequest += new DisplayLibDocEvent(displayLibDocs_PrintRequest); ContentInfo.InfoChanged += new ContentInfoEvent(RefreshDisplayHistory); @@ -2496,6 +2496,7 @@ namespace VEPROMS // Open procedure in the editor. if (_Procedure == null) continue; //skip and continue with foreach OpenItem(_Procedure); + if (tc.MyEditItem == null) continue; // skip and continue with foreach // SelectedStepTabPanel needs to be set so the print buttons on the ribbon will work. SelectedStepTabPanel = tc.MyEditItem.MyStepPanel.MyStepTabPanel; diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs index 466f6338..36e70e49 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs @@ -2647,8 +2647,8 @@ namespace VEPROMS.CSLA.Library with = with.Replace(@"\ul ", ""); with = with.Replace(@"\ulnone ", ""); } - //if (Properties.Settings.Default.cbShwRplWrdsColor && !(epMode == E_EditPrintMode.Print)) - if (Properties.Settings.Default.cbShwRplWrdsColor && !(epMode == E_EditPrintMode.Print)) + // B2025-050 use VlnSettings so we don't need to restart PROMS + if (VlnSettings.cbShwRplWrdsColor && !(epMode == E_EditPrintMode.Print)) { with = $@"\cf2{with}\cf0 "; } diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 88c6a841..4f02807b 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -37,7 +37,7 @@ namespace VEPROMS.CSLA.Library // Variables in this region are not set in the format files. They are used only in the C# code // when IgnoreUCF is true, get the original data, i.e.don't apply any UCF changes to it - private static bool _IgnoreUCF = false; + private static bool _IgnoreUCF = true; // turn off reading in UCF values when getting format information public static bool IgnoreUCF { get { return PlantFormat._IgnoreUCF; } diff --git a/PROMS/Volian.Base.Library/VlnSettings.cs b/PROMS/Volian.Base.Library/VlnSettings.cs index 2c1c430b..25d4aeaa 100644 --- a/PROMS/Volian.Base.Library/VlnSettings.cs +++ b/PROMS/Volian.Base.Library/VlnSettings.cs @@ -197,7 +197,7 @@ namespace Volian.Base.Library set { VlnSettings._UserID = value; } } private static bool _StepTypeToolTip = false; - public static bool StepTypeToolType + public static bool StepTypeToolTip { get { return VlnSettings._StepTypeToolTip; } set { VlnSettings._StepTypeToolTip = value; } diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs index 8181c1c1..c0fec876 100644 --- a/PROMS/Volian.Controls.Library/EditItem.cs +++ b/PROMS/Volian.Controls.Library/EditItem.cs @@ -201,11 +201,15 @@ namespace Volian.Controls.Library /// public ItemInfo MyItemInfo { - get { return _MyItemInfo; } + get + { + ToolTipOnOff(); //B2025-050 Show the tooltip based on User Options Settings + return _MyItemInfo; + } set { _MyItemInfo = value; - if (VlnSettings.StepTypeToolType) SetToolTip(_MyItemInfo.ToolTip); + SetToolTip(_MyItemInfo.ToolTip); // B2025-050 always set tooltip text. This method will also show the tooltip based on User Options Settings ChangeBar = _MyItemInfo.HasChangeBar; CheckOff co = _MyItemInfo.GetCheckOffStep(); if (co != null && co.UIMark != null) @@ -2977,6 +2981,8 @@ namespace Volian.Controls.Library public abstract void SetText(); public abstract void SetExpandAndExpander(ItemInfo itemInfo); public abstract void SaveCurrentAndContents(); + public abstract void ToolTipOnOff(); + #endregion private int SupInfoTopOffset { diff --git a/PROMS/Volian.Controls.Library/GridItem.cs b/PROMS/Volian.Controls.Library/GridItem.cs index c26e35c3..1a2292cc 100644 --- a/PROMS/Volian.Controls.Library/GridItem.cs +++ b/PROMS/Volian.Controls.Library/GridItem.cs @@ -462,8 +462,12 @@ namespace Volian.Controls.Library DevComponents.DotNetBar.SuperTooltipInfo tpi = new DevComponents.DotNetBar.SuperTooltipInfo("", "", tip, null, null, DevComponents.DotNetBar.eTooltipColor.Lemon); _MyToolTip.MinimumTooltipSize = new Size(0, 24); _MyToolTip.TooltipDuration = 3; - //_MyToolTip.SetSuperTooltip(MyStepRTB, tpi); _MyToolTip.SetSuperTooltip(MyFlexGrid, tpi); + ToolTipOnOff(); // B2025-050 Show the tooltip based on User Options Settings + } + public override void ToolTipOnOff() + { + _MyToolTip.Enabled = VlnSettings.StepTypeToolTip; // B2025-XXX Show the tooltip based on User Options Settings } private bool DoNotRefresh = false; public override void RefreshContent() diff --git a/PROMS/Volian.Controls.Library/ImageItem.cs b/PROMS/Volian.Controls.Library/ImageItem.cs index 698fc85d..879ded63 100644 --- a/PROMS/Volian.Controls.Library/ImageItem.cs +++ b/PROMS/Volian.Controls.Library/ImageItem.cs @@ -9,6 +9,7 @@ using System.IO; using System.Text.RegularExpressions; using VEPROMS.CSLA.Library; using JR.Utils.GUI.Forms; +using Volian.Base.Library; namespace Volian.Controls.Library { @@ -78,7 +79,7 @@ namespace Volian.Controls.Library /// /// Left edge of the PictureBox /// - public override int ContentLeft + override public int ContentLeft { get { return Left + _MyPictureBox.Left; } } @@ -95,8 +96,14 @@ namespace Volian.Controls.Library _MyToolTip.MinimumTooltipSize = new Size(0, 24); _MyToolTip.TooltipDuration = 3; _MyToolTip.SetSuperTooltip(MyPictureBox, tpi); + ToolTipOnOff(); // B2025-050 Show the tooltip based on User Options Settings } - public override void RefreshContent() + public override void ToolTipOnOff() + { + _MyToolTip.Enabled = VlnSettings.StepTypeToolTip; // B2025-XXX Show the tooltip based on User Options Settings + } + + override public void RefreshContent() { IdentifyMe(false); RefreshDisplay(false); diff --git a/PROMS/Volian.Controls.Library/RTBItem.cs b/PROMS/Volian.Controls.Library/RTBItem.cs index 1b09a902..68ef343e 100644 --- a/PROMS/Volian.Controls.Library/RTBItem.cs +++ b/PROMS/Volian.Controls.Library/RTBItem.cs @@ -7,6 +7,7 @@ using System.Text; using System.Text.RegularExpressions; using System.Windows.Forms; using VEPROMS.CSLA.Library; +using Volian.Base.Library; namespace Volian.Controls.Library { @@ -133,6 +134,11 @@ namespace Volian.Controls.Library _MyToolTip.MinimumTooltipSize = new Size(0, 24); _MyToolTip.TooltipDuration = 3; _MyToolTip.SetSuperTooltip(MyStepRTB, tpi); + ToolTipOnOff(); // B2025-050 Show the tooltip based on User Options Settings + } + public override void ToolTipOnOff() + { + _MyToolTip.Enabled = VlnSettings.StepTypeToolTip; // B2025-XXX Show the tooltip based on User Options Settings } public override void RefreshContent() { diff --git a/PROMS/Volian.Controls.Library/RtfRawItem.cs b/PROMS/Volian.Controls.Library/RtfRawItem.cs index d2e5e41e..f7664f98 100644 --- a/PROMS/Volian.Controls.Library/RtfRawItem.cs +++ b/PROMS/Volian.Controls.Library/RtfRawItem.cs @@ -97,6 +97,11 @@ namespace Volian.Controls.Library _MyToolTip.MinimumTooltipSize = new Size(0, 24); _MyToolTip.TooltipDuration = 3; _MyToolTip.SetSuperTooltip(MyStepRTB, tpi); + ToolTipOnOff(); // B2025-050 Show the tooltip based on User Options Settings + } + public override void ToolTipOnOff() + { + _MyToolTip.Enabled = VlnSettings.StepTypeToolTip; // B2025-XXX Show the tooltip based on User Options Settings } public override void RefreshContent() {