Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-12-23 19:34:15 +08:00
Code Issues Projects Releases Wiki Activity

added "ignore errors" option to media conversion.

Browse Source
This commit is contained in:
morkt 2015-06-14 13:54:03 +04:00
parent 9d88975f13
commit 30e7a470d3
9 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
App.config
View File

@ -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>

4
ConvertMedia.xaml
View File

@ -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"/>

2
GarConvert.cs
View File

@ -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)

4
Properties/AssemblyInfo.cs
View File

@ -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")]

12
Properties/Settings.Designer.cs generated
View File

@ -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;
}
}
}
}

3
Properties/Settings.settings
View File

@ -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>

11
Strings/guiStrings.Designer.cs generated
View File

@ -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 {

5
Strings/guiStrings.resx
View File

@ -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>

5
Strings/guiStrings.ru-RU.resx
View File

@ -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>