implemented #3

This commit is contained in:
Manuel Kamper 2020-01-19 08:40:43 +01:00
parent f99d31c72d
commit f1bec13c66
4 changed files with 14 additions and 9 deletions

View File

@ -693,7 +693,7 @@
this.MinimumSize = new System.Drawing.Size(983, 605); this.MinimumSize = new System.Drawing.Size(983, 605);
this.Name = "Main"; this.Name = "Main";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Image Sorter v1.50 | © 2015-2020 by mk0.at"; this.Text = "Image Sorter v1.51 | © 2015-2020 by mk0.at";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing);
this.Load += new System.EventHandler(this.Main_Load); this.Load += new System.EventHandler(this.Main_Load);
this.Shown += new System.EventHandler(this.Main_Shown); this.Shown += new System.EventHandler(this.Main_Shown);

View File

@ -45,6 +45,7 @@ namespace Mk0.Software.ImageSorter
public string[] Args; public string[] Args;
private System.Timers.Timer t1 = new System.Timers.Timer(1200); private System.Timers.Timer t1 = new System.Timers.Timer(1200);
private FormWindowState lastState = FormWindowState.Minimized; private FormWindowState lastState = FormWindowState.Minimized;
private string defaultWindowName;
public Main() public Main()
{ {
@ -81,6 +82,8 @@ namespace Mk0.Software.ImageSorter
Args = null; Args = null;
} }
defaultWindowName = Text;
AutoUpdater.ShowSkipButton = false; AutoUpdater.ShowSkipButton = false;
AutoUpdater.Start("https://software.mk0.at/update/imagesorter.xml"); AutoUpdater.Start("https://software.mk0.at/update/imagesorter.xml");
} }
@ -572,10 +575,12 @@ namespace Mk0.Software.ImageSorter
imageIndex = 0; imageIndex = 0;
} }
pictureBoxImage.ImageLocation = CropImageBorders(images.ElementAt(imageIndex)); pictureBoxImage.ImageLocation = CropImageBorders(images.ElementAt(imageIndex));
Text = defaultWindowName + " - " + Path.GetFileName(pictureBoxImage.ImageLocation);
} }
else else
{ {
pictureBoxImage.Image = null; pictureBoxImage.Image = null;
Text = defaultWindowName;
} }
} }

View File

@ -33,7 +33,7 @@
<PublisherName>manuelkamper.com</PublisherName> <PublisherName>manuelkamper.com</PublisherName>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish> <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.50.0.0</ApplicationVersion> <ApplicationVersion>1.51.0.0</ApplicationVersion>
<UseApplicationTrust>true</UseApplicationTrust> <UseApplicationTrust>true</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>
<ExcludeDeploymentUrl>true</ExcludeDeploymentUrl> <ExcludeDeploymentUrl>true</ExcludeDeploymentUrl>
@ -77,22 +77,22 @@
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
<Reference Include="Mk0.GUI.Banner, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Mk0.GUI.Banner, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\mk0.gui.banner.1.0.0\lib\net461\Mk0.GUI.Banner.dll</HintPath> <HintPath>..\..\..\Mk0.Tools.Password\Mk0.Tools.Password\Mk0.Tools.Password\mk0.gui.banner.1.0.0\lib\net461\Mk0.GUI.Banner.dll</HintPath>
</Reference> </Reference>
<Reference Include="Mk0.Software.OnlineUpdater"> <Reference Include="Mk0.Software.OnlineUpdater">
<HintPath>..\..\manuelkamp\Mk0.Software.OnlineUpdater\Mk0.Software.OnlineUpdater\bin\Debug\Mk0.Software.OnlineUpdater.dll</HintPath> <HintPath>..\..\Mk0.Software.OnlineUpdater\Mk0.Software.OnlineUpdater\bin\Debug\Mk0.Software.OnlineUpdater.dll</HintPath>
</Reference> </Reference>
<Reference Include="Mk0.Tools.Calculation, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Mk0.Tools.Calculation, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\mk0.tools.calculation.1.0.0\lib\net461\Mk0.Tools.Calculation.dll</HintPath> <HintPath>..\..\..\Mk0.Tools.Password\Mk0.Tools.Password\Mk0.Tools.Password\mk0.tools.calculation.1.0.0\lib\net461\Mk0.Tools.Calculation.dll</HintPath>
</Reference> </Reference>
<Reference Include="Mk0.Tools.ImageCropper, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Mk0.Tools.ImageCropper, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\mk0.tools.imagecropper.1.0.0\lib\net461\Mk0.Tools.ImageCropper.dll</HintPath> <HintPath>..\..\..\Mk0.Tools.Password\Mk0.Tools.Password\Mk0.Tools.Password\mk0.tools.imagecropper.1.0.0\lib\net461\Mk0.Tools.ImageCropper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Mk0.Tools.Images, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Mk0.Tools.Images, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\mk0.tools.images.1.0.4\lib\net461\Mk0.Tools.Images.dll</HintPath> <HintPath>..\..\..\Mk0.Tools.Password\Mk0.Tools.Password\Mk0.Tools.Password\mk0.tools.images.1.0.4\lib\net461\Mk0.Tools.Images.dll</HintPath>
</Reference> </Reference>
<Reference Include="Mk0.Tools.Randomization, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Mk0.Tools.Randomization, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\mk0.tools.randomization.1.0.0\lib\net461\Mk0.Tools.Randomization.dll</HintPath> <HintPath>..\..\..\Mk0.Tools.Password\Mk0.Tools.Password\Mk0.Tools.Password\mk0.tools.randomization.1.0.0\lib\net461\Mk0.Tools.Randomization.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />

View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben: // übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.50.*")] [assembly: AssemblyVersion("1.51.*")]
//[assembly: AssemblyFileVersion("1.6.0.0")] //[assembly: AssemblyFileVersion("1.6.0.0")]