Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

C2022-003-Change-Textboxes-to-RTF-3 #701

Open
plarsen wants to merge 28 commits from C2022-003-Change-Textboxes-to-RTF-3 into Development
pull from: C2022-003-Change-Textboxes-to-RTF-3
merge into: Volian:Development
Conversation 10 Commits 28 Files Changed 20 +1444 -712
plarsen commented 2026-02-03 13:33:16 -05:00
Owner
Copy Link

C2022-003 The symbols that can be entered into the PROMS editor should be added to the RO editor.

C2022-003 The symbols that can be entered into the PROMS editor should be added to the RO editor.
C2022-003 The symbols that can be entered into the PROMS editor should be added to the RO editor.docx
1.6 MiB
plarsen self-assigned this 2026-02-03 13:33:16 -05:00
djankowski was assigned by plarsen 2026-02-03 13:33:16 -05:00
jjenko was assigned by plarsen 2026-02-03 13:33:16 -05:00
mschill was assigned by plarsen 2026-02-03 13:33:16 -05:00
mvickers was assigned by plarsen 2026-02-03 13:33:16 -05:00
plarsen added 24 commits 2026-02-03 13:33:17 -05:00
C2022-003-Change-Textboxes-to-RTF-3 563c133676
C2022-003-Change-Textboxes-to-RTF-3 cc66eb5329
C2022-003-Change-Textboxes-to-RTF-3 37b4726925
C2022-003-Change-Textboxes-to-RTF-3 52583a05f6
C2022-003-Change-Textboxes-to-RTF-3 9023cc76a0
C2022-003-Change-Textboxes-to-RTF-3 c561aad661
C2022-003-Change-Textboxes-to-RTF-3 751794c1ec
C2022-003-Change-Textboxes-to-RTF-3 d4ecf28147
C2022-003-Change-Textboxes-to-RTF-3 72c2bd90e4
C2022-003-Change-Textboxes-to-RTF-3 5a2c0460aa
C2022-003-Change-Textboxes-to-RTF-3 99216321a8
C2022-003-Change-Textboxes-to-RTF-3 5e7d2431b3
C2022-003-Change-Textboxes-to-RTF-3 f8865206e9
C2022-003-Change-Textboxes-to-RTF-3 c0651e4e2c
C2022-003-Change-Textboxes-to-RTF-3 447d1f510c
C2022-003-Change-Textboxes-to-RTF-3 ac5e49d0fc
C2022-003-Change-Textboxes-to-RTF-3 d560468f3c
C2022-003-Change-Textboxes-to-RTF-3 5ce168071c
C2022-003-Change-Textboxes-to-RTF-3 0ae45eb918
C2022-003-Change-Textboxes-to-RTF-3 77c6298067
C2022-003-Change-Textboxes-to-RTF-3 35eb05432b
Merge branch 'Development' into C2022-003-Change-Textboxes-to-RTF-3 9e64e5a60e
C2022-003-Change-Textboxes-to-RTF-3 bfdc77da97
Merge remote-tracking branch 'origin/Development' into C2022-003-Change-Textboxes-to-RTF-3 ecaf00c5b3
plarsen requested review from jjenko 2026-02-03 13:46:03 -05:00
plarsen requested review from mschill 2026-02-03 13:46:03 -05:00
mschill approved these changes 2026-02-03 13:50:01 -05:00
Dismissed
mschill left a comment
Owner
Copy Link

As a FYI - I am still seeing changes to StepTabRibbon.designer.cs & StepTabRibbon.resx --- I believe these were to be restored to match dev / i.e. they should not be any changes to these 2 files as part of this project.

As a FYI - I am still seeing changes to StepTabRibbon.designer.cs & StepTabRibbon.resx --- I believe these were to be restored to match dev / i.e. they should not be any changes to these 2 files as part of this project.
mschill requested review from mschill 2026-02-03 13:50:15 -05:00
mschill reviewed 2026-02-03 13:53:04 -05:00
PROMS/Volian.Controls.Library/DisplayRO.resx Outdated
@@ -121,3 +120,3 @@
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="btnSaveRO.SuperTooltip" xml:space="preserve">
mschill commented 2026-02-03 13:53:04 -05:00
Owner
Copy Link

Should this be removed? --- Would check if tooltip for this button still shows appropriately - if so, then this is fine --- if not then this probably shouldn't be removed.

Should this be removed? --- Would check if tooltip for this button still shows appropriately - if so, then this is fine --- if not then this probably shouldn't be removed.
plarsen commented 2026-02-03 15:19:22 -05:00
Author
Owner
Copy Link

It is not used. I am leaving it as is.

