WinGui: Misc UI fixes and fixes to the logging code for scanning that could sometimes...

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

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
index a560493ab61656cbeac808f944f6e4ee1983ea87..6e16fa93784f5e570158425ad14085733bef6a93 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
@@ -168,8 +168,12 @@ namespace HandBrake.ApplicationServices.Services.Scan
             {\r
                 try\r
                 {\r
-                    this.scanLog.Close();\r
-                    this.scanLog.Dispose();\r
+                    lock (LogLock)\r
+                    {\r
+                        this.scanLog.Close();\r
+                        this.scanLog.Dispose();\r
+                        this.scanLog = null;\r
+                    }\r
                     this.instance.Dispose();\r
                 }\r
                 catch (Exception)\r
@@ -227,10 +231,14 @@ namespace HandBrake.ApplicationServices.Services.Scan
                 this.IsScanning = false;\r
                 this.instance.StopScan();\r
 \r
-                if (this.scanLog != null)\r
+                lock (LogLock)\r
                 {\r
-                    this.scanLog.Close();\r
-                    this.scanLog.Dispose();\r
+                    if (this.scanLog != null)\r
+                    {\r
+                        this.scanLog.Close();\r
+                        this.scanLog.Dispose();\r
+                        this.scanLog = null;\r
+                    }\r
                 }\r
             }\r
             catch (Exception)\r

diff --git a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
index dd7650b319fc92c4309f33e7ca5e0f848c5a3adc..44d600c4ed69a3e4b2b917c7886ff22e9ffde9bc 100644 (file)
--- a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
+++ b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
@@ -15,11 +15,11 @@
         \r
         \r
         <StackPanel Orientation="Horizontal" Grid.Row="0" Margin="5,8,0,0">\r
-            <TextBlock Text="Source Selection" FontSize="14" FontWeight="Bold" /> \r
+            <TextBlock Text="Source Selection" FontSize="26" FontFamily="Segoe UI Light" /> \r
         </StackPanel>\r
 \r
         <!-- Title Specific Scan -->\r
-        <StackPanel Grid.Row="1" Orientation="Vertical" HorizontalAlignment="Left"  Margin="5,5,0,0">\r
+        <StackPanel Grid.Row="1" Orientation="Vertical" HorizontalAlignment="Left"  Margin="5,15,0,0">\r
             <StackPanel Orientation="Horizontal">\r
                 <TextBlock Text="Optionally choose a specific title: " />\r
 \r
@@ -86,7 +86,7 @@
         </Grid>\r
 \r
         <!-- Cancel Window -->\r
-        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,10,10">\r
+        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,2,10">\r
             <Button cal:Message.Attach="[Event Click] = [Action CloseSourceSelection]" Content="Cancel" Padding="8,2" />\r
         </StackPanel>\r
 \r

diff --git a/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml b/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml
index 481c2eedbf40f4f3ebb97538b1082d9e47e08740..4c4fbe20d8549ce86d58988daccee10918087169 100644 (file)
--- a/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml
+++ b/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml
@@ -1,28 +1,60 @@
-<UserControl x:Class="HandBrakeWPF.Controls.StatusPanel"\r
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
+<UserControl xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
-             xmlns:ctr="clr-namespace:HandBrakeWPF.Controls">\r
+             xmlns:ctr="clr-namespace:HandBrakeWPF.Controls"\r
+             x:Class="HandBrakeWPF.Controls.StatusPanel"\r
+             FontFamily="S"\r
+             >\r
 \r
     <UserControl.Resources>\r
         <BooleanToVisibilityConverter x:Key="boolTovisibility" />\r
     </UserControl.Resources>\r
+    \r
+    <Grid>\r
+        <Grid.RowDefinitions>\r
+            <RowDefinition Height="*" />\r
+            <RowDefinition Height="Auto" />\r
+            <RowDefinition Height="*" />\r
+        </Grid.RowDefinitions>\r
 \r
-    <DockPanel Background="Black" Opacity="0.85"\r
-               Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, \r
-                            Path=IsLoading, Mode=OneWay, Converter={StaticResource boolTovisibility}}">\r
+        <StackPanel Grid.Row="0" Background="Black" Opacity="0.45" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>\r
 \r
