Added new Open Both Folders button

src/AntiDupl/AntiDupl.NET/GUIControl/ResultsPreviewDuplPair.cs

@@ -45,6 +45,7 @@ public class ResultsPreviewDuplPair : ResultsPreviewBase
         private ToolStripButton m_renameSecondToFirstButton;
         private ToolStripButton m_deleteBothButton;
         private ToolStripButton m_mistakeButton;
+        private ToolStripButton m_openBothFoldersButton;
 
         private struct RectanglesWithSimilarity
         {
@@ -80,8 +81,9 @@ private void InitializeComponents()
             m_renameFirstToSecondButton = InitFactory.ToolButton.Create("RenameFirstToSecondVerticalButton", CoreDll.LocalActionType.RenameFirstToSecond, OnButtonClicked);
             m_renameSecondToFirstButton = InitFactory.ToolButton.Create("RenameSecondToFirstVerticalButton", CoreDll.LocalActionType.RenameSecondToFirst, OnButtonClicked);
             m_mistakeButton = InitFactory.ToolButton.Create("MistakeButton", CoreDll.LocalActionType.Mistake, OnButtonClicked);
-
-           /* m_difrentNumericUpDown = new System.Windows.Forms.NumericUpDown();
+            m_openBothFoldersButton = InitFactory.ToolButton.Create("OpenBothFoldersButton.png", null, OnOpenBothFoldersButtonClicked);
+
+            /* m_difrentNumericUpDown = new System.Windows.Forms.NumericUpDown();
             m_difrentNumericUpDown.Size = new System.Drawing.Size(62, 17);
             m_difrentNumericUpDown.Location = new System.Drawing.Point(102, 0);
             m_difrentNumericUpDown.Margin = new Padding(0);
@@ -120,6 +122,7 @@ public void UpdateStrings()
             m_renameFirstToSecondButton.ToolTipText = GetToolTip(s.ResultsPreviewDuplPair_RenameFirstToSecondButton_ToolTip_Text, HotKeyOptions.Action.CurrentDuplPairRenameFirstToSecond);
             m_renameSecondToFirstButton.ToolTipText = GetToolTip(s.ResultsPreviewDuplPair_RenameSecondToFirstButton_ToolTip_Text, HotKeyOptions.Action.CurrentDuplPairRenameSecondToFirst);
             m_mistakeButton.ToolTipText = GetToolTip(s.ResultsPreviewDefect_MistakeButton_ToolTip_Text, HotKeyOptions.Action.CurrentMistake);
+            m_openBothFoldersButton.ToolTipText = s.ResultsPreviewDuplPair_OpenBothFoldersButton_ToolTip_Text;
 
             // Для обновления EXIF.
             if (m_currentSearchResult != null)
@@ -192,6 +195,12 @@ private void OnImageDoubleClicked(object sender, System.EventArgs e)
             Process.Start(startInfo);
         }
 
+        private void OnOpenBothFoldersButtonClicked(object sender, System.EventArgs e)
+        {
+            FolderOpener.OpenContainingFolder(m_firstImagePreviewPanel.CurrentImageInfo);
+            FolderOpener.OpenContainingFolder(m_secondImagePreviewPanel.CurrentImageInfo);
+        }
+
         private void OnOptionsChanged()
         {
             m_mistakeButton.Enabled = m_coreOptions.advancedOptions.mistakeDataBase;
@@ -228,6 +237,8 @@ protected override void AddItems(ResultsOptions.ViewMode viewMode)
                 m_renameSecondToFirstButton.Image = Resources.Images.Get("RenameSecondToFirstHorizontalButton");
             }
 
+            m_toolStrip.Items.Add(m_openBothFoldersButton);
+            m_toolStrip.Items.Add(new ToolStripSeparator());
             m_toolStrip.Items.Add(m_deleteBothButton);
             m_toolStrip.Items.Add(new ToolStripSeparator());
             m_toolStrip.Items.Add(m_renameFirstToSecondButton);

src/AntiDupl/AntiDupl.NET/Resources.cs

@@ -96,7 +96,10 @@ static public Image Get(string name)
                 Image image;
                 try
                 {
-                    image = Image.FromFile(GetPath(Path, name, Extension));
+                    string extension = System.IO.Path.GetExtension(name);
+                    if (string.IsNullOrEmpty(extension))
+                        extension = Extension;
+                    image = Image.FromFile(GetPath(Path, System.IO.Path.GetFileNameWithoutExtension(name), extension));
                 }
                 catch
                 {

src/AntiDupl/AntiDupl.NET/Strings.cs

@@ -174,6 +174,7 @@ public Strings()
         public string ResultsPreviewDuplPair_RenameFirstToSecondButton_ToolTip_Text;
         public string ResultsPreviewDuplPair_RenameSecondToFirstButton_ToolTip_Text;
         public string ResultsPreviewDuplPair_MistakeButton_ToolTip_Text;
+        public string ResultsPreviewDuplPair_OpenBothFoldersButton_ToolTip_Text;
 
         public string ResultsPreviewDefect_DeleteButton_ToolTip_Text;
         public string ResultsPreviewDefect_MistakeButton_ToolTip_Text;

src/AntiDupl/AntiDupl.NET/StringsDefaultEnglish.cs

@@ -171,6 +171,7 @@ static public void CopyTo(Strings s)
             s.ResultsPreviewDuplPair_RenameFirstToSecondButton_ToolTip_Text = "Replace second picture by the first picture";
             s.ResultsPreviewDuplPair_RenameSecondToFirstButton_ToolTip_Text = "Replace first picture by the second picture";
             s.ResultsPreviewDuplPair_MistakeButton_ToolTip_Text = "Mark current result as a mistake";
+            s.ResultsPreviewDuplPair_OpenBothFoldersButton_ToolTip_Text = "Open both containing folders";
 
             s.ResultsPreviewDefect_DeleteButton_ToolTip_Text = "Delete picture";
             s.ResultsPreviewDefect_MistakeButton_ToolTip_Text = "Mark current result as a mistake";

src/AntiDupl/AntiDupl.NET/StringsDefaultRussian.cs

@@ -171,6 +171,7 @@ static public void CopyTo(Strings s)
             s.ResultsPreviewDuplPair_RenameFirstToSecondButton_ToolTip_Text = "Заместить вторую картинку первой";
             s.ResultsPreviewDuplPair_RenameSecondToFirstButton_ToolTip_Text = "Заместить первую картинку второй";
             s.ResultsPreviewDuplPair_MistakeButton_ToolTip_Text = "Пометить текущий результат как ошибочный";
+            s.ResultsPreviewDuplPair_OpenBothFoldersButton_ToolTip_Text = "Откройте обе содержащие папки";
 
             s.ResultsPreviewDefect_DeleteButton_ToolTip_Text = "Удалить картинку";
             s.ResultsPreviewDefect_MistakeButton_ToolTip_Text = "Пометить текущий результат как ошибочный";