Revised tab indices

Form1.Designer.cs

@@ -76,6 +76,7 @@ namespace photo_sorter
             this.pbar = new System.Windows.Forms.ToolStripProgressBar();
             this.split_container_main = new System.Windows.Forms.SplitContainer();
             this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
+            this.btn_delete = new System.Windows.Forms.Button();
             this.menuStrip1.SuspendLayout();
             this.gbox_preview.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.img_preview)).BeginInit();
@@ -182,6 +183,7 @@ namespace photo_sorter
             this.gbox_preview.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.gbox_preview.Controls.Add(this.btn_delete);
             this.gbox_preview.Controls.Add(this.lbl_counter);
             this.gbox_preview.Controls.Add(this.lbl_current_fname);
             this.gbox_preview.Controls.Add(this.btn_next);
@@ -300,7 +302,7 @@ namespace photo_sorter
             this.gbox_photo_type.Location = new System.Drawing.Point(7, 151);
             this.gbox_photo_type.Name = "gbox_photo_type";
             this.gbox_photo_type.Size = new System.Drawing.Size(142, 137);
-            this.gbox_photo_type.TabIndex = 6;
+            this.gbox_photo_type.TabIndex = 4;
             this.gbox_photo_type.TabStop = false;
             this.gbox_photo_type.Text = "File Type";
             // 
@@ -363,7 +365,7 @@ namespace photo_sorter
             this.btn_reload_src.Location = new System.Drawing.Point(274, 488);
             this.btn_reload_src.Name = "btn_reload_src";
             this.btn_reload_src.Size = new System.Drawing.Size(75, 23);
-            this.btn_reload_src.TabIndex = 902;
+            this.btn_reload_src.TabIndex = 901;
             this.btn_reload_src.Text = "&Reload";
             this.btn_reload_src.UseVisualStyleBackColor = true;
             this.btn_reload_src.Click += new System.EventHandler(this.btn_reload_src_Click);
@@ -374,7 +376,7 @@ namespace photo_sorter
             this.btn_open_src_dir.Location = new System.Drawing.Point(323, 512);
             this.btn_open_src_dir.Name = "btn_open_src_dir";
             this.btn_open_src_dir.Size = new System.Drawing.Size(26, 23);
-            this.btn_open_src_dir.TabIndex = 901;
+            this.btn_open_src_dir.TabIndex = 902;
             this.btn_open_src_dir.Text = "...";
             this.btn_open_src_dir.UseVisualStyleBackColor = true;
             this.btn_open_src_dir.Click += new System.EventHandler(this.btn_open_src_dir_Click);
@@ -438,7 +440,7 @@ namespace photo_sorter
             this.gbox_copybool.Location = new System.Drawing.Point(235, 151);
             this.gbox_copybool.Name = "gbox_copybool";
             this.gbox_copybool.Size = new System.Drawing.Size(111, 71);
-            this.gbox_copybool.TabIndex = 4;
+            this.gbox_copybool.TabIndex = 6;
             this.gbox_copybool.TabStop = false;
             this.gbox_copybool.Text = "Sort Method";
             // 
@@ -449,7 +451,7 @@ namespace photo_sorter
             this.rad_sort_move.Location = new System.Drawing.Point(6, 19);
             this.rad_sort_move.Name = "rad_sort_move";
             this.rad_sort_move.Size = new System.Drawing.Size(52, 17);
-            this.rad_sort_move.TabIndex = 4;
+            this.rad_sort_move.TabIndex = 11;
             this.rad_sort_move.TabStop = true;
             this.rad_sort_move.Text = "Move";
             this.rad_sort_move.UseVisualStyleBackColor = true;
@@ -460,7 +462,7 @@ namespace photo_sorter
             this.rad_sort_copy.Location = new System.Drawing.Point(6, 42);
             this.rad_sort_copy.Name = "rad_sort_copy";
             this.rad_sort_copy.Size = new System.Drawing.Size(49, 17);
-            this.rad_sort_copy.TabIndex = 5;
+            this.rad_sort_copy.TabIndex = 12;
             this.rad_sort_copy.Text = "Copy";
             this.rad_sort_copy.UseVisualStyleBackColor = true;
             // 
@@ -561,6 +563,17 @@ namespace photo_sorter
             this.split_container_main.SplitterDistance = 360;
             this.split_container_main.TabIndex = 4;
             // 
+            // btn_delete
+            // 
+            this.btn_delete.Anchor = System.Windows.Forms.AnchorStyles.Top;
+            this.btn_delete.Location = new System.Drawing.Point(528, 13);
+            this.btn_delete.Name = "btn_delete";
+            this.btn_delete.Size = new System.Drawing.Size(75, 23);
+            this.btn_delete.TabIndex = 9;
+            this.btn_delete.Text = "&Delete (!)";
+            this.btn_delete.UseVisualStyleBackColor = true;
+            this.btn_delete.Visible = false;
+            // 
             // form_main
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -644,6 +657,7 @@ namespace photo_sorter
         private System.Windows.Forms.ToolStripMenuItem tsi_enableGlobalHotkeys;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+        private System.Windows.Forms.Button btn_delete;
     }
 }
 

Form1.cs

@@ -181,15 +181,6 @@ namespace photo_sorter
                 }
                 status_bar.Refresh();
                 fname = global.filenames[global.position];