-        <ctr:Loading DockPanel.Dock="Left" HorizontalAlignment="Left" VerticalAlignment="Top"\r
-                     Height="45" Margin="18,10" />\r
+        <Grid VerticalAlignment="Center" Grid.Row="1" HorizontalAlignment="Stretch"\r
+                       Background="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}">\r
+            \r
+            <Grid.RowDefinitions>\r
+                <RowDefinition Height="Auto" />\r
+                <RowDefinition Height="Auto" />\r
+            </Grid.RowDefinitions>\r
+\r
+            <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="0" MaxHeight="220" MinHeight="220">\r
+                <ctr:Loading HorizontalAlignment="Center" VerticalAlignment="Center" Height="45" Margin="18,10" />\r
+\r
+                <StackPanel VerticalAlignment="Center" Orientation="Vertical" >\r
+                    <StackPanel VerticalAlignment="Center" MinWidth="300">\r
+                        <TextBlock SnapsToDevicePixels="True" VerticalAlignment="Top" FontSize="26" FontFamily="Segoe UI Light" Margin="0,11,0,0" HorizontalAlignment="Left"\r
+                                                   FontWeight="Bold" TextWrapping="WrapWithOverflow"\r
+                                                   Text="{Binding Message, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"\r
+                           />\r
+\r
+                        <TextBlock SnapsToDevicePixels="True" VerticalAlignment="Top" FontSize="16" FontFamily="Segoe UI Light" Margin="0,5" HorizontalAlignment="Left"\r
+                                                   Text="{Binding SubMessage, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" \r
+                                                   TextWrapping="WrapWithOverflow"\r
+                           />\r
+                    </StackPanel>\r
+             \r
+                    <Button Content="{Binding ActionText, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Margin="0,10,0,0"\r
+                            x:Name="StatusActionButton" Click="StatusActionButton_OnClick" Padding="8,2" HorizontalAlignment="Right"\r
+                            Visibility="{Binding IsActionButtonVisible, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Converter={StaticResource boolTovisibility}}" />\r
+\r
+                </StackPanel>\r
+            </StackPanel>\r
+\r
+            \r
+        </Grid>\r
+\r
+        <StackPanel Grid.Row="2" Background="Black" Opacity="0.45" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>\r
+\r
+    </Grid>\r
 \r
-        <StackPanel VerticalAlignment="Top">\r
-            <TextBlock SnapsToDevicePixels="True" VerticalAlignment="Top" FontSize="16" Margin="0,11,0,0" HorizontalAlignment="Left"\r
-                       FontWeight="Bold"\r
-                       Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Path=Message}" \r
-                       Foreground="LightBlue" />\r
 \r
-            <TextBlock SnapsToDevicePixels="True" VerticalAlignment="Top" FontSize="12" Margin="0,5" HorizontalAlignment="Left"\r
-                       Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Path=SubMessage}" \r
-                       Foreground="LightBlue" />\r
-        </StackPanel>\r
-    </DockPanel>\r
 </UserControl>\r

diff --git a/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml.cs b/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml.cs
index 92ca002d5b2a000a82d94d384d55ff9e9563c016..404e2981b7353755774568bb2d51ff753553fb78 100644 (file)
--- a/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml.cs
+++ b/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml.cs
@@ -9,6 +9,7 @@
 \r
 namespace HandBrakeWPF.Controls\r
 {\r
+    using System;\r
     using System.Windows;\r
     using System.Windows.Controls;\r
 \r
@@ -23,6 +24,7 @@ namespace HandBrakeWPF.Controls
         public StatusPanel()\r
         {\r
             InitializeComponent();\r
+            this.Message = "Message";\r
         }\r
 \r
         /// <summary>\r
@@ -35,13 +37,25 @@ namespace HandBrakeWPF.Controls
         /// Dependancy Property for the Message Property\r
         /// </summary>\r
         public static readonly DependencyProperty MessageProperty =\r
-            DependencyProperty.Register("Message", typeof(string), typeof(StatusPanel), new UIPropertyMetadata(string.Empty));\r
+            DependencyProperty.Register("Message", typeof(string), typeof(StatusPanel), new UIPropertyMetadata("Loading..."));\r
 \r
         /// <summary>\r
         /// Dependancy Property for the submessage propery\r
         /// </summary>\r
         public static readonly DependencyProperty SubMessageProperty =\r
-            DependencyProperty.Register("SubMessage", typeof(string), typeof(StatusPanel), new UIPropertyMetadata(string.Empty));\r
+            DependencyProperty.Register("SubMessage", typeof(string), typeof(StatusPanel), new FrameworkPropertyMetadata("Please Wait", FrameworkPropertyMetadataOptions.AffectsRender));\r
+\r
+        /// <summary>\r
+        /// Dependancy Property for the submessage propery\r
+        /// </summary>\r
+        public static readonly DependencyProperty ActionProperty =\r
+            DependencyProperty.Register("CancelAction", typeof(Action), typeof(StatusPanel), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.None, OnCancelActionSet));\r
+\r
+        /// <summary>\r
+        /// Dependancy Property for the submessage propery\r
+        /// </summary>\r
+        public static readonly DependencyProperty ActionTextProperty =\r
+            DependencyProperty.Register("ActionText", typeof(string), typeof(StatusPanel), new UIPropertyMetadata("Cancel"));\r
 \r
         /// <summary>\r
         /// Gets or sets a value indicating whether IsLoading.\r
