diff options
Diffstat (limited to 'win')
-rw-r--r-- | win/CS/HandBrakeWPF/Controls/NumberBox.xaml.cs | 2 | ||||
-rw-r--r-- | win/CS/HandBrakeWPF/Controls/SourceSelection.xaml | 4 | ||||
-rw-r--r-- | win/CS/HandBrakeWPF/Properties/Resources.Designer.cs | 99 | ||||
-rw-r--r-- | win/CS/HandBrakeWPF/Properties/Resources.resx | 29 | ||||
-rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs | 2 | ||||
-rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs | 2 | ||||
-rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs | 13 | ||||
-rw-r--r-- | win/CS/HandBrakeWPF/Views/MainView.xaml | 8 | ||||
-rw-r--r-- | win/CS/HandBrakeWPF/Views/OptionsView.xaml | 12 | ||||
-rw-r--r-- | win/CS/HandBrakeWPF/Views/SummaryView.xaml | 8 | ||||
-rw-r--r-- | win/CS/HandBrakeWPF/Views/VideoView.xaml | 2 |
11 files changed, 151 insertions, 30 deletions
diff --git a/win/CS/HandBrakeWPF/Controls/NumberBox.xaml.cs b/win/CS/HandBrakeWPF/Controls/NumberBox.xaml.cs index 477e79c37..938f4b40b 100644 --- a/win/CS/HandBrakeWPF/Controls/NumberBox.xaml.cs +++ b/win/CS/HandBrakeWPF/Controls/NumberBox.xaml.cs @@ -108,7 +108,7 @@ namespace HandBrakeWPF.Controls /// </summary>
public NumberBox()
{
- this.noneCaption = "(none)";
+ this.noneCaption = string.Empty;
this.UpdateBindingOnTextChange = true;
this.ShowIncrementButtons = true;
this.SelectAllOnClick = true;
diff --git a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml index 1a5934c94..7069fde07 100644 --- a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml +++ b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml @@ -6,7 +6,7 @@ xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
xmlns:converters="clr-namespace:HandBrakeWPF.Converters"
x:Name="sourcePanel"
- >
+ >
<UserControl.Resources>
<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
@@ -116,7 +116,7 @@ <StackPanel Grid.Row="8" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,2,10">
<TextBlock>
- <Hyperlink x:Name="Preferences" NavigateUri="/" RequestNavigate="OpenOptions_OnRequestNavigate" ><TextBlock Text="{x:Static Properties:Resources.SourceSelection_Preferences}"/></Hyperlink>
+ <Hyperlink x:Name="Preferences" NavigateUri="/" RequestNavigate="OpenOptions_OnRequestNavigate" ><TextBlock Text="{x:Static Properties:Resources.Preferences}"/></Hyperlink>
</TextBlock>
<TextBlock Text="|" Margin="5,0,5,0"/>
<TextBlock>
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs index 915eb3eb4..8e4931c68 100644 --- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs +++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs @@ -1205,6 +1205,15 @@ namespace HandBrakeWPF.Properties { } /// <summary> + /// Looks up a localized string similar to Log Viewer. + /// </summary> + public static string LogViewModel_Title { + get { + return ResourceManager.GetString("LogViewModel_Title", resourceCulture); + } + } + + /// <summary> /// Looks up a localized string similar to HandBrake is already encoding.. /// </summary> public static string Main_AlreadyEncoding { @@ -1746,6 +1755,15 @@ namespace HandBrakeWPF.Properties { } /// <summary> + /// Looks up a localized string similar to Aspect:. + /// </summary> + public static string MainView_Aspect { + get { + return ResourceManager.GetString("MainView_Aspect", resourceCulture); + } + } + + /// <summary> /// Looks up a localized string similar to Audio. /// </summary> public static string MainView_AudioTab { @@ -1854,6 +1872,15 @@ namespace HandBrakeWPF.Properties { } /// <summary> + /// Looks up a localized string similar to Filters:. + /// </summary> + public static string MainView_Filters { + get { + return ResourceManager.GetString("MainView_Filters", resourceCulture); + } + } + + /// <summary> /// Looks up a localized string similar to Filters. /// </summary> public static string MainView_FiltersTab { @@ -2223,6 +2250,15 @@ namespace HandBrakeWPF.Properties { } /// <summary> + /// Looks up a localized string similar to Size:. + /// </summary> + public static string MainView_Size { + get { + return ResourceManager.GetString("MainView_Size", resourceCulture); + } + } + + /// <summary> /// Looks up a localized string similar to Source:. /// </summary> public static string MainView_Source { @@ -2349,6 +2385,15 @@ namespace HandBrakeWPF.Properties { } /// <summary> + /// Looks up a localized string similar to Tracks:. + /// </summary> + public static string MainView_Tracks { + get { + return ResourceManager.GetString("MainView_Tracks", resourceCulture); + } + } + + /// <summary> /// Looks up a localized string similar to Update Selected Preset. /// </summary> public static string MainView_UpdateSelectedPreset { @@ -3184,6 +3229,24 @@ namespace HandBrakeWPF.Properties { } /// <summary> + /// Looks up a localized string similar to General. + /// </summary> + public static string OptionsTab_General { + get { + return ResourceManager.GetString("OptionsTab_General", resourceCulture); + } + } + + /// <summary> + /// Looks up a localized string similar to &#60; Back. + /// </summary> + public static string OptionsView_BackButton { + get { + return ResourceManager.GetString("OptionsView_BackButton", resourceCulture); + } + } + + /// <summary> /// Looks up a localized string similar to Checking for Updates .... /// </summary> public static string OptionsView_CheckingForUpdates { @@ -3431,6 +3494,15 @@ namespace HandBrakeWPF.Properties { } /// <summary> + /// Looks up a localized string similar to Click 'Check for Updates' to check for new versions. + /// </summary> + public static string OptionsViewModel_CheckForUpdatesMsg { + get { + return ResourceManager.GetString("OptionsViewModel_CheckForUpdatesMsg", resourceCulture); + } + } + + /// <summary> /// Looks up a localized string similar to A New Update is Available! Please check the website for release notes.. /// </summary> public static string OptionsViewModel_NewUpdate { @@ -3714,6 +3786,15 @@ namespace HandBrakeWPF.Properties { } /// <summary> + /// Looks up a localized string similar to Preferences. + /// </summary> + public static string Preferences { + get { + return ResourceManager.GetString("Preferences", resourceCulture); + } + } + + /// <summary> /// Looks up a localized string similar to Custom. /// </summary> public static string Preset_Custom { @@ -4073,6 +4154,15 @@ namespace HandBrakeWPF.Properties { } /// <summary> + /// Looks up a localized string similar to Currently Paused. + /// </summary> + public static string QueueView_CurrentlyPaused { + get { + return ResourceManager.GetString("QueueView_CurrentlyPaused", resourceCulture); + } + } + + /// <summary> /// Looks up a localized string similar to Delete. /// </summary> public static string QueueView_Delete { @@ -4750,15 +4840,6 @@ namespace HandBrakeWPF.Properties { } /// <summary> - /// Looks up a localized string similar to Preferences. - /// </summary> - public static string SourceSelection_Preferences { - get { - return ResourceManager.GetString("SourceSelection_Preferences", resourceCulture); - } - } - - /// <summary> /// Looks up a localized string similar to Recover Queue Files. /// </summary> public static string SourceSelection_QueueArchiveRecovery { diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx index 437efe84c..f5d81335b 100644 --- a/win/CS/HandBrakeWPF/Properties/Resources.resx +++ b/win/CS/HandBrakeWPF/Properties/Resources.resx @@ -1741,7 +1741,7 @@ Would you like to overwrite it?</value> <data name="SourceSelection_Help" xml:space="preserve">
<value>Help</value>
</data>
- <data name="SourceSelection_Preferences" xml:space="preserve">
+ <data name="Preferences" xml:space="preserve">
<value>Preferences</value>
</data>
<data name="AudioDefaultsView_AddTrack" xml:space="preserve">
@@ -2048,4 +2048,31 @@ Where supported, any user presets will have been imported.</value> <data name="StaticPreviewView_PreviewRotationFlip" xml:space="preserve">
<value>Preview Rotation and Flip</value>
</data>
+ <data name="LogViewModel_Title" xml:space="preserve">
+ <value>Log Viewer</value>
+ </data>
+ <data name="MainView_Aspect" xml:space="preserve">
+ <value>Aspect:</value>
+ </data>
+ <data name="MainView_Filters" xml:space="preserve">
+ <value>Filters:</value>
+ </data>
+ <data name="MainView_Size" xml:space="preserve">
+ <value>Size:</value>
+ </data>
+ <data name="MainView_Tracks" xml:space="preserve">
+ <value>Tracks:</value>
+ </data>
+ <data name="OptionsTab_General" xml:space="preserve">
+ <value>General</value>
+ </data>
+ <data name="OptionsViewModel_CheckForUpdatesMsg" xml:space="preserve">
+ <value>Click 'Check for Updates' to check for new versions</value>
+ </data>
+ <data name="OptionsView_BackButton" xml:space="preserve">
+ <value>&#60; Back</value>
+ </data>
+ <data name="QueueView_CurrentlyPaused" xml:space="preserve">
+ <value>Currently Paused</value>
+ </data>
</root>
\ No newline at end of file diff --git a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs index d1ed6654d..b37939f36 100644 --- a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs @@ -48,7 +48,7 @@ namespace HandBrakeWPF.ViewModels {
this.errorService = errorService;
this.logService = LogService.GetLogger();
- this.Title = "Log Viewer";
+ this.Title = Resources.LogViewModel_Title;
}
/// <summary>
diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs index df1acb451..c3d407f92 100644 --- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs @@ -141,7 +141,7 @@ namespace HandBrakeWPF.ViewModels this.OnLoad();
this.SelectedTab = OptionsTab.General;
- this.UpdateMessage = "Click 'Check for Updates' to check for new versions";
+ this.UpdateMessage = Resources.OptionsViewModel_CheckForUpdatesMsg;
}
#endregion
diff --git a/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs index aaf477e1b..9e070e6e7 100644 --- a/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs @@ -111,6 +111,7 @@ namespace HandBrakeWPF.ViewModels { return this.currentTitle; } + set { if (Equals(value, this.currentTitle)) return; @@ -133,20 +134,29 @@ namespace HandBrakeWPF.ViewModels #region DisplayProperties public BitmapSource PreviewImage { get; set; } + public bool PreviewNotAvailable { get; set; } + public int MaxWidth { get; set; } + public int MaxHeight { get; set; } public string VideoTrackInfo { get; set; } + public string AudioTrackInfo { get; set; } + public string SubtitleTrackInfo { get; set; } + public string ChapterInfo { get; set; } + public string FiltersInfo { get; set; } public string DimensionInfo { get; set; } + public string AspectInfo { get; set; } public bool IsPreviewInfoVisible { get; set; } + public string PreviewInfo { get; set; } public bool IsPreviousPreviewControlVisible @@ -155,6 +165,7 @@ namespace HandBrakeWPF.ViewModels { return this.isPreviousPreviewControlVisible; } + set { if (value == this.isPreviousPreviewControlVisible) return; @@ -169,6 +180,7 @@ namespace HandBrakeWPF.ViewModels { return this.isNextPreviewControlVisible; } + set { if (value == this.isNextPreviewControlVisible) return; @@ -183,6 +195,7 @@ namespace HandBrakeWPF.ViewModels { return this.showPreview; } + set { if (value == this.showPreview) return; diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml index ba4e361ea..14fd7f5b9 100644 --- a/win/CS/HandBrakeWPF/Views/MainView.xaml +++ b/win/CS/HandBrakeWPF/Views/MainView.xaml @@ -313,7 +313,7 @@ Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Activity2.png'}"/>
<Label Margin="8,0,0,0"
VerticalAlignment="Center"
- Content="Activity Log"/>
+ Content="{x:Static Properties:Resources.MainView_ActivityLog}"/>
</StackPanel>
</Button>
@@ -325,7 +325,7 @@ Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Presets2.png'}"/>
<Label Margin="8,0,0,0"
VerticalAlignment="Center"
- Content="Presets"/>
+ Content="{x:Static Properties:Resources.MainView_Presets}"/>
</StackPanel>
</Button>
</ToolBar>
@@ -453,7 +453,7 @@ <!-- Presets Options -->
<StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,10,10,5" IsEnabled="{Binding HasSource, Converter={StaticResource booleanConverter}, ConverterParameter=false}">
- <Label Content="Presets:" FontWeight="Bold" VerticalAlignment="Center" />
+ <Label Content="{x:Static Properties:Resources.MainView_Presets}" FontWeight="Bold" VerticalAlignment="Center" />
<StackPanel Orientation="Horizontal" Margin="5,0,0,0" Visibility="{Binding IsPresetPanelShowing, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">
<Button x:Name="SelectPresetsButton" VerticalAlignment="Center" Click="SelectPreset_OnClick" Width="255">
@@ -586,7 +586,7 @@ <Button Name="DestinationBrowser"
Grid.Column="2"
Margin="10,0,0,0" FontWeight="Bold"
- Content="Browse"
+ Content="{x:Static Properties:Resources.Browse}"
ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Browse}"
cal:Message.Attach="[Event Click] = [Action BrowseDestination]"
/>
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml index d203c27ee..a3ce125a5 100644 --- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml +++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml @@ -65,7 +65,7 @@ <!-- Row 1 -->
<StackPanel Grid.Row="0" Grid.ColumnSpan="2" Orientation="Vertical">
- <TextBlock Text="Preferences" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" Grid.ColumnSpan="2" />
+ <TextBlock Text="{x:Static Properties:Resources.Preferences}" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" Grid.ColumnSpan="2" />
</StackPanel>
<Border BorderBrush="DarkGray" Grid.Column="0" Grid.Row="1" BorderThickness="0,0,1,0">
@@ -73,7 +73,7 @@ <StackPanel Orientation="Vertical" Margin="11,0,-1,0">
- <Button Content="< Back" IsDefault="True" cal:Message.Attach="[Event Click] = [Action Close]"
+ <Button Content="{x:Static Properties:Resources.OptionsView_BackButton}" IsDefault="True" cal:Message.Attach="[Event Click] = [Action Close]"
HorizontalAlignment="Left" Padding="12,2" Margin="0,0,0,10" FontWeight="Bold" />
<ListBox ItemsSource="{Binding Source={StaticResource OptionTabsList}, Converter={StaticResource optionTabConverter}}" SelectedItem="{Binding SelectedTab}"
@@ -140,7 +140,7 @@ <StackPanel Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="{x:Static Properties:Resources.Options_Path}" />
<TextBox Name="vlcPath" Text="{Binding VLCPath}" Width="250" />
- <Button Content="Browse" cal:Message.Attach="[Event Click] = [Action BrowseVlcPath]" Margin="5,0,0,0" />
+ <Button Content="{x:Static Properties:Resources.Browse}" cal:Message.Attach="[Event Click] = [Action BrowseVlcPath]" Margin="5,0,0,0" />
</StackPanel>
<TextBlock Margin="35,0,0,0" Text="{x:Static Properties:Resources.Options_VideoPreviewPath}" />
@@ -180,7 +180,7 @@ <TextBlock VerticalAlignment="Center" Text="{x:Static Properties:Resources.Options_DefaultPath}" Grid.Column="0" Grid.Row="0" />
<TextBox Name="autoNameOutputPath" Text="{Binding AutoNameDefaultPath}" Width="380" Grid.Column="1" Grid.Row="0"
ToolTip="{x:Static Properties:Resources.Options_DefaultPathAdditionalParams}" HorizontalAlignment="Left" />
- <Button Content="Browse" Margin="5,0,0,0" Grid.Column="2" Grid.Row="0" cal:Message.Attach="[Event Click] = [Action BrowseAutoNamePath]" HorizontalAlignment="Left" />
+ <Button Content="{x:Static Properties:Resources.Browse}" Margin="5,0,0,0" Grid.Column="2" Grid.Row="0" cal:Message.Attach="[Event Click] = [Action BrowseAutoNamePath]" HorizontalAlignment="Left" />
<TextBlock Text="{x:Static Properties:Resources.OptionsView_PathOptions}" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" FontStyle="Italic" FontSize="11" TextWrapping="Wrap" />
<TextBlock VerticalAlignment="Center" Text="{x:Static Properties:Resources.Options_Format}" Grid.Column="0" Grid.Row="3" Margin="0,5,0,0" />
@@ -259,7 +259,7 @@ </StackPanel>
</CheckBox>
- <Button Content="Browse" cal:Message.Attach="[Event Click] = [Action BrowseSendFileTo]" />
+ <Button Content="{x:Static Properties:Resources.Browse}" cal:Message.Attach="[Event Click] = [Action BrowseSendFileTo]" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,5,0,0">
@@ -396,7 +396,7 @@ <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
<TextBlock Text="{x:Static Properties:Resources.Options_LogPath}" VerticalAlignment="Center" />
<TextBox Width="380" Text="{Binding LogDirectory}" />
- <Button Content="Browse" Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action BrowseLogPath]" />
+ <Button Content="{x:Static Properties:Resources.Browse}" Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action BrowseLogPath]" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,10,0,0">
<Button Content="{x:Static Properties:Resources.Options_ViewLogDirectory}" cal:Message.Attach="[Event Click] = [Action ViewLogDirectory]" Margin="0,0,5,0" />
diff --git a/win/CS/HandBrakeWPF/Views/SummaryView.xaml b/win/CS/HandBrakeWPF/Views/SummaryView.xaml index 8aad4a3a2..3b0f13d38 100644 --- a/win/CS/HandBrakeWPF/Views/SummaryView.xaml +++ b/win/CS/HandBrakeWPF/Views/SummaryView.xaml @@ -77,21 +77,21 @@ IsChecked="{Binding Path=IPod5GSupport}" Visibility="{Binding IsMkvOrWebm, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" /> - <TextBlock Text="Tracks:" FontWeight="Bold" Grid.Row="5" Grid.Column="0" VerticalAlignment="Center" /> + <TextBlock Text="{x:Static Properties:Resources.MainView_Tracks}" FontWeight="Bold" Grid.Row="5" Grid.Column="0" VerticalAlignment="Center" /> <TextBlock Text="{Binding VideoTrackInfo}" Grid.Row="5" Grid.Column="1" VerticalAlignment="Center" /> <TextBlock Text="{Binding AudioTrackInfo}" Grid.Row="6" Grid.Column="1" TextWrapping="Wrap" /> <TextBlock Text="{Binding SubtitleTrackInfo}" Grid.Row="7" Grid.Column="1" TextWrapping="Wrap" /> <TextBlock Text="{Binding ChapterInfo}" Grid.Row="8" Grid.Column="1" /> - <TextBlock Text="Filters:" FontWeight="Bold" Grid.Row="10" Grid.Column="0" VerticalAlignment="Center" /> + <TextBlock Text="{x:Static Properties:Resources.MainView_Filters}" FontWeight="Bold" Grid.Row="10" Grid.Column="0" VerticalAlignment="Center" /> <TextBlock Text="{Binding FiltersInfo}" Grid.Row="10" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Stretch" TextWrapping="Wrap" /> - <TextBlock Text="Size:" FontWeight="Bold" Grid.Row="12" Grid.Column="0" VerticalAlignment="Center" /> + <TextBlock Text="{x:Static Properties:Resources.MainView_Size}" FontWeight="Bold" Grid.Row="12" Grid.Column="0" VerticalAlignment="Center" /> <TextBlock Text="{Binding DimensionInfo}" HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Row="12" Grid.Column="1" /> - <TextBlock Text="Aspect:" FontSize="14" Grid.Row="13" Grid.Column="0" VerticalAlignment="Center" Visibility="Collapsed" /> + <TextBlock Text="{x:Static Properties:Resources.MainView_Aspect}" FontSize="14" Grid.Row="13" Grid.Column="0" VerticalAlignment="Center" Visibility="Collapsed" /> <TextBlock Text="{Binding AspectInfo}" HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Row="13" Grid.Column="1" Margin="5,0,0,0" Visibility="Collapsed" /> </Grid> diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml index 92f15f06e..afe60ddfe 100644 --- a/win/CS/HandBrakeWPF/Views/VideoView.xaml +++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml @@ -78,7 +78,7 @@ </StackPanel>
<StackPanel Orientation="Vertical" Grid.Column="1">
- <TextBlock Text="Quality" FontWeight="Bold" Margin="0,0,0,10"/>
+ <TextBlock Text="{x:Static Properties:Resources.VideoView_Quality}" FontWeight="Bold" Margin="0,0,0,10"/>
<StackPanel Orientation="Horizontal" Margin="0,0,0,10" >
<RadioButton Content="{x:Static Properties:Resources.VideoView_ConstantQuality}" IsChecked="{Binding IsConstantQuantity}" Margin="0,0,10,0"
|