It is not used. I am leaving it as is.
mschill marked this conversation as resolved
plarsen added 1 commit 2026-02-03 15:00:31 -05:00
C2022-003-Change-Textboxes-to-RTF-3 879518c4a9
jjenko reviewed 2026-02-03 16:15:03 -05:00
PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs Outdated
@@ -641,0 +626,4 @@
// btnFilter
//
this.btnFilter.Name = "btnFilter";
this.btnFilter.Text = "Tree View Search:";
jjenko commented 2026-02-03 16:15:03 -05:00
Owner
Copy Link

this is missing this.btnFilter.Click += SubmitFilter;

this is missing this.btnFilter.Click += SubmitFilter;
mschill commented 2026-02-04 06:38:32 -05:00
Owner
Copy Link

Agreed - this appears to be intendedly that some code was removed.

Agreed - this appears to be intendedly that some code was removed.
plarsen commented 2026-02-04 09:47:13 -05:00
Author
Owner
Copy Link

I added the missing line last night.

I added the missing line last night.
jjenko reviewed 2026-02-03 16:17:10 -05:00
PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs Outdated
@@ -641,0 +635,4 @@
"ds in the Procedure Number or Title. Press enter or the Tree View Search button " +
"to submit.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.txtFilter.TextBoxWidth = 120;
this.txtFilter.WatermarkColor = System.Drawing.SystemColors.GrayText;
jjenko commented 2026-02-03 16:17:10 -05:00
Owner
Copy Link

in general, this txtFilter code looks different appears to be missing code from the orginal.

in general, this txtFilter code looks different appears to be missing code from the orginal.
mschill commented 2026-02-04 06:38:56 -05:00
Owner
Copy Link

Agreed - this appears to be intendedly that some code was removed.

Agreed - this appears to be intendedly that some code was removed.
plarsen commented 2026-02-04 09:45:00 -05:00
Author
Owner
Copy Link

I added the missing lines last night.

I added the missing lines last night.
jjenko reviewed 2026-02-03 17:27:21 -05:00
PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs Outdated
@@ -1153,6 +1153,7 @@ namespace VEPROMS
//
this.displayRO.CurROLink = null;
this.displayRO.Dock = System.Windows.Forms.DockStyle.Fill;
this.displayRO.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
jjenko commented 2026-02-03 17:27:21 -05:00
Owner
Copy Link

not sure why adding this font reference is needed. assume this was one of those automatic things Visual Studio did. Probably OK to keeep.

not sure why adding this font reference is needed. assume this was one of those automatic things Visual Studio did. Probably OK to keeep.
jjenko reviewed 2026-02-03 17:28:30 -05:00
PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs Outdated
@@ -1170,6 +1171,7 @@ namespace VEPROMS
this.tc.ChgId = null;
this.tc.Dock = System.Windows.Forms.DockStyle.Fill;
this.tc.ForeColor = System.Drawing.SystemColors.ControlText;
this.tc.IsInEditorialMode = false;
jjenko commented 2026-02-03 17:28:30 -05:00
Owner
Copy Link

this wasn't in original. assume this was some automatic thing from visual studio

this wasn't in original. assume this was some automatic thing from visual studio
jjenko requested changes 2026-02-03 17:42:53 -05:00
Dismissed
jjenko left a comment
Owner
Copy Link

I don't think that the files StepTabRibbon.designer.cs and StepTabRibbon.resx should be include in this push, in that StepTabRibbon.cs was not changed.

I don't think that the files StepTabRibbon.designer.cs and StepTabRibbon.resx should be include in this push, in that StepTabRibbon.cs was not changed.
plarsen added 2 commits 2026-02-03 22:05:55 -05:00
Merge remote-tracking branch 'origin/Development' into C2022-003-Change-Textboxes-to-RTF-3 5c0f11aea1
C2022-003-Change-Textboxes-to-RTF-3 12f175740f
mschill requested changes 2026-02-04 07:41:39 -05:00
Dismissed
mschill left a comment
Owner
Copy Link

major - It appears there are some unintended changes to several files. I recommend undoing the changes to: frmVEPROMS.Designer.cs, frmVEPROMS.resx, StepTabRibbon.designer.cs, & StepTabRibbon.resx

minor - I recommend reviewing these to understand for future code but not necessarily changing currently in order to not hold up this project further.

  • FieldCombForm.cs - 2 minor items (1 performance related, 1 code maintainability related)
  • ROEditor.cs - a few minor items (1 code maintainability/formatting related, several duplicate code)