@@ -69,5 +83,65 @@ namespace HandBrakeWPF.Controls
             get { return (string)GetValue(SubMessageProperty); }\r
             set { SetValue(SubMessageProperty, value); }\r
         }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the cancel action.\r
+        /// </summary>\r
+        public Action CancelAction\r
+        {\r
+            get { return (Action)GetValue(ActionProperty); }\r
+            set { SetValue(SubMessageProperty, value); }\r
+        }\r
+\r
+        /// <summary>\r
+        /// The on cancel action set.\r
+        /// </summary>\r
+        /// <param name="d">\r
+        /// The d.\r
+        /// </param>\r
+        /// <param name="e">\r
+        /// The e.\r
+        /// </param>\r
+        private static void OnCancelActionSet(DependencyObject d, DependencyPropertyChangedEventArgs e)\r
+        {\r
+       \r
+        }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the action text.\r
+        /// </summary>\r
+        public string ActionText\r
+        {\r
+            get { return (string)GetValue(ActionTextProperty); }\r
+            set { SetValue(ActionTextProperty, value); }\r
+        }\r
+\r
+        /// <summary>\r
+        /// Gets a value indicating whether is action button visible.\r
+        /// </summary>\r
+        public bool IsActionButtonVisible\r
+        {\r
+            get\r
+            {\r
+                return true; // this.CancelAction != null;\r
+            }\r
+        }\r
+\r
+        /// <summary>\r
+        /// The status action button_ on click.\r
+        /// </summary>\r
+        /// <param name="sender">\r
+        /// The sender.\r
+        /// </param>\r
+        /// <param name="e">\r
+        /// The e.\r
+        /// </param>\r
+        private void StatusActionButton_OnClick(object sender, RoutedEventArgs e)\r
+        {\r
+            if (this.CancelAction != null)\r
+            {\r
+                this.CancelAction();\r
+            }\r
+        }\r
     }\r
 }\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 71d8c6a73d6dc8dc0d3f6120e4c8f6c58f21fd84..7465ceb10647f3e8f0885006ed2e9d95d4bb9380 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -53,6 +53,7 @@ namespace HandBrakeWPF.ViewModels
 \r
     using Ookii.Dialogs.Wpf;\r
 \r
+    using Action = System.Action;\r
     using Execute = Caliburn.Micro.Execute;\r
     using IQueueProcessor = HandBrakeWPF.Services.Queue.Interfaces.IQueueProcessor;\r
 \r
@@ -1046,6 +1047,17 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>\r
         public IStaticPreviewViewModel StaticPreviewViewModel { get; set; }\r
 \r
+        /// <summary>\r
+        /// Gets the cancel action.\r
+        /// </summary>\r
+        public Action CancelAction\r
+        {\r
+            get\r
+            {\r
+                return this.CancelScan;\r
+            }\r
+        }\r
+\r
         #endregion\r
 \r
         #region Load and Shutdown Handling\r

diff --git a/win/CS/HandBrakeWPF/Views/AboutView.xaml b/win/CS/HandBrakeWPF/Views/AboutView.xaml
index d7b63c08bdc9a31f1d6a4dcd67e7dfe367480c8a..ac625ef5d6d0e23168722d9add1c7ecbeeb31473 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/AboutView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AboutView.xaml
@@ -34,8 +34,8 @@
                 <StackPanel Grid.Row="0"\r
                             Margin="5,10,0,0"\r
                             Orientation="Horizontal">\r
