diff --git a/Mk0.Software.ImageSorter/App.config b/Mk0.Software.ImageSorter/App.config
index 161ff3f..3a32af8 100644
--- a/Mk0.Software.ImageSorter/App.config
+++ b/Mk0.Software.ImageSorter/App.config
@@ -38,10 +38,10 @@
-
+
-
+
True
@@ -73,6 +73,9 @@
3
+
+ False
+
diff --git a/Mk0.Software.ImageSorter/Main.Designer.cs b/Mk0.Software.ImageSorter/Main.Designer.cs
index 732a4ef..3b1f0c6 100644
--- a/Mk0.Software.ImageSorter/Main.Designer.cs
+++ b/Mk0.Software.ImageSorter/Main.Designer.cs
@@ -693,7 +693,7 @@
this.MinimumSize = new System.Drawing.Size(983, 605);
this.Name = "Main";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
- this.Text = "Image Sorter v1.48 | © 2015-2020 by mk0.at";
+ this.Text = "Image Sorter v1.49 | © 2015-2020 by mk0.at";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing);
this.Load += new System.EventHandler(this.Main_Load);
this.Shown += new System.EventHandler(this.Main_Shown);
diff --git a/Mk0.Software.ImageSorter/Main.cs b/Mk0.Software.ImageSorter/Main.cs
index c9aba79..164b9dc 100644
--- a/Mk0.Software.ImageSorter/Main.cs
+++ b/Mk0.Software.ImageSorter/Main.cs
@@ -146,21 +146,28 @@ namespace Mk0.Software.ImageSorter
///
private void Main_Shown(object sender, EventArgs e)
{
- if (Properties.Settings.Default.lastHeight >= MinimumSize.Height)
+ if (Properties.Settings.Default.fullScreen)
{
- Height = Properties.Settings.Default.lastHeight;
+ WindowState = FormWindowState.Maximized;
}
- if (Properties.Settings.Default.lastWidth >= MinimumSize.Width)
+ else
{
- Width = Properties.Settings.Default.lastWidth;
- }
- if (Properties.Settings.Default.lastTop <= Screen.PrimaryScreen.Bounds.Height && Properties.Settings.Default.lastTop >= 0)
- {
- Top = Properties.Settings.Default.lastTop;
- }
- if (Properties.Settings.Default.lastLeft <= Screen.PrimaryScreen.Bounds.Width && Properties.Settings.Default.lastLeft >= 0)
- {
- Left = Properties.Settings.Default.lastLeft;
+ if (Properties.Settings.Default.lastHeight >= MinimumSize.Height)
+ {
+ Height = Properties.Settings.Default.lastHeight;
+ }
+ if (Properties.Settings.Default.lastWidth >= MinimumSize.Width)
+ {
+ Width = Properties.Settings.Default.lastWidth;
+ }
+ if (Properties.Settings.Default.lastTop <= Screen.PrimaryScreen.Bounds.Height && Properties.Settings.Default.lastTop >= 0)
+ {
+ Top = Properties.Settings.Default.lastTop;
+ }
+ if (Properties.Settings.Default.lastLeft <= Screen.PrimaryScreen.Bounds.Width && Properties.Settings.Default.lastLeft >= 0)
+ {
+ Left = Properties.Settings.Default.lastLeft;
+ }
}
groupBoxInformationen.Visible = Properties.Settings.Default.showInfo;
if (!groupBoxInformationen.Visible)
@@ -1189,6 +1196,7 @@ namespace Mk0.Software.ImageSorter
Properties.Settings.Default.lastTop = Top;
Properties.Settings.Default.lastLeft = Left;
Properties.Settings.Default.showInfo = groupBoxInformationen.Visible;
+ Properties.Settings.Default.fullScreen = (WindowState == FormWindowState.Maximized ? true : false);
Properties.Settings.Default.Save();
}
diff --git a/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj b/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj
index d124504..d8e27cd 100644
--- a/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj
+++ b/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj
@@ -33,7 +33,7 @@
manuelkamper.com
false
0
- 1.48.0.0
+ 1.49.0.0
true
true
true
@@ -79,6 +79,9 @@
..\packages\mk0.gui.banner.1.0.0\lib\net461\Mk0.GUI.Banner.dll
+
+ ..\..\manuelkamp\Mk0.Software.OnlineUpdater\Mk0.Software.OnlineUpdater\bin\Debug\Mk0.Software.OnlineUpdater.dll
+
..\packages\mk0.tools.calculation.1.0.0\lib\net461\Mk0.Tools.Calculation.dll
@@ -91,10 +94,6 @@
..\packages\mk0.tools.randomization.1.0.0\lib\net461\Mk0.Tools.Randomization.dll
-
- False
- ..\..\..\Mk0.Software.OnlineUpdater\Mk0.Software.OnlineUpdater\bin\Debug\OnlineUpdater.dll
-
diff --git a/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs b/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs
index 5f26207..de0ff5e 100644
--- a/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs
+++ b/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.48.*")]
+[assembly: AssemblyVersion("1.49.*")]
//[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/Mk0.Software.ImageSorter/Properties/Settings.Designer.cs b/Mk0.Software.ImageSorter/Properties/Settings.Designer.cs
index 1f5ac93..332f827 100644
--- a/Mk0.Software.ImageSorter/Properties/Settings.Designer.cs
+++ b/Mk0.Software.ImageSorter/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace Mk0.Software.ImageSorter.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -166,5 +166,17 @@ namespace Mk0.Software.ImageSorter.Properties {
this["fadingSpeed"] = value;
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("False")]
+ public bool fullScreen {
+ get {
+ return ((bool)(this["fullScreen"]));
+ }
+ set {
+ this["fullScreen"] = value;
+ }
+ }
}
}
diff --git a/Mk0.Software.ImageSorter/Properties/Settings.settings b/Mk0.Software.ImageSorter/Properties/Settings.settings
index 3357dee..576bc42 100644
--- a/Mk0.Software.ImageSorter/Properties/Settings.settings
+++ b/Mk0.Software.ImageSorter/Properties/Settings.settings
@@ -38,5 +38,8 @@
3
+
+ False
+
\ No newline at end of file