From 154699160bedd0a1e4d8a5f00ad3f8748bc1daee Mon Sep 17 00:00:00 2001
From: morkt <muvluv.ru@gmail.com>
Date: Wed, 1 Feb 2017 16:47:48 +0400
Subject: [PATCH 01/10] added dialog popup on extraction errors.

looks like Ookii.Dialogs have to be replaced with manual progress dialog
implementation, as i have no control over progress dialog window once
extraction has begun.

frankly, i just need to be able to call StopProgressDialog and
StartProgressDialog from IProgressDialog interface, but Ookii does not
provide such low-level access.
---
 GUI/FileErrorDialog.xaml    |  20 ++++++
 GUI/FileErrorDialog.xaml.cs |  76 +++++++++++++++++++++
 GUI/GARbro.GUI.csproj       |   7 ++
 GUI/GarExtract.cs           | 128 ++++++++++++++++++++++++------------
 4 files changed, 190 insertions(+), 41 deletions(-)
 create mode 100644 GUI/FileErrorDialog.xaml
 create mode 100644 GUI/FileErrorDialog.xaml.cs

diff --git a/GUI/FileErrorDialog.xaml b/GUI/FileErrorDialog.xaml
new file mode 100644
index 00000000..c506f95f
--- /dev/null
+++ b/GUI/FileErrorDialog.xaml
@@ -0,0 +1,20 @@
+<w:ModalWindow x:Class="GARbro.GUI.FileErrorDialog"
+               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+               xmlns:w="clr-namespace:Rnd.Windows"
+               Title="{Binding Title}" ShowInTaskbar="False" WindowStartupLocation="CenterOwner"
+               ResizeMode="NoResize" SizeToContent="WidthAndHeight"
+               Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}">
+    <StackPanel Orientation="Vertical">
+        <TextBox x:Name="ErrorText" Text="{Binding Text}" IsReadOnly="True" Background="Transparent" BorderThickness="0" Margin="10"/>
+        <Separator/>
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
+            <CheckBox x:Name="IgnoreErrors" Content="_Ignore further errors" Margin="10" VerticalAlignment="Center"/>
+            <Button Content="_Continue" Margin="10" Width="75" Height="25" IsDefault="True" Click="ContinueButton_Click"/>
+            <Button Content="_Abort" Margin="10" Width="75" Height="25" IsCancel="True" Click="AbortButton_Click"/>
+        </StackPanel>
+    </StackPanel>
+    <Window.InputBindings>
+        <KeyBinding Gesture="Ctrl+C" Command="{Binding CopyCommand}"/>
+    </Window.InputBindings>
+</w:ModalWindow>
diff --git a/GUI/FileErrorDialog.xaml.cs b/GUI/FileErrorDialog.xaml.cs
new file mode 100644
index 00000000..7fcb5725
--- /dev/null
+++ b/GUI/FileErrorDialog.xaml.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace GARbro.GUI
+{
+    /// <summary>
+    /// Interaction logic for FileErrorDialog.xaml
+    /// </summary>
+    public partial class FileErrorDialog : Rnd.Windows.ModalWindow
+    {
+        public FileErrorDialog (string title, string error_text)
+        {
+            InitializeComponent();
+            this.DataContext = new ViewModel { Title = title, Text = error_text };
+        }
+
+        private void ContinueButton_Click (object sender, RoutedEventArgs e)
+        {
+            this.DialogResult = true;
+        }
+
+        private void AbortButton_Click (object sender, RoutedEventArgs e)
+        {
+            this.DialogResult = false;
+        }
+
+        private class ViewModel
+        {
+            public string         Title { get; set; }
+            public string          Text { get; set; }
+            public ICommand CopyCommand { get; private set; }
+
+            public ViewModel ()
+            {
+                CopyCommand = new ActionCommand (CopyText);
+            }
+
+            private void CopyText ()
+            {
+                try
+                {
+                    Clipboard.SetText (Text);
+                }
+                catch (Exception X)
+                {
+                    System.Diagnostics.Trace.WriteLine (X.Message, "Clipboard error");
+                }
+            }
+        }
+
+        private class ActionCommand : ICommand
+        {
+            readonly Action     m_action;
+
+            public ActionCommand (Action action)
+            {
+                m_action = action;
+            }
+
+            public void Execute (object parameter)
+            {
+                m_action();
+            }
+
+            public bool CanExecute (object parameter)
+            {
+                return true;
+            }
+
+            #pragma warning disable 67
+            public event EventHandler CanExecuteChanged;
+        }
+    }
+}
diff --git a/GUI/GARbro.GUI.csproj b/GUI/GARbro.GUI.csproj
index 7efbf283..8046765b 100644
--- a/GUI/GARbro.GUI.csproj
+++ b/GUI/GARbro.GUI.csproj
@@ -147,6 +147,9 @@
     <Compile Include="ExtractFile.xaml.cs">
       <DependentUpon>ExtractFile.xaml</DependentUpon>
     </Compile>
+    <Compile Include="FileErrorDialog.xaml.cs">
+      <DependentUpon>FileErrorDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="GarConvert.cs" />
     <Compile Include="GarCreate.cs" />
     <Compile Include="GarExtract.cs" />
@@ -195,6 +198,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="FileErrorDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/GUI/GarExtract.cs b/GUI/GarExtract.cs
index d7a36840..6ba569e2 100644
--- a/GUI/GarExtract.cs
+++ b/GUI/GarExtract.cs
@@ -28,13 +28,13 @@ using System.IO;
 using System.Linq;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics;
+using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Input;
+using System.Windows.Interop;
 using System.Windows.Media.Imaging;
 using Ookii.Dialogs.Wpf;
 using GameRes;
-using GameRes.Strings;
 using GARbro.GUI.Strings;
 using GARbro.GUI.Properties;
 
@@ -116,6 +116,7 @@ namespace GARbro.GUI
         private bool                m_convert_audio;
         private ImageFormat         m_image_format;
         private int                 m_extract_count;
+        private int                 m_skip_count;
         private bool                m_extract_in_progress = false;
         private ProgressDialog      m_progress_dialog;
         private Exception           m_pending_error;
@@ -269,7 +270,6 @@ namespace GARbro.GUI
                 m_progress_dialog.ProgressBarStyle = ProgressBarStyle.MarqueeProgressBar;
             }
             m_convert_audio = !m_skip_audio && Settings.Default.appConvertAudio;
-            m_extract_count = 0;
             m_pending_error = null;
             m_progress_dialog.DoWork += (s, e) => ExtractWorker (file_list);
             m_progress_dialog.RunWorkerCompleted += OnExtractComplete;
@@ -279,16 +279,20 @@ namespace GARbro.GUI
 
         void ExtractWorker (IEnumerable<Entry> file_list)
         {
-            try
+            m_extract_count = 0;
+            m_skip_count = 0;
+            var arc = m_fs.Source;
+            int total = file_list.Count();
+            int progress_count = 0;
+            bool ignore_errors = false;
+            foreach (var entry in file_list)
             {
-                var arc = m_fs.Source;
-                int total = file_list.Count();
-                foreach (var entry in file_list)
+                if (m_progress_dialog.CancellationPending)
+                    break;
+                if (total > 1)
+                    m_progress_dialog.ReportProgress (progress_count++*100/total, null, entry.Name);
+                try
                 {
-                    if (m_progress_dialog.CancellationPending)
-                        break;
-                    if (total > 1)
-                        m_progress_dialog.ReportProgress (m_extract_count*100/total, null, entry.Name);
                     if (null != m_image_format && entry.Type == "image")
                         ExtractImage (arc, entry, m_image_format);
                     else if (m_convert_audio && entry.Type == "audio")
@@ -297,43 +301,85 @@ namespace GARbro.GUI
                         arc.Extract (entry);
                     ++m_extract_count;
                 }
+                catch (Exception X)
+                {
+                    if (!ignore_errors)
+                    {
+                        IntPtr progress_handle = IntPtr.Zero;
+                        try
+                        {
+                            var error_text = string.Format ("{0}\n{1}\n{2}", "Failed to extract file",
+                                                            entry.Name, X.Message);
+                            bool dialog_result = false;
+                            m_main.Dispatcher.Invoke (() => {
+                                progress_handle = HideProgressDialog();
+                                var dialog = new FileErrorDialog ("File extraction error", error_text);
+                                dialog.Owner = m_main;
+                                dialog_result = dialog.ShowDialog() ?? false;
+                                ignore_errors = dialog.IgnoreErrors.IsChecked ?? false;
+                            });
+                            if (!dialog_result)
+                                break;
+                        }
+                        finally
+                        {
+                            if (progress_handle != IntPtr.Zero)
+                                ShowWindow (progress_handle, SW_SHOW);
+                        }
+                    }
+                    ++m_skip_count;
+                }
             }
-            catch (Exception X)
-            {
-                m_pending_error = X;
-            }
+        }
+
+        const int SW_HIDE = 0;
+        const int SW_SHOW = 5;
+
+        [DllImport("user32.dll", SetLastError = true)]
+        static extern IntPtr FindWindowEx (IntPtr hwndParent, IntPtr hwndChildAfter, string lpszClass, string lpszWindow);
+        [DllImport("user32.dll")][return: MarshalAs(UnmanagedType.Bool)]
+        static extern bool ShowWindow (IntPtr hWnd, int nCmdShow);
+
+        IntPtr HideProgressDialog ()
+        {
+//            IntPtr parent = new WindowInteropHelper (m_main).Handle;
+//            var found = FindWindowEx (parent, IntPtr.Zero, null, m_progress_dialog.WindowTitle);
+            var found = FindWindowEx (IntPtr.Zero, IntPtr.Zero, null, m_progress_dialog.WindowTitle);
+            if (IntPtr.Zero != found)
+                ShowWindow (found, SW_HIDE);
+            return found;
+        }
+
+        bool ShowErrorDialog (string error_text)
+        {
+            var dialog = new FileErrorDialog ("File extraction error", error_text);
+            dialog.Owner = m_main;
+            return dialog.ShowDialog() ?? false;
         }
 
         void ExtractImage (ArcFile arc, Entry entry, ImageFormat target_format)
         {
-            try
+            using (var decoder = arc.OpenImage (entry))
             {
-                using (var decoder = arc.OpenImage (entry))
+                var src_format = decoder.SourceFormat; // could be null
+                string target_ext = target_format.Extensions.FirstOrDefault() ?? "";
+                string outname = FindUniqueFileName (entry.Name, target_ext);
+                if (src_format == target_format)
                 {
-                    var src_format = decoder.SourceFormat; // could be null
-                    string target_ext = target_format.Extensions.FirstOrDefault() ?? "";
-                    string outname = FindUniqueFileName (entry.Name, target_ext);
-                    if (src_format == target_format)
-                    {
-                        // source format is the same as a target, copy file as is
-                        using (var output = ArchiveFormat.CreateFile (outname))
-                            decoder.Source.CopyTo (output);
-                        return;
-                    }
-                    ImageData image = decoder.Image;
-                    if (m_adjust_image_offset)
-                    {
-                        image = AdjustImageOffset (image);
-                    }
-                    using (var outfile = ArchiveFormat.CreateFile (outname))
-                    {
-                        target_format.Write (outfile, image);
-                    }
+                    // source format is the same as a target, copy file as is
+                    using (var output = ArchiveFormat.CreateFile (outname))
+                        decoder.Source.CopyTo (output);
+                    return;
+                }
+                ImageData image = decoder.Image;
+                if (m_adjust_image_offset)
+                {
+                    image = AdjustImageOffset (image);
+                }
+                using (var outfile = ArchiveFormat.CreateFile (outname))
+                {
+                    target_format.Write (outfile, image);
                 }
-            }
-            catch
-            {
-                throw new InvalidFormatException (string.Format ("{1}: {0}", guiStrings.MsgUnableInterpretImage, entry.Name));
             }
         }
 
@@ -372,7 +418,7 @@ namespace GARbro.GUI
             using (var sound = AudioFormat.Read (file))
             {
                 if (null == sound)
-                    throw new InvalidFormatException (string.Format ("{1}: {0}", guiStrings.MsgUnableInterpretAudio, entry.Name));
+                    throw new InvalidFormatException (guiStrings.MsgUnableInterpretAudio);
                 ConvertAudio (entry.Name, sound);
             }
         }

From 774b7e6d9cffd94ea4c281063b4cad7af3420a08 Mon Sep 17 00:00:00 2001
From: morkt <muvluv.ru@gmail.com>
Date: Thu, 2 Feb 2017 10:59:15 +0400
Subject: [PATCH 02/10] comment.

---
 GUI/GarExtract.cs | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/GUI/GarExtract.cs b/GUI/GarExtract.cs
index 6ba569e2..aa8b31af 100644
--- a/GUI/GarExtract.cs
+++ b/GUI/GarExtract.cs
@@ -342,21 +342,15 @@ namespace GARbro.GUI
 
         IntPtr HideProgressDialog ()
         {
-//            IntPtr parent = new WindowInteropHelper (m_main).Handle;
-//            var found = FindWindowEx (parent, IntPtr.Zero, null, m_progress_dialog.WindowTitle);
+            // i just want to temporarily hide progress dialog when error window pops up, or at least force it
+            // to background so it can't be interacted with until error dialog is resolved.  Unfortunately
+            // it's impossible with Ookii.Dialogs implementation aside from ugly hacks like this one.
             var found = FindWindowEx (IntPtr.Zero, IntPtr.Zero, null, m_progress_dialog.WindowTitle);
             if (IntPtr.Zero != found)
                 ShowWindow (found, SW_HIDE);
             return found;
         }
 
-        bool ShowErrorDialog (string error_text)
-        {
-            var dialog = new FileErrorDialog ("File extraction error", error_text);
-            dialog.Owner = m_main;
-            return dialog.ShowDialog() ?? false;
-        }
-
         void ExtractImage (ArcFile arc, Entry entry, ImageFormat target_format)
         {
             using (var decoder = arc.OpenImage (entry))

From cd5a820c480fb50c561aa0d08aac90b9c6242c76 Mon Sep 17 00:00:00 2001
From: morkt <muvluv.ru@gmail.com>
Date: Thu, 2 Feb 2017 20:27:13 +0400
Subject: [PATCH 03/10] added modified ProgressDialog from Ookii.Dialogs.

---
 GUI/FileErrorDialog.xaml              |   2 +-
 GUI/GARbro.GUI.csproj                 |   7 +-
 GUI/GarConvert.cs                     |   1 -
 GUI/GarCreate.cs                      |   1 -
 GUI/GarExtract.cs                     |  75 ++-
 GUI/ProgressDialog/IProgressDialog.cs | 116 +++++
 GUI/ProgressDialog/ProgressDialog.cs  | 713 ++++++++++++++++++++++++++
 GUI/Utility.cs                        |  17 +
 8 files changed, 883 insertions(+), 49 deletions(-)
 create mode 100644 GUI/ProgressDialog/IProgressDialog.cs
 create mode 100644 GUI/ProgressDialog/ProgressDialog.cs

diff --git a/GUI/FileErrorDialog.xaml b/GUI/FileErrorDialog.xaml
index c506f95f..89fd9dc9 100644
--- a/GUI/FileErrorDialog.xaml
+++ b/GUI/FileErrorDialog.xaml
@@ -3,7 +3,7 @@
                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                xmlns:w="clr-namespace:Rnd.Windows"
                Title="{Binding Title}" ShowInTaskbar="False" WindowStartupLocation="CenterOwner"
-               ResizeMode="NoResize" SizeToContent="WidthAndHeight"
+               ResizeMode="NoResize" SizeToContent="WidthAndHeight" ShowActivated="True"
                Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}">
     <StackPanel Orientation="Vertical">
         <TextBox x:Name="ErrorText" Text="{Binding Text}" IsReadOnly="True" Background="Transparent" BorderThickness="0" Margin="10"/>
diff --git a/GUI/GARbro.GUI.csproj b/GUI/GARbro.GUI.csproj
index 8046765b..bf565e0e 100644
--- a/GUI/GARbro.GUI.csproj
+++ b/GUI/GARbro.GUI.csproj
@@ -95,9 +95,6 @@
       <HintPath>..\packages\NAudio.1.8.0\lib\net35\NAudio.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Ookii.Dialogs.Wpf">
-      <HintPath>..\packages\Ookii.Dialogs.1.0\lib\net35\Ookii.Dialogs.Wpf.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Windows.Controls.Input.Toolkit">
@@ -158,6 +155,10 @@
     <Compile Include="ListViewEx.cs" />
     <Compile Include="ModalWindow.cs" />
     <Compile Include="NAudio.cs" />