-                    <TextBlock Margin="0,0,5,0" FontSize="12" FontWeight="Bold" Text="HandBrake " />\r
-                    <TextBlock Margin="0,0,0,1" FontSize="12" VerticalAlignment="Bottom" Text="{Binding Version}" />\r
+                    <TextBlock Margin="0,0,5,0" FontSize="16" FontFamily="Segoe UI Light" Text="Version: " />\r
+                    <TextBlock Margin="0,0,0,1" FontSize="16" FontFamily="Segoe UI Light" VerticalAlignment="Bottom" Text="{Binding Version}" />\r
                 </StackPanel>\r
 \r
                 <TextBlock Grid.Row="1" Margin="5,10,0,5" Text="License: " />\r

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 44a46b19521231688a94df690f0cb6db44ebfecf..8e365891a4a28ece65dd268e12886c15283069ae 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -641,24 +641,26 @@
 \r
         <!-- Source Selection-->\r
         <Controls:SourceSelection Grid.Row="1" MinWidth="300" HorizontalAlignment="Left" VerticalAlignment="Stretch" BorderThickness="1" BorderBrush="DarkGray"\r
-                                  Visibility="{Binding ShowSourceSelection, Converter={StaticResource boolToVisConverter}}" Panel.ZIndex="1"\r
+                                  Visibility="{Binding ShowSourceSelection, Converter={StaticResource boolToVisConverter}, TargetNullValue=Collapsed, FallbackValue=Collapsed}" Panel.ZIndex="1"\r
                                   />\r
 \r
 \r
-        <DockPanel Background="Black" Opacity="0.40" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Panel.ZIndex="0"\r
+        <!--<DockPanel Background="Black" Opacity="0.40" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Panel.ZIndex="0"\r
                    Grid.Row="1"\r
-                   Visibility="{Binding ShowSourceSelection, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />\r
+                   Visibility="{Binding ShowSourceSelection, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />-->\r
 \r
-        <!--  StatusPanel  -->\r
+        <!--  StatusPanel   Height="70" -->\r
         <Controls:StatusPanel x:Name="loadingPanel"\r
-                              Grid.Row="1"\r
-                              Grid.RowSpan="2"\r
-                              Height="70"\r
-                              VerticalAlignment="Bottom"\r
+                              Grid.Row="0"\r
+                              Grid.RowSpan="3"\r
+                              Visibility="{Binding ShowStatusWindow, Converter={StaticResource boolToVisConverter}, ConverterParameter=false, TargetNullValue=Collapsed, FallbackValue=Collapsed}"\r
+                              VerticalAlignment="Stretch" HorizontalAlignment="Stretch"\r
                               Panel.ZIndex="10"\r
                               IsLoading="{Binding ShowStatusWindow}"\r
-                              Message="{Binding StatusLabel}"\r
-                              SubMessage="Please Wait ..."\r
+                              Message="Please wait ..."\r
+                              SubMessage="{Binding StatusLabel}"\r
+                              ActionText="Cancel"\r
+                              CancelAction="{Binding CancelAction}"\r
                               />\r
 \r
         <!--  Status Bar  -->\r

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 52f9568d21e1ce204d638ef43e164a3532dd0a5a..a558cd52580e65600edc326b12f7287292f8e2f4 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -53,50 +53,51 @@
         </Grid.ColumnDefinitions>\r
 \r
         <Grid.RowDefinitions>\r
+            <RowDefinition Height="Auto" />\r
             <RowDefinition Height="*" />\r
             <RowDefinition Height="Auto" />\r
         </Grid.RowDefinitions>\r
 \r
-        <StackPanel Orientation="Vertical" Grid.Column="0" Margin="10,10,0,0">\r
-            <Border BorderThickness="0 0 0 1" BorderBrush="LightGray" Margin="0,0,0,10">\r
-                <TextBlock Text="Preferences" FontSize="16" />\r
-            </Border>\r
+        <!-- Row 1 -->\r
+        <TextBlock Text="Options" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" Grid.ColumnSpan="2" />\r
+\r
+        <Border BorderBrush="DarkGray"  Grid.Column="0" Grid.Row="1"  BorderThickness="0,0,1,0">\r
+            <StackPanel Orientation="Vertical" Margin="11,5,-1,0">\r
 \r
