Merge changes (Update to 4.8 .Net Framework) from initial commit

ermig1979 · Feb 17, 2023 · 63ae6d3 · 63ae6d3
1 parent 08329dd
commit 63ae6d3
Show file tree

Hide file tree

Showing 127 changed files with 115 additions and 84 deletions.
diff --git a/src/AntiDuplWPF/AntiDuplWPF/AntiDuplWPF.csproj b/src/AntiDuplWPF/AntiDuplWPF/AntiDuplWPF.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,8 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkProfile />
-    <PublishUrl>publish\</PublishUrl>
+    <PublishUrl>publish</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>
@@ -29,22 +28,42 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>AntiDuplWPF.App</StartupObject>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <PlatformTarget>x64</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
     <OutputPath>..\..\..\bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <PlatformTarget>x64</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
     <OutputPath>..\..\..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.39\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WindowsAPICodePack-Core.1.1.1\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -388,9 +407,9 @@
     <Resource Include="Image\MoveAndRenameSecondLikeFirstVertical.png" />
   </ItemGroup>
   <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.5">
+    <BootstrapperPackage Include=".NETFramework,Version=v4.8">
       <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.5 %28x86 и x64%29</ProductName>
+      <ProductName>Microsoft .NET Framework 4.8 %28x86 und x64%29</ProductName>
       <Install>true</Install>
     </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">

diff --git a/src/AntiDuplWPF/AntiDuplWPF/App.xaml.cs b/src/AntiDuplWPF/AntiDuplWPF/App.xaml.cs
@@ -3,6 +3,7 @@
 using System.Windows;
 using AntiDuplWPF.Core;
 using AntiDuplWPF.Model;
+using AntiDuplWPF.Properties;
 using AntiDuplWPF.Service;
 using AntiDuplWPF.View;
 using AntiDuplWPF.ViewModel;
@@ -30,7 +31,8 @@ private void Application_Startup(object sender, StartupEventArgs e)
             ILanguageService languageService = new LanguageService(confModel);
             TinyIoCContainer.Current.Register<ILanguageService>(languageService);
 
-            CoreLib core = new CoreLib();
+            AntiDuplWPF.Properties.Resources.UserPath = AntiDuplWPF.Properties.Resources.GetDefaultUserPath();
+            CoreLib core = new CoreLib(AntiDuplWPF.Properties.Resources.UserPath);
             TinyIoC.TinyIoCContainer.Current.Register<ICoreLib>(core);
 
             ImageLoader imageLoader = new ImageLoader(core);

diff --git a/src/AntiDuplWPF/AntiDuplWPF/Behavior/AllowableCharactersTextBoxBehavior.cs b/src/AntiDuplWPF/AntiDuplWPF/Behavior/AllowableCharactersTextBoxBehavior.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -7,7 +7,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 
 namespace AntiDuplWPF.Behavior
 {

diff --git a/src/AntiDuplWPF/AntiDuplWPF/Behavior/DataGridContextMenuItemSourceBindingOnOpenBehavior.cs b/src/AntiDuplWPF/AntiDuplWPF/Behavior/DataGridContextMenuItemSourceBindingOnOpenBehavior.cs
@@ -11,7 +11,7 @@
 using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using AntiDuplWPF.Helper;
 using AntiDuplWPF.ObjectModel;
 using AntiDuplWPF.ViewModel;

diff --git a/src/AntiDuplWPF/AntiDuplWPF/Behavior/DataGridScrollIntoViewBehavior.cs b/src/AntiDuplWPF/AntiDuplWPF/Behavior/DataGridScrollIntoViewBehavior.cs
@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 
 namespace AntiDuplWPF.Behavior
 {

diff --git a/src/AntiDuplWPF/AntiDuplWPF/Behavior/FrameworkElementDropBehavior.cs b/src/AntiDuplWPF/AntiDuplWPF/Behavior/FrameworkElementDropBehavior.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using AntiDuplWPF.DragDrop;
 
 namespace AntiDuplWPF.Behavior

diff --git a/src/AntiDuplWPF/AntiDuplWPF/Behavior/ImagePropertyBehavior.cs b/src/AntiDuplWPF/AntiDuplWPF/Behavior/ImagePropertyBehavior.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using System.Windows.Controls;
 using AntiDuplWPF.Helper;
 using TinyIoC;
@@ -70,7 +70,6 @@ private void SetPropertyes()
                 }
             }
         }
-
         #endregion
     }
 }
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Behavior/MenuItemButtonGroupBehavior.cs b/src/AntiDuplWPF/AntiDuplWPF/Behavior/MenuItemButtonGroupBehavior.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using AntiDuplWPF.Model;
 using AntiDuplWPF.ObjectModel;
 using TinyIoC;

