Compare commits
	
		
			27 Commits
		
	
	
		
			B2025-051
			...
			F2025-027_
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 779c6247cd | |||
| fcaffa8c5f | |||
| d2ffcc903a | |||
| 1d12c97e30 | |||
| 3bcaeb214e | |||
| 85995040a8 | |||
| 826d06b532 | |||
| 3328e35cf4 | |||
| 091c56ec34 | |||
| 31e9910242 | |||
| f6e3c72e9c | |||
| 3f618bc970 | |||
| 1c766e568c | |||
| 8ed9bfbfcb | |||
| f1d66fc446 | |||
| 50977b367f | |||
| 45312d0564 | |||
| 3261d63b19 | |||
| 2894899ad4 | |||
| dd5c709709 | |||
| 618247f4d5 | |||
| abcf035143 | |||
| 0b015233a9 | |||
| 44d85b842c | |||
| 470f4a770b | |||
| 808a1ba0ea | |||
| 04cef606fc | 
| @@ -32,7 +32,7 @@ namespace AdjustBuildRevision | |||||||
| 						{ | 						{ | ||||||
| 							// Allow for setting build revision on either proms or the roeditor: | 							// Allow for setting build revision on either proms or the roeditor: | ||||||
| 							if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ")) | 							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") + "\")"); | 								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.4.yyMM.dHH") + "\")"); | ||||||
| 							else | 							else | ||||||
| 								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")"); | 								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")"); | ||||||
| 					//		if (outline != line) | 					//		if (outline != line) | ||||||
|   | |||||||
										
											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.
										
									
								
							| @@ -59,7 +59,7 @@ | |||||||