-            <ListBox ItemsSource="{Binding Source={StaticResource OptionTabsList}}" SelectedItem="{Binding SelectedTab}"\r
+                <ListBox ItemsSource="{Binding Source={StaticResource OptionTabsList}}" SelectedItem="{Binding SelectedTab}"\r
                      BorderThickness="0" Background="Transparent">\r
-                <ListBox.ItemTemplate>\r
-                    <DataTemplate>\r
-                        <TextBlock Text="{Binding Converter={StaticResource tabNameConverter}}"/>\r
-                    </DataTemplate>\r
-                </ListBox.ItemTemplate>\r
-            </ListBox>\r
+                    <ListBox.ItemTemplate>\r
+                        <DataTemplate>\r
+                            <TextBlock Text="{Binding Converter={StaticResource tabNameConverter}}"/>\r
+                        </DataTemplate>\r
+                    </ListBox.ItemTemplate>\r
+                </ListBox>\r
 \r
-        </StackPanel>\r
+            </StackPanel>\r
+        </Border>\r
 \r
-        <ScrollViewer Grid.Column="1">\r
+        <ScrollViewer Grid.Column="1" Grid.Row="1" >\r
             <StackPanel Orientation="Vertical">\r
 \r
-                <StackPanel Name="General" Orientation="Vertical" Margin="10,10,0,0"\r
+                <StackPanel Name="General" Orientation="Vertical" Margin="10,5,0,0"\r
                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.General}}">\r
 \r
-                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">\r
-                        <TextBlock Text="General" FontSize="16" />\r
-                    </Border>\r
+                    <TextBlock Text="General" FontSize="20" FontFamily="Segoe UI Light"  />\r
 \r
                     <StackPanel Orientation="Vertical" Margin="0,10,0,20">\r
 \r
-                        <TextBlock Text="On Startup" Grid.Column="0" FontSize="14" Margin="0,0,0,10"/>\r
+                        <TextBlock Text="On Startup" FontSize="14" Margin="0,0,0,10"/>\r
 \r
-                        <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">\r
+                        <StackPanel Orientation="Vertical" Margin="20,0,0,0">\r
                             <CheckBox Content="Check for Updates" IsChecked="{Binding CheckForUpdates}" />\r
                             <ComboBox Name="checkForUpdateFrequency" ItemsSource="{Binding CheckForUpdatesFrequencies}" SelectedIndex="{Binding CheckForUpdatesFrequency}" Margin="25,0,0,5" HorizontalAlignment="Left" Width="120"></ComboBox>\r
                         </StackPanel>\r
                     </StackPanel>\r
 \r
                     <StackPanel Orientation="Vertical" Margin="0,0,0,20">\r
-                        <TextBlock Text="When Done" Grid.Column="0" FontSize="14" Margin="0,0,0,10" />\r
+                        <TextBlock Text="When Done" FontSize="14" Margin="0,0,0,10" />\r
 \r
-                        <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">\r
+                        <StackPanel Orientation="Vertical" Margin="20,0,0,0">\r
                             <StackPanel Orientation="Horizontal">\r
                                 <ComboBox Name="whenDone" ItemsSource="{Binding WhenDoneOptions}" SelectedItem="{Binding WhenDone}" Width="120"  HorizontalAlignment="Left" />\r
 \r
@@ -158,18 +159,16 @@
                     </StackPanel>\r
                 </StackPanel>\r
 \r
-                <StackPanel Name="Output" Orientation="Vertical" Margin="10,10,0,0"\r
+                <StackPanel Name="Output" Orientation="Vertical" Margin="10,5,0,0"\r
                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.OutputFiles}}">\r
 \r
-                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">\r
-                        <TextBlock Text="Output Files" FontSize="16" />\r
-                    </Border>\r
+                    <TextBlock Text="Output Files" FontSize="20" FontFamily="Segoe UI Light"  />\r
 \r
                     <StackPanel Orientation="Vertical" Margin="0,10,0,20">\r
 \r
-                        <TextBlock Text="Automatic File Naming" Grid.Column="0" FontSize="14" Margin="0,0,0,10"/>\r
+                        <TextBlock Text="Automatic File Naming" FontSize="14" Margin="0,0,0,10"/>\r
 \r
