Skip to content
This repository was archived by the owner on Dec 16, 2022. It is now read-only.

Commit 527623b

Browse files
andreigecandreigec
committed
0.4: keep app responsive
1 parent 19a1c44 commit 527623b

33 files changed

+54826
-57
lines changed

‎SOURCE/.vs/DwarfFortressModMerger/v14/.suo‎

74.5 KB
Binary file not shown.

‎SOURCE/DwarfFortressModMerger.sln‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,45 @@
11

2-
Microsoft Visual Studio Solution File, Format Version 11.00
3-
# Visual Studio 2010
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.24720.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
46
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DwarfFortressModMerger", "DwarfFortressModMerger\DwarfFortressModMerger.csproj", "{CE1E85E5-85BC-4358-8053-EB7EDD280303}"
57
EndProject
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANDREICSLIB", "..\..\ANDREICSLIB\SOURCE\ANDREICSLIB\ANDREICSLIB.csproj", "{469B8120-B6D8-48BD-97C4-AFAB63AEE304}"
7-
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Debug|Any CPU = Debug|Any CPU
1111
Debug|Mixed Platforms = Debug|Mixed Platforms
12+
Debug|x64 = Debug|x64
1213
Debug|x86 = Debug|x86
1314
Release With Debug|Any CPU = Release With Debug|Any CPU
1415
Release With Debug|Mixed Platforms = Release With Debug|Mixed Platforms
16+
Release With Debug|x64 = Release With Debug|x64
1517
Release With Debug|x86 = Release With Debug|x86
1618
Release|Any CPU = Release|Any CPU
1719
Release|Mixed Platforms = Release|Mixed Platforms
20+
Release|x64 = Release|x64
1821
Release|x86 = Release|x86
1922
EndGlobalSection
2023
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2124
{CE1E85E5-85BC-4358-8053-EB7EDD280303}.Debug|Any CPU.ActiveCfg = Debug|x86
2225
{CE1E85E5-85BC-4358-8053-EB7EDD280303}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
2326
{CE1E85E5-85BC-4358-8053-EB7EDD280303}.Debug|Mixed Platforms.Build.0 = Debug|x86
27+
{CE1E85E5-85BC-4358-8053-EB7EDD280303}.Debug|x64.ActiveCfg = Debug|x86
2428
{CE1E85E5-85BC-4358-8053-EB7EDD280303}.Debug|x86.ActiveCfg = Debug|x86
2529
{CE1E85E5-85BC-4358-8053-EB7EDD280303}.Debug|x86.Build.0 = Debug|x86
2630
{CE1E85E5-85BC-4358-8053-EB7EDD280303}.Release With Debug|Any CPU.ActiveCfg = Release|x86
2731
{CE1E85E5-85BC-4358-8053-EB7EDD280303}.Release With Debug|Mixed Platforms.ActiveCfg = Release|x86
2832
{CE1E85E5-85BC-4358-8053-EB7EDD280303}.Release With Debug|Mixed Platforms.Build.0 = Release|x86
33+
{CE1E85E5-85BC-4358-8053-EB7EDD280303}.Release With Debug|x64.ActiveCfg = Release|x86
34+
{CE1E85E5-85BC-4358-8053-EB7EDD280303}.Release With Debug|x64.Build.0 = Release|x86
2935
{CE1E85E5-85BC-4358-8053-EB7EDD280303}.Release With Debug|x86.ActiveCfg = Debug|x86
3036
{CE1E85E5-85BC-4358-8053-EB7EDD280303}.Release With Debug|x86.Build.0 = Debug|x86
3137
{CE1E85E5-85BC-4358-8053-EB7EDD280303}.Release|Any CPU.ActiveCfg = Release|x86
3238
{CE1E85E5-85BC-4358-8053-EB7EDD280303}.Release|Mixed Platforms.ActiveCfg = Release|x86
3339
{CE1E85E5-85BC-4358-8053-EB7EDD280303}.Release|Mixed Platforms.Build.0 = Release|x86
40+
{CE1E85E5-85BC-4358-8053-EB7EDD280303}.Release|x64.ActiveCfg = Release|x86
3441
{CE1E85E5-85BC-4358-8053-EB7EDD280303}.Release|x86.ActiveCfg = Release|x86
3542
{CE1E85E5-85BC-4358-8053-EB7EDD280303}.Release|x86.Build.0 = Release|x86
36-
{469B8120-B6D8-48BD-97C4-AFAB63AEE304}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37-
{469B8120-B6D8-48BD-97C4-AFAB63AEE304}.Debug|Any CPU.Build.0 = Debug|Any CPU
38-
{469B8120-B6D8-48BD-97C4-AFAB63AEE304}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
39-
{469B8120-B6D8-48BD-97C4-AFAB63AEE304}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
40-
{469B8120-B6D8-48BD-97C4-AFAB63AEE304}.Debug|x86.ActiveCfg = Debug|Any CPU
41-
{469B8120-B6D8-48BD-97C4-AFAB63AEE304}.Release With Debug|Any CPU.ActiveCfg = Release With Debug|Any CPU
42-
{469B8120-B6D8-48BD-97C4-AFAB63AEE304}.Release With Debug|Any CPU.Build.0 = Release With Debug|Any CPU
43-
{469B8120-B6D8-48BD-97C4-AFAB63AEE304}.Release With Debug|Mixed Platforms.ActiveCfg = Release With Debug|Any CPU
44-
{469B8120-B6D8-48BD-97C4-AFAB63AEE304}.Release With Debug|Mixed Platforms.Build.0 = Release With Debug|Any CPU
45-
{469B8120-B6D8-48BD-97C4-AFAB63AEE304}.Release With Debug|x86.ActiveCfg = Release With Debug|Any CPU
46-
{469B8120-B6D8-48BD-97C4-AFAB63AEE304}.Release|Any CPU.ActiveCfg = Release|Any CPU
47-
{469B8120-B6D8-48BD-97C4-AFAB63AEE304}.Release|Any CPU.Build.0 = Release|Any CPU
48-
{469B8120-B6D8-48BD-97C4-AFAB63AEE304}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
49-
{469B8120-B6D8-48BD-97C4-AFAB63AEE304}.Release|Mixed Platforms.Build.0 = Release|Any CPU
50-
{469B8120-B6D8-48BD-97C4-AFAB63AEE304}.Release|x86.ActiveCfg = Release|Any CPU
5143
EndGlobalSection
5244
GlobalSection(SolutionProperties) = preSolution
5345
HideSolutionNode = FALSE