|     <WarningLevel>4</WarningLevel> |     <WarningLevel>4</WarningLevel> | ||||||
|     <DebugType>full</DebugType> |     <DebugType>full</DebugType> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||||||
| @@ -85,6 +85,7 @@ | |||||||
|     <DebugType>none</DebugType> |     <DebugType>none</DebugType> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|  |     <PlatformTarget>x64</PlatformTarget> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> | ||||||
|     <DebugSymbols>true</DebugSymbols> |     <DebugSymbols>true</DebugSymbols> | ||||||
| @@ -92,7 +93,7 @@ | |||||||
|     <DefineConstants>DEBUG;TRACE</DefineConstants> |     <DefineConstants>DEBUG;TRACE</DefineConstants> | ||||||
|     <BaseAddress>285212672</BaseAddress> |     <BaseAddress>285212672</BaseAddress> | ||||||
|     <DebugType>full</DebugType> |     <DebugType>full</DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
| @@ -103,7 +104,7 @@ | |||||||
|     <Optimize>true</Optimize> |     <Optimize>true</Optimize> | ||||||
|     <DebugType> |     <DebugType> | ||||||
|     </DebugType> |     </DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   | |||||||
| @@ -7,7 +7,7 @@ | |||||||
|     <Optimize>true</Optimize> |     <Optimize>true</Optimize> | ||||||
|     <DebugType> |     <DebugType> | ||||||
|     </DebugType> |     </DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
| @@ -71,7 +71,7 @@ | |||||||
|     <DebugType>full</DebugType> |     <DebugType>full</DebugType> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||||||
|     <OutputPath>bin\Release\</OutputPath> |     <OutputPath>bin\Release\</OutputPath> | ||||||
| @@ -96,6 +96,7 @@ | |||||||
|     <DebugType>none</DebugType> |     <DebugType>none</DebugType> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|  |     <PlatformTarget>x64</PlatformTarget> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> | ||||||
|     <DebugSymbols>true</DebugSymbols> |     <DebugSymbols>true</DebugSymbols> | ||||||
| @@ -103,7 +104,7 @@ | |||||||
|     <DefineConstants>DEBUG;TRACE</DefineConstants> |     <DefineConstants>DEBUG;TRACE</DefineConstants> | ||||||
|     <BaseAddress>285212672</BaseAddress> |     <BaseAddress>285212672</BaseAddress> | ||||||
|     <DebugType>full</DebugType> |     <DebugType>full</DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   | |||||||
| @@ -62,6 +62,7 @@ | |||||||
|     <DebugType>full</DebugType> |     <DebugType>full</DebugType> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|  |     <PlatformTarget>x64</PlatformTarget> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||||||
|     <OutputPath>bin\Release\</OutputPath> |     <OutputPath>bin\Release\</OutputPath> | ||||||
| @@ -86,6 +87,7 @@ | |||||||
|     <DebugType>none</DebugType> |     <DebugType>none</DebugType> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|  |     <PlatformTarget>x64</PlatformTarget> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> | ||||||
|     <DebugSymbols>true</DebugSymbols> |     <DebugSymbols>true</DebugSymbols> | ||||||
| @@ -93,7 +95,7 @@ | |||||||
|     <DefineConstants>DEBUG;TRACE</DefineConstants> |     <DefineConstants>DEBUG;TRACE</DefineConstants> | ||||||
|     <BaseAddress>285212672</BaseAddress> |     <BaseAddress>285212672</BaseAddress> | ||||||
|     <DebugType>full</DebugType> |     <DebugType>full</DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
| @@ -104,7 +106,7 @@ | |||||||
|     <Optimize>true</Optimize> |     <Optimize>true</Optimize> | ||||||
|     <DebugType> |     <DebugType> | ||||||
|     </DebugType> |     </DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   | |||||||
| @@ -35,6 +35,7 @@ | |||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <WarningLevel>4</WarningLevel> |     <WarningLevel>4</WarningLevel> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|  |     <PlatformTarget>x64</PlatformTarget> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||||||
|     <DebugType>pdbonly</DebugType> |     <DebugType>pdbonly</DebugType> | ||||||
| @@ -44,13 +45,14 @@ | |||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <WarningLevel>4</WarningLevel> |     <WarningLevel>4</WarningLevel> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|  |     <PlatformTarget>x64</PlatformTarget> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> | ||||||
|     <DebugSymbols>true</DebugSymbols> |     <DebugSymbols>true</DebugSymbols> | ||||||
|     <OutputPath>bin\Debug\</OutputPath> |     <OutputPath>bin\Debug\</OutputPath> | ||||||
|     <DefineConstants>DEBUG;TRACE</DefineConstants> |     <DefineConstants>DEBUG;TRACE</DefineConstants> | ||||||
|     <DebugType>full</DebugType> |     <DebugType>full</DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
| @@ -59,7 +61,7 @@ | |||||||
|     <DefineConstants>TRACE</DefineConstants> |     <DefineConstants>TRACE</DefineConstants> | ||||||
|     <Optimize>true</Optimize> |     <Optimize>true</Optimize> | ||||||
|     <DebugType>pdbonly</DebugType> |     <DebugType>pdbonly</DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   | |||||||
| @@ -409,7 +409,7 @@ namespace RODBInterface | |||||||
| 			GetDbServerInfo(ropath); | 			GetDbServerInfo(ropath); | ||||||
| 			if (!dbProviderType.Equals((int)DB_PROVIDER.SQL_SERVER)) | 			if (!dbProviderType.Equals((int)DB_PROVIDER.SQL_SERVER)) | ||||||
| 			{ | 			{ | ||||||
| 				strDatabaseConnectionCommand = "Provider=Microsoft.Jet.OLEDB.4.0;Password=\"\";User ID=Admin;Data Source=" + DataConnectionPath + "\\ROMaster.mdb;Mode=Share Deny None;Extended Properties=\"\";Jet OLEDB:System database=\"\";Jet OLEDB:Registry Path=\"\";Jet OLEDB:Database Password=\"\";Jet OLEDB:Engine Type=5;Jet OLEDB:Database Locking Mode=1;Jet OLEDB:Global Partial Bulk Ops=2;Jet OLEDB:Global Bulk Transactions=1;Jet OLEDB:New Database Password=\"\";Jet OLEDB:Create System Database=False;Jet OLEDB:Encrypt Database=False;Jet OLEDB:Don't Copy Locale on Compact=False;Jet OLEDB:Compact Without Replica Repair=False;Jet OLEDB:SFP=False"; | 				strDatabaseConnectionCommand = "Provider=Microsoft.ACE.OLEDB.12.0;Password=\"\";User ID=Admin;Data Source=" + DataConnectionPath + "\\ROMaster.mdb;Mode=Share Deny None;Extended Properties=\"\";Jet OLEDB:System database=\"\";Jet OLEDB:Registry Path=\"\";Jet OLEDB:Database Password=\"\";Jet OLEDB:Engine Type=5;Jet OLEDB:Database Locking Mode=1;Jet OLEDB:Global Partial Bulk Ops=2;Jet OLEDB:Global Bulk Transactions=1;Jet OLEDB:New Database Password=\"\";Jet OLEDB:Create System Database=False;Jet OLEDB:Encrypt Database=False;Jet OLEDB:Don't Copy Locale on Compact=False;Jet OLEDB:Compact Without Replica Repair=False;Jet OLEDB:SFP=False"; | ||||||
| 			} | 			} | ||||||
| 		} | 		} | ||||||
| 		#endregion | 		#endregion | ||||||
|   | |||||||
| @@ -62,6 +62,7 @@ | |||||||
|     <DebugType>full</DebugType> |     <DebugType>full</DebugType> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|  |     <PlatformTarget>x64</PlatformTarget> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||||||
|     <OutputPath>bin\Release\</OutputPath> |     <OutputPath>bin\Release\</OutputPath> | ||||||
| @@ -86,6 +87,7 @@ | |||||||
|     <DebugType>none</DebugType> |     <DebugType>none</DebugType> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|  |     <PlatformTarget>x64</PlatformTarget> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> | ||||||
|     <DebugSymbols>true</DebugSymbols> |     <DebugSymbols>true</DebugSymbols> | ||||||
| @@ -93,7 +95,7 @@ | |||||||
|     <DefineConstants>DEBUG;TRACE</DefineConstants> |     <DefineConstants>DEBUG;TRACE</DefineConstants> | ||||||
|     <BaseAddress>285212672</BaseAddress> |     <BaseAddress>285212672</BaseAddress> | ||||||
|     <DebugType>full</DebugType> |     <DebugType>full</DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
| @@ -104,7 +106,7 @@ | |||||||
|     <Optimize>true</Optimize> |     <Optimize>true</Optimize> | ||||||
|     <DebugType> |     <DebugType> | ||||||
|     </DebugType> |     </DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
| @@ -171,6 +173,17 @@ | |||||||
|       <Name>VlnStatus</Name> |       <Name>VlnStatus</Name> | ||||||
|     </ProjectReference> |     </ProjectReference> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
|  |   <ItemGroup> | ||||||
|  |     <COMReference Include="Microsoft.Office.Interop.Access.Dao"> | ||||||
|  |       <Guid>{4AC9E1DA-5BAD-4AC7-86E3-24F4CDCECA28}</Guid> | ||||||
|  |       <VersionMajor>12</VersionMajor> | ||||||
|  |       <VersionMinor>0</VersionMinor> | ||||||
|  |       <Lcid>0</Lcid> | ||||||
|  |       <WrapperTool>primary</WrapperTool> | ||||||
|  |       <Isolated>False</Isolated> | ||||||
|  |       <EmbedInteropTypes>True</EmbedInteropTypes> | ||||||
|  |     </COMReference> | ||||||
|  |   </ItemGroup> | ||||||
|   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | ||||||
|   <PropertyGroup> |   <PropertyGroup> | ||||||
|     <PreBuildEvent> |     <PreBuildEvent> | ||||||
|   | |||||||
| @@ -62,6 +62,7 @@ | |||||||
|     <DebugType>full</DebugType> |     <DebugType>full</DebugType> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|  |     <PlatformTarget>x64</PlatformTarget> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||||||
|     <OutputPath>bin\Release\</OutputPath> |     <OutputPath>bin\Release\</OutputPath> | ||||||
| @@ -86,6 +87,7 @@ | |||||||
|     <DebugType>none</DebugType> |     <DebugType>none</DebugType> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|  |     <PlatformTarget>x64</PlatformTarget> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> | ||||||
|     <DebugSymbols>true</DebugSymbols> |     <DebugSymbols>true</DebugSymbols> | ||||||
| @@ -93,7 +95,7 @@ | |||||||
|     <DefineConstants>DEBUG;TRACE;Upgrade2005;</DefineConstants> |     <DefineConstants>DEBUG;TRACE;Upgrade2005;</DefineConstants> | ||||||
|     <BaseAddress>285212672</BaseAddress> |     <BaseAddress>285212672</BaseAddress> | ||||||
|     <DebugType>full</DebugType> |     <DebugType>full</DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
| @@ -104,7 +106,7 @@ | |||||||
|     <Optimize>true</Optimize> |     <Optimize>true</Optimize> | ||||||
|     <DebugType> |     <DebugType> | ||||||
|     </DebugType> |     </DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   | |||||||
| @@ -62,6 +62,7 @@ | |||||||
|     <DebugType>full</DebugType> |     <DebugType>full</DebugType> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|  |     <PlatformTarget>x64</PlatformTarget> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||||||
|     <OutputPath>bin\Release\</OutputPath> |     <OutputPath>bin\Release\</OutputPath> | ||||||
| @@ -86,6 +87,7 @@ | |||||||
|     <DebugType>none</DebugType> |     <DebugType>none</DebugType> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|  |     <PlatformTarget>x64</PlatformTarget> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> | ||||||
|     <DebugSymbols>true</DebugSymbols> |     <DebugSymbols>true</DebugSymbols> | ||||||
| @@ -93,7 +95,7 @@ | |||||||
|     <DefineConstants>DEBUG;TRACE</DefineConstants> |     <DefineConstants>DEBUG;TRACE</DefineConstants> | ||||||
|     <BaseAddress>285212672</BaseAddress> |     <BaseAddress>285212672</BaseAddress> | ||||||
|     <DebugType>full</DebugType> |     <DebugType>full</DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
| @@ -104,7 +106,7 @@ | |||||||
|     <Optimize>true</Optimize> |     <Optimize>true</Optimize> | ||||||
|     <DebugType> |     <DebugType> | ||||||
|     </DebugType> |     </DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   | |||||||
| @@ -77,6 +77,7 @@ | |||||||
|     <DebugType>full</DebugType> |     <DebugType>full</DebugType> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|  |     <PlatformTarget>x64</PlatformTarget> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||||||
|     <OutputPath>bin\Release\</OutputPath> |     <OutputPath>bin\Release\</OutputPath> | ||||||
| @@ -101,6 +102,7 @@ | |||||||
|     <DebugType>none</DebugType> |     <DebugType>none</DebugType> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|  |     <PlatformTarget>x64</PlatformTarget> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> | ||||||
|     <DebugSymbols>true</DebugSymbols> |     <DebugSymbols>true</DebugSymbols> | ||||||
| @@ -108,7 +110,7 @@ | |||||||
|     <DefineConstants>DEBUG;TRACE</DefineConstants> |     <DefineConstants>DEBUG;TRACE</DefineConstants> | ||||||
|     <BaseAddress>285212672</BaseAddress> |     <BaseAddress>285212672</BaseAddress> | ||||||
|     <DebugType>full</DebugType> |     <DebugType>full</DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
| @@ -119,7 +121,7 @@ | |||||||
|     <Optimize>true</Optimize> |     <Optimize>true</Optimize> | ||||||
|     <DebugType> |     <DebugType> | ||||||
|     </DebugType> |     </DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   | |||||||
| @@ -7,7 +7,7 @@ | |||||||
|     <Optimize>true</Optimize> |     <Optimize>true</Optimize> | ||||||
|     <DebugType> |     <DebugType> | ||||||
|     </DebugType> |     </DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
| @@ -73,6 +73,7 @@ | |||||||
|     <DebugType>full</DebugType> |     <DebugType>full</DebugType> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|  |     <PlatformTarget>x64</PlatformTarget> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||||||
|     <OutputPath>bin\Release\</OutputPath> |     <OutputPath>bin\Release\</OutputPath> | ||||||
| @@ -97,6 +98,7 @@ | |||||||
|     <DebugType>none</DebugType> |     <DebugType>none</DebugType> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|  |     <PlatformTarget>x64</PlatformTarget> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> | ||||||
|     <DebugSymbols>true</DebugSymbols> |     <DebugSymbols>true</DebugSymbols> | ||||||
| @@ -104,7 +106,7 @@ | |||||||
|     <DefineConstants>DEBUG;TRACE</DefineConstants> |     <DefineConstants>DEBUG;TRACE</DefineConstants> | ||||||
|     <BaseAddress>285212672</BaseAddress> |     <BaseAddress>285212672</BaseAddress> | ||||||
|     <DebugType>full</DebugType> |     <DebugType>full</DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   | |||||||
| @@ -62,6 +62,7 @@ | |||||||
|     <DebugType>full</DebugType> |     <DebugType>full</DebugType> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|  |     <PlatformTarget>x64</PlatformTarget> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||||||
|     <OutputPath>bin\Release\</OutputPath> |     <OutputPath>bin\Release\</OutputPath> | ||||||
| @@ -86,6 +87,7 @@ | |||||||
|     <DebugType>none</DebugType> |     <DebugType>none</DebugType> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|  |     <PlatformTarget>x64</PlatformTarget> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> | ||||||
|     <DebugSymbols>true</DebugSymbols> |     <DebugSymbols>true</DebugSymbols> | ||||||
| @@ -93,7 +95,7 @@ | |||||||
|     <DefineConstants>DEBUG;TRACE</DefineConstants> |     <DefineConstants>DEBUG;TRACE</DefineConstants> | ||||||
|     <BaseAddress>285212672</BaseAddress> |     <BaseAddress>285212672</BaseAddress> | ||||||
|     <DebugType>full</DebugType> |     <DebugType>full</DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
| @@ -104,7 +106,7 @@ | |||||||
|     <Optimize>true</Optimize> |     <Optimize>true</Optimize> | ||||||
|     <DebugType> |     <DebugType> | ||||||
|     </DebugType> |     </DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   | |||||||
| @@ -62,6 +62,7 @@ | |||||||
|     <DebugType>full</DebugType> |     <DebugType>full</DebugType> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|  |     <PlatformTarget>x64</PlatformTarget> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||||||
|     <OutputPath>bin\Release\</OutputPath> |     <OutputPath>bin\Release\</OutputPath> | ||||||
| @@ -86,6 +87,7 @@ | |||||||
|     <DebugType>none</DebugType> |     <DebugType>none</DebugType> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|  |     <PlatformTarget>x64</PlatformTarget> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> |   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> | ||||||
|     <DebugSymbols>true</DebugSymbols> |     <DebugSymbols>true</DebugSymbols> | ||||||
| @@ -93,7 +95,7 @@ | |||||||
|     <DefineConstants>DEBUG;TRACE</DefineConstants> |     <DefineConstants>DEBUG;TRACE</DefineConstants> | ||||||
|     <BaseAddress>285212672</BaseAddress> |     <BaseAddress>285212672</BaseAddress> | ||||||
|     <DebugType>full</DebugType> |     <DebugType>full</DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
| @@ -104,7 +106,7 @@ | |||||||
|     <Optimize>true</Optimize> |     <Optimize>true</Optimize> | ||||||
|     <DebugType> |     <DebugType> | ||||||
|     </DebugType> |     </DebugType> | ||||||
|     <PlatformTarget>x86</PlatformTarget> |     <PlatformTarget>x64</PlatformTarget> | ||||||
|     <ErrorReport>prompt</ErrorReport> |     <ErrorReport>prompt</ErrorReport> | ||||||
|     <Prefer32Bit>false</Prefer32Bit> |     <Prefer32Bit>false</Prefer32Bit> | ||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|   | |||||||
| @@ -229,7 +229,7 @@ namespace RoAccessToSql | |||||||
| 					if (sqlConnection.State == ConnectionState.Open) | 					if (sqlConnection.State == ConnectionState.Open) | ||||||
| 					{ | 					{ | ||||||
| 						// now try to open access db: | 						// now try to open access db: | ||||||
| 						string strDatabaseConnectionCommand = "Provider=Microsoft.Jet.OLEDB.4.0;Password=\"\";User ID=Admin;Data Source=" + MSAccessPath + "\\ROMaster.mdb;Mode=Share Deny None;Extended Properties=\"\";Jet OLEDB:System database=\"\";Jet OLEDB:Registry Path=\"\";Jet OLEDB:Database Password=\"\";Jet OLEDB:Engine Type=5;Jet OLEDB:Database Locking Mode=1;Jet OLEDB:Global Partial Bulk Ops=2;Jet OLEDB:Global Bulk Transactions=1;Jet OLEDB:New Database Password=\"\";Jet OLEDB:Create System Database=False;Jet OLEDB:Encrypt Database=False;Jet OLEDB:Don't Copy Locale on Compact=False;Jet OLEDB:Compact Without Replica Repair=False;Jet OLEDB:SFP=False"; | 						string strDatabaseConnectionCommand = "Provider=Microsoft.ACE.OLEDB.12.0;Password=\"\";User ID=Admin;Data Source=" + MSAccessPath + "\\ROMaster.mdb;Mode=Share Deny None;Extended Properties=\"\";Jet OLEDB:System database=\"\";Jet OLEDB:Registry Path=\"\";Jet OLEDB:Database Password=\"\";Jet OLEDB:Engine Type=5;Jet OLEDB:Database Locking Mode=1;Jet OLEDB:Global Partial Bulk Ops=2;Jet OLEDB:Global Bulk Transactions=1;Jet OLEDB:New Database Password=\"\";Jet OLEDB:Create System Database=False;Jet OLEDB:Encrypt Database=False;Jet OLEDB:Don't Copy Locale on Compact=False;Jet OLEDB:Compact Without Replica Repair=False;Jet OLEDB:SFP=False"; | ||||||
| 						using (OleDbConnection accessConnection = new OleDbConnection(strDatabaseConnectionCommand)) | 						using (OleDbConnection accessConnection = new OleDbConnection(strDatabaseConnectionCommand)) | ||||||
| 						{ | 						{ | ||||||
| 							try | 							try | ||||||
|   | |||||||
| @@ -100,6 +100,17 @@ | |||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <None Include="App.config" /> |     <None Include="App.config" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
|  |   <ItemGroup> | ||||||
|  |     <COMReference Include="Microsoft.Office.Interop.Access.Dao"> | ||||||
|  |       <Guid>{4AC9E1DA-5BAD-4AC7-86E3-24F4CDCECA28}</Guid> | ||||||
|  |       <VersionMajor>12</VersionMajor> | ||||||
|  |       <VersionMinor>0</VersionMinor> | ||||||
|  |       <Lcid>0</Lcid> | ||||||
|  |       <WrapperTool>primary</WrapperTool> | ||||||
|  |       <Isolated>False</Isolated> | ||||||
|  |       <EmbedInteropTypes>True</EmbedInteropTypes> | ||||||
|  |     </COMReference> | ||||||
|  |   </ItemGroup> | ||||||
|   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> | ||||||
|   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.  |   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.  | ||||||
|        Other similar extension points exist, see Microsoft.Common.targets. |        Other similar extension points exist, see Microsoft.Common.targets. | ||||||
|   | |||||||
| @@ -1807,14 +1807,15 @@ namespace VEPROMS | |||||||
| 						// Deactivate previous procedure tab state by user | 						// Deactivate previous procedure tab state by user | ||||||
| 						VEPROMS.CSLA.Library.Item.DeactivateStateDisplayTabTmp(MySessionInfo.UserID); | 						VEPROMS.CSLA.Library.Item.DeactivateStateDisplayTabTmp(MySessionInfo.UserID); | ||||||
| 						// Save current procedure tab state | 						// Save current procedure tab state | ||||||
| 						foreach (KeyValuePair<string, DisplayTabItem> pgTab in tc._MyDisplayTabItems) |  | ||||||
|  | 						//B2024-082 Remember Tabs Not opening in correct order | ||||||
|  | 						foreach (DisplayTabItem dti in tc.MyBar.Items) | ||||||
| 						{ | 						{ | ||||||
| 							cnt++; | 							cnt++; | ||||||
| 							DisplayTabID = pgTab.Key; | 							DisplayTabID = dti.MyKey; | ||||||
| 							TabItemID = Int32.Parse(DisplayTabID.Substring(DisplayTabID.IndexOf("Item - ") + 7)); | 							TabItemID = dti.MyItemInfo.ItemID; | ||||||
| 							DisplayTabName = pgTab.Value.ToString(); | 							DisplayTabName = dti.ToString(); | ||||||
| 							//tc.SelectedDisplayTabItem.MyStepTabPanel.ToString() |                             Item.AddDisplayTabsState(TabItemID, DisplayTabID, DisplayTabName, MySessionInfo.UserID, cnt); | ||||||
| 							VEPROMS.CSLA.Library.Item.AddDisplayTabsState(TabItemID, DisplayTabID, DisplayTabName, MySessionInfo.UserID, cnt); |  | ||||||
| 						} | 						} | ||||||
| 					} | 					} | ||||||
|  |  | ||||||
| @@ -2513,6 +2514,7 @@ namespace VEPROMS | |||||||
| 						{ | 						{ | ||||||
| 							SelectedStepTabPanel.Select(); | 							SelectedStepTabPanel.Select(); | ||||||
| 							dlgFindReplace.MyEditItem = tc.MyEditItem; | 							dlgFindReplace.MyEditItem = tc.MyEditItem; | ||||||
|  | 							SpellChecker.MyEditItem = tc.MyEditItem;   //B2025-043 Remember Tabs is not setting the EditItem for the active window causing a PROMS crash when Spell Check | ||||||
| 						} | 						} | ||||||
| 					} | 					} | ||||||
| 				} | 				} | ||||||
|   | |||||||
| @@ -1638,7 +1638,7 @@ namespace VEPROMS.CSLA.Library | |||||||
| 						// get the first enhanced section, there may be non-linked sections before first linked section: | 						// get the first enhanced section, there may be non-linked sections before first linked section: | ||||||
| 						SectionConfig firstEnhSectionConfig = pastedEnhancedProc.Sections == null ? null : pastedEnhancedProc.Sections[0].MyConfig as SectionConfig; | 						SectionConfig firstEnhSectionConfig = pastedEnhancedProc.Sections == null ? null : pastedEnhancedProc.Sections[0].MyConfig as SectionConfig; | ||||||
| 						ItemInfo pastedEnhancedCurrentSection = null; | 						ItemInfo pastedEnhancedCurrentSection = null; | ||||||
| 						if (firstEnhSectionConfig.MyEnhancedDocuments.Count > 0) pastedEnhancedCurrentSection = pastedEnhancedProc.Sections[0]; | 						if (firstEnhSectionConfig?.MyEnhancedDocuments.Count > 0) pastedEnhancedCurrentSection = pastedEnhancedProc.Sections[0]; | ||||||
| 						else pastedEnhancedCurrentSection = GetNextEnhancedSection(pastedEnhancedProc.Sections[0]); | 						else pastedEnhancedCurrentSection = GetNextEnhancedSection(pastedEnhancedProc.Sections[0]); | ||||||
|  |  | ||||||
| 						// newly pasted procedure has sections/steps, need to adjust 'MyEnhancedDocuments' config items to point to correct | 						// newly pasted procedure has sections/steps, need to adjust 'MyEnhancedDocuments' config items to point to correct | ||||||
| @@ -1647,7 +1647,7 @@ namespace VEPROMS.CSLA.Library | |||||||
| 							foreach (ItemInfo sourceSect in Sections) | 							foreach (ItemInfo sourceSect in Sections) | ||||||
| 							{ | 							{ | ||||||
| 								SectionConfig srcCfg = sourceSect.MyConfig as SectionConfig; | 								SectionConfig srcCfg = sourceSect.MyConfig as SectionConfig; | ||||||
| 								if (srcCfg != null && (srcCfg.Section_LnkEnh=="Y" || srcCfg.Section_LnkEnh=="T") && srcCfg.MyEnhancedDocuments != null && srcCfg.MyEnhancedDocuments.Count > 0) | 								if (srcCfg != null && (srcCfg.Section_LnkEnh != "N") && srcCfg.MyEnhancedDocuments != null && srcCfg.MyEnhancedDocuments.Count > 0) | ||||||
| 								{ | 								{ | ||||||
| 									// use pastedEnhancedCurrentSection to link to: | 									// use pastedEnhancedCurrentSection to link to: | ||||||
| 									foreach (EnhancedDocument ed in srcCfg.MyEnhancedDocuments) | 									foreach (EnhancedDocument ed in srcCfg.MyEnhancedDocuments) | ||||||
| @@ -1664,7 +1664,7 @@ namespace VEPROMS.CSLA.Library | |||||||
| 									enhSectCfg.MyEnhancedDocuments[0].ItemID = sourceSect.ItemID; | 									enhSectCfg.MyEnhancedDocuments[0].ItemID = sourceSect.ItemID; | ||||||
| 									enhSectCfg.SaveEnhancedDocuments(); | 									enhSectCfg.SaveEnhancedDocuments(); | ||||||
| 									pastedEnhancedCurrentSection.SaveConfig(enhSectCfg.ToString()); | 									pastedEnhancedCurrentSection.SaveConfig(enhSectCfg.ToString()); | ||||||
| 									if (srcCfg.Section_LnkEnh == "Y") EnhancedSetStepLinks(sourceSect, enhProc.Type); //if steps, do them for this type | 									if (srcCfg.Section_LnkEnh != "T") EnhancedSetStepLinks(sourceSect, enhProc.Type); //if steps, do them for this type | ||||||
| 									pastedEnhancedCurrentSection = GetNextEnhancedSection(pastedEnhancedCurrentSection); | 									pastedEnhancedCurrentSection = GetNextEnhancedSection(pastedEnhancedCurrentSection); | ||||||
| 								} | 								} | ||||||
| 							} | 							} | ||||||
|   | |||||||
| @@ -42,7 +42,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoAccessToSql", "..\RoAcces | |||||||
| 		{AEEE9FD1-6892-45E2-A67E-418C06D46FF9} = {AEEE9FD1-6892-45E2-A67E-418C06D46FF9} | 		{AEEE9FD1-6892-45E2-A67E-418C06D46FF9} = {AEEE9FD1-6892-45E2-A67E-418C06D46FF9} | ||||||
| 	EndProjectSection | 	EndProjectSection | ||||||
| EndProject | EndProject | ||||||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VlnStatus64", "VlnStatus64\VlnStatus64.csproj", "{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}" | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VlnStatus", "..\ReferencedObjects\LibSource\VlnStatus\VlnStatus.csproj", "{551CB7B3-00B1-11D7-8590-482B59000000}" | ||||||
| EndProject | EndProject | ||||||
| Global | Global | ||||||
| 	GlobalSection(SolutionConfigurationPlatforms) = preSolution | 	GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||||||
| @@ -550,38 +550,38 @@ Global | |||||||
| 		{1EC96BDA-01E7-4153-A95D-6A4A36FA278E}.Release|Mixed Platforms.Build.0 = Release|Any CPU | 		{1EC96BDA-01E7-4153-A95D-6A4A36FA278E}.Release|Mixed Platforms.Build.0 = Release|Any CPU | ||||||
| 		{1EC96BDA-01E7-4153-A95D-6A4A36FA278E}.Release|Win32.ActiveCfg = Release|Any CPU | 		{1EC96BDA-01E7-4153-A95D-6A4A36FA278E}.Release|Win32.ActiveCfg = Release|Any CPU | ||||||
| 		{1EC96BDA-01E7-4153-A95D-6A4A36FA278E}.Release|x86.ActiveCfg = Release|Any CPU | 		{1EC96BDA-01E7-4153-A95D-6A4A36FA278E}.Release|x86.ActiveCfg = Release|Any CPU | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Debug|Any CPU.Build.0 = Debug|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Mixed Platforms.Build.0 = Debug|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Debug|Win32.ActiveCfg = Debug|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Win32.ActiveCfg = Debug|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Debug|Win32.Build.0 = Debug|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Win32.Build.0 = Debug|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Debug|x86.ActiveCfg = Debug|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|x86.ActiveCfg = Debug|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Debug|x86.Build.0 = Debug|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Debug|x86.Build.0 = Debug|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Demo|Any CPU.ActiveCfg = Debug|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Demo|Any CPU.ActiveCfg = Debug|Any CPU | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Demo|Any CPU.Build.0 = Debug|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Demo|Any CPU.Build.0 = Debug|Any CPU | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Demo|Mixed Platforms.ActiveCfg = Debug|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Demo|Mixed Platforms.ActiveCfg = Debug|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Demo|Mixed Platforms.Build.0 = Debug|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Demo|Mixed Platforms.Build.0 = Debug|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Demo|Win32.ActiveCfg = Debug|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Demo|Win32.ActiveCfg = Debug|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Demo|Win32.Build.0 = Debug|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Demo|Win32.Build.0 = Debug|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Demo|x86.ActiveCfg = Debug|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Demo|x86.ActiveCfg = Debug|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Demo|x86.Build.0 = Debug|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Demo|x86.Build.0 = Debug|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Release_PreRegistered|Any CPU.ActiveCfg = Release|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Release_PreRegistered|Any CPU.ActiveCfg = Release|Any CPU | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Release_PreRegistered|Any CPU.Build.0 = Release|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Release_PreRegistered|Any CPU.Build.0 = Release|Any CPU | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Release_PreRegistered|Mixed Platforms.ActiveCfg = Release|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Release_PreRegistered|Mixed Platforms.ActiveCfg = Release|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Release_PreRegistered|Mixed Platforms.Build.0 = Release|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Release_PreRegistered|Mixed Platforms.Build.0 = Release|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Release_PreRegistered|Win32.ActiveCfg = Release|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Release_PreRegistered|Win32.ActiveCfg = Release|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Release_PreRegistered|Win32.Build.0 = Release|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Release_PreRegistered|Win32.Build.0 = Release|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Release_PreRegistered|x86.ActiveCfg = Release|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Release_PreRegistered|x86.ActiveCfg = Release|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Release_PreRegistered|x86.Build.0 = Release|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Release_PreRegistered|x86.Build.0 = Release|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Release|Any CPU.ActiveCfg = Release|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Release|Any CPU.Build.0 = Release|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Release|Mixed Platforms.ActiveCfg = Release|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Release|Mixed Platforms.Build.0 = Release|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Release|Mixed Platforms.Build.0 = Release|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Release|Win32.ActiveCfg = Release|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Release|Win32.ActiveCfg = Release|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Release|Win32.Build.0 = Release|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Release|Win32.Build.0 = Release|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Release|x86.ActiveCfg = Release|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Release|x86.ActiveCfg = Release|x86 | ||||||
| 		{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}.Release|x86.Build.0 = Release|Any CPU | 		{551CB7B3-00B1-11D7-8590-482B59000000}.Release|x86.Build.0 = Release|x86 | ||||||
| 	EndGlobalSection | 	EndGlobalSection | ||||||
| 	GlobalSection(SolutionProperties) = preSolution | 	GlobalSection(SolutionProperties) = preSolution | ||||||
| 		HideSolutionNode = FALSE | 		HideSolutionNode = FALSE | ||||||
|   | |||||||
| @@ -1,232 +0,0 @@ | |||||||
| /********************************************************************************************* |  | ||||||
|  * Copyright 2002 - Volian Enterprises, Inc. All rights reserved. |  | ||||||
|  * Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE |  | ||||||
|  * ------------------------------------------------------------------------------ |  | ||||||
|  * $Workfile: StatusBarFrm.cs $     $Revision: 3 $ |  | ||||||
|  * $Author: Jsj $   $Date: 4/08/04 9:50a $ |  | ||||||
|  * |  | ||||||
|  * $History: StatusBarFrm.cs $ |  | ||||||
|  *  |  | ||||||
|  * *****************  Version 3  ***************** |  | ||||||
|  * User: Jsj          Date: 4/08/04    Time: 9:50a |  | ||||||
|  * Updated in $/LibSource/VlnStatus |  | ||||||
|  * added profile code and try to optimize |  | ||||||
|  *  |  | ||||||
|  * *****************  Version 2  ***************** |  | ||||||
|  * User: Jsj          Date: 11/26/02   Time: 3:38p |  | ||||||
|  * Updated in $/LibSource/VlnStatus |  | ||||||
|  * Added overbounds check |  | ||||||
|  *********************************************************************************************/ |  | ||||||
|  |  | ||||||
| using System; |  | ||||||
| using System.Drawing; |  | ||||||
| using System.Collections; |  | ||||||
| using System.ComponentModel; |  | ||||||
| using System.Windows.Forms; |  | ||||||
| //using ROProfiler; //don't forget to add VlnProfiler to the reference list |  | ||||||
|  |  | ||||||
| namespace VlnStatus |  | ||||||
| { |  | ||||||
| 	/// <summary> |  | ||||||
| 	/// Create a status window with a progress bar |  | ||||||
| 	/// </summary> |  | ||||||
| 	public class StatusBarFrm : System.Windows.Forms.Form |  | ||||||
| 	{ |  | ||||||
| 		private System.Windows.Forms.ProgressBar progressBar1; |  | ||||||
| 		private System.Windows.Forms.Label lblBar; |  | ||||||
| 		private System.Windows.Forms.Label StatMsg; |  | ||||||
| //		private string strLblLast=""; |  | ||||||
| 		/// <summary> |  | ||||||
| 		/// Required designer variable. |  | ||||||
| 		/// </summary> |  | ||||||
| 		private System.ComponentModel.Container components = null; |  | ||||||
|  |  | ||||||
| 		public StatusBarFrm() |  | ||||||
| 		{ |  | ||||||
| 			// |  | ||||||
| 			// Required for Windows Form Designer support |  | ||||||
| 			// |  | ||||||
| 			InitializeComponent(); |  | ||||||
|  |  | ||||||
| 			Text = "Status"; |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		public StatusBarFrm(string StatusBoxTitle) |  | ||||||
| 		{ |  | ||||||
| 			// |  | ||||||
| 			// Required for Windows Form Designer support |  | ||||||
| 			// |  | ||||||
| 			InitializeComponent(); |  | ||||||
|  |  | ||||||
| 			Text = StatusBoxTitle; |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		/// <summary> |  | ||||||
| 		/// Clean up any resources being used. |  | ||||||
| 		/// </summary> |  | ||||||
| 		protected override void Dispose( bool disposing ) |  | ||||||
| 		{ |  | ||||||
| 			if( disposing ) |  | ||||||
| 			{ |  | ||||||
| 				if(components != null) |  | ||||||
| 				{ |  | ||||||
| 					components.Dispose(); |  | ||||||
| 				} |  | ||||||
| 			} |  | ||||||
| 			base.Dispose( disposing ); |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		#region Windows Form Designer generated code |  | ||||||
| 		/// <summary> |  | ||||||
| 		/// Required method for Designer support - do not modify |  | ||||||
| 		/// the contents of this method with the code editor. |  | ||||||
| 		/// </summary> |  | ||||||
| 		private void InitializeComponent() |  | ||||||
| 		{ |  | ||||||
| 			this.progressBar1 = new System.Windows.Forms.ProgressBar(); |  | ||||||
| 			this.lblBar = new System.Windows.Forms.Label(); |  | ||||||
| 			this.StatMsg = new System.Windows.Forms.Label(); |  | ||||||
| 			this.SuspendLayout(); |  | ||||||
| 			//  |  | ||||||
| 			// progressBar1 |  | ||||||
| 			//  |  | ||||||
| 			this.progressBar1.Location = new System.Drawing.Point(29, 83); |  | ||||||
| 			this.progressBar1.Name = "progressBar1"; |  | ||||||
| 			this.progressBar1.Size = new System.Drawing.Size(297, 27); |  | ||||||
| 			this.progressBar1.TabIndex = 0; |  | ||||||
| 			//  |  | ||||||
| 			// lblBar |  | ||||||
| 			//  |  | ||||||
| 			this.lblBar.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0))); |  | ||||||
| 			this.lblBar.Location = new System.Drawing.Point(29, 136); |  | ||||||
| 			this.lblBar.Name = "lblBar"; |  | ||||||
| 			this.lblBar.Size = new System.Drawing.Size(297, 16); |  | ||||||
| 			this.lblBar.TabIndex = 1; |  | ||||||
| 			this.lblBar.Text = "% Complete"; |  | ||||||
| 			this.lblBar.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |  | ||||||
| 			//  |  | ||||||
| 			// StatMsg |  | ||||||
| 			//  |  | ||||||
| 			this.StatMsg.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0))); |  | ||||||
| 			this.StatMsg.Location = new System.Drawing.Point(29, 18); |  | ||||||
| 			this.StatMsg.Name = "StatMsg"; |  | ||||||
| 			this.StatMsg.Size = new System.Drawing.Size(307, 56); |  | ||||||
| 			this.StatMsg.TabIndex = 2; |  | ||||||
| 			this.StatMsg.Text = "Progress Bar"; |  | ||||||
| 			this.StatMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |  | ||||||
| 			//  |  | ||||||
| 			// StatusBarFrm |  | ||||||
| 			//  |  | ||||||
| 			this.AutoScaleBaseSize = new System.Drawing.Size(6, 15); |  | ||||||
| 			this.ClientSize = new System.Drawing.Size(350, 171); |  | ||||||
| 			this.ControlBox = false; |  | ||||||
| 			this.Controls.Add(this.StatMsg); |  | ||||||
| 			this.Controls.Add(this.lblBar); |  | ||||||
| 			this.Controls.Add(this.progressBar1); |  | ||||||
| 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; |  | ||||||
| 			this.MaximizeBox = false; |  | ||||||
| 			this.MinimizeBox = false; |  | ||||||
| 			this.Name = "StatusBarFrm"; |  | ||||||
| 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; |  | ||||||
| 			this.Text = "Status"; |  | ||||||
| 			this.TopMost = true; |  | ||||||
| 			this.Load += new System.EventHandler(this.StatusBarFrm_Load); |  | ||||||
| 			this.ResumeLayout(false); |  | ||||||
|  |  | ||||||
| 		} |  | ||||||
| 		#endregion |  | ||||||
|  |  | ||||||
| 		private void StatusBarFrm_Load(object sender, System.EventArgs e) |  | ||||||
| 		{ |  | ||||||
| 		 |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		public int Value |  | ||||||
| 		{ |  | ||||||
| 			get |  | ||||||
| 			{ |  | ||||||
| 				return progressBar1.Value; |  | ||||||
| 			} |  | ||||||
| 			set |  | ||||||
| 			{ |  | ||||||
| 				if (value >= progressBar1.Maximum) |  | ||||||
| 					progressBar1.Value = progressBar1.Maximum; |  | ||||||
| 				else |  | ||||||
| 					progressBar1.Value = value; |  | ||||||
| 				UpateLabel(); |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		public int Maximum |  | ||||||
| 		{ |  | ||||||
| 			get |  | ||||||
| 			{ |  | ||||||
| 				return progressBar1.Maximum; |  | ||||||
| 			} |  | ||||||
| 			set |  | ||||||
| 			{ |  | ||||||
| 				progressBar1.Maximum = value; |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		public int Step |  | ||||||
| 		{ |  | ||||||
| 			get |  | ||||||
| 			{ |  | ||||||
| 				return progressBar1.Step; |  | ||||||
| 			} |  | ||||||
| 			set |  | ||||||
| 			{ |  | ||||||
| 				progressBar1.Step = value; |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		public void PerformStep() |  | ||||||
| 		{ |  | ||||||
| 			progressBar1.PerformStep(); |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		private void UpateLabel() |  | ||||||
| 		{ |  | ||||||
| 			lblBar.Text = (Math.Round((decimal)(progressBar1.Value * 100) / progressBar1.Maximum)).ToString(); |  | ||||||
| 			lblBar.Text += "% Complete"; |  | ||||||
| //			if( lblBar.Text != strLblLast) |  | ||||||
| //			{ |  | ||||||
| //				Profiler.Start("UpdateLabel"); |  | ||||||
| 				lblBar.Refresh(); |  | ||||||
| //				lblBar.Update(); |  | ||||||
| //				Profiler.End("UpdateLabel"); |  | ||||||
| //			} |  | ||||||
| //			strLblLast = lblBar.Text; |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		public string StatusMessage |  | ||||||
| 		{ |  | ||||||
| 			get |  | ||||||
| 			{ |  | ||||||
| 				return StatMsg.Text; |  | ||||||
| 			} |  | ||||||
| 			set |  | ||||||
| 			{ |  | ||||||
| 				StatMsg.Text = value; |  | ||||||
| //				Profiler.Start("StatusMessage"); |  | ||||||
| 				StatMsg.Refresh(); |  | ||||||
| //				StatMsg.Update(); |  | ||||||
| //				Profiler.End("StatusMessage"); |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		public string StatusBoxTitle |  | ||||||
| 		{ |  | ||||||
| 			get |  | ||||||
| 			{ |  | ||||||
| 				return Text; |  | ||||||
| 			} |  | ||||||
| 			set |  | ||||||
| 			{ |  | ||||||
| 				Text = value; |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
| @@ -1,157 +0,0 @@ | |||||||
| <?xml version="1.0" encoding="utf-8"?> |  | ||||||
| <root> |  | ||||||
|   <!--  |  | ||||||
|     Microsoft ResX Schema  |  | ||||||
|      |  | ||||||
|     Version 1.3 |  | ||||||
|      |  | ||||||
|     The primary goals of this format is to allow a simple XML format  |  | ||||||
|     that is mostly human readable. The generation and parsing of the  |  | ||||||
|     various data types are done through the TypeConverter classes  |  | ||||||
|     associated with the data types. |  | ||||||
|      |  | ||||||
|     Example: |  | ||||||
|      |  | ||||||
|     ... ado.net/XML headers & schema ... |  | ||||||
|     <resheader name="resmimetype">text/microsoft-resx</resheader> |  | ||||||
|     <resheader name="version">1.3</resheader> |  | ||||||
|     <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> |  | ||||||
|     <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> |  | ||||||
|     <data name="Name1">this is my long string</data> |  | ||||||
|     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> |  | ||||||
|     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> |  | ||||||
|         [base64 mime encoded serialized .NET Framework object] |  | ||||||
|     </data> |  | ||||||
|     <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> |  | ||||||
|         [base64 mime encoded string representing a byte array form of the .NET Framework object] |  | ||||||
|     </data> |  | ||||||
|                  |  | ||||||
|     There are any number of "resheader" rows that contain simple  |  | ||||||
|     name/value pairs. |  | ||||||
|      |  | ||||||
|     Each data row contains a name, and value. The row also contains a  |  | ||||||
|     type or mimetype. Type corresponds to a .NET class that support  |  | ||||||
|     text/value conversion through the TypeConverter architecture.  |  | ||||||
|     Classes that don't support this are serialized and stored with the  |  | ||||||
|     mimetype set. |  | ||||||
|      |  | ||||||
|     The mimetype is used forserialized objects, and tells the  |  | ||||||
|     ResXResourceReader how to depersist the object. This is currently not  |  | ||||||
|     extensible. For a given mimetype the value must be set accordingly: |  | ||||||
|      |  | ||||||
|     Note - application/x-microsoft.net.object.binary.base64 is the format  |  | ||||||
|     that the ResXResourceWriter will generate, however the reader can  |  | ||||||
|     read any of the formats listed below. |  | ||||||
|      |  | ||||||
|     mimetype: application/x-microsoft.net.object.binary.base64 |  | ||||||
|     value   : The object must be serialized with  |  | ||||||
|             : System.Serialization.Formatters.Binary.BinaryFormatter |  | ||||||
|             : and then encoded with base64 encoding. |  | ||||||
|      |  | ||||||
|     mimetype: application/x-microsoft.net.object.soap.base64 |  | ||||||
|     value   : The object must be serialized with  |  | ||||||
|             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter |  | ||||||
|             : and then encoded with base64 encoding. |  | ||||||
|  |  | ||||||
|     mimetype: application/x-microsoft.net.object.bytearray.base64 |  | ||||||
|     value   : The object must be serialized into a byte array  |  | ||||||
|             : using a System.ComponentModel.TypeConverter |  | ||||||
|             : and then encoded with base64 encoding. |  | ||||||
|     --> |  | ||||||
|   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> |  | ||||||
|     <xsd:element name="root" msdata:IsDataSet="true"> |  | ||||||
|       <xsd:complexType> |  | ||||||
|         <xsd:choice maxOccurs="unbounded"> |  | ||||||
|           <xsd:element name="data"> |  | ||||||
|             <xsd:complexType> |  | ||||||
|               <xsd:sequence> |  | ||||||
|                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> |  | ||||||
|                 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> |  | ||||||
|               </xsd:sequence> |  | ||||||
|               <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" /> |  | ||||||
|               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> |  | ||||||
|               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> |  | ||||||
|             </xsd:complexType> |  | ||||||
|           </xsd:element> |  | ||||||
|           <xsd:element name="resheader"> |  | ||||||
|             <xsd:complexType> |  | ||||||
|               <xsd:sequence> |  | ||||||
|                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> |  | ||||||
|               </xsd:sequence> |  | ||||||
|               <xsd:attribute name="name" type="xsd:string" use="required" /> |  | ||||||
|             </xsd:complexType> |  | ||||||
|           </xsd:element> |  | ||||||
|         </xsd:choice> |  | ||||||
|       </xsd:complexType> |  | ||||||
|     </xsd:element> |  | ||||||
|   </xsd:schema> |  | ||||||
|   <resheader name="resmimetype"> |  | ||||||
|     <value>text/microsoft-resx</value> |  | ||||||
|   </resheader> |  | ||||||
|   <resheader name="version"> |  | ||||||
|     <value>1.3</value> |  | ||||||
|   </resheader> |  | ||||||
|   <resheader name="reader"> |  | ||||||
|     <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> |  | ||||||
|   </resheader> |  | ||||||
|   <resheader name="writer"> |  | ||||||
|     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> |  | ||||||
|   </resheader> |  | ||||||
|   <data name="progressBar1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>False</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="progressBar1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>Private</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="progressBar1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>Private</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="lblBar.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>False</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="lblBar.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>Private</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="lblBar.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>Private</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="StatMsg.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>False</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="StatMsg.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>Private</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="StatMsg.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>Private</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>False</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>(Default)</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>False</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>False</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> |  | ||||||
|     <value>8, 8</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>True</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>80</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="$this.Name"> |  | ||||||
|     <value>StatusBarFrm</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>True</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>Private</value> |  | ||||||
|   </data> |  | ||||||
| </root> |  | ||||||
| @@ -1,140 +0,0 @@ | |||||||
| /********************************************************************************************* |  | ||||||
|  * Copyright 2002 - Volian Enterprises, Inc. All rights reserved. |  | ||||||
|  * Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE |  | ||||||
|  * ------------------------------------------------------------------------------ |  | ||||||
|  * $Workfile: StatusMessageFrm.cs $     $Revision: 3 $ |  | ||||||
|  * $Author: Jsj $   $Date: 5/11/04 9:30a $ |  | ||||||
|  * |  | ||||||
|  * $History: StatusMessageFrm.cs $ |  | ||||||
|  *  |  | ||||||
|  * *****************  Version 3  ***************** |  | ||||||
|  * User: Jsj          Date: 5/11/04    Time: 9:30a |  | ||||||
|  * Updated in $/LibSource/VlnStatus |  | ||||||
|  *  |  | ||||||
|  * *****************  Version 2  ***************** |  | ||||||
|  * User: Jsj          Date: 11/26/02   Time: 3:38p |  | ||||||
|  * Updated in $/LibSource/VlnStatus |  | ||||||
|  * Added overbounds check |  | ||||||
|  *********************************************************************************************/ |  | ||||||
|  |  | ||||||
| using System; |  | ||||||
| using System.Drawing; |  | ||||||
| using System.Collections; |  | ||||||
| using System.ComponentModel; |  | ||||||
| using System.Windows.Forms; |  | ||||||
|  |  | ||||||
| namespace VlnStatus |  | ||||||
| { |  | ||||||
| 	/// <summary> |  | ||||||
| 	/// Create status message window. |  | ||||||
| 	/// </summary> |  | ||||||
| 	public class StatusMessageFrm : System.Windows.Forms.Form |  | ||||||
| 	{ |  | ||||||
| 		private System.Windows.Forms.Label lblStatMsg; |  | ||||||
| 		/// <summary> |  | ||||||
| 		/// Required designer variable. |  | ||||||
| 		/// </summary> |  | ||||||
| 		private System.ComponentModel.Container components = null; |  | ||||||
|  |  | ||||||
| 		public StatusMessageFrm() |  | ||||||
| 		{ |  | ||||||
| 			// |  | ||||||
| 			// Required for Windows Form Designer support |  | ||||||
| 			// |  | ||||||
| 			InitializeComponent(); |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		public StatusMessageFrm(string StatTitle) |  | ||||||
| 		{ |  | ||||||
| 			// |  | ||||||
| 			// Required for Windows Form Designer support |  | ||||||
| 			// |  | ||||||
| 			InitializeComponent(); |  | ||||||
|  |  | ||||||
| 			Text = StatTitle; |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		/// <summary> |  | ||||||
| 		/// Clean up any resources being used. |  | ||||||
| 		/// </summary> |  | ||||||
| 		protected override void Dispose( bool disposing ) |  | ||||||
| 		{ |  | ||||||
| 			if( disposing ) |  | ||||||
| 			{ |  | ||||||
| 				if(components != null) |  | ||||||
| 				{ |  | ||||||
| 					components.Dispose(); |  | ||||||
| 				} |  | ||||||
| 			} |  | ||||||
| 			base.Dispose( disposing ); |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		#region Windows Form Designer generated code |  | ||||||
| 		/// <summary> |  | ||||||
| 		/// Required method for Designer support - do not modify |  | ||||||
| 		/// the contents of this method with the code editor. |  | ||||||
| 		/// </summary> |  | ||||||
| 		private void InitializeComponent() |  | ||||||
| 		{ |  | ||||||
| 			this.lblStatMsg = new System.Windows.Forms.Label(); |  | ||||||
| 			this.SuspendLayout(); |  | ||||||
| 			//  |  | ||||||
| 			// lblStatMsg |  | ||||||
| 			//  |  | ||||||
| 			this.lblStatMsg.Location = new System.Drawing.Point(19, 20); |  | ||||||
| 			this.lblStatMsg.Name = "lblStatMsg"; |  | ||||||
| 			this.lblStatMsg.Size = new System.Drawing.Size(420, 81); |  | ||||||
| 			this.lblStatMsg.TabIndex = 0; |  | ||||||
| 			this.lblStatMsg.Text = "Put Status Message Here"; |  | ||||||
| 			this.lblStatMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |  | ||||||
| 			//  |  | ||||||
| 			// StatusMessageFrm |  | ||||||
| 			//  |  | ||||||
| 			this.AutoScaleBaseSize = new System.Drawing.Size(7, 19); |  | ||||||
| 			this.ClientSize = new System.Drawing.Size(457, 117); |  | ||||||
| 			this.ControlBox = false; |  | ||||||
| 			this.Controls.Add(this.lblStatMsg); |  | ||||||
| 			this.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0))); |  | ||||||
| 			this.MaximizeBox = false; |  | ||||||
| 			this.MinimizeBox = false; |  | ||||||
| 			this.Name = "StatusMessageFrm"; |  | ||||||
| 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; |  | ||||||
| 			this.Text = "Status"; |  | ||||||
| 			this.TopMost = true; |  | ||||||
| 			this.Load += new System.EventHandler(this.StatusMessageFrm_Load); |  | ||||||
| 			this.ResumeLayout(false); |  | ||||||
|  |  | ||||||
| 		} |  | ||||||
| 		#endregion |  | ||||||
|  |  | ||||||
| 		private void StatusMessageFrm_Load(object sender, System.EventArgs e) |  | ||||||
| 		{ |  | ||||||
| 		 |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		public string StatusMessage |  | ||||||
| 		{ |  | ||||||
| 			get |  | ||||||
| 			{ |  | ||||||
| 				return lblStatMsg.Text; |  | ||||||
| 			} |  | ||||||
| 			set |  | ||||||
| 			{ |  | ||||||
| 				lblStatMsg.Text = value; |  | ||||||
| 				lblStatMsg.Refresh(); |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		public string StatusBoxTitle |  | ||||||
| 		{ |  | ||||||
| 			get |  | ||||||
| 			{ |  | ||||||
| 				return Text; |  | ||||||
| 			} |  | ||||||
| 			set |  | ||||||
| 			{ |  | ||||||
| 				Text = value; |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
| @@ -1,139 +0,0 @@ | |||||||
| <?xml version="1.0" encoding="utf-8"?> |  | ||||||
| <root> |  | ||||||
|   <!--  |  | ||||||
|     Microsoft ResX Schema  |  | ||||||
|      |  | ||||||
|     Version 1.3 |  | ||||||
|      |  | ||||||
|     The primary goals of this format is to allow a simple XML format  |  | ||||||
|     that is mostly human readable. The generation and parsing of the  |  | ||||||
|     various data types are done through the TypeConverter classes  |  | ||||||
|     associated with the data types. |  | ||||||
|      |  | ||||||
|     Example: |  | ||||||
|      |  | ||||||
|     ... ado.net/XML headers & schema ... |  | ||||||
|     <resheader name="resmimetype">text/microsoft-resx</resheader> |  | ||||||
|     <resheader name="version">1.3</resheader> |  | ||||||
|     <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> |  | ||||||
|     <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> |  | ||||||
|     <data name="Name1">this is my long string</data> |  | ||||||
|     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> |  | ||||||
|     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> |  | ||||||
|         [base64 mime encoded serialized .NET Framework object] |  | ||||||
|     </data> |  | ||||||
|     <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> |  | ||||||
|         [base64 mime encoded string representing a byte array form of the .NET Framework object] |  | ||||||
|     </data> |  | ||||||
|                  |  | ||||||
|     There are any number of "resheader" rows that contain simple  |  | ||||||
|     name/value pairs. |  | ||||||
|      |  | ||||||
|     Each data row contains a name, and value. The row also contains a  |  | ||||||
|     type or mimetype. Type corresponds to a .NET class that support  |  | ||||||
|     text/value conversion through the TypeConverter architecture.  |  | ||||||
|     Classes that don't support this are serialized and stored with the  |  | ||||||
|     mimetype set. |  | ||||||
|      |  | ||||||
|     The mimetype is used forserialized objects, and tells the  |  | ||||||
|     ResXResourceReader how to depersist the object. This is currently not  |  | ||||||
|     extensible. For a given mimetype the value must be set accordingly: |  | ||||||
|      |  | ||||||
|     Note - application/x-microsoft.net.object.binary.base64 is the format  |  | ||||||
|     that the ResXResourceWriter will generate, however the reader can  |  | ||||||
|     read any of the formats listed below. |  | ||||||
|      |  | ||||||
|     mimetype: application/x-microsoft.net.object.binary.base64 |  | ||||||
|     value   : The object must be serialized with  |  | ||||||
|             : System.Serialization.Formatters.Binary.BinaryFormatter |  | ||||||
|             : and then encoded with base64 encoding. |  | ||||||
|      |  | ||||||
|     mimetype: application/x-microsoft.net.object.soap.base64 |  | ||||||
|     value   : The object must be serialized with  |  | ||||||
|             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter |  | ||||||
|             : and then encoded with base64 encoding. |  | ||||||
|  |  | ||||||
|     mimetype: application/x-microsoft.net.object.bytearray.base64 |  | ||||||
|     value   : The object must be serialized into a byte array  |  | ||||||
|             : using a System.ComponentModel.TypeConverter |  | ||||||
|             : and then encoded with base64 encoding. |  | ||||||
|     --> |  | ||||||
|   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> |  | ||||||
|     <xsd:element name="root" msdata:IsDataSet="true"> |  | ||||||
|       <xsd:complexType> |  | ||||||
|         <xsd:choice maxOccurs="unbounded"> |  | ||||||
|           <xsd:element name="data"> |  | ||||||
|             <xsd:complexType> |  | ||||||
|               <xsd:sequence> |  | ||||||
|                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> |  | ||||||
|                 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> |  | ||||||
|               </xsd:sequence> |  | ||||||
|               <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" /> |  | ||||||
|               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> |  | ||||||
|               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> |  | ||||||
|             </xsd:complexType> |  | ||||||
|           </xsd:element> |  | ||||||
|           <xsd:element name="resheader"> |  | ||||||
|             <xsd:complexType> |  | ||||||
|               <xsd:sequence> |  | ||||||
|                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> |  | ||||||
|               </xsd:sequence> |  | ||||||
|               <xsd:attribute name="name" type="xsd:string" use="required" /> |  | ||||||
|             </xsd:complexType> |  | ||||||
|           </xsd:element> |  | ||||||
|         </xsd:choice> |  | ||||||
|       </xsd:complexType> |  | ||||||
|     </xsd:element> |  | ||||||
|   </xsd:schema> |  | ||||||
|   <resheader name="resmimetype"> |  | ||||||
|     <value>text/microsoft-resx</value> |  | ||||||
|   </resheader> |  | ||||||
|   <resheader name="version"> |  | ||||||
|     <value>1.3</value> |  | ||||||
|   </resheader> |  | ||||||
|   <resheader name="reader"> |  | ||||||
|     <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> |  | ||||||
|   </resheader> |  | ||||||
|   <resheader name="writer"> |  | ||||||
|     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> |  | ||||||
|   </resheader> |  | ||||||
|   <data name="lblStatMsg.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>False</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="lblStatMsg.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>Private</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="lblStatMsg.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>Private</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>False</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>(Default)</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>False</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>False</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> |  | ||||||
|     <value>8, 8</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="$this.Name"> |  | ||||||
|     <value>StatusMessageFrm</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>True</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>80</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>True</value> |  | ||||||
|   </data> |  | ||||||
|   <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |  | ||||||
|     <value>Private</value> |  | ||||||
|   </data> |  | ||||||
| </root> |  | ||||||
| @@ -1,58 +0,0 @@ | |||||||
| <?xml version="1.0" encoding="utf-8"?> |  | ||||||
| <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |  | ||||||
|   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> |  | ||||||
|   <PropertyGroup> |  | ||||||
|     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |  | ||||||
|     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |  | ||||||
|     <ProjectGuid>{797DE52C-278C-41D4-8B65-B9CFC02DDCD9}</ProjectGuid> |  | ||||||
|     <OutputType>Library</OutputType> |  | ||||||
|     <AppDesignerFolder>Properties</AppDesignerFolder> |  | ||||||
|     <RootNamespace>VlnStatus64</RootNamespace> |  | ||||||
|     <AssemblyName>VlnStatus64</AssemblyName> |  | ||||||
|     <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion> |  | ||||||
|     <FileAlignment>512</FileAlignment> |  | ||||||
|     <Deterministic>true</Deterministic> |  | ||||||
|   </PropertyGroup> |  | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |  | ||||||
|     <DebugSymbols>true</DebugSymbols> |  | ||||||
|     <DebugType>full</DebugType> |  | ||||||
|     <Optimize>false</Optimize> |  | ||||||
|     <OutputPath>bin\Debug\</OutputPath> |  | ||||||
|     <DefineConstants>DEBUG;TRACE</DefineConstants> |  | ||||||
|     <ErrorReport>prompt</ErrorReport> |  | ||||||
|     <WarningLevel>4</WarningLevel> |  | ||||||
|     <PlatformTarget>x64</PlatformTarget> |  | ||||||
|   </PropertyGroup> |  | ||||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |  | ||||||
|     <DebugType>pdbonly</DebugType> |  | ||||||
|     <Optimize>true</Optimize> |  | ||||||
|     <OutputPath>bin\Release\</OutputPath> |  | ||||||
|     <DefineConstants>TRACE</DefineConstants> |  | ||||||
|     <ErrorReport>prompt</ErrorReport> |  | ||||||
|     <WarningLevel>4</WarningLevel> |  | ||||||
|     <PlatformTarget>x64</PlatformTarget> |  | ||||||
|   </PropertyGroup> |  | ||||||
|   <ItemGroup> |  | ||||||
|     <Reference Include="System" /> |  | ||||||
|     <Reference Include="System.Data" /> |  | ||||||
|     <Reference Include="System.Drawing" /> |  | ||||||
|     <Reference Include="System.Windows.Forms" /> |  | ||||||
|     <Reference Include="System.Xml" /> |  | ||||||
|   </ItemGroup> |  | ||||||
|   <ItemGroup> |  | ||||||
|     <Compile Include="Properties\AssemblyInfo.cs" /> |  | ||||||
|     <Compile Include="StatusBarFrm.cs"> |  | ||||||
|       <SubType>Form</SubType> |  | ||||||
|     </Compile> |  | ||||||
|     <Compile Include="StatusMessageFrm.cs"> |  | ||||||
|       <SubType>Form</SubType> |  | ||||||
|     </Compile> |  | ||||||
|     <Compile Include="VlnStatusBar.cs" /> |  | ||||||
|     <Compile Include="VlnStatusMessage.cs" /> |  | ||||||
|   </ItemGroup> |  | ||||||
|   <ItemGroup> |  | ||||||
|     <EmbeddedResource Include="StatusBarFrm.resx" /> |  | ||||||
|     <EmbeddedResource Include="StatusMessageFrm.resx" /> |  | ||||||
|   </ItemGroup> |  | ||||||
|   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |  | ||||||
| </Project> |  | ||||||
| @@ -1,148 +0,0 @@ | |||||||
| /********************************************************************************************* |  | ||||||
|  * Copyright 2002 - Volian Enterprises, Inc. All rights reserved. |  | ||||||
|  * Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE |  | ||||||
|  * ------------------------------------------------------------------------------ |  | ||||||
|  * $Workfile: VlnStatusBar.cs $     $Revision: 4 $ |  | ||||||
|  * $Author: Jsj $   $Date: 11/26/02 4:25p $ |  | ||||||
|  * |  | ||||||
|  * $History: VlnStatusBar.cs $ |  | ||||||
|  *  |  | ||||||
|  * *****************  Version 4  ***************** |  | ||||||
|  * User: Jsj          Date: 11/26/02   Time: 4:25p |  | ||||||
|  * Updated in $/LibSource/VlnStatus |  | ||||||
|  * fixed problem with counter |  | ||||||
|  *  |  | ||||||
|  * *****************  Version 3  ***************** |  | ||||||
|  * User: Jsj          Date: 11/26/02   Time: 3:38p |  | ||||||
|  * Updated in $/LibSource/VlnStatus |  | ||||||
|  * Added overbounds check |  | ||||||
|  *********************************************************************************************/ |  | ||||||
| using System; |  | ||||||
|  |  | ||||||
| namespace VlnStatus |  | ||||||
| { |  | ||||||
| 	/// <summary> |  | ||||||
| 	/// Creates a Status Window with a progression bar control. |  | ||||||
| 	///  |  | ||||||
| 	/// This class has two constructors. One allows you to pass in the title |  | ||||||
| 	/// of the Status Box.  The Other provides a default title of "Status". |  | ||||||
| 	/// The Status Box Title can also be set/changed via the StatusBoxTitle |  | ||||||
| 	/// property. |  | ||||||
| 	///  |  | ||||||
| 	///  |  | ||||||
| 	/// </summary> |  | ||||||
| 	public class VlnStatusBar |  | ||||||
| 	{ |  | ||||||
| 		StatusBarFrm StatBar; |  | ||||||
| 		private int Cnt; |  | ||||||
|  |  | ||||||
| 		// Create a status window with the default title of "Status" |  | ||||||
| 		public VlnStatusBar() |  | ||||||
| 		{ |  | ||||||
| 			StatBar = new StatusBarFrm(); |  | ||||||
| 			StatBar.Show(); |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// Create a status window with the passed in title |  | ||||||
| 		public VlnStatusBar(string Title) |  | ||||||
| 		{ |  | ||||||
| 			StatBar = new StatusBarFrm(Title); |  | ||||||
| 			StatBar.Show(); |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// Increament the the status bar by the passed in value. |  | ||||||
| 		public void PerformStep(int val) |  | ||||||
| 		{ |  | ||||||
| //			StatBar.Value = val; |  | ||||||
| //			Cnt = val; |  | ||||||
| 			BarValue = val; |  | ||||||
| 			StatBar.PerformStep(); |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// Increament the the status bar by one |  | ||||||
| 		public void PerformStep() |  | ||||||
| 		{ |  | ||||||
| //			StatBar.Value = StatBar.Value + 1; |  | ||||||
| 			Cnt++; |  | ||||||
| 			BarValue = Cnt; |  | ||||||
| 			StatBar.PerformStep(); |  | ||||||
| 		} |  | ||||||
| 		 |  | ||||||
| 		// This property gets or sets the current status bar value. |  | ||||||
| 		public int BarValue |  | ||||||
| 		{ |  | ||||||
| 			get |  | ||||||
| 			{ |  | ||||||
| 				return StatBar.Value; |  | ||||||
| 			} |  | ||||||
| 			set |  | ||||||
| 			{ |  | ||||||
| 				StatBar.Value = value; |  | ||||||
| 				Cnt = value; |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// This property sets or gets the maximum value that the |  | ||||||
| 		// BarValue property can be. i.e. when BarValue reaches this |  | ||||||
| 		// number, the status bar is completely displayed. |  | ||||||
| 		public int BarMax |  | ||||||
| 		{ |  | ||||||
| 			get |  | ||||||
| 			{ |  | ||||||
| 				return StatBar.Maximum; |  | ||||||
| 			} |  | ||||||
| 			set |  | ||||||
| 			{ |  | ||||||
| 				StatBar.Maximum = value; |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// This property sets or gets the increamenting value used to |  | ||||||
| 		// move the status bar.  For example, if set to 5, each tick of |  | ||||||
| 		// the status bar represents a value of 5. |  | ||||||
| 		public int BarStepValue |  | ||||||
| 		{ |  | ||||||
| 			get |  | ||||||
| 			{ |  | ||||||
| 				return StatBar.Step; |  | ||||||
| 			} |  | ||||||
| 			set |  | ||||||
| 			{ |  | ||||||
| 				StatBar.Step = value; |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// This property sets or gets the message above the status bar. |  | ||||||
| 		public string StatMsg |  | ||||||
| 		{ |  | ||||||
| 			get |  | ||||||
| 			{ |  | ||||||
| 				return StatBar.StatusMessage; |  | ||||||
| 			} |  | ||||||
| 			set |  | ||||||
| 			{ |  | ||||||
| 				StatBar.StatusMessage = value; |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// This property sets or gets the Status Window Title |  | ||||||
| 		public string StatusBoxTitle |  | ||||||
| 		{ |  | ||||||
| 			get |  | ||||||
| 			{ |  | ||||||
| 				return StatBar.StatusBoxTitle; |  | ||||||
| 			} |  | ||||||
| 			set |  | ||||||
| 			{ |  | ||||||
| 				StatBar.StatusBoxTitle = value; |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		public void Dispose() |  | ||||||
| 		{ |  | ||||||
| 			StatBar.Dispose(); |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
|  |  | ||||||
| @@ -1,79 +0,0 @@ | |||||||
| /********************************************************************************************* |  | ||||||
|  * Copyright 2002 - Volian Enterprises, Inc. All rights reserved. |  | ||||||
|  * Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE |  | ||||||
|  * ------------------------------------------------------------------------------ |  | ||||||
|  * $Workfile: VlnStatusMessage.cs $     $Revision: 3 $ |  | ||||||
|  * $Author: Jsj $   $Date: 11/26/02 3:38p $ |  | ||||||
|  * |  | ||||||
|  * $History: VlnStatusMessage.cs $ |  | ||||||
|  *  |  | ||||||
|  * *****************  Version 3  ***************** |  | ||||||
|  * User: Jsj          Date: 11/26/02   Time: 3:38p |  | ||||||
|  * Updated in $/LibSource/VlnStatus |  | ||||||
|  * Added overbounds check |  | ||||||
|  *********************************************************************************************/ |  | ||||||
|  |  | ||||||
| using System; |  | ||||||
|  |  | ||||||
| namespace VlnStatus |  | ||||||
| { |  | ||||||
| 	/// <summary> |  | ||||||
| 	/// Creates a Status Window to display a status message. |  | ||||||
| 	///  |  | ||||||
| 	/// This class has two constructors. One allows you to pass in the title |  | ||||||
| 	/// of the Status Box.  The Other provides a default title of "Status". |  | ||||||
| 	/// The Status Box Title can also be set/changed via the StatusBoxTitle |  | ||||||
| 	/// property. |  | ||||||
| 	///  |  | ||||||
| 	/// </summary> |  | ||||||
| 	public class VlnStatusMessage |  | ||||||
| 	{ |  | ||||||
| 		StatusMessageFrm StatusMessageBox; |  | ||||||
|  |  | ||||||
| 		// Create a status window with the default title of "Status" |  | ||||||
| 		public VlnStatusMessage() |  | ||||||
| 		{ |  | ||||||
| 			StatusMessageBox = new StatusMessageFrm(); |  | ||||||
| 			StatusMessageBox.Show(); |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// Create a status window with the passed in title. |  | ||||||
| 		public VlnStatusMessage(string StatusBoxTitle) |  | ||||||
| 		{ |  | ||||||
| 			StatusMessageBox = new StatusMessageFrm(StatusBoxTitle); |  | ||||||
| 			StatusMessageBox.Show(); |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// This property gets or sets the current status message |  | ||||||
| 		public string StatusMessage |  | ||||||
| 		{ |  | ||||||
| 			get |  | ||||||
| 			{ |  | ||||||
| 				return StatusMessageBox.StatusMessage; |  | ||||||
| 			} |  | ||||||
| 			set |  | ||||||
| 			{ |  | ||||||
| 				StatusMessageBox.StatusMessage = value; |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// This property gets or sets the status box title |  | ||||||
| 		public string StatusBoxTitle |  | ||||||
| 		{ |  | ||||||
| 			get |  | ||||||
| 			{ |  | ||||||
| 				return StatusMessageBox.StatusBoxTitle; |  | ||||||
| 			} |  | ||||||
| 			set |  | ||||||
| 			{ |  | ||||||
| 				StatusMessageBox.StatusBoxTitle = value; |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		public void Dispose() |  | ||||||
| 		{ |  | ||||||
| 			StatusMessageBox.Dispose(); |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
| @@ -603,7 +603,8 @@ namespace Volian.Controls.Library | |||||||
| 		{ | 		{ | ||||||
| 			ItemInfo myItemInfo = myItemInfo2; | 			ItemInfo myItemInfo = myItemInfo2; | ||||||
|  |  | ||||||
| 			if (myItemInfo.MyDocVersion == null) // bug fix: B2016-108 disconnected data will not have a MyDocVersion | 			//B2025-046 Remember Tabs failing when swapping versions of PROMS | ||||||
|  | 			if (myItemInfo?.MyDocVersion == null) // bug fix: B2016-108 disconnected data will not have a MyDocVersion | ||||||
| 			{ | 			{ | ||||||
| 				FlexibleMessageBox.Show(this, "Possible disconnected item", "Item Not Found"); | 				FlexibleMessageBox.Show(this, "Possible disconnected item", "Item Not Found"); | ||||||
| 				return null; | 				return null; | ||||||
|   | |||||||
| @@ -27,10 +27,26 @@ namespace Volian.Controls.Library | |||||||
| 			while (MyEditItem.SpellCheckNext()) | 			while (MyEditItem.SpellCheckNext()) | ||||||
| 			{ | 			{ | ||||||
| 				ItemInfo next = MyEditItem.MyItemInfo.SearchNext; | 				ItemInfo next = MyEditItem.MyItemInfo.SearchNext; | ||||||
| 				if (next == null || !next.IsStep) // B2016-063 check if next is not a step type instead of specifically a section | 				//C2025-037 Evaluate the way that Spell Check (in step editor sections) is currently closing after one section. | ||||||
| 					return; // spell check only current section |  | ||||||
| 				MyEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OpenItem(next); | 				if (next == null || next.IsProcedure) // B2016-063 check if next is not a step type instead of specifically a section | ||||||
| 			} |                 { | ||||||
|  |                     return; // spell check only current procedure | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  | 				//If it is a word document, find the next non-word document | ||||||
|  | 				while (next.HasWordContent) | ||||||
|  |                 { | ||||||
|  | 					next = next.SearchNext; | ||||||
|  |  | ||||||
|  | 					if (next == null || next.IsProcedure) // B2016-063 check if next is not a step type instead of specifically a section | ||||||
|  | 					{ | ||||||
|  | 						return; // spell check only current procedure | ||||||
|  | 					} | ||||||
|  | 				} | ||||||
|  |  | ||||||
|  |                 MyEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OpenItem(next); | ||||||
|  |             } | ||||||
| 			MyEditItem.SetFocus(); | 			MyEditItem.SetFocus(); | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
|   | |||||||
| @@ -345,6 +345,12 @@ namespace Volian.Print.Library | |||||||
| 		// will skip certain logic if CAS Only or CTS Only | 		// will skip certain logic if CAS Only or CTS Only | ||||||
| 		public PromsPrinterPrintType PromsPrinterPrintType { get; set; } = PromsPrinterPrintType.Normal; | 		public PromsPrinterPrintType PromsPrinterPrintType { get; set; } = PromsPrinterPrintType.Normal; | ||||||
|  |  | ||||||
|  | 		//B2025-054 Wrong Page Numbers in CAS Summary | ||||||
|  | 		// when section title continued and CAS | ||||||
|  | 		//  Flag for when should build the CAS_CTAS | ||||||
|  | 		//to avoid overwriting data | ||||||
|  | 		public bool ShouldPrint_CAS_CTAS { get; set; } = true; | ||||||
|  |  | ||||||
| 		public PromsPrinter(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, string backgroundFolder, bool openPDF, bool overWrite, | 		public PromsPrinter(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, string backgroundFolder, bool openPDF, bool overWrite, | ||||||
| 			ChangeBarDefinition cbd, String pdfFile, bool insertBlankPages, bool batchPrint, string prefix, bool saveLinks, int removeTrailngHardReturnsAndManualPageBreaks, string blankPageText, bool didAll, MergedPdf mergedPdf, string watermarkColor, int PrtSectID = -1) | 			ChangeBarDefinition cbd, String pdfFile, bool insertBlankPages, bool batchPrint, string prefix, bool saveLinks, int removeTrailngHardReturnsAndManualPageBreaks, string blankPageText, bool didAll, MergedPdf mergedPdf, string watermarkColor, int PrtSectID = -1) | ||||||
| 		{ | 		{ | ||||||
|   | |||||||
| @@ -99,8 +99,8 @@ | |||||||
|     <Reference Include="System.Drawing" /> |     <Reference Include="System.Drawing" /> | ||||||
|     <Reference Include="System.Windows.Forms" /> |     <Reference Include="System.Windows.Forms" /> | ||||||
|     <Reference Include="System.Xml" /> |     <Reference Include="System.Xml" /> | ||||||
|     <Reference Include="VlnStatus64"> |     <Reference Include="VlnStatus"> | ||||||
|       <HintPath>..\VEPROMS\VlnStatus64\bin\Debug\VlnStatus64.dll</HintPath> |       <HintPath>..\ReferencedObjects\LibSource\VlnStatus\bin\Debug\VlnStatus.dll</HintPath> | ||||||
|     </Reference> |     </Reference> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|   | |||||||
| @@ -2162,12 +2162,12 @@ namespace Volian.Print.Library | |||||||
| 			//B2025-048  Problem with Printing CAS Steps | 			//B2025-048  Problem with Printing CAS Steps | ||||||
| 			//  skip this if printing CAS or CTAS - was causing it to | 			//  skip this if printing CAS or CTAS - was causing it to | ||||||
| 			//  skip/overwrite data | 			//  skip/overwrite data | ||||||
| 			if (doSectionTitleContinued && MyPromsPrinter.PromsPrinterPrintType == PromsPrinterPrintType.Normal) | 			if (doSectionTitleContinued) | ||||||
| 			{ | 			{ | ||||||
| 				vlnParagraph sectContPara; | 				vlnParagraph sectContPara; | ||||||
| 				string contMsg = (MyItemInfo.ActiveSection != null) ? MyItemInfo.ActiveSection.MyDocStyle.Continue.SectionTitle.AppendToTitle : ""; // C2018-003 fixed use of getting the active section | 				string contMsg = (MyItemInfo.ActiveSection != null) ? MyItemInfo.ActiveSection.MyDocStyle.Continue.SectionTitle.AppendToTitle : ""; // C2018-003 fixed use of getting the active section | ||||||
| 				// For Calvert, the xoffset will be the highest level sections xoffset (there are metasections, | 																																					// For Calvert, the xoffset will be the highest level sections xoffset (there are metasections, | ||||||
| 				// don't use their xoffset or the continue message is indented too much) | 																																					// don't use their xoffset or the continue message is indented too much) | ||||||
| 				if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert) | 				if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert) | ||||||
| 				{ | 				{ | ||||||
| 					float secContinueTabXoff = (float)MyItemInfo.MyDocStyle.Layout.LeftMargin; | 					float secContinueTabXoff = (float)MyItemInfo.MyDocStyle.Layout.LeftMargin; | ||||||
| @@ -2187,6 +2187,12 @@ namespace Volian.Print.Library | |||||||
| 					// get to the correct section for the message, i.e. if on a section, the message should be the parent | 					// get to the correct section for the message, i.e. if on a section, the message should be the parent | ||||||
| 					// section (not the activesection which is myself); if on a step, the message should be the active section | 					// section (not the activesection which is myself); if on a step, the message should be the active section | ||||||
| 					ItemInfo sectForCont = MyItemInfo.IsSection && MyItemInfo.MyParent.IsSection ? MyItemInfo.MyParent : MyItemInfo.ActiveSection; | 					ItemInfo sectForCont = MyItemInfo.IsSection && MyItemInfo.MyParent.IsSection ? MyItemInfo.MyParent : MyItemInfo.ActiveSection; | ||||||
|  | 					//B2025-054 Wrong Page Numbers in CAS Summary | ||||||
|  | 					// when section title continued and CAS | ||||||
|  | 					//to avoid overwriting data | ||||||
|  | 					// - this will be built at a different call to vlnParagraph | ||||||
|  | 					if (MyPromsPrinter.PromsPrinterPrintType != PromsPrinterPrintType.Normal) | ||||||
|  | 						MyPromsPrinter.ShouldPrint_CAS_CTAS = false; | ||||||
| 					sectContPara = new vlnParagraph(MyParent.MyParent, cb, sectForCont, MyParent.XOffset, 0, 0, 0, MyParent.MyItemInfo.ActiveFormat, null, (contMsg == null || contMsg == "") ? "  (Continued)" : contMsg, 0, false, MyPromsPrinter); | 					sectContPara = new vlnParagraph(MyParent.MyParent, cb, sectForCont, MyParent.XOffset, 0, 0, 0, MyParent.MyItemInfo.ActiveFormat, null, (contMsg == null || contMsg == "") ? "  (Continued)" : contMsg, 0, false, MyPromsPrinter); | ||||||
| 					if (sectContPara.PartsLeft.Count > 0) | 					if (sectContPara.PartsLeft.Count > 0) | ||||||
| 					{ | 					{ | ||||||
| @@ -2197,7 +2203,7 @@ namespace Volian.Print.Library | |||||||
| 						vt.XOffset = secContinueTabXoff; | 						vt.XOffset = secContinueTabXoff; | ||||||
| 						vt.Width = secContinueXoff - secContinueTabXoff; | 						vt.Width = secContinueXoff - secContinueTabXoff; | ||||||
| 						sectContPara.XOffset = secContinueXoff; | 						sectContPara.XOffset = secContinueXoff; | ||||||
| 						if ((wd + 12) > secContinueXoff - secContinueTabXoff)			// 12 is 2 characters | 						if ((wd + 12) > secContinueXoff - secContinueTabXoff)           // 12 is 2 characters | ||||||
| 						{ | 						{ | ||||||
| 							float dif = wd + 12 - (secContinueXoff - secContinueTabXoff); | 							float dif = wd + 12 - (secContinueXoff - secContinueTabXoff); | ||||||
| 							vt.Width += dif; | 							vt.Width += dif; | ||||||
| @@ -2212,12 +2218,20 @@ namespace Volian.Print.Library | |||||||
| 				} | 				} | ||||||
| 				else | 				else | ||||||
| 				{ | 				{ | ||||||
|  | 					//B2025-054 Wrong Step Numbers | ||||||
|  | 					// when section title continued and CAS | ||||||
|  | 					//to avoid overwriting data | ||||||
|  | 					// - this will be built at a different call to vlnParagraph | ||||||
|  | 					if (MyPromsPrinter.PromsPrinterPrintType != PromsPrinterPrintType.Normal) | ||||||
|  | 						MyPromsPrinter.ShouldPrint_CAS_CTAS = false; | ||||||
| 					sectContPara = new vlnParagraph(MyParent.MyParent, cb, MyItemInfo.ActiveSection, MyParent.XOffset, 0, 0, 0, MyParent.MyItemInfo.ActiveFormat, null, (contMsg == null || contMsg == "") ? "  (Continued)" : contMsg, 0, false, MyPromsPrinter); | 					sectContPara = new vlnParagraph(MyParent.MyParent, cb, MyItemInfo.ActiveSection, MyParent.XOffset, 0, 0, 0, MyParent.MyItemInfo.ActiveFormat, null, (contMsg == null || contMsg == "") ? "  (Continued)" : contMsg, 0, false, MyPromsPrinter); | ||||||
| 					float mytmpfloat = sectContPara.ParagraphToPdf(cb, yTopMargin, yTopMargin, yBottomMargin); | 					float mytmpfloat = sectContPara.ParagraphToPdf(cb, yTopMargin, yTopMargin, yBottomMargin); | ||||||
| 					if (sectContPara.SectionContinuePrinted) | 					if (sectContPara.SectionContinuePrinted) | ||||||
| 						yPageStart -= sectContPara.Height + SixLinesPerInch; | 						yPageStart -= sectContPara.Height + SixLinesPerInch; | ||||||
| 				} | 				} | ||||||
| 			} | 			} | ||||||
|  | 			//out of section title section - reset this back to true (default) | ||||||
|  | 			MyPromsPrinter.ShouldPrint_CAS_CTAS = true; | ||||||
|  |  | ||||||
| 			// see if this hls has footnotes, add to the footnote datastructure for processing at end of page. | 			// see if this hls has footnotes, add to the footnote datastructure for processing at end of page. | ||||||
| 			if (MyItemInfo.IsHigh && MyPageHelper.NotesToFootNotesHLS.ContainsKey(MyItemInfo.ItemID)) AddFootNote(cb); | 			if (MyItemInfo.IsHigh && MyPageHelper.NotesToFootNotesHLS.ContainsKey(MyItemInfo.ItemID)) AddFootNote(cb); | ||||||
| @@ -3596,11 +3610,11 @@ namespace Volian.Print.Library | |||||||
| 			BuildPlacekeeper(parent, itemInfo); | 			BuildPlacekeeper(parent, itemInfo); | ||||||
|  |  | ||||||
| 			// Save step text information to be used to create a Continuous Action Summary | 			// Save step text information to be used to create a Continuous Action Summary | ||||||
| 			BuildContinuousActionSummary(parent, itemInfo); | 			if (MyPromsPrinter.ShouldPrint_CAS_CTAS) BuildContinuousActionSummary(parent, itemInfo); | ||||||
|  |  | ||||||
| 			// F2022-024 Time Critical Step | 			// F2022-024 Time Critical Step | ||||||
| 			// Save step text information to be used to create a Time Critical Action Summary | 			// Save step text information to be used to create a Time Critical Action Summary | ||||||
| 			BuildTimeCriticalActionSummary(parent, itemInfo); | 			if (MyPromsPrinter.ShouldPrint_CAS_CTAS) BuildTimeCriticalActionSummary(parent, itemInfo); | ||||||
|  |  | ||||||
| 			if (itemInfo.ActiveFormat.MyStepSectionLayoutData.BoxLeftAdj != null) | 			if (itemInfo.ActiveFormat.MyStepSectionLayoutData.BoxLeftAdj != null) | ||||||
| 				_MyBoxLeftAdj = float.Parse(itemInfo.ActiveFormat.MyStepSectionLayoutData.BoxLeftAdj); | 				_MyBoxLeftAdj = float.Parse(itemInfo.ActiveFormat.MyStepSectionLayoutData.BoxLeftAdj); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user