-                        <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">\r
+                        <StackPanel Orientation="Vertical" Margin="20,0,0,0">\r
                             <CheckBox Content="Automatically name output files" IsChecked="{Binding AutomaticallyNameFiles}" />\r
 \r
                             <Grid Margin="0,5,0,0">\r
@@ -182,7 +181,7 @@
                                     <ColumnDefinition Width="Auto" />\r
                                     <ColumnDefinition Width="Auto" />\r
                                 </Grid.ColumnDefinitions>\r
-                                \r
+\r
                                 <TextBlock VerticalAlignment="Center" Text="Default Path: " Grid.Column="0" Grid.Row="0" />\r
                                 <TextBox Name="autoNameOutputPath" Text="{Binding AutoNameDefaultPath}" Width="380" Grid.Column="1" Grid.Row="0" \r
                                          ToolTip="{x:Static Properties:Resources.Options_DefaultPathAdditionalParams}" Style="{StaticResource LongToolTipHolder}"  />\r
@@ -208,14 +207,12 @@
                     </StackPanel>\r
                 </StackPanel>\r
 \r
-                <StackPanel Name="Hardware" Orientation="Vertical" Margin="10,10,0,0"\r
+                <StackPanel Name="Hardware" Orientation="Vertical" Margin="10,5,0,0"\r
                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.Video}}">\r
 \r
-                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">\r
-                        <TextBlock Text="Video" FontSize="16" />\r
-                    </Border>\r
+                    <TextBlock Text="Video" FontSize="20" FontFamily="Segoe UI Light" />\r
 \r
-                    <StackPanel Orientation="Vertical" Margin="0,10,0,20">\r
+                    <StackPanel Orientation="Vertical" Margin="0,0,0,20">\r
 \r
                         <TextBlock Text="Decoding" FontSize="14" Margin="0,10,0,10" />\r
 \r
@@ -232,7 +229,7 @@
                         </StackPanel>\r
 \r
                         <TextBlock Text="Scaling" FontSize="14" Margin="0,20,0,10" />\r
-                        \r
+\r
                         <StackPanel Orientation="Horizontal" Margin="20,0,0,0">\r
                             <TextBlock Text="Choose Scaler: " Margin="0,0,5,0" VerticalAlignment="Center" />\r
                             <ComboBox  ItemsSource="{Binding ScalingOptions, Converter={StaticResource enumComboConverter}}" \r
@@ -244,24 +241,23 @@
                             <TextBlock Text="{x:Static Properties:Resources.Video_ScalingModes}" TextWrapping="Wrap"\r
                                        Visibility="{Binding IsClScaling, Converter={StaticResource boolToVisConverter}}" />\r
                         </StackPanel>\r
-               \r
+\r
                     </StackPanel>\r
 \r
-             \r
+\r
                 </StackPanel>\r
 \r
-                <StackPanel  Name="Advanced" Orientation="Vertical" Margin="10,10,0,0"\r
+                <StackPanel  Name="Advanced" Orientation="Vertical" Margin="10,5,0,0"\r
                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.Advanced}}">\r
 \r
-                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">\r
-                        <TextBlock Text="Advanced" FontSize="16" />\r
-                    </Border>\r
+\r
+                    <TextBlock Text="Advanced" FontSize="20" FontFamily="Segoe UI Light"  />\r
 \r
                     <StackPanel Orientation="Vertical" Margin="0,10,0,20">\r
 \r
-                        <TextBlock Text="Advanced Options" Grid.Column="0" FontSize="14" Margin="0,0,0,10"/>\r
+                        <TextBlock Text="Advanced Options" FontSize="14" Margin="0,0,0,10"/>\r
 \r
-                        <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">\r
+                        <StackPanel Orientation="Vertical" Margin="20,0,0,0">\r
                             <CheckBox Content="Prevent the system from sleeping while encoding" IsChecked="{Binding PreventSleep}" />\r
                             <StackPanel Orientation="Horizontal" Margin="0,10,0,0">\r
                                 <TextBlock Text="Number of picture previews to scan:" VerticalAlignment="Center" Width="250" />\r
@@ -327,15 +323,13 @@
 \r
                 </StackPanel>\r
 \r
-                <StackPanel Name="Updates" Orientation="Vertical" Margin="10,10,0,0"\r
+                <StackPanel Name="Updates" Orientation="Vertical" Margin="10,5,0,0"\r
                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.Updates}}">\r
 \r
 \r