diff --git a/src/AntiDuplWPF/AntiDuplWPF/Behavior/MouseEnterBehaviour.cs b/src/AntiDuplWPF/AntiDuplWPF/Behavior/MouseEnterBehaviour.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 
 namespace AntiDuplWPF.Behavior
 {

diff --git a/src/AntiDuplWPF/AntiDuplWPF/Behavior/WindowCloseOnEscBehavior.cs b/src/AntiDuplWPF/AntiDuplWPF/Behavior/WindowCloseOnEscBehavior.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 
 namespace AntiDuplWPF.Behavior
 {

diff --git a/src/AntiDuplWPF/AntiDuplWPF/Control/ImageInfoControl.xaml b/src/AntiDuplWPF/AntiDuplWPF/Control/ImageInfoControl.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:i="clr-namespace:Microsoft.Xaml.Behaviors;assembly=Microsoft.Xaml.Behaviors;"
              xmlns:convertor="clr-namespace:AntiDuplWPF.Convertor"
              xmlns:control="clr-namespace:AntiDuplWPF.Control"
              mc:Ignorable="d" 

diff --git a/src/AntiDuplWPF/AntiDuplWPF/Core/CoreDll.cs b/src/AntiDuplWPF/AntiDuplWPF/Core/CoreDll.cs
@@ -17,7 +17,7 @@ public enum AlgorithmComparing : int
     public class CoreDll : DynamicModule
     {
         public CoreDll()
-            : base(IntPtr.Size == 8 ? "AntiDupl64.dll" : "AntiDupl32.dll")
+            : base("AntiDupl64.dll")
         {
         }
 
@@ -296,10 +296,10 @@ public class WorkProgressInteropNegotiator
 
         //-------------------API functions:------------------------------------
 
-        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        public delegate void adCreate_fn();
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Unicode)]
+        public delegate IntPtr adCreate_fn(string userPath);
         [DynamicModuleApi]
-        public adCreate_fn adCreate = null;
+        public adCreate_fn adCreateW = null;
 
         [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Unicode)]
         public delegate Error adRelease_fn();
@@ -341,8 +341,8 @@ public class WorkProgressInteropNegotiator
         [DynamicModuleApi]
         public adGetResult_fn adGetResult = null;
 
-        /*[UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Unicode)]
-        public delegate Error adOptionsSet_fn(OptionsType optionsType, IntPtr pOptions);
+ /*       [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Unicode)]
+        public delegate Error adOptionsSet_fn(IntPtr handle, OptionsType optionsType, IntPtr pOptions);
         [DynamicModuleApi]
         public adOptionsSet_fn adOptionsSet = null;*/
 

diff --git a/src/AntiDuplWPF/AntiDuplWPF/Core/CoreLib.cs b/src/AntiDuplWPF/AntiDuplWPF/Core/CoreLib.cs
@@ -15,7 +15,7 @@ public class CoreLib : AntiDuplWPF.Core.ICoreLib
 
         //-----------Public functions----------------------------------------------
 
