Compare commits
341 Commits
B2025-011-
...
C2022-003-
| Author | SHA1 | Date | |
|---|---|---|---|
| c561aad661 | |||
| 0a301e1a84 | |||
| 37e727202c | |||
| 9023cc76a0 | |||
| 49bdd03c1c | |||
| 23f4b672b2 | |||
| 599d45086f | |||
| 93aed0e06a | |||
| 7eb94d7575 | |||
| fa8b0bd6a1 | |||
| c26e271676 | |||
| 7d87477d68 | |||
| 9002fb3828 | |||
| 10257a832a | |||
| 261f5a526c | |||
| b5e0c121e8 | |||
| 6d99c456e4 | |||
| 8c6f0c2736 | |||
| bd89af5e8c | |||
| b0e4128d3c | |||
| 875a8f101a | |||
| c5a8ef57ac | |||
| c8adeed187 | |||
| 49f5f506d4 | |||
| 1c87585570 | |||
| 30eb52da77 | |||
| 6f089482e6 | |||
| 8e221cc263 | |||
| 441917b670 | |||
| 6251de3b38 | |||
| d731125a14 | |||
| d6fe64bc40 | |||
| f8b93807ae | |||
| 2287a111c1 | |||
| a08d92ea41 | |||
| c41d7981ba | |||
| 37f5336806 | |||
| ebdc98dfa7 | |||
| f3c8c860f5 | |||
| f7b27142c4 | |||
| 4fc37c54c5 | |||
| 849e1e57dd | |||
| c768ca5eba | |||
| c9516d90e9 | |||
| 327aae687a | |||
| 3cbe4617eb | |||
| de69fe6b6f | |||
| e53101dacb | |||
| d3ec749848 | |||
| 410b7d3dd6 | |||
| e87b233713 | |||
| ca38ecb1cf | |||
| 5dfa70dc10 | |||
| ff3daff15a | |||
| 7b7f235354 | |||
| 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 | |||
| 1ef6a1d0e4 | |||
| b163a3a7b9 | |||
| e7f7f28ff1 | |||
| b9c17fd360 | |||
| c7534a985a | |||
| 52583a05f6 | |||
| 081373fc0d | |||
| 9130604fa6 | |||
| 37b4726925 | |||
| cc66eb5329 | |||
| 563c133676 | |||
| e8b32c4ed3 | |||
| 72ca259771 | |||
| d175c4b564 | |||
| fb2aeb8192 | |||
| 24c25ab26c | |||
| 9da91e460f | |||
| 2634cf7de9 | |||
| 7417091f3f | |||
| f9aad50f46 | |||
| 535cd5af2e | |||
| 4a8e469736 | |||
| 7d89f711fe | |||
| 7555a0389b | |||
| 1ac6e4b1a0 | |||
| d2fc4c6134 | |||
| 73cad308aa | |||
| c9f4c33ba1 | |||
| 3f0bdc593c | |||
| 0da2d38bd8 | |||
| 3a6ce52ead | |||
| eb0582ae69 | |||
| 3143d094e8 | |||
| f265a23f97 | |||
| dceeb410c6 | |||
| 30be08fe4d | |||
| 20247d0bc2 | |||
| c0ac325911 | |||
| c02ab116cd | |||
| 7ec4f2a61e | |||
| 16129ba742 | |||
| 61853fb71f | |||
| 58f13eb1dc | |||
| b999f17445 | |||
| c8047854f6 | |||
| 91ee23287a | |||
| 85b08b8c65 | |||
| c81079a876 | |||
| 8abe57552c | |||
| 3bf24b838b | |||
| e37928bf89 | |||
| 525173bc9f | |||
| aa6dacf0c5 | |||
| 69cc71ab3b | |||
| fe52d31168 | |||
| 3ea4307716 | |||
| 5650df1a9f | |||
| 8f154ebf48 | |||
| 47a4c62e92 | |||
| 539ad769d0 | |||
| 5fa90d9eab | |||
| ba9d56811c | |||
| 8eb8a328d1 | |||
| e8327316dd | |||
| 3bd7001106 | |||
| 2e5ad53c6a | |||
| ca0ae279e0 | |||
| adf1120436 | |||
| 7879391de0 | |||
| 11ba9ea418 | |||
| 0fe84ca17c | |||
| 1009ca5111 | |||
| 2c973fb0be | |||
| dba1f4e71c | |||
| 46fe124fe1 | |||
| 50688d7d8a | |||
| a7396e3c4a | |||
| 41e969f79e | |||
| 7b3f78f745 | |||
| 14bc171246 | |||
| a584c0751e | |||
| 3d7528e069 | |||
| 58cc75ef71 | |||
| b5a9462e95 | |||
| 1bc421ac6d | |||
| ad0d091b49 | |||
| 22de686a44 | |||
| 3e7eb09758 | |||
| e2a276085b | |||
| d561c579e0 | |||
| 371d117746 | |||
| 28c681a562 | |||
| 2131efb522 | |||
| 6e20774edf | |||
| a7c7744ff3 | |||
| 019aefbc61 | |||
| 81a23305ba | |||
| 4001abff02 | |||
| 25bfbeb8d6 | |||
| 44025c3978 | |||
| a3aa9747b8 | |||
| 009243b091 | |||
| e31e0b6680 | |||
| 449bb2522b | |||
| 453dce9520 | |||
| 655592186b | |||
| 1ebf67233b | |||
| 1588dabcbe | |||
| 09d3995e6c | |||
| db20385a6d | |||
| d701935ddf | |||
| d3888e3c32 | |||
| 94f0795247 | |||
| 4def73d738 | |||
| 99445406fc | |||
| 8c32d18aec | |||
| 20c31153de | |||
| 025fa57e24 | |||
| 6f04d0bf07 | |||
| ecb9a805e5 | |||
| 0577acad93 | |||
| d7f83fa4d4 | |||
| 4c4f4d52d2 | |||
| 0bf9025c0d | |||
| 7a0f56cad8 | |||
| 2784b57a05 | |||
| b9fc9748c7 | |||
| c98299d916 | |||
| f6e25fd966 | |||
| 557b9429bf | |||
| 139f7bbd0a | |||
| ec25f6426a | |||
| 00283b4f28 | |||
| e08b5cde69 | |||
| ec8e4c36a4 | |||
| 07c7718320 | |||
| 2953e977ef | |||
| 92522b1229 | |||
| 9ef9dcd7b9 | |||
| 5fd8096ef0 | |||
| 5f59543a14 | |||
| d44593d6d4 | |||
| 38744ff8e8 | |||
| 83e935a3f4 | |||
| 4d96e73866 | |||
| a55ce75e2e | |||
| c45dbf1dac | |||
| 2d08629608 | |||
| 49bc67a64f | |||
| abec4d9281 | |||
| 149bc601e2 | |||
| 66deede936 | |||
| 0df5511bf7 | |||
| 2e68218cfe | |||
| 80f3568dbd | |||
| 5fd0ff9e71 | |||
| 4dcfa05157 | |||
| 42648f31a5 | |||
| e0b628dce9 | |||
| 6e9c7e28e6 | |||
| ac091a7d26 | |||
| 8f31532917 | |||
| 612e7955cf | |||
| ce92031ff7 | |||
| 5a7e63871d | |||
| 7ade7f6e24 | |||
| e470ef0553 | |||
| fb01a4f8df | |||
| eacdca8669 | |||
| df97a6dd01 | |||
| 0259d4ff1d | |||
| f71e9938bb | |||
| 69f8e3f4fc | |||
| f49c888307 | |||
| 04a2da4371 | |||
| 59372b23e4 | |||
| 2970c0d7d4 | |||
| 392f1b09b2 | |||
| 79f66e9641 | |||
| e90fceca86 | |||
| 24d5cee8b4 | |||
| 31f608a9ec | |||
| 1ba4c4f343 | |||
| 700d9656b2 | |||
| 0c17d9abc2 | |||
| 2c1476b74c | |||
| 0fa71727ac | |||
| 20cacf26ae | |||
| 1d406b0c7e | |||
| a099d27b86 | |||
| 3e53ec9191 | |||
| 637cbd9954 | |||
| 717251ca5e | |||
| 5d3bb41275 | |||
| e5211fee00 | |||
| 41cb078a94 | |||
| 0a5e4076e1 | |||
| c3534e21fa | |||
| e9e934cfb1 | |||
| a417ddda85 | |||
| 06159c6b68 | |||
| 22c14d169b | |||
| f273a8839a | |||
| db09db3cd0 | |||
| ba8a8b8673 | |||
| 62ae81c7b3 | |||
| 6db9567eb9 | |||
| 8ef08c53b3 | |||
| 6f354bfeee | |||
| 818d764b3d | |||
| 9fdbdb05f4 | |||
| d392131005 | |||
| 389b9e382b | |||
| 6fd84e2f2a | |||
| 689ea71846 | |||
| 66295594e9 | |||
| 042b80b9f4 | |||
| c4da241516 | |||
| 74ccbfa760 | |||
| 46d8838d0e | |||
| 94d2c32025 | |||
| 64124cc0f7 | |||
| 24c5bc5097 | |||
| 1ffde5de50 | |||
| 3828da2f8f | |||
| 1554d3cc33 | |||
| d808b306b6 | |||
| 45aeb808fa | |||
| 74f9fc0c18 | |||
| c2c90a2c2e | |||
| 05ab077dda | |||
| 1ae422c74e | |||
| 5da62c3a5d | |||
| 86a98118fb | |||
| 6a51208a13 | |||
| 0749f5e724 | |||
| f65644f553 | |||
| dc74da6e86 | |||
| 301c4c2c97 | |||
| 8ec820a7f7 | |||
| 18734e0f85 | |||
| 9980504c47 | |||
| 626960da9f | |||
| 535728b982 | |||
| ace9672a2e | |||
| 05a13861ac | |||
| 24374b85c1 | |||
| 8c358f1e3c | |||
| 289285f517 | |||
| 3ee9e0f4eb | |||
| d6c924a51f | |||
| 3a739c5b64 | |||
| 3564f4ba8e | |||
| 5ad9d81cc1 | |||
| 0292634374 | |||
| d4418b8d8a | |||
| a33f136e77 | |||
| f85f8e9e2c | |||
| 01541c9e0d |
@@ -5,7 +5,7 @@
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
@@ -44,6 +44,7 @@
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
@@ -53,13 +54,14 @@
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
|
||||
@@ -32,9 +32,9 @@ namespace AdjustBuildRevision
|
||||
{
|
||||
// Allow for setting build revision on either proms or the roeditor:
|
||||
if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ"))
|
||||
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")");
|
||||
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.4.yyMM.dHH") + "\")");
|
||||
else
|
||||
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")");
|
||||
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")");
|
||||
// if (outline != line)
|
||||
// {
|
||||
// Console.WriteLine("Before: '{0}'", line);
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
@@ -30,15 +30,17 @@
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
|
||||
@@ -28,7 +28,9 @@ namespace AT.STO.UI.Win
|
||||
|
||||
_dropDownHelper = new DropDownWindowHelper();
|
||||
|
||||
_dropDownHelper.DropDownClosed -= new DropDownClosedEventHandler(DropDownHelper_DropDownClosed);
|
||||
_dropDownHelper.DropDownClosed += new DropDownClosedEventHandler(DropDownHelper_DropDownClosed);
|
||||
_dropDownHelper.DropDownCancel -= new DropDownCancelEventHandler(DropDownHelper_DropDownCancel);
|
||||
_dropDownHelper.DropDownCancel += new DropDownCancelEventHandler(DropDownHelper_DropDownCancel);
|
||||
|
||||
combo.DisplayMember = "Text";
|
||||
@@ -82,7 +84,9 @@ namespace AT.STO.UI.Win
|
||||
DropDownForm dropDown = new DropDownForm(_dropDownControl);
|
||||
|
||||
|
||||
dropDown.FinishEditing -= new DropDownValueChangedEventHandler(DropDown_FinishEditing);
|
||||
dropDown.FinishEditing += new DropDownValueChangedEventHandler(DropDown_FinishEditing);
|
||||
dropDown.ValueChanged -= new DropDownValueChangedEventHandler(DropDown_ValueChanged);
|
||||
dropDown.ValueChanged += new DropDownValueChangedEventHandler(DropDown_ValueChanged);
|
||||
|
||||
combo.DroppedDown = false;
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
@@ -45,13 +45,14 @@
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Demo|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>bin\Demo\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
@@ -60,7 +61,7 @@
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
@@ -69,7 +70,7 @@
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
@@ -78,7 +79,7 @@
|
||||
<OutputPath>bin\Demo\</OutputPath>
|
||||
<DefineConstants>TRACE;DEMO</DefineConstants>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
|
||||
@@ -49,7 +49,9 @@ namespace AT.STO.UI.Win
|
||||
{
|
||||
base.OnShown(e);
|
||||
|
||||
_control.FinishEditing -= new DropDownValueChangedEventHandler(Ctrl_FinishEditing);
|
||||
_control.FinishEditing += new DropDownValueChangedEventHandler(Ctrl_FinishEditing);
|
||||
_control.ValueChanged -= new DropDownValueChangedEventHandler(Ctrl_ValueChanged);
|
||||
_control.ValueChanged += new DropDownValueChangedEventHandler(Ctrl_ValueChanged);
|
||||
}
|
||||
#endregion
|
||||
|
||||
@@ -39,6 +39,7 @@ namespace AT.STO.UI.Win
|
||||
public DropDownWindowHelper()
|
||||
{
|
||||
_filter = new DropDownMessageFilter(this);
|
||||
_filter.DropDownCancel -= new DropDownCancelEventHandler(Popup_Cancel);
|
||||
_filter.DropDownCancel += new DropDownCancelEventHandler(Popup_Cancel);
|
||||
}
|
||||
#endregion
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
@@ -40,13 +40,14 @@
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
@@ -56,7 +57,7 @@
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
|
||||
@@ -35,6 +35,7 @@
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
@@ -44,11 +45,12 @@
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.8.1Build\DevComponents.DotNetBar2.dll</HintPath>
|
||||
<HintPath>..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.6Build\DevComponents.DotNetBar2.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Data" />
|
||||
@@ -92,6 +94,10 @@
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="epall\EPFormatTST1.xml" />
|
||||
<Content Include="epall\EPFormatTST2.xml" />
|
||||
<Content Include="epall\EPFormatTST3.xml" />
|
||||
<Content Include="epall\EPFormatTST4.xml" />
|
||||
<Content Include="fmtall\AEPall.xml">
|
||||
<SubType>Designer</SubType>
|
||||
</Content>
|
||||
@@ -176,6 +182,8 @@
|
||||
<Content Include="fmtall\CPL_03all.xml" />
|
||||
<Content Include="fmtall\CPSAMGDataall.xml" />
|
||||
<Content Include="fmtall\CPSAMGDEVall.xml" />
|
||||
<Content Include="fmtall\EPTSTBCK1all.xml" />
|
||||
<Content Include="fmtall\EPTST1all.xml" />
|
||||
<Content Include="fmtall\CWEall.xml" />
|
||||
<Content Include="fmtall\CWEDEVall.xml" />
|
||||
<Content Include="fmtall\CWERall.xml" />
|
||||
@@ -187,6 +195,7 @@
|
||||
<Content Include="fmtall\EFSGBCKall.xml" />
|
||||
<Content Include="fmtall\ELFDEVall.xml" />
|
||||
<Content Include="fmtall\ENall.xml" />
|
||||
<Content Include="fmtall\EPTST2all.xml" />
|
||||
<Content Include="fmtall\ESFDEVall.xml" />
|
||||
<Content Include="fmtall\EXCLNall.xml" />
|
||||
<Content Include="fmtall\EXCLN_00all.xml" />
|
||||
@@ -282,6 +291,10 @@
|
||||
<Content Include="fmtall\NSPWGall.xml" />
|
||||
<Content Include="fmtall\NSP_00all.xml" />
|
||||
<Content Include="fmtall\OHLPall.xml" />
|
||||
<Content Include="fmtall\PROMSDemo1all.xml" />
|
||||
<Content Include="fmtall\PROMSDemo2all.xml" />
|
||||
<Content Include="fmtall\PROMSDemoALRall.xml" />
|
||||
<Content Include="fmtall\PROMSDemoBCKall.xml" />
|
||||
<Content Include="fmtall\PROMSMan1all.xml" />
|
||||
<Content Include="fmtall\PROMSMan2all.xml" />
|
||||
<Content Include="fmtall\RGEall.xml" />
|
||||
@@ -499,6 +512,10 @@
|
||||
<Content Include="genmacall\nspsam.svg" />
|
||||
<Content Include="genmacall\nspsamdev.svg" />
|
||||
<Content Include="genmacall\ohlp.svg" />
|
||||
<Content Include="genmacall\PROMSDemo1.svg" />
|
||||
<Content Include="genmacall\PROMSDemo2.svg" />
|
||||
<Content Include="genmacall\PROMSDemoALR.svg" />
|
||||
<Content Include="genmacall\PROMSDemoBCK.svg" />
|
||||
<Content Include="genmacall\PROMSMan1.svg" />
|
||||
<Content Include="genmacall\PROMSMan2.svg" />
|
||||
<Content Include="genmacall\rge.svg" />
|
||||
|
||||
BIN
PROMS/Formats/epall/EPFormatTST1.xml
Normal file
BIN
PROMS/Formats/epall/EPFormatTST1.xml
Normal file
Binary file not shown.
BIN
PROMS/Formats/epall/EPFormatTST2.xml
Normal file
BIN
PROMS/Formats/epall/EPFormatTST2.xml
Normal file
Binary file not shown.
BIN
PROMS/Formats/epall/EPFormatTST3.xml
Normal file
BIN
PROMS/Formats/epall/EPFormatTST3.xml
Normal file
Binary file not shown.
BIN
PROMS/Formats/epall/EPFormatTST4.xml
Normal file
BIN
PROMS/Formats/epall/EPFormatTST4.xml
Normal file
Binary file not shown.
BIN
PROMS/Formats/fmtall/ACMEBCKall.xml
Normal file
BIN
PROMS/Formats/fmtall/ACMEBCKall.xml
Normal file
Binary file not shown.
BIN
PROMS/Formats/fmtall/ACMEall.xml
Normal file
BIN
PROMS/Formats/fmtall/ACMEall.xml
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
PROMS/Formats/fmtall/EPTST1all.xml
Normal file
BIN
PROMS/Formats/fmtall/EPTST1all.xml
Normal file
Binary file not shown.
BIN
PROMS/Formats/fmtall/EPTST2all.xml
Normal file
BIN
PROMS/Formats/fmtall/EPTST2all.xml
Normal file
Binary file not shown.
BIN
PROMS/Formats/fmtall/EPTSTBCK1all.xml
Normal file
BIN
PROMS/Formats/fmtall/EPTSTBCK1all.xml
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
PROMS/Formats/fmtall/PROMSDemo1all.xml
Normal file
BIN
PROMS/Formats/fmtall/PROMSDemo1all.xml
Normal file
Binary file not shown.
BIN
PROMS/Formats/fmtall/PROMSDemo2all.xml
Normal file
BIN
PROMS/Formats/fmtall/PROMSDemo2all.xml
Normal file
Binary file not shown.
BIN
PROMS/Formats/fmtall/PROMSDemoALRall.xml
Normal file
BIN
PROMS/Formats/fmtall/PROMSDemoALRall.xml
Normal file
Binary file not shown.
BIN
PROMS/Formats/fmtall/PROMSDemoBCKall.xml
Normal file
BIN
PROMS/Formats/fmtall/PROMSDemoBCKall.xml
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
66
PROMS/Formats/frmFormatCopy.Designer.cs
generated
66
PROMS/Formats/frmFormatCopy.Designer.cs
generated
@@ -33,6 +33,9 @@ namespace Formats
|
||||
this.btnCopyFormats = new DevComponents.DotNetBar.ButtonX();
|
||||
this.btnBrowse = new DevComponents.DotNetBar.ButtonX();
|
||||
this.buttonX2 = new DevComponents.DotNetBar.ButtonX();
|
||||
this.labelX2 = new DevComponents.DotNetBar.LabelX();
|
||||
this.LstBxExcludeFiles = new DevComponents.DotNetBar.ListBoxAdv();
|
||||
this.cbIncludeDemoFormats = new DevComponents.DotNetBar.Controls.CheckBoxX();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// txbxPROMSFormatsPath
|
||||
@@ -64,7 +67,7 @@ namespace Formats
|
||||
//
|
||||
this.btnCopyFormats.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
|
||||
this.btnCopyFormats.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
|
||||
this.btnCopyFormats.Location = new System.Drawing.Point(152, 68);
|
||||
this.btnCopyFormats.Location = new System.Drawing.Point(232, 156);
|
||||
this.btnCopyFormats.Name = "btnCopyFormats";
|
||||
this.btnCopyFormats.Size = new System.Drawing.Size(84, 27);
|
||||
this.btnCopyFormats.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
@@ -88,7 +91,7 @@ namespace Formats
|
||||
//
|
||||
this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
|
||||
this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
|
||||
this.buttonX2.Location = new System.Drawing.Point(329, 68);
|
||||
this.buttonX2.Location = new System.Drawing.Point(409, 156);
|
||||
this.buttonX2.Name = "buttonX2";
|
||||
this.buttonX2.Size = new System.Drawing.Size(75, 23);
|
||||
this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
@@ -96,17 +99,67 @@ namespace Formats
|
||||
this.buttonX2.Text = "Exit";
|
||||
this.buttonX2.Click += new System.EventHandler(this.buttonX2_Click);
|
||||
//
|
||||
// Form1
|
||||
// labelX2
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.labelX2.Location = new System.Drawing.Point(12, 41);
|
||||
this.labelX2.Name = "labelX2";
|
||||
this.labelX2.Size = new System.Drawing.Size(200, 23);
|
||||
this.labelX2.TabIndex = 5;
|
||||
this.labelX2.Text = "Excluding Format Files that Start with:";
|
||||
//
|
||||
// LstBxExcludeFiles
|
||||
//
|
||||
this.LstBxExcludeFiles.AutoScroll = true;
|
||||
//
|
||||
//
|
||||
//
|
||||
this.LstBxExcludeFiles.BackgroundStyle.Class = "ListBoxAdv";
|
||||
this.LstBxExcludeFiles.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.LstBxExcludeFiles.CausesValidation = false;
|
||||
this.LstBxExcludeFiles.CheckStateMember = null;
|
||||
this.LstBxExcludeFiles.ContainerControlProcessDialogKey = true;
|
||||
this.LstBxExcludeFiles.DragDropSupport = true;
|
||||
this.LstBxExcludeFiles.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.LstBxExcludeFiles.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
|
||||
this.LstBxExcludeFiles.Location = new System.Drawing.Point(57, 70);
|
||||
this.LstBxExcludeFiles.Name = "LstBxExcludeFiles";
|
||||
this.LstBxExcludeFiles.ShowToolTips = false;
|
||||
this.LstBxExcludeFiles.Size = new System.Drawing.Size(134, 76);
|
||||
this.LstBxExcludeFiles.TabIndex = 6;
|
||||
this.LstBxExcludeFiles.Text = "listBoxAdv1";
|
||||
//
|
||||
// cbIncludeDemoFormats
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
this.cbIncludeDemoFormats.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.cbIncludeDemoFormats.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.cbIncludeDemoFormats.Location = new System.Drawing.Point(43, 156);
|
||||
this.cbIncludeDemoFormats.Name = "cbIncludeDemoFormats";
|
||||
this.cbIncludeDemoFormats.Size = new System.Drawing.Size(160, 23);
|
||||
this.cbIncludeDemoFormats.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2010;
|
||||
this.cbIncludeDemoFormats.TabIndex = 7;
|
||||
this.cbIncludeDemoFormats.Text = "Include Demo Formats";
|
||||
//
|
||||
// frmFormatCopy
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(496, 107);
|
||||
this.ClientSize = new System.Drawing.Size(496, 191);
|
||||
this.Controls.Add(this.cbIncludeDemoFormats);
|
||||
this.Controls.Add(this.LstBxExcludeFiles);
|
||||
this.Controls.Add(this.labelX2);
|
||||
this.Controls.Add(this.buttonX2);
|
||||
this.Controls.Add(this.btnBrowse);
|
||||
this.Controls.Add(this.btnCopyFormats);
|
||||
this.Controls.Add(this.labelX1);
|
||||
this.Controls.Add(this.txbxPROMSFormatsPath);
|
||||
this.Name = "Form1";
|
||||
this.Name = "frmFormatCopy";
|
||||
this.Text = "Form1";
|
||||
this.ResumeLayout(false);
|
||||
|
||||
@@ -119,6 +172,9 @@ namespace Formats
|
||||
private DevComponents.DotNetBar.ButtonX btnCopyFormats;
|
||||
private DevComponents.DotNetBar.ButtonX btnBrowse;
|
||||
private DevComponents.DotNetBar.ButtonX buttonX2;
|
||||
private DevComponents.DotNetBar.LabelX labelX2;
|
||||
private DevComponents.DotNetBar.ListBoxAdv LstBxExcludeFiles;
|
||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbIncludeDemoFormats;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,11 @@ namespace Formats
|
||||
public frmFormatCopy()
|
||||
{
|
||||
InitializeComponent();
|
||||
SetDefaults();
|
||||
foreach (string excludeThis in excludeThese)
|
||||
{
|
||||
LstBxExcludeFiles.Items.Add(excludeThis);
|
||||
}
|
||||
SetDefaults();
|
||||
}
|
||||
|
||||
private void SetDefaults()
|
||||
@@ -92,12 +96,17 @@ namespace Formats
|
||||
if (!txbxPROMSFormatsPath.Text.EndsWith(@"\")) txbxPROMSFormatsPath.Text += @"\";
|
||||
}
|
||||
|
||||
// Added a PROMSDemo to the list of excluded format files
|
||||
public string[] excludeThese = { "WPS", "WPB", "VCBEPP", "PROMSDemo" };
|
||||
|
||||
// Added logic to support in inclusion of the PROMSDemo formats if the checkbox on the
|
||||
// dialog is check
|
||||
private bool ExcludeFromCopy(string fn)
|
||||
{
|
||||
// don't copy formats whos file name starts with..
|
||||
string[] excludeThese = { "WPS", "WEP", "WPB", "VCBEPP" };
|
||||
foreach (string excludeThis in excludeThese)
|
||||
if (fn.ToUpper().StartsWith(excludeThis)) return true;
|
||||
if (fn.ToUpper().StartsWith(excludeThis)
|
||||
&& !(cbIncludeDemoFormats.Checked && fn.ToUpper().StartsWith("PROMSDEMO"))) return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -156,5 +165,5 @@ namespace Formats
|
||||
Application.Exit();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -112,9 +112,9 @@
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
</root>
|
||||
BIN
PROMS/Formats/genmacall/ACME.svg
Normal file
BIN
PROMS/Formats/genmacall/ACME.svg
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
PROMS/Formats/genmacall/PROMSDemo1.svg
Normal file
BIN
PROMS/Formats/genmacall/PROMSDemo1.svg
Normal file
Binary file not shown.
BIN
PROMS/Formats/genmacall/PROMSDemo2.svg
Normal file
BIN
PROMS/Formats/genmacall/PROMSDemo2.svg
Normal file
Binary file not shown.
BIN
PROMS/Formats/genmacall/PROMSDemoALR.svg
Normal file
BIN
PROMS/Formats/genmacall/PROMSDemoALR.svg
Normal file
Binary file not shown.
BIN
PROMS/Formats/genmacall/PROMSDemoBCK.svg
Normal file
BIN
PROMS/Formats/genmacall/PROMSDemoBCK.svg
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
PROMS/Formats/genmacall/acmebck.svg
Normal file
BIN
PROMS/Formats/genmacall/acmebck.svg
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -34,7 +34,7 @@
|
||||
<DefineConstants>TRACE;DEBUG</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
@@ -45,13 +45,14 @@
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>TRACE;DEBUG</DefineConstants>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
@@ -61,7 +62,7 @@
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<DebugType>full</DebugType>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
@@ -85,6 +85,7 @@
|
||||
<DebugType>none</DebugType>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
@@ -92,7 +93,7 @@
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<BaseAddress>285212672</BaseAddress>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
@@ -103,7 +104,7 @@
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>
|
||||
</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
|
||||
@@ -96,10 +96,10 @@ namespace ROEditor
|
||||
private System.Windows.Forms.Label lblW2;
|
||||
private System.Windows.Forms.Label lblW3;
|
||||
private System.Windows.Forms.Label lblW4;
|
||||
private System.Windows.Forms.TextBox tbSingleTxtWid;
|
||||
private System.Windows.Forms.TextBox tbVariableTxtWid;
|
||||
private System.Windows.Forms.TextBox tbTableWid;
|
||||
private System.Windows.Forms.TextBox tbXYPlotWid;
|
||||
private System.Windows.Forms.RichTextBox tbSingleTxtWid; // RO Editor add symbols C2025 - 003
|
||||
private System.Windows.Forms.RichTextBox tbVariableTxtWid;
|
||||
private System.Windows.Forms.RichTextBox tbTableWid;
|
||||
private System.Windows.Forms.RichTextBox tbXYPlotWid;
|
||||
private System.Windows.Forms.Button btnOK;
|
||||
private System.Windows.Forms.Button btnCancel;
|
||||
/// <summary>
|
||||
@@ -218,10 +218,10 @@ namespace ROEditor
|
||||
this.lblFieldName = new System.Windows.Forms.Label();
|
||||
this.tbFieldName = new System.Windows.Forms.TextBox();
|
||||
this.gbAlternatives = new System.Windows.Forms.GroupBox();
|
||||
this.tbXYPlotWid = new System.Windows.Forms.TextBox();
|
||||
this.tbTableWid = new System.Windows.Forms.TextBox();
|
||||
this.tbVariableTxtWid = new System.Windows.Forms.TextBox();
|
||||
this.tbSingleTxtWid = new System.Windows.Forms.TextBox();
|
||||
this.tbXYPlotWid = new System.Windows.Forms.RichTextBox(); // RO Editor add symbols C2025 - 003
|
||||
this.tbTableWid = new System.Windows.Forms.RichTextBox();
|
||||
this.tbVariableTxtWid = new System.Windows.Forms.RichTextBox();
|
||||
this.tbSingleTxtWid = new System.Windows.Forms.RichTextBox();
|
||||
this.lblW4 = new System.Windows.Forms.Label();
|
||||
this.lblW3 = new System.Windows.Forms.Label();
|
||||
this.lblW2 = new System.Windows.Forms.Label();
|
||||
|
||||
@@ -1584,7 +1584,7 @@ namespace ROEditor
|
||||
if (i + 1 < InUseList.Count) inuserecs = inuserecs + " ";
|
||||
}
|
||||
}
|
||||
if (inuserecs != origFieldsInUse)
|
||||
if ((inuserecs ?? "") != (origFieldsInUse ?? ""))
|
||||
return true;
|
||||
|
||||
|
||||
@@ -1599,7 +1599,7 @@ namespace ROEditor
|
||||
if (i + 1 < InUseApplcList.Count) applicfieldrecs = applicfieldrecs + " ";
|
||||
}
|
||||
}
|
||||
if (applicfieldrecs != origApplicFields)
|
||||
if ((applicfieldrecs ?? "") != (origApplicFields ?? ""))
|
||||
return true;
|
||||
|
||||
//nothing has changed
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -7,7 +7,7 @@
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>
|
||||
</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
@@ -71,7 +71,7 @@
|
||||
<DebugType>full</DebugType>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
@@ -96,6 +96,7 @@
|
||||
<DebugType>none</DebugType>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
@@ -103,11 +104,15 @@
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<BaseAddress>285212672</BaseAddress>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.6Build\DevComponents.DotNetBar2.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System">
|
||||
<Name>System</Name>
|
||||
</Reference>
|
||||
@@ -123,10 +128,18 @@
|
||||
<Reference Include="System.Xml">
|
||||
<Name>System.XML</Name>
|
||||
</Reference>
|
||||
<Reference Include="VEPROMS.CSLA.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\VEPROMS.CSLA.Library\bin\Debug\VEPROMS.CSLA.Library.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Volian.Base.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\Volian.Base.Library\bin\Debug\Volian.Base.Library.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Volian.Controls.Library, Version=1.0.9399.43177, Culture=neutral, processorArchitecture=AMD64">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\Volian.Controls.Library\bin\Debug\Volian.Controls.Library.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="AboutROEditor.cs">
|
||||
@@ -167,6 +180,7 @@
|
||||
<Compile Include="RO_FST.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Content Include="Symbols.xml" />
|
||||
<EmbeddedResource Include="AboutROEditor.resx">
|
||||
<SubType>Designer</SubType>
|
||||
<DependentUpon>AboutROEditor.cs</DependentUpon>
|
||||
|
||||
@@ -125,7 +125,7 @@
|
||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
|
||||
CAAAAk1TRnQBSQFMAgEBAgEAASwBAAEsAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
CAAAAk1TRnQBSQFMAgEBAgEAAUQBAAFEAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
||||
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
||||
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
||||
@@ -175,7 +175,7 @@
|
||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAe
|
||||
CwAAAk1TRnQBSQFMAgEBBgEAASwBAAEsAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
CwAAAk1TRnQBSQFMAgEBBgEAAUQBAAFEAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
||||
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
||||
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
||||
|
||||
@@ -264,9 +264,11 @@ namespace ROEditor
|
||||
File.Delete(FstNew); // remove ROFST.NEW
|
||||
if (OrphanedRecords.Length > 0)
|
||||
{
|
||||
StreamWriter sw = new StreamWriter(VlnSettings.TemporaryFolder + @"\Orphaned RO Records.txt");
|
||||
sw.Write(OrphanedRecords.ToString());
|
||||
sw.Close();
|
||||
using (StreamWriter sw = new StreamWriter(Path.Combine(FstDir, @"Orphaned RO Records.txt"), false))
|
||||
{
|
||||
sw.Write(OrphanedRecords.ToString());
|
||||
sw.Close();
|
||||
}
|
||||
MessageBox.Show("The file Orphaned RO Records.txt has been created", "Warning - Orphan RO Record");
|
||||
}
|
||||
|
||||
|
||||
@@ -42,6 +42,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CmpRpt", "..\CmpRpt\CmpRpt.
|
||||
{3A4A3543-2D44-11D6-8452-00A0CC271352} = {3A4A3543-2D44-11D6-8452-00A0CC271352}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D9093FAB-448E-47C7-961B-92B18D85CAF7}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
|
||||
@@ -62,6 +62,7 @@
|
||||
<DebugType>full</DebugType>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
@@ -86,6 +87,7 @@
|
||||
<DebugType>none</DebugType>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
@@ -93,7 +95,7 @@
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<BaseAddress>285212672</BaseAddress>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
@@ -104,7 +106,7 @@
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>
|
||||
</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
|
||||
@@ -35,6 +35,7 @@
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
@@ -44,13 +45,14 @@
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
@@ -59,7 +61,7 @@
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
|
||||
@@ -263,6 +263,7 @@ using System.Collections.Specialized;
|
||||
using Org.Mentalis.Files;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
|
||||
namespace RODBInterface
|
||||
@@ -409,7 +410,7 @@ namespace RODBInterface
|
||||
GetDbServerInfo(ropath);
|
||||
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
|
||||
@@ -1909,6 +1910,8 @@ namespace RODBInterface
|
||||
string Info = DBE.GetString(3);
|
||||
//B2022-043 &pos; was missing the ;
|
||||
Info = Info.Replace("'", "\'"); // B2021-071: crash when getting/saving field names
|
||||
Info = Regex.Replace(Info, @"\\u([0-9]{1,4})\?", m => Convert.ToChar(int.Parse(m.Groups[1].Value)).ToString()); // RO Editor add symbols C2025 - 003
|
||||
|
||||
node.SetAttribute("HasChild", "True");
|
||||
|
||||
// Store data in the VlnXmlElement as a subgroup
|
||||
@@ -1972,6 +1975,7 @@ namespace RODBInterface
|
||||
elem.SetAttribute("RecID", RecID);
|
||||
elem.SetAttribute("ParentID", node.GetAttribute("RecID"));
|
||||
elem.SetAttribute("Table", node.GetAttribute("Table"));
|
||||
AccPageID = Regex.Replace(AccPageID, @"\\u([0-9]{1,4})\?", m => Convert.ToChar(int.Parse(m.Groups[1].Value)).ToString()); // RO Editor add symbols C2025 - 003
|
||||
elem.SetAttribute("AccPageID", AccPageID);
|
||||
}
|
||||
}
|
||||
@@ -2182,10 +2186,13 @@ namespace RODBInterface
|
||||
parent.SetAttribute("ChildLoaded", "True");
|
||||
}
|
||||
string xmlstr = GenerateXmlString(ro, false);
|
||||
string tmp2 = Regex.Replace(xmlstr, @"\\u([0-9]{1,4})\?", m => Convert.ToChar(int.Parse(m.Groups[1].Value)).ToString()); // RO Editor add symbols C2025 - 003
|
||||
string wraccid = null;
|
||||
if (ro.HasAttribute("AccPageID"))
|
||||
{
|
||||
string accid = ro.GetAttribute("AccPageID");
|
||||
|
||||
|
||||
int quote = accid.IndexOf("'");
|
||||
if (quote >= 0)
|
||||
wraccid = accid.Insert(quote, "'");
|
||||
|
||||
@@ -62,6 +62,7 @@
|
||||
<DebugType>full</DebugType>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
@@ -86,6 +87,7 @@
|
||||
<DebugType>none</DebugType>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
@@ -93,7 +95,7 @@
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<BaseAddress>285212672</BaseAddress>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
@@ -104,11 +106,14 @@
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>
|
||||
</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="ctlXMLEditLib">
|
||||
<HintPath>..\..\..\VEPROMS User Interface\bin\Debug\ctlXMLEditLib.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System">
|
||||
<Name>System</Name>
|
||||
</Reference>
|
||||
@@ -171,6 +176,17 @@
|
||||
<Name>VlnStatus</Name>
|
||||
</ProjectReference>
|
||||
</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" />
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user