WinGui: General tidy up and remove the custom styling for the app. The app will now always honour the system defaults.

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

1 files changed, 5 insertions, 18 deletions

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 3397699a0..ad8e7ad49 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -2,8 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cal="http://www.caliburnproject.org"

               xmlns:Options="clr-namespace:HandBrakeWPF.Converters.Options"

               xmlns:Converters="clr-namespace:HandBrakeWPF.Converters" xmlns:local="clr-namespace:HandBrakeWPF.Model"

-              xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"

-              Style="{StaticResource whiteUserControlStyle}">

+              xmlns:Properties="clr-namespace:HandBrakeWPF.Properties">

 

     <UserControl.Resources>

         <Style TargetType="Button">

@@ -133,9 +132,9 @@
 

                     <StackPanel Orientation="Vertical" Margin="0,0,0,20">

 

-                        <TextBlock Text="Path to VLC Player" Grid.Column="0" FontSize="14" Margin="0,0,0,10"/>

+                        <TextBlock Text="Path to VLC Player" FontSize="14" Margin="0,0,0,10"/>

 

-                        <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">

+                        <StackPanel Orientation="Vertical" Margin="20,0,0,0">

 

                             <StackPanel Orientation="Horizontal">

                                 <TextBlock VerticalAlignment="Center" Text="Path:" />

@@ -150,12 +149,9 @@
 

                     <StackPanel Orientation="Vertical" Margin="0,0,0,20">

 

-                        <TextBlock Text="User Interface" Grid.Column="0" FontSize="14" Margin="0,0,0,10"/>

+                        <TextBlock Text="User Interface" FontSize="14" Margin="0,0,0,10"/>

 

-                        <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">

-

-                            <CheckBox Content="Always use System Colours (Requires Restart)"

-                                      ToolTip="Note: This option will always be on for systems with a High Contrast Theme selected." IsChecked="{Binding UseSystemColoursForStylesForStyles}" />

+                        <StackPanel Orientation="Vertical" Margin="20,0,0,0">

                             <CheckBox Content="Minimize to system tray (Requires Restart)" IsChecked="{Binding MinimiseToTray}" />

                             <CheckBox Content="Disable preset update notification on startup" IsChecked="{Binding DisablePresetUpdateCheckNotification}" />

                             <CheckBox Content="Always clear completed queue items after an encode completes" IsChecked="{Binding ClearQueueOnEncodeCompleted}" />

@@ -376,15 +372,6 @@
         </ScrollViewer>

 

         <StackPanel HorizontalAlignment="Stretch" Grid.Row="2" Grid.Column="0" >

-            <StackPanel.Style>

-                <Style TargetType="StackPanel">

-                    <Style.Triggers>

-                        <DataTrigger Binding="{Binding UseSystemColours}" Value="False">

-                            <Setter Property="Background" Value="LightGray" />

-                        </DataTrigger>

-                    </Style.Triggers>

-                </Style>

-            </StackPanel.Style>

 

             <Button Content="&#60; Back" IsDefault="True" cal:Message.Attach="[Event Click] = [Action Close]" 

                     HorizontalAlignment="Center" Padding="12,2" Margin="0,5,10,5" FontWeight="Bold" />