‎SOURCE/DwarfFortressModMerger/DwarfFortressModMerger.csproj‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,8 +10,9 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>DwarfFortressModMerger</RootNamespace>
1212
<AssemblyName>DwarfFortressModMerger</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
13+
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
14+
<TargetFrameworkProfile>
15+
</TargetFrameworkProfile>
1516
<FileAlignment>512</FileAlignment>
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -23,6 +24,7 @@
2324
<DefineConstants>DEBUG;TRACE</DefineConstants>
2425
<ErrorReport>prompt</ErrorReport>
2526
<WarningLevel>4</WarningLevel>
27+
<Prefer32Bit>false</Prefer32Bit>
2628
</PropertyGroup>
2729
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
2830
<PlatformTarget>x86</PlatformTarget>
@@ -32,6 +34,7 @@
3234
<DefineConstants>TRACE</DefineConstants>
3335
<ErrorReport>prompt</ErrorReport>
3436
<WarningLevel>4</WarningLevel>
37+
<Prefer32Bit>false</Prefer32Bit>
3538
</PropertyGroup>
3639
<PropertyGroup>
3740
<StartupObject>DwarfFortressModMerger.Program</StartupObject>
@@ -40,6 +43,18 @@
4043
<ApplicationIcon>j.ico</ApplicationIcon>
4144
</PropertyGroup>
4245
<ItemGroup>
46+
<Reference Include="ANDREICSLIB, Version=1.0.80.0, Culture=neutral, processorArchitecture=MSIL">
47+
<HintPath>..\packages\ANDREICSLIB.1.0.80.0\lib\net451\ANDREICSLIB.dll</HintPath>
48+
<Private>True</Private>
49+
</Reference>
50+
<Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
51+
<HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
52+
<Private>True</Private>
53+
</Reference>
54+
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
55+
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
56+
<Private>True</Private>
57+
</Reference>
4358
<Reference Include="System" />
4459
<Reference Include="System.Core" />
4560
<Reference Include="System.Runtime.Serialization" />
@@ -82,6 +97,7 @@
8297
<DesignTime>True</DesignTime>
8398
</Compile>
8499
<None Include="app.config" />
100+
<None Include="packages.config" />
85101
<None Include="Properties\Settings.settings">
86102
<Generator>SettingsSingleFileGenerator</Generator>
87103
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -115,12 +131,6 @@
115131
<None Include="Service References\ServiceReference1\configuration91.svcinfo" />
116132
<None Include="Service References\ServiceReference1\Services.disco" />
117133
</ItemGroup>
118-
<ItemGroup>
119-
<ProjectReference Include="..\..\..\ANDREICSLIB\SOURCE\ANDREICSLIB\ANDREICSLIB.csproj">
120-
<Project>{469B8120-B6D8-48BD-97C4-AFAB63AEE304}</Project>
121-
<Name>ANDREICSLIB</Name>
122-
</ProjectReference>
123-
</ItemGroup>
124134
<ItemGroup>
125135
<WCFMetadata Include="Service References\" />
126136
</ItemGroup>

