From 9be558d961413ee242da53dfc18a7c819b0faf41 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Thu, 14 Jun 2012 09:46:46 +0000
Subject: WinGui: Initial layout changes to the options screen.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4729 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 .../Converters/Options/OptionsTabConverter.cs      |  66 ++++++
 win/CS/HandBrakeWPF/HandBrakeWPF.csproj            |   1 +
 win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs |  38 ++++
 win/CS/HandBrakeWPF/Views/OptionsView.xaml         | 244 ++++++++++++---------
 4 files changed, 242 insertions(+), 107 deletions(-)
 create mode 100644 win/CS/HandBrakeWPF/Converters/Options/OptionsTabConverter.cs

(limited to 'win/CS')

diff --git a/win/CS/HandBrakeWPF/Converters/Options/OptionsTabConverter.cs b/win/CS/HandBrakeWPF/Converters/Options/OptionsTabConverter.cs
new file mode 100644
index 000000000..5799425d9
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Converters/Options/OptionsTabConverter.cs
@@ -0,0 +1,66 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="OptionsTabConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The Options Tab Converter. Controls which tab is dispalyed.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+
+namespace HandBrakeWPF.Converters.Options
+{
+    using System;
+    using System.Globalization;
+    using System.Windows;
+    using System.Windows.Data;
+
+    /// <summary>
+    /// The Options Tab Converter. Controls which tab is dispalyed.
+    /// </summary>
+    class OptionsTabConverter : IValueConverter
+    {
+        /// <summary>
+        /// Converts a value. 
+        /// </summary>
+        /// <returns>
+        /// A converted value. If the method returns null, the valid null value is used.
+        /// </returns>
+        /// <param name="value">The value produced by the binding source.</param><param name="targetType">The type of the binding target property.</param><param name="parameter">The converter parameter to use.</param><param name="culture">The culture to use in the converter.</param>
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value != null && parameter != null)
+            {
+                switch (value.ToString())
+                {
+                    case "General":
+                        if (parameter.ToString() == "General") return Visibility.Visible;
+                        break;
+                    case "Output Files":
+                        if (parameter.ToString() == "Output Files") return Visibility.Visible;
+                        break;
+                    case "Language":
+                        if (parameter.ToString() == "Language") return Visibility.Visible;
+                        break;
+                    case "Advanced":
+                        if (parameter.ToString() == "Advanced") return Visibility.Visible;
+                        break;
+                }
+            }
+
+            return Visibility.Collapsed;
+        }
+
+        /// <summary>
+        /// Converts a value. 
+        /// </summary>
+        /// <returns>
+        /// A converted value. If the method returns null, the valid null value is used.
+        /// </returns>
+        /// <param name="value">The value that is produced by the binding target.</param><param name="targetType">The type to convert to.</param><param name="parameter">The converter parameter to use.</param><param name="culture">The culture to use in the converter.</param>
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index bb6511e7f..1ab37f13e 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -120,6 +120,7 @@
     <Compile Include="Converters\Audio\AudioBitrateConverter.cs" />
     <Compile Include="Converters\Audio\AudioEncoderConverter.cs" />
     <Compile Include="Converters\BooleanToHiddenVisibilityConverter.cs" />
+    <Compile Include="Converters\Options\OptionsTabConverter.cs" />
     <Compile Include="Converters\Video\VideoEncoderConverter.cs" />
     <Compile Include="Model\ShellWindow.cs" />
     <Compile Include="Views\ShellView.xaml.cs">
diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index 706009107..ff402a9ed 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -310,6 +310,11 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>
         private bool clearQueueOnEncodeCompleted;
 
+        /// <summary>
+        /// The options tab that is selected.
+        /// </summary>
+        private string selectedTab;
+
         #endregion
 
         #region Constructors and Destructors
@@ -332,8 +337,41 @@ namespace HandBrakeWPF.ViewModels
             this.userSettingService = userSettingService;
             this.shellViewModel = shellViewModel;
             this.OnLoad();
+
+            this.SelectedTab = "General";
+        }
+
+        #endregion
+
+        #region Window Properties
+
+        /// <summary>
+        /// Gets OptionTabs.
+        /// </summary>
+        public IEnumerable<string> OptionTabs
+        {
+            get
+            {
+                return new List<string> { "General", "Output Files", "Language", "Advanced" };
+            }
         }
 