-        public CoreLib()
+        public CoreLib(string userPath)
         {
             try
             {
@@ -25,7 +25,7 @@ public CoreLib()
             {
                 throw new Exception("Can't load core library! " + Environment.NewLine + ex.Message);
             }
-            _dll.adCreate();
+            _dll.adCreateW(userPath);
         }
 
         ~CoreLib()

diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/AB.jpg b/src/AntiDuplWPF/AntiDuplWPF/Image/AB.jpg
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/DeleteIcon16.png b/src/AntiDuplWPF/AntiDuplWPF/Image/DeleteIcon16.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/MistakeButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/MistakeButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/MoveAndRenameFirstLikeSecondVertical.png b/src/AntiDuplWPF/AntiDuplWPF/Image/MoveAndRenameFirstLikeSecondVertical.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/MoveAndRenameSecondLikeFirstVertical.png b/src/AntiDuplWPF/AntiDuplWPF/Image/MoveAndRenameSecondLikeFirstVertical.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/MoveFirstToSecondVerticalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/MoveFirstToSecondVerticalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/MoveSecondToFirstVerticalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/MoveSecondToFirstVerticalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/ReplaceFirstVerticalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/ReplaceFirstVerticalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/ReplaceSecondVerticalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/ReplaceSecondVerticalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/BlockinessIcon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/BlockinessIcon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/BlurringIcon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/BlurringIcon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DefectIcon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DefectIcon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteBothHorizontalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteBothHorizontalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteBothVerticalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteBothVerticalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteBothesHorizontalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteBothesHorizontalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteBothesHorizontalMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteBothesHorizontalMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteBothesVerticalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteBothesVerticalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteBothesVerticalMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteBothesVerticalMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteDefectHorizontalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteDefectHorizontalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteDefectIcon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteDefectIcon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteDefectVerticalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteDefectVerticalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteDefectsHorizontalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteDefectsHorizontalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteDefectsHorizontalMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteDefectsHorizontalMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteDefectsVerticalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteDefectsVerticalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteDefectsVerticalMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteDefectsVerticalMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteFirstHorizontalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteFirstHorizontalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteFirstHorizontalIcon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteFirstHorizontalIcon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteFirstVerticalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteFirstVerticalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteFirstVerticalIcon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteFirstVerticalIcon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteFirstsHorizontalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteFirstsHorizontalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteFirstsHorizontalMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteFirstsHorizontalMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteFirstsVerticalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteFirstsVerticalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteFirstsVerticalMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteFirstsVerticalMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteSecondHorizontalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteSecondHorizontalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteSecondHorizontalIcon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteSecondHorizontalIcon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteSecondVerticalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteSecondVerticalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteSecondVerticalIcon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteSecondVerticalIcon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteSecondsHorizontalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteSecondsHorizontalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteSecondsHorizontalMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteSecondsHorizontalMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteSecondsVerticalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteSecondsVerticalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteSecondsVerticalMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DeleteSecondsVerticalMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DuplPairHorizontalIcon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DuplPairHorizontalIcon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/DuplPairVerticalIcon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/DuplPairVerticalIcon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/HelpButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/HelpButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/HelpMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/HelpMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/JpegEndMarkerIsAbsentIcon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/JpegEndMarkerIsAbsentIcon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/MirrorTurn_0_Icon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/MirrorTurn_0_Icon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/MirrorTurn_180_Icon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/MirrorTurn_180_Icon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/MirrorTurn_270_Icon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/MirrorTurn_270_Icon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/MirrorTurn_90_Icon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/MirrorTurn_90_Icon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/MistakeButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/MistakeButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/MistakesButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/MistakesButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/MistakesMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/MistakesMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/MoveFirstToSecondHorizontalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/MoveFirstToSecondHorizontalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/MoveFirstToSecondHorizontalMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/MoveFirstToSecondHorizontalMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/MoveFirstToSecondVerticalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/MoveFirstToSecondVerticalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/MoveFirstToSecondVerticalMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/MoveFirstToSecondVerticalMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/MoveSecondToFirstHorizontalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/MoveSecondToFirstHorizontalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/MoveSecondToFirstHorizontalMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/MoveSecondToFirstHorizontalMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/MoveSecondToFirstVerticalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/MoveSecondToFirstVerticalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/MoveSecondToFirstVerticalMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/MoveSecondToFirstVerticalMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/NextButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/NextButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/OptionsButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/OptionsButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/OptionsMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/OptionsMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/PathsButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/PathsButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/PathsMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/PathsMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/PerformHintButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/PerformHintButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/PerformHintMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/PerformHintMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/PreviousButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/PreviousButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/ProfileOpenButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/ProfileOpenButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/ProfileOpenMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/ProfileOpenMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/ProfileSaveAsButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/ProfileSaveAsButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/ProfileSaveAsMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/ProfileSaveAsMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RedoButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RedoButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RedoMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RedoMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RefreshButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RefreshButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RefreshMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RefreshMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameFirstLikeSecondHorizontalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameFirstLikeSecondHorizontalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameFirstLikeSecondHorizontalMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameFirstLikeSecondHorizontalMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameFirstLikeSecondVerticalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameFirstLikeSecondVerticalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameFirstLikeSecondVerticalMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameFirstLikeSecondVerticalMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameFirstToSecondHorizontalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameFirstToSecondHorizontalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameFirstToSecondHorizontalIcon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameFirstToSecondHorizontalIcon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameFirstToSecondHorizontalMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameFirstToSecondHorizontalMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameFirstToSecondVerticalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameFirstToSecondVerticalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameFirstToSecondVerticalIcon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameFirstToSecondVerticalIcon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameFirstToSecondVerticalMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameFirstToSecondVerticalMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameSecondLikeFirstHorizontalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameSecondLikeFirstHorizontalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameSecondLikeFirstHorizontalMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameSecondLikeFirstHorizontalMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameSecondLikeFirstVerticalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameSecondLikeFirstVerticalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameSecondLikeFirstVerticalMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameSecondLikeFirstVerticalMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameSecondToFirstHorizontalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameSecondToFirstHorizontalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameSecondToFirstHorizontalIcon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameSecondToFirstHorizontalIcon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameSecondToFirstHorizontalMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameSecondToFirstHorizontalMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameSecondToFirstVerticalButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameSecondToFirstVerticalButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameSecondToFirstVerticalIcon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameSecondToFirstVerticalIcon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameSecondToFirstVerticalMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/RenameSecondToFirstVerticalMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/StartButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/StartButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/StartMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/StartMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/Turn_0_Icon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/Turn_0_Icon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/Turn_180_Icon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/Turn_180_Icon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/Turn_270_Icon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/Turn_270_Icon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/Turn_90_Icon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/Turn_90_Icon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/UndoButton.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/UndoButton.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/UndoMenu.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/UndoMenu.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Image/img/UnknownDefectIcon.png b/src/AntiDuplWPF/AntiDuplWPF/Image/img/UnknownDefectIcon.png
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Properties/Resources.Designer.cs b/src/AntiDuplWPF/AntiDuplWPF/Properties/Resources.Designer.cs
diff --git a/src/AntiDuplWPF/AntiDuplWPF/Properties/Settings.Designer.cs b/src/AntiDuplWPF/AntiDuplWPF/Properties/Settings.Designer.cs