-                /* v0.1.1 Preview
-                using (var jpegThumbnail = new MagickImage(fname))
-                {
-                    // Correct the image orientation
-                    jpegThumbnail.AutoOrient();
-                    //Image img = jpegThumbnail.Write();
-                    jpegThumbnail.Write(global.dest + "\\.tmp.jpg");
-                }
-                */
                 pbar.Value += 5;
                 stat_bar_label.Text = "Allocating memory...";
                 status_bar.Refresh();

packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Magick.NET.Core" version="12.2.1" targetFramework="net472" />
-  <package id="Magick.NET-Q16-AnyCPU" version="12.2.1" targetFramework="net472" />
+  <package id="Magick.NET.Core" version="12.2.2" targetFramework="net472" />
+  <package id="Magick.NET-Q16-x64" version="12.2.2" targetFramework="net472" />
 </packages>

packages/Magick.NET-Q16-AnyCPU.12.2.1/build/netstandard20/Magick.NET-Q16-AnyCPU.targets

@@ -1,40 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' OR '$(MagickCopyNativeWindows)' == 'true'">
-    <NativeWindowsDLL Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win*\native\*.dll" />
-    <Content Include="@(NativeWindowsDLL)">
-      <Link>%(FileName)%(Extension)</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup Condition="'$(MagickCopyNativeLinux)' == 'true'">
-    <NativeLinuxDLL Include="$(MSBuildThisFileDirectory)\..\..\runtimes\linux-x64\native\*.so" />
-    <Content Include="@(NativeLinuxDLL)">
-      <Link>%(FileName)%(Extension)</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <NativeLinuxArm64DLL Include="$(MSBuildThisFileDirectory)\..\..\runtimes\linux-arm64\native\*.so" />
-    <Content Include="@(NativeLinuxArm64DLL)">
-      <Link>%(FileName)%(Extension)</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup Condition="'$(MagickCopyNativeLinuxMusl)' == 'true'">
-    <NativeLinuxMuslDLL Include="$(MSBuildThisFileDirectory)\..\..\runtimes\linux-musl-x64\native\*.so" />
-    <Content Include="@(NativeLinuxMuslDLL)">
-      <Link>%(FileName)%(Extension)</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup Condition="'$(MagickCopyNativeMacOS)' == 'true'">
-    <NativeMacOSDLL Include="$(MSBuildThisFileDirectory)\..\..\runtimes\osx-x64\native\*.dylib" />
-    <Content Include="@(NativeMacOSDLL)">
-      <Link>%(FileName)%(Extension)</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <NativeMacOSArm64DLL Include="$(MSBuildThisFileDirectory)\..\..\runtimes\osx-arm64\native\*.dylib" />
-    <Content Include="@(NativeMacOSArm64DLL)">
-      <Link>%(FileName)%(Extension)</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-</Project>

packages/Magick.NET.Core.12.2.1/Copyright.txt

@@ -1,2 +0,0 @@
-Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
-Licensed under the Apache License, Version 2.0.

photo_sorter.csproj

@@ -25,8 +25,8 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.1.0</ApplicationVersion>
+    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationVersion>1.0.1.2</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
@@ -73,11 +73,11 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Magick.NET-Q16-AnyCPU, Version=12.2.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
-      <HintPath>packages\Magick.NET-Q16-AnyCPU.12.2.1\lib\netstandard20\Magick.NET-Q16-AnyCPU.dll</HintPath>
+    <Reference Include="Magick.NET-Q16-x64, Version=12.2.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=AMD64">
+      <HintPath>packages\Magick.NET-Q16-x64.12.2.2\lib\netstandard20\Magick.NET-Q16-x64.dll</HintPath>
     </Reference>
     <Reference Include="Magick.NET.Core, Version=12.2.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
-      <HintPath>packages\Magick.NET.Core.12.2.1\lib\netstandard20\Magick.NET.Core.dll</HintPath>
+      <HintPath>packages\Magick.NET.Core.12.2.2\lib\netstandard20\Magick.NET.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -143,11 +143,11 @@
     </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="packages\Magick.NET-Q16-AnyCPU.12.2.1\build\netstandard20\Magick.NET-Q16-AnyCPU.targets" Condition="Exists('packages\Magick.NET-Q16-AnyCPU.12.2.1\build\netstandard20\Magick.NET-Q16-AnyCPU.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\Magick.NET-Q16-AnyCPU.12.2.1\build\netstandard20\Magick.NET-Q16-AnyCPU.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Magick.NET-Q16-AnyCPU.12.2.1\build\netstandard20\Magick.NET-Q16-AnyCPU.targets'))" />
+    <Error Condition="!Exists('packages\Magick.NET-Q16-x64.12.2.2\build\netstandard20\Magick.NET-Q16-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Magick.NET-Q16-x64.12.2.2\build\netstandard20\Magick.NET-Q16-x64.targets'))" />
   </Target>
+  <Import Project="packages\Magick.NET-Q16-x64.12.2.2\build\netstandard20\Magick.NET-Q16-x64.targets" Condition="Exists('packages\Magick.NET-Q16-x64.12.2.2\build\netstandard20\Magick.NET-Q16-x64.targets')" />
 </Project>