+        /// <summary>
+        /// Gets or sets SelectedTab.
+        /// </summary>
+        public string SelectedTab
+        {
+            get
+            {
+                return this.selectedTab;
+            }
+
+            set
+            {
+                this.selectedTab = value;
+                this.NotifyOfPropertyChange(() => this.SelectedTab);
+            }
+        }
         #endregion
 
         #region Properties
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 80a97754f..6fd6b5524 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -1,7 +1,8 @@
 <UserControl  x:Class="HandBrakeWPF.Views.OptionsView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cal="http://www.caliburnproject.org"
-        xmlns:Helpers="clr-namespace:HandBrakeWPF.Helpers" >
+        xmlns:Helpers="clr-namespace:HandBrakeWPF.Helpers"
+              xmlns:Options="clr-namespace:HandBrakeWPF.Converters.Options" Background="White">
 
     <UserControl.Resources>
         <Style TargetType="Button">
@@ -21,28 +22,54 @@
         <Style TargetType="CheckBox">
             <Setter Property="Margin" Value="0,0,0,5" />
         </Style>
-        </UserControl.Resources>
 
-    <Grid Background="#FFF1F0EF">
+        <Style TargetType="ListBoxItem">
+            <Setter Property="Padding" Value="8,4" />
+            <!--<Style.Triggers>
+                <DataTrigger Binding="{Binding IsBuildIn}" Value="True">
+                    <Setter Property="Foreground" Value="DarkBlue" />
+                </DataTrigger>
+            </Style.Triggers>-->
+        </Style>
+
+        <Options:OptionsTabConverter x:Key="tabConverter" />
+    </UserControl.Resources>
+
+
+
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="150" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        
-        <!-- Header -->
-        <StackPanel Orientation="Horizontal"  Background="White" Height="50" Grid.Row="0" >
-            <Image Source="Images/Preferences.png" Margin="10,0,5,0" Width="32" Height="32" VerticalAlignment="Center" />
-            <StackPanel Orientation="Vertical" VerticalAlignment="Center">
-                <TextBlock Text="Options" FontWeight="Bold" />
-                <TextBlock Text="Preferences to control various features in HandBrake" />
-            </StackPanel>
+
+
+        <StackPanel Orientation="Vertical" Grid.Column="0" Margin="10,10,0,0">
+            <Border BorderThickness="0 0 0 1" BorderBrush="LightGray" Margin="0,0,0,10">
+                <TextBlock Text="Preferences" FontSize="16" />
+            </Border>
+            
+            <ListBox ItemsSource="{Binding OptionTabs}" SelectedItem="{Binding SelectedTab}"
+                     BorderThickness="0" Background="Transparent">
+            </ListBox>
+            
         </StackPanel>
 
-        <!-- Options Panel-->
-        <TabControl Margin="10,10,10,10" MinHeight="410" Grid.Row="1">
-            <TabItem Header="General">
-                <StackPanel Orientation="Vertical">
+        <ScrollViewer Grid.Column="1">
+            <StackPanel Orientation="Vertical">
+
+                <StackPanel Name="General" Orientation="Vertical" Margin="10,10,0,0"
+                            Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter='General'}">
+
+                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">
+                        <TextBlock Text="General" FontSize="16" />
+                    </Border>
+
                     <Grid Margin="10,10,0,10">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="100" />
@@ -88,11 +115,35 @@
 
                         </StackPanel>
                     </Grid>
+
+                    <Grid Margin="10,10,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="100" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Text="VLC Path:" Grid.Column="0" FontWeight="Bold"/>
+
+                        <StackPanel Orientation="Vertical" Grid.Column="1">
+
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock VerticalAlignment="Center" Text="Path:" />
+                                <TextBox Name="vlcPath" Text="{Binding VLCPath}"  Width="180" />
+                                <Button Content="Browse" cal:Message.Attach="[Event Click] = [Action BrowseVlcPath]" Margin="5,0,0,0" Width="55"/>
+                            </StackPanel>
+                            <TextBlock Text="This path is used for the video preview feature only." />
+
+                        </StackPanel>
+                    </Grid>
                 </StackPanel>
-            </TabItem>
 
-            <TabItem Header="Output Files">
-                <StackPanel Orientation="Vertical">
+                <StackPanel Name="Output" Orientation="Vertical" Margin="10,10,0,0"
+                            Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter='Output Files'}">
+
+                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">
+                        <TextBlock Text="Output Files" FontSize="16" />
+                    </Border>
+                    
                     <Grid Margin="10,10,0,10">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="100" />