-                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">\r
-                        <TextBlock Text="Updates" FontSize="16" />\r
-                    </Border>\r
+                    <TextBlock Text="Updates" FontSize="20" FontFamily="Segoe UI Light" />\r
 \r
-                    <TextBlock Text="Current Version" Grid.Column="0" FontSize="14" Margin="0,10,0,10"/>\r
+                    <TextBlock Text="Current Version" FontSize="14" Margin="0,10,0,10"/>\r
 \r
                     <Grid Margin="20,10,0,20">\r
                         <Grid.ColumnDefinitions>\r
@@ -348,7 +342,7 @@
                         <TextBlock Grid.Column="1" Margin="0,0,0,1" VerticalAlignment="Bottom" Text="{Binding Version}" />\r
                     </Grid>\r
 \r
-                    <TextBlock Text="Updates" Grid.Column="0" FontSize="14" Margin="0,10,0,10"/>\r
+                    <TextBlock Text="Updates" FontSize="14" Margin="0,10,0,10"/>\r
 \r
                     <StackPanel Margin="20,0,0,0" Orientation="Horizontal">\r
                         <Button Content="Check for Updates" MaxWidth="130" Margin="0,0,5,0" cal:Message.Attach="[Event Click] = [Action PerformUpdateCheck]" />\r
@@ -358,20 +352,17 @@
                     <StackPanel Margin="20,10,0,0" Orientation="Horizontal">\r
                         <ProgressBar Minimum="0" Maximum="100" Height="20" Width="400" Value="{Binding DownloadProgressPercentage}" \r
                                  Visibility="{Binding UpdateAvailable, Converter={StaticResource boolToVisConverter}}" />\r
-                        \r
+\r
                     </StackPanel>\r
 \r
                     <TextBlock Text="{Binding UpdateMessage}" Margin="20,5,10,0" VerticalAlignment="Center" TextWrapping="Wrap" />\r
 \r
                 </StackPanel>\r
 \r
-                <StackPanel Name="About" Orientation="Vertical" Margin="10,10,0,0"\r
+                <StackPanel Name="About" Orientation="Vertical" Margin="10,5,0,0"\r
                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.About}}">\r
 \r
-\r
-                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">\r
-                        <TextBlock Text="About HandBrake" FontSize="16" />\r
-                    </Border>\r
+                    <TextBlock Text="About HandBrake" FontSize="20" FontFamily="Segoe UI Light"  />\r
 \r
                     <ContentControl x:Name="AboutViewModel" />\r
 \r
@@ -379,7 +370,7 @@
             </StackPanel>\r
         </ScrollViewer>\r
 \r
-        <StackPanel HorizontalAlignment="Stretch" Grid.Row="1" Grid.ColumnSpan="2" >\r
+        <StackPanel HorizontalAlignment="Stretch" Grid.Row="2" Grid.ColumnSpan="2" >\r
             <StackPanel.Style>\r
                 <Style TargetType="StackPanel">\r
                     <Style.Triggers>\r
@@ -389,11 +380,10 @@
                     </Style.Triggers>\r
                 </Style>\r
             </StackPanel.Style>\r
-            \r
+\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
-\r
     </Grid>\r
+\r
 </UserControl>\r

diff --git a/win/CS/HandBrakeWPF/Views/ShellView.xaml b/win/CS/HandBrakeWPF/Views/ShellView.xaml
index 063678da5cc0289e58be90c6c87b95fd89440e06..9524199b9c89250b50941fec54624b6170c509a3 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/ShellView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ShellView.xaml
@@ -39,8 +39,8 @@
         <DockPanel Background="Black" Opacity="0.60" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Panel.ZIndex="1"\r
                Visibility="{Binding ShowOverlayPanel, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />\r
         \r
-        <ContentControl x:Name="OverlayPanelViewModel"  Visibility="{Binding ShowOverlayPanel, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" \r
-                        VerticalAlignment="Center" HorizontalAlignment="Center" Panel.ZIndex="2" MinWidth="900" MinHeight="675"  />\r
+        <!--<ContentControl x:Name="OverlayPanelViewModel"  Visibility="{Binding ShowOverlayPanel, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" \r
+                        VerticalAlignment="Center" HorizontalAlignment="Center" Panel.ZIndex="2" MinWidth="900" MinHeight="675"  />-->\r
 \r
 \r
     </Grid>\r