+    <Compile Include="ProgressDialog\IProgressDialog.cs" />
+    <Compile Include="ProgressDialog\ProgressDialog.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="Settings.cs" />
     <Compile Include="Shell.cs" />
     <Compile Include="Strings\guiStrings.Designer.cs">
diff --git a/GUI/GarConvert.cs b/GUI/GarConvert.cs
index 739bf79d..1d61da9d 100644
--- a/GUI/GarConvert.cs
+++ b/GUI/GarConvert.cs
@@ -34,7 +34,6 @@ using System.Diagnostics;
 using GameRes;
 using GARbro.GUI.Strings;
 using GARbro.GUI.Properties;
-using Ookii.Dialogs.Wpf;
 using System.Runtime.InteropServices;
 
 namespace GARbro.GUI
diff --git a/GUI/GarCreate.cs b/GUI/GarCreate.cs
index 7388895a..8db66518 100644
--- a/GUI/GarCreate.cs
+++ b/GUI/GarCreate.cs
@@ -34,7 +34,6 @@ using System.Windows.Input;
 using GameRes;
 using GARbro.GUI.Strings;
 using GARbro.GUI.Properties;
-using Ookii.Dialogs.Wpf;
 
 namespace GARbro.GUI
 {
diff --git a/GUI/GarExtract.cs b/GUI/GarExtract.cs
index aa8b31af..8d10048a 100644
--- a/GUI/GarExtract.cs
+++ b/GUI/GarExtract.cs
@@ -33,7 +33,6 @@ using System.Windows;
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media.Imaging;
-using Ookii.Dialogs.Wpf;
 using GameRes;
 using GARbro.GUI.Strings;
 using GARbro.GUI.Properties;
@@ -114,6 +113,7 @@ namespace GARbro.GUI
         private bool                m_skip_audio  = false;
         private bool                m_adjust_image_offset = false;
         private bool                m_convert_audio;
+        private bool                m_ignore_errors;
         private ImageFormat         m_image_format;
         private int                 m_extract_count;
         private int                 m_skip_count;
@@ -284,7 +284,7 @@ namespace GARbro.GUI
             var arc = m_fs.Source;
             int total = file_list.Count();
             int progress_count = 0;
-            bool ignore_errors = false;
+            m_ignore_errors = false;
             foreach (var entry in file_list)
             {
                 if (m_progress_dialog.CancellationPending)
@@ -303,54 +303,18 @@ namespace GARbro.GUI
                 }
                 catch (Exception X)
                 {
-                    if (!ignore_errors)
+                    if (!m_ignore_errors)
                     {
-                        IntPtr progress_handle = IntPtr.Zero;
-                        try
-                        {
-                            var error_text = string.Format ("{0}\n{1}\n{2}", "Failed to extract file",
-                                                            entry.Name, X.Message);
-                            bool dialog_result = false;
-                            m_main.Dispatcher.Invoke (() => {
-                                progress_handle = HideProgressDialog();
-                                var dialog = new FileErrorDialog ("File extraction error", error_text);
-                                dialog.Owner = m_main;
-                                dialog_result = dialog.ShowDialog() ?? false;
-                                ignore_errors = dialog.IgnoreErrors.IsChecked ?? false;
-                            });
-                            if (!dialog_result)
-                                break;
-                        }
-                        finally
-                        {
-                            if (progress_handle != IntPtr.Zero)
-                                ShowWindow (progress_handle, SW_SHOW);
-                        }
+                        var error_text = string.Format ("{0}\n{1}\n{2}", "Failed to extract file",
+                                                        entry.Name, X.Message);
+                        if (!m_main.Dispatcher.Invoke (() => ShowErrorDialog (error_text)))
+                            break;
                     }
                     ++m_skip_count;
                 }
             }
         }
 
-        const int SW_HIDE = 0;
-        const int SW_SHOW = 5;
-
-        [DllImport("user32.dll", SetLastError = true)]
-        static extern IntPtr FindWindowEx (IntPtr hwndParent, IntPtr hwndChildAfter, string lpszClass, string lpszWindow);
-        [DllImport("user32.dll")][return: MarshalAs(UnmanagedType.Bool)]
-        static extern bool ShowWindow (IntPtr hWnd, int nCmdShow);
-
-        IntPtr HideProgressDialog ()
-        {
-            // i just want to temporarily hide progress dialog when error window pops up, or at least force it
-            // to background so it can't be interacted with until error dialog is resolved.  Unfortunately
-            // it's impossible with Ookii.Dialogs implementation aside from ugly hacks like this one.
-            var found = FindWindowEx (IntPtr.Zero, IntPtr.Zero, null, m_progress_dialog.WindowTitle);
-            if (IntPtr.Zero != found)
-                ShowWindow (found, SW_HIDE);
-            return found;
-        }
-
         void ExtractImage (ArcFile arc, Entry entry, ImageFormat target_format)
         {
             using (var decoder = arc.OpenImage (entry))
@@ -450,6 +414,31 @@ namespace GARbro.GUI
             throw new IOException ("File aready exists");
         }
 