@@ -129,35 +180,14 @@
                         </StackPanel>
                     </Grid>
                 </StackPanel>
-            </TabItem>
-
-            <TabItem Header="Preview">
-                <StackPanel Orientation="Vertical">
-                    <Grid Margin="10,10,0,10">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="100" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-
-                        <TextBlock Text="VLC Path:" Grid.Column="0" FontWeight="Bold"/>
-
-                        <StackPanel Orientation="Vertical" Grid.Column="1">
-
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock VerticalAlignment="Center" Text="Path:" />
-                                <TextBox Name="vlcPath" Text="{Binding VLCPath}"  Width="180" />
-                                <Button Content="Browse" cal:Message.Attach="[Event Click] = [Action BrowseVlcPath]" Margin="5,0,0,0" Width="55"/>
-                            </StackPanel>
-                            <TextBlock Text="This path is used for the video preview feature only." />
-
-                        </StackPanel>
-                    </Grid>
-                </StackPanel>
-            </TabItem>
 
-            <TabItem Header="Audio and Subtitles">
-                <StackPanel Orientation="Vertical">
+                <StackPanel Name="Audio" Orientation="Vertical" Margin="10,10,0,0"
+                            Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter='Language'}">
 
+                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">
+                        <TextBlock Text="Automatic Language Selection" FontSize="16" />
+                    </Border>
+                    
                     <TextBlock Text="Automatic Selection" Grid.Column="0" Margin="10,10,0,0" FontWeight="Bold"/>
 
                     <Grid Margin="10,10,0,0">
@@ -254,125 +284,125 @@
                     </StackPanel>
 
                 </StackPanel>
-            </TabItem>
 
-            <TabItem Header="System and Logging">
-                <StackPanel Orientation="Vertical">
+                <StackPanel Name="Advanced" Orientation="Vertical" Margin="10,10,0,0"
+                            Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter='Advanced'}">
+                    
+                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">
+                        <TextBlock Text="Advanced" FontSize="16" />
+                    </Border>
+                    
                     <Grid Margin="10,10,0,10">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="100" />
                             <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
 
-                        <TextBlock Text="CLI:" Grid.Column="0" FontWeight="Bold"/>
-                        <StackPanel Orientation="Horizontal" Grid.Column="1">
-                            <TextBlock Text="Priority Level:" VerticalAlignment="Center" />
-                            <ComboBox Name="processPriorityLevel" ItemsSource="{Binding PriorityLevelOptions}" SelectedItem="{Binding SelectedPriority}" Width="120" />
+                        <TextBlock Text="GUI:" Grid.Column="0" FontWeight="Bold"/>
+                        <StackPanel Orientation="Vertical" Grid.Column="1">
+                            <CheckBox Content="Minimize to system tray (Requires Restart)" Visibility="Collapsed" IsChecked="{Binding MinimiseToTray}" />
+                            <CheckBox Content="Display status messages from tray icon (balloon popups)"  Visibility="Collapsed"  IsChecked="{Binding DisplayStatusMessagesTrayIcon}" />
+                            <CheckBox Content="Disable built-in preset update notification" IsChecked="{Binding DisablePresetUpdateCheckNotification}" />
+                            <CheckBox Content="Show CLI window (Allows you to cleanly exit encode with ctrl-c)" IsChecked="{Binding ShowCliWindow}" />
+                            <CheckBox Content="Always clear completed queue items after an encode completes" IsChecked="{Binding ClearQueueOnEncodeCompleted}" />
+                            <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+                                <TextBlock Text="Number of picture previews to scan:" VerticalAlignment="Center" Width="250" />
+                                <ComboBox Name="numberOfPreviews" ItemsSource="{Binding PreviewPicturesToScan}" SelectedItem="{Binding SelectedPreviewCount}" Width="120" />
+                            </StackPanel>
+                            <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
+                                <TextBlock Text="Minimum length of title to scan (seconds):" VerticalAlignment="Center" Width="250" />
+                                <TextBox Name="MinTitleLength" Text="{Binding MinLength}"  Width="120"/>
+                                <!-- Find a control for this-->
+                            </StackPanel>
+
                         </StackPanel>
                     </Grid>
 
-                    <Grid Margin="10,10,0,10">
+                    <Grid Margin="10,0,0,10">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="100" />
                             <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
