Compare commits

..

44 Commits

Author SHA1 Message Date
djankowski 829dbf84da Merge pull request 'Development' (#217) from Development into master
Merging F2024-005 and B2024-004 from development into master after successful testing
2024-01-31 08:34:00 -05:00
djankowski 7b156c17f8 Merge pull request 'Development' (#212) from Development into master
Merging all changes up through F2024-006 from development into master after successful testing.
2024-01-24 11:30:40 -05:00
djankowski cbf7cbc164 Merge pull request 'Development' (#198) from Development into master
Merging F2024-002 and F2023-112 from development into master.  No testing required since formats are under development.
2024-01-08 15:24:15 -05:00
djankowski b04faa816e Merge pull request 'Development' (#196) from Development into master
Merging F2023-126, F2024-001, C2022-009, C2023-024 and C2023-023 from development into Master after successful testing.
2024-01-03 10:54:22 -05:00
djankowski 517ebe2902 Merge pull request 'Development' (#189) from Development into master
Initial check-in of Vogtle Background formats.  No testing required since formats are under development.
2023-12-15 15:48:55 -05:00
djankowski 03d0d314e3 Merge pull request 'Development' (#187) from Development into master
Merging B2023-115 from development into master after successful testing.
2023-12-12 15:31:06 -05:00
djankowski 3e804c5cce Merge pull request 'Development' (#185) from Development into master
Merging F2023-133 into from development into master. No testing required since formats are under development.
2023-12-11 10:08:22 -05:00
djankowski ee2b8b538e Merge pull request 'Development' (#183) from Development into master
Merging PROMSFixes from development into master after minor changes to UpdateFormatList.
2023-12-08 14:51:21 -05:00
djankowski fdfd34fe92 Merge pull request 'Development' (#181) from Development into master
Merging F2023-151 from development into master.  No testing required since formats are under development.
2023-12-07 15:55:16 -05:00
djankowski 2d6fb6523b Merge pull request 'Development' (#179) from Development into master
Merging F2023-133 from development into master.  No testing required since formats are under development.
2023-12-07 11:44:31 -05:00
djankowski 3084bf3982 Merge pull request 'Development' (#177) from Development into master
Merging B2023-115 and F2023-150 from development into master.  No testing required since formats are under development.
2023-12-06 09:08:18 -05:00
djankowski 5ba51e8392 Merge pull request 'Development' (#174) from Development into master
Merging F2023-149 from development into master.  No testing required since formats are under development.
2023-12-05 16:30:39 -05:00
djankowski fb5eb43e34 Merge pull request 'Development' (#172) from Development into master
Merging F2023-124 from development into master.  No testing required since formats are under development.
2023-12-04 11:22:59 -05:00
djankowski b154056276 Merge pull request 'Development' (#170) from Development into master
Merging F2023-119 from development into master.  No testing required since formats are under development.
2023-12-01 15:36:22 -05:00
djankowski c67b8f9ca1 Merge pull request 'Development' (#168) from Development into master
Merging F2023-146 from development to master.  No testing required since formats are under development.
2023-12-01 10:02:50 -05:00
djankowski 95e4181360 Merge pull request 'Development' (#166) from Development into master
Merging F2023-148, F2023-148, and B2023-120 from development into Master. No testing required since formats are under development.
2023-11-30 14:38:49 -05:00
djankowski 32dffbe56b Merge pull request 'Development' (#162) from Development into master
Merging B2023-116, B2023-117, and F2023-143 from development to master after successful testing.
2023-11-29 15:58:44 -05:00
jjenko 6b3c8d373b Merge pull request 'F2023-143_Vogtle3&4_Alrm_Footer' (#159) from F2023-143_Vogtle3&4_Alrm_Footer into master
Format only change.
Vogtle 3&4 formats under development. This change will be tested as data in entered into PROMS by Volian
2023-11-27 16:23:44 -05:00
djankowski db29107f47 Merge pull request 'Development' (#156) from Development into master
Merging F2023-142 and B2022-046 in from development to master after successful testing.
2023-11-14 08:45:47 -05:00
djankowski 355537f2ab Merge pull request 'Development' (#153) from Development into master
Merging F2023-140, F2023-123, B2023-007, B2023-108, F2023-139, F2023-138 and B2023-103
2023-11-09 10:33:40 -05:00
djankowski 0729ef0c21 Merge pull request 'Development' (#147) from Development into master
Merging F2023-139 from development into master after successful testing.
2023-10-26 10:10:33 -04:00
djankowski 6fe82bfd0f Merge pull request 'Development' (#145) from Development into master
Merging F2023-138 from development into master after successful testing.
2023-10-25 14:40:15 -04:00
djankowski 39bf072363 Merge pull request 'Development' (#142) from Development into master
Merging B2023-103 from development into master after successful testing.
2023-10-23 15:28:31 -04:00
djankowski da7c384fd8 Merge pull request 'Development' (#139) from Development into master
Merging C2023-017, C2023-019, B2023-104, B2023-101 and B2023-102 from development into master after successful testing.
2023-10-18 10:37:59 -04:00
djankowski 95130fd9a0 Merge pull request 'Development' (#133) from Development into master
Merging C2023-018 from development into master after successful testing.
2023-10-11 09:26:45 -04:00
djankowski 978e2344a3 Merge pull request 'Development' (#131) from Development into master
Merging C2023-016 and C2023-017 from development into master after successful testing.
2023-10-06 10:56:34 -04:00
djankowski c9bf45602c Merge pull request 'Development' (#128) from Development into master
Merging F2023-137 and B2023-100 from development into master. F2023-137 does not require testing since formats are under development. B2023-100 tested successfully.
2023-10-02 11:52:22 -04:00
djankowski aa160b2036 Merge pull request 'Development' (#124) from Development into master
Merging B2023-099 from development into master after successful testing.
2023-09-28 15:58:27 -04:00
djankowski f82b32d351 Merge pull request 'Development' (#122) from Development into master
Merging B2023-097 and B2023-098 from development into master after successful testing.
2023-09-26 14:58:05 -04:00
djankowski e519dc9a57 Merge pull request 'Development' (#120) from Development into master
Merging B2023-094 from development into master after successful testing.
2023-09-22 13:24:17 -04:00
djankowski f020c37db9 Merge pull request 'Development' (#118) from Development into master
Merged B2023-096 from development into master after successful testing.
2023-09-15 11:50:57 -04:00
djankowski 5a4ec3b6b1 Merge pull request 'Development' (#117) from Development into master
Merging F2023-135 and B2023-093 from development into master after successful testing.
2023-09-14 15:58:52 -04:00
djankowski 2602d6c9d2 Merge pull request 'Development' (#113) from Development into master
Merging C2023-015 from development into master.
2023-09-12 09:23:57 -04:00
djankowski ff403583d7 Merge pull request 'Development' (#111) from Development into master
Merging B2023-091 and B2023-078 from development into master.
2023-08-30 16:07:17 -04:00
djankowski c5577cc2bd Merge pull request 'Development' (#108) from Development into master
Merging F2023-134 from development into master.  No testing required since formats are under development.
2023-08-24 15:01:12 -04:00
djankowski 78be6e5dc1 Merge pull request 'Development' (#106) from Development into master
Merging GitAutomation from Development into Master.
2023-08-24 09:13:06 -04:00
djankowski b954a41375 Merge pull request 'Development' (#104) from Development into master
Merging B2023-089 and F2023-131 from Development into Master.  No testing required since formats are under development.
2023-08-24 09:05:31 -04:00
djankowski 0100a11cfe Merge pull request 'Development' (#101) from Development into master
Merging F2023-125 from development into master.  No testing required since formats are under development.
2023-08-23 08:19:00 -04:00
djankowski 04cf2e8534 Merge pull request 'Development' (#99) from Development into master
Merging F2023-130 from Development into Master. No testing required since formats are under development.
2023-08-22 15:04:22 -04:00
djankowski be00724818 Merge pull request 'Development' (#97) from Development into master
Merging B2023-088 from development into master.  No testing required since formats are under development.
2023-08-22 10:52:09 -04:00
djankowski 274d93c61a Merge pull request 'Development' (#94) from Development into master
Merging F2023-122 from development into master.  No testing required since formats are under development.
2023-08-22 08:53:57 -04:00
djankowski 7dc4c30436 Merge pull request 'Development' (#92) from Development into master
Merging F2023-127 from development into master.  No testing required since formats are under development.
2023-08-22 08:33:56 -04:00
djankowski 028ef4bc31 Merge pull request 'Development' (#89) from Development into master
Merging F2023-128 and F2023-129 from development into master.  No testing required since formats are under development.
2023-08-21 11:46:01 -04:00
djankowski 42124d65c7 Merge pull request 'Development' (#87) from Development into master
Merging F2023-118,  F2023-120 and F2023-121 from development into master.  No testing required since formats are under development.
2023-08-16 10:13:52 -04:00
143 changed files with 18299 additions and 2021 deletions
@@ -27,7 +27,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
+2 -2
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.3.yyMM.dHH") + "\")");
else
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")");
else
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.1.yyMM.dHH") + "\")");
// if (outline != line)
// {
// Console.WriteLine("Before: '{0}'", line);
+1 -1
View File
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
+1 -1
View File
@@ -6,7 +6,7 @@
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
</startup>
<userSettings>
<Baseline.Properties.Settings>
+1 -1
View File
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Baseline</RootNamespace>
<AssemblyName>Baseline</AssemblyName>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>
+1 -1
View File
@@ -18,7 +18,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FlexableMessageBox</RootNamespace>
<AssemblyName>FlexableMessageBox</AssemblyName>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<SccProjectName>
+1 -1
View File
@@ -18,7 +18,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
+1 -1
View File
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></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.
+1 -1
View File
@@ -18,7 +18,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@@ -33,7 +33,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile />
</PropertyGroup>
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup><runtime>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
</assemblyBinding></runtime></configuration>
@@ -23,8 +23,8 @@ using System.Runtime.CompilerServices;
// Build YYMM (two digit year, two digit month)
// Revision DHH (day - no leading zero, two digit hour - military time
//
[assembly: AssemblyVersion("2.3.2404.1611")]
[assembly: AssemblyFileVersion("2.3.2404.1611")]
[assembly: AssemblyVersion("2.2.2306.2212")]
[assembly: AssemblyFileVersion("2.2.2306.2212")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
@@ -89,8 +89,6 @@ using System.Runtime.CompilerServices;
@@ -44,7 +44,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile />
</PropertyGroup>
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup><runtime>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
</assemblyBinding></runtime>
<appSettings>
@@ -35,7 +35,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile />
</PropertyGroup>
@@ -18,7 +18,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@@ -35,7 +35,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile />
</PropertyGroup>
@@ -35,7 +35,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile />
</PropertyGroup>
@@ -35,7 +35,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile />
</PropertyGroup>
@@ -51,7 +51,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -46,7 +46,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile />
</PropertyGroup>
@@ -35,7 +35,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile />
</PropertyGroup>
@@ -35,7 +35,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile />
</PropertyGroup>
+1 -1
View File
@@ -60,6 +60,6 @@
</logger>
</log4net>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
</startup>
</configuration>
+1 -1
View File
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>RoAccessToSql</RootNamespace>
<AssemblyName>RoAccessToSql</AssemblyName>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<SccProjectName>
+1 -1
View File
@@ -33,7 +33,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile />
</PropertyGroup>
+43 -47
View File
@@ -1,73 +1,73 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="VEPROMS.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
<section name="UISampleNetBar1.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
<section name="VEPROMS.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="UISampleNetBar1.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<log4net>
<appender name="LogFileAppender" type="log4net.Appender.FileAppender">
<param name="File" value="${USERPROFILE}/My Documents/VEPROMS/ErrorLog.txt"/>
<param name="File" value="${USERPROFILE}/My Documents/VEPROMS/ErrorLog.txt" />
<!--<param name="File" value="${APPDATA}/Volian/Proms2010/ErrorLog.txt" />-->
<!--<param name="File" value="${LOCALAPPDATA}/Temp/VEPROMS/ErrorLog.txt" />-->
<param name="AppendToFile" value="true"/>
<param name="AppendToFile" value="true" />
<layout type="log4net.Layout.PatternLayout">
<!--<param name="Header" value="[Header]\r\n" />-->
<!--<param name="Footer" value="[Footer]\r\n" />-->
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n"/>
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n" />
</layout>
</appender>
<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="--&gt; %date [%thread] %-5level %logger (%property{log4net:HostName}) [%ndc] - %message%newline"/>
<conversionPattern value="--&gt; %date [%thread] %-5level %logger (%property{log4net:HostName}) [%ndc] - %message%newline" />
</layout>
</appender>
<appender name="EventLogAppender" type="log4net.Appender.EventLogAppender">
<threshold value="WARN"/>
<threshold value="WARN" />
<mapping>
<level value="DEBUG"/>
<eventLogEntryType value="Information"/>
<level value="DEBUG" />
<eventLogEntryType value="Information" />
</mapping>
<mapping>
<level value="INFO"/>
<eventLogEntryType value="Information"/>
<level value="INFO" />
<eventLogEntryType value="Information" />
</mapping>
<mapping>
<level value="WARN"/>
<eventLogEntryType value="Warning"/>
<level value="WARN" />
<eventLogEntryType value="Warning" />
</mapping>
<mapping>
<level value="ERROR"/>
<eventLogEntryType value="Error"/>
<level value="ERROR" />
<eventLogEntryType value="Error" />
</mapping>
<mapping>
<level value="FATAL"/>
<eventLogEntryType value="Error"/>
<level value="FATAL" />
<eventLogEntryType value="Error" />
</mapping>
<layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value="---&gt; %d [%t] %-5p %c - %m%n"/>
<param name="ConversionPattern" value="---&gt; %d [%t] %-5p %c - %m%n" />
</layout>
</appender>
<root>
<level value="ALL"/>
<appender-ref ref="ConsoleAppender"/>
<appender-ref ref="LogFileAppender"/>
<appender-ref ref="EventLogAppender"/>
<level value="ALL" />
<appender-ref ref="ConsoleAppender" />
<appender-ref ref="LogFileAppender" />
<appender-ref ref="EventLogAppender" />
</root>
<logger name="VEPROMS.CSLA.Library">
<level value="INFO"/>
<level value="INFO" />
</logger>
<logger name="Volian.Controls.Library">
<level value="INFO"/>
<level value="INFO" />
</logger>
</log4net>
<appSettings>
<add key="OperatingMode" value="Production"/>
<add key="OperatingMode" value="Production" />
<!--"Debug" "Production" "Demo"/-->
<add key="OriginalPageBreak" value="False"/>
<add key="CslaAuthentication" value="Windows"/>
<add key="OriginalPageBreak" value="False" />
<add key="CslaAuthentication" value="Windows" />
<!--
<add key="CslaDataPortalProxy"
value="Csla.DataPortalClient.RemotingProxy, Csla"/>
@@ -85,17 +85,17 @@
value="EnterpriseServicesHost.EnterpriseServicesProxy,
EnterpriseServicesHost"/>
-->
<add key="ClientSettingsProvider.ServiceUri" value=""/>
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
<connectionStrings>
<add name="VEPROMS" connectionString="Data Source=VOLIAN-SERVER;User Id=proms2010;password=proms2010;Initial Catalog=VEPROMS" providerName="System.Data.SqlClient"/>
<add name="VEPROMS_LOCAL" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
<add name="VEPROMS_RMARK_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
<add name="VEPROMS_RMARK_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
<add name="VEPROMS" connectionString="Data Source=VOLIAN-SERVER;User Id=proms2010;password=proms2010;Initial Catalog=VEPROMS" providerName="System.Data.SqlClient" />
<add name="VEPROMS_LOCAL" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
<add name="VEPROMS_RMARK_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
<add name="VEPROMS_RMARK_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
<!--<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
<add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />-->
<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
<add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
<add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
<!--<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN12;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
<add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN12;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />-->
</connectionStrings>
@@ -135,10 +135,10 @@
<value>True</value>
</setting>
<setting name="QATItems" serializeAs="String">
<value/>
<value />
</setting>
<setting name="DefaultDB" serializeAs="String">
<value/>
<value />
</setting>
<setting name="LastVersion" serializeAs="String">
<value>0.0</value>
@@ -150,10 +150,10 @@
<value>True</value>
</setting>
<setting name="SMTPServer" serializeAs="String">
<value/>
<value />
</setting>
<setting name="SMTPUser" serializeAs="String">
<value/>
<value />
</setting>
<setting name="UpdateSettings" serializeAs="String">
<value>True</value>
@@ -181,22 +181,18 @@
</UISampleNetBar1.Properties.Settings>
</userSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
</startup>
<runtime>
<AppContextSwitchOverrides
value="Switch.System.Windows.Forms.DoNotLoadLatestRichEditControl=true" />
</runtime>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
</configuration>
</configuration>
@@ -59,13 +59,6 @@ namespace VEPROMS
get { return _Automatic; }
set { _Automatic = value; }
}
private int _prtSectID = -1;
public int PrtSectID
{
get { return _prtSectID; }
set { _prtSectID = value; }
}
// C2018-033 Used to turn off using the date/time PDF file prefix and suffix when doing batch file autmatic baseline print testing (frmVEPROMS.cs RunAutomatic())
// This is needed so the the automatic baselines can compare results from different runs of PROMS
@@ -775,7 +768,7 @@ namespace VEPROMS
// B2021-102 put in the using for better memory management
using (frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked, cbxOrPgBrk.Checked,
cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, myPDFPath, cbd, txbPDFName.Text, new Point(Left, Bottom - 50),
swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text, _MergedPfd, watermarkColor, PrtSectID))//;//C2018-009 print PROMS version
swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text, _MergedPfd, watermarkColor))//;//C2018-009 print PROMS version
{
frmStatus.CloseWhenDone = true;
Application.DoEvents();
@@ -856,9 +849,8 @@ namespace VEPROMS
// B2016-249 Output Procedure to folder associated with Parent Child
using (frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked,
cbxOrPgBrk.Checked, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, GetMultiunitPDFPath(), cbd, txbPDFName.Text,
new Point(Left, Bottom - 50), swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text, _MergedPfd, watermarkColor, PrtSectID)) // ;//C2018-009 print PROMS version
new Point(Left, Bottom - 50), swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text, _MergedPfd, watermarkColor)) // ;//C2018-009 print PROMS version
{
frmStatus.PrtSectID = PrtSectID;
frmStatus.CloseWhenDone = true;
Application.DoEvents();
frmStatus.CancelStop = true;
@@ -1009,7 +1001,7 @@ namespace VEPROMS
// B2018-124 use text of watermark form drop down list instead of enum value
using (frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked, cbxOrPgBrk.Checked,
cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, GetMultiunitPDFPath(), cbd, txbPDFName.Text, new Point(Left, Bottom - 50),
swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, false, tbBlankPage.Text, _MergedPfd, watermarkColor, PrtSectID))//; //C2018-009 print PROMS version
swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, false, tbBlankPage.Text, _MergedPfd, watermarkColor))//; //C2018-009 print PROMS version
{
frmStatus.MakePlaceKeeper = swtbtnGeneratePlacekeeper.Value;
frmStatus.MakeContinuousActionSummary = cbxGenerateConActSum.Checked;
+2 -78
View File
@@ -22148,84 +22148,8 @@ AS
[Folders].[FormatID]=@FormatID
RETURN
GO
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_ListUnlinkedItems]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
DROP PROCEDURE [vesp_ListUnlinkedItems];
GO
/*****************************************************************************
Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
Copyright 2024 - Volian Enterprises, Inc. All rights reserved.
*****************************************************************************/
/*
==========================================================================================================
Author: Kathy Ruffing
Create Date: 03/27/2024
Description: B2024-018: Gets list of procedures/sections/steps for possible enhanced linking
==========================================================================================================
*/
Create Procedure[dbo].[vesp_ListUnlinkedItems]
(
@ItemID int,
@EnhType int
)
WITH EXECUTE AS OWNER
AS
BEGIN
DECLARE @ParItemID int
DECLARE @EItemID int
set @EItemID = (select top 1 VIS.EItemID from vefn_AllSiblingItems(@ItemID)--Find All Siblings
outer apply vefn_GetNewEnhancedData(ItemID,@EnhType) VIS -- That are Linked
where EitemID is not null)
if @EItemID is null
BEGIN
select @EItemID = epp.ItemID
from (select * from Parts where ItemID in(select itemID from vefn_AllSiblingItems(@ItemID)))SPP -- FindParent
JOIN ITEMS SII ON sPP.ContentID = sII.ContentID -- Get Parent Content ID
outer apply vefn_GetNewEnhancedData(SII.ItemID,@EnhType) VIS -- Get Enhanced ID for Parent
JOIN ITEMS EII ON VIS.EItemID = EII.ItemID -- Get Enhanced Parent Content ID
JOIN PARTS EPP ON EPP.ContentID = EII.ContentID and SPP.FromType = epp.FromType -- Get first Child
END
if @EItemID is null -- B2024-018: If not found at the current level, check at the parent level
BEGIN
select @ParItemID = dbo.ve_getparentitem(@ItemID)
select @EItemID = epp.ItemID
from (select * from Parts where ItemID in(select itemID from vefn_AllSiblingItems(@ParItemID)))SPP -- FindParent
JOIN ITEMS SII ON sPP.ContentID = sII.ContentID -- Get Parent Content ID
outer apply vefn_GetNewEnhancedData(SII.ItemID,@EnhType) VIS -- Get Enhanced ID for Parent
JOIN ITEMS EII ON VIS.EItemID = EII.ItemID -- Get Enhanced Parent Content ID
JOIN PARTS EPP ON EPP.ContentID = EII.ContentID --and SPP.FromType = epp.FromType (had to remove types may be proc/sect)
END
if @EItemID is null
BEGIN
select @EItemID = DV2.ItemID from (select *,cast(config as xml) xconfig from DocVersions
where ItemID in(select itemID from vefn_AllSiblingItems(@ItemID))) SDV -- Source DocVersion
cross apply (select * from vefn_GetEnhancedDocVersions(SDV.VersionID) where @EnhType = Type) EDV -- Enhanced DocVersion
Join DocVersions DV2 ON DV2.VersionID = EDV.VersionID -- First Procedure
END
Select ItemID,PreviousID,II.ContentID,II.[DTS],II.[UserID],II.[LastChanged],
(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[ItemID]=[II].[ItemID]) [AnnotationCount],
(SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[ItemID]=[II].[ItemID]) [DocVersionCount],
(SELECT COUNT(*) FROM [Items] [Children] WHERE [Children].[PreviousID]=[II].[ItemID]) [NextCount],
(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ItemID]=[II].[ItemID]) [PartCount],
(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[RangeID]=[II].[ItemID]) [Transition_RangeIDCount],
(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[ToID]=[II].[ItemID]) [Transition_ToIDCount]
from Items II
Left Join Entries EE ON II.ContentID = EE.ContentID
where ItemID In (select SIB.ItemID from vefn_AllSiblingItems(@EItemID) SIB
outer apply vefn_GetNewEnhancedData(ItemID,0) VIE
Where VIE.EItemID is null)
and EE.ContentID is null
END
Go
IF (@@Error = 0) PRINT 'Procedure Creation: [vesp_ListUnlinkedItems] Succeeded'
ELSE PRINT 'Procedure Creation: [vesp_ListUnlinkedItems] Error on Creation'
GO
-----------------------------------------------------------------------------
/*
---------------------------------------------------------------------------
@@ -22260,8 +22184,8 @@ BEGIN TRY -- Try Block
DECLARE @RevDate varchar(255)
DECLARE @RevDescription varchar(255)
set @RevDate = '03/27/2024 11:00 AM'
set @RevDescription = 'B2024-018: Enhanced link issue with sub-sections in source but not in enhanced'
set @RevDate = '10/03/2023 11:00 AM'
set @RevDescription = 'C2023-017: Added logic to filter the format list when selecting a format to be applied to a section'
Select cast(@RevDate as datetime) RevDate, @RevDescription RevDescription
PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,92 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("PROMS")]
[assembly: AssemblyDescription("Create, Edit, and Maintain Procedures Sets.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Volian Enterprises, Inc.")]
[assembly: AssemblyProduct("PROMS")]
[assembly: AssemblyCopyright("Copyright © 2012. All Rights Reserved.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("2ffeb031-bf85-4153-baa2-2d4da2fd5556")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build YYMM (two digit year, two digit month)
// Revision DHH (day - no leading zero, two digit hour - military time
//
[assembly: AssemblyVersion("11.6.1205.316")]
[assembly: AssemblyFileVersion("11.6.1205.316")]
@@ -1,2 +0,0 @@
da3d5d14-691f-4908-aa3c-fd3239734232;-8584908724854775808;VkVQUk9NUy5leGU=;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,MjQyNzYxODZYWFhYWFhYWDAzNg,Sk9ITi1XSU4xMA,RmFsc2U,ODg0Mw,RmFsc2U,MA,MA,djIwMjQuMQ,,;PxeAWRi6mhDqvUMfJhk9Tniu/8ZnOLQv64hLh05xWM+MPyBs3yYfs3vEn5TLW779QNr1k8F6tV3gOAoLG+JSPZoG3NXmdTe6LJya05W+zWyb0H+jj2ReXN2dNR9fbZNDd3ClAeuzNpsM0pw62aYpOe2Tp6fx9gOFx1/0g8g4/8g
da3d5d14-691f-4908-aa3c-fd3239734232;-8584865524854775808;VkVQUk9NUy5leGU=;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,NjE5MDczODdYWFhYWFhYWDA1Mw,Q0hSSVM,RmFsc2U,ODg5NA,RmFsc2U,MA,MA,djIwMjQuMQ,,;luo/kWHt4XRAYR+3s8m8QoRagBcvXLv0mHvCYU2VCIeACFord4tdtTGmSUvmGhEmUiAd7YvaTlDlFrlni6CWaVlxa1mdbWuWsNVUkRnyJZ8kOAt1A+3SGfHecCsqotTW7apXjwW5qXLZ/fcgutioe7xaXgniFQysshTdUWt26T8
@@ -19,7 +19,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@@ -99,7 +99,12 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
<Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Csla">
<HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
</Reference>
@@ -134,7 +139,6 @@
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="UIAutomationProvider" />
<Reference Include="VEPROMS.CSLA.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\VEPROMS.CSLA.Library\bin\Debug\VEPROMS.CSLA.Library.dll</HintPath>
@@ -423,7 +427,6 @@
<Compile Include="VlnWeb.Designer.cs">
<DependentUpon>VlnWeb.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="VEPROMS.gclicx" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Separator.png" />
@@ -4173,19 +4173,7 @@ namespace VEPROMS
if (glookFor != greplaceWith)
{
// B2024-011: For unit RO in grid, old grid data had the ROID in the #Link:ReferencedObject ending in '0000'
// so when compared with the newer format "0041" it was not found and not replaced with updated rousageid
bool hasNewROID = (content.MyGrid.Data.Contains(glookFor));
if (hasNewROID)
content.MyGrid.Data = content.MyGrid.Data.Replace(glookFor, greplaceWith);
else if (!hasNewROID && glookFor.Contains("0041") && glookFor.Contains("FFFF"))
{
string newGlookFor = glookFor;
newGlookFor = newGlookFor.Replace("0041", "0000");
if (content.MyGrid.Data.Contains(newGlookFor))
content.MyGrid.Data = content.MyGrid.Data.Replace(newGlookFor, greplaceWith);
}
content.MyGrid.Data = content.MyGrid.Data.Replace(glookFor, greplaceWith);
}
}
}
@@ -57,7 +57,7 @@
this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Location = new System.Drawing.Point(179, 111);
this.btnCancel.Location = new System.Drawing.Point(165, 111);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(64, 23);
this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -88,7 +88,7 @@
this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown;
this.dateTimeInput1.ButtonDropDown.Visible = true;
this.dateTimeInput1.CustomFormat = "MM/dd/yyyy HH:mm:ss";
this.dateTimeInput1.CustomFormat = "MM/dd/yyyy";
this.dateTimeInput1.DateTimeSelectorVisibility = DevComponents.Editors.DateTimeAdv.eDateTimeSelectorVisibility.DateSelector;
this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom;
this.dateTimeInput1.IsPopupCalendarOpen = false;
@@ -122,7 +122,7 @@
this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true;
this.dateTimeInput1.Name = "dateTimeInput1";
this.dateTimeInput1.Size = new System.Drawing.Size(146, 20);
this.dateTimeInput1.Size = new System.Drawing.Size(113, 20);
this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.superTooltip1.SetSuperTooltip(this.dateTimeInput1, new DevComponents.DotNetBar.SuperTooltipInfo("Change Bar Start Date", "", "Only the changes made after this date will have change bars.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(138, 67)));
this.dateTimeInput1.TabIndex = 4;
@@ -133,7 +133,7 @@
//
this.btnNow.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.btnNow.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.btnNow.Location = new System.Drawing.Point(182, 51);
this.btnNow.Location = new System.Drawing.Point(149, 51);
this.btnNow.Name = "btnNow";
this.btnNow.Size = new System.Drawing.Size(49, 23);
this.btnNow.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -146,7 +146,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(268, 144);
this.ClientSize = new System.Drawing.Size(241, 144);
this.Controls.Add(this.btnNow);
this.Controls.Add(this.dateTimeInput1);
this.Controls.Add(this.label1);
@@ -32,46 +32,13 @@ namespace VEPROMS
{
string cbdt = MyProcConfig.Print_ChangeBarDate;
string[] tmp = cbdt.Split(' ');
if (tmp[0] == null || tmp[0] == "") // First time date set.
{
cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + DateTime.Now.ToString("HH:mm:ss");
dateTimeInput1.Value = DateTime.Parse(cbdt);
return;
}
else
{
DateTime tmpdt = DateTime.Parse(cbdt);
if (tmpdt.Date == DateTime.Today) // Date has before been set.
{
TimeSpan start = TimeSpan.Parse("00:00:00");
var time = tmpdt.TimeOfDay;
if (start < time) // If time is greater than 12:00:00 AM
{
cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + tmpdt.TimeOfDay.ToString();
dateTimeInput1.Value = DateTime.Parse(cbdt);
return;
}
else // if time is 12:00:00 AM
{
cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + " 00:00:00";
dateTimeInput1.Value = DateTime.Parse(cbdt);
return;
}
}
else
{
cbdt = tmpdt.ToString();
dateTimeInput1.Value = DateTime.Parse(cbdt);
return;
}
}
cbdt = tmp[0] + " 00:00:00";
dateTimeInput1.Value = (cbdt == null || cbdt == "") ? DateTime.Now : DateTime.Parse(cbdt);
}
private void btnOK_Click(object sender, EventArgs e)
{
MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss");// ("MM/dd/yyyy HH:mm:ss");
MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy 00:00:00");// ("MM/dd/yyyy HH:mm:ss");
}
@@ -112,12 +112,12 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>
@@ -91,13 +91,7 @@ namespace VEPROMS
get { return _DidAll; }
set { _DidAll = value; }
}
private int _prtSectID = -1;
public int PrtSectID
{
get { return _prtSectID; }
set { _prtSectID = value; }
}
public frmPDFStatusForm(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd, string pdfFile, Point newLocation, bool insertBlankPages, bool allOrAuto, string prefix, bool saveLinks, int removeTrailingHardReturnsAndManualPageBreaks, bool showPROMSVer, bool didAll, string blankPageText, MergedPdf mergedPdf, string watermarkColor, int PrtSectID = -1)
public frmPDFStatusForm(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd, string pdfFile, Point newLocation, bool insertBlankPages, bool allOrAuto, string prefix, bool saveLinks, int removeTrailingHardReturnsAndManualPageBreaks, bool showPROMSVer, bool didAll, string blankPageText, MergedPdf mergedPdf, string watermarkColor)
{
// B2021-088 moved this if/else from CreatePDF() so that the Approval logic will have access to this logic
ProcedureInfo MyProcedure = myItem as ProcedureInfo;
@@ -122,7 +116,6 @@ namespace VEPROMS
Prefix = prefix;
OpenPDF = openPDF;
DidAll = didAll;
_prtSectID = PrtSectID;
InitializeComponent();
@@ -283,7 +276,7 @@ namespace VEPROMS
cachePartInfo = PartInfo.CacheList;
}
_PdfFile = MyPromsPrinter.Print(PDFPath, MakePlaceKeeper, MakeContinuousActionSummary, MakeTimeCriticalActionSummary, PrtSectID);
_PdfFile = MyPromsPrinter.Print(PDFPath, MakePlaceKeeper, MakeContinuousActionSummary, MakeTimeCriticalActionSummary);
ProfileTimer.Pop(profileDepth);
+5 -41
View File
@@ -36,8 +36,6 @@ namespace VEPROMS
this.btnShortCuts = new DevComponents.DotNetBar.ButtonItem();
this.btnHelpVWeb = new DevComponents.DotNetBar.ButtonItem();
this.btnSendErrorLog = new DevComponents.DotNetBar.ButtonItem();
this.btnShowErrFld = new DevComponents.DotNetBar.ButtonItem();
this.btnShowPrtFld = new DevComponents.DotNetBar.ButtonItem();
this.btnHelpAbout = new DevComponents.DotNetBar.ButtonItem();
this.office2007StartButton1 = new DevComponents.DotNetBar.Office2007StartButton();
this.itemContainer1 = new DevComponents.DotNetBar.ItemContainer();
@@ -68,7 +66,6 @@ namespace VEPROMS
this.cbScrunch = new System.Windows.Forms.CheckBox();
this.btnNext = new System.Windows.Forms.Button();
this.cmbFont = new System.Windows.Forms.ComboBox();
this.lblDummy = new System.Windows.Forms.Label();
this.labelItem10 = new DevComponents.DotNetBar.LabelItem();
this.bottomProgBar = new DevComponents.DotNetBar.ProgressBarItem();
this.labelItem9 = new DevComponents.DotNetBar.LabelItem();
@@ -209,13 +206,11 @@ namespace VEPROMS
this.btnHelp.KeyTips = "?";
this.btnHelp.Name = "btnHelp";
this.btnHelp.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.btnHelpManual,
this.btnShortCuts,
this.btnHelpVWeb,
this.btnSendErrorLog,
this.btnShowErrFld,
this.btnShowPrtFld,
this.btnHelpAbout}); ;
this.btnHelpManual,
this.btnShortCuts,
this.btnHelpVWeb,
this.btnSendErrorLog,
this.btnHelpAbout});
this.btnHelp.Text = "Help";
//
// btnHelpManual
@@ -249,24 +244,6 @@ namespace VEPROMS
this.btnSendErrorLog.Text = "Send Error Log";
this.btnSendErrorLog.Click += new System.EventHandler(this.btnSendErrorLog_Click);
//
// btnShowErrFld
//
//this.btnShowErrFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS;
this.btnShowErrFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowErrFld.Image")));
this.btnShowErrFld.Name = "btnShowErrFld";
this.btnShowErrFld.Text = "Open Log Folder";
this.btnShowErrFld.Click += new System.EventHandler(this.btnShowErrFld_Click);
//
// btnShowPrtFld
//
//this.btnShowPrtFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS;
this.btnShowPrtFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowPrtFld.Image")));
this.btnShowPrtFld.Name = "btnShowPrtFld";
this.btnShowPrtFld.Text = "Open Default Print Folder";
this.btnShowPrtFld.Click += new System.EventHandler(this.btnShowPrtFld_Click);
//
//
//
// btnHelpAbout
//
this.btnHelpAbout.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
@@ -515,7 +492,6 @@ namespace VEPROMS
this.bottomBar.Controls.Add(this.cbScrunch);
this.bottomBar.Controls.Add(this.btnNext);
this.bottomBar.Controls.Add(this.cmbFont);
this.bottomBar.Controls.Add(this.lblDummy);
this.bottomBar.Dock = System.Windows.Forms.DockStyle.Bottom;
this.bottomBar.Font = new System.Drawing.Font("Segoe UI", 9F);
this.bottomBar.IsMaximized = false;
@@ -603,15 +579,6 @@ namespace VEPROMS
this.cmbFont.TabIndex = 0;
this.cmbFont.SelectedIndexChanged += new System.EventHandler(this.cmbFont_SelectedIndexChanged);
//
// lblDummy
//
this.lblDummy.Dock = System.Windows.Forms.DockStyle.Right;
this.lblDummy.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
this.lblDummy.Location = new System.Drawing.Point(1013, 0);
this.lblDummy.Name = "lblDummy";
this.lblDummy.Size = new System.Drawing.Size(10, 25);
this.lblDummy.Visible = false;
//
// labelItem10
//
this.labelItem10.BorderSide = DevComponents.DotNetBar.eBorderSide.Left;
@@ -1743,7 +1710,6 @@ namespace VEPROMS
private DevComponents.DotNetBar.ButtonItem btnShortCuts;
private DevComponents.DotNetBar.LabelItem lblItemID;
private System.Windows.Forms.ComboBox cmbFont;
private System.Windows.Forms.Label lblDummy;
private DevComponents.DotNetBar.LabelItem lblResolution;
private DevComponents.DotNetBar.LabelItem lblUser;
private DevComponents.DotNetBar.LabelItem lblLastChange;
@@ -1767,8 +1733,6 @@ namespace VEPROMS
private DevComponents.DotNetBar.TabItem infotabFoldoutMaint;
private Volian.Controls.Library.DisplayFoldoutMaint displayFoldoutMaint;
private DevComponents.DotNetBar.ButtonItem btnSendErrorLog;
private DevComponents.DotNetBar.ButtonItem btnShowErrFld;
private DevComponents.DotNetBar.ButtonItem btnShowPrtFld;
private DevComponents.DotNetBar.TabControlPanel tabControlPanel3;
private DevComponents.DotNetBar.TabItem toosTabReports;
private Volian.Controls.Library.DisplayReports displayReports;
@@ -21,7 +21,6 @@ using DescriptiveEnum;
using Volian.Base.Library;
using Volian.Print.Library;
using JR.Utils.GUI.Forms;
using System.Diagnostics;
[assembly: log4net.Config.XmlConfigurator(Watch = true)]
@@ -515,7 +514,6 @@ namespace VEPROMS
ItemInfo.ItemDeleted += new ItemInfoEvent(RefreshDisplayHistory);
tv.PrintProcedure += new vlnTreeViewEvent(tv_PrintProcedure);
tv.PrintSection += new vlnTreeViewEvent(tv_PrintSection);
tv.QPrintProcedure += new vlnTreeViewEvent(tv_QPrintProcedure);
tv.PrintAllProcedures += new vlnTreeViewEvent(tv_PrintAllProcedures);
tv.ApproveProcedure += new vlnTreeViewEvent(tv_ApproveProcedure);
@@ -1191,45 +1189,6 @@ namespace VEPROMS
}
void tv_PrintSection(object sender, vlnTreeEventArgs args) // Quick Print right click menu on Procedure name.
{
try
{
//args.Node.Parent.
SectionInfo si2 = (args.Node as VETreeNode).VEObject as SectionInfo;
int _prtSectID = si2.ItemID;
if (si2 == null) return;
tc.SaveCurrentEditItem(si2.MyProcedure);
si2.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex;
using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(si2.MyProcedure))
{
prnDlg.PrtSectID = _prtSectID;
prnDlg.SelectedSlave = args.UnitIndex;
prnDlg.MySessionInfo = MySessionInfo;
prnDlg.SetupForProcedure(); // Setup filename
prnDlg.ShowDialog(this); // Create Print report
si2.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
}
}
catch (Exception ex)
{
StringBuilder sb = new StringBuilder();
sb.AppendLine("Could not create PDF Print");
sb.AppendLine();
MessageBox.Show(sb.ToString(), "Error when creating PDF Print", MessageBoxButtons.OK, MessageBoxIcon.Warning);
_MyLog.Warn("Failed to create PDF print", ex);
}
}
void tv_CreateContinuousActionSummary(object sender, vlnTreeEventArgs args)
{
DialogResult dr = System.Windows.Forms.DialogResult.Yes;
@@ -3202,14 +3161,6 @@ namespace VEPROMS
txtSearch.Visible = false;
lblLastChange.Visible = false;
btnStepRTF.Visible = false;
lblDummy.Visible = false;
}
else
{
// C2024-007: On Proms main form, allow for control of whether the FontMenu
// combo box is displayed. Only done when running in debugmode
cmbFont.Visible = Volian.Base.Library.VlnSettings.GetCommandFlag("FontMenu");
lblDummy.Visible = !Volian.Base.Library.VlnSettings.GetCommandFlag("FontMenu");
}
}
@@ -4981,26 +4932,6 @@ namespace VEPROMS
}
}
private void btnShowErrFld_Click(object sender, EventArgs e)
{
string path = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
path = path + @"\Documents\VEPROMS";
if (Directory.Exists(path))
{
Process.Start("explorer.exe", path);
}
}
private void btnShowPrtFld_Click(object sender, EventArgs e)
{
string path = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
path = path + @"\AppData\Local\Temp\VEPROMS";
if (Directory.Exists(path))
{
Process.Start("explorer.exe", path);
}
}
private void btnHelpManual_Click(object sender, EventArgs e)
{
// C2019-024 Display the PROMS User Manual when user click on the option in the Help drop down menu
@@ -170,18 +170,6 @@
rkJggg==
</value>
</data>
<data name="btnShowErrFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAANUlEQVR4nGNgoBR8ahL8jw1/bBTooMiAT8Qa8gmPAUQZ8n+Z3n9KMMOoAf9Hw0CPCmEw4AAA71z+QhwwNhoAAAAASUVORK5CYII=
</value>
</data>
<data name="btnShowPrtFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAANUlEQVR4nGNgoBR8ahL8jw1/bBTooMiAT8Qa8gmPAUQZ8n+Z3n9KMMOoAf9Hw0CPCmEw4AAA71z+QhwwNhoAAAAASUVORK5CYII=
</value>
</data>
<data name="btnHelpAbout.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+333 -338
View File
@@ -30,8 +30,8 @@ namespace VEPROMS
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmVersionsProperties));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
this.ppBtnCancel = new System.Windows.Forms.Button();
this.ppBtnOK = new System.Windows.Forms.Button();
this.ppBtnDefaultChgBar = new DevComponents.DotNetBar.ButtonX();
@@ -95,14 +95,17 @@ namespace VEPROMS
this.ppLblDefSettingsInfo = new System.Windows.Forms.Label();
this.dlgROFolder = new System.Windows.Forms.FolderBrowserDialog();
this.tcVersions = new DevComponents.DotNetBar.TabControl();
this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel();
this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components);
this.tcpRefereceObjects = new DevComponents.DotNetBar.TabControlPanel();
this.ppBtnRoToSql = new System.Windows.Forms.Button();
this.tbRoDb = new System.Windows.Forms.TextBox();
this.ppBtnRoDbBrowse = new System.Windows.Forms.Button();
this.btnRoDbProperties = new DevComponents.DotNetBar.ButtonX();
this.cmbRoDb = new System.Windows.Forms.ComboBox();
this.ppGpbxUpROvals = new DevComponents.DotNetBar.Controls.GroupPanel();
this.tiRefObjs = new DevComponents.DotNetBar.TabItem(this.components);
this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel();
this.gpxMOSLandLocation = new DevComponents.DotNetBar.Controls.GroupPanel();
this.ppCmbxMOSLandcornerLoc = new DevComponents.DotNetBar.Controls.ComboBoxEx();
this.tbxMOSLandyloc = new DevComponents.DotNetBar.Controls.TextBoxX();
this.tbxMOSLandxloc = new DevComponents.DotNetBar.Controls.TextBoxX();
this.lblMOSLandcorner = new System.Windows.Forms.Label();
this.lblMOSLandyloc = new System.Windows.Forms.Label();
this.lblMOSLandxloc = new System.Windows.Forms.Label();
this.ppChbxMOSview = new DevComponents.DotNetBar.Controls.CheckBoxX();
this.gpxMOSLocation = new DevComponents.DotNetBar.Controls.GroupPanel();
this.ppCmbxMOScornerLoc = new DevComponents.DotNetBar.Controls.ComboBoxEx();
@@ -121,16 +124,6 @@ namespace VEPROMS
this.ppCmbxMOSformat = new DevComponents.DotNetBar.Controls.ComboBoxEx();
this.lblMOSformat = new System.Windows.Forms.Label();
this.tiMergedOutputSettings = new DevComponents.DotNetBar.TabItem(this.components);
this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel();
this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components);
this.tcpRefereceObjects = new DevComponents.DotNetBar.TabControlPanel();
this.ppBtnRoToSql = new System.Windows.Forms.Button();
this.tbRoDb = new System.Windows.Forms.TextBox();
this.ppBtnRoDbBrowse = new System.Windows.Forms.Button();
this.btnRoDbProperties = new DevComponents.DotNetBar.ButtonX();
this.cmbRoDb = new System.Windows.Forms.ComboBox();
this.ppGpbxUpROvals = new DevComponents.DotNetBar.Controls.GroupPanel();
this.tiRefObjs = new DevComponents.DotNetBar.TabItem(this.components);
this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel();
this.ppChbxEnhancedAllowMods = new System.Windows.Forms.CheckBox();
this.btnUnlinkDocVersion = new System.Windows.Forms.Button();
@@ -217,19 +210,25 @@ namespace VEPROMS
this.ROPrefixBindingSource = new System.Windows.Forms.BindingSource(this.components);
this.PDFLocationBrowserDialog = new System.Windows.Forms.FolderBrowserDialog();
this.formatInfoListBindingSource = new System.Windows.Forms.BindingSource(this.components);
this.gpxMOSLandLocation = new DevComponents.DotNetBar.Controls.GroupPanel();
this.ppCmbxMOSLandcornerLoc = new DevComponents.DotNetBar.Controls.ComboBoxEx();
this.tbxMOSLandyloc = new DevComponents.DotNetBar.Controls.TextBoxX();
this.tbxMOSLandxloc = new DevComponents.DotNetBar.Controls.TextBoxX();
this.lblMOSLandcorner = new System.Windows.Forms.Label();
this.lblMOSLandyloc = new System.Windows.Forms.Label();
this.lblMOSLandxloc = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.imageCodecInfoBindingSource)).BeginInit();
this.ppGpbxUserSpecCB.SuspendLayout();
this.ppGpbxUserSpecTxt.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tcVersions)).BeginInit();
this.tcVersions.SuspendLayout();
this.tabControlPanel2.SuspendLayout();
this.gpxMOSLandLocation.SuspendLayout();
this.gpxMOSLocation.SuspendLayout();
this.gpxMOSfont.SuspendLayout();
this.tcpGeneral.SuspendLayout();
this.tcpRefereceObjects.SuspendLayout();
this.ppGpbxUpROvals.SuspendLayout();
this.tabControlPanel2.SuspendLayout();
this.gpxMOSLocation.SuspendLayout();
this.gpxMOSfont.SuspendLayout();
this.tabControlPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bsMiniEnhanced)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bsEnhanced)).BeginInit();
@@ -248,6 +247,7 @@ namespace VEPROMS
this.panVerBtns.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.ROPrefixBindingSource)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.formatInfoListBindingSource)).BeginInit();
this.gpxMOSLandLocation.SuspendLayout();
this.SuspendLayout();
//
// ppBtnCancel
@@ -1102,9 +1102,9 @@ namespace VEPROMS
this.tcVersions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.tcVersions.BackColor = System.Drawing.Color.Transparent;
this.tcVersions.CanReorderTabs = true;
this.tcVersions.Controls.Add(this.tcpRefereceObjects);
this.tcVersions.Controls.Add(this.tcpGeneral);
this.tcVersions.Controls.Add(this.tabControlPanel2);
this.tcVersions.Controls.Add(this.tcpGeneral);
this.tcVersions.Controls.Add(this.tcpRefereceObjects);
this.tcVersions.Controls.Add(this.tabControlPanel1);
this.tcVersions.Controls.Add(this.tcpApplicability);
this.tcVersions.Controls.Add(this.tabControlPanel5);
@@ -1130,6 +1130,173 @@ namespace VEPROMS
this.tcVersions.TabsVisible = false;
this.tcVersions.Text = "tabControl1";
//
// tcpGeneral
//
this.tcpGeneral.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.tcpGeneral.Controls.Add(this.ppCmbxProcSetType);
this.tcpGeneral.Controls.Add(this.ppRTxtName);
this.tcpGeneral.Controls.Add(this.label9);
this.tcpGeneral.Controls.Add(this.ppRTxtProcSetRev);
this.tcpGeneral.Controls.Add(this.lblProcSetRev);
this.tcpGeneral.Controls.Add(this.label4);
this.tcpGeneral.Controls.Add(this.label3);
this.tcpGeneral.Controls.Add(this.ppRTxtTitle);
this.tcpGeneral.Controls.Add(this.ppTxtBxUserID);
this.tcpGeneral.Controls.Add(this.ppDTPicker);
this.tcpGeneral.Controls.Add(this.label2);
this.tcpGeneral.Controls.Add(this.label1);
this.tcpGeneral.DisabledBackColor = System.Drawing.Color.Empty;
this.tcpGeneral.Dock = System.Windows.Forms.DockStyle.Fill;
this.tcpGeneral.Location = new System.Drawing.Point(0, 22);
this.tcpGeneral.Margin = new System.Windows.Forms.Padding(2);
this.tcpGeneral.Name = "tcpGeneral";
this.tcpGeneral.Padding = new System.Windows.Forms.Padding(2);
this.tcpGeneral.Size = new System.Drawing.Size(625, 311);
this.tcpGeneral.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
this.tcpGeneral.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
this.tcpGeneral.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.tcpGeneral.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
this.tcpGeneral.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
| DevComponents.DotNetBar.eBorderSide.Bottom)));
this.tcpGeneral.Style.GradientAngle = 90;
this.tcpGeneral.TabIndex = 1;
this.tcpGeneral.TabItem = this.tiGeneral;
//
// tiGeneral
//
this.tiGeneral.AttachedControl = this.tcpGeneral;
this.tiGeneral.Name = "tiGeneral";
this.tiGeneral.Text = "General";
//
// tcpRefereceObjects
//
this.tcpRefereceObjects.Controls.Add(this.ppBtnRoToSql);
this.tcpRefereceObjects.Controls.Add(this.tbRoDb);
this.tcpRefereceObjects.Controls.Add(this.ppBtnRoDbBrowse);
this.tcpRefereceObjects.Controls.Add(this.btnRoDbProperties);
this.tcpRefereceObjects.Controls.Add(this.cmbRoDb);
this.tcpRefereceObjects.Controls.Add(this.ppGpbxUpROvals);
this.tcpRefereceObjects.Controls.Add(this.label6);
this.tcpRefereceObjects.DisabledBackColor = System.Drawing.Color.Empty;
this.tcpRefereceObjects.Dock = System.Windows.Forms.DockStyle.Fill;
this.tcpRefereceObjects.Location = new System.Drawing.Point(0, 22);
this.tcpRefereceObjects.Margin = new System.Windows.Forms.Padding(2);
this.tcpRefereceObjects.Name = "tcpRefereceObjects";
this.tcpRefereceObjects.Padding = new System.Windows.Forms.Padding(2);
this.tcpRefereceObjects.Size = new System.Drawing.Size(625, 311);
this.tcpRefereceObjects.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
this.tcpRefereceObjects.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
this.tcpRefereceObjects.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.tcpRefereceObjects.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
this.tcpRefereceObjects.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
| DevComponents.DotNetBar.eBorderSide.Bottom)));
this.tcpRefereceObjects.Style.GradientAngle = 90;
this.tcpRefereceObjects.TabIndex = 2;
this.tcpRefereceObjects.TabItem = this.tiRefObjs;
this.tcpRefereceObjects.Enter += new System.EventHandler(this.tabpage_Enter);
//
// ppBtnRoToSql
//
this.ppBtnRoToSql.Location = new System.Drawing.Point(337, 146);
this.ppBtnRoToSql.Name = "ppBtnRoToSql";
this.ppBtnRoToSql.Size = new System.Drawing.Size(163, 46);
this.ppBtnRoToSql.TabIndex = 48;
this.ppBtnRoToSql.Text = "Migrate Data to Sql";
this.ppBtnRoToSql.UseVisualStyleBackColor = true;
this.ppBtnRoToSql.Visible = false;
this.ppBtnRoToSql.Click += new System.EventHandler(this.ppBtnRoToSql_Click);
//
// tbRoDb
//
this.tbRoDb.Enabled = false;
this.tbRoDb.Location = new System.Drawing.Point(80, 13);
this.tbRoDb.Margin = new System.Windows.Forms.Padding(2);
this.tbRoDb.Name = "tbRoDb";
this.tbRoDb.Size = new System.Drawing.Size(318, 20);
this.tbRoDb.TabIndex = 20;
//
// ppBtnRoDbBrowse
//
this.ppBtnRoDbBrowse.Location = new System.Drawing.Point(406, 34);
this.ppBtnRoDbBrowse.Margin = new System.Windows.Forms.Padding(2);
this.ppBtnRoDbBrowse.Name = "ppBtnRoDbBrowse";
this.ppBtnRoDbBrowse.Size = new System.Drawing.Size(51, 20);
this.ppBtnRoDbBrowse.TabIndex = 22;
this.ppBtnRoDbBrowse.Text = "Browse...";
this.ppBtnRoDbBrowse.UseVisualStyleBackColor = true;
this.ppBtnRoDbBrowse.Click += new System.EventHandler(this.ppBtnRoDbBrowse_Click);
//
// btnRoDbProperties
//
this.btnRoDbProperties.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.btnRoDbProperties.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.btnRoDbProperties.Image = ((System.Drawing.Image)(resources.GetObject("btnRoDbProperties.Image")));
this.btnRoDbProperties.Location = new System.Drawing.Point(406, 10);
this.btnRoDbProperties.Margin = new System.Windows.Forms.Padding(2);
this.btnRoDbProperties.Name = "btnRoDbProperties";
this.btnRoDbProperties.Size = new System.Drawing.Size(33, 23);
this.btnRoDbProperties.TabIndex = 21;
this.btnRoDbProperties.Click += new System.EventHandler(this.btnRoDbProperties_Click);
//
// cmbRoDb
//
this.cmbRoDb.FormattingEnabled = true;
this.cmbRoDb.Location = new System.Drawing.Point(80, 13);
this.cmbRoDb.Margin = new System.Windows.Forms.Padding(2);
this.cmbRoDb.Name = "cmbRoDb";
this.cmbRoDb.Size = new System.Drawing.Size(318, 21);
this.cmbRoDb.TabIndex = 47;
this.cmbRoDb.SelectedIndexChanged += new System.EventHandler(this.cmbRoDb_SelectedIndexChanged);
//
// ppGpbxUpROvals
//
this.ppGpbxUpROvals.BackColor = System.Drawing.Color.Transparent;
this.ppGpbxUpROvals.CanvasColor = System.Drawing.SystemColors.Control;
this.ppGpbxUpROvals.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.ppGpbxUpROvals.Controls.Add(this.ppBtnResetRoVals);
this.ppGpbxUpROvals.Controls.Add(this.ppBtnUpRoVals);
this.ppGpbxUpROvals.DisabledBackColor = System.Drawing.Color.Empty;
this.ppGpbxUpROvals.Location = new System.Drawing.Point(34, 69);
this.ppGpbxUpROvals.Margin = new System.Windows.Forms.Padding(2);
this.ppGpbxUpROvals.Name = "ppGpbxUpROvals";
this.ppGpbxUpROvals.Size = new System.Drawing.Size(112, 162);
//
//
//
this.ppGpbxUpROvals.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
this.ppGpbxUpROvals.Style.BackColorGradientAngle = 90;
this.ppGpbxUpROvals.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.ppGpbxUpROvals.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderBottomWidth = 1;
this.ppGpbxUpROvals.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.ppGpbxUpROvals.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderLeftWidth = 1;
this.ppGpbxUpROvals.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderRightWidth = 1;
this.ppGpbxUpROvals.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderTopWidth = 1;
this.ppGpbxUpROvals.Style.CornerDiameter = 4;
this.ppGpbxUpROvals.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
this.ppGpbxUpROvals.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
this.ppGpbxUpROvals.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.ppGpbxUpROvals.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
//
//
//
this.ppGpbxUpROvals.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.ppGpbxUpROvals.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.ppGpbxUpROvals.TabIndex = 46;
this.ppGpbxUpROvals.Text = "RO Values";
//
// tiRefObjs
//
this.tiRefObjs.AttachedControl = this.tcpRefereceObjects;
this.tiRefObjs.Name = "tiRefObjs";
this.tiRefObjs.Text = "Referenced Objects";
//
// tabControlPanel2
//
this.tabControlPanel2.Controls.Add(this.gpxMOSLandLocation);
@@ -1157,128 +1324,6 @@ namespace VEPROMS
this.tabControlPanel2.TabIndex = 30;
this.tabControlPanel2.TabItem = this.tiMergedOutputSettings;
//
// gpxMOSLandLocation
//
this.gpxMOSLandLocation.BackColor = System.Drawing.Color.Transparent;
this.gpxMOSLandLocation.CanvasColor = System.Drawing.SystemColors.Control;
this.gpxMOSLandLocation.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.gpxMOSLandLocation.Controls.Add(this.ppCmbxMOSLandcornerLoc);
this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandyloc);
this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandxloc);
this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandcorner);
this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandyloc);
this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandxloc);
this.gpxMOSLandLocation.DisabledBackColor = System.Drawing.Color.Empty;
this.gpxMOSLandLocation.Location = new System.Drawing.Point(284, 164);
this.gpxMOSLandLocation.Margin = new System.Windows.Forms.Padding(2);
this.gpxMOSLandLocation.Name = "gpxMOSLandLocation";
this.gpxMOSLandLocation.Size = new System.Drawing.Size(209, 98);
//
//
//
this.gpxMOSLandLocation.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
this.gpxMOSLandLocation.Style.BackColorGradientAngle = 90;
this.gpxMOSLandLocation.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.gpxMOSLandLocation.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderBottomWidth = 1;
this.gpxMOSLandLocation.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.gpxMOSLandLocation.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderLeftWidth = 1;
this.gpxMOSLandLocation.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderRightWidth = 1;
this.gpxMOSLandLocation.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderTopWidth = 1;
this.gpxMOSLandLocation.Style.CornerDiameter = 4;
this.gpxMOSLandLocation.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
this.gpxMOSLandLocation.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
this.gpxMOSLandLocation.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.gpxMOSLandLocation.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
//
//
//
this.gpxMOSLandLocation.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.gpxMOSLandLocation.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.gpxMOSLandLocation.TabIndex = 7;
this.gpxMOSLandLocation.Text = "Landscape Location";
//
// ppCmbxMOSLandcornerLoc
//
this.ppCmbxMOSLandcornerLoc.DisplayMember = "Text";
this.ppCmbxMOSLandcornerLoc.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
this.ppCmbxMOSLandcornerLoc.FormattingEnabled = true;
this.ppCmbxMOSLandcornerLoc.ItemHeight = 16;
this.ppCmbxMOSLandcornerLoc.Location = new System.Drawing.Point(59, 53);
this.ppCmbxMOSLandcornerLoc.Margin = new System.Windows.Forms.Padding(2);
this.ppCmbxMOSLandcornerLoc.Name = "ppCmbxMOSLandcornerLoc";
this.ppCmbxMOSLandcornerLoc.Size = new System.Drawing.Size(144, 22);
this.ppCmbxMOSLandcornerLoc.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.ppCmbxMOSLandcornerLoc.TabIndex = 9;
this.ppCmbxMOSLandcornerLoc.WatermarkText = "corner location";
//
// tbxMOSLandyloc
//
//
//
//
this.tbxMOSLandyloc.Border.Class = "TextBoxBorder";
this.tbxMOSLandyloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.tbxMOSLandyloc.Location = new System.Drawing.Point(62, 30);
this.tbxMOSLandyloc.Margin = new System.Windows.Forms.Padding(2);
this.tbxMOSLandyloc.Name = "tbxMOSLandyloc";
this.tbxMOSLandyloc.PreventEnterBeep = true;
this.tbxMOSLandyloc.Size = new System.Drawing.Size(75, 20);
this.tbxMOSLandyloc.TabIndex = 8;
//
// tbxMOSLandxloc
//
//
//
//
this.tbxMOSLandxloc.Border.Class = "TextBoxBorder";
this.tbxMOSLandxloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.tbxMOSLandxloc.Location = new System.Drawing.Point(62, 10);
this.tbxMOSLandxloc.Margin = new System.Windows.Forms.Padding(2);
this.tbxMOSLandxloc.Name = "tbxMOSLandxloc";
this.tbxMOSLandxloc.PreventEnterBeep = true;
this.tbxMOSLandxloc.Size = new System.Drawing.Size(75, 20);
this.tbxMOSLandxloc.TabIndex = 7;
//
// lblMOSLandcorner
//
this.lblMOSLandcorner.AutoSize = true;
this.lblMOSLandcorner.BackColor = System.Drawing.Color.Transparent;
this.lblMOSLandcorner.Location = new System.Drawing.Point(14, 54);
this.lblMOSLandcorner.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblMOSLandcorner.Name = "lblMOSLandcorner";
this.lblMOSLandcorner.Size = new System.Drawing.Size(41, 13);
this.lblMOSLandcorner.TabIndex = 6;
this.lblMOSLandcorner.Text = "Corner:";
//
// lblMOSLandyloc
//
this.lblMOSLandyloc.AutoSize = true;
this.lblMOSLandyloc.BackColor = System.Drawing.Color.Transparent;
this.lblMOSLandyloc.Location = new System.Drawing.Point(14, 32);
this.lblMOSLandyloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblMOSLandyloc.Name = "lblMOSLandyloc";
this.lblMOSLandyloc.Size = new System.Drawing.Size(34, 13);
this.lblMOSLandyloc.TabIndex = 5;
this.lblMOSLandyloc.Text = "Y (in):";
//
// lblMOSLandxloc
//
this.lblMOSLandxloc.AutoSize = true;
this.lblMOSLandxloc.BackColor = System.Drawing.Color.Transparent;
this.lblMOSLandxloc.Location = new System.Drawing.Point(14, 10);
this.lblMOSLandxloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblMOSLandxloc.Name = "lblMOSLandxloc";
this.lblMOSLandxloc.Size = new System.Drawing.Size(34, 13);
this.lblMOSLandxloc.TabIndex = 4;
this.lblMOSLandxloc.Text = "X (in):";
//
// ppChbxMOSview
//
this.ppChbxMOSview.BackColor = System.Drawing.Color.Transparent;
@@ -1568,174 +1613,6 @@ namespace VEPROMS
this.tiMergedOutputSettings.Name = "tiMergedOutputSettings";
this.tiMergedOutputSettings.Text = "Merged Output Settings";
//
// tcpGeneral
//
this.tcpGeneral.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.tcpGeneral.Controls.Add(this.ppCmbxProcSetType);
this.tcpGeneral.Controls.Add(this.ppRTxtName);
this.tcpGeneral.Controls.Add(this.label9);
this.tcpGeneral.Controls.Add(this.ppRTxtProcSetRev);
this.tcpGeneral.Controls.Add(this.lblProcSetRev);
this.tcpGeneral.Controls.Add(this.label4);
this.tcpGeneral.Controls.Add(this.label3);
this.tcpGeneral.Controls.Add(this.ppRTxtTitle);
this.tcpGeneral.Controls.Add(this.ppTxtBxUserID);
this.tcpGeneral.Controls.Add(this.ppDTPicker);
this.tcpGeneral.Controls.Add(this.label2);
this.tcpGeneral.Controls.Add(this.label1);
this.tcpGeneral.DisabledBackColor = System.Drawing.Color.Empty;
this.tcpGeneral.Dock = System.Windows.Forms.DockStyle.Fill;
this.tcpGeneral.Location = new System.Drawing.Point(0, 22);
this.tcpGeneral.Margin = new System.Windows.Forms.Padding(2);
this.tcpGeneral.Name = "tcpGeneral";
this.tcpGeneral.Padding = new System.Windows.Forms.Padding(2);
this.tcpGeneral.Size = new System.Drawing.Size(625, 311);
this.tcpGeneral.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
this.tcpGeneral.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
this.tcpGeneral.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.tcpGeneral.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
this.tcpGeneral.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
| DevComponents.DotNetBar.eBorderSide.Bottom)));
this.tcpGeneral.Style.GradientAngle = 90;
this.tcpGeneral.TabIndex = 1;
this.tcpGeneral.TabItem = this.tiGeneral;
//
// tiGeneral
//
this.tiGeneral.AttachedControl = this.tcpGeneral;
this.tiGeneral.Name = "tiGeneral";
this.tiGeneral.Text = "General";
//
// tcpRefereceObjects
//
this.tcpRefereceObjects.Controls.Add(this.ppBtnRoToSql);
this.tcpRefereceObjects.Controls.Add(this.tbRoDb);
this.tcpRefereceObjects.Controls.Add(this.ppBtnRoDbBrowse);
this.tcpRefereceObjects.Controls.Add(this.btnRoDbProperties);
this.tcpRefereceObjects.Controls.Add(this.cmbRoDb);
this.tcpRefereceObjects.Controls.Add(this.ppGpbxUpROvals);
this.tcpRefereceObjects.Controls.Add(this.label6);
this.tcpRefereceObjects.DisabledBackColor = System.Drawing.Color.Empty;
this.tcpRefereceObjects.Dock = System.Windows.Forms.DockStyle.Fill;
this.tcpRefereceObjects.Location = new System.Drawing.Point(0, 22);
this.tcpRefereceObjects.Margin = new System.Windows.Forms.Padding(2);
this.tcpRefereceObjects.Name = "tcpRefereceObjects";
this.tcpRefereceObjects.Padding = new System.Windows.Forms.Padding(2);
this.tcpRefereceObjects.Size = new System.Drawing.Size(625, 311);
this.tcpRefereceObjects.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
this.tcpRefereceObjects.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
this.tcpRefereceObjects.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.tcpRefereceObjects.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
this.tcpRefereceObjects.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
| DevComponents.DotNetBar.eBorderSide.Bottom)));
this.tcpRefereceObjects.Style.GradientAngle = 90;
this.tcpRefereceObjects.TabIndex = 2;
this.tcpRefereceObjects.TabItem = this.tiRefObjs;
this.tcpRefereceObjects.Enter += new System.EventHandler(this.tabpage_Enter);
//
// ppBtnRoToSql
//
this.ppBtnRoToSql.Location = new System.Drawing.Point(337, 146);
this.ppBtnRoToSql.Name = "ppBtnRoToSql";
this.ppBtnRoToSql.Size = new System.Drawing.Size(163, 46);
this.ppBtnRoToSql.TabIndex = 48;
this.ppBtnRoToSql.Text = "Migrate Data to Sql";
this.ppBtnRoToSql.UseVisualStyleBackColor = true;
this.ppBtnRoToSql.Visible = false;
this.ppBtnRoToSql.Click += new System.EventHandler(this.ppBtnRoToSql_Click);
//
// tbRoDb
//
this.tbRoDb.Enabled = false;
this.tbRoDb.Location = new System.Drawing.Point(80, 13);
this.tbRoDb.Margin = new System.Windows.Forms.Padding(2);
this.tbRoDb.Name = "tbRoDb";
this.tbRoDb.Size = new System.Drawing.Size(318, 20);
this.tbRoDb.TabIndex = 20;
this.tbRoDb.TextChanged += new System.EventHandler(this.tbRoDb_TextChanged);
//
// ppBtnRoDbBrowse
//
this.ppBtnRoDbBrowse.Location = new System.Drawing.Point(406, 34);
this.ppBtnRoDbBrowse.Margin = new System.Windows.Forms.Padding(2);
this.ppBtnRoDbBrowse.Name = "ppBtnRoDbBrowse";
this.ppBtnRoDbBrowse.Size = new System.Drawing.Size(51, 20);
this.ppBtnRoDbBrowse.TabIndex = 22;
this.ppBtnRoDbBrowse.Text = "Browse...";
this.ppBtnRoDbBrowse.UseVisualStyleBackColor = true;
this.ppBtnRoDbBrowse.Click += new System.EventHandler(this.ppBtnRoDbBrowse_Click);
//
// btnRoDbProperties
//
this.btnRoDbProperties.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.btnRoDbProperties.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.btnRoDbProperties.Image = ((System.Drawing.Image)(resources.GetObject("btnRoDbProperties.Image")));
this.btnRoDbProperties.Location = new System.Drawing.Point(406, 10);
this.btnRoDbProperties.Margin = new System.Windows.Forms.Padding(2);
this.btnRoDbProperties.Name = "btnRoDbProperties";
this.btnRoDbProperties.Size = new System.Drawing.Size(33, 23);
this.btnRoDbProperties.TabIndex = 21;
this.btnRoDbProperties.Click += new System.EventHandler(this.btnRoDbProperties_Click);
//
// cmbRoDb
//
this.cmbRoDb.FormattingEnabled = true;
this.cmbRoDb.Location = new System.Drawing.Point(80, 13);
this.cmbRoDb.Margin = new System.Windows.Forms.Padding(2);
this.cmbRoDb.Name = "cmbRoDb";
this.cmbRoDb.Size = new System.Drawing.Size(318, 21);
this.cmbRoDb.TabIndex = 47;
this.cmbRoDb.SelectedIndexChanged += new System.EventHandler(this.cmbRoDb_SelectedIndexChanged);
//
// ppGpbxUpROvals
//
this.ppGpbxUpROvals.BackColor = System.Drawing.Color.Transparent;
this.ppGpbxUpROvals.CanvasColor = System.Drawing.SystemColors.Control;
this.ppGpbxUpROvals.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.ppGpbxUpROvals.Controls.Add(this.ppBtnResetRoVals);
this.ppGpbxUpROvals.Controls.Add(this.ppBtnUpRoVals);
this.ppGpbxUpROvals.DisabledBackColor = System.Drawing.Color.Empty;
this.ppGpbxUpROvals.Location = new System.Drawing.Point(34, 69);
this.ppGpbxUpROvals.Margin = new System.Windows.Forms.Padding(2);
this.ppGpbxUpROvals.Name = "ppGpbxUpROvals";
this.ppGpbxUpROvals.Size = new System.Drawing.Size(112, 162);
//
//
//
this.ppGpbxUpROvals.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
this.ppGpbxUpROvals.Style.BackColorGradientAngle = 90;
this.ppGpbxUpROvals.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.ppGpbxUpROvals.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderBottomWidth = 1;
this.ppGpbxUpROvals.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.ppGpbxUpROvals.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderLeftWidth = 1;
this.ppGpbxUpROvals.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderRightWidth = 1;
this.ppGpbxUpROvals.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderTopWidth = 1;
this.ppGpbxUpROvals.Style.CornerDiameter = 4;
this.ppGpbxUpROvals.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
this.ppGpbxUpROvals.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
this.ppGpbxUpROvals.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.ppGpbxUpROvals.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
//
//
//
this.ppGpbxUpROvals.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.ppGpbxUpROvals.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.ppGpbxUpROvals.TabIndex = 46;
this.ppGpbxUpROvals.Text = "RO Values";
//
// tiRefObjs
//
this.tiRefObjs.AttachedControl = this.tcpRefereceObjects;
this.tiRefObjs.Name = "tiRefObjs";
this.tiRefObjs.Text = "Referenced Objects";
//
// tabControlPanel1
//
this.tabControlPanel1.Controls.Add(this.ppChbxEnhancedAllowMods);
@@ -2295,14 +2172,14 @@ namespace VEPROMS
this.documentEntryCountDataGridViewTextBoxColumn,
this.libTitleDataGridViewTextBoxColumn});
this.ppGrdLibDocList.DataSource = this.documentInfoListBindingSource;
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.ppGrdLibDocList.DefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.ppGrdLibDocList.DefaultCellStyle = dataGridViewCellStyle2;
this.ppGrdLibDocList.Dock = System.Windows.Forms.DockStyle.Fill;
this.ppGrdLibDocList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
this.ppGrdLibDocList.HighlightSelectedColumnHeaders = false;
@@ -2319,8 +2196,8 @@ namespace VEPROMS
// documentEntryCountDataGridViewTextBoxColumn
//
this.documentEntryCountDataGridViewTextBoxColumn.DataPropertyName = "DocumentEntryCount";
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.documentEntryCountDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3;
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.documentEntryCountDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1;
this.documentEntryCountDataGridViewTextBoxColumn.HeaderText = "Number of Usages";
this.documentEntryCountDataGridViewTextBoxColumn.Name = "documentEntryCountDataGridViewTextBoxColumn";
this.documentEntryCountDataGridViewTextBoxColumn.ReadOnly = true;
@@ -2787,14 +2664,132 @@ namespace VEPROMS
this.btnGeneral.Text = "General";
this.btnGeneral.Click += new System.EventHandler(this.btnGeneral_Click);
//
// ROPrefixBindingSource
//
this.ROPrefixBindingSource.CurrentChanged += new System.EventHandler(this.ROPrefixBindingSource_CurrentChanged);
//
// formatInfoListBindingSource
//
this.formatInfoListBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.FormatInfo);
//
// gpxMOSLandLocation
//
this.gpxMOSLandLocation.BackColor = System.Drawing.Color.Transparent;
this.gpxMOSLandLocation.CanvasColor = System.Drawing.SystemColors.Control;
this.gpxMOSLandLocation.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.gpxMOSLandLocation.Controls.Add(this.ppCmbxMOSLandcornerLoc);
this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandyloc);
this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandxloc);
this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandcorner);
this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandyloc);
this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandxloc);
this.gpxMOSLandLocation.DisabledBackColor = System.Drawing.Color.Empty;
this.gpxMOSLandLocation.Location = new System.Drawing.Point(284, 164);
this.gpxMOSLandLocation.Margin = new System.Windows.Forms.Padding(2);
this.gpxMOSLandLocation.Name = "gpxMOSLandLocation";
this.gpxMOSLandLocation.Size = new System.Drawing.Size(209, 98);
//
//
//
this.gpxMOSLandLocation.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
this.gpxMOSLandLocation.Style.BackColorGradientAngle = 90;
this.gpxMOSLandLocation.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.gpxMOSLandLocation.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderBottomWidth = 1;
this.gpxMOSLandLocation.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.gpxMOSLandLocation.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderLeftWidth = 1;
this.gpxMOSLandLocation.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderRightWidth = 1;
this.gpxMOSLandLocation.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderTopWidth = 1;
this.gpxMOSLandLocation.Style.CornerDiameter = 4;
this.gpxMOSLandLocation.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
this.gpxMOSLandLocation.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
this.gpxMOSLandLocation.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.gpxMOSLandLocation.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
//
//
//
this.gpxMOSLandLocation.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.gpxMOSLandLocation.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.gpxMOSLandLocation.TabIndex = 7;
this.gpxMOSLandLocation.Text = "Landscape Location";
//
// ppCmbxMOSLandcornerLoc
//
this.ppCmbxMOSLandcornerLoc.DisplayMember = "Text";
this.ppCmbxMOSLandcornerLoc.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
this.ppCmbxMOSLandcornerLoc.FormattingEnabled = true;
this.ppCmbxMOSLandcornerLoc.ItemHeight = 16;
this.ppCmbxMOSLandcornerLoc.Location = new System.Drawing.Point(59, 53);
this.ppCmbxMOSLandcornerLoc.Margin = new System.Windows.Forms.Padding(2);
this.ppCmbxMOSLandcornerLoc.Name = "ppCmbxMOSLandcornerLoc";
this.ppCmbxMOSLandcornerLoc.Size = new System.Drawing.Size(144, 22);
this.ppCmbxMOSLandcornerLoc.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.ppCmbxMOSLandcornerLoc.TabIndex = 9;
this.ppCmbxMOSLandcornerLoc.WatermarkText = "corner location";
//
// tbxMOSLandyloc
//
//
//
//
this.tbxMOSLandyloc.Border.Class = "TextBoxBorder";
this.tbxMOSLandyloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.tbxMOSLandyloc.Location = new System.Drawing.Point(62, 30);
this.tbxMOSLandyloc.Margin = new System.Windows.Forms.Padding(2);
this.tbxMOSLandyloc.Name = "tbxMOSLandyloc";
this.tbxMOSLandyloc.PreventEnterBeep = true;
this.tbxMOSLandyloc.Size = new System.Drawing.Size(75, 20);
this.tbxMOSLandyloc.TabIndex = 8;
//
// tbxMOSLandxloc
//
//
//
//
this.tbxMOSLandxloc.Border.Class = "TextBoxBorder";
this.tbxMOSLandxloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.tbxMOSLandxloc.Location = new System.Drawing.Point(62, 10);
this.tbxMOSLandxloc.Margin = new System.Windows.Forms.Padding(2);
this.tbxMOSLandxloc.Name = "tbxMOSLandxloc";
this.tbxMOSLandxloc.PreventEnterBeep = true;
this.tbxMOSLandxloc.Size = new System.Drawing.Size(75, 20);
this.tbxMOSLandxloc.TabIndex = 7;
//
// lblMOSLandcorner
//
this.lblMOSLandcorner.AutoSize = true;
this.lblMOSLandcorner.BackColor = System.Drawing.Color.Transparent;
this.lblMOSLandcorner.Location = new System.Drawing.Point(14, 54);
this.lblMOSLandcorner.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblMOSLandcorner.Name = "lblMOSLandcorner";
this.lblMOSLandcorner.Size = new System.Drawing.Size(41, 13);
this.lblMOSLandcorner.TabIndex = 6;
this.lblMOSLandcorner.Text = "Corner:";
//
// lblMOSLandyloc
//
this.lblMOSLandyloc.AutoSize = true;
this.lblMOSLandyloc.BackColor = System.Drawing.Color.Transparent;
this.lblMOSLandyloc.Location = new System.Drawing.Point(14, 32);
this.lblMOSLandyloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblMOSLandyloc.Name = "lblMOSLandyloc";
this.lblMOSLandyloc.Size = new System.Drawing.Size(34, 13);
this.lblMOSLandyloc.TabIndex = 5;
this.lblMOSLandyloc.Text = "Y (in):";
//
// lblMOSLandxloc
//
this.lblMOSLandxloc.AutoSize = true;
this.lblMOSLandxloc.BackColor = System.Drawing.Color.Transparent;
this.lblMOSLandxloc.Location = new System.Drawing.Point(14, 10);
this.lblMOSLandxloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblMOSLandxloc.Name = "lblMOSLandxloc";
this.lblMOSLandxloc.Size = new System.Drawing.Size(34, 13);
this.lblMOSLandxloc.TabIndex = 4;
this.lblMOSLandxloc.Text = "X (in):";
//
// frmVersionsProperties
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -2802,7 +2797,7 @@ namespace VEPROMS
this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.CancelButton = this.ppBtnCancel;
this.CaptionFont = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.ClientSize = new System.Drawing.Size(802, 361);
this.ClientSize = new System.Drawing.Size(806, 365);
this.ControlBox = false;
this.Controls.Add(this.panVerBtns);
this.Controls.Add(this.tcVersions);
@@ -2829,19 +2824,17 @@ namespace VEPROMS
this.ppGpbxUserSpecTxt.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.tcVersions)).EndInit();
this.tcVersions.ResumeLayout(false);
this.tabControlPanel2.ResumeLayout(false);
this.tabControlPanel2.PerformLayout();
this.gpxMOSLandLocation.ResumeLayout(false);
this.gpxMOSLandLocation.PerformLayout();
this.gpxMOSLocation.ResumeLayout(false);
this.gpxMOSLocation.PerformLayout();
this.gpxMOSfont.ResumeLayout(false);
this.gpxMOSfont.PerformLayout();
this.tcpGeneral.ResumeLayout(false);
this.tcpGeneral.PerformLayout();
this.tcpRefereceObjects.ResumeLayout(false);
this.tcpRefereceObjects.PerformLayout();
this.ppGpbxUpROvals.ResumeLayout(false);
this.tabControlPanel2.ResumeLayout(false);
this.tabControlPanel2.PerformLayout();
this.gpxMOSLocation.ResumeLayout(false);
this.gpxMOSLocation.PerformLayout();
this.gpxMOSfont.ResumeLayout(false);
this.gpxMOSfont.PerformLayout();
this.tabControlPanel1.ResumeLayout(false);
this.tabControlPanel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.bsMiniEnhanced)).EndInit();
@@ -2866,6 +2859,8 @@ namespace VEPROMS
this.panVerBtns.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.ROPrefixBindingSource)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.formatInfoListBindingSource)).EndInit();
this.gpxMOSLandLocation.ResumeLayout(false);
this.gpxMOSLandLocation.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -1928,16 +1928,6 @@ namespace VEPROMS
#endregion
#endregion
private void tbRoDb_TextChanged(object sender, EventArgs e)
{
}
private void ROPrefixBindingSource_CurrentChanged(object sender, EventArgs e)
{
}
}
@@ -123,12 +123,6 @@
<metadata name="docVersionConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>415, 17</value>
</metadata>
<metadata name="docVersionConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>415, 17</value>
</metadata>
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>643, 17</value>
</metadata>
<data name="ppCmbxFormat.SuperTooltip" xml:space="preserve">
<value>Allows you to specify the default format to use for all procedures in this set.
@@ -216,21 +210,9 @@ Check "Show Default Settings" to display the "default" duplexing setting (below
<metadata name="bsEnhanced.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>817, 17</value>
</metadata>
<metadata name="bsMiniEnhanced.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 65</value>
</metadata>
<metadata name="bsEnhanced.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>817, 17</value>
</metadata>
<metadata name="bsMiniApple.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>118, 17</value>
</metadata>
<metadata name="bsMiniApple.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>118, 17</value>
</metadata>
<metadata name="bsApples.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="bsApples.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
@@ -285,22 +285,16 @@ namespace VEPROMS.CSLA.Library
#region ROTextConvertMethods
// B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing
// step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode.
public static string ROConvertSymbols(string retval, bool arr1, bool arr2)
public static string ROConvertSymbols(string retval)
{
if (arr1)
{
retval = retval.Replace("\\u8209?>", @"\u8594?"); // Right Arrow
retval = retval.Replace("<\\u8209?", @"\u8592?"); // Left Arrow
retval = retval.Replace("->", @"\u8594?"); // Right Arrow
retval = retval.Replace("<-", @"\u8592?"); // Left Arrow
}
if (arr2)
{
retval = retval.Replace("<=", @"\u8804?"); // Less than or Equal
retval = retval.Replace(">=", @"\u8805?"); // Greater than or Equal
retval = retval.Replace("+\\u8209?", @"\'b1"); // plus minus
retval = retval.Replace("+-", @"\'b1"); // plus minus
}
retval = retval.Replace("\\u8209?>", @"\u8594?"); // Right Arrow
retval = retval.Replace("<\\u8209?", @"\u8592?"); // Left Arrow
retval = retval.Replace("->", @"\u8594?"); // Right Arrow
retval = retval.Replace("<-", @"\u8592?"); // Left Arrow
retval = retval.Replace("<=", @"\u8804?"); // Less than or Equal
retval = retval.Replace(">=", @"\u8805?"); // Greater than or Equal
retval = retval.Replace("+\\u8209?", @"\'b1"); // plus minus
retval = retval.Replace("+-", @"\'b1"); // plus minus
return retval;
}
#endregion
@@ -490,7 +484,7 @@ namespace VEPROMS.CSLA.Library
return rc;
}
public string GetTranslatedRoValue(string roid, bool DoCaret, bool DoDOSSuperSubScript, bool convertRoSymbols, ItemInfo myiteminfo)
public string GetTranslatedRoValue(string roid, bool DoCaret, bool DoDOSSuperSubScript, bool convertRoSymbols)
{
roid = FormatRoidKey(roid, true);
@@ -502,13 +496,7 @@ namespace VEPROMS.CSLA.Library
retval = ReplaceUnicode(retval, DoCaret);
// B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing
// step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode.
//(_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
// _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue))
bool arrows1 = myiteminfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
bool arrows2 = myiteminfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
if (convertRoSymbols) retval = ROFSTLookup.ROConvertSymbols(retval, arrows1, arrows2);
if (convertRoSymbols) retval = ROFSTLookup.ROConvertSymbols(retval);
retval = ConvertFortranFormatToScienctificNotation(retval);

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