major - It appears there are some unintended changes to several files. I recommend undoing the changes to: frmVEPROMS.Designer.cs, frmVEPROMS.resx, StepTabRibbon.designer.cs, & StepTabRibbon.resx minor - I recommend reviewing these to understand for future code but not necessarily changing currently in order to not hold up this project further. - FieldCombForm.cs - 2 minor items (1 performance related, 1 code maintainability related) - ROEditor.cs - a few minor items (1 code maintainability/formatting related, several duplicate code)
PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldCombFrm.cs
@@ -280,6 +281,7 @@ namespace ROEditor
this.tbXYPlotWid.Size = new System.Drawing.Size(40, 22);
this.tbXYPlotWid.TabIndex = 11;
this.tbXYPlotWid.Text = "";
this.tbXYPlotWid.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
mschill commented 2026-02-04 06:10:52 -05:00
Owner
Copy Link

minor ---- in the future, would recommend

tbXYPlotWid.KeyDown += txtBox_KeyDown;

as we noticed that sometimes the designer does not like the new KeyPressEventHandler

see email from mschill@volian.com from "Thu 1/29/2026 7:38 AM" titled "RE: Do either of you get this when displaying the frmveproms form designer?"

Since this is minor, I will not be mentioning this in other places / files - I am simply mentioning it here so there is awareness for future projects/code changes.