-                        <TextBlock Text="System:" Grid.Column="0" FontWeight="Bold"/>
+                        <TextBlock Text="x264:" Grid.Column="0" FontWeight="Bold"/>
                         <StackPanel Orientation="Horizontal" Grid.Column="1">
-                            <CheckBox Content="Prevent the system from sleeping while encoding" IsChecked="{Binding PreventSleep}" />
+                            <TextBlock Text="Constant quality fractional granularity:" VerticalAlignment="Center" Width="250" />
+                            <ComboBox Name="x264Granularity" ItemsSource="{Binding ConstantQualityGranularity}" SelectedItem="{Binding SelectedGranulairty}" Width="120"/>
                         </StackPanel>
                     </Grid>
 
-                    <Grid Margin="10,10,0,10">
+                    <Grid Margin="10,0,0,10">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="100" />
                             <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
 
-                        <TextBlock Text="Logs:" Grid.Column="0" FontWeight="Bold"/>
+                        <TextBlock Text="DVD:" Grid.Column="0" FontWeight="Bold"/>
 
                         <StackPanel Orientation="Vertical" Grid.Column="1">
-                            <StackPanel Orientation="Horizontal" Grid.Column="1">
-                                <TextBlock Text="Log Verbosity Level:" VerticalAlignment="Center" />
-                                <ComboBox Name="logVerbosityLevel" ItemsSource="{Binding LogVerbosityOptions}" SelectedItem="{Binding SelectedVerbosity}" Width="120" />
-                            </StackPanel>
-
-                            <CheckBox Content="Put a copy of individual encode logs in the same location as the encoded video" IsChecked="{Binding CopyLogToEncodeDirectory}" />
-                            <CheckBox Content="Put a copy of individual encode logs in a specified location: " IsChecked="{Binding CopyLogToSepcficedLocation}" />
-                            <StackPanel Orientation="Horizontal" Margin="0,10,0,0" Grid.Column="1">
-                                <TextBlock Text="Log Path:" VerticalAlignment="Center" />
-                                <TextBox Width="120" Text="{Binding LogDirectory}" />
-                                <Button Content="Browse" Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action BrowseLogPath]" />
-                            </StackPanel>
-                            <StackPanel Orientation="Horizontal" Margin="0,10,0,0" Grid.Column="1">
-                                <Button Content="View Log Directory" cal:Message.Attach="[Event Click] = [Action ViewLogDirectory]" Margin="0,0,5,0" />
-                                <Button Content="Clear Log History" cal:Message.Attach="[Event Click] = [Action ClearLogHistory]" />
-                            </StackPanel>
-
-                            <CheckBox Content="Clear Log files older than 30 days " Margin="0,5,0,0" IsChecked="{Binding ClearOldOlgs}" />
+                            <CheckBox Content="Disable LibDVDNav. (libdvdread will be used instead)" IsChecked="{Binding DisableLibdvdNav}" />
                         </StackPanel>
 
                     </Grid>
-                </StackPanel>
-            </TabItem>
 
-            <TabItem Header="Advanced">
-                <StackPanel Orientation="Vertical">
                     <Grid Margin="10,10,0,10">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="100" />
                             <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
 
-                        <TextBlock Text="GUI:" Grid.Column="0" FontWeight="Bold"/>
-                        <StackPanel Orientation="Vertical" Grid.Column="1">
-                            <CheckBox Content="Minimize to system tray (Requires Restart)" Visibility="Collapsed" IsChecked="{Binding MinimiseToTray}" />
-                            <CheckBox Content="Display status messages from tray icon (balloon popups)"  Visibility="Collapsed"  IsChecked="{Binding DisplayStatusMessagesTrayIcon}" />
-                            <CheckBox Content="Disable built-in preset update notification" IsChecked="{Binding DisablePresetUpdateCheckNotification}" />
-                            <CheckBox Content="Show CLI window (Allows you to cleanly exit encode with ctrl-c)" IsChecked="{Binding ShowCliWindow}" />
-                            <CheckBox Content="Always clear completed queue items after an encode completes" IsChecked="{Binding ClearQueueOnEncodeCompleted}" />
-                            <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
-                                <TextBlock Text="Number of picture previews to scan:" VerticalAlignment="Center" Width="250" />
-                                <ComboBox Name="numberOfPreviews" ItemsSource="{Binding PreviewPicturesToScan}" SelectedItem="{Binding SelectedPreviewCount}" Width="120" />
-                            </StackPanel>
-                            <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
-                                <TextBlock Text="Minimum length of title to scan (seconds):" VerticalAlignment="Center" Width="250" />
-                                <TextBox Name="MinTitleLength" Text="{Binding MinLength}"  Width="120"/>
-                                <!-- Find a control for this-->
-                            </StackPanel>
-
+                        <TextBlock Text="CLI:" Grid.Column="0" FontWeight="Bold"/>
+                        <StackPanel Orientation="Horizontal" Grid.Column="1">
+                            <TextBlock Text="Priority Level:" VerticalAlignment="Center" />
+                            <ComboBox Name="processPriorityLevel" ItemsSource="{Binding PriorityLevelOptions}" SelectedItem="{Binding SelectedPriority}" Width="120" />
                         </StackPanel>
                     </Grid>
 
