WinGui: Misc typos, tidyup

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4978 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs b/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs
index 325d0d5a856d0938c19d82177f84a065165aabb3..93d15dda0f6e0b741c278c6385ff033a4d006117 100644 (file)
--- 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"}, \r
                                                               {"Pali", "pli"}, \r
                                                               {"Polish", "pol"}, \r
-                                                              {"Portugues", "por"}, \r
+                                                              {"Portuguese", "por"}, \r
                                                               {"Pushto", "pus"}, \r
                                                               {"Quechua", "que"}, \r
                                                               {"Romansh", "roh"}, \r

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index f6bb499b0a9b71066b53f56e75e5f95d5028851c..dcaf10f3d38c94ef271216ee3275b2c9986b20b0 100644 (file)
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -369,20 +369,13 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </Content>\r
     <Resource Include="Views\Images\Refresh.ico" />\r
-    <Resource Include="Views\Images\WarningSmall.png" />\r
     <Resource Include="Views\Images\Complete.png" />\r
     <Resource Include="Views\Images\Working0.png" />\r
     <Resource Include="handbrakepineapple.ico" />\r
     <Resource Include="Views\Images\delete.png" />\r
     <Resource Include="Views\Images\Close.png" />\r
-    <Resource Include="Views\Images\Help24.png" />\r
-    <Resource Include="Views\Images\Help32.png" />\r
     <Resource Include="Views\Images\Add16.png" />\r
     <Resource Include="Views\Images\Options24.png" />\r
-    <Resource Include="Views\Images\arrow_down.png" />\r
-    <Resource Include="Views\Images\arrow_left.png" />\r
-    <Resource Include="Views\Images\arrow_right.png" />\r
-    <Resource Include="Views\Images\arrow_up.png" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Resource Include="Views\Images\ActivityWindow.png" />\r
@@ -404,14 +397,12 @@
     <Resource Include="Views\Images\Movies.png" />\r
     <Resource Include="Views\Images\logo64.png" />\r
     <Resource Include="Views\Images\logo128.png" />\r
-    <Resource Include="Views\Images\info16.png" />\r
     <Resource Include="Views\Images\Help16.png" />\r
     <Resource Include="Views\Images\hb32.png" />\r
     <Resource Include="Views\Images\hb16.png" />\r
     <Resource Include="Views\Images\Preferences.png" />\r
     <Resource Include="Views\Images\folder.png" />\r
     <Resource Include="Views\Images\ErrorX.png" />\r
-    <Resource Include="Views\Images\download.png" />\r
     <Resource Include="Views\Images\AddToQueue_small.png" />\r
     <Resource Include="Views\Images\AddToQueue.png" />\r
     <Resource Include="Views\Images\window.png" />\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
