Skip to content

Commit

Permalink
v2.2.5
Browse files Browse the repository at this point in the history
Latest version code
  • Loading branch information
eibol authored Oct 19, 2020
1 parent d314579 commit ffa9cea
Show file tree
Hide file tree
Showing 9 changed files with 750 additions and 641 deletions.
7 changes: 4 additions & 3 deletions FFBatch_Converter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@
<StartupObject>FFBatch.Program</StartupObject>
</PropertyGroup>
<PropertyGroup>
<ManifestCertificateThumbprint>BAD5BAFD541ECDF55A8D818397CE59923F1977D9</ManifestCertificateThumbprint>
<ManifestCertificateThumbprint>435F46A2ACDB27F59B873A7AC0D6E884937B5C75</ManifestCertificateThumbprint>
</PropertyGroup>
<PropertyGroup>
<ManifestKeyFile>EibolSoft_2020_2.pfx</ManifestKeyFile>
<ManifestKeyFile>FFBatch_Converter_3_TemporaryKey.pfx</ManifestKeyFile>
</PropertyGroup>
<PropertyGroup>
<GenerateManifests>true</GenerateManifests>
Expand All @@ -80,7 +80,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>EibolSoft_2020_2.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>FFBatch_Converter_3_TemporaryKey.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup>
<NoWin32Manifest>true</NoWin32Manifest>
Expand Down Expand Up @@ -287,6 +287,7 @@
<None Include="EibolSoft_2020_2.pfx" />
<None Include="FFBatch_2020Key.pfx" />
<None Include="FFBatch_Converter_2_TemporaryKey.pfx" />
<None Include="FFBatch_Converter_3_TemporaryKey.pfx" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>PublicSettingsSingleFileGenerator</Generator>
Expand Down
2 changes: 1 addition & 1 deletion Form1.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

321 changes: 192 additions & 129 deletions Form1.cs

Large diffs are not rendered by default.

367 changes: 183 additions & 184 deletions Form1.resx

Large diffs are not rendered by default.

60 changes: 37 additions & 23 deletions Form3.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 36 additions & 3 deletions Form3.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public Form3()
public Boolean sort_multi;
public Boolean send_params_console;
public Boolean warn_successful;
public Boolean no_warn_0;
public Boolean reload_config;
public Boolean subfolders;
public Boolean to_sleep;
Expand Down Expand Up @@ -396,11 +397,36 @@ private void Form3_Load(object sender, EventArgs e)
warn_successful = true;
}

//End warn sucessful items
//End warn sucessful items

//No saving of logs
//Warn 0 duration

String f_nologs = String.Empty;
String f_warn_0 = String.Empty;
if (is_portable == false)
{
f_warn_0 = System.IO.Path.Combine(Environment.GetEnvironmentVariable("appdata"), "FFBatch") + "\\" + "ff_warn_0.ini";
}
else
{
f_warn_0 = System.IO.Path.Combine(Environment.GetEnvironmentVariable("appdata"), "FFBatch") + "\\" + "ff_warn_0_portable.ini";
}

if (File.Exists(f_warn_0))
{
chk_non0.CheckState = CheckState.Checked;
no_warn_0 = false;
}
else
{
chk_non0.CheckState = CheckState.Unchecked;
no_warn_0 = true;
}

//End warn 0 duration

//No saving of logs

String f_nologs = String.Empty;
if (is_portable == false)
{
f_nologs = System.IO.Path.Combine(Environment.GetEnvironmentVariable("appdata"), "FFBatch") + "\\" + "ff_nologs.ini";
Expand Down Expand Up @@ -838,6 +864,7 @@ private void btn_defaults_Click(object sender, EventArgs e)
checkBox1.CheckState = CheckState.Unchecked;
chk_play.Checked = false;
chk_w_position.Checked = false;
chk_non0.Checked = false;
}

private void btn_restore_Click(object sender, EventArgs e)
Expand Down Expand Up @@ -1036,5 +1063,11 @@ private void chk_w_position_CheckedChanged(object sender, EventArgs e)
if (chk_w_position.CheckState == CheckState.Checked) remember_w = true;
else remember_w = false;
}

private void chk_non0_CheckedChanged(object sender, EventArgs e)
{
if (chk_non0.CheckState == CheckState.Checked) no_warn_0 = true;
else no_warn_0 = false;
}
}
}
Loading

0 comments on commit ffa9cea

Please sign in to comment.