added heic

This commit is contained in:
Manuel Kamper 2023-03-27 19:10:29 +02:00
parent e6efa42e45
commit 7ae2923906
8 changed files with 33 additions and 13 deletions

View File

@ -470,7 +470,8 @@
this.labelNoImages.Size = new System.Drawing.Size(682, 526);
this.labelNoImages.TabIndex = 1;
this.labelNoImages.Text = "Keine Bilder im aktuellen Pfad vorhanden.\r\nBitte den Quellpfad ändern, um Bilder " +
"zu sortieren.\r\nErlaubte Dateiformate sind (JPG, PNG, GIF, BMP, TIF, WEBP).";
"zu sortieren.\r\nErlaubte Dateiformate sind:\r\nJP(E)G, PNG, GIF, BMP, TIF(F), WEBP," +
" HEIC";
this.labelNoImages.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// groupBoxRander
@ -612,7 +613,7 @@
this.labelBanner2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelBanner2.Location = new System.Drawing.Point(56, 27);
this.labelBanner2.Name = "labelBanner2";
this.labelBanner2.Size = new System.Drawing.Size(194, 16);
this.labelBanner2.Size = new System.Drawing.Size(193, 16);
this.labelBanner2.TabIndex = 2;
this.labelBanner2.Text = "\"Pfadangabe\" verschoben.";
//
@ -622,7 +623,7 @@
this.labelBanner1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelBanner1.Location = new System.Drawing.Point(57, 7);
this.labelBanner1.Name = "labelBanner1";
this.labelBanner1.Size = new System.Drawing.Size(241, 16);
this.labelBanner1.Size = new System.Drawing.Size(240, 16);
this.labelBanner1.TabIndex = 1;
this.labelBanner1.Text = "Bild \"Dateiname\" erfolgreich nach";
//
@ -820,7 +821,7 @@
this.KeyPreview = true;
this.MinimumSize = new System.Drawing.Size(983, 605);
this.Name = "Main";
this.Text = "Image Sorter v2.2 | © 2015-2023 by kmpr.at";
this.Text = "Image Sorter v2.3 | © 2015-2023 by kmpr.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);

View File

