From 30e7a470d35f0c229336281ab1a60a721c8a59ed Mon Sep 17 00:00:00 2001
From: morkt <muvluv.ru@gmail.com>
Date: Sun, 14 Jun 2015 13:54:03 +0400
Subject: [PATCH] added "ignore errors" option to media conversion.

---
 App.config                      |  3 +++
 ConvertMedia.xaml               |  4 +++-
 GarConvert.cs                   |  2 +-
 Properties/AssemblyInfo.cs      |  4 ++--
 Properties/Settings.Designer.cs | 12 ++++++++++++
 Properties/Settings.settings    |  3 +++
 Strings/guiStrings.Designer.cs  | 11 ++++++++++-
 Strings/guiStrings.resx         |  5 ++++-
 Strings/guiStrings.ru-RU.resx   |  5 ++++-
 9 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/App.config b/App.config
index 3940edd0..34321363 100644
--- a/App.config
+++ b/App.config
@@ -85,6 +85,9 @@
             <setting name="appExtractAudio" serializeAs="String">
                 <value>True</value>
             </setting>
+            <setting name="appIgnoreConversionErrors" serializeAs="String">
+                <value>False</value>
+            </setting>
         </GARbro.GUI.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/ConvertMedia.xaml b/ConvertMedia.xaml
index a62d0ad6..4bbc7d8a 100644
--- a/ConvertMedia.xaml
+++ b/ConvertMedia.xaml
@@ -14,7 +14,9 @@
                       ItemsSource="{Binding Source={x:Static g:FormatCatalog.Instance}, Path=ImageFormats, Mode=OneWay}" SelectedValuePath="Tag"
                       SelectedValue="{Binding Source={x:Static p:Settings.Default}, Path=appLastImageFormat, Mode=TwoWay}"/>
         </StackPanel>
-        <TextBlock Text="{x:Static s:guiStrings.TextAudioConversion}" Margin="20,10"/>
+        <TextBlock Text="{x:Static s:guiStrings.TextAudioConversion}" Margin="20,10,20,0"/>
+        <CheckBox Name="IgnoreErrors" Content="{x:Static s:guiStrings.LabelSkipFailures}" Margin="20,10"
+                  IsChecked="{Binding Source={x:Static p:Settings.Default}, Path=appIgnoreConversionErrors, Mode=TwoWay}"/>
         <Separator/>
         <StackPanel Orientation="Horizontal" Margin="10,0,10,10" HorizontalAlignment="Right">
             <Button Content="{x:Static s:guiStrings.ButtonOK}" Click="ConvertButton_Click" Margin="10" Width="75" IsDefault="True" Height="25"/>
diff --git a/GarConvert.cs b/GarConvert.cs
index 779e56ab..9758b4f9 100644
--- a/GarConvert.cs
+++ b/GarConvert.cs
@@ -61,7 +61,6 @@ namespace GARbro.GUI
             if (!result)
                 return;
             var format = convert_dialog.ImageConversionFormat.SelectedItem as ImageFormat;
-//            var format = FormatCatalog.Instance.ImageFormats.FirstOrDefault (f => f.Tag == selected);
             if (null == format)
             {
                 Trace.WriteLine ("Format is not selected", "ConvertMediaExec");
@@ -71,6 +70,7 @@ namespace GARbro.GUI
             {
                 Directory.SetCurrentDirectory (ViewModel.Path);
                 var converter = new GarConvertMedia (this);
+                converter.IgnoreErrors = convert_dialog.IgnoreErrors.IsChecked ?? false;
                 converter.Convert (source, format);
             }
             catch (Exception X)
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index 23b30022..55432133 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion ("1.1.2.20")]
-[assembly: AssemblyFileVersion ("1.1.2.20")]
+[assembly: AssemblyVersion ("1.1.2.21")]
+[assembly: AssemblyFileVersion ("1.1.2.21")]
diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs
index e9432921..d644f9a5 100644
--- a/Properties/Settings.Designer.cs
+++ b/Properties/Settings.Designer.cs
@@ -333,5 +333,17 @@ namespace GARbro.GUI.Properties {
                 this["appExtractAudio"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool appIgnoreConversionErrors {
+            get {
+                return ((bool)(this["appIgnoreConversionErrors"]));
+            }
+            set {
+                this["appIgnoreConversionErrors"] = value;
+            }
+        }
     }
 }
diff --git a/Properties/Settings.settings b/Properties/Settings.settings
index 960a8b12..f59b1e46 100644
--- a/Properties/Settings.settings
+++ b/Properties/Settings.settings
@@ -80,5 +80,8 @@
     <Setting Name="appExtractAudio" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="appIgnoreConversionErrors" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/Strings/guiStrings.Designer.cs b/Strings/guiStrings.Designer.cs
index 236034ff..44c60dc4 100644
--- a/Strings/guiStrings.Designer.cs
+++ b/Strings/guiStrings.Designer.cs
@@ -339,6 +339,15 @@ namespace GARbro.GUI.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Skip incovertible files..
+        /// </summary>
+        public static string LabelSkipFailures {
+            get {
+                return ResourceManager.GetString("LabelSkipFailures", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to About Game Resource browser.
         /// </summary>
@@ -811,7 +820,7 @@ namespace GARbro.GUI.Strings {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Convert media.
+        ///   Looks up a localized string similar to Media conversion.
         /// </summary>
         public static string TextConvertMedia {
             get {
diff --git a/Strings/guiStrings.resx b/Strings/guiStrings.resx
index d6ffe58f..0e9ecb1e 100644
--- a/Strings/guiStrings.resx
+++ b/Strings/guiStrings.resx
@@ -388,7 +388,7 @@ Overwrite?</value>
     <value>Choose destination format for images</value>
   </data>
   <data name="TextConvertMedia" xml:space="preserve">
-    <value>Convert media</value>
+    <value>Media conversion</value>
   </data>
   <data name="MsgConvertingFile" xml:space="preserve">
     <value>Converting file {0}</value>
@@ -423,4 +423,7 @@ Overwrite?</value>
   <data name="TextAudioConversion" xml:space="preserve">
     <value>Audio will be converted to either WAV, MP3 or OGG.</value>
   </data>
+  <data name="LabelSkipFailures" xml:space="preserve">
+    <value>Skip incovertible files.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Strings/guiStrings.ru-RU.resx b/Strings/guiStrings.ru-RU.resx
index 14171564..82ac0d48 100644
--- a/Strings/guiStrings.ru-RU.resx
+++ b/Strings/guiStrings.ru-RU.resx
@@ -403,7 +403,7 @@
     <value>Формат преобразования изображений</value>
   </data>
   <data name="TextConvertMedia" xml:space="preserve">
-    <value>Преобразовать мультимедиа</value>
+    <value>Преобразование мультимедиа</value>
   </data>
   <data name="MsgConvertingFile" xml:space="preserve">
     <value>Преобразование файла {0}</value>
@@ -435,6 +435,9 @@
   <data name="MsgUnableInterpretAudio" xml:space="preserve">
     <value>не удалось интерпретировать формат аудио</value>
   </data>
+  <data name="LabelSkipFailures" xml:space="preserve">
+    <value>Пропускать файлы, не поддавшиеся конверсии.</value>
+  </data>
   <data name="MsgNoMediaFiles" xml:space="preserve">
     <value>Среди выбранных файлов нет мультиемедиа.</value>
   </data>