Compare commits

..

384 Commits

Author SHA1 Message Date
e5d5528b19 B2024-062 printing a procedure that is empty displays the Empty Procedure message. WhenOK button is clicked, PROMS will exit the Print function.. 2024-08-20 10:34:14 -04:00
7713f0cd63 Merge pull request 'B2024-059: Paste source section has bad links.' (#391) from B2024-059 into Development
Reviewed-on: #391
Reviewed-by: Paul Larsen <plarsen@volian.com>
2024-08-15 10:10:13 -04:00
Kathy Ruffing
2711520666 B2024-059: Paste source section has bad links. 2024-08-15 06:51:02 -04:00
Kathy Ruffing
4a6c0ba447 Merge pull request 'B2024-058-RevisionDate-field-Print-dialog' (#390) from B2024-058-RevisionDate-field-Print-dialog into Development
Reviewed-on: #390
Reviewed-by: Kathy Ruffing <kruffing@volian.com>
2024-08-14 12:04:36 -04:00
3f3281e2f4 B2024-058-RevisionDate-field-Print-dialog 2024-08-14 09:37:26 -04:00
0eadd3fe33 B2024-058-RevisionDate-field-Print-dialog 2024-08-13 14:01:38 -04:00
4bf42be80a B2024-058-RevisionDate-field-Print-dialog 2024-08-13 10:05:05 -04:00
d7f829737a B2024-058-RevisionDate-field-Print-dialog 2024-08-08 15:21:11 -04:00
25cc62c7c6 Merge pull request 'F2024-069-Procedure-Set-Specific-Information-dialog-ajustments' (#388) from F2024-069-Procedure-Set-Specific-Information-dialog-ajustments into Development
changes good. ready for testing
2024-08-08 14:13:28 -04:00
47596c7bca Merge pull request 'F2024-067 - Updates to VCSummer for time sensitive stes (clock)' (#387) from F2024-067 into Development
format change ready for testing
2024-08-08 14:12:05 -04:00
7129853902 F2024-069-Procedure-Set-Specific-Information-dialog-ajustments 2024-08-08 13:33:16 -04:00
Kevin Laskey
f08466f702 Merge pull request 'B2024-038: tree view menuing for paste/replace of sections' (#386) from B2024-038 into Development
Reviewed-on: #386
Reviewed-by: Kevin Laskey <klaskey@volian.com>
2024-08-08 10:18:27 -04:00
4248d40917 B2024-058-RevisionDate-field-Print-dialog 2024-08-08 09:27:27 -04:00
Kathy Ruffing
7cf28366f4 B2024-038: tree view menuing for paste/replace of sections 2024-08-08 09:01:31 -04:00
037c82e22e Merge pull request 'F2024-068-VCS-Deviation-Format' (#385) from F2024-068-VCS-Deviation-Format into Development
ok for testing phase
2024-08-08 08:29:10 -04:00
6de13b12f9 F2024-068-VCS-Deviation-Format 2024-08-07 21:59:59 -04:00
cf69aa93e6 Merge pull request 'B2024-057 - Updated sizes of tooltips in delete area of admin' (#384) from B2024-057 into Development
OK for testing
2024-08-07 15:22:41 -04:00
Kevin Laskey
4b915b78b6 B2024-057 - Updated sizes of tooltips in delete area of admin 2024-08-07 14:37:31 -04:00
Kevin Laskey
a891a62ffa F2024-067 - Updates to VCSummer for time sensitive stes (clock) 2024-08-07 14:15:57 -04:00
7a768484a1 Merge pull request 'B2024-057' (#382) from B2024-057 into Development
approved, ready for testing
2024-08-06 11:18:30 -04:00
Kevin Laskey
5f7af3309d B2024-054 - Update Annotation tooltip 2024-08-06 11:17:17 -04:00
Kevin Laskey
1f3a1dabbc B2024-055 - Update tooltips for the labels on delete annotations and delete folders 2024-08-06 10:58:04 -04:00
Kevin Laskey
4b61495960 B2024-057 - updated curors 2024-08-06 10:48:05 -04:00
Kevin Laskey
d091a37171 B2024-055 - Update tooltips on admin delete functions 2024-08-06 10:29:06 -04:00
Kevin Laskey
189b78d7d3 B2024-057 - Added check to see if anything is checked out for annotations and folder delete from admin area. 2024-08-06 09:14:36 -04:00
8ee7a31b97 Merge pull request 'C2024-018 - Update to use results pane' (#381) from C2024-018 into Development
approved and ready for testing phase
2024-08-05 15:29:46 -04:00
Kevin Laskey
055be66421 C2024-018 - Update to use results pane 2024-08-05 15:24:43 -04:00
86a3e56a27 Merge pull request 'C2024-018 - Updated fixes per Michelle testing. Added some confirmation messages' (#380) from C2024-018 into Development
changes approved. - ready for testing phase
2024-08-05 12:12:05 -04:00
Kevin Laskey
0db98e4182 C2024-018 - Updated fixes per Michelle testing. Added some confirmation messages 2024-08-05 11:12:21 -04:00
3102596a3d Merge pull request 'C2021-059_deleteFolders' (#379) from C2021-059_deleteFolders into Development
code changes look good.  - on to testing phase
2024-08-02 14:05:24 -04:00
Kevin Laskey
41aa195785 C2021-059 - Added extra code to ensure delect sets parent tree items deslected 2024-08-02 13:08:19 -04:00
Kevin Laskey
954186265e C2021-059 - Patch in auto checkbox filling for delete tree. 2024-08-02 12:56:12 -04:00
Kevin Laskey
33cced07c6 C2021-059 Added veProms connection to remove the node in the main tree 2024-08-02 10:31:50 -04:00
Kevin Laskey
afbf6f360d C2021-059 - Updates to get build moving after custom merging 2024-08-02 10:13:05 -04:00
Kevin Laskey
df2be585a1 C2021-059 - Moved updates to branch 2024-08-01 15:54:28 -04:00
Kevin Laskey
c81f527cb8 C2021-059 - Update Proms Fixes 2024-08-01 15:05:42 -04:00
0f67382c27 Merge pull request 'B2024-054_Update_Tool_tip_text_for_delete_annotations' (#375) from B2024-054_Update_Tool_tip_text_for_delete_annotations into Development
changes look good - onto testing phase
2024-08-01 11:07:59 -04:00
b42b8ddfa3 B2024-054_Update_Tool_tip_text_for_delete_annotations 2024-08-01 10:42:53 -04:00
f3efd409c6 Merge pull request 'B2024-053_Submitted_for_Admin_Tools-Delete' (#372) from B2024-053_Submitted_for_Admin_Tools-Delete into Development
passed code review - on to testing phase.
2024-07-31 14:41:13 -04:00
9011b134d6 B2024-053_Submitted_for_Admin_Tools-Delete 2024-07-31 14:34:49 -04:00
7c33bad362 Merge pull request 'B2024-052-In-Annotations-pop-up-no-Annotation-type-should-be-selected-by-default' (#371) from B2024-052-In-Annotations-pop-up-no-Annotation-type-should-be-selected-by-default into Development
changes look good - onto testing phase
2024-07-31 09:49:30 -04:00
Kevin Laskey
e49a4d674f Merge pull request 'B2024-045, B2024-049, B2024-050 crash on paste/replace' (#370) from B2024-045 into Development
Reviewed-on: #370
Reviewed-by: Kevin Laskey <klaskey@volian.com>
2024-07-31 09:48:50 -04:00
7872f192ed B2024-052-In-Annotations-pop-up-no-Annotation-type-should-be-selected-by-default 2024-07-31 09:23:34 -04:00
Kathy Ruffing
870bba0aa6 B2024-045, B2024-049, B2024-050 crash on paste/replace 2024-07-31 07:21:30 -04:00
35c7b2b0cf Merge pull request 'B2024-051 Added null checks in the MultiUser.cs file to handle when a user as access to a procedure set that no longer exists.' (#369) from B2024-051 into Development
Reviewed-on: #369
2024-07-30 15:46:21 -04:00
9e6c8acca4 B2024-051 Added null checks in the MultiUser.cs file to handle when a user as access to a procedure set that no longer exists. 2024-07-30 14:48:34 -04:00
099bbdd328 Merge pull request 'B2024-043-Fix-User-Tab2' (#368) from B2024-043-Fix-User-Tab2 into Development
changes look good. onto the testing phase
2024-07-30 10:38:31 -04:00
720c5db2d0 B2024-043-Fix-User-Tab2 2024-07-30 10:09:40 -04:00
659833c5bf Merge pull request 'C2024-016-Annotations-Delete-Info-to-results-panel' (#366) from C2024-016-Annotations-Delete-Info-to-results-panel into Development
changes OK. ready to create test exe.
2024-07-29 14:12:10 -04:00
5ea9bcdd8b C2024-016-Annotations-Delete-Info-to-results-panel 2024-07-29 12:52:29 -04:00
3ec7c11797 Merge pull request 'C2024-017 Removed old (not implemented) format variables and settings from the format files and removed incomplete references to them in the C# code. Also added descriptions of the used format variables in the C# code that hooks the XML format files t…' (#364) from C2024-017_RemoveUnUsedFormatItems into Development
format cleanup. any code changes were to add comments (description of format variables) and to remove commented out and un-used code.
2024-07-26 14:57:56 -04:00
7f899175d1 C2024-017 Removed old (not implemented) format variables and settings from the format files and removed incomplete references to them in the C# code. Also added descriptions of the used format variables in the C# code that hooks the XML format files to the PROMS C# logic. 2024-07-26 14:54:11 -04:00
112edd1c8a Merge pull request 'B2024-048-Annotations-Cleanup-tools-tips' (#363) from B2024-048-Annotations-Cleanup-tools-tips into Development
changes are good. ready for testing phase
2024-07-26 10:57:20 -04:00
819c1bbec4 B2024-048-Annotations-Cleanup-tools-tips 2024-07-26 09:38:25 -04:00
6b6968561b B2024-048-Annotations-Cleanup-tools-tips 2024-07-25 08:13:20 -04:00
24fbb69e25 Merge pull request 'B2024-047-Fix-Size-Treeview-In-Link-Tab-Admin-Tools' (#361) from B2024-047-Fix-Size-Treeview-In-Link-Tab-Admin-Tools into Development
ready for testing phase
2024-07-24 16:28:04 -04:00
79751732a3 B2024-047-Fix-Size-Treeview-In-Link-Tab-Admin-Tools 2024-07-24 16:11:52 -04:00
e6e62ed2c8 Merge pull request 'B2024-046-Set-Default-Tab-In-Admin-Tools' (#360) from B2024-046-Set-Default-Tab-In-Admin-Tools into Development
change looks good to continue with testing phase.
2024-07-24 10:44:56 -04:00
8f2cbf4081 B2024-046-Set-Default-Tab-In-Admin-Tools 2024-07-24 10:37:59 -04:00
Kathy Ruffing
c25f501909 Merge pull request 'B2024-042 - When replacing a procedure, this change will now replace the procedure correctly and add it to the tree node, previously it would replace th eprocedure, then add a whole new procedure to the node, incorrectly using the copy procedure which …' (#358) from B2024-042 into Development
Reviewed-on: #358
Reviewed-by: Kathy Ruffing <kruffing@volian.com>
2024-07-22 09:45:17 -04:00
Kevin Laskey
bf72a6bf78 B2024-042 - Update TreeNodeReplace section when adding a node to working draft (remove unneeded code) 2024-07-22 09:39:13 -04:00
Kevin Laskey
a1380dbb8a B2024-042 - When replacing a procedure, this change will now replace the procedure correctly and add it to the tree node, previously it would replace th eprocedure, then add a whole new procedure to the node, incorrectly using the copy procedure which appended "copy of". 2024-07-18 14:06:01 -04:00
Kathy Ruffing
501798a8cb Merge pull request 'C2024-005-Annotations-Cleanup-2' (#355) from C2024-005-Annototions-Cleanup-2 into Development
Reviewed-on: #355
Reviewed-by: Kathy Ruffing <kruffing@volian.com>
Code reviewed successfully
2024-07-18 11:39:12 -04:00
a240bc2c19 C2024-005-Annotations-Cleanup-2 2024-07-18 11:31:49 -04:00
a804a3866a C2024-005-Annotations-Cleanup-2 2024-07-18 11:12:30 -04:00
069ffb80e9 C2024-005-Annotations-Cleanup-2 2024-07-17 14:28:24 -04:00
Kevin Laskey
5255080291 Merge pull request 'B2022-118: search of multi value ROs fails' (#354) from B2022-118 into Development
Reviewed-on: #354
2024-07-17 10:56:40 -04:00
Kathy Ruffing
ae35d9f0d7 B2022-118: search of multi value ROs fails 2024-07-17 10:11:43 -04:00
afbd653611 Merge pull request 'B2024-041 - Update PromsFixes SQL file to acocunt for replacing vs pasting procs' (#352) from B2024-041_v2 into Development
good for testing phase
2024-07-16 16:27:35 -04:00
Kevin Laskey
9a55111e1e B2024-041 - Update PromsFixes SQL file to acocunt for replacing vs pasting procs 2024-07-16 16:20:21 -04:00
422a3053b7 Merge pull request 'B2024-039 Customer reported that transitions to standard text get converted to text when the Refresh Transitions is done from the Admin Tools' (#350) from B2024-039_BNPP_StdtxtTrans into Development
format only changes
2024-07-12 14:16:22 -04:00
feb74ee09f B2024-039 Customer reported that transitions to standard text get converted to text when the Refresh Transitions is done from the Admin Tools 2024-07-12 14:14:23 -04:00
7cebb2b7f1 Merge pull request 'B2024-037: Bug fix for copy/replace functionality on procedures and steps.' (#349) from B2024-037 into Development
changes look good. OK for testing phase.
2024-07-11 10:54:10 -04:00
Kevin Laskey
8097c6283c B2024-037 - Update versioning on proms fixes 2024-07-11 10:30:31 -04:00
Kevin Laskey
8f08ef5ee4 B2024-037 - Slight clean up on parentedititme 2024-07-11 08:45:18 -04:00
Kevin Laskey
fd26f16776 B2024-037 Include proms sql fixes for copy replace functionality 2024-07-10 14:53:20 -04:00
Kevin Laskey
21a83df99d B2024-037 - Fixes made for replacing procs and steps via paste/replace functionality. 2024-07-10 12:15:14 -04:00
616acf0e37 Merge pull request 'F2024-065 - Turned off the CapRoIfLastLower flag in all of the Beaver Valley formats F2024-066 - Turned off the Replace Words feature in EOP, “without Issue Number”, and the SAMG Background formats' (#347) from F2024-065-066-BeaverValley into Development
Format only changes
2024-07-03 10:08:45 -04:00
3cff87cf97 F2024-065 - Turned off the CapRoIfLastLower flag in all of the Beaver Valley formats F2024-066 - Turned off the Replace Words feature in EOP, “without Issue Number”, and the SAMG Background formats 2024-07-03 10:01:03 -04:00
Kathy Ruffing
9202d903a5 Merge pull request 'F2024-064: underline and spacing of section titles' (#345) from F2024-064 into Development
Reviewed-on: #345
2024-07-01 09:27:34 -04:00
Kathy Ruffing
a9a9a56c09 F2024-064: underline and spacing of section titles 2024-07-01 09:15:42 -04:00
aee7819a9c Merge pull request 'C2024-013: On print dialog, disable Merge button if creating hyperlinks' (#343) from C2024-013 into Development
code changed reviewed and can proceed to testing phase
2024-06-25 13:42:33 -04:00
Kathy Ruffing
d3bc1c4725 C2024-013: On print dialog, disable Merge button if creating hyperlinks 2024-06-25 12:14:26 -04:00
d0474b22f9 Merge pull request 'C2022-029 - Export Single Procedure (Overwrite/Rename/Cancel)' (#341) from C2022-029 into Development
passed code review. ready for testing phase
2024-06-20 10:02:52 -04:00
5bd1f94be0 Merge pull request 'C2024-004' (#339) from C2024-004 into Development
code changes look good. ready for testing phase.
2024-06-19 14:12:03 -04:00
Kevin Laskey
629fe1b615 Updated to include passing teh selected tree node parent for cases where the only procedure in a folder is being replaced. otherwise i pass null for that as its not really used. 2024-06-19 13:50:52 -04:00
Kevin Laskey
c92b888ec2 Update to close the procedure when opened during the paste/replace option. 2024-06-18 10:48:28 -04:00
5df42daa71 Merge pull request 'C2019-047' (#337) from C2019-047 into Development
changes approved.  Ready for testing phase
2024-06-14 13:24:51 -04:00
Kevin Laskey
9349396d9a Updates to display tags page for inital load of RO images and other images, updates to set some pre values for resizing and ratios. 2024-06-14 11:46:08 -04:00
Kevin Laskey
38425a05f9 Updates to pass through image details to the tag setting. 2024-06-13 15:14:35 -04:00
Kevin Laskey
9d1b99b08e Update 2024-06-13 09:00:49 -04:00
Kevin Laskey
4f7a762bf1 Updated to use modified date, shortened code a bit. 2024-06-13 08:35:13 -04:00
Kevin Laskey
11cb2e0efd Updated message 2024-06-07 15:14:33 -04:00
78f58bea19 Merge pull request 'C2019-047 - Show figure size under tags when adding a new figure.' (#336) from C2019-047 into Development
changes are good. ready for testing phase.
2024-06-07 15:04:14 -04:00
Kevin Laskey
a2e830d0c3 Update for "cancel" button action 2024-06-07 14:42:26 -04:00
Kevin Laskey
2ffab17caf Updates for adding custom buttons 2024-06-07 14:17:43 -04:00
Kevin Laskey
49aba5c67b update 2024-06-07 10:34:46 -04:00
1b24177b68 Merge pull request 'B2024-036 - Removed Print button from V Menu' (#334) from B2024-036 into Development
Code changes look good.  OK to generate test exe.
2024-06-06 08:59:41 -04:00
bf7a967633 Merge pull request 'F2024-063 Beaver Valley requested that the section number be underlined at the top of the pages of the Two Column Attachment section and an extra space was added between the top continue message and first line of step text on that page.' (#333) from F2024-063_BeaverValley into Development
format only change. OK to move to testing phase.
2024-06-05 16:26:57 -04:00
f5669e50a8 F2024-063 Beaver Valley requested that the section number be underlined at the top of the pages of the Two Column Attachment section and an extra space was added between the top continue message and first line of step text on that page. 2024-06-05 16:27:08 -04:00
Kevin Laskey
2ae0d0d454 Update to ensure some size is presetned for the figure when adding a new. 2024-06-05 10:48:51 -04:00
Kevin Laskey
241785846e Update for displaying when a figure is selected or added (as opposed to a step or some other type of option) 2024-06-04 11:55:17 -04:00
Kevin Laskey
0d6fd6950c C2019-047 - Show the figure size adjustment panel before a figure is selected or inserted, so that they dont have to open/close the area to see it. 2024-06-04 09:18:58 -04:00
Kevin Laskey
bb99d6444c B2024-036 - Removed Print button from V Menu 2024-06-04 09:05:22 -04:00
Kevin Laskey
db4f114caf C2022-029 - Export Import changes, Set path automatically for single proc export, provide overwrite message on single prompt export. 2024-06-04 08:51:57 -04:00
80d83da9c9 Merge pull request 'B2024-035-Overwrite-settings.' (#331) from B2024-035 into Development
OK to generate test exe.
2024-05-29 16:56:39 -04:00
54e02e6263 B2024-035-Overwrite-settings. 2024-05-29 15:30:25 -04:00
c4af911f15 Merge pull request 'F2024-062 Removed the Unit number that was mistakenly added to the procedure steps section header.' (#330) from F2024-062_BNPP into Development
format only change.
2024-05-23 14:20:46 -04:00
f9690ee772 F2024-062 Removed the Unit number that was mistakenly added to the procedure steps section header. 2024-05-23 14:19:14 -04:00
623c6a7941 Merge pull request 'B2024-034 Fix "Overwrite PDF File" functionality in Print Dialog Box' (#329) from B2024-034 into Development
passed code review and ready for testing
2024-05-22 16:09:56 -04:00
7a5129208c B2024-034 Fix Overwrite PDF File. 2024-05-22 16:08:12 -04:00
e15c56f1e2 Merge pull request 'B2024-023: UI fixes for insert section with associated enhanced section' (#328) from B2024-023 into Development
ready to be tested
2024-05-22 09:04:55 -04:00
Kathy Ruffing
5d808e436a B2024-023: UI fixes for insert section with associated enhanced section 2024-05-22 08:51:22 -04:00
20e40a5c49 Merge pull request 'F2024-061 Added an AOP Deviation format for Beaver Valley.' (#326) from F2024-061 into Development
format only change
2024-05-20 10:57:51 -04:00
885dae812d F2024-061 Added an AOP Deviation format for Beaver Valley. 2024-05-20 10:56:13 -04:00
35bd91f7e8 Merge pull request 'F2024-060 For the Byron and Braidwood formats, adjusted the text widths on the edit screen to be closer to that of which is printed.' (#324) from F2024-060_ByBwd_Bckgnd into Development
format only change
2024-05-16 14:58:23 -04:00
305f2768bb F2024-060 For the Byron and Braidwood formats, adjusted the text widths on the edit screen to be closer to that of which is printed. 2024-05-16 14:58:09 -04:00
5f733161c6 Merge pull request 'C2024-001-Update-Baseline-Auto-Testing' (#322) from C2024-011 into Development
passed code review
2024-05-16 11:44:32 -04:00
4fc13acd1a Merge pull request 'B2024-030 On the Working Draft properties page, added a check to see if we need to create the folder(s) for the path typed into the PDF Location text box.' (#320) from B2024-030_SetOuptputPath into Development
Reviewed-on: #320
2024-05-14 15:41:41 -04:00
365f6a23c8 B2024-030 On the Working Draft properties page, added a check to see if we need to create the folder(s) for the path typed into the PDF Location text box. 2024-05-14 14:24:01 -04:00
331d5751c3 C2024-001-Update-Baseline-Auto-Testing 2024-05-14 11:41:45 -04:00
dfb965edbc Merge pull request 'B2024-028 consistent paste menuing in enhanced set' (#319) from B2024-028 into Development
good to test
2024-05-14 10:20:00 -04:00
Kathy Ruffing
c7cc69fd73 B2024-028 consistent paste menuing in enhanced set 2024-05-14 10:09:20 -04:00
d187aa885d Merge pull request 'B2024-032 Fix Click Quick Print' (#318) from B2024-032 into Development
code OK to be tested
2024-05-13 08:46:14 -04:00
b1b4535d9b B2024-032 Fix Click Quick Print 2024-05-12 16:42:24 -04:00
b085a727f0 Merge pull request 'B2024-031Fix for Transitions hyperlinks in PDFs' (#317) from B2024-031_PDF_HyperLinks_Fix into Development
Reviewed-on: #317
2024-05-10 07:46:43 -04:00
e548e1da63 B2024-031Fix for Transitions hyperlinks in PDFs 2024-05-09 16:47:52 -04:00
c320634d3d Merge pull request 'C2024-010' (#316) from C2024-010 into Development
OK to generate test executable
2024-05-09 15:25:55 -04:00
af889a8818 C2024-010 Add quick print to tabstepribbonReview 2024-05-09 14:10:16 -04:00
c265975cbe C2024-010 Add quick print to tabstepribbonReview 2024-05-08 17:32:06 -04:00
a41a398e7e Merge pull request 'B2024-026: page number transitions duplicate page number' (#314) from B2024-026 into Development
ready to build for testing
2024-05-08 13:53:13 -04:00
Kathy Ruffing
5edaf30601 B2024-026: page number transitions duplicate page number 2024-05-08 12:07:11 -04:00
df0c5259c0 Merge pull request 'C2024-007 When link information is created in a PDF during print, the link information includes the PDF file name of where the link is referencing. Logic was added to include any file prefix or suffix to the PDF file name that is saved in the link info…' (#313) from PDFLinks_Fix into Development
Reviewed-on: #313
2024-05-08 09:49:17 -04:00
10c25dbe44 C2024-007 When link information is created in a PDF during print, the link information includes the PDF file name of where the link is referencing. Logic was added to include any file prefix or suffix to the PDF file name that is saved in the link information so the Adobe can locate the file and open it when the use clicks on the link in the PDF. 2024-05-08 09:00:58 -04:00
2df37533a8 Merge pull request 'F2024-059 Customer requested an Asterisk Single Spaced List sub-step type. This was added to all Calaway formats' (#312) from F2024-059_Callaway into Development
format only changes
2024-05-07 16:07:55 -04:00
6392ee3f0f F2024-059 Customer requested an Asterisk Single Spaced List sub-step type. This was added to all Calaway formats 2024-05-07 16:00:36 -04:00
96ddce8b73 Merge pull request 'B2024-029 A newer version of Component One Flex Grid caused issues when creating a new table in PROMS. We are reverting back to the prior version of Flex Grid.' (#310) from GeneralDebugging into Development
no code review needed. Testing Source Control Document will satisfy QA.
2024-05-07 14:34:49 -04:00
c88caefe5d B2024-029 A newer version of Component One Flex Grid caused issues when creating a new table in PROMS. We are reverting back to the prior version of Flex Grid. 2024-05-07 14:32:57 -04:00
eb26b7a123 Merge pull request 'B2024-025 Older Parent/Child procedure sets use applicability tokens that do not include the “U-“ prefix.' (#309) from B2024-025_ApplicabilityTokens into Development
Reviewed-on: #309
2024-05-06 15:02:56 -04:00
c865b67398 B2024-025 Older Parent/Child procedure sets use applicability tokens that do not include the “U-“ prefix. 2024-05-06 13:49:03 -04:00
89814777b4 Merge pull request 'F2024-057 F2024-058 bullet symbom in ERG note, Allow the insert of sub-steps in Notes and Cautions' (#308) from GeneralDebugging into Development
format only change.
2024-04-26 16:21:23 -04:00
de7e2d5f2a F2024-057 F2024-058 bullet symbom in ERG note, Allow the insert of sub-steps in Notes and Cautions 2024-04-26 16:18:51 -04:00
f51866236f Merge pull request 'B2024-024 - Fixes issue when creating an Approved procedure import file (from Versions context menu) from a non-Parent/Child procedure set.' (#306) from GeneralDebugging into Development
Reviewed-on: #306
2024-04-26 10:08:30 -04:00
a9eec83382 B2024-024 - Fixes issue when creating an Approved procedure import file (from Versions context menu) from a non-Parent/Child procedure set. 2024-04-25 16:32:20 -04:00
fd5739bbcd Merge pull request 'C2023-006 Add time / eidt time to showing change bars.' (#305) from C2023-006 into Development
code review successful. OK to create test exe's
2024-04-24 14:06:47 -04:00
076e0bfe8e C2023-006 Add time / eidt time to showing change bars. 2024-04-24 13:41:15 -04:00
07d10c571b Merge pull request 'F2024-056 Centered the AND and OR separators in the PROMS User Manual single column format.' (#304) from GeneralDebugging into Development
format only change
2024-04-24 11:16:17 -04:00
20cbff0255 F2024-056 Centered the AND and OR separators in the PROMS User Manual single column format. 2024-04-24 11:15:31 -04:00
b643f7fdf8 Merge pull request 'F2024-054 F2024-055 Added a Dashed Double Spaced List and a Dashed Explicit OR sub-step type, Added "NO" to be underlined in ReplaceWords' (#303) from Vogtle3&4 into Development
format only changes.
2024-04-22 15:47:03 -04:00
0607fcf261 F2024-054 F2024-055 Added a Dashed Double Spaced List and a Dashed Explicit OR sub-step type, Added "NO" to be underlined in ReplaceWords 2024-04-22 15:43:31 -04:00
1289e52600 Merge pull request 'C2017-033 Remove text inserted for new step from V button' (#302) from C2017-033 into Development
ready to build for testing
2024-04-19 09:39:47 -04:00
fccc47483f C2017-033 Remove text inserted for new step from V button 2024-04-19 09:29:36 -04:00
5ffd99bd0e Merge pull request 'B2023-025: AER Ro table displays too far to left' (#301) from B2023-025 into Development
Ok to build test exe
2024-04-18 08:42:37 -04:00
Kathy Ruffing
dffea37fad B2023-025: AER Ro table displays too far to left 2024-04-18 08:36:51 -04:00
811076d432 Merge pull request 'C2024-008 -Created a PROMS executable use .Net version 4.8.1' (#299) from dotnet4_8_1 into Development
just build settings - no code review needed.
2024-04-16 14:18:45 -04:00
1bdfb7d1e3 C2024-008 -Created a PROMS executable use .Net version 4.8.1
B2020-106 - Fixed insert of new symbols.
2024-04-16 14:16:40 -04:00
4a3ca1c074 Merge pull request 'C2024-007: Proms form font combo box debug mode displayed by command line arg in debug mode' (#298) from GenWork into Development
Ok to generate exes for testing
2024-04-16 08:40:07 -04:00
Kathy Ruffing
9d50f55f71 C2024-007: Proms form font combo box debug mode displayed by command line arg in debug mode 2024-04-16 08:13:33 -04:00
Kathy Ruffing
b8e8e80acb Merge pull request 'F2024-053: Robinson foldouts printing on Purpose & Attachment sections' (#296) from F2024-053 into Development
Formats: no review needed
2024-04-10 07:14:02 -04:00
Kathy Ruffing
c77320d4e7 F2024-053: Robinson foldouts printing on Purpose & Attachment sections 2024-04-10 07:05:50 -04:00
59bc3141e8 Merge pull request 'removed AssemblyInfo.cs from Git cached' (#294) from GeneralDebugging into Development
no testing needed.
2024-04-05 14:49:59 -04:00
dc73cc3a50 removed AssemblyInfo.cs from Git cached 2024-04-05 14:47:56 -04:00
1433f14a0b Merge pull request 'F2024-052 - Beaver Valley Two Column Format. Allow Notes and Cautions off of sub-steps.' (#293) from F2024-052_BeaverValley into Development
Format only change
2024-04-05 12:18:41 -04:00
6e3fc49517 F2024-052 - Beaver Valley Two Column Format. Allow Notes and Cautions off of sub-steps. 2024-04-05 12:17:14 -04:00
d0f7da7ef6 Merge pull request 'F2024-051 Generic EOP Format, page width of Attachment section' (#291) from F2024-051_GenericEOPFmt into Development
format only change
2024-04-05 09:48:27 -04:00
b0776fb8b7 F2024-051 Generic EOP Format, page width of Attachment section 2024-04-05 09:43:15 -04:00
cae3e2323d Merge pull request 'B2024-021' (#290) from B2024-021 into Development
Code change looks good
2024-04-04 16:34:56 -04:00
ce8497e61f Merge pull request 'F2024-049 F2024-050 Generic EOP Format updates' (#289) from F2024-049_050_ERGFormat into Development
Reviewed-on: #289
2024-04-04 16:12:00 -04:00
72eaac478f B2024-021 2024-04-04 15:45:44 -04:00
776d9891d9 F2024-049 F2024-050 Generic EOP Format updates 2024-04-04 15:36:15 -04:00
Kathy Ruffing
6e37911462 Merge pull request 'F2024-045: BGE format - note/sub-step table overwrites note line' (#288) from F2024-045 into Development
F2024-045: Calvert Format (BGEOI & BGESTP) – printed Note’s sub-step table extends beyond Note/Caution line
2024-04-04 11:46:13 -04:00
Kathy Ruffing
d2cad3a9f7 F2024-045: BGE format - note/sub-step table overwrites note line 2024-04-04 11:42:39 -04:00
3f94097f73 Merge pull request 'B2024-019 - BNPP - Allow the use to select a sub-step that has a bullet instead of a number/letter step tab, when using the {Step Text} transitions. Also don’t show any Tables in the tree view to select the step to link to.' (#286) from B2024-019_BNPP_StepTextTransition into Development
Reviewed-on: #286
2024-04-01 14:48:28 -04:00
e45422755f B2024-019 - BNPP - Allow the use to select a sub-step that has a bullet instead of a number/letter step tab, when using the {Step Text} transitions. Also don’t show any Tables in the tree view to select the step to link to. 2024-04-01 14:32:26 -04:00
09b5cb4be4 Merge pull request 'B2024-017-Fix-BNPP-Table-Arrows' (#285) from B2024-017 into Development
changes look good and ready for testing
2024-03-28 11:22:35 -04:00
50f18ff803 B2024-017-fix-BNPP-Table-Arrows 2024-03-28 10:50:41 -04:00
Kathy Ruffing
6c733d54fc Merge pull request 'F2024-048 - Robinson requested that we use a hard space in the page number part of transitions that include page numbers. Made this change generic because it doen't make sence to break a page number on to the next line all by itstelf.' (#284) from F2024-048-HardSpaceInTransPageNum into Development
Code review completed successfully
2024-03-28 09:29:44 -04:00
64bdb9fb76 B2024-017-Fix-BNPP-Table-Arrows 2024-03-28 09:03:03 -04:00
389a3013b5 F2024-048 - Robinson requested that we use a hard space in the page number part of transitions that include page numbers. Made this change generic because it doen't make sence to break a page number on to the next line all by itstelf. 2024-03-27 16:12:00 -04:00
21c2012c15 Merge pull request 'F2024-047 - Added (to all BNPP formats) a transition type that can be used to referenced procedure steps containing standard step text.' (#283) from F2024-047_BNPP_Transition_To_Text into Development
Reviewed-on: #283
2024-03-27 14:48:45 -04:00
e309c4a814 F2024-047 - Added (to all BNPP formats) a transition type that can be used to referenced procedure steps containing standard step text. 2024-03-27 14:29:09 -04:00
95a39e5a12 Merge pull request 'B2024-018: enhanced linking with subsections' (#281) from B2024-018 into Development
code review successful. OK to test.
2024-03-27 10:39:42 -04:00
Kathy Ruffing
2c587dd848 B2024-018: enhanced linking with subsections 2024-03-27 10:06:37 -04:00
07f67414a9 Merge pull request 'F2024-021 -Adjusted the page margins in the Vogtle 2 column format' (#280) from Vogtle3&4 into Development
Format only change.
2024-03-27 09:57:22 -04:00
da4cbfd112 F2024-021 -Adjusted the page margins in the Vogtle 2 column format 2024-03-27 09:50:33 -04:00
e392c1fcc7 Merge pull request 'F2024-030 - Fixed PC/PC procedure number in transitions so that only one appears.' (#279) from F2024-030_Vogtle3_4_PCTrans into Development
Reviewed-on: #279
2024-03-25 10:51:09 -04:00
eeacf9b969 F2024-030 - Fixed PC/PC procedure number in transitions so that only one appears. 2024-03-25 09:15:07 -04:00
cf13e2f7d5 Merge pull request 'F2024-046 - In Robinson format CPL, fixed transition {Section Number} {Page Num} so that it does not prompt saying you need to select a step.' (#278) from F2024-046-RobinsonTransition into Development
Format only change.
2024-03-22 15:23:11 -04:00
5db530f4e8 F2024-046 - In Robinson format CPL, fixed transition {Section Number} {Page Num} so that it does not prompt saying you need to select a step. 2024-03-22 15:22:28 -04:00
d42e8115ec Merge pull request 'B2023-110-Symbols-in-tables' (#277) from B2023-110 into Development
changes are good for testing.
2024-03-22 15:19:38 -04:00
4f68414a8a B2023-110-Symbols-in-tables 2024-03-22 12:56:36 -04:00
9fd9eac16a Merge pull request 'B2024-016 - For Robinson, all local transitions will now have the option of including a page number. Generic, transitions defined to never include a step number will not display a list of steps in the Transitions Step Properties panel' (#276) from GeneralDebugging into Development
Reviewed-on: #276
2024-03-22 10:10:21 -04:00
c4e3ba10c6 B2024-016 - For Robinson, all local transitions will now have the option of including a page number. Generic, transitions defined to never include a step number will not display a list of steps in the Transitions Step Properties panel 2024-03-22 09:19:59 -04:00
3c632d4abc Merge pull request 'Fixing CSLA references' (#274) from GeneralDebugging into Development
fixing build errors
2024-03-20 14:12:13 -04:00
ccb2bab805 Fixing CSLA references 2024-03-20 14:11:56 -04:00
a5a0d389e2 Merge pull request 'F2024-037 Adjustments made for single column sections of the Vogtle Units 3 & 4, including length of un-numbered HLS, resetting the sub-step numbering when staring under an un-numbered HLS, removed “Two Column” from the section type name Purpose an…' (#273) from Vogtle3&4 into Development
Reviewed-on: #273
2024-03-19 16:23:41 -04:00
97dbfad875 F2024-037 Adjustments made for single column sections of the Vogtle Units 3 & 4, including length of un-numbered HLS, resetting the sub-step numbering when staring under an un-numbered HLS, removed “Two Column” from the section type name Purpose and Symptoms Step Editor 2024-03-19 15:30:57 -04:00
Chris Glavan
51ef1d127d Merge pull request 'CSLA_version_upgrade' (#272) from CSLA_version_upgrade into Development
Merging into Development.

**NOTE**
Developers will need to update their 3rd Party Library repository to ensure that they have the latest CSLA version.  Review the Git documentation in Confluence for instructions on cloning the repository.
2024-03-19 12:01:54 -04:00
Chris Glavan
31301c4717 ~Added CSLA v3.8.4 library 2024-03-19 11:21:21 -04:00
Chris Glavan
b01a9edc1e ~Upgraded CSLA library to v3.0.5 2024-03-18 11:42:04 -04:00
ac1041fa10 Merge pull request 'F2024-040 Fixed the Single Spaced Paragraph sub-step type and removed the duplicated one.' (#270) from Vogtle3&4 into Development
format only changes
2024-03-15 10:09:59 -04:00
f7a692248e F2024-044 Underline the Note tabs in the Commanche Peak ERG format. 2024-03-15 10:07:10 -04:00
49500f0926 Merge pull request 'F2024-044 Underline the Note tabs in the Commanche Peak ERG format.' (#268) from F2023-044_ComanchePeakNoteTab into Development
format only change
2024-03-14 14:01:06 -04:00
77cf0f09b4 F2024-044 Underline the Note tabs in the Commanche Peak ERG format. 2024-03-14 14:00:57 -04:00
Kathy Ruffing
4292581840 Merge pull request 'F2024-043 Corrected box around second level continuous action sub-step.' (#267) from Vogtle3&4 into Development
Code review completed successfully.
2024-03-14 06:49:06 -04:00
d9018c44e7 F2024-043 Corrected box around second level continuous action sub-step. 2024-03-13 16:32:27 -04:00
490c61c225 Merge pull request 'F2024-019 Put box around Continuous Action Sub-Step tab.' (#266) from Vogtle3&4 into Development
format only changes
2024-03-13 08:37:06 -04:00
021bcb3c65 F2024-019 Put box around Continuous Action Sub-Step tab. 2024-03-13 08:36:48 -04:00
8e433cc28e Merge pull request 'F2024-016 Remove column headers from Attachment – Word Section.' (#264) from Vogtle3&4 into Development
Format only change
2024-03-12 10:22:12 -04:00
33972bed19 F2024-016 Remove column headers from Attachment – Word Section. 2024-03-12 10:21:57 -04:00
Kathy Ruffing
ed65bded13 Merge pull request 'F2024-032: Robinson page number transitions in format' (#263) from F2024-032 into Development
Robinson Format (CPL & CPLA) – add section number/title page number transition support
2024-03-07 10:19:25 -05:00
Kathy Ruffing
c5e145e4f6 F2024-032: Robinson page number transitions in format 2024-03-07 10:16:39 -05:00
2c4a8a79ee Merge pull request 'F2024-027 & F2024-028 - Top continue message logic for Vogtle Units3&4 local Alarms Attachment sections' (#262) from Vogtle3&4 into Development
Reviewed-on: #262
2024-03-06 14:22:51 -05:00
42180012fe F2024-027 & F2024-028 - Top continue message logic for Vogtle Units3&4 local Alarms Attachment sections 2024-03-06 13:57:38 -05:00
00268c8fac Merge pull request 'Vogtle3&4' (#261) from Vogtle3&4 into Development
Format only change
2024-03-05 11:23:06 -05:00
eabfcf7b82 F2024-025 - Added a new Front Matter section that include the end message “END OF PROCEDURE TEXT”. 2024-03-05 11:23:26 -05:00
264b444464 Merge branch 'Development' into Vogtle3&4 2024-03-05 11:04:36 -05:00
Kathy Ruffing
b1efb03958 Merge pull request 'B2024-013 - Fixed issue where hard returns are replaced with semi-colons in section titles in Automatic Table of Contents and will use the hard return when printing the section title for Vogtle’s Units 3 & 4 formats.' (#257) from Vogtle3&4 into Development
Code review completed successfully
2024-03-05 10:59:07 -05:00
821ce21e24 Merge branch 'Development' into Vogtle3&4 2024-03-05 09:14:58 -05:00
Chris Glavan
02b0fa9b6d Merge pull request '~Added bolding to HLS in the AER and RNO' (#260) from F2024-034 into Development
Merging into Development.  No code review needed due to formats being under development.
2024-03-05 08:58:20 -05:00
Chris Glavan
315a897444 ~Added bolding to HLS in the AER and RNO 2024-03-05 08:57:08 -05:00
820f82e977 Merge branch 'Development' into Vogtle3&4 2024-03-04 14:10:08 -05:00
126eff7614 Merge pull request 'B2024-014 - Fixed issue where Bulleted High Level Step and Dashed Explicit And steps were missing from the step and sub-step list' (#258) from B2024-014_Westinghouse_BulletStep into Development
format only change
2024-03-04 14:04:36 -05:00
82eeaeb351 B2024-014 - Fixed issue where Bulleted High Level Step and Dashed Explicit And steps were missing from the step and sub-step list 2024-03-04 14:04:22 -05:00
78f83eb2a5 B2024-013 - Fixed issue where hard returns are replaced with semi-colons in section titles in Automatic Table of Contents and will use the hard return when printing the section title for Vogtle’s Units 3 & 4 formats. 2024-03-04 10:40:10 -05:00
Chris Glavan
e38a706931 Merge pull request '~Removed previous edits and added "Dashed Equipment List" type' (#255) from F2024-020 into Development
Merged into Development.  No code review needed since formats are under development.
2024-02-29 11:25:30 -05:00
Chris Glavan
8a8507395f ~Removed previous edits and added "Dashed Equipment List" type 2024-02-29 11:25:52 -05:00
Chris Glavan
e0faa6403f Merge pull request 'F2024-020' (#254) from F2024-020 into Development
Merging into Development.  No code review needed since formats are under development.
2024-02-29 10:43:51 -05:00
Chris Glavan
88391824eb ~Re-committing after merge conflict 2024-02-29 10:43:05 -05:00
Chris Glavan
b6f1c9cdb5 ~Added a Dashed Single Spaced List to the VEGP2 format 2024-02-29 10:35:53 -05:00
Chris Glavan
3a44d4cd0e Merge pull request '~Added the word "Step" after "Go To" and to the Through and And transition types.' (#251) from F2024-022 into Development
Merging into Development.  No code review needed since formats are under development.
2024-02-29 09:00:35 -05:00
Chris Glavan
e6f9ae3623 ~Added the word "Step" after "Go To" and to the Through and And transition types. 2024-02-29 08:59:45 -05:00
8fa08b09fa Merge pull request 'C2024-003-Print-Sub-Section' (#241) from C2024-003 into Development
ready to build and test
2024-02-28 10:46:06 -05:00
578b8842f7 C2024-003-print-sub-section 2024-02-28 09:16:47 -05:00
1db167e5ca Merge pull request 'F2024-026 - Added a transition type that is just a section number in parentheses in the Vogtle Alarms format.' (#249) from Vogtle3&4 into Development
format only change
2024-02-27 15:22:15 -05:00
78020ca40a F2024-026 - Added a transition type that is just a section number in parentheses in the Vogtle Alarms format. 2024-02-27 15:22:29 -05:00
fcaa0ce41d C2024-003-print-sub-section 2024-02-27 12:02:21 -05:00
6fed25bbfa Merge pull request 'F2024-029 Add a bottom continue message in the Attachment – Step Editor section type in the Vogtle Alarms format.' (#247) from GeneralDebugging into Development
Format change
2024-02-27 10:54:33 -05:00
eee137a324 F2024-029 Add a bottom continue message in the Attachment – Step Editor section type in the Vogtle Alarms format. 2024-02-27 10:54:39 -05:00
3710e871a9 Merge remote-tracking branch 'origin/Development' into C2024-003 2024-02-27 10:31:20 -05:00
Kathy Ruffing
b3c6ce633d Merge pull request 'B2024-009: Front Matter Notes & Cautions not in global search for step types' (#246) from B2024-009 into Development
Reviewed-on: #246
2024-02-27 10:22:39 -05:00
15048a317f Merge remote-tracking branch 'origin/Development' into C2024-003 2024-02-27 09:11:59 -05:00
Chris Glavan
527422876a Merge pull request '~Fixed box location around high level continuous action step number' (#245) from B2024-010 into Development
Merging into Development.  No code review needed for format change.
2024-02-27 09:07:18 -05:00
Chris Glavan
11f307ec0d ~Fixed box location around high level continuous action step number 2024-02-27 09:02:10 -05:00
Kathy Ruffing
77706f22e4 B2024-009: Front Matter Notes & Cautions not in global search for step types 2024-02-27 07:13:00 -05:00
9e56422df8 C2024-003-print-sub-section 2024-02-26 23:00:29 -05:00
092ed83ca4 C2024-003-print-sub-section 2024-02-26 16:06:04 -05:00
6078d30a94 Revert "F2024-006 Fixed pagination logic to that step text at the bottom of an Alarm Point page does not print on top of the bottom continue message"
This reverts commit 82fa4f1e74.
2024-02-26 15:08:52 -05:00
9804cf0fce C2024-003-print-sub-section 2024-02-26 12:48:54 -05:00
faed1cdfd6 Merge pull request 'F2024-023 - Shortened the section title length in the Vogtle Alarms format.' (#244) from Vogtle3&4 into Development
format only change
2024-02-26 11:43:31 -05:00
7d5997cd43 F2024-023 - Shortened the section title length in the Vogtle Alarms format. 2024-02-26 11:43:45 -05:00
72457d956e C2024-003-print-sub-section 2024-02-26 10:04:57 -05:00
d55df8beb0 Merge pull request 'B2024-011: Import of unit information ROs not importing correctly' (#243) from B2024-011 into Development
Code change looks good and is ready for testing
2024-02-26 09:00:31 -05:00
Kathy Ruffing
b2d238f8e1 B2024-011: Import of unit information ROs not importing correctly 2024-02-26 08:19:49 -05:00
837978da92 C2024-003-print-sub-sections 2024-02-25 21:40:27 -05:00
2005eab8cb Merge pull request 'B2024-012' (#242) from Vogtle3&4 into Development
format only change
2024-02-23 14:22:29 -05:00
f3b5b425c0 B2024-012
Set AllUnits format flag to True so that RO value unit of measures are always displayed when more than on with the same unit of measure is in the same line of text.
2024-02-23 14:21:03 -05:00
dcfdf5f852 C2024-003-Print-Sub-Section 2024-02-22 16:54:56 -05:00
77d31a4a99 Merge pull request 'F2024-017 - Corrected the Open Bullet List - Double Spaced so that there is only one blank line between items. This was corrected in all of the Beaver Valley formats.' (#240) from F2024-017_BeaverValley into Development
format only changes
2024-02-22 14:10:50 -05:00
b09c6d654c F2024-017 - Corrected the Open Bullet List - Double Spaced so that there is only one blank line between items. This was corrected in all of the Beaver Valley formats. 2024-02-22 14:06:13 -05:00
5a1116f359 Merge pull request 'F2024-018 - Adjust ReplaceWords in the Vogtle Alarm format so that that works “Shutdown:” and “Start:” are not bolded.' (#238) from Vogtle3&4 into Development
Format only change.
2024-02-21 10:57:38 -05:00
e171aa66fe F2024-018 - Adjust ReplaceWords in the Vogtle Alarm format so that that works “Shutdown:” and “Start:” are not bolded. 2024-02-21 10:57:37 -05:00
Chris Glavan
8883ac6358 Merge pull request '~Addressed out-of-memory exception being thrown when right-clicking on a procedure with previous revisions' (#237) from B2024-008 into Development
Merging into Development.  No code review needed since part of joint developer effort.
2024-02-19 12:15:54 -05:00
Chris Glavan
92345f8f91 ~Addressed out-of-memory exception being thrown when right-clicking on a procedure with previous revisions 2024-02-19 12:09:09 -05:00
Chris Glavan
85f683371c Merge pull request 'F2024-015' (#236) from F2024-015 into Development
Merging into Development.  No code review needed due to formats in development.
2024-02-19 10:43:07 -05:00
Chris Glavan
79f6a0eeb9 ~Adjusted width of High-level RNO in 2-column format 2024-02-19 10:43:40 -05:00
Chris Glavan
19aed4e5ac ~Adjusted width of High-level RNO in 2-column format 2024-02-19 10:35:40 -05:00
719d2b5d90 Merge pull request 'B2024-007 - Added missing settings to Beaver Valley’s Transition “{Proc Num} (Procedure Number Only)” to fix a null reference error' (#234) from B2024-007_BeaverValley_Transition into Development
Reviewed-on: #234
2024-02-16 10:57:31 -05:00
e83648ec38 B2024-007 - Added missing settings to Beaver Valley’s Transition “{Proc Num} (Procedure Number Only)” to fix a null reference error 2024-02-15 14:24:50 -05:00
03f7847484 Merge pull request 'F2024-014 - In all of the Comanche Peak formats, the Table step type was set to Arial 11' (#232) from F2024-014_ComPeak_Table_Font into Development
format only changes
2024-02-14 15:52:23 -05:00
fd24f57de3 F2024-014 - In all of the Comanche Peak formats, the Table step type was set to Arial 11 2024-02-14 15:50:55 -05:00
dff3f46ad9 Merge pull request 'B2024-006 - Improved memory management when performing the Refresh Transitions Amin Tool by encasing the getting of content information in Using statements. Same change was done for the method used by the Update RO Values Amin tool.' (#230) from B2024-006_AdminTool_Memory_mangement into Development
Reviewed-on: #230
2024-02-09 15:52:56 -05:00
afad3365bd B2024-006 - Improved memory management when performing the Refresh Transitions Amin Tool by encasing the getting of content information in Using statements. Same change was done for the method used by the Update RO Values Amin tool. 2024-02-09 14:30:11 -05:00
98d94baa03 Merge pull request 'C2024-002' (#228) from C2024-002 into Development
code looks good test
2024-02-09 09:32:48 -05:00
67f965d8dd Merge remote-tracking branch 'origin/Development' into C2024-002 2024-02-09 09:10:38 -05:00
1d0642a05a C2024-002-Print-Sections 2024-02-09 09:09:12 -05:00
a132d3de22 Merge pull request 'F2024-013 - The end message for Attachment and Procedure Step sections is now bolded and have a dash before and after the end message' (#227) from GeneralDebugging into Development
format only changes for Vogtle Units 3 & 4
2024-02-08 15:30:09 -05:00
a3c14cb999 F2024-013 - The end message for Attachment and Procedure Step sections is now bolded and have a dash before and after the end message 2024-02-08 15:27:53 -05:00
Kathy Ruffing
b94fb7988d Merge pull request 'B2024-005: Vogtle Alarm pagination' (#225) from B2024-005 into Development
Reviewed-on: #225
2024-02-08 08:56:58 -05:00
Kathy Ruffing
8903d2a53e B2024-005: Vogtle Alarm pagination 2024-02-08 06:50:10 -05:00
Kathy Ruffing
cec3b70fbf Merge pull request 'F2024-012 - Adjusted the Cover Page title spacing in all of the Vogtle Units 3 & 4 formats' (#224) from Vogtle3&4 into Development
Code change reviewed successfully.
2024-02-07 09:17:54 -05:00
fa10fe4190 F2024-012 - Adjusted the Cover Page title spacing in all of the Vogtle Units 3 & 4 formats 2024-02-06 16:30:35 -05:00
0a327a3d81 Merge pull request 'B2024-002: save step before update ROs from Step Ribbon' (#223) from B2024-002 into Development
Code changes are good. OK to test.
2024-02-06 11:55:48 -05:00
Kathy Ruffing
41abad1ad9 B2024-002: save step before update ROs from Step Ribbon 2024-02-06 11:47:49 -05:00
ce68bb9c42 C2024-002-Print-Sections 2024-02-06 11:30:55 -05:00
Kathy Ruffing
1ca341670e Merge pull request 'F2024-008 - Updated transition definitions to title case section numbers, section titles, and procedure titles. Also surround section titles with parenthesis.' (#222) from Vogtle3&4 into Development
Reviewed-on: #222
2024-02-06 08:58:08 -05:00
7b16478417 C2024-002-Print-Sections 2024-02-06 07:26:58 -05:00
06013afc8b F2024-008 - Updated transition definitions to title case section numbers, section titles, and procedure titles. Also surround section titles with parenthesis. 2024-02-05 15:43:54 -05:00
b0479c6334 C2024-002-Print-Sections 2024-02-05 14:42:30 -05:00
5112c7caff Merge pull request 'F2024-011 - Adjusted the Cover Page title length in all of the Vogtle Units 3 & 4 formats' (#221) from Vogtle3&4 into Development
Format only change
2024-02-05 09:41:36 -05:00
de8249b584 F2024-011 - Adjusted the Cover Page title length in all of the Vogtle Units 3 & 4 formats 2024-02-05 09:39:11 -05:00
3116729507 Merge pull request 'F2024-010 - Added a Landscaped Word section type to all of the Vogtle Units 3 & 4 formats' (#220) from Vogtle3&4 into Development
Format only update
2024-02-05 09:00:06 -05:00
dd1a8dea33 F2024-010 - Added a Landscaped Word section type to all of the Vogtle Units 3 & 4 formats 2024-02-05 08:59:23 -05:00
54441eee06 C2024-002-Print-Sections 2024-02-02 16:02:38 -05:00
8496d70756 Merge pull request 'U2024-003-Help-Menu-Additions' (#218) from U2024-003 into Development
This is good for testing.
2024-01-31 13:38:25 -05:00
9beeee2aac U2024-003-Help-Menu-Additions 2024-01-31 09:18:22 -05:00
1c6ac4ac6a Merge pull request 'F2024-005' (#216) from F2024-005 into Development
format files look good
2024-01-29 16:04:38 -05:00
a8a654e168 F2024-005-Comanche-Peaks-Arial 2024-01-29 15:25:55 -05:00
2439524413 F2024-005-Comanche-Peaks-Arial 2024-01-28 17:53:19 -05:00
293224275d C2024-002-Print_section 2024-01-26 11:06:26 -05:00
Chris Glavan
1f125619f3 Merge pull request 'B2024-004 In the RO Editor, fixed the issue for when Child values have a length of zero, the parent value will now be displayed (as gray text) in the Child field. Also, when generating a RO.FST file, it will use the Parent value when the Child value …' (#215) from B2024-004 into Development
Merging into Development after successful code review
2024-01-26 10:41:36 -05:00
9a546064cf C2024-002-Print-Section 2024-01-26 09:26:42 -05:00
5be9daa019 B2024-004 In the RO Editor, fixed the issue for when Child values have a length of zero, the parent value will now be displayed (as gray text) in the Child field. Also, when generating a RO.FST file, it will use the Parent value when the Child value length is zero. 2024-01-25 11:15:10 -05:00
d6cb841d46 C2024-002-Print-Section 2024-01-25 11:05:04 -05:00
0095b2883b C2024-002-Print-Section 2024-01-25 09:18:48 -05:00
50e0fcb2b4 Merge pull request 'Format update fix. Needed to remove an invalid character at the beginning of the ComPeakFlexall.xml file. Note that the character was not visible in the editor but you could right arrow past it.' (#214) from GeneralDebugging into Development
Fixed the ComPeakFlexall.xml format file. there was an invalid (and invisible) character at the beginning of the file that needed to be removed for PROMS to be able to load it.

This will enable the testing of the previous Commanche Peak format check-in.
2024-01-24 16:48:58 -05:00
4a3d32960f Format update fix. Needed to remove an invalid character at the beginning of the ComPeakFlexall.xml file. Note that the character was not visible in the editor but you could right arrow past it. 2024-01-24 16:44:55 -05:00
Chris Glavan
414c2239ee Merge pull request '~Modified font to use Arial' (#213) from B2023-114_PLarsen into Development
Merging into Development.  No code review needed due to format change
2024-01-24 13:52:10 -05:00
Chris Glavan
f71bd0da19 ~Modified font to use Arial 2024-01-24 13:51:19 -05:00
9b59810c89 Merge pull request 'F2024-006 Fixed pagination logic to that step text at the bottom of an Alarm Point page does not print on top of the bottom continue message' (#210) from Vogtle3&4 into Development
Merging F2024-006 into development after successful code review.
2024-01-24 08:40:57 -05:00
82fa4f1e74 F2024-006 Fixed pagination logic to that step text at the bottom of an Alarm Point page does not print on top of the bottom continue message 2024-01-24 08:10:21 -05:00
d59ef9118f Merge pull request 'B2024-001: Out of memory crash on update of ROs when RO has '>' or '<' and RO in table, when done from ribbon or admin tools' (#209) from GenWork into Development
Review successful. Good to merge into Development.
2024-01-24 08:05:05 -05:00
Kathy Ruffing
3b3a542b24 B2024-001: Out of memory crash on update of ROs when RO has '>' or '<' and RO in table, when done from ribbon or admin tools 2024-01-24 06:57:46 -05:00
Kathy Ruffing
d6f1f5fb0c Merge pull request 'F2023-112 Continuation of the initial check-in for the Vogtle Units 3 & 4 Background Document formats. Also tweaked TOC page num position in all VEGP formats.' (#206) from Vogtle3&4 into Development
Reviewed-on: #206
2024-01-17 08:47:06 -05:00
a2ec9162be F2023-112 Continuation of the initial check-in for the Vogtle Units 3 & 4 Background Document formats. Also tweaked TOC page num position in all VEGP formats. 2024-01-16 15:20:39 -05:00
e2f9dbf1e2 Merge pull request 'F2024-004 Added a Flex Deviation format per Beaver Valley’s request.' (#205) from F2024-004_BeaverVallyFlexDev into Development
Format only change.
2024-01-12 10:46:14 -05:00
3d6cbd9a6b F2024-004 Added a Flex Deviation format per Beaver Valley’s request. 2024-01-12 10:43:37 -05:00
35e4826dc4 Merge pull request 'B2023-114E' (#200) from B2023-114E-Comanche-Peaks-Arial into Development
format changes look good. Ready to be tested
2024-01-12 09:33:20 -05:00
5b985a3cbe B2023-114E-Comanche-Peaks-Arial 2024-01-12 09:12:38 -05:00
1be087a279 Merge pull request 'C2024-001-Quick-Print-In-ribbon' (#204) from C2024-001-Quick-Print-In-ribbon into Development
code looked good.
2024-01-11 14:25:53 -05:00
4afac4b3df Merge branch 'Development' into C2024-001-Quick-Print-In-ribbon 2024-01-11 12:42:06 -05:00
473a170983 Merge remote-tracking branch 'origin/Development' into C2024-001-Quick-Print-In-ribbon 2024-01-11 10:33:12 -05:00
87c4d13abe C2024-001-Quick-Print-In-Ribbon 2024-01-11 08:58:35 -05:00
Kathy Ruffing
e1972763ae Merge pull request 'Vogtle3&4' (#201) from Vogtle3&4 into Development
Code Review completed successfully.
2024-01-11 06:30:22 -05:00
f09a29318c B2023-114E-Comanche-Peaks-Arial 2024-01-10 18:01:11 -05:00
aa28de4ba8 C2024-001 Quick-Print-in-ribbon 2024-01-10 14:28:47 -05:00
8e4c42ac05 F2023-112 - adjust length of text next to purpose in background format, other format adjustments and cleanup 2024-01-10 12:17:53 -05:00
0a1c588625 B2023-114E 2024-01-09 20:24:01 -05:00
a6e85a6cda Merge pull request 'B2022-134: update ros crash when ro has '<' or '>' and ro is used in table' (#199) from GenWork into Development
code was successfully reviewed.
2024-01-09 12:00:00 -05:00
Kathy Ruffing
077564cd3e B2022-134: update ros crash when ro has '<' or '>' and ro is used in table 2024-01-09 10:43:27 -05:00
b8807f2289 Merge branch 'Development' into Vogtle3&4 2024-01-08 15:50:08 -05:00
71cef595ca F2023-112 format setting to remove -B from background proc num (used in title box) 2024-01-08 15:46:05 -05:00
Chris Glavan
eb00324edf Merge pull request 'Vogtle3&4' (#197) from Vogtle3&4 into Development
Merging into Development after successful code review.
2024-01-08 14:47:51 -05:00
f0670905b3 F2024-002 Fix the line spacing for the Attachment – Step Editor section type to restore the blank lines between sub-steps. 2024-01-05 15:47:34 -05:00
e53cc2ab71 F2023-112 -adjusted step widths 2024-01-05 15:03:54 -05:00
f02ca8bd86 F2023-112 Format Flag foruse of width override 2024-01-05 11:09:24 -05:00
27bbbdc9df Merge branch 'Development' into Vogtle3&4 2024-01-03 17:44:14 -05:00
bda5a54754 F2023-112 added format flag for full section number in step tab - for background format 2024-01-03 17:43:38 -05:00
935e666b7f Merge pull request 'F2023-126: center single line caution/note when more than 1 Vogtle Alarms' (#195) from GenWork into Development
Code looks good. ready for testing.
2024-01-03 09:38:50 -05:00
Kathy Ruffing
b1043cfec1 F2023-126: center single line caution/note when more than 1 Vogtle Alarms 2024-01-03 09:27:13 -05:00
ad64675119 Merge pull request 'F2024-001 Added an “Attachment – Step Editor” section type to the Vogtle Alarms format' (#194) from Vogtle3&4 into Development
format only changes given to me from Jeff.
2024-01-02 14:04:23 -05:00
e670b3776b F2024-001 Added an “Attachment – Step Editor” section type to the Vogtle Alarms format 2024-01-02 14:03:16 -05:00
Chris Glavan
10c4974cdf Merge pull request 'C2022-009 New link to Error folder' (#193) from C2022-009 into Development
Merging into Development after successful code review.
2024-01-02 11:07:28 -05:00
b6cbb97d7d C2022-009 New link to Error folder 2023-12-27 20:51:32 -05:00
Chris Glavan
c25421ceb6 Merge pull request 'C2023-024 Fix Duplicate Print Issue' (#192) from C2023-024B into Development
Merging into Development after successful code review.
2023-12-27 16:01:15 -05:00
041e28b61b C2023-024 Fix Duplicate Print Issue 2023-12-27 11:45:43 -05:00
Chris Glavan
3ad6dea425 Merge pull request 'C2023-023 Quick Print' (#190) from C2023-023 into Development
Merging into Development after successful code review
2023-12-21 11:24:46 -05:00
051805c76d C2023-023 Quick Print 2023-12-21 10:04:58 -05:00
3acdf1f6b4 C2023-023 Quick Print 2023-12-20 12:21:43 -05:00
Chris Glavan
4f8eaf2d9b Merge pull request 'F2023-112 inital check in of Vogtle Background format' (#188) from Vogtle3&4 into Development
Merging into Development after successful code review.
2023-12-15 15:47:01 -05:00
e7298c5201 F2023-112 inital check in of Vogtle Background format 2023-12-15 15:25:13 -05:00
03cbaa055a Merge pull request 'B2023-115: Vogtle Alarms - Top Continue message (round 2)' (#186) from GenWork into Development
passed code review
2023-12-12 09:16:56 -05:00
Kathy Ruffing
389847c9ca B2023-115: Vogtle Alarms - Top Continue message (round 2) 2023-12-12 09:02:40 -05:00
140d7c72e0 Merge pull request 'F2023-133: adjust alarm point title size font adjustment amount (from 410 to 405)' (#184) from GenWork into Development
Merging F2023-133 into Development.
2023-12-11 10:05:59 -05:00
Kathy Ruffing
8e682201d7 F2023-133: adjust alarm point title size font adjustment amount (from 410 to 405) 2023-12-11 08:39:22 -05:00
5e272075f8 Merge pull request 'Cleaned up fomat plant list' (#182) from GeneralDebugging into Development
just cleaned up the file, no testing needed
2023-12-08 14:45:25 -05:00
09d1e93404 Cleaned up fomat plant list 2023-12-08 14:42:42 -05:00
7fe4fab1b7 Merge pull request 'F2023-151 Added the max length for the ROLookup value that show the alarm point title to the pagelist used for the second page.' (#180) from GeneralDebugging into Development
format only change
2023-12-07 15:05:02 -05:00
24597b0aa1 F2023-151 Added the max length for the ROLookup value that show the alarm point title to the pagelist used for the second page. 2023-12-07 15:03:34 -05:00
Kathy Ruffing
149c1b4252 Merge pull request 'F2023-133: Alarm Point Title out of box - shrink font' (#178) from GenWork into Development
Format only
2023-12-07 11:16:25 -05:00
Kathy Ruffing
186b2c132d F2023-133: Alarm Point Title out of box - shrink font 2023-12-07 11:12:34 -05:00
34689f75ec Merge pull request 'F2023-150 Added “\Bypass” to ReplaceWords so that it does not get bolded' (#176) from F2023-150_Bypass into Development
Format only changes
2023-12-06 09:04:25 -05:00
c24d4f17a4 F2023-150 Added “\Bypass” to ReplaceWords so that it does not get bolded 2023-12-06 09:03:02 -05:00
3967b319ad Merge pull request 'B2023-115: Vogtle Alarms top continue message' (#175) from GenWork into Development
this code passed the code review.
2023-12-06 08:38:06 -05:00
Kathy Ruffing
53bed9e015 B2023-115: Vogtle Alarms top continue message 2023-12-06 08:24:19 -05:00
e33902b912 Merge pull request 'F2023-149' (#173) from F2023-149_Vogtle34Alarm_AND_OR_separators into Development
Format only change.
2023-12-05 16:28:36 -05:00
f65d2067ba F2023-149
Changed the AND and OR separators so that they are no longer underlined
2023-12-05 16:26:00 -05:00
Chris Glavan
f6c86e4b56 Merge pull request '~Added an "Operator Actions Two Column Attachment" section type.' (#171) from F2023-124 into Development
Merging into Development.  No code review needed since it is a format change.
2023-12-04 11:12:00 -05:00
Chris Glavan
8c952663ac ~Added an "Operator Actions Two Column Attachment" section type. 2023-12-04 11:11:01 -05:00
Chris Glavan
076fdb37a9 Merge pull request '~Added a section style for the Continuous Action pages' (#169) from F2023-119 into Development
Merging into Development.  No code review needed since this is a format change.
2023-12-01 15:20:42 -05:00
Chris Glavan
f393acb343 ~Added a section style for the Continuous Action pages 2023-12-01 15:17:23 -05:00
27dcedbeaa Merge pull request 'F2023-146 Added a blank line between the parent Note and its sub-steps. Moved the bottom line of the note box up closer to the last line of the note. Same changes made for Cautions and Warnings. Did this in the Vogtle 3&4 Alarm, Two Column, and One …' (#167) from Vogtle3&4 into Development
Format only changes -  no code review required
2023-12-01 10:00:56 -05:00
b531dacb25 F2023-146 Added a blank line between the parent Note and its sub-steps. Moved the bottom line of the note box up closer to the last line of the note. Same changes made for Cautions and Warnings. Did this in the Vogtle 3&4 Alarm, Two Column, and One Column formats 2023-12-01 09:58:30 -05:00
f98627d5e7 Merge pull request 'Vogtle3&4' (#165) from Vogtle3&4 into Development
Format only changes.
2023-11-30 14:35:13 -05:00
24237a7cff F2023-148 Added “See” to ReplaceWords so that it is Title Cased and Bolded no matter what case it is typed as. 2023-11-30 14:33:50 -05:00
9ea0a7699e Merge pull request 'B2023-120 If the path to the ROMaster DB contains spaces the copy process fails when transfer RO data to SQL along the some house keeping chech ins.' (#164) from B2023-120 into Development
Reviewed.  Check-in looks good.
2023-11-30 11:26:08 -05:00
57e43fe5d7 B2023-120 If the path to the ROMaster DB contains spaces the copy process fails when transfer RO data to SQL along the some house keeping chech ins. 2023-11-30 11:01:27 -05:00
6575516c36 Merge branch 'Development' into Vogtle3&4 2023-11-30 08:49:44 -05:00
12f2732dc1 F2023-147 don't bold Supply/Return 2023-11-29 15:53:40 -05:00
41499c184b Merge pull request 'B2023-116: Vogtle Alarms pagination' (#163) from GenWork into Development
Passed code review.
2023-11-29 10:57:13 -05:00
Kathy Ruffing
e0ed777f68 B2023-116: Vogtle Alarms pagination 2023-11-29 09:42:59 -05:00
6c78449c86 F2023-144 Alarm format: Needed to move the ReplaceWords item for “Return To” to before the one for “Return” so that “Return To” will be bolded and title cased. 2023-11-28 16:15:34 -05:00
Chris Glavan
4a6f855bd7 Merge pull request 'B2023-117 - added check to not load the audit Info List if the Delete Satus is zero' (#161) from GeneralDebugging into Development
Merging into Development after successful code review
2023-11-28 14:15:43 -05:00
dece3b5514 B2023-117 - added check to not load the audit Info List if the Delete Satus is zero 2023-11-28 13:59:30 -05:00
438 changed files with 8575 additions and 21816 deletions

View File

@@ -27,7 +27,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>

View File

@@ -32,9 +32,9 @@ namespace AdjustBuildRevision
{
// Allow for setting build revision on either proms or the roeditor:
if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ"))
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")");
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")");
else
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.1.yyMM.dHH") + "\")");
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")");
// if (outline != line)
// {
// Console.WriteLine("Before: '{0}'", line);

View File

@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>

View File

@@ -6,7 +6,7 @@
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
</startup>
<userSettings>
<Baseline.Properties.Settings>

View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Baseline</RootNamespace>
<AssemblyName>Baseline</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>

View File

@@ -18,7 +18,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>

View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FlexableMessageBox</RootNamespace>
<AssemblyName>FlexableMessageBox</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<SccProjectName>

View File

@@ -241,6 +241,21 @@ namespace JR.Utils.GUI.Forms
return FlexibleMessageBoxForm.Show(owner, text, caption, buttons, icon, defaultButton);
}
/// <summary>
/// Shows the specified message box.
/// </summary>
/// <param name="owner">The owner.</param>
/// <param name="text">The text.</param>
/// <param name="caption">The caption.</param>
/// <param name="buttons">The buttons.</param>
/// <param name="icon">The icon.</param>
/// <param name="defaultButton">The default button.</param>
/// <returns>The dialog result.</returns>
public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
{
return FlexibleMessageBoxForm.ShowCustom(null, text, caption, buttons, icon);
}
#endregion
#region Internal form class
@@ -420,15 +435,15 @@ namespace JR.Utils.GUI.Forms
private static readonly String STANDARD_MESSAGEBOX_SEPARATOR_SPACES = " ";
//These are the possible buttons (in a standard MessageBox)
private enum ButtonID { OK = 0, CANCEL, YES, NO, ABORT, RETRY, IGNORE };
private enum ButtonID { OK = 0, CANCEL, YES, NO, ABORT, RETRY, IGNORE, OVERWRITE, RENAME };
//These are the buttons texts for different languages.
//If you want to add a new language, add it here and in the GetButtonText-Function
private enum TwoLetterISOLanguageID { en, de, es, it };
private static readonly String[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore" }; //Note: This is also the fallback language
private static readonly String[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren" };
private static readonly String[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar" };
private static readonly String[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora" };
private static readonly String[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore", "&Overwrite", "&Rename" }; //Note: This is also the fallback language
private static readonly String[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren", "&Overwrite", "&Rename" };
private static readonly String[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar", "&Overwrite", "&Rename" };
private static readonly String[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora", "&Overwrite", "&Rename" };
#endregion
@@ -693,6 +708,7 @@ namespace JR.Utils.GUI.Forms
flexibleMessageBoxForm.CancelButton = flexibleMessageBoxForm.button3;
break;
case MessageBoxButtons.OK:
default:
@@ -709,16 +725,38 @@ namespace JR.Utils.GUI.Forms
flexibleMessageBoxForm.defaultButton = defaultButton;
}
#endregion
private static void SetDialogButtonsCustom(FlexibleMessageBoxForm flexibleMessageBoxForm)
{
flexibleMessageBoxForm.visibleButtonsCount = 3;
#region Private event handlers
flexibleMessageBoxForm.button1.Visible = true;
flexibleMessageBoxForm.button1.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.CANCEL);
flexibleMessageBoxForm.button1.DialogResult = DialogResult.Abort;
/// <summary>
/// Handles the Shown event of the FlexibleMessageBoxForm control.
/// </summary>
/// <param name="sender">The source of the event.</param>
/// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
private void FlexibleMessageBoxForm_Shown(object sender, EventArgs e)
flexibleMessageBoxForm.button2.Visible = true;
flexibleMessageBoxForm.button2.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.OVERWRITE);
flexibleMessageBoxForm.button2.DialogResult = DialogResult.Retry;
flexibleMessageBoxForm.button3.Visible = true;
flexibleMessageBoxForm.button3.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.RENAME);
flexibleMessageBoxForm.button3.DialogResult = DialogResult.Ignore;
flexibleMessageBoxForm.ControlBox = false;
}
#endregion
#region Private event handlers
/// <summary>
/// Handles the Shown event of the FlexibleMessageBoxForm control.
/// </summary>
/// <param name="sender">The source of the event.</param>
/// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
private void FlexibleMessageBoxForm_Shown(object sender, EventArgs e)
{
int buttonIndexToFocus = 1;
Button buttonToFocus;
@@ -866,6 +904,46 @@ namespace JR.Utils.GUI.Forms
return flexibleMessageBoxForm.ShowDialog(owner);
}
/// <summary>
/// Shows the specified message box.
/// </summary>
/// <param name="owner">The owner.</param>
/// <param name="text">The text.</param>
/// <param name="caption">The caption.</param>
/// <param name="buttons">The buttons.</param>
/// <param name="icon">The icon.</param>
/// <param name="defaultButton">The default button.</param>
/// <returns>The dialog result.</returns>
public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
{
//Create a new instance of the FlexibleMessageBox form
var flexibleMessageBoxForm = new FlexibleMessageBoxForm();
flexibleMessageBoxForm.ShowInTaskbar = false;
//Bind the caption and the message text
flexibleMessageBoxForm.CaptionText = caption;
flexibleMessageBoxForm.MessageText = text;
flexibleMessageBoxForm.FlexibleMessageBoxFormBindingSource.DataSource = flexibleMessageBoxForm;
//Set the buttons visibilities and texts. Also set a default button.
SetDialogButtonsCustom(flexibleMessageBoxForm);
//Set the dialogs icon. When no icon is used: Correct placement and width of rich text box.
SetDialogIcon(flexibleMessageBoxForm, icon);
//Set the font for all controls
flexibleMessageBoxForm.Font = FONT;
flexibleMessageBoxForm.richTextBoxMessage.Font = FONT;
//Calculate the dialogs start size (Try to auto-size width to show longest text row). Also set the maximum dialog size.
SetDialogSizes(flexibleMessageBoxForm, text, caption);
//Set the dialogs start position when given. Otherwise center the dialog on the current screen.
SetDialogStartPosition(flexibleMessageBoxForm, owner);
//Show the dialog
return flexibleMessageBoxForm.ShowDialog(owner);
}
#endregion
} //class FlexibleMessageBoxForm

View File

@@ -18,7 +18,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@@ -126,6 +126,8 @@
<Content Include="fmtall\BVPSAOPall.xml" />
<Content Include="fmtall\BVPSAtchall.xml" />
<Content Include="fmtall\BVPSBCKall.xml" />
<Content Include="fmtall\BVPSAOPDEVall.xml" />
<Content Include="fmtall\BVPSFlexDEVall.xml" />
<Content Include="fmtall\BVPSDEVall.xml" />
<Content Include="fmtall\BVPSNIBCKall.xml" />
<Content Include="fmtall\BVPSSAMGall.xml" />
@@ -301,6 +303,7 @@
<Content Include="fmtall\SHESAMall.xml" />
<Content Include="fmtall\SHESSDall.xml" />
<Content Include="fmtall\SHESSD_00all.xml" />
<Content Include="fmtall\VEGPBckall.xml" />
<Content Include="fmtall\VEGP1all.xml" />
<Content Include="fmtall\VEGP2all.xml" />
<Content Include="fmtall\VEGPAlrall.xml" />
@@ -376,6 +379,7 @@
<Content Include="fmtall\wst1all.xml" />
<Content Include="fmtall\wst2all.xml" />
<Content Include="fmtall\wstalrall.xml" />
<Content Include="fmtall\VEGPBckStpsall.xml" />
<Content Include="fmtall\wstbckall.xml" />
<Content Include="fmtall\wstcklall.xml" />
<Content Include="fmtall\wstdcsall.xml" />
@@ -403,6 +407,8 @@
<Content Include="genmacall\BVPSAOP.svg" />
<Content Include="genmacall\BVPSAtch.svg" />
<Content Include="genmacall\BVPSbck.svg" />
<Content Include="genmacall\BVPSAOPdev.svg" />
<Content Include="genmacall\BVPSFlexdev.svg" />
<Content Include="genmacall\BVPSdev.svg" />
<Content Include="genmacall\BVPSNIBCK.svg" />
<Content Include="genmacall\BVPSSAMG.svg" />
@@ -510,6 +516,8 @@
<Content Include="genmacall\shervsu.svg" />
<Content Include="genmacall\shesam.svg" />
<Content Include="genmacall\shessd.svg" />
<Content Include="genmacall\VEGPBck.svg" />
<Content Include="genmacall\VEGPBckStps.svg" />
<Content Include="genmacall\VEGP1.svg" />
<Content Include="genmacall\VEGP2.svg" />
<Content Include="genmacall\VEGPAlr.svg" />

View File

@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More