index e261062b5fcd2c5198344576dacc25b0d6c33cfc..2fa4913a634be8483ded67279235e5153916f8e9 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
@@ -9,10 +9,7 @@
 \r
 namespace HandBrakeWPF.ViewModels\r
 {\r
-    using Caliburn.Micro;\r
-\r
     using HandBrake.ApplicationServices;\r
-    using HandBrake.ApplicationServices.Services.Interfaces;\r
 \r
     using HandBrakeWPF.ViewModels.Interfaces;\r
 \r
@@ -24,13 +21,7 @@ namespace HandBrakeWPF.ViewModels
         /// <summary>\r
         /// Initializes a new instance of the <see cref="AboutViewModel"/> class.\r
         /// </summary>\r
-        /// <param name="windowManager">\r
-        /// The window manager.\r
-        /// </param>\r
-        /// <param name="userSettingService">\r
-        /// The user Setting Service.\r
-        /// </param>\r
-        public AboutViewModel(IWindowManager windowManager, IUserSettingService userSettingService)\r
+        public AboutViewModel()\r
         {\r
             this.Title = "About HandBrake";\r
         }\r

diff --git a/win/CS/HandBrakeWPF/Views/Images/Help24.png b/win/CS/HandBrakeWPF/Views/Images/Help24.png
deleted file mode 100644 (file)
index 1c6e130..0000000
Binary files a/win/CS/HandBrakeWPF/Views/Images/Help24.png and /dev/null differ

diff --git a/win/CS/HandBrakeWPF/Views/Images/Help32.png b/win/CS/HandBrakeWPF/Views/Images/Help32.png
deleted file mode 100644 (file)
index e3dc78d..0000000
Binary files a/win/CS/HandBrakeWPF/Views/Images/Help32.png and /dev/null differ

diff --git a/win/CS/HandBrakeWPF/Views/Images/WarningSmall.png b/win/CS/HandBrakeWPF/Views/Images/WarningSmall.png
deleted file mode 100644 (file)
index 78f246f..0000000
Binary files a/win/CS/HandBrakeWPF/Views/Images/WarningSmall.png and /dev/null 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 (file)
index 9a8de4f..0000000
Binary files a/win/CS/HandBrakeWPF/Views/Images/arrow_down.png and /dev/null 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 (file)
index 713030f..0000000
Binary files a/win/CS/HandBrakeWPF/Views/Images/arrow_left.png and /dev/null 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 (file)
index a270c54..0000000
Binary files a/win/CS/HandBrakeWPF/Views/Images/arrow_right.png and /dev/null 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 (file)
index 530daed..0000000
Binary files a/win/CS/HandBrakeWPF/Views/Images/arrow_up.png and /dev/null differ

diff --git a/win/CS/HandBrakeWPF/Views/Images/download.png b/win/CS/HandBrakeWPF/Views/Images/download.png
deleted file mode 100644 (file)
index c320662..0000000
Binary files a/win/CS/HandBrakeWPF/Views/Images/download.png and /dev/null differ

diff --git a/win/CS/HandBrakeWPF/Views/Images/info16.png b/win/CS/HandBrakeWPF/Views/Images/info16.png
deleted file mode 100644 (file)
index 6b6b9f0..0000000
Binary files a/win/CS/HandBrakeWPF/Views/Images/info16.png and /dev/null differ

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index db918987aacc55a2692d7ea340671635bb1889ee..d0135db47635eee3ec2825c2594b0914925da85b 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -198,25 +198,21 @@
                                 </Grid.ColumnDefinitions>\r
 \r
                                 <StackPanel Orientation="Vertical" Grid.Column="0">\r
-                                    <TextBlock Text="Available Langauges" Margin="0,0,0,5"/>\r
+                                    <TextBlock Text="Available Languages" Margin="0,0,0,5"/>\r
                                     <ListBox Name="availableLanguages" ItemsSource="{Binding AvailableLanguages}" Helpers:ListBoxHelper.SelectedItems="{Binding SelectedAvailableToMove}" \r
                                              SelectionMode="Extended" Width="140" Height="140"></ListBox>\r
                                 </StackPanel>\r
 \r
                                 <DockPanel Grid.Column="1" Margin="10,0,10,0">\r
                                     <StackPanel Orientation="Vertical" VerticalAlignment="Center">\r
-                                        <Button VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveLeft]" Width="60" >\r
-                                            <Image Source="Images/arrow_right.png" Width="24" Height="24" />\r
-                                        </Button>\r
-                                        <Button VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveRight]" Width="60" >\r
-                                            <Image Source="Images/arrow_left.png" Width="24" Height="24" />\r
-                                        </Button>\r
-                                        <Button Content="Clear" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageClearAll]" Width="60" />\r
+                                        <Button Content="Move Left"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveLeft]" Width="80" />\r
+                                        <Button Content="Move Right"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveRight]" Width="80" />\r
+                                        <Button Content="Clear" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageClearAll]" Width="80"/>\r
                                     </StackPanel>\r
                                 </DockPanel>\r
 \r
                                 <StackPanel Orientation="Vertical" Grid.Column="2">\r
-                                    <TextBlock Text="Selected Langauges"  Margin="0,0,0,5"/>\r
+                                    <TextBlock Text="Selected Languages"  Margin="0,0,0,5"/>\r
                                     <ListBox Name="selectedLangauges" ItemsSource="{Binding SelectedLangauges}" Helpers:ListBoxHelper.SelectedItems="{Binding SelectedLangaugesToMove}" \r
                                              SelectionMode="Extended" Width="140" Height="140"\r
                                              dd:DragDrop.DropHandler="{Binding}"\r
@@ -232,7 +228,7 @@
                             <StackPanel Orientation="Horizontal">\r
                                 <TextBlock Text="Audio:" VerticalAlignment="Center" Margin="15,0,5,0" Width="100" />\r
                                 <ComboBox Name="autoAudioMode" ItemsSource="{Binding AddAudioModeOptions}" SelectedIndex="{Binding SelectedAddAudioMode}" Width="120" Margin="0,0,5,0" />\r
-                                <CheckBox Content="Add only one audio track per langauge" VerticalAlignment="Center" IsChecked="{Binding AddOnlyOneAudioTrackPerLanguage}" />\r
+                                <CheckBox Content="Add only one audio track per language" VerticalAlignment="Center" IsChecked="{Binding AddOnlyOneAudioTrackPerLanguage}" />\r
                             </StackPanel>\r
 \r
                             <StackPanel Orientation="Horizontal" Margin="0,5,0,0">\r
@@ -391,7 +387,7 @@
         </ScrollViewer>\r
 \r
         <StackPanel HorizontalAlignment="Stretch" Background="LightGray" Grid.Row="1" Grid.ColumnSpan="2" >\r
-            <Button Content="Save Changes" IsDefault="True" cal:Message.Attach="[Event Click] = [Action Close]"\r
+            <Button Content="Close" IsDefault="True" cal:Message.Attach="[Event Click] = [Action Close]"\r
                     HorizontalAlignment="Center" Padding="12,2" Margin="0,5,10,5" />\r
         </StackPanel>\r
 \r