WinGui: Couple UI tweaks and better text rendering throughout the app since no-one complained yet.

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

7 files changed, 20 insertions, 10 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 30f884779..606d87a96 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1232,11 +1232,14 @@ namespace HandBrakeWPF.ViewModels
                 return;

             }

 

-            this.SelectedPreset.Task = new EncodeTask(this.CurrentTask);

-            this.presetService.Update(this.SelectedPreset);

+            if (this.errorService.ShowMessageBox("Are you sure you wish to update the selected preset?", "Are you sure?", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)

+            {

+                this.SelectedPreset.Task = new EncodeTask(this.CurrentTask);

+                this.presetService.Update(this.SelectedPreset);

 

-            this.errorService.ShowMessageBox(

-                    "The Preset has now been updated with your current settings.", "Preset Updated", MessageBoxButton.OK, MessageBoxImage.Information);

+                this.errorService.ShowMessageBox(

+                        "The Preset has now been updated with your current settings.", "Preset Updated", MessageBoxButton.OK, MessageBoxImage.Information);

+            } 

         }

 

         /// <summary>

diff --git a/win/CS/HandBrakeWPF/Views/AboutView.xaml b/win/CS/HandBrakeWPF/Views/AboutView.xaml
index 7743dfc2d..dcf159967 100644
--- a/win/CS/HandBrakeWPF/Views/AboutView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AboutView.xaml
@@ -6,6 +6,7 @@
         Width="600"

         Height="320"

         ResizeMode="NoResize"

+        TextOptions.TextFormattingMode="Display"

         WindowStartupLocation="CenterScreen">

 

     <Grid>

diff --git a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
index b6e186575..946e6b7d2 100644
--- a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
@@ -10,6 +10,7 @@
         ResizeMode="NoResize"

         SizeToContent="Height"

         WindowStartupLocation="CenterScreen"

+        TextOptions.TextFormattingMode="Display"

         mc:Ignorable="d">

 

     <Window.Resources>

diff --git a/win/CS/HandBrakeWPF/Views/ErrorView.xaml b/win/CS/HandBrakeWPF/Views/ErrorView.xaml
index 17acaddb3..e4e7ab885 100644
--- a/win/CS/HandBrakeWPF/Views/ErrorView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ErrorView.xaml
@@ -9,6 +9,7 @@
         MinHeight="380"

         Background="#FFF0F0F0"

         FontSize="11"

+        TextOptions.TextFormattingMode="Display"

         WindowStartupLocation="CenterScreen">

     <Grid>

         <Grid.RowDefinitions>

diff --git a/win/CS/HandBrakeWPF/Views/LogView.xaml b/win/CS/HandBrakeWPF/Views/LogView.xaml
index ec47ad556..cb6687251 100644
--- a/win/CS/HandBrakeWPF/Views/LogView.xaml
+++ b/win/CS/HandBrakeWPF/Views/LogView.xaml
@@ -3,11 +3,12 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

         xmlns:cal="http://www.caliburnproject.org"

         Title="{Binding Title}"

-        Width="500"

+        Width="525"

         Height="600"

-        MinWidth="500"

+        MinWidth="525"

         MinHeight="600"

-        WindowStartupLocation="CenterScreen">

+        WindowStartupLocation="CenterScreen"

+        TextOptions.TextFormattingMode="Display">

     <Grid>

         <Grid>

             <Grid.RowDefinitions>

@@ -25,15 +26,16 @@
                            VerticalAlignment="Center"

                            FontWeight="Bold"

                            Text="Choose Log:" />

-                <ComboBox Width="100"

-                          HorizontalAlignment="Right"

+                <ComboBox Width="120

+                          " Margin="0,0,10,0" Background="LightSteelBlue" Height="22" FontWeight="Black"

+                          HorizontalAlignment="Right" VerticalAlignment="Center"

                           ItemsSource="{Binding LogModes}"

                           SelectedIndex="{Binding SelectedMode}"

                           />

                 

                 <Separator />

                 

-                <Button cal:Message.Attach="[Event Click] = [Action CopyLog]">

+                <Button cal:Message.Attach="[Event Click] = [Action CopyLog]" Margin="10,0,0,0">

                     <StackPanel Orientation="Horizontal">

                         <Image Width="16" Source="Images/copy.png" />

                         <TextBlock Margin="2,0,0,0" Text="Copy to clipboard" />

diff --git a/win/CS/HandBrakeWPF/Views/PreviewView.xaml b/win/CS/HandBrakeWPF/Views/PreviewView.xaml
index 19ff2c6c6..826634167 100644
--- a/win/CS/HandBrakeWPF/Views/PreviewView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PreviewView.xaml
@@ -10,6 +10,7 @@
         ResizeMode="NoResize"

         SizeToContent="Height"

         WindowStartupLocation="CenterScreen"

+        TextOptions.TextFormattingMode="Display"

         mc:Ignorable="d">

 

     <Window.Resources>

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 6c64557b1..5384948b3 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -17,6 +17,7 @@
         MaxWidth="600"

         Background="#FFF0F0F0"

         WindowStartupLocation="CenterScreen"

+        TextOptions.TextFormattingMode="Display"

         mc:Ignorable="d">

 

     <Window.Resources>