summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs2
-rw-r--r--win/CS/HandBrakeWPF/HandBrakeWPF.csproj9
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs11
-rw-r--r--win/CS/HandBrakeWPF/Views/Images/Help24.pngbin1684 -> 0 bytes
-rw-r--r--win/CS/HandBrakeWPF/Views/Images/Help32.pngbin2531 -> 0 bytes
-rw-r--r--win/CS/HandBrakeWPF/Views/Images/WarningSmall.pngbin618 -> 0 bytes
-rw-r--r--win/CS/HandBrakeWPF/Views/Images/arrow_down.pngbin625 -> 0 bytes
-rw-r--r--win/CS/HandBrakeWPF/Views/Images/arrow_left.pngbin654 -> 0 bytes
-rw-r--r--win/CS/HandBrakeWPF/Views/Images/arrow_right.pngbin793 -> 0 bytes
-rw-r--r--win/CS/HandBrakeWPF/Views/Images/arrow_up.pngbin669 -> 0 bytes
-rw-r--r--win/CS/HandBrakeWPF/Views/Images/download.pngbin4569 -> 0 bytes
-rw-r--r--win/CS/HandBrakeWPF/Views/Images/info16.pngbin3495 -> 0 bytes
-rw-r--r--win/CS/HandBrakeWPF/Views/OptionsView.xaml18
13 files changed, 9 insertions, 31 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs b/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs
index 325d0d5a8..93d15dda0 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs
@@ -154,7 +154,7 @@ namespace HandBrake.ApplicationServices.Utilities
{"Persian", "fas"},
{"Pali", "pli"},
{"Polish", "pol"},
- {"Portugues", "por"},
+ {"Portuguese", "por"},
{"Pushto", "pus"},
{"Quechua", "que"},
{"Romansh", "roh"},
diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index f6bb499b0..dcaf10f3d 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -369,20 +369,13 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Resource Include="Views\Images\Refresh.ico" />
- <Resource Include="Views\Images\WarningSmall.png" />
<Resource Include="Views\Images\Complete.png" />
<Resource Include="Views\Images\Working0.png" />
<Resource Include="handbrakepineapple.ico" />
<Resource Include="Views\Images\delete.png" />
<Resource Include="Views\Images\Close.png" />
- <Resource Include="Views\Images\Help24.png" />
- <Resource Include="Views\Images\Help32.png" />
<Resource Include="Views\Images\Add16.png" />
<Resource Include="Views\Images\Options24.png" />
- <Resource Include="Views\Images\arrow_down.png" />
- <Resource Include="Views\Images\arrow_left.png" />
- <Resource Include="Views\Images\arrow_right.png" />
- <Resource Include="Views\Images\arrow_up.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Views\Images\ActivityWindow.png" />
@@ -404,14 +397,12 @@
<Resource Include="Views\Images\Movies.png" />
<Resource Include="Views\Images\logo64.png" />
<Resource Include="Views\Images\logo128.png" />
- <Resource Include="Views\Images\info16.png" />
<Resource Include="Views\Images\Help16.png" />
<Resource Include="Views\Images\hb32.png" />
<Resource Include="Views\Images\hb16.png" />
<Resource Include="Views\Images\Preferences.png" />
<Resource Include="Views\Images\folder.png" />
<Resource Include="Views\Images\ErrorX.png" />
- <Resource Include="Views\Images\download.png" />
<Resource Include="Views\Images\AddToQueue_small.png" />
<Resource Include="Views\Images\AddToQueue.png" />
<Resource Include="Views\Images\window.png" />
diff --git a/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
index e261062b5..2fa4913a6 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
@@ -9,10 +9,7 @@
namespace HandBrakeWPF.ViewModels
{
- using Caliburn.Micro;
-
using HandBrake.ApplicationServices;
- using HandBrake.ApplicationServices.Services.Interfaces;
using HandBrakeWPF.ViewModels.Interfaces;
@@ -24,13 +21,7 @@ namespace HandBrakeWPF.ViewModels
/// <summary>
/// Initializes a new instance of the <see cref="AboutViewModel"/> class.
/// </summary>
- /// <param name="windowManager">
- /// The window manager.
- /// </param>
- /// <param name="userSettingService">
- /// The user Setting Service.
- /// </param>
- public AboutViewModel(IWindowManager windowManager, IUserSettingService userSettingService)
+ public AboutViewModel()
{
this.Title = "About HandBrake";
}
diff --git a/win/CS/HandBrakeWPF/Views/Images/Help24.png b/win/CS/HandBrakeWPF/Views/Images/Help24.png
deleted file mode 100644
index 1c6e13069..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/Help24.png
+++ /dev/null
Binary files differ
diff --git a/win/CS/HandBrakeWPF/Views/Images/Help32.png b/win/CS/HandBrakeWPF/Views/Images/Help32.png
deleted file mode 100644
index e3dc78d0b..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/Help32.png
+++ /dev/null
Binary files differ
diff --git a/win/CS/HandBrakeWPF/Views/Images/WarningSmall.png b/win/CS/HandBrakeWPF/Views/Images/WarningSmall.png
deleted file mode 100644
index 78f246f04..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/WarningSmall.png
+++ /dev/null
Binary files differ
diff --git a/win/CS/HandBrakeWPF/Views/Images/arrow_down.png b/win/CS/HandBrakeWPF/Views/Images/arrow_down.png
deleted file mode 100644
index 9a8de4f4a..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/arrow_down.png
+++ /dev/null
Binary files differ
diff --git a/win/CS/HandBrakeWPF/Views/Images/arrow_left.png b/win/CS/HandBrakeWPF/Views/Images/arrow_left.png
deleted file mode 100644
index 713030f29..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/arrow_left.png
+++ /dev/null
Binary files differ
diff --git a/win/CS/HandBrakeWPF/Views/Images/arrow_right.png b/win/CS/HandBrakeWPF/Views/Images/arrow_right.png
deleted file mode 100644
index a270c5479..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/arrow_right.png
+++ /dev/null
Binary files differ
diff --git a/win/CS/HandBrakeWPF/Views/Images/arrow_up.png b/win/CS/HandBrakeWPF/Views/Images/arrow_up.png
deleted file mode 100644
index 530daed53..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/arrow_up.png
+++ /dev/null
Binary files differ
diff --git a/win/CS/HandBrakeWPF/Views/Images/download.png b/win/CS/HandBrakeWPF/Views/Images/download.png
deleted file mode 100644
index c3206626b..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/download.png
+++ /dev/null
Binary files differ
diff --git a/win/CS/HandBrakeWPF/Views/Images/info16.png b/win/CS/HandBrakeWPF/Views/Images/info16.png
deleted file mode 100644
index 6b6b9f01f..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/info16.png
+++ /dev/null
Binary files differ
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index db918987a..d0135db47 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -198,25 +198,21 @@
</Grid.ColumnDefinitions>
<StackPanel Orientation="Vertical" Grid.Column="0">
- <TextBlock Text="Available Langauges" Margin="0,0,0,5"/>
+ <TextBlock Text="Available Languages" Margin="0,0,0,5"/>
<ListBox Name="availableLanguages" ItemsSource="{Binding AvailableLanguages}" Helpers:ListBoxHelper.SelectedItems="{Binding SelectedAvailableToMove}"
SelectionMode="Extended" Width="140" Height="140"></ListBox>
</StackPanel>
<DockPanel Grid.Column="1" Margin="10,0,10,0">
<StackPanel Orientation="Vertical" VerticalAlignment="Center">
- <Button VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveLeft]" Width="60" >
- <Image Source="Images/arrow_right.png" Width="24" Height="24" />
- </Button>
- <Button VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveRight]" Width="60" >
- <Image Source="Images/arrow_left.png" Width="24" Height="24" />
- </Button>
- <Button Content="Clear" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageClearAll]" Width="60" />
+ <Button Content="Move Left" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveLeft]" Width="80" />
+ <Button Content="Move Right" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveRight]" Width="80" />
+ <Button Content="Clear" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageClearAll]" Width="80"/>
</StackPanel>
</DockPanel>
<StackPanel Orientation="Vertical" Grid.Column="2">
- <TextBlock Text="Selected Langauges" Margin="0,0,0,5"/>
+ <TextBlock Text="Selected Languages" Margin="0,0,0,5"/>
<ListBox Name="selectedLangauges" ItemsSource="{Binding SelectedLangauges}" Helpers:ListBoxHelper.SelectedItems="{Binding SelectedLangaugesToMove}"
SelectionMode="Extended" Width="140" Height="140"
dd:DragDrop.DropHandler="{Binding}"
@@ -232,7 +228,7 @@
<StackPanel Orientation="Horizontal">
<TextBlock Text="Audio:" VerticalAlignment="Center" Margin="15,0,5,0" Width="100" />
<ComboBox Name="autoAudioMode" ItemsSource="{Binding AddAudioModeOptions}" SelectedIndex="{Binding SelectedAddAudioMode}" Width="120" Margin="0,0,5,0" />
- <CheckBox Content="Add only one audio track per langauge" VerticalAlignment="Center" IsChecked="{Binding AddOnlyOneAudioTrackPerLanguage}" />
+ <CheckBox Content="Add only one audio track per language" VerticalAlignment="Center" IsChecked="{Binding AddOnlyOneAudioTrackPerLanguage}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,5,0,0">
@@ -391,7 +387,7 @@
</ScrollViewer>
<StackPanel HorizontalAlignment="Stretch" Background="LightGray" Grid.Row="1" Grid.ColumnSpan="2" >
- <Button Content="Save Changes" IsDefault="True" cal:Message.Attach="[Event Click] = [Action Close]"
+ <Button Content="Close" IsDefault="True" cal:Message.Attach="[Event Click] = [Action Close]"
HorizontalAlignment="Center" Padding="12,2" Margin="0,5,10,5" />
</StackPanel>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-21 17:12:25 +0000