-                    <Grid Margin="10,0,0,10">
+                    <Grid Margin="10,10,0,10">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="100" />
                             <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
-                        <TextBlock Text="x264:" Grid.Column="0" FontWeight="Bold"/>
+                        <TextBlock Text="System:" Grid.Column="0" FontWeight="Bold"/>
                         <StackPanel Orientation="Horizontal" Grid.Column="1">
-                            <TextBlock Text="Constant quality fractional granularity:" VerticalAlignment="Center" Width="250" />
-                            <ComboBox Name="x264Granularity" ItemsSource="{Binding ConstantQualityGranularity}" SelectedItem="{Binding SelectedGranulairty}" Width="120"/>
+                            <CheckBox Content="Prevent the system from sleeping while encoding" IsChecked="{Binding PreventSleep}" />
                         </StackPanel>
                     </Grid>
 
-                    <Grid Margin="10,0,0,10">
+                    <Grid Margin="10,10,0,10">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="100" />
                             <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
 
-                        <TextBlock Text="DVD:" Grid.Column="0" FontWeight="Bold"/>
+                        <TextBlock Text="Logs:" Grid.Column="0" FontWeight="Bold"/>
 
                         <StackPanel Orientation="Vertical" Grid.Column="1">
-                            <CheckBox Content="Disable LibDVDNav. (libdvdread will be used instead)" IsChecked="{Binding DisableLibdvdNav}" />
+                            <StackPanel Orientation="Horizontal" Grid.Column="1">
+                                <TextBlock Text="Log Verbosity Level:" VerticalAlignment="Center" />
+                                <ComboBox Name="logVerbosityLevel" ItemsSource="{Binding LogVerbosityOptions}" SelectedItem="{Binding SelectedVerbosity}" Width="120" />
+                            </StackPanel>
+
+                            <CheckBox Content="Put a copy of individual encode logs in the same location as the encoded video" IsChecked="{Binding CopyLogToEncodeDirectory}" />
+                            <CheckBox Content="Put a copy of individual encode logs in a specified location: " IsChecked="{Binding CopyLogToSepcficedLocation}" />
+                            <StackPanel Orientation="Horizontal" Margin="0,10,0,0" Grid.Column="1">
+                                <TextBlock Text="Log Path:" VerticalAlignment="Center" />
+                                <TextBox Width="120" Text="{Binding LogDirectory}" />
+                                <Button Content="Browse" Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action BrowseLogPath]" />
+                            </StackPanel>
+                            <StackPanel Orientation="Horizontal" Margin="0,10,0,0" Grid.Column="1">
+                                <Button Content="View Log Directory" cal:Message.Attach="[Event Click] = [Action ViewLogDirectory]" Margin="0,0,5,0" />
+                                <Button Content="Clear Log History" cal:Message.Attach="[Event Click] = [Action ClearLogHistory]" />
+                            </StackPanel>
+
+                            <CheckBox Content="Clear Log files older than 30 days " Margin="0,5,0,0" IsChecked="{Binding ClearOldOlgs}" />
                         </StackPanel>
 
                     </Grid>
                 </StackPanel>
-            </TabItem>
-        </TabControl>
+            </StackPanel>
+        </ScrollViewer>
 
-        <StackPanel HorizontalAlignment="Stretch" Background="LightGray" Grid.Row="2" >
+        <StackPanel HorizontalAlignment="Stretch" Background="LightGray" Grid.Row="1" Grid.ColumnSpan="2" >
             <Button Content="Save Changes" IsDefault="True" cal:Message.Attach="[Event Click] = [Action Close]"
                     HorizontalAlignment="Center" Padding="12,2" Margin="0,5,10,5" />
         </StackPanel>
-- 
cgit v1.2.3