+        bool ShowErrorDialog (string error_text)
+        {
+            var dialog = new FileErrorDialog ("File extraction error", error_text);
+            var progress_dialog_hwnd = m_progress_dialog.GetWindowHandle(); 
+            if (progress_dialog_hwnd != IntPtr.Zero)
+            {
+                var native_dialog = new WindowInteropHelper (dialog);
+                native_dialog.Owner = progress_dialog_hwnd;
+                NativeMethods.EnableWindow (progress_dialog_hwnd, false);
+                EventHandler on_closed = null;
+                on_closed = (s, e) => {
+                    NativeMethods.EnableWindow (progress_dialog_hwnd, true);
+                    dialog.Closed -= on_closed;
+                };
+                dialog.Closed += on_closed;
+            }
+            else
+            {
+                dialog.Owner = m_main;
+            }
+            bool dialog_result = dialog.ShowDialog() ?? false;
+            m_ignore_errors = dialog.IgnoreErrors.IsChecked ?? false;
+            return dialog_result;
+        }
+
         void OnExtractComplete (object sender, RunWorkerCompletedEventArgs e)
         {
             m_extract_in_progress = false;
diff --git a/GUI/ProgressDialog/IProgressDialog.cs b/GUI/ProgressDialog/IProgressDialog.cs
new file mode 100644
index 00000000..16308e9a
--- /dev/null
+++ b/GUI/ProgressDialog/IProgressDialog.cs
@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Runtime.InteropServices;
+
+namespace GARbro.GUI.Interop
+{
+    [ComImport, Guid ("F8383852-FCD3-11d1-A6B9-006097DF5BD4")]
+    internal class ProgressDialogRCW
+    {
+    }
+
+    [ComImport, Guid ("EBBC7C04-315E-11d2-B62F-006097DF5BD4"), CoClass (typeof(ProgressDialogRCW))]
+    internal interface ProgressDialog : IProgressDialog
+    {
+    }
+
+    [Flags]
+    internal enum ProgressDialogFlags : uint
+    {
+        Normal          = 0x00000000,
+        Modal           = 0x00000001,
+        AutoTime        = 0x00000002,
+        NoTime          = 0x00000004,
+        NoMinimize      = 0x00000008,
+        NoProgressBar   = 0x00000010,
+        MarqueeProgress = 0x00000020,
+        NoCancel        = 0x00000040
+    }
+
+    [Flags]
+    internal enum ProgressTimerAction : uint
+    {
+        Reset  = 0x00000001,
+        Pause  = 0x00000002,
+        Resume = 0x00000003
+    }
+
+    [ComImport, Guid ("EBBC7C04-315E-11d2-B62F-006097DF5BD4"), InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]
+    internal interface IProgressDialog
+    {
+
+        [PreserveSig]
+        void StartProgressDialog(
+            IntPtr hwndParent,
+            [MarshalAs(UnmanagedType.IUnknown)]
+			object punkEnableModless,
+            ProgressDialogFlags dwFlags,
+            IntPtr pvResevered
+            );
+
+        [PreserveSig]
+        void StopProgressDialog();
+
+        [PreserveSig]
+        void SetTitle(
+            [MarshalAs(UnmanagedType.LPWStr)]
+			string pwzTitle
+            );
+
+        [PreserveSig]
+        void SetAnimation(
+            IntPtr hInstAnimation,
+            ushort idAnimation
+            );
+
+        [PreserveSig]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        bool HasUserCancelled();
+
+        [PreserveSig]
+        void SetProgress(
+            uint dwCompleted,
+            uint dwTotal
+            );
+        [PreserveSig]
+        void SetProgress64(
+            ulong ullCompleted,
+            ulong ullTotal
+            );
+
+        [PreserveSig]
+        void SetLine(
+            uint dwLineNum,
+            [MarshalAs(UnmanagedType.LPWStr)]
+			string pwzString,
+            [MarshalAs(UnmanagedType.VariantBool)]
+			bool fCompactPath,
+            IntPtr pvResevered
+            );
+
+        [PreserveSig]
+        void SetCancelMsg(
+            [MarshalAs(UnmanagedType.LPWStr)]
+			string pwzCancelMsg,
+            object pvResevered
+            );
+
+        [PreserveSig]
+        void Timer(
+            ProgressTimerAction dwTimerAction,
+            object pvResevered
+            );
+    }
+
+    [ComImport, Guid ("00000114-0000-0000-C000-000000000046"), InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]
+    internal interface IOleWindow
+    {
+        [PreserveSig]
+        void GetWindow (out IntPtr phwnd);
+
+        [PreserveSig]
+        void ContextSensitiveHelp ([MarshalAs(UnmanagedType.Bool)] bool fEnterMode);
+    }
+}
diff --git a/GUI/ProgressDialog/ProgressDialog.cs b/GUI/ProgressDialog/ProgressDialog.cs
new file mode 100644
index 00000000..fa1f47a4
--- /dev/null
+++ b/GUI/ProgressDialog/ProgressDialog.cs
@@ -0,0 +1,713 @@
+// Modified ProgressDialog from Ookii.Dialogs
+// 
+// Copyright © Sven Groot (Ookii.org) 2009
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without 
+// modification, are permitted provided that the following conditions are met:
+// 
+// 1) Redistributions of source code must retain the above copyright notice, 
+//    this list of conditions and the following disclaimer. 
+// 2) Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation
+//    and/or other materials provided with the distribution. 
+// 3) Neither the name of the ORGANIZATION nor the names of its contributors
+//    may be used to endorse or promote products derived from this software
+//    without specific prior written permission. 
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+// THE POSSIBILITY OF SUCH DAMAGE.
+//
+
+using System;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Windows;
+using System.Windows.Interop;
+
+namespace GARbro.GUI
+{
+    public class ProgressDialog : Component
+    {
+        private class ProgressChangedData
+        {
+            public string        Text { get; set; }
+            public string Description { get; set; }
+            public object   UserState { get; set; }
+        }
+
+        private string _windowTitle;
+        private string _text;
+        private string _description;
+        private Interop.IProgressDialog _dialog;
+        private string _cancellationText;
+        private bool _useCompactPathsForText;
+        private bool _useCompactPathsForDescription;
+        private bool _cancellationPending;
+        private BackgroundWorker _backgroundWorker;
+
+        /// <summary>
+        /// Event raised when the dialog is displayed.
+        /// </summary>
+        /// <remarks>
+        /// Use this event to perform the operation that the dialog is showing the progress for.
+        /// This event will be raised on a different thread than the UI thread.
+        /// </remarks>
+        public event DoWorkEventHandler DoWork;
+
+        /// <summary>
+        /// Event raised when the operation completes.
+        /// </summary>
+        public event RunWorkerCompletedEventHandler RunWorkerCompleted;
+
+        /// <summary>
+        /// Event raised when <see cref="ReportProgress(int,string,string,object)"/> is called.
+        /// </summary>
+        public event ProgressChangedEventHandler ProgressChanged;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ProgressDialog"/> class.
+        /// </summary>
+        public ProgressDialog ()
+        {
+            InitializeComponent();
+
+            ProgressBarStyle = ProgressBarStyle.ProgressBar;
+            ShowCancelButton = true;
+            MinimizeBox = true;
+        }
+
+        /// <summary>
+        /// Gets or sets the text in the progress dialog's title bar.
+        /// </summary>
+        /// <value>
+        /// The text in the progress dialog's title bar. The default value is an empty string.
+        /// </value>
+        /// <remarks>
+        /// <para>
+        ///   This property must be set before <see cref="ShowDialog()"/> or <see cref="Show()"/> is called. Changing property has
+        ///   no effect while the dialog is being displayed.
+        /// </para>
+        /// </remarks>
+        [Localizable(true), Category("Appearance"), Description("The text in the progress dialog's title bar."), DefaultValue("")]
+        public string WindowTitle
+        {
+            get { return _windowTitle ?? string.Empty; }
+            set { _windowTitle = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a short description of the operation being carried out.
+        /// </summary>
+        /// <value>
+        /// A short description of the operation being carried. The default value is an empty string.
+        /// </value>
+        /// <remarks>
+        /// <para>
+        ///   This is the primary message to the user.
+        /// </para>
+        /// <para>
+        ///   This property can be changed while the dialog is running, but may only be changed from the thread which
+        ///   created the progress dialog. The recommended method to change this value while the dialog is running
+        ///   is to use the <see cref="ReportProgress(int,string,string)"/> method.
+        /// </para>
+        /// </remarks>
+        [Localizable(true), Category("Appearance"), Description("A short description of the operation being carried out.")]
+        public string Text
+        {
+            get { return _text ?? string.Empty; }
+            set 
+            { 
+                _text = value;
+                if (_dialog != null)
+                    _dialog.SetLine (1, Text, UseCompactPathsForText, IntPtr.Zero);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value that indicates whether path strings in the <see cref="Text"/> property should be compacted if
+        /// they are too large to fit on one line.
+        /// </summary>
+        /// <value>
+        /// <see langword="true"/> to compact path strings if they are too large to fit on one line; otherwise,
+        /// <see langword="false"/>. The default value is <see langword="false"/>.
+        /// </value>
+        /// <remarks>
+        /// <note>
+        ///   This property requires Windows Vista or later. On older versions of Windows, it has no effect.
+        /// </note>
+        /// <para>
+        ///   This property can be changed while the dialog is running, but may only be changed from the thread which
+        ///   created the progress dialog.
+        /// </para>
+        /// </remarks>
+        [Category("Behavior"), Description("Indicates whether path strings in the Text property should be compacted if they are too large to fit on one line."), DefaultValue(false)]
+        public bool UseCompactPathsForText
+        {
+            get { return _useCompactPathsForText; }
+            set 
+            {
+                _useCompactPathsForText = value;
+                if (_dialog != null)
+                    _dialog.SetLine (1, Text, _useCompactPathsForText, IntPtr.Zero);
+            }
+        }
+	
+        /// <summary>
+        /// Gets or sets additional details about the operation being carried out.
+        /// </summary>
+        /// <value>
+        /// Additional details about the operation being carried out. The default value is an empty string.
+        /// </value>
+        /// <remarks>
+        /// This text is used to provide additional details beyond the <see cref="Text"/> property.
+        /// </remarks>
+        /// <remarks>
+        /// <para>
+        ///   This property can be changed while the dialog is running, but may only be changed from the thread which
+        ///   created the progress dialog. The recommended method to change this value while the dialog is running
+        ///   is to use the <see cref="ReportProgress(int,string,string)"/> method.
+        /// </para>
+        /// </remarks>
+        [Localizable(true), Category("Appearance"), Description("Additional details about the operation being carried out."), DefaultValue("")]
+        public string Description
+        {
+            get { return _description ?? string.Empty; }
+            set 
+            { 
+                _description = value;
+                if (_dialog != null)
+                    _dialog.SetLine (2, Description, UseCompactPathsForDescription, IntPtr.Zero);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value that indicates whether path strings in the <see cref="Description"/> property should be compacted if
+        /// they are too large to fit on one line.
+        /// </summary>
+        /// <value>
+        /// <see langword="true"/> to compact path strings if they are too large to fit on one line; otherwise,
+        /// <see langword="false"/>. The default value is <see langword="false"/>.
+        /// </value>
+        /// <remarks>
+        /// <note>
+        ///   This property requires Windows Vista or later. On older versions of Windows, it has no effect.
+        /// </note>
+        /// <para>
+        ///   This property can be changed while the dialog is running, but may only be changed from the thread which
+        ///   created the progress dialog.
+        /// </para>
+        /// </remarks>
+        [Category("Behavior"), Description("Indicates whether path strings in the Description property should be compacted if they are too large to fit on one line."), DefaultValue(false)]
+        public bool UseCompactPathsForDescription
+        {
+            get { return _useCompactPathsForDescription; }
+            set
+            {
+                _useCompactPathsForDescription = value;
+                if( _dialog != null )
+                    _dialog.SetLine(2, Description, UseCompactPathsForDescription, IntPtr.Zero);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text that will be shown after the Cancel button is pressed.
+        /// </summary>
+        /// <value>
+        /// The text that will be shown after the Cancel button is pressed.
+        /// </value>
+        /// <remarks>
+        /// <para>
+        ///   This property must be set before <see cref="ShowDialog()"/> or <see cref="Show()"/> is called. Changing property has
+        ///   no effect while the dialog is being displayed.
+        /// </para>
+        /// </remarks>
+        [Localizable(true), Category("Appearance"), Description("The text that will be shown after the Cancel button is pressed."), DefaultValue("")]
+        public string CancellationText
+        {
+            get { return _cancellationText ?? string.Empty; }
+            set { _cancellationText = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a value that indicates whether an estimate of the remaining time will be shown.
+        /// </summary>
+        /// <value>
+        /// <see langword="true"/> if an estimate of remaining time will be shown; otherwise, <see langword="false"/>. The
+        /// default value is <see langword="false"/>.
+        /// </value>
+        /// <remarks>
+        /// <para>
+        ///   This property must be set before <see cref="ShowDialog()"/> or <see cref="Show()"/> is called. Changing property has
+        ///   no effect while the dialog is being displayed.
+        /// </para>
+        /// </remarks>
+        [Category("Appearance"), Description("Indicates whether an estimate of the remaining time will be shown."), DefaultValue(false)]
+        public bool ShowTimeRemaining { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value that indicates whether the dialog has a cancel button.
+        /// </summary>
+        /// <value>
+        /// <see langword="true"/> if the dialog has a cancel button; otherwise, <see langword="false"/>. The default
+        /// value is <see langword="true"/>.
+        /// </value>
+        /// <remarks>
+        /// <note>
+        ///   This property requires Windows Vista or later; on older versions of Windows, the cancel button will always
+        ///   be displayed.
+        /// </note>
+        /// <para>
+        ///   The event handler for the <see cref="DoWork"/> event must periodically check the value of the
+        ///   <see cref="CancellationPending"/> property to see if the operation has been cancelled if this
+        ///   property is <see langword="true"/>.
+        /// </para>
+        /// <para>
+        ///   Setting this property to <see langword="false"/> is not recommended unless absolutely necessary.
+        /// </para>
+        /// </remarks>
+        [Category("Appearance"), Description("Indicates whether the dialog has a cancel button. Do not set to false unless absolutely necessary."), DefaultValue(true)]
+        public bool ShowCancelButton { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value that indicates whether the progress dialog has a minimize button.
+        /// </summary>
+        /// <value>
+        /// <see langword="true"/> if the dialog has a minimize button; otherwise, <see langword="false"/>. The default
+        /// value is <see langword="true"/>.
+        /// </value>
+        /// <remarks>
+        /// <note>
+        ///   This property has no effect on modal dialogs (which do not have a minimize button). It only applies
+        ///   to modeless dialogs shown by using the <see cref="Show()"/> method.
+        /// </note>
+        /// <para>
+        ///   This property must be set before <see cref="Show()"/> is called. Changing property has
+        ///   no effect while the dialog is being displayed.
+        /// </para>
+        /// </remarks>
+        [Category("Window Style"), Description("Indicates whether the progress dialog has a minimize button."), DefaultValue(true)]
+        public bool MinimizeBox { get; set; }
+
+        /// <summary>
+        /// Gets a value indicating whether the user has requested cancellation of the operation.
+        /// </summary>
+        /// <value>
+        /// <see langword="true" /> if the user has cancelled the progress dialog; otherwise, <see langword="false" />. The default is <see langword="false" />.
+        /// </value>
+        /// <remarks>
+        /// The event handler for the <see cref="DoWork"/> event must periodically check this property and abort the operation
+        /// if it returns <see langword="true"/>.
+        /// </remarks>
+        [Browsable(false)]
+        public bool CancellationPending
+        {
+            get
+            {
+                _backgroundWorker.ReportProgress (-1); // Call with an out-of-range percentage will update the value of
+                                                       // _cancellationPending but do nothing else.
+                return _cancellationPending;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value that indicates whether a regular or marquee style progress bar should be used.
+        /// </summary>
+        /// <value>
+        /// One of the values of <see cref="Ookii.Dialogs.Wpf.ProgressBarStyle"/>. 
+        /// The default value is <see cref="Ookii.Dialogs.Wpf.ProgressBarStyle.ProgressBar"/>.
+        /// </value>
+        /// <remarks>
+        /// <note>
+        ///   Operating systems older than Windows Vista do not support marquee progress bars on the progress dialog. On those operating systems, the
+        ///   progress bar will be hidden completely if this property is <see cref="Ookii.Dialogs.Wpf.ProgressBarStyle.MarqueeProgressBar"/>.
+        /// </note>
+        /// <para>
+        ///   When this property is set to <see cref="Ookii.Dialogs.Wpf.ProgressBarStyle.ProgressBar" />, use the <see cref="ReportProgress(int)"/> method to set
+        ///   the value of the progress bar. When this property is set to <see cref="Ookii.Dialogs.Wpf.ProgressBarStyle.MarqueeProgressBar"/>
+        ///   you can still use the <see cref="ReportProgress(int,string,string)"/> method to update the text of the dialog,
+        ///   but the percentage will be ignored.
+        /// </para>
+        /// <para>
+        ///   This property must be set before <see cref="ShowDialog()"/> or <see cref="Show()"/> is called. Changing property has
+        ///   no effect while the dialog is being displayed.
+        /// </para>
+        /// </remarks>
+        [Category("Appearance"), Description("Indicates the style of the progress bar."), DefaultValue(ProgressBarStyle.ProgressBar)]
+        public ProgressBarStyle ProgressBarStyle { get; set; }
+
+
+        /// <summary>
+        /// Gets a value that indicates whether the <see cref="ProgressDialog"/> is running an asynchronous operation.
+        /// </summary>
+        /// <value>
+        /// <see langword="true"/> if the <see cref="ProgressDialog"/> is running an asynchronous operation; 
+        /// otherwise, <see langword="false"/>.
+        /// </value>
+        [Browsable(false)]
+        public bool IsBusy
+        {
+            get { return _backgroundWorker.IsBusy; }
+        }
+
+        /// <summary>
+        /// Displays the progress dialog as a modeless dialog.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        ///   This function will not block the parent window and will return immediately.
+        /// </para>
+        /// <para>
+        ///   Although this function returns immediately, you cannot use the UI thread to do any processing. The dialog
+        ///   will not function correctly unless the UI thread continues to handle window messages, so that thread may
+        ///   not be blocked by some other activity. All processing related to the progress dialog must be done in
+        ///   the <see cref="DoWork"/> event handler.
+        /// </para>
+        /// </remarks>
+        public void Show ()
+        {
+            Show (null);
+        }
+
+        /// <summary>
+        /// Displays the progress dialog as a modeless dialog.
+        /// </summary>
+        /// <param name="argument">A parameter for use by the background operation to be executed in the <see cref="DoWork"/> event handler.</param>
+        /// <remarks>
+        /// <para>
+        ///   This function will not block the parent window and return immediately.
+        /// </para>
+        /// <para>
+        ///   Although this function returns immediately, you cannot use the UI thread to do any processing. The dialog
+        ///   will not function correctly unless the UI thread continues to handle window messages, so that thread may
+        ///   not be blocked by some other activity. All processing related to the progress dialog must be done in
+        ///   the <see cref="DoWork"/> event handler.
+        /// </para>
+        /// </remarks>
+        public void Show (object argument)
+        {
+            RunProgressDialog (IntPtr.Zero, argument);
+        }
+
+        /// <summary>
+        /// Displays the progress dialog as a modal dialog.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        ///   The ShowDialog function for most .Net dialogs will not return until the dialog is closed. However,
+        ///   the <see cref="ShowDialog()"/> function for the <see cref="ProgressDialog"/> class will return immediately.
+        ///   The parent window will be disabled as with all modal dialogs.
+        /// </para>
+        /// <para>
+        ///   Although this function returns immediately, you cannot use the UI thread to do any processing. The dialog
+        ///   will not function correctly unless the UI thread continues to handle window messages, so that thread may
+        ///   not be blocked by some other activity. All processing related to the progress dialog must be done in
+        ///   the <see cref="DoWork"/> event handler.
+        /// </para>
+        /// <para>
+        ///   The progress dialog's window will appear in the taskbar. This behaviour is also contrary to most .Net dialogs,
+        ///   but is part of the underlying native progress dialog API so cannot be avoided.
+        /// </para>
+        /// <para>
+        ///   When possible, it is recommended that you use a modeless dialog using the <see cref="Show()"/> function.
+        /// </para>
+        /// </remarks>
+        public void ShowDialog()
+        {
+            ShowDialog (null, null);
+        }
+
+        /// <summary>
+        /// Displays the progress dialog as a modal dialog.
+        /// </summary>
+        /// <param name="owner">The window that owns the dialog.</param>
+        /// <remarks>
+        /// <para>
+        ///   The ShowDialog function for most .Net dialogs will not return until the dialog is closed. However,
+        ///   the <see cref="ShowDialog()"/> function for the <see cref="ProgressDialog"/> class will return immediately.
+        ///   The parent window will be disabled as with all modal dialogs.
+        /// </para>
+        /// <para>
+        ///   Although this function returns immediately, you cannot use the UI thread to do any processing. The dialog
+        ///   will not function correctly unless the UI thread continues to handle window messages, so that thread may
+        ///   not be blocked by some other activity. All processing related to the progress dialog must be done in
+        ///   the <see cref="DoWork"/> event handler.
+        /// </para>
+        /// <para>
+        ///   The progress dialog's window will appear in the taskbar. This behaviour is also contrary to most .Net dialogs,
+        ///   but is part of the underlying native progress dialog API so cannot be avoided.
+        /// </para>
+        /// <para>
+        ///   When possible, it is recommended that you use a modeless dialog using the <see cref="Show()"/> function.
+        /// </para>
+        /// </remarks>
+        public void ShowDialog (Window owner)
+        {
+            ShowDialog (owner, null);
+        }
+
+        /// <summary>
+        /// Displays the progress dialog as a modal dialog.
+        /// </summary>
+        /// <param name="owner">The window that owns the dialog.</param>
+        /// <param name="argument">A parameter for use by the background operation to be executed in the <see cref="DoWork"/> event handler.</param>
+        /// <remarks>
+        /// <para>
+        ///   The ShowDialog function for most .Net dialogs will not return until the dialog is closed. However,
+        ///   the <see cref="ShowDialog()"/> function for the <see cref="ProgressDialog"/> class will return immediately.
+        ///   The parent window will be disabled as with all modal dialogs.
+        /// </para>
+        /// <para>
+        ///   Although this function returns immediately, you cannot use the UI thread to do any processing. The dialog
+        ///   will not function correctly unless the UI thread continues to handle window messages, so that thread may
+        ///   not be blocked by some other activity. All processing related to the progress dialog must be done in
+        ///   the <see cref="DoWork"/> event handler.
+        /// </para>
+        /// <para>
+        ///   The progress dialog's window will appear in the taskbar. This behaviour is also contrary to most .Net dialogs,
+        ///   but is part of the underlying native progress dialog API so cannot be avoided.
+        /// </para>
+        /// <para>
+        ///   When possible, it is recommended that you use a modeless dialog using the <see cref="Show()"/> function.
+        /// </para>
+        /// </remarks>
+        public void ShowDialog (Window owner, object argument)
+        {
+            RunProgressDialog (owner == null ? NativeMethods.GetActiveWindow() : new WindowInteropHelper(owner).Handle, argument);
+        }
+
+        const int SW_HIDE = 0;
+        const int SW_SHOW = 5;
+
+        public void Hide ()
+        {
+            if (null == _dialog)
+                return;
+            var hwnd = GetWindowHandle();
+            if (hwnd != IntPtr.Zero)
+                NativeMethods.ShowWindow (hwnd, SW_HIDE);
+        }
+
+        public void Restore ()
+        {
+            if (null == _dialog)
+                return;
+            var hwnd = GetWindowHandle();
+            if (hwnd != IntPtr.Zero)
+                NativeMethods.ShowWindow (hwnd, SW_SHOW); 
+        }
+
+        /// <summary>
+        /// Get win32 handle of the progress dialog window.
+        /// </summary>
+        public IntPtr GetWindowHandle ()
+        {
+            var ole = _dialog as Interop.IOleWindow;
+            if (null == ole)
+                return IntPtr.Zero;
+            IntPtr hwnd;
+            ole.GetWindow (out hwnd);
+            return hwnd;
+        }
+
+        /// <summary>
+        /// Updates the dialog's progress bar.
+        /// </summary>
+        /// <param name="percentProgress">The percentage, from 0 to 100, of the operation that is complete.</param>
+        /// <remarks>
+        /// <para>
+        ///   Call this method from the <see cref="DoWork"/> event handler if you want to report progress.
+        /// </para>
+        /// <para>
+        ///   This method has no effect is <see cref="ProgressBarStyle"/> is <see cref="Ookii.Dialogs.Wpf.ProgressBarStyle.MarqueeProgressBar"/>
+        ///   or <see cref="Ookii.Dialogs.Wpf.ProgressBarStyle.None"/>.
+        /// </para>
+        /// </remarks>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="percentProgress"/> is out of range.</exception>
+        /// <exception cref="InvalidOperationException">The progress dialog is not currently being displayed.</exception>
+        public void ReportProgress (int percentProgress)
+        {
+            ReportProgress (percentProgress, null, null, null);
+        }
+
+        /// <summary>
+        /// Updates the dialog's progress bar.
+        /// </summary>
+        /// <param name="percentProgress">The percentage, from 0 to 100, of the operation that is complete.</param>
+        /// <param name="text">The new value of the progress dialog's primary text message, or <see langword="null"/> to leave the value unchanged.</param>
+        /// <param name="description">The new value of the progress dialog's additional description message, or <see langword="null"/> to leave the value unchanged.</param>
+        /// <remarks>Call this method from the <see cref="DoWork"/> event handler if you want to report progress.</remarks>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="percentProgress"/> is out of range.</exception>
+        /// <exception cref="InvalidOperationException">The progress dialog is not currently being displayed.</exception>
+        public void ReportProgress (int percentProgress, string text, string description)
+        {
+            ReportProgress (percentProgress, text, description, null);
+        }
+
+        /// <summary>
+        /// Updates the dialog's progress bar.
+        /// </summary>
+        /// <param name="percentProgress">The percentage, from 0 to 100, of the operation that is complete.</param>
+        /// <param name="text">The new value of the progress dialog's primary text message, or <see langword="null"/> to leave the value unchanged.</param>
+        /// <param name="description">The new value of the progress dialog's additional description message, or <see langword="null"/> to leave the value unchanged.</param>
+        /// <param name="userState">A state object that will be passed to the <see cref="ProgressChanged"/> event handler.</param>
+        /// <remarks>Call this method from the <see cref="DoWork"/> event handler if you want to report progress.</remarks>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="percentProgress"/> is out of range.</exception>
+        /// <exception cref="InvalidOperationException">The progress dialog is not currently being displayed.</exception>
+        public void ReportProgress (int percentProgress, string text, string description, object userState)
+        {
+            if (percentProgress < 0 || percentProgress > 100)
+                throw new ArgumentOutOfRangeException ("percentProgress");
+            if (_dialog == null)
+                throw new InvalidOperationException ("The progress dialog is not shown.");
+            _backgroundWorker.ReportProgress (percentProgress, new ProgressChangedData { Text = text, Description = description, UserState = userState });
+        }
+
+        /// <summary>
+        /// Raises the <see cref="DoWork"/> event.
+        /// </summary>
+        /// <param name="e">The <see cref="DoWorkEventArgs"/> containing data for the event.</param>
+        protected virtual void OnDoWork (DoWorkEventArgs e)
+        {
+            var handler = DoWork;
+            if (handler != null)
+                handler (this, e);
+        }
+
+        /// <summary>
+        /// Raises the <see cref="RunWorkerCompleted"/> event.
+        /// </summary>
+        /// <param name="e">The <see cref="EventArgs"/> containing data for the event.</param>
+        protected virtual void OnRunWorkerCompleted (RunWorkerCompletedEventArgs e)
+        {
+            var handler = RunWorkerCompleted;
+            if (handler != null)
+                handler (this, e);
+        }
+
+        /// <summary>
+        /// Raises the <see cref="ProgressChanged"/> event.
+        /// </summary>
+        /// <param name="e">The <see cref="ProgressChangedEventArgs"/> containing data for the event.</param>
+        protected virtual void OnProgressChanged (ProgressChangedEventArgs e)
+        {
+            var handler = ProgressChanged;
+            if (handler != null)
+                handler (this, e);
+        }
+
+        private void RunProgressDialog (IntPtr owner, object argument)
+        {
+            if (_backgroundWorker.IsBusy)
+                throw new InvalidOperationException ("The progress dialog is already running.");
+
+            _cancellationPending = false;
+            _dialog = new Interop.ProgressDialog();
+            _dialog.SetTitle (WindowTitle);
+
+            if (CancellationText.Length > 0)
+                _dialog.SetCancelMsg (CancellationText, null);
+            _dialog.SetLine (1, Text, UseCompactPathsForText, IntPtr.Zero);
+            _dialog.SetLine (2, Description, UseCompactPathsForDescription, IntPtr.Zero);
+
+            var flags = Interop.ProgressDialogFlags.Normal;
+            if (owner != IntPtr.Zero)
+                flags |= Interop.ProgressDialogFlags.Modal;
+            switch (ProgressBarStyle)
+            {
+            case ProgressBarStyle.None:
+                flags |= Interop.ProgressDialogFlags.NoProgressBar;
+                break;
+            case ProgressBarStyle.MarqueeProgressBar:
+                if (NativeMethods.IsWindowsVistaOrLater)
+                    flags |= Interop.ProgressDialogFlags.MarqueeProgress;
+                else
+                    flags |= Interop.ProgressDialogFlags.NoProgressBar; // Older than Vista doesn't support marquee.
+                break;
+            }
+            if( ShowTimeRemaining )
+                flags |= Interop.ProgressDialogFlags.AutoTime;
+            if( !ShowCancelButton )
+                flags |= Interop.ProgressDialogFlags.NoCancel;
+            if( !MinimizeBox )
+                flags |= Interop.ProgressDialogFlags.NoMinimize;
+
+            _dialog.StartProgressDialog (owner, null, flags, IntPtr.Zero);
+            _backgroundWorker.RunWorkerAsync (argument);
+        }
+
+        private void InitializeComponent ()
+        {
+            _backgroundWorker = new BackgroundWorker();
+            _backgroundWorker.WorkerReportsProgress = true;
+            _backgroundWorker.WorkerSupportsCancellation = true;
+            _backgroundWorker.DoWork += new DoWorkEventHandler (_backgroundWorker_DoWork);
+            _backgroundWorker.RunWorkerCompleted += new RunWorkerCompletedEventHandler (_backgroundWorker_RunWorkerCompleted);
+            _backgroundWorker.ProgressChanged += new ProgressChangedEventHandler (_backgroundWorker_ProgressChanged);
+
+        }
+
+        private void _backgroundWorker_DoWork (object sender, DoWorkEventArgs e)
+        {
+            OnDoWork (e);
+        }
+
+        private void _backgroundWorker_RunWorkerCompleted (object sender, RunWorkerCompletedEventArgs e)
+        {
+            _dialog.StopProgressDialog();
+            Marshal.ReleaseComObject (_dialog);
+            _dialog = null;
+
+            OnRunWorkerCompleted (new RunWorkerCompletedEventArgs((!e.Cancelled && e.Error == null) ? e.Result : null, e.Error, e.Cancelled));
+        }
+
+        private void _backgroundWorker_ProgressChanged (object sender, ProgressChangedEventArgs e)
+        {
+            _cancellationPending = _dialog.HasUserCancelled();
+            // ReportProgress doesn't allow values outside this range. However, CancellationPending will call
+            // BackgroundWorker.ReportProgress directly with a value that is outside this range to update the value of the property.
+            if (e.ProgressPercentage >= 0 && e.ProgressPercentage <= 100)
+            {
+                _dialog.SetProgress ((uint)e.ProgressPercentage, 100);
+                var data = e.UserState as ProgressChangedData;
+                if (data != null)
+                {
+                    if (data.Text != null)
+                        Text = data.Text;
+                    if (data.Description != null)
+                        Description = data.Description;
+                    OnProgressChanged (new ProgressChangedEventArgs (e.ProgressPercentage, data.UserState));
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Indicates the type of progress on a task dialog.
+    /// </summary>
+    public enum ProgressBarStyle
+    {
+        /// <summary>
+        /// No progress bar is displayed on the dialog.
+        /// </summary>
+        None,
+        /// <summary>
+        /// A regular progress bar is displayed on the dialog.
+        /// </summary>
+        ProgressBar,
+        /// <summary>
+        /// A marquee progress bar is displayed on the dialog. Use this value for operations
+        /// that cannot report concrete progress information.
+        /// </summary>
+        MarqueeProgressBar
+    }
+}
diff --git a/GUI/Utility.cs b/GUI/Utility.cs
index f289b480..d0ca2a61 100644
--- a/GUI/Utility.cs
+++ b/GUI/Utility.cs
@@ -35,6 +35,14 @@ namespace GARbro.GUI
 {
     internal class NativeMethods
     {
+        public static bool IsWindowsVistaOrLater
+        {
+            get
+            {
+                return Environment.OSVersion.Platform == PlatformID.Win32NT && Environment.OSVersion.Version >= new Version (6, 0, 6000);
+            }
+        }
+
         [DllImport ("shlwapi.dll", CharSet = CharSet.Unicode)]
         internal static extern int StrCmpLogicalW (string psz1, string psz2);
 
@@ -46,6 +54,15 @@ namespace GARbro.GUI
 
         [DllImport ("user32.dll")]
         internal static extern int ReleaseDC (IntPtr hWnd, IntPtr hDc);
+
+        [DllImport ("user32.dll", CharSet = CharSet.Unicode, ExactSpelling = true)]
+        internal static extern IntPtr GetActiveWindow();
+
+        [DllImport ("user32.dll")][return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool ShowWindow (IntPtr hWnd, int nCmdShow);
+
+        [DllImport ("user32.dll")][return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool EnableWindow (IntPtr hWnd, bool bEnable);
     }
 
     public static class Desktop

From c483e745d9848b39f328516b2b6c97c34d865622 Mon Sep 17 00:00:00 2001
From: morkt <muvluv.ru@gmail.com>
Date: Fri, 3 Feb 2017 08:53:34 +0400
Subject: [PATCH 04/10] (GUI): added string resources.

---
 GUI/FileErrorDialog.xaml            |  7 +++---
 GUI/GarExtract.cs                   | 20 +++-------------
 GUI/Strings/guiStrings.Designer.cs  | 36 +++++++++++++++++++++++++++++
 GUI/Strings/guiStrings.ko-KR.resx   | 18 ++++++++++++++-
 GUI/Strings/guiStrings.resx         | 12 ++++++++++
 GUI/Strings/guiStrings.ru-RU.resx   | 14 ++++++++++-
 GUI/Strings/guiStrings.zh-Hans.resx | 16 +++++++++++++
 7 files changed, 101 insertions(+), 22 deletions(-)

diff --git a/GUI/FileErrorDialog.xaml b/GUI/FileErrorDialog.xaml
index 89fd9dc9..bed67536 100644
--- a/GUI/FileErrorDialog.xaml
+++ b/GUI/FileErrorDialog.xaml
@@ -2,6 +2,7 @@
                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                xmlns:w="clr-namespace:Rnd.Windows"
+               xmlns:s="clr-namespace:GARbro.GUI.Strings"
                Title="{Binding Title}" ShowInTaskbar="False" WindowStartupLocation="CenterOwner"
                ResizeMode="NoResize" SizeToContent="WidthAndHeight" ShowActivated="True"
                Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}">
@@ -9,9 +10,9 @@
         <TextBox x:Name="ErrorText" Text="{Binding Text}" IsReadOnly="True" Background="Transparent" BorderThickness="0" Margin="10"/>
         <Separator/>
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
-            <CheckBox x:Name="IgnoreErrors" Content="_Ignore further errors" Margin="10" VerticalAlignment="Center"/>
-            <Button Content="_Continue" Margin="10" Width="75" Height="25" IsDefault="True" Click="ContinueButton_Click"/>
-            <Button Content="_Abort" Margin="10" Width="75" Height="25" IsCancel="True" Click="AbortButton_Click"/>
+            <CheckBox x:Name="IgnoreErrors" Content="{x:Static s:guiStrings.LabelIgnoreErrors}" Margin="10" VerticalAlignment="Center"/>
+            <Button Content="{x:Static s:guiStrings.ButtonContinue}" Margin="10" Width="75" Height="25" IsDefault="True" Click="ContinueButton_Click"/>
+            <Button Content="{x:Static s:guiStrings.ButtonAbort}" Margin="10" Width="75" Height="25" IsCancel="True" Click="AbortButton_Click"/>
         </StackPanel>
     </StackPanel>
     <Window.InputBindings>
diff --git a/GUI/GarExtract.cs b/GUI/GarExtract.cs
index 8d10048a..be5a0a10 100644
--- a/GUI/GarExtract.cs
+++ b/GUI/GarExtract.cs
@@ -2,7 +2,7 @@
 //! \date       Fri Jul 25 05:52:27 2014
 //! \brief      Extract archive frontend.
 //
-// Copyright (C) 2014-2015 by morkt
+// Copyright (C) 2014-2017 by morkt
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to
@@ -119,7 +119,6 @@ namespace GARbro.GUI
         private int                 m_skip_count;
         private bool                m_extract_in_progress = false;
         private ProgressDialog      m_progress_dialog;
-        private Exception           m_pending_error;
 
         public bool IsActive { get { return m_extract_in_progress; } }
 
@@ -270,7 +269,6 @@ namespace GARbro.GUI
                 m_progress_dialog.ProgressBarStyle = ProgressBarStyle.MarqueeProgressBar;
             }
             m_convert_audio = !m_skip_audio && Settings.Default.appConvertAudio;
-            m_pending_error = null;
             m_progress_dialog.DoWork += (s, e) => ExtractWorker (file_list);
             m_progress_dialog.RunWorkerCompleted += OnExtractComplete;
             m_progress_dialog.ShowDialog (m_main);
@@ -305,8 +303,7 @@ namespace GARbro.GUI
                 {
                     if (!m_ignore_errors)
                     {
-                        var error_text = string.Format ("{0}\n{1}\n{2}", "Failed to extract file",
-                                                        entry.Name, X.Message);
+                        var error_text = string.Format (guiStrings.TextErrorExtracting, entry.Name, X.Message);
                         if (!m_main.Dispatcher.Invoke (() => ShowErrorDialog (error_text)))
                             break;
                     }
@@ -416,7 +413,7 @@ namespace GARbro.GUI
 
         bool ShowErrorDialog (string error_text)
         {
-            var dialog = new FileErrorDialog ("File extraction error", error_text);
+            var dialog = new FileErrorDialog (guiStrings.TextExtractionError, error_text);
             var progress_dialog_hwnd = m_progress_dialog.GetWindowHandle(); 
             if (progress_dialog_hwnd != IntPtr.Zero)
             {
@@ -449,17 +446,6 @@ namespace GARbro.GUI
                 m_main.Dispatcher.Invoke (m_main.RefreshView);
             }
             m_main.SetStatusText (Localization.Format ("MsgExtractedFiles", m_extract_count));
-            if (null != m_pending_error)
-            {
-                if (m_pending_error is OperationCanceledException)
-                    m_main.SetStatusText (m_pending_error.Message);
-                else
-                {
-                    string message = string.Format (guiStrings.TextErrorExtracting,
-                                                    m_progress_dialog.Description, m_pending_error.Message);
-                    m_main.PopupError (message, guiStrings.MsgErrorExtracting);
-                }
-            }
             this.Dispose();
         }
         
diff --git a/GUI/Strings/guiStrings.Designer.cs b/GUI/Strings/guiStrings.Designer.cs
index 9bcca2f4..b03f1416 100644
--- a/GUI/Strings/guiStrings.Designer.cs
+++ b/GUI/Strings/guiStrings.Designer.cs
@@ -60,6 +60,15 @@ namespace GARbro.GUI.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to _Abort.
+        /// </summary>
+        public static string ButtonAbort {
+            get {
+                return ResourceManager.GetString("ButtonAbort", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Cancel.
         /// </summary>
@@ -69,6 +78,15 @@ namespace GARbro.GUI.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to _Continue.
+        /// </summary>
+        public static string ButtonContinue {
+            get {
+                return ResourceManager.GetString("ButtonContinue", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Convert.
         /// </summary>
@@ -384,6 +402,15 @@ namespace GARbro.GUI.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to _Ignore further errors.
+        /// </summary>
+        public static string LabelIgnoreErrors {
+            get {
+                return ResourceManager.GetString("LabelIgnoreErrors", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Skip incovertible files..
         /// </summary>
@@ -965,6 +992,15 @@ namespace GARbro.GUI.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to File extraction error.
+        /// </summary>
+        public static string TextExtractionError {
+            get {
+                return ResourceManager.GetString("TextExtractionError", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Extract text.
         /// </summary>
diff --git a/GUI/Strings/guiStrings.ko-KR.resx b/GUI/Strings/guiStrings.ko-KR.resx
index f4b22c62..b3009ef5 100644
--- a/GUI/Strings/guiStrings.ko-KR.resx
+++ b/GUI/Strings/guiStrings.ko-KR.resx
@@ -458,4 +458,20 @@
   <data name="CtxMenuSelectByMask" xml:space="preserve">
     <value>마스크로 파일 선택...</value>
   </data>
-</root>
+  <data name="ButtonAbort" xml:space="preserve">
+    <value>Abort</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="ButtonContinue" xml:space="preserve">
+    <value>Continue</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="LabelIgnoreErrors" xml:space="preserve">
+    <value>Ignore further errors</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="TextExtractionError" xml:space="preserve">
+    <value>File extraction error</value>
+    <comment>translation pending</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/GUI/Strings/guiStrings.resx b/GUI/Strings/guiStrings.resx
index d2ad5db1..f08e7fab 100644
--- a/GUI/Strings/guiStrings.resx
+++ b/GUI/Strings/guiStrings.resx
@@ -462,4 +462,16 @@ Overwrite?</value>
   <data name="CtxMenuSelectByMask" xml:space="preserve">
     <value>Select files by mask...</value>
   </data>
+  <data name="ButtonAbort" xml:space="preserve">
+    <value>_Abort</value>
+  </data>
+  <data name="ButtonContinue" xml:space="preserve">
+    <value>_Continue</value>
+  </data>
+  <data name="LabelIgnoreErrors" xml:space="preserve">
+    <value>_Ignore further errors</value>
+  </data>
+  <data name="TextExtractionError" xml:space="preserve">
+    <value>File extraction error</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/GUI/Strings/guiStrings.ru-RU.resx b/GUI/Strings/guiStrings.ru-RU.resx
index 8650f6c1..83b3bed3 100644
--- a/GUI/Strings/guiStrings.ru-RU.resx
+++ b/GUI/Strings/guiStrings.ru-RU.resx
@@ -460,7 +460,7 @@
     <value>Выбрать файлы</value>
   </data>
   <data name="TextErrorExtracting" xml:space="preserve">
-    <value>Произошёл сбой во время извлечения файла
+    <value>Не удалось извлечь файл
 {0}
 {1}</value>
   </data>
@@ -483,4 +483,16 @@
   <data name="CtxMenuSelectByMask" xml:space="preserve">
     <value>Выбрать файлы по маске...</value>
   </data>
+  <data name="ButtonAbort" xml:space="preserve">
+    <value>Прервать</value>
+  </data>
+  <data name="ButtonContinue" xml:space="preserve">
+    <value>Продолжить</value>
+  </data>
+  <data name="LabelIgnoreErrors" xml:space="preserve">
+    <value>Игнорировать дальнейшие ошибки</value>
+  </data>
+  <data name="TextExtractionError" xml:space="preserve">
+    <value>Ошибка извлечения файла</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/GUI/Strings/guiStrings.zh-Hans.resx b/GUI/Strings/guiStrings.zh-Hans.resx
index f175744f..beefb52d 100644
--- a/GUI/Strings/guiStrings.zh-Hans.resx
+++ b/GUI/Strings/guiStrings.zh-Hans.resx
@@ -460,4 +460,20 @@
     <value>Select files by mask...</value>
     <comment>translation pending</comment>
   </data>
+  <data name="ButtonAbort" xml:space="preserve">
+    <value>Abort</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="ButtonContinue" xml:space="preserve">
+    <value>Continue</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="LabelIgnoreErrors" xml:space="preserve">
+    <value>Ignore further errors</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="TextExtractionError" xml:space="preserve">
+    <value>File extraction error</value>
+    <comment>translation pending</comment>
+  </data>
 </root>
\ No newline at end of file

From 4559ded191b6ce3a57007110452dd5fab528993e Mon Sep 17 00:00:00 2001
From: mireado <mireado@daum.net>
Date: Fri, 3 Feb 2017 22:56:12 +0900
Subject: [PATCH 05/10] (GUI): update korean translation. (#44)

---
 GUI/Strings/guiStrings.ko-KR.resx | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/GUI/Strings/guiStrings.ko-KR.resx b/GUI/Strings/guiStrings.ko-KR.resx
index b3009ef5..859ed708 100644
--- a/GUI/Strings/guiStrings.ko-KR.resx
+++ b/GUI/Strings/guiStrings.ko-KR.resx
@@ -459,19 +459,15 @@
     <value>마스크로 파일 선택...</value>
   </data>
   <data name="ButtonAbort" xml:space="preserve">
-    <value>Abort</value>
-    <comment>translation pending</comment>
+    <value>중단</value>
   </data>
   <data name="ButtonContinue" xml:space="preserve">
-    <value>Continue</value>
-    <comment>translation pending</comment>
+    <value>계속</value>
   </data>
   <data name="LabelIgnoreErrors" xml:space="preserve">
-    <value>Ignore further errors</value>
-    <comment>translation pending</comment>
+    <value>추가 오류 무시</value>
   </data>
   <data name="TextExtractionError" xml:space="preserve">
-    <value>File extraction error</value>
-    <comment>translation pending</comment>
+    <value>파일 추출 오류</value>
   </data>
-</root>
\ No newline at end of file
+</root>

From 661e986e850bd45b566759daf3b87d34d5caf3f7 Mon Sep 17 00:00:00 2001
From: morkt <muvluv.ru@gmail.com>
Date: Fri, 3 Feb 2017 18:04:35 +0400
Subject: [PATCH 06/10] (FileExistsDialog): new modal window.

added FileErrorDialog logic to GarConvert.
---
 GUI/FileErrorDialog.xaml.cs         | 16 +++++++
 GUI/FileExistsDialog.xaml           | 21 +++++++++
 GUI/FileExistsDialog.xaml.cs        | 72 +++++++++++++++++++++++++++++
 GUI/GARbro.GUI.csproj               |  7 +++
 GUI/GarConvert.cs                   | 62 ++++++++++++-------------
 GUI/GarExtract.cs                   | 29 ++----------
 GUI/MainWindow.xaml.cs              | 37 ++++++++++++++-
 GUI/Strings/guiStrings.Designer.cs  | 56 ++++++++++++++++++++++
 GUI/Strings/guiStrings.ko-KR.resx   | 26 +++++++++++
 GUI/Strings/guiStrings.resx         | 20 ++++++++
 GUI/Strings/guiStrings.ru-RU.resx   | 20 ++++++++
 GUI/Strings/guiStrings.zh-Hans.resx | 26 +++++++++++
 12 files changed, 332 insertions(+), 60 deletions(-)
 create mode 100644 GUI/FileExistsDialog.xaml
 create mode 100644 GUI/FileExistsDialog.xaml.cs

diff --git a/GUI/FileErrorDialog.xaml.cs b/GUI/FileErrorDialog.xaml.cs
index 7fcb5725..420e9129 100644
--- a/GUI/FileErrorDialog.xaml.cs
+++ b/GUI/FileErrorDialog.xaml.cs
@@ -16,6 +16,16 @@ namespace GARbro.GUI
             this.DataContext = new ViewModel { Title = title, Text = error_text };
         }
 
+        new public FileErrorDialogResult ShowDialog ()
+        {
+            bool dialog_result = base.ShowDialog() ?? false;
+            return new FileErrorDialogResult
+            {
+                Continue     = dialog_result,
+                IgnoreErrors = IgnoreErrors.IsChecked ?? false
+            };
+        }
+
         private void ContinueButton_Click (object sender, RoutedEventArgs e)
         {
             this.DialogResult = true;
@@ -73,4 +83,10 @@ namespace GARbro.GUI
             public event EventHandler CanExecuteChanged;
         }
     }
+
+    public struct FileErrorDialogResult
+    {
+        public bool Continue;
+        public bool IgnoreErrors;
+    }
 }
diff --git a/GUI/FileExistsDialog.xaml b/GUI/FileExistsDialog.xaml
new file mode 100644
index 00000000..bb1c2689
--- /dev/null
+++ b/GUI/FileExistsDialog.xaml
@@ -0,0 +1,21 @@
+<w:ModalWindow x:Class="GARbro.GUI.FileExistsDialog"
+               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+               xmlns:w="clr-namespace:Rnd.Windows"
+               xmlns:s="clr-namespace:GARbro.GUI.Strings"
+               Title="File already exists" ShowInTaskbar="False" WindowStartupLocation="CenterOwner"
+               ResizeMode="NoResize" SizeToContent="WidthAndHeight" ShowActivated="True"
+               Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}">
+    <StackPanel Orientation="Vertical">
+        <TextBlock x:Name="Notice" Text="File named {0} already exists in destination folder." Margin="10"/>
+        <TextBlock Text="{x:Static s:guiStrings.LabelDuplicateFileQuestion}" Margin="10"/>
+        <Separator/>
+        <CheckBox x:Name="ApplyToAll" Content="{x:Static s:guiStrings.LabelApplyToAll}" Margin="10"/>
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
+            <Button Content="{x:Static s:guiStrings.ButtonSkip}" Margin="10" Width="75" Height="25" IsDefault="True" Click="SkipButton_Click"/>
+            <Button Content="{x:Static s:guiStrings.ButtonOverwrite}" Margin="10" Width="75" Height="25" Click="OverwriteButton_Click"/>
+            <Button Content="{x:Static s:guiStrings.ButtonRename}" Margin="10" Width="75" Height="25" Click="RenameButton_Click"/>
+            <Button Content="{x:Static s:guiStrings.ButtonAbort}" Margin="10" Width="75" Height="25" IsCancel="True" Click="AbortButton_Click"/>
+        </StackPanel>
+    </StackPanel>
+</w:ModalWindow>
diff --git a/GUI/FileExistsDialog.xaml.cs b/GUI/FileExistsDialog.xaml.cs
new file mode 100644
index 00000000..b308f1df
--- /dev/null
+++ b/GUI/FileExistsDialog.xaml.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace GARbro.GUI
+{
+    /// <summary>
+    /// Interaction logic for FileExistsDialog.xaml
+    /// </summary>
+    public partial class FileExistsDialog : Rnd.Windows.ModalWindow
+    {
+        public FileExistsDialog (string title, string text)
+        {
+            InitializeComponent ();
+            this.Title = title;
+            this.Notice.Text = text;
+        }
+
+        new public FileExistsDialogResult ShowDialog ()
+        {
+            bool dialog_result = base.ShowDialog() ?? false;
+            if (!dialog_result)
+                FileAction = ExistingFileAction.Abort;
+            return new FileExistsDialogResult
+            {
+                Action      = FileAction,
+                ApplyToAll  = ApplyToAll.IsChecked ?? false
+            };
+        }
+
+        public ExistingFileAction FileAction { get; set; }
+
+        private void SkipButton_Click (object sender, RoutedEventArgs e)
+        {
+            this.DialogResult = true;
+            this.FileAction = ExistingFileAction.Skip;
+        }
+
+        private void OverwriteButton_Click (object sender, RoutedEventArgs e)
+        {
+            this.DialogResult = true;
+            this.FileAction = ExistingFileAction.Overwrite;
+        }
+
+        private void RenameButton_Click (object sender, RoutedEventArgs e)
+        {
+            this.DialogResult = true;
+            this.FileAction = ExistingFileAction.Rename;
+        }
+
+        private void AbortButton_Click (object sender, RoutedEventArgs e)
+        {
+            this.DialogResult = false;
+            this.FileAction = ExistingFileAction.Abort;
+        }
+    }
+
+    public enum ExistingFileAction
+    {
+        Skip,
+        Overwrite,
+        Rename,
+        Abort
+    }
+
+    public struct FileExistsDialogResult
+    {
+        public ExistingFileAction Action;
+        public bool ApplyToAll;
+    }
+}
diff --git a/GUI/GARbro.GUI.csproj b/GUI/GARbro.GUI.csproj
index bf565e0e..1a19b592 100644
--- a/GUI/GARbro.GUI.csproj
+++ b/GUI/GARbro.GUI.csproj
@@ -147,6 +147,9 @@
     <Compile Include="FileErrorDialog.xaml.cs">
       <DependentUpon>FileErrorDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="FileExistsDialog.xaml.cs">
+      <DependentUpon>FileExistsDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="GarConvert.cs" />
     <Compile Include="GarCreate.cs" />
     <Compile Include="GarExtract.cs" />
@@ -203,6 +206,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="FileExistsDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/GUI/GarConvert.cs b/GUI/GarConvert.cs
index 1d61da9d..57365053 100644
--- a/GUI/GarConvert.cs
+++ b/GUI/GarConvert.cs
@@ -143,42 +143,38 @@ namespace GARbro.GUI
         void ConvertWorker (object sender, DoWorkEventArgs e)
         {
             m_pending_error = null;
-            try
+            int total = m_source.Count();
+            int i = 0;
+            foreach (var entry in m_source)
             {
-                int total = m_source.Count();
-                int i = 0;
-                foreach (var entry in m_source)
+                if (m_progress_dialog.CancellationPending)
                 {
-                    if (m_progress_dialog.CancellationPending)
-                        throw new OperationCanceledException();
-                    var filename = entry.Name;
-                    int progress = i++*100/total;
-                    m_progress_dialog.ReportProgress (progress, string.Format (guiStrings.MsgConvertingFile,
-                        Path.GetFileName (filename)), null);
-                    try
-                    {
-                        if ("image" == entry.Type)
-                            ConvertImage (filename);
-                        else if ("audio" == entry.Type)
-                            ConvertAudio (filename);
-                    }
-                    catch (NotImplementedException X)
-                    {
-                        // target format creation not implemented
-                        m_pending_error = X;
-                        break;
-                    }
-                    catch (Exception X)
-                    {
-                        if (!IgnoreErrors)
-                            throw;
-                        m_failed.Add (Tuple.Create (Path.GetFileName (filename), X.Message));
-                    }
+                    m_pending_error = new OperationCanceledException();
+                    break;
+                }
+                var filename = entry.Name;
+                int progress = i++*100/total;
+                m_progress_dialog.ReportProgress (progress, string.Format (guiStrings.MsgConvertingFile,
+                    Path.GetFileName (filename)), null);
+                try
+                {
+                    if ("image" == entry.Type)
+                        ConvertImage (filename);
+                    else if ("audio" == entry.Type)
+                        ConvertAudio (filename);
+                }
+                catch (Exception X)
+                {
+                    if (!IgnoreErrors)
+                    {
+                        var error_text = string.Format (guiStrings.TextErrorConverting, entry.Name, X.Message);
+                        var result = m_main.Dispatcher.Invoke (() => m_main.ShowErrorDialog (guiStrings.TextMediaConvertError, error_text, m_progress_dialog.GetWindowHandle()));
+                        if (!result.Continue)
+                            break;
+                        IgnoreErrors = result.IgnoreErrors;
+                    }
+                    m_failed.Add (Tuple.Create (Path.GetFileName (filename), X.Message));
                 }
-            }
-            catch (Exception X)
-            {
-                m_pending_error = X;
             }
         }
 
diff --git a/GUI/GarExtract.cs b/GUI/GarExtract.cs
index be5a0a10..be378361 100644
--- a/GUI/GarExtract.cs
+++ b/GUI/GarExtract.cs
@@ -304,8 +304,10 @@ namespace GARbro.GUI
                     if (!m_ignore_errors)
                     {
                         var error_text = string.Format (guiStrings.TextErrorExtracting, entry.Name, X.Message);
-                        if (!m_main.Dispatcher.Invoke (() => ShowErrorDialog (error_text)))
+                        var result = m_main.Dispatcher.Invoke (() => m_main.ShowErrorDialog (guiStrings.TextExtractionError, error_text, m_progress_dialog.GetWindowHandle()));
+                        if (!result.Continue)
                             break;
+                        m_ignore_errors = result.IgnoreErrors;
                     }
                     ++m_skip_count;
                 }
@@ -411,31 +413,6 @@ namespace GARbro.GUI
             throw new IOException ("File aready exists");
         }
 
-        bool ShowErrorDialog (string error_text)
-        {
-            var dialog = new FileErrorDialog (guiStrings.TextExtractionError, error_text);
-            var progress_dialog_hwnd = m_progress_dialog.GetWindowHandle(); 
-            if (progress_dialog_hwnd != IntPtr.Zero)
-            {
-                var native_dialog = new WindowInteropHelper (dialog);
-                native_dialog.Owner = progress_dialog_hwnd;
-                NativeMethods.EnableWindow (progress_dialog_hwnd, false);
-                EventHandler on_closed = null;
-                on_closed = (s, e) => {
-                    NativeMethods.EnableWindow (progress_dialog_hwnd, true);
-                    dialog.Closed -= on_closed;
-                };
-                dialog.Closed += on_closed;
-            }
-            else
-            {
-                dialog.Owner = m_main;
-            }
-            bool dialog_result = dialog.ShowDialog() ?? false;
-            m_ignore_errors = dialog.IgnoreErrors.IsChecked ?? false;
-            return dialog_result;
-        }
-
         void OnExtractComplete (object sender, RunWorkerCompletedEventArgs e)
         {
             m_extract_in_progress = false;
diff --git a/GUI/MainWindow.xaml.cs b/GUI/MainWindow.xaml.cs
index 6adab05c..3d45960e 100644
--- a/GUI/MainWindow.xaml.cs
+++ b/GUI/MainWindow.xaml.cs
@@ -1,6 +1,6 @@
 // Game Resource Browser
 //
-// Copyright (C) 2014-2015 by morkt
+// Copyright (C) 2014-2017 by morkt
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to
@@ -35,6 +35,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Input;
+using System.Windows.Interop;
 using System.Windows.Threading;
 using Microsoft.VisualBasic.FileIO;
 using GARbro.GUI.Properties;
@@ -195,6 +196,40 @@ namespace GARbro.GUI
             Dispatcher.Invoke (() => MessageBox.Show (this, message, title, MessageBoxButton.OK, MessageBoxImage.Error));
         }
 
+        internal FileErrorDialogResult ShowErrorDialog (string error_title, string error_text, IntPtr parent_hwnd)
+        {
+            var dialog = new FileErrorDialog (error_title, error_text);
+            SetModalWindowParent (dialog, parent_hwnd);
+            return dialog.ShowDialog();
+        }
+
+        internal FileExistsDialogResult ShowFileExistsDialog (string title, string text, IntPtr parent_hwnd)
+        {
+            var dialog = new FileExistsDialog (title, text);
+            SetModalWindowParent (dialog, parent_hwnd);
+            return dialog.ShowDialog();
+        }
+
+        private void SetModalWindowParent (Window dialog, IntPtr parent_hwnd)
+        {
+            if (parent_hwnd != IntPtr.Zero)
+            {
+                var native_dialog = new WindowInteropHelper (dialog);
+                native_dialog.Owner = parent_hwnd;
+                NativeMethods.EnableWindow (parent_hwnd, false);
+                EventHandler on_closed = null;
+                on_closed = (s, e) => {
+                    NativeMethods.EnableWindow (parent_hwnd, true);
+                    dialog.Closed -= on_closed;
+                };
+                dialog.Closed += on_closed;
+            }
+            else
+            {
+                dialog.Owner = this;
+            }
+        }
+
         const int MaxRecentFiles = 9;
         LinkedList<string> m_recent_files;
 
diff --git a/GUI/Strings/guiStrings.Designer.cs b/GUI/Strings/guiStrings.Designer.cs
index b03f1416..cd3ff941 100644
--- a/GUI/Strings/guiStrings.Designer.cs
+++ b/GUI/Strings/guiStrings.Designer.cs
@@ -114,6 +114,33 @@ namespace GARbro.GUI.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to _Overwrite.
+        /// </summary>
+        public static string ButtonOverwrite {
+            get {
+                return ResourceManager.GetString("ButtonOverwrite", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to _Rename.
+        /// </summary>
+        public static string ButtonRename {
+            get {
+                return ResourceManager.GetString("ButtonRename", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to _Skip.
+        /// </summary>
+        public static string ButtonSkip {
+            get {
+                return ResourceManager.GetString("ButtonSkip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to _Close.
         /// </summary>
@@ -312,6 +339,15 @@ namespace GARbro.GUI.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to A_pply to all duplicate files.
+        /// </summary>
+        public static string LabelApplyToAll {
+            get {
+                return ResourceManager.GetString("LabelApplyToAll", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Archive format.
         /// </summary>
@@ -366,6 +402,15 @@ namespace GARbro.GUI.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to What should be done?.
+        /// </summary>
+        public static string LabelDuplicateFileQuestion {
+            get {
+                return ResourceManager.GetString("LabelDuplicateFileQuestion", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Encoding.
         /// </summary>
@@ -963,6 +1008,17 @@ namespace GARbro.GUI.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Error occured while converting file
+        ///{0}
+        ///{1}.
+        /// </summary>
+        public static string TextErrorConverting {
+            get {
+                return ResourceManager.GetString("TextErrorConverting", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Error occured while extracting file
         ///{0}
diff --git a/GUI/Strings/guiStrings.ko-KR.resx b/GUI/Strings/guiStrings.ko-KR.resx
index b3009ef5..7047b2fb 100644
--- a/GUI/Strings/guiStrings.ko-KR.resx
+++ b/GUI/Strings/guiStrings.ko-KR.resx
@@ -474,4 +474,30 @@
     <value>File extraction error</value>
     <comment>translation pending</comment>
   </data>
+  <data name="ButtonOverwrite" xml:space="preserve">
+    <value>Overwrite</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="ButtonRename" xml:space="preserve">
+    <value>Rename</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="ButtonSkip" xml:space="preserve">
+    <value>Skip</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="LabelApplyToAll" xml:space="preserve">
+    <value>Apply to all duplicate files</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="LabelDuplicateFileQuestion" xml:space="preserve">
+    <value>What should be done?</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="TextErrorConverting" xml:space="preserve">
+    <value>Error occured while converting file
+{0}
+{1}</value>
+    <comment>translation pending</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/GUI/Strings/guiStrings.resx b/GUI/Strings/guiStrings.resx
index f08e7fab..59310985 100644
--- a/GUI/Strings/guiStrings.resx
+++ b/GUI/Strings/guiStrings.resx
@@ -474,4 +474,24 @@ Overwrite?</value>
   <data name="TextExtractionError" xml:space="preserve">
     <value>File extraction error</value>
   </data>
+  <data name="ButtonOverwrite" xml:space="preserve">
+    <value>_Overwrite</value>
+  </data>
+  <data name="ButtonRename" xml:space="preserve">
+    <value>_Rename</value>
+  </data>
+  <data name="ButtonSkip" xml:space="preserve">
+    <value>_Skip</value>
+  </data>
+  <data name="LabelApplyToAll" xml:space="preserve">
+    <value>A_pply to all duplicate files</value>
+  </data>
+  <data name="LabelDuplicateFileQuestion" xml:space="preserve">
+    <value>What should be done?</value>
+  </data>
+  <data name="TextErrorConverting" xml:space="preserve">
+    <value>Error occured while converting file
+{0}
+{1}</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/GUI/Strings/guiStrings.ru-RU.resx b/GUI/Strings/guiStrings.ru-RU.resx
index 83b3bed3..5103adff 100644
--- a/GUI/Strings/guiStrings.ru-RU.resx
+++ b/GUI/Strings/guiStrings.ru-RU.resx
@@ -495,4 +495,24 @@
   <data name="TextExtractionError" xml:space="preserve">
     <value>Ошибка извлечения файла</value>
   </data>
+  <data name="ButtonOverwrite" xml:space="preserve">
+    <value>Заменить</value>
+  </data>
+  <data name="ButtonRename" xml:space="preserve">
+    <value>Переименовать</value>
+  </data>
+  <data name="ButtonSkip" xml:space="preserve">
+    <value>Пропустить</value>
+  </data>
+  <data name="LabelApplyToAll" xml:space="preserve">
+    <value>Применить ко всем совпадающим файлам</value>
+  </data>
+  <data name="LabelDuplicateFileQuestion" xml:space="preserve">
+    <value>Что делать?</value>
+  </data>
+  <data name="TextErrorConverting" xml:space="preserve">
+    <value>Не удадось конвертировать файл
+{0}
+{1}</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/GUI/Strings/guiStrings.zh-Hans.resx b/GUI/Strings/guiStrings.zh-Hans.resx
index beefb52d..7f6e2c00 100644
--- a/GUI/Strings/guiStrings.zh-Hans.resx
+++ b/GUI/Strings/guiStrings.zh-Hans.resx
@@ -476,4 +476,30 @@
     <value>File extraction error</value>
     <comment>translation pending</comment>
   </data>
+  <data name="ButtonOverwrite" xml:space="preserve">
+    <value>Overwrite</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="ButtonRename" xml:space="preserve">
+    <value>Rename</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="ButtonSkip" xml:space="preserve">
+    <value>Skip</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="LabelApplyToAll" xml:space="preserve">
+    <value>Apply to all duplicate files</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="LabelDuplicateFileQuestion" xml:space="preserve">
+    <value>What should be done?</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="TextErrorConverting" xml:space="preserve">
+    <value>Error occured while converting file
+{0}
+{1}</value>
+    <comment>translation pending</comment>
+  </data>
 </root>
\ No newline at end of file

From aedd41fde449367afe9446152e82bf5251ed2f4e Mon Sep 17 00:00:00 2001
From: morkt <muvluv.ru@gmail.com>
Date: Fri, 3 Feb 2017 21:56:04 +0400
Subject: [PATCH 07/10] implemented duplicate file actions dialog.

---
 GUI/FileErrorDialog.xaml            |  18 +++--
 GUI/FileExistsDialog.xaml           |  24 +++---
 GUI/GARbro.GUI.csproj               |   7 ++
 GUI/GarConvert.cs                   |  52 +++++--------
 GUI/GarCreate.cs                    |   8 +-
 GUI/GarExtract.cs                   |  61 +++++++--------
 GUI/GarOperation.cs                 | 115 ++++++++++++++++++++++++++++
 GUI/Images/64x64/actions.png        | Bin 0 -> 8854 bytes
 GUI/Images/64x64/alert.png          | Bin 0 -> 3776 bytes
 GUI/Strings/guiStrings.Designer.cs  |   9 +++
 GUI/Strings/guiStrings.ko-KR.resx   |   4 +
 GUI/Strings/guiStrings.resx         |   3 +
 GUI/Strings/guiStrings.ru-RU.resx   |   3 +
 GUI/Strings/guiStrings.zh-Hans.resx |   3 +
 14 files changed, 216 insertions(+), 91 deletions(-)
 create mode 100644 GUI/GarOperation.cs
 create mode 100644 GUI/Images/64x64/actions.png
 create mode 100644 GUI/Images/64x64/alert.png

diff --git a/GUI/FileErrorDialog.xaml b/GUI/FileErrorDialog.xaml
index bed67536..58830ee1 100644
--- a/GUI/FileErrorDialog.xaml
+++ b/GUI/FileErrorDialog.xaml
@@ -6,13 +6,17 @@
                Title="{Binding Title}" ShowInTaskbar="False" WindowStartupLocation="CenterOwner"
                ResizeMode="NoResize" SizeToContent="WidthAndHeight" ShowActivated="True"
                Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}">
-    <StackPanel Orientation="Vertical">
-        <TextBox x:Name="ErrorText" Text="{Binding Text}" IsReadOnly="True" Background="Transparent" BorderThickness="0" Margin="10"/>
-        <Separator/>
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
-            <CheckBox x:Name="IgnoreErrors" Content="{x:Static s:guiStrings.LabelIgnoreErrors}" Margin="10" VerticalAlignment="Center"/>
-            <Button Content="{x:Static s:guiStrings.ButtonContinue}" Margin="10" Width="75" Height="25" IsDefault="True" Click="ContinueButton_Click"/>
-            <Button Content="{x:Static s:guiStrings.ButtonAbort}" Margin="10" Width="75" Height="25" IsCancel="True" Click="AbortButton_Click"/>
+    <StackPanel Orientation="Horizontal">
+        <Image Source="Images/64x64/alert.png" Width="64" Height="64" Margin="10"
+               SnapsToDevicePixels="True" VerticalAlignment="Top" RenderOptions.BitmapScalingMode="HighQuality"/>
+        <StackPanel Orientation="Vertical">
+            <TextBox x:Name="ErrorText" Text="{Binding Text}" IsReadOnly="True" Background="Transparent" BorderThickness="0" Margin="0,10,10,10"/>
+            <Separator/>
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
+                <CheckBox x:Name="IgnoreErrors" Content="{x:Static s:guiStrings.LabelIgnoreErrors}" Margin="0,10,10,10" VerticalAlignment="Center"/>
+                <Button Content="{x:Static s:guiStrings.ButtonContinue}" Margin="10" MinWidth="75" Height="25" IsDefault="True" Click="ContinueButton_Click"/>
+                <Button Content="{x:Static s:guiStrings.ButtonAbort}" Margin="10" MinWidth="75" Height="25" IsCancel="True" Click="AbortButton_Click"/>
+            </StackPanel>
         </StackPanel>
     </StackPanel>
     <Window.InputBindings>
diff --git a/GUI/FileExistsDialog.xaml b/GUI/FileExistsDialog.xaml
index bb1c2689..d9ea71d6 100644
--- a/GUI/FileExistsDialog.xaml
+++ b/GUI/FileExistsDialog.xaml
@@ -6,16 +6,20 @@
                Title="File already exists" ShowInTaskbar="False" WindowStartupLocation="CenterOwner"
                ResizeMode="NoResize" SizeToContent="WidthAndHeight" ShowActivated="True"
                Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}">
-    <StackPanel Orientation="Vertical">
-        <TextBlock x:Name="Notice" Text="File named {0} already exists in destination folder." Margin="10"/>
-        <TextBlock Text="{x:Static s:guiStrings.LabelDuplicateFileQuestion}" Margin="10"/>
-        <Separator/>
-        <CheckBox x:Name="ApplyToAll" Content="{x:Static s:guiStrings.LabelApplyToAll}" Margin="10"/>
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
-            <Button Content="{x:Static s:guiStrings.ButtonSkip}" Margin="10" Width="75" Height="25" IsDefault="True" Click="SkipButton_Click"/>
-            <Button Content="{x:Static s:guiStrings.ButtonOverwrite}" Margin="10" Width="75" Height="25" Click="OverwriteButton_Click"/>
-            <Button Content="{x:Static s:guiStrings.ButtonRename}" Margin="10" Width="75" Height="25" Click="RenameButton_Click"/>
-            <Button Content="{x:Static s:guiStrings.ButtonAbort}" Margin="10" Width="75" Height="25" IsCancel="True" Click="AbortButton_Click"/>
+    <StackPanel Orientation="Horizontal">
+        <Image Source="Images/64x64/actions.png" Width="64" Height="64" Margin="10"
+               SnapsToDevicePixels="True" VerticalAlignment="Top" RenderOptions.BitmapScalingMode="HighQuality"/>
+        <StackPanel Orientation="Vertical">
+            <TextBlock x:Name="Notice" Text="File named {0} already exists in destination folder." Margin="0,10,10,10"/>
+            <TextBlock Text="{x:Static s:guiStrings.LabelDuplicateFileQuestion}" Margin="0,0,10,10"/>
+            <Separator/>
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
+                <Button Content="{x:Static s:guiStrings.ButtonSkip}" Margin="0,10,10,10" MinWidth="75" Height="25" IsDefault="True" Click="SkipButton_Click"/>
+                <Button Content="{x:Static s:guiStrings.ButtonOverwrite}" Margin="10" MinWidth="75" Height="25" Click="OverwriteButton_Click"/>
+                <Button Content="{x:Static s:guiStrings.ButtonRename}" Margin="10" MinWidth="75" Height="25" Click="RenameButton_Click"/>
+                <Button Content="{x:Static s:guiStrings.ButtonAbort}" Margin="10" MinWidth="75" Height="25" IsCancel="True" Click="AbortButton_Click"/>
+            </StackPanel>
+            <CheckBox x:Name="ApplyToAll" Content="{x:Static s:guiStrings.LabelApplyToAll}" Margin="0,10,10,10"/>
         </StackPanel>
     </StackPanel>
 </w:ModalWindow>
diff --git a/GUI/GARbro.GUI.csproj b/GUI/GARbro.GUI.csproj
index 1a19b592..aff20539 100644
--- a/GUI/GARbro.GUI.csproj
+++ b/GUI/GARbro.GUI.csproj
@@ -153,6 +153,7 @@
     <Compile Include="GarConvert.cs" />
     <Compile Include="GarCreate.cs" />
     <Compile Include="GarExtract.cs" />
+    <Compile Include="GarOperation.cs" />
     <Compile Include="HistoryStack.cs" />
     <Compile Include="ImagePreview.cs" />
     <Compile Include="ListViewEx.cs" />
@@ -299,6 +300,12 @@
   <ItemGroup>
     <Resource Include="Images\Cursors\grabbing.cur" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\64x64\actions.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\64x64\alert.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>perl "$(SolutionDir)inc-revision.pl" "$(ProjectPath)" $(ConfigurationName) "$(SolutionDir)\"
diff --git a/GUI/GarConvert.cs b/GUI/GarConvert.cs
index 57365053..1b5bb240 100644
--- a/GUI/GarConvert.cs
+++ b/GUI/GarConvert.cs
@@ -106,21 +106,17 @@ namespace GARbro.GUI
         }
     }
 
-    internal class GarConvertMedia
+    internal class GarConvertMedia : GarOperation
     {
-        private MainWindow      m_main;
-        private ProgressDialog  m_progress_dialog;
         private IEnumerable<Entry> m_source;
         private ImageFormat     m_image_format;
-        private Exception       m_pending_error;
         private List<Tuple<string,string>> m_failed = new List<Tuple<string,string>>();
 
         public bool IgnoreErrors { get; set; }
         public IEnumerable<Tuple<string,string>> FailedFiles { get { return m_failed; } }
 
-        public GarConvertMedia (MainWindow parent)
+        public GarConvertMedia (MainWindow parent) : base (parent, guiStrings.TextMediaConvertError)
         {
-            m_main = parent;
         }
 
         public void Convert (IEnumerable<Entry> images, ImageFormat format)
@@ -163,12 +159,21 @@ namespace GARbro.GUI
                     else if ("audio" == entry.Type)
                         ConvertAudio (filename);
                 }
+                catch (SkipExistingFileException)
+                {
+                    continue;
+                }
+                catch (OperationCanceledException X)
+                {
+                    m_pending_error = X;
+                    break;
+                }
                 catch (Exception X)
                 {
                     if (!IgnoreErrors)
                     {
                         var error_text = string.Format (guiStrings.TextErrorConverting, entry.Name, X.Message);
-                        var result = m_main.Dispatcher.Invoke (() => m_main.ShowErrorDialog (guiStrings.TextMediaConvertError, error_text, m_progress_dialog.GetWindowHandle()));
+                        var result = ShowErrorDialog (error_text);
                         if (!result.Continue)
                             break;
                         IgnoreErrors = result.IgnoreErrors;
@@ -227,41 +232,20 @@ namespace GARbro.GUI
                     return;
                 file.Position = 0;
                 var image = src_format.Item1.Read (file, src_format.Item2);
+                var output = CreateNewFile (target_name);
                 try
                 {
-                    using (var output = CreateNewFile (target_name))
-                        m_image_format.Write (output, image);
+                    m_image_format.Write (output, image);
                 }
                 catch // delete destination file on conversion failure
                 {
+                    // FIXME if user chooses to overwrite file, and conversion results in error,
+                    // then original file will be lost.
+                    output.Dispose();
                     File.Delete (target_name);
                     throw;
                 }
-            }
-        }
-
-        /// <summary>
-        /// Creates new file with specified filename, or, if it's already exists, tries to open
-        /// files named "FILENAME.1.EXT", "FILENAME.2.EXT" and so on.
-        /// <exception cref="System.IOException">Throws exception after 100th failed attempt.</exception>
-        /// </summary>
-
-        public static Stream CreateNewFile (string filename)
-        {
-            string name = filename;
-            var ext = new Lazy<string> (() => Path.GetExtension (filename));
-            for (int attempt = 1; ; ++attempt)
-            {
-                try
-                {
-                    return File.Open (name, FileMode.CreateNew);
-                }
-                catch (IOException) // file already exists
-                {
-                    if (100 == attempt) // limit number of attempts
-                        throw;
-                }
-                name = Path.ChangeExtension (filename, attempt.ToString()+ext.Value);
+                output.Dispose();
             }
         }
 
diff --git a/GUI/GarCreate.cs b/GUI/GarCreate.cs
index 8db66518..93ff242e 100644
--- a/GUI/GarCreate.cs
+++ b/GUI/GarCreate.cs
@@ -56,21 +56,17 @@ namespace GARbro.GUI
         }
     }
 
-    internal class GarCreate
+    internal class GarCreate : GarOperation
     {
-        private MainWindow      m_main;
         private string          m_arc_name;
         private IList<Entry>    m_file_list;
-        private ProgressDialog  m_progress_dialog;
         private ArchiveFormat   m_format;
         private ResourceOptions m_options;
-        private Exception       m_pending_error;
 
         delegate void AddFilesEnumerator (IList<Entry> list, string path, DirectoryInfo path_info);
 
-        public GarCreate (MainWindow parent)
+        public GarCreate (MainWindow parent) : base (parent, guiStrings.TextCreateArchiveError)
         {
-            m_main = parent;
             m_arc_name = Settings.Default.appLastCreatedArchive;
         }
 
diff --git a/GUI/GarExtract.cs b/GUI/GarExtract.cs
index be378361..def69d32 100644
--- a/GUI/GarExtract.cs
+++ b/GUI/GarExtract.cs
@@ -102,9 +102,8 @@ namespace GARbro.GUI
         }
     }
 
-    sealed internal class GarExtract : IDisposable
+    sealed internal class GarExtract : GarOperation, IDisposable
     {
-        private MainWindow          m_main;
         private string              m_arc_name;
         private ArchiveFileSystem   m_fs;
         private readonly bool       m_should_ascend;
@@ -113,16 +112,14 @@ namespace GARbro.GUI
         private bool                m_skip_audio  = false;
         private bool                m_adjust_image_offset = false;
         private bool                m_convert_audio;
-        private bool                m_ignore_errors;
         private ImageFormat         m_image_format;
         private int                 m_extract_count;
         private int                 m_skip_count;
         private bool                m_extract_in_progress = false;
-        private ProgressDialog      m_progress_dialog;
 
         public bool IsActive { get { return m_extract_in_progress; } }
 
-        public GarExtract (MainWindow parent, string source)
+        public GarExtract (MainWindow parent, string source) : base (parent, guiStrings.TextExtractionError)
         {
             m_arc_name = Path.GetFileName (source);
             try
@@ -135,15 +132,13 @@ namespace GARbro.GUI
                 throw new OperationCanceledException (string.Format ("{1}: {0}", X.Message, m_arc_name));
             }
             m_fs = VFS.Top as ArchiveFileSystem;
-            m_main = parent;
         }
 
-        public GarExtract (MainWindow parent, string source, ArchiveFileSystem fs)
+        public GarExtract (MainWindow parent, string source, ArchiveFileSystem fs) : base (parent, guiStrings.TextExtractionError)
         {
             if (null == fs)
                 throw new UnknownFormatException();
             m_fs = fs;
-            m_main = parent;
             m_arc_name = Path.GetFileName (source);
             m_should_ascend = false;
         }
@@ -282,7 +277,7 @@ namespace GARbro.GUI
             var arc = m_fs.Source;
             int total = file_list.Count();
             int progress_count = 0;
-            m_ignore_errors = false;
+            bool ignore_errors = false;
             foreach (var entry in file_list)
             {
                 if (m_progress_dialog.CancellationPending)
@@ -299,15 +294,24 @@ namespace GARbro.GUI
                         arc.Extract (entry);
                     ++m_extract_count;
                 }
+                catch (SkipExistingFileException)
+                {
+                    ++m_skip_count;
+                    continue;
+                }
+                catch (OperationCanceledException)
+                {
+                    break;
+                }
                 catch (Exception X)
                 {
-                    if (!m_ignore_errors)
+                    if (!ignore_errors)
                     {
                         var error_text = string.Format (guiStrings.TextErrorExtracting, entry.Name, X.Message);
-                        var result = m_main.Dispatcher.Invoke (() => m_main.ShowErrorDialog (guiStrings.TextExtractionError, error_text, m_progress_dialog.GetWindowHandle()));
+                        var result = ShowErrorDialog (error_text);
                         if (!result.Continue)
                             break;
-                        m_ignore_errors = result.IgnoreErrors;
+                        ignore_errors = result.IgnoreErrors;
                     }
                     ++m_skip_count;
                 }
@@ -320,11 +324,12 @@ namespace GARbro.GUI
             {
                 var src_format = decoder.SourceFormat; // could be null
                 string target_ext = target_format.Extensions.FirstOrDefault() ?? "";
-                string outname = FindUniqueFileName (entry.Name, target_ext);
+                string outname = Path.ChangeExtension (entry.Name, target_ext);
+                outname = ArchiveFormat.CreatePath (outname);
                 if (src_format == target_format)
                 {
                     // source format is the same as a target, copy file as is
-                    using (var output = ArchiveFormat.CreateFile (outname))
+                    using (var output = CreateNewFile (outname))
                         decoder.Source.CopyTo (output);
                     return;
                 }
@@ -333,7 +338,7 @@ namespace GARbro.GUI
                 {
                     image = AdjustImageOffset (image);
                 }
-                using (var outfile = ArchiveFormat.CreateFile (outname))
+                using (var outfile = CreateNewFile (outname))
                 {
                     target_format.Write (outfile, image);
                 }
@@ -369,7 +374,7 @@ namespace GARbro.GUI
             return new ImageData (bitmap);
         }
 
-        static void ExtractAudio (ArcFile arc, Entry entry)
+        void ExtractAudio (ArcFile arc, Entry entry)
         {
             using (var file = arc.OpenBinaryEntry (entry))
             using (var sound = AudioFormat.Read (file))
@@ -380,13 +385,14 @@ namespace GARbro.GUI
             }
         }
 
-        public static void ConvertAudio (string entry_name, SoundInput input)
+        public void ConvertAudio (string filename, SoundInput input)
         {
+            filename = ArchiveFormat.CreatePath (filename);
             string source_format = input.SourceFormat;
             if (GarConvertMedia.CommonAudioFormats.Contains (source_format))
             {
-                string output_name = FindUniqueFileName (entry_name, source_format);
-                using (var output = ArchiveFormat.CreateFile (output_name))
+                var output_name = Path.ChangeExtension (filename, source_format);
+                using (var output = CreateNewFile (output_name))
                 {
                     input.Source.Position = 0;
                     input.Source.CopyTo (output);
@@ -394,25 +400,12 @@ namespace GARbro.GUI
             }
             else
             {
-                string output_name = FindUniqueFileName (entry_name, "wav");
-                using (var output = ArchiveFormat.CreateFile (output_name))
+                var output_name = Path.ChangeExtension (filename, "wav");
+                using (var output = CreateNewFile (output_name))
                     AudioFormat.Wav.Write (input, output);
             }
         }
 
-        public static string FindUniqueFileName (string source_filename, string target_ext)
-        {
-            string ext = target_ext;
-            for (int attempt = 1; attempt < 100; ++attempt)
-            {
-                string filename = Path.ChangeExtension (source_filename, ext);
-                if (!File.Exists (filename))
-                    return filename;
-                ext = string.Format ("{0}.{1}", attempt, target_ext);
-            }
-            throw new IOException ("File aready exists");
-        }
-
         void OnExtractComplete (object sender, RunWorkerCompletedEventArgs e)
         {
             m_extract_in_progress = false;
diff --git a/GUI/GarOperation.cs b/GUI/GarOperation.cs
new file mode 100644
index 00000000..ddc57dbe
--- /dev/null
+++ b/GUI/GarOperation.cs
@@ -0,0 +1,115 @@
+//! \file       GarOperation.cs
+//! \date       Fri Feb 03 19:06:52 2017
+//! \brief      Base class for GARbro file operation.
+//
+// Copyright (C) 2017 by morkt
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//
+
+using System;
+using System.IO;
+using GARbro.GUI.Strings;
+
+namespace GARbro.GUI
+{
+    internal class GarOperation
+    {
+        internal MainWindow             m_main;
+        internal ProgressDialog         m_progress_dialog;
+        internal Exception              m_pending_error;
+        internal FileExistsDialogResult m_duplicate_action;
+        internal string                 m_title;
+
+        const int MaxRenameAttempts = 100;
+
+        protected GarOperation (MainWindow parent, string dialog_title)
+        {
+            m_main = parent;
+            m_title = dialog_title;
+        }
+
+        protected Stream CreateNewFile (string filename)
+        {
+            FileMode open_mode = FileMode.CreateNew;
+            if (m_duplicate_action.ApplyToAll &&
+                m_duplicate_action.Action == ExistingFileAction.Overwrite)
+                open_mode = FileMode.Create;
+            try
+            {
+                return File.Open (filename, open_mode);
+            }
+            catch (IOException) // file already exists?
+            {
+                if (!File.Exists (filename) || FileMode.Create == open_mode) // some unforseen I/O error, give up
+                    throw;
+            }
+            if (!m_duplicate_action.ApplyToAll)
+            {
+                var msg_text = string.Format (guiStrings.TextFileAlreadyExists, Path.GetFileName (filename));
+                m_duplicate_action = m_main.Dispatcher.Invoke (() => m_main.ShowFileExistsDialog (m_title, msg_text, m_progress_dialog.GetWindowHandle()));
+            }
+            switch (m_duplicate_action.Action)
+            {
+            default:
+            case ExistingFileAction.Abort:
+                throw new OperationCanceledException();
+            case ExistingFileAction.Skip:
+                throw new SkipExistingFileException();
+            case ExistingFileAction.Rename:
+                return CreateRenamedFile (filename);
+            case ExistingFileAction.Overwrite:
+                return File.Open (filename, FileMode.Create);
+            }
+        }
+
+        /// <summary>
+        /// Creates new file with specified filename, or, if it's already exists, tries to open
+        /// files named "FILENAME.1.EXT", "FILENAME.2.EXT" and so on.
+        /// <exception cref="System.IOException">Throws exception after 100th failed attempt.</exception>
+        /// </summary>
+
+        public static Stream CreateRenamedFile (string filename)
+        {
+            var ext = Path.GetExtension (filename);
+            for (int attempt = 1; ; ++attempt)
+            {
+                var name = Path.ChangeExtension (filename, attempt.ToString()+ext);
+                try
+                {
+                    return File.Open (name, FileMode.CreateNew);
+                }
+                catch (IOException) // file already exists
+                {
+                    if (MaxRenameAttempts == attempt) // limit number of attempts
+                        throw;
+                }
+            }
+        }
+
+        protected FileErrorDialogResult ShowErrorDialog (string error_text)
+        {
+            return m_main.Dispatcher.Invoke (() => m_main.ShowErrorDialog (m_title, error_text, m_progress_dialog.GetWindowHandle()));
+        }
+    }
+
+    internal class SkipExistingFileException : ApplicationException
+    {
+    }
+}
diff --git a/GUI/Images/64x64/actions.png b/GUI/Images/64x64/actions.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b26a1397639c6cf093f2ae5058a0b2593b1e90e
GIT binary patch
literal 8854
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
Y2ZYF^fUj53fdBvi07*qoM6N<$f-)>)RR910

literal 0
HcmV?d00001

diff --git a/GUI/Images/64x64/alert.png b/GUI/Images/64x64/alert.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a0ce795df0e8194d6d65fcb6202f922d1048b2f
GIT binary patch
literal 3776
zcmV;x4nOgUP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU=Qb|NXRCwCt
zTM3XA#Tov4j`#MxU3M2%SXg$K8x^xC9w-VbMC3A<i(nyzYpGkcmL@4uNl|4?l?hc=
zu&gAN3aGJiSQ?EcrDzfbjS)pm5D$V8MI_24%dz*{x9`1~?)-nx)id)J2`=}m?dqAH
zo}T`{|L*Q(;_W$bCjSf&aE1eL;t;67G8M~UEbFmsKM|8)LL6TJ#9Om9tX5%ZiadH5
zOEbIZg>A=kKH71IT)@*<n&hX;Cj(T?L^&Kt?K7~vD>ls@f7(ib*feW7R(C<73fMTj
zG^??ZBNjS{ohtzjy-3~OU>C2s{Irt*@#d`I$l+!(Ic&uD04%&{--6{mfX<JA4Zj&6
zHJT)03ikcc=?8!i%drfCfztr=DuCYot_(5&I}4E61yHku`cb)sZ@jkRv;lx`oQc+6
zGy>Cs4gD5C?jU{{9S}3IHl3PVz!EjUDlZ|p>aqO%^pOC8dQYNX{dFYNwK>dCK%iPj
zVA_Dy+~j%ZM*gpvlTUd7_&={%gfcywEIk`M7j?heAyyJ?glj@cXuyVig>;6>U8g(%
zsLywhUbC7Tki)G`+{HBK(`fx2;&tbq+6!F>z;z(>GJ1Eu{l=FUow5Mf8)n>#R7_#%
z(ZDKDnynrrQp&$${3OvH@yuxlbc^{;&}x@>QqXit0$^{Lj#gYOB9^myq#?W46>)HD
z;Seiqw-&*3E8_r`s;9QAaI9sg8~{kq&#}})<)z5vawMwP33?>4Zq1Q+VL7$hPN4Mc
z0j;jl6#{6sUY}lZ$^c-kzj`Xpx)B||Bg)x5BohvSL>v`#dk*nx?LMP^7#px8xy8wZ
zKs}cGPnl5IdhM#!Sk2dJZvd_QBFFeCE-#lC@bRt|Ab_OW%PH6}rmh;23Fd-PkTyZ2
ztHJ*Fovw7iL}S{zE&ZGh_wTRp>Xl@*=Yuf-w5sVC=6)CmnnuJiXzj?t4NdpN-d*#=
zeK4#l6-WdHM};1YALau8>^bT}xy1D+w+f)!Bc;{rQS`e%LB{4Bf+SJIRSV2y(hGS*
zr6iS-&t*U1N<n5f=+*O4SO(D8^9$>yEj(!fD7-TDF6s74$ADIL9*X_}g_{MxBohX3
z&SS+ea5_A%^riREcy{kVKo=hqx7cq0<o|I+1#+>8IH}d$2+;Pf!+pukLQrGdfV5du
z0tTeeM%ejqf2y<lKpQXtprnTS&A@LhJNYC)VDf_2S{rmJ4w^vjx5qdyiQ_q0CrmTM
zeY$tJpL6@E?_pc(X3$68>PtcX<;%-X8US*CpK<|mrcq#6tJk3oY}<^JREfw3#dd1L
z&_mo$Bom?ML2<{(w}PgX02_D-^&chr$u0Je1aNT=WqJD0xxhMi$ap?Rc%+n;rb7~t
zDoGx;zm$SQo4}}DfZ&oh5ly)lFKamA0OZzQO4*)tdq(w4fUa$>=;tG%pAU(6!Zac(
zV7N9T7m*f4it^pSvMr$3T<596@)Hh#XZVa!n8zP{(;<SQJ_>K69P|njnM{NYA>GIO
zsleHei)?=%C2baFi={GK>|HZ?-U$Ps_k~NA;ViCVso|ifM}o-g3_@8i?2Sr*drcx=
zR0U#v3*j+sbc+W!f>FQFlY*ru1c2=G7n9p-mfRn6D~OhLQuGB*R&XVz_hbJ;AmUgj
z5_(t#@Lqi$5FU&};|hu^x_5$6iRzEQlUu~OEIa-ZAjArCd-_>ZK%)uf4h5MVP1Ywo
zT05>W8L<I$?*~6c-V2R~(joS}0_ND;JSkXoTmi`bby5SeLq=p~{Q~6vYsj@iFliA?
zT8MC)Lqs0Zsjv;8dnxwf2*x0g&=_h6oJNu$cmvMq!Q%#i;9|KTw>KPP^o|eY3QloC
zZAEld)u3=#i`W3eiTsN7=kc)xN{eWD70l7JX257pO+C+D&~VHF=y~@1uaVnh<o1Tm
z1kw7Ao47>9)b`u`WC)9pcEUoD4+CK8LbeNTh5GyN^CIeyZwJ=(F~$bhAN3-tb`)+;
zE^->9G2Y+%5_+a=Xp$cH{K-dk+BJyjlCTj>lLXlLnDhh-C5nON0jPpJ!qBTRTTId1
z7G_pYoOjFs$UM_PZf}N`uEn@#G>ES4jwnVZ<#5_|xfxmgagAWQM2i5Rh5IP0L{e%Z
z<NIJ2G5~0U%+ZUF$}Ju-0Nqc2DMedW#C>!8ZNPUu=jQqWcZ!L>P+X%g88R2(kw6Gs
zBN*;4_~F#R1-oM_y2W#VA!Eob;#`~iUjjI0dt8jwt0seHbz{)8*L7PS(Sd#klZ{J&
zBN+uKji^9L0u*VAtP^s}2i3O|Tmi)D1^($XV2)Yr>^yPNzW{XqX+ndu5WyfZdLi)L
z&&z<taZy&x^7}wU#o50`H%Nh>ssc&oOF*&r0>Yzi(tVcM1-hn#KInW>g9e=QgZ&18
z5PUfnFh+b8^YV8<$Q>Tl@F`qTjGquio>7f4LrEgC9ESH!ETKw^<*N{cRKZflwf*Hb
z`_t8s7=IJ(M9`d@x}G{`)E5Sz>&dg{Nw<eqHc>MjI0Zd@89q^jSP|x+Lr`849997#
z+l8u1#l}(9EMyQZX9=!#Gnlp4dIs^{FAM;3XQ?!N<CY-8e|B<xq3EM(_&h!3ia#%^
z0%QXqBmw1V=14$MPY@k5_+FrfPGA1n%V5^c@!ewQAIHx-Y5+PPAGZ_@3c9^IFv~|_
z(6c3OfI@~(op>PrF+fNK3@aQ6Y05&Vu;TA>JNAvh&M0%qcY)aT7f6h|$uo%GIqH1@
zA$NBGlIPw6_V!1dRFr9`W6nMvBm9K3t1Fo1@A@)Ij_6vro1kt@A*-`-2vAvOz@&*a
z&dxASzOoFT+b#&8?jNc(cfReX+rf64Q11D`O<*=mhkVHp;Mta$9e)_xT(M~Ts{d<e
zsN=CQWJQ~dvo3^W{dBNDe3(p&Lm2JodIV!(l5nQ9IXl11+wt{xeq8``9oT>hU}p^h
zmP&)j_FzP}9|Nln1jh~lP>2`)W~u^!Y>$8;)f4*+7zuzOa(2^?X|OF7H-0?vhyiGS
zbkqc_{zHV8P5T+}EtvV{+QI}Y91q%=vem6@c`E=om-x&ufF%+V3?f?O(FIzT!(|Z%
z08{|L38GX9@UDG8@EgXtw?p=mHDDchn+CkEa`AtEaAW{HGV%$m7AD4g6HLt7?48fL
z+xmKlXcpnPcg;L$h;rXM8vtq@K1&mbe=!g|6%Y#HB22gf29#8RHeo4bUX#&r2kk9Z
zF8O5VVU1w>??;f^TS#s%IeaSE6!h3igvN`xJv$P#d`>VF%lP_u9tnc{cpz$Mi;N-L
zd-kJSd<)DGa|oykxrp<5UchsEi3vA@z2kB8t)0aeCt_~TjuWByZPmXEuwZ|e4XfWS
z$U@hCL>KML<70-Ct$2<gl!X_L!BKMLJl`$0{jPpSpI)Htw{;Xl&(O+hAyHln`E4uZ
z2c)%E#8EIZhFtLiTw*D$ytMw@u?MOb@KgYw|828?pFGtgx5=fKNiev3K^o>xWbP@l
z;wm5%Rq$)yCh&-AxE>+j0c^)(kUaZF=zZ@Y8ua_%oJ)>NfVaq5g4{2>|10-YhaC=f
zV!40u#3#ymPek{23Hafo9nhW0L!nTRg|4ZMo)rszLJK941WCBk5L$pyf+QItw`>4&
z&{*_1Lx{%Nt-q;ljsej6@bCu_{RU(3g`n|HOff%l2joh`6<wlICehca50x0?%u8GI
zkm<=m9<9DwsEwXcpIG2jG_+R07glTm)n^*b-|7K->q<y9G<(5OV+eplzpkm58yt9>
zI<FC|tq(b=sfaIc2YG!Ib<5|5h^`BGhaGejN!^YS?-hDReTqeupsW*$(2<((O0)=N
zi`>r`?e-5q6J3}so<~wJ8EL*ZkO09~Q0K(RSs*@J3!-<Q&;8IEKUWtetv;5%qsA|6
zsjr!A;C&u)xm>7F8$ENj#BD`=>>^24e92s>XN-7wFTvSR$suDOKq<Jzvky&&9vV7a
zzjN5Cvk`&^m{|&?lWqt5z5AVzH|m$26FdG9Fo<5$VaU)k<>(s(zPe(d2G!%zuy$QL
za^1!l$i`TR!-~6y!4)I$tuFkw9YlJe(_<i%&^LOrEPO5eHf0Q}8?^LbfK(mWZ6Bp1
zO$SyDMo8e{<hXBuY3~7h&svvIHIfTQcSQr8NX<e)5IEQLmo`DGNkI!UV9o0p8Trn=
zvJ|S3vwUwBeYfRK8iLyMK1HL$J_02*Y*yP613|y&r_l8ZIRn^;@+f4Ctd~>*-|?g)
zzLH1?$M61eE(XHAW}wFSZt)Tyc?|&w!W|=nc3@8dhLk5@$z_J~sIwb*C)%7WqG1bH
zwnQW;iX=!800cyd6)^y$RODKLwZ7?%ImtkSuv;c*ojX9IqpYqE7UbInbN#t+3Dguq
zg#^kYm<fgB{x!HU0QmR9MsT`md#Qj1&ubHs@ZkTqibz06y;Pz_AHeV;@q<%aEt}jn
z*lnOoSTFbacW!_bEzOGF5Jv?lA`K$WakZZZMwI&@Alz&29tA9x4~Sy9fhQMzOF`d(
zlTzcH^4%Hl*#3H%3?2C8AesCyGX<vJ0Xp<zKRc4hc-dUMEvD<L+AvR<qR9^n=R-mz
z7y@FWMz=4OPyi6c+Bid+O$@>ZqC=oF3~)dmy!0Z#yanY6(K9CpCT)2hi_^oObAQ+a
zt$k#VM|G-!nE$E9;JP8-Zrf+<|3xKKf4751U-8uKr5}zNtTj}Xu?Zz68wRJ*&*IS4
znHAf2wel@@Jl6BXwtf6Si>L&{H3qaV0}EDW=#1}bI5U2x+~aihsl}E1)EPoN8G*er
qc-wb>8Jx+#<Nm+HC)@9T0t^6vs3D-dr8M9G0000<MNUMnLSTYGN(Hk3

literal 0
HcmV?d00001

diff --git a/GUI/Strings/guiStrings.Designer.cs b/GUI/Strings/guiStrings.Designer.cs
index cd3ff941..6610230a 100644
--- a/GUI/Strings/guiStrings.Designer.cs
+++ b/GUI/Strings/guiStrings.Designer.cs
@@ -1075,6 +1075,15 @@ namespace GARbro.GUI.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to File {0} already exists in the destination folder..
+        /// </summary>
+        public static string TextFileAlreadyExists {
+            get {
+                return ResourceManager.GetString("TextFileAlreadyExists", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Multimedia conversion error.
         /// </summary>
diff --git a/GUI/Strings/guiStrings.ko-KR.resx b/GUI/Strings/guiStrings.ko-KR.resx
index 94028895..f66c85d4 100644
--- a/GUI/Strings/guiStrings.ko-KR.resx
+++ b/GUI/Strings/guiStrings.ko-KR.resx
@@ -496,4 +496,8 @@
 {1}</value>
     <comment>translation pending</comment>
   </data>
+  <data name="TextFileAlreadyExists" xml:space="preserve">
+    <value>File {0} already exists in the destination folder.</value>
+    <comment>translation pending</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/GUI/Strings/guiStrings.resx b/GUI/Strings/guiStrings.resx
index 59310985..8c89f810 100644
--- a/GUI/Strings/guiStrings.resx
+++ b/GUI/Strings/guiStrings.resx
@@ -494,4 +494,7 @@ Overwrite?</value>
 {0}
 {1}</value>
   </data>
+  <data name="TextFileAlreadyExists" xml:space="preserve">
+    <value>File {0} already exists in the destination folder.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/GUI/Strings/guiStrings.ru-RU.resx b/GUI/Strings/guiStrings.ru-RU.resx
index 5103adff..cb36b5fe 100644
--- a/GUI/Strings/guiStrings.ru-RU.resx
+++ b/GUI/Strings/guiStrings.ru-RU.resx
@@ -515,4 +515,7 @@
 {0}
 {1}</value>
   </data>
+  <data name="TextFileAlreadyExists" xml:space="preserve">
+    <value>Файл с именем {0} уже существует.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/GUI/Strings/guiStrings.zh-Hans.resx b/GUI/Strings/guiStrings.zh-Hans.resx
index 7f6e2c00..a602e8fc 100644
--- a/GUI/Strings/guiStrings.zh-Hans.resx
+++ b/GUI/Strings/guiStrings.zh-Hans.resx
@@ -502,4 +502,7 @@
 {1}</value>
     <comment>translation pending</comment>
   </data>
+  <data name="TextFileAlreadyExists" xml:space="preserve">
+    <value>文件{0}已经存在。</value>
+  </data>
 </root>
\ No newline at end of file

From 5e74d88ee6aaab587ac7503cece15a4849b49886 Mon Sep 17 00:00:00 2001
From: morkt <muvluv.ru@gmail.com>
Date: Fri, 3 Feb 2017 23:43:38 +0400
Subject: [PATCH 08/10] (GarExtract): fixed overwrite dialog for regular entry.

---
 GUI/GarExtract.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/GUI/GarExtract.cs b/GUI/GarExtract.cs
index def69d32..edc3d772 100644
--- a/GUI/GarExtract.cs
+++ b/GUI/GarExtract.cs
@@ -291,7 +291,7 @@ namespace GARbro.GUI
                     else if (m_convert_audio && entry.Type == "audio")
                         ExtractAudio (arc, entry);
                     else
-                        arc.Extract (entry);
+                        ExtractEntryAsIs (arc, entry);
                     ++m_extract_count;
                 }
                 catch (SkipExistingFileException)
@@ -318,6 +318,13 @@ namespace GARbro.GUI
             }
         }
 
+        void ExtractEntryAsIs (ArcFile arc, Entry entry)
+        {
+            using (var input = arc.OpenEntry (entry))
+            using (var output = CreateNewFile (entry.Name))
+                input.CopyTo (output);
+        }
+
         void ExtractImage (ArcFile arc, Entry entry, ImageFormat target_format)
         {
             using (var decoder = arc.OpenImage (entry))

From f486f19495aa0e70268d4790f941d23b54aa82ef Mon Sep 17 00:00:00 2001
From: morkt <muvluv.ru@gmail.com>
Date: Sat, 4 Feb 2017 13:26:51 +0400
Subject: [PATCH 09/10] (GarExtract): skip invalid entries.

---
 GUI/GarExtract.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/GUI/GarExtract.cs b/GUI/GarExtract.cs
index edc3d772..c4e2542c 100644
--- a/GUI/GarExtract.cs
+++ b/GUI/GarExtract.cs
@@ -240,6 +240,7 @@ namespace GARbro.GUI
 
         private void ExtractFilesFromArchive (string text, IEnumerable<Entry> file_list)
         {
+            file_list = file_list.Where (e => e.Offset >= 0);
             if (file_list.Skip (1).Any() // file_list.Count() > 1
                 && (m_skip_images || m_skip_script || m_skip_audio))
                 file_list = file_list.Where (f => !(m_skip_images && f.Type == "image") && 

From 5e6c8e40487959e4aaaafa4bec9a764e1db5fd5a Mon Sep 17 00:00:00 2001
From: morkt <muvluv.ru@gmail.com>
Date: Sun, 5 Feb 2017 01:38:54 +0400
Subject: [PATCH 10/10] (GarOperation): fixed path creation.

---
 GUI/GarExtract.cs   | 12 +++++-------
 GUI/GarOperation.cs |  9 ++++++++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/GUI/GarExtract.cs b/GUI/GarExtract.cs
index c4e2542c..0da4bcdd 100644
--- a/GUI/GarExtract.cs
+++ b/GUI/GarExtract.cs
@@ -322,7 +322,7 @@ namespace GARbro.GUI
         void ExtractEntryAsIs (ArcFile arc, Entry entry)
         {
             using (var input = arc.OpenEntry (entry))
-            using (var output = CreateNewFile (entry.Name))
+            using (var output = CreateNewFile (entry.Name, true))
                 input.CopyTo (output);
         }
 
@@ -333,11 +333,10 @@ namespace GARbro.GUI
                 var src_format = decoder.SourceFormat; // could be null
                 string target_ext = target_format.Extensions.FirstOrDefault() ?? "";
                 string outname = Path.ChangeExtension (entry.Name, target_ext);
-                outname = ArchiveFormat.CreatePath (outname);
                 if (src_format == target_format)
                 {
                     // source format is the same as a target, copy file as is
-                    using (var output = CreateNewFile (outname))
+                    using (var output = CreateNewFile (outname, true))
                         decoder.Source.CopyTo (output);
                     return;
                 }
@@ -346,7 +345,7 @@ namespace GARbro.GUI
                 {
                     image = AdjustImageOffset (image);
                 }
-                using (var outfile = CreateNewFile (outname))
+                using (var outfile = CreateNewFile (outname, true))
                 {
                     target_format.Write (outfile, image);
                 }
@@ -395,12 +394,11 @@ namespace GARbro.GUI
 
         public void ConvertAudio (string filename, SoundInput input)
         {
-            filename = ArchiveFormat.CreatePath (filename);
             string source_format = input.SourceFormat;
             if (GarConvertMedia.CommonAudioFormats.Contains (source_format))
             {
                 var output_name = Path.ChangeExtension (filename, source_format);
-                using (var output = CreateNewFile (output_name))
+                using (var output = CreateNewFile (output_name, true))
                 {
                     input.Source.Position = 0;
                     input.Source.CopyTo (output);
@@ -409,7 +407,7 @@ namespace GARbro.GUI
             else
             {
                 var output_name = Path.ChangeExtension (filename, "wav");
-                using (var output = CreateNewFile (output_name))
+                using (var output = CreateNewFile (output_name, true))
                     AudioFormat.Wav.Write (input, output);
             }
         }
diff --git a/GUI/GarOperation.cs b/GUI/GarOperation.cs
index ddc57dbe..c37d6d9d 100644
--- a/GUI/GarOperation.cs
+++ b/GUI/GarOperation.cs
@@ -45,8 +45,15 @@ namespace GARbro.GUI
             m_title = dialog_title;
         }
 
-        protected Stream CreateNewFile (string filename)
+        /// <summary>
+        /// Create file <paramref name="filename"/>.  Also create path to file if <paramref name="create_path"/> is true.
+        /// If file aready exists, popup dialog asking for necessary action.
+        /// WARNING: path to file should be relative, ArchiveFormat.CreatePath strips drive/root specification.
+        /// </summary>
+        protected Stream CreateNewFile (string filename, bool create_path = false)
         {
+            if (create_path)
+                filename = GameRes.ArchiveFormat.CreatePath (filename);
             FileMode open_mode = FileMode.CreateNew;
             if (m_duplicate_action.ApplyToAll &&
                 m_duplicate_action.Action == ExistingFileAction.Overwrite)