@ -24,7 +24,7 @@ namespace Mk0.Software.ImageSorter
{
public string quellPath = "";
public string zielPath = "";
private string[] fileTypes = { ".jpg", ".png", ".jpeg", ".gif", ".tif", ".tiff", ".bmp", ".webp" };
private string[] fileTypes = { ".jpg", ".png", ".jpeg", ".gif", ".tif", ".tiff", ".bmp", ".webp", ".heic" };
private int moved = 0;
private int imageIndex;
private List<Button> buttons = new List<Button>();
@ -64,7 +64,9 @@ namespace Mk0.Software.ImageSorter
FileAssociation.Check("Image_Sorter_JPEG", Application.ExecutablePath, "JPEG Bild", $@"{Application.StartupPath}\AssocIcons\jpeg.ico") &&
FileAssociation.Check("Image_Sorter_BMP", Application.ExecutablePath, "BMP Bild", $@"{Application.StartupPath}\AssocIcons\bmp.ico") &&
FileAssociation.Check("Image_Sorter_TIF", Application.ExecutablePath, "TIF Bild", $@"{Application.StartupPath}\AssocIcons\tif.ico") &&
FileAssociation.Check("Image_Sorter_TIFF", Application.ExecutablePath, "TIFF Bild", $@"{Application.StartupPath}\AssocIcons\tiff.ico"))
FileAssociation.Check("Image_Sorter_TIFF", Application.ExecutablePath, "TIFF Bild", $@"{Application.StartupPath}\AssocIcons\tiff.ico") &&
FileAssociation.Check("Image_Sorter_WEBP", Application.ExecutablePath, "WEBP Bild", $@"{Application.StartupPath}\AssocIcons\webp.ico") &&
FileAssociation.Check("Image_Sorter_HEIC", Application.ExecutablePath, "HEIC Bild", $@"{Application.StartupPath}\AssocIcons\heic.ico"))
{
Properties.Settings.Default.fileAssociation = true;
}
@ -131,6 +133,7 @@ namespace Mk0.Software.ImageSorter
WriteResource($@"{Application.StartupPath}\AssocIcons\tif.ico", Resources.tif);
WriteResource($@"{Application.StartupPath}\AssocIcons\tiff.ico", Resources.tiff);
WriteResource($@"{Application.StartupPath}\AssocIcons\webp.ico", Resources.webp);
WriteResource($@"{Application.StartupPath}\AssocIcons\heic.ico", Resources.heic);
}
/// <summary>
@ -581,6 +584,7 @@ namespace Mk0.Software.ImageSorter
FileAssociation.Add("Image_Sorter_TIF", ".tif", Application.ExecutablePath, "TIF Bild", $@"{Application.StartupPath}\AssocIcons\tif.ico");
FileAssociation.Add("Image_Sorter_TIFF", ".tiff", Application.ExecutablePath, "TIFF Bild", $@"{Application.StartupPath}\AssocIcons\tiff.ico");
FileAssociation.Add("Image_Sorter_WEBP", ".webp", Application.ExecutablePath, "WEBP Bild", $@"{Application.StartupPath}\AssocIcons\webp.ico");
FileAssociation.Add("Image_Sorter_HEIC", ".heic", Application.ExecutablePath, "HEIC Bild", $@"{Application.StartupPath}\AssocIcons\heic.ico");
}
else
{
@ -595,6 +599,7 @@ namespace Mk0.Software.ImageSorter
FileAssociation.Remove("Image_Sorter_TIF");
FileAssociation.Remove("Image_Sorter_TIFF");
FileAssociation.Remove("Image_Sorter_WEBP");
FileAssociation.Remove("Image_Sorter_HEIC");
}
}

View File

@ -33,7 +33,7 @@
<PublisherName>manuelkamper.com</PublisherName>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>2.2.0.0</ApplicationVersion>
<ApplicationVersion>2.3.0.0</ApplicationVersion>
<UseApplicationTrust>true</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<ExcludeDeploymentUrl>true</ExcludeDeploymentUrl>
@ -187,6 +187,8 @@
</ItemGroup>
<ItemGroup>
<Content Include="Mk0.Software.OnlineUpdater.dll" />
<Content Include="Resources\heic.ico" />
<Content Include="Resources\webp.ico" />
<None Include="Resources\transform-rotate-270-icon.png" />
<None Include="Resources\transform-rotate-180-icon.png" />
<None Include="Resources\transform-rotate-90-icon.png" />
@ -195,7 +197,6 @@
<None Include="Resources\arrow-undo-icon.png" />
<None Include="Resources\bin-closed-icon.png" />
<Content Include="Resources\bmp.ico" />
<None Include="Resources\webp.ico" />
<None Include="Resources\duplicate.png" />
<None Include="Resources\canvas-size-icon.png" />
<None Include="Resources\cog-icon.png" />

View File

@ -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("2.2.*")]
[assembly: AssemblyVersion("2.3.*")]
//[assembly: AssemblyFileVersion("1.6.0.0")]

View File

@ -19,7 +19,7 @@ namespace Mk0.Software.ImageSorter.Properties {
// -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
// Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
// mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@ -290,6 +290,16 @@ namespace Mk0.Software.ImageSorter.Properties {
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
/// </summary>
internal static System.Drawing.Icon heic {
get {
object obj = ResourceManager.GetObject("heic", resourceCulture);
return ((System.Drawing.Icon)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>

View File

@ -169,9 +169,6 @@
<data name="arrow-left-icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow-left-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="webp" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\webp.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="arrow-right-icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow-right-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -238,4 +235,10 @@
<data name="no-picture" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\no-picture.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="heic" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\heic.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="webp" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\webp.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 KiB

After

Width:  |  Height:  |  Size: 17 KiB