‎SOURCE/DwarfFortressModMerger/Form1.cs‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
using System.Threading;
1212
using System.Windows.Forms;
1313
using ANDREICSLIB;
14+
using ANDREICSLIB.Helpers;
15+
using ANDREICSLIB.Licensing;
1416
using DwarfFortressModMerger.Properties;
1517
using DwarfFortressModMerger.ServiceReference1;
1618

@@ -21,7 +23,7 @@ public partial class Form1 : Form
2123
#region licensing
2224

2325
private const string AppTitle = "Dwarf Fortress Mod Merger";
24-
private const double AppVersion = 0.3;
26+
private const double AppVersion = 0.4;
2527
private const String HelpString = "";
2628

2729
private readonly String OtherText =
@@ -266,12 +268,20 @@ private void startmergebutton_Click(object sender, EventArgs e)
266268
return;
267269
}
268270

269-
var res = controller.MergeOp(v, m, o, mergesaveCB.Checked, mergeinitdirCB.Checked, ChangeStatusText);
270-
if (res == false)
271-
return;
271+
try
272+
{
273+
startmergebutton.Enabled = false;
274+
var res = controller.MergeOp(v, m, o, mergesaveCB.Checked, mergeinitdirCB.Checked, ChangeStatusText);
275+
if (res == false)
276+
return;
272277

273-
if (opendirCB.Checked)
274-
Process.Start(o);
278+
if (opendirCB.Checked)
279+
Process.Start(o);
280+
}
281+
finally
282+
{
283+
startmergebutton.Enabled = true;
284+
}
275285
}
276286

277287
private void helpToolStripMenuItem1_Click(object sender, EventArgs e)

‎SOURCE/DwarfFortressModMerger/Properties/Settings.Designer.cs‎

Lines changed: 10 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SOURCE/DwarfFortressModMerger/Resources.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SOURCE/DwarfFortressModMerger/Service References/ServiceReference1/DwarfFortressModMerger.ServiceReference1.TitleInfoServiceModel.datasource‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
cause the file to be unrecognizable by the program.
77
-->
88
<GenericObjectDataSource DisplayName="TitleInfoServiceModel" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
9-
<TypeInfo>DwarfFortressModMerger.ServiceReference1.TitleInfoServiceModel, Service References.ServiceReference1.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
9+
<TypeInfo>DwarfFortressModMerger.ServiceReference1.TitleInfoServiceModel, Service References.ServiceReference1.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
1010
</GenericObjectDataSource>

‎SOURCE/DwarfFortressModMerger/Service References/ServiceReference1/Reference.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was generated by a tool.
4-
// Runtime Version:4.0.30319.18408
4+
// Runtime Version:4.0.30319.42000
55
//
66
// Changes to this file may cause incorrect behavior and will be lost if
77
// the code is regenerated.

‎SOURCE/DwarfFortressModMerger/app.config‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<system.serviceModel>
44
<bindings>
55
<basicHttpBinding>
6-
<binding name="BasicHttpBinding_IServices" messageEncoding="Mtom" />
6+
<binding name="BasicHttpBinding_IServices" messageEncoding="Mtom"/>
77
</basicHttpBinding>
88
</bindings>
99
<client>
10-
<endpoint address="http://andreigec.net/services/Services.svc"
11-
binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IServices"
12-
contract="ServiceReference1.IServices" name="BasicHttpBinding_IServices" />
10+
<endpoint address="http://andreigec.net/services/Services.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IServices" contract="ServiceReference1.IServices" name="BasicHttpBinding_IServices"/>
1311
</client>
1412
</system.serviceModel>
15-
</configuration>
13+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/></startup></configuration>

‎SOURCE/DwarfFortressModMerger/controller.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using System.Threading;
77
using System.Windows.Forms;
88
using ANDREICSLIB;
9+
using ANDREICSLIB.ClassExtras;
910

1011
namespace DwarfFortressModMerger
1112
{

0 commit comments

Comments
 (0)