minor ---- in the future, would recommend tbXYPlotWid.KeyDown += txtBox_KeyDown; as we noticed that sometimes the designer does not like the new KeyPressEventHandler see email from mschill@volian.com from "Thu 1/29/2026 7:38 AM" titled "RE: Do either of you get this when displaying the frmveproms form designer?" Since this is minor, I will not be mentioning this in other places / files - I am simply mentioning it here so there is awareness for future projects/code changes.
KeyPress_Email.jpg
375 KiB
KeyPress_Email.jpg
PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldCombFrm.cs
@@ -589,0 +598,4 @@
string clpBrd = Clipboard.GetText();
if (clpBrd.Any(c => c > 166))
{
MessageBox.Show("Symbols are not allowed in the field. Clipbroad: '" + clpBrd + "'");
mschill commented 2026-02-04 06:20:22 -05:00
Owner
Copy Link

minor - Performance String Concatenation

This is minor since it is not in a loop - but every time you add strings together it creates a string for each piece added together then destroys and re-creates when added. In a loop or when doing a lot of it, a stringbuilder is recommended. If it is one line and you simply want to put a variable into the string then string interpolation is the recommended way. SonarLint will even do a recommendation and can fix it for you (see screenshot attached).

with string interpolation this would look like:
MessageBox.Show("Symbols are not allowed in the field. Clipbroad: '{clpBrd)'");

you could also technically use string.format to create the interpolated string.

Since this is minor, I will not be mentioning this in other places / files - I am simply mentioning it here so there is awareness for future projects/code changes.

minor - Performance String Concatenation This is minor since it is not in a loop - but every time you add strings together it creates a string for each piece added together then destroys and re-creates when added. In a loop or when doing a lot of it, a stringbuilder is recommended. If it is one line and you simply want to put a variable into the string then string interpolation is the recommended way. SonarLint will even do a recommendation and can fix it for you (see screenshot attached). with string interpolation this would look like: MessageBox.Show("Symbols are not allowed in the field. Clipbroad: '{clpBrd)'"); you could also technically use string.format to create the interpolated string. Since this is minor, I will not be mentioning this in other places / files - I am simply mentioning it here so there is awareness for future projects/code changes.
String_concat.jpg
101 KiB
String_concat.jpg
PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs
@@ -372,3 +384,4 @@
private System.Windows.Forms.TreeView roTreeView;
private System.Windows.Forms.ListView roListView;
private System.Windows.Forms.ToolBar tbar;
mschill commented 2026-02-04 06:43:45 -05:00
Owner
Copy Link

minor formatting / spacing concerns still remain - since we have previously discussed and mentioned these, will leave as-is.

minor formatting / spacing concerns still remain - since we have previously discussed and mentioned these, will leave as-is.
PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs
@@ -1674,0 +1818,4 @@
this.Controls.Add(this.panel1);
this.Controls.Add(this.splitter1);
this.Controls.Add(this.roTreeView);
//this.Controls.Add(this.tbar);
mschill commented 2026-02-04 06:46:33 -05:00
Owner
Copy Link

minor - remove commented out code

minor - remove commented out code
PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs
@@ -2609,2 +2754,2 @@
tbtnSave.Enabled = false;
tbtnSaveAs.Enabled = false;
duplicate_active = false;
mschill commented 2026-02-04 06:58:46 -05:00
Owner
Copy Link

minor - duplicate code - this line is in here twice -lines 2755 & 2761

minor - duplicate code - this line is in here twice -lines 2755 & 2761
PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs
@@ -2729,2 +2876,2 @@
tbtnSave.Enabled = false;
tbtnSaveAs.Enabled = false;
menuROSave.Enabled = false;
mschill commented 2026-02-04 06:56:48 -05:00
Owner
Copy Link

minor - this line is here twice - duplicate code - see lines 2877 & 2884

minor - this line is here twice - duplicate code - see lines 2877 & 2884
PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs
@@ -2808,2 +2958,2 @@
tbtnSaveAs.Enabled = false;
tbtnDuplicate.Enabled = true;
duplicate_active = false;
mschill commented 2026-02-04 06:59:56 -05:00
Owner
Copy Link

minor - duplicate code --- this line is here twice - lines 2959 & 2966

minor - duplicate code --- this line is here twice - lines 2959 & 2966
PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs Outdated
@@ -641,0 +634,4 @@
this.superTooltip1.SetSuperTooltip(this.txtFilter, new DevComponents.DotNetBar.SuperTooltipInfo("Filter", "", "This will filter the Procedure Tree in PROMS to Procedures containing entered wor" +
"ds in the Procedure Number or Title. Press enter or the Tree View Search button " +
"to submit.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.txtFilter.TextBoxWidth = 120;
mschill commented 2026-02-03 14:00:09 -05:00
Owner
Copy Link

Are we removing functionality? ----- noticed we removed the this.txtFilter.TextBox.KeyPress?

Are we removing functionality? ----- noticed we removed the this.txtFilter.TextBox.KeyPress?
mschill commented 2026-02-03 14:02:20 -05:00
Owner
Copy Link

looks like there are other changes also?

like:
this.btnFilter.Click
&
this.txtFilter.TextBox.Font

now missing?

looks like there are other changes also? like: this.btnFilter.Click & this.txtFilter.TextBox.Font now missing?
PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs
@@ -1153,6 +1158,7 @@ namespace VEPROMS
//
this.displayRO.CurROLink = null;
this.displayRO.Dock = System.Windows.Forms.DockStyle.Fill;
this.displayRO.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
mschill commented 2026-02-04 06:37:40 -05:00
Owner
Copy Link

minor - It looks like this is already being done in displayRO?

major - As such, since this appears to be the only intended change to frmVEPROMS.Designer.cs, frmVEPROMS.resx and there appear multiple unintended changes to these files, I would recommend not including this in your check in.

minor - It looks like this is already being done in displayRO? major - As such, since this appears to be the only intended change to frmVEPROMS.Designer.cs, frmVEPROMS.resx and there appear multiple unintended changes to these files, I would recommend not including this in your check in.
DisplayRO_font.jpg
135 KiB
DisplayRO_font.jpg
mschill added 1 commit 2026-02-04 10:45:54 -05:00
C2022-003-Change-Textboxes-to-RTF-3 30aedb6eec 
undoing the changes to: frmVEPROMS.Designer.cs, frmVEPROMS.resx, StepTabRibbon.designer.cs, & StepTabRibbon.resx
mschill requested review from mschill 2026-02-04 11:04:00 -05:00
mschill approved these changes 2026-02-04 11:11:48 -05:00
mschill left a comment
Owner
Copy Link

Looks Good.
Will need to wait to merge into Development when ready (we are going to wait until Vogtle 3/4 has gone out).

Once ready, will need to do 1 commit with an update of this branch to bring in any dev changes since last merged. Then this should be able to merge into dev (we may want a quick review for audit sake - though it will really be nothing more than a quick sign off)

Looks Good. Will need to wait to merge into Development when ready (we are going to wait until Vogtle 3/4 has gone out). Once ready, will need to do 1 commit with an update of this branch to bring in any dev changes since last merged. Then this should be able to merge into dev (we may want a quick review for audit sake - though it will really be nothing more than a quick sign off)
jjenko approved these changes 2026-02-04 12:03:14 -05:00
jjenko left a comment
Owner
Copy Link

approving changes.
Will hold on merging into development until after Vogtle release goes out

approving changes. Will hold on merging into development until after Vogtle release goes out
Checking for merge conflicts…
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin C2022-003-Change-Textboxes-to-RTF-3:C2022-003-Change-Textboxes-to-RTF-3
git checkout C2022-003-Change-Textboxes-to-RTF-3
Sign in to join this conversation.
Reviewers
No Reviewers
mschill
jjenko
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
djankowski jjenko lbutler mschill mvickers plarsen
No Assignees plarsen djankowski jjenko mschill mvickers
3 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Volian/SourceCode#701
Delete Branch "C2022-003-Change-Textboxes-to-RTF-3"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?