From 76140507f1d927f4faa4b7d806a5ddca4b5d7753 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Sat, 22 Oct 2011 16:38:47 +0000
Subject: WinGui: Initial layout of the WPF options window

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4306 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 win/CS/HandBrakeWPF/HandBrakeWPF.csproj            |   7 +-
 win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs   |  20 +-
 .../HandBrakeWPF/ViewModels/AddPresetViewModel.cs  |   2 +
 .../ViewModels/Interfaces/IAboutViewModel.cs       |   9 +
 .../ViewModels/Interfaces/IOptionsViewModel.cs     |   9 +
 win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs    |  22 +-
 win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs |  20 +-
 win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs    |   9 +
 .../Views/Controls/PictureSettingsView.xaml        |  18 +-
 .../Views/Images/General Preferences.png           | Bin 1490 -> 0 bytes
 win/CS/HandBrakeWPF/Views/Images/Preferences.png   | Bin 0 -> 1490 bytes
 win/CS/HandBrakeWPF/Views/MainView.xaml            |  14 +-
 win/CS/HandBrakeWPF/Views/OptionsView.xaml         | 335 ++++++++++++++++++++-
 13 files changed, 429 insertions(+), 36 deletions(-)
 create mode 100644 win/CS/HandBrakeWPF/ViewModels/Interfaces/IAboutViewModel.cs
 create mode 100644 win/CS/HandBrakeWPF/ViewModels/Interfaces/IOptionsViewModel.cs
 delete mode 100644 win/CS/HandBrakeWPF/Views/Images/General Preferences.png
 create mode 100644 win/CS/HandBrakeWPF/Views/Images/Preferences.png

(limited to 'win/CS')

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 59151234c..7eaa3b2fa 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -65,9 +65,6 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="WPFToolkit.Extended">
-      <HintPath>..\libraries\WPFToolkit.Extended.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">
@@ -78,7 +75,9 @@
     <Compile Include="Startup\MefBootstrapper.cs" />
     <Compile Include="ViewModels\AboutViewModel.cs" />
     <Compile Include="ViewModels\AddPresetViewModel.cs" />
+    <Compile Include="ViewModels\Interfaces\IAboutViewModel.cs" />
     <Compile Include="ViewModels\Interfaces\IMainViewModel.cs" />
+    <Compile Include="ViewModels\Interfaces\IOptionsViewModel.cs" />
     <Compile Include="ViewModels\PreviewViewModel.cs" />
     <Compile Include="ViewModels\QueueViewModel.cs" />
     <Compile Include="ViewModels\OptionsViewModel.cs" />
@@ -239,7 +238,7 @@
     <Resource Include="Views\Images\Help16.png" />
     <Resource Include="Views\Images\hb32.png" />
     <Resource Include="Views\Images\hb16.png" />
-    <Resource Include="Views\Images\General Preferences.png" />
+    <Resource Include="Views\Images\Preferences.png" />
     <Resource Include="Views\Images\folder.png" />
     <Resource Include="Views\Images\ErrorX.png" />
     <Resource Include="Views\Images\download.png" />
diff --git a/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
index aff760ad7..759be462d 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
@@ -5,15 +5,33 @@
 
 namespace HandBrakeWPF.ViewModels
 {
+    using System.ComponentModel.Composition;
+
     using Caliburn.Micro;
 
+    using HandBrakeWPF.ViewModels.Interfaces;
+
     /// <summary>
     /// The About View Model
     /// </summary>
-    public class AboutViewModel : ViewModelBase
+    [Export(typeof(IAboutViewModel))]
+    public class AboutViewModel : ViewModelBase, IAboutViewModel
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AboutViewModel"/> class.
+        /// </summary>
+        /// <param name="windowManager">
+        /// The window manager.
+        /// </param>
         public AboutViewModel(IWindowManager windowManager) : base(windowManager)
         {
         }
+
+        /// <summary>
+        /// Close this window.
+        /// </summary>
+        public void Close()
+        {       
+        }
     }
 }
diff --git a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
index 0c9373b57..199e44be2 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
@@ -5,6 +5,8 @@
 
 namespace HandBrakeWPF.ViewModels
 {
+    using System.ComponentModel.Composition;
+
     using Caliburn.Micro;
 
     /// <summary>
diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAboutViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAboutViewModel.cs
new file mode 100644
index 000000000..7e592ccde
--- /dev/null
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAboutViewModel.cs
@@ -0,0 +1,9 @@
+namespace HandBrakeWPF.ViewModels.Interfaces
+{
+    /// <summary>
+    /// The About View Model Interface
+    /// </summary>
+    public interface IAboutViewModel
+    {
+    }
+}
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IOptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IOptionsViewModel.cs
new file mode 100644
index 000000000..b6b75ad87
--- /dev/null
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IOptionsViewModel.cs
@@ -0,0 +1,9 @@
+namespace HandBrakeWPF.ViewModels.Interfaces
+{
+    /// <summary>
+    /// The Options Screen View Model Interface
+    /// </summary>
+    public interface IOptionsViewModel
+    {
+    }
+}
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index f833695c6..30c705381 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -63,6 +63,13 @@ namespace HandBrakeWPF.ViewModels
 
         #region Properties
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MainViewModel"/> class.
+        /// The viewmodel for HandBrakes main window.
+        /// </summary>
+        /// <param name="windowManager">
+        /// The window manager.
+        /// </param>
         [ImportingConstructor]
         public MainViewModel(IWindowManager windowManager) : base(windowManager) 
         {
@@ -184,11 +191,21 @@ namespace HandBrakeWPF.ViewModels
             this.queueProcessor.EncodeService.EncodeStatusChanged -= this.EncodeStatusChanged;
         }
 
-
         #region Menu and Taskbar
         
-        public void AboutApplication()
+        public void OpenAboutApplication()
         {
+            this.WindowManager.ShowWindow(new AboutViewModel(this.WindowManager));
+        }
+
+        public void OpenOptionsWindow()
+        {
+            this.WindowManager.ShowWindow(new OptionsViewModel(this.WindowManager));
+        }
+
+        public void OpenQueueWindow()
+        {
+            this.WindowManager.ShowWindow(new QueueViewModel(this.WindowManager));
         }
         
         /// <summary>
@@ -201,7 +218,6 @@ namespace HandBrakeWPF.ViewModels
 
         #endregion
 
-
         #region Event Handlers
         /// <summary>
         /// Handle the Scan Status Changed Event.
diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index 5979cdf60..6b8e4d939 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -5,15 +5,33 @@
 
 namespace HandBrakeWPF.ViewModels
 {
+    using System.ComponentModel.Composition;
+
     using Caliburn.Micro;
 
+    using HandBrakeWPF.ViewModels.Interfaces;
+
     /// <summary>
     /// The Options View Model
     /// </summary>
-    public class OptionsViewModel : ViewModelBase
+    [Export(typeof(IOptionsViewModel))]
+    public class OptionsViewModel : ViewModelBase, IOptionsViewModel
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OptionsViewModel"/> class.
+        /// </summary>
+        /// <param name="windowManager">
+        /// The window manager.
+        /// </param>
         public OptionsViewModel(IWindowManager windowManager) : base(windowManager)
         {
         }
+
+        /// <summary>
+        /// Close this window.
+        /// </summary>
+        public void Close()
+        {         
+        }
     }
 }
diff --git a/win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs b/win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs
index 29379938a..cc2d9307a 100644
--- a/win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs
@@ -7,11 +7,20 @@
     /// </summary>
     public class ViewModelBase : Screen
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
+        /// </summary>
+        /// <param name="windowManager">
+        /// The window manager.
+        /// </param>
         public ViewModelBase(IWindowManager windowManager)
         {
             this.WindowManager = windowManager;
         }
 
+        /// <summary>
+        /// Gets WindowManager.
+        /// </summary>
         public IWindowManager WindowManager { get; private set; }
     }
 }
diff --git a/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml
index f39f61528..0261513f8 100644
--- a/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml
@@ -1,10 +1,6 @@
 <UserControl x:Class="HandBrakeWPF.Views.Controls.PictureSettingsView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:Controls="clr-namespace:Microsoft.Windows.Controls;assembly=WPFToolkit.Extended"
-             >
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     
     <StackPanel Orientation="Horizontal" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
 
@@ -21,9 +17,9 @@
             <!-- Row 2-->
             <StackPanel Orientation="Horizontal" Margin="5,0,5,0">
                 <Label Content="Width:" Grid.Row="1" Grid.Column="0" />
-                <Controls:NumericUpDown Name="width" Minimum="0" Grid.Row="1" Grid.Column="1" Width="45"  />
+                <!--<Controls:NumericUpDown Name="width" Minimum="0" Grid.Row="1" Grid.Column="1" Width="45"  />-->
                 <Label Content="Height:" Grid.Row="1" Grid.Column="2" />
-                <Controls:NumericUpDown Name="height" Minimum="0" Grid.Row="1" Grid.Column="3" Width="45"  />
+                <!--<Controls:NumericUpDown Name="height" Minimum="0" Grid.Row="1" Grid.Column="3" Width="45"  />-->
                 <CheckBox Content="Keep Aspect Ratio" VerticalAlignment="Center" Margin="5,0,0,0" />
             </StackPanel>
 
@@ -52,9 +48,9 @@
 
                 <ComboBox Width="110" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
                 <ComboBox Width="110" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
-                <Controls:NumericUpDown Width="45" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
+                <!--<Controls:NumericUpDown Width="45" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
                 <Controls:NumericUpDown Width="45" Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
-                <Controls:NumericUpDown Width="45" Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
+                <Controls:NumericUpDown Width="45" Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />-->
                 <Label Content="---" Grid.Row="5" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
             </Grid>
         </StackPanel>
@@ -87,10 +83,10 @@
                 <Label Content="Left" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" />
                 <Label Content="Right" Grid.Row="2" Grid.Column="4" HorizontalAlignment="Center" />
 
-                <Controls:NumericUpDown Width="45" Grid.Row="1" Grid.Column="2" HorizontalAlignment="Left" Margin="0,0,0,5" />
+                <!--<Controls:NumericUpDown Width="45" Grid.Row="1" Grid.Column="2" HorizontalAlignment="Left" Margin="0,0,0,5" />
                 <Controls:NumericUpDown Width="45" Grid.Row="3" Grid.Column="2" HorizontalAlignment="Left" Margin="0,0,0,5" />
                 <Controls:NumericUpDown Width="45" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
-                <Controls:NumericUpDown Width="45" Grid.Row="2" Grid.Column="3" HorizontalAlignment="Left" Margin="0,0,0,5" />
+                <Controls:NumericUpDown Width="45" Grid.Row="2" Grid.Column="3" HorizontalAlignment="Left" Margin="0,0,0,5" />-->
 
             </Grid>
             
diff --git a/win/CS/HandBrakeWPF/Views/Images/General Preferences.png b/win/CS/HandBrakeWPF/Views/Images/General Preferences.png
deleted file mode 100644
index 9814afcc1..000000000
Binary files a/win/CS/HandBrakeWPF/Views/Images/General Preferences.png and /dev/null differ
diff --git a/win/CS/HandBrakeWPF/Views/Images/Preferences.png b/win/CS/HandBrakeWPF/Views/Images/Preferences.png
new file mode 100644
index 000000000..9814afcc1
Binary files /dev/null and b/win/CS/HandBrakeWPF/Views/Images/Preferences.png differ
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 999f73c84..cdb63a7df 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -16,26 +16,18 @@
                     </MenuItem>
 
                     <MenuItem Header="Tools">
+                        <MenuItem Header="Options" Micro:Message.Attach="[Event Click] = [Action OpenOptionsWindow]" />
+                       
                         <MenuItem Header="Show Queue" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
                         <MenuItem Header="Activity Window" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
                     </MenuItem>
 
-                    <MenuItem Header="Presets">
-                        <MenuItem Header="Reset Built-in Presets" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
-                        <MenuItem Header="Delete Built-in Presets" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
-                        <Separator />
-                        <MenuItem Header="Save As New Preset" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
-                        <MenuItem Header="Import" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
-                        <MenuItem Header="Export" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
-                        <MenuItem Header="Set as Default" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
-                    </MenuItem>
-
                     <MenuItem Header="Help">
                         <MenuItem Header="HandBrake User Guide" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
                         <Separator />
                         <MenuItem Header="Check for Updates" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
                         <Separator />
-                        <MenuItem Header="About..." Micro:Message.Attach="[Event Click] = [Action AboutApplication]" />
+                        <MenuItem Header="About..." Micro:Message.Attach="[Event Click] = [Action OpenAboutApplication]" />
                     </MenuItem>
                 </Menu>
 
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 7573415b7..9c465d7f8 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -1,8 +1,333 @@
 <Window x:Class="HandBrakeWPF.Views.OptionsView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="OptionsView" Height="300" Width="300">
-    <Grid>
-        
-    </Grid>
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cal="http://www.caliburnproject.org"
+        Title="OptionsView" MinWidth="620" MinHeight="520" Width="620" Height="520">
+
+    <StackPanel Orientation="Vertical" Background="LightGray">
+        <!-- Header -->
+        <StackPanel Orientation="Horizontal"  Background="White" Height="50" >
+            <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>
+
+        <!-- Options Panel-->
+        <TabControl Margin="10,10,10,10" Height="380">
+            <TabItem Header="General">
+                <StackPanel Orientation="Vertical">
+                    <Grid Margin="10,10,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="100" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Text="At Launch:" Grid.Column="0" FontWeight="Bold"/>
+
+                        <StackPanel Orientation="Vertical" Grid.Column="1">
+                            <CheckBox Content="Check for Updates" />
+                            <ComboBox Name="checkForUpdateFrequency" Margin="25,0,0,0" HorizontalAlignment="Left" Width="120"></ComboBox>
+
+                            <CheckBox Content="Enable Tooltips" />
+                        </StackPanel>
+                    </Grid>
+
+                    <Grid Margin="10,10,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="100" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Text="When Done:" Grid.Column="0" FontWeight="Bold"/>
+
+                        <StackPanel Orientation="Vertical" Grid.Column="1">
+                            <ComboBox Name="whenDone" Width="120" HorizontalAlignment="Left"></ComboBox>
+
+                            <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
+                                <CheckBox Content="Growl after Queue Completes"/>
+                                <CheckBox Content="Growl after Encode Completes" Margin="5,0,0,0" />
+                            </StackPanel>
+
+                            <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
+                                <CheckBox Content="Send file to:" />
+                                <TextBlock Margin="5,0,0,0" Text="None" />
+                                <Button Content="Browse" Width="55"/>
+                            </StackPanel>
+
+                            <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
+                                <TextBlock Margin="25,0,0,0" Text="Arguments" />
+                                <TextBox Name="SendToArguments" Width="180" />
+                            </StackPanel>
+
+                        </StackPanel>
+                    </Grid>
+                </StackPanel>
+            </TabItem>
+
+            <TabItem Header="Output Files">
+                <StackPanel Orientation="Vertical">
+                    <Grid Margin="10,10,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="100" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Text="Output Files:" Grid.Column="0" FontWeight="Bold"/>
+
+                        <StackPanel Orientation="Vertical" Grid.Column="1">
+                            <CheckBox Content="Automatically name output files" />
+
+                            <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
+                                <TextBlock Text="Arguments" />
+                                <TextBox Name="autoNameOutputPath" Width="180" />
+                                <Button Content="Browse" Width="55"/>
+                            </StackPanel>
+                            <TextBlock Text="Available Options: {source_path} or {source_folder_name} (Not Both)" />
+
+                            <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
+                                <TextBlock Text="Format:" />
+                                <TextBox Name="autoNameFormat" Width="180" />
+                            </StackPanel>
+                            <TextBlock Text="Available Options: {source} {title} {chapters} {date}" />
+
+                            <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
+                                <CheckBox Content="Remove underscores from name"/>
+                                <CheckBox Content="Change case to Title Case" Margin="5,0,0,0" />
+                            </StackPanel>
+
+                            <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
+                                <TextBlock Text="MP4 File Extension:" />
+                                <ComboBox Name="mp4FileExtension" Width="120" HorizontalAlignment="Left"></ComboBox>
+                            </StackPanel>
+                        </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" Margin="0,5,0,0">
+                                <TextBlock Text="Arguments" />
+                                <TextBox Name="vlcPath" Width="180" />
+                                <Button Content="Browse" Width="55"/>
+                            </StackPanel>
+                            <TextBlock Text="This path is used for the view preview feature only." />
+
+                        </StackPanel>
+                    </Grid>
+                </StackPanel>
+            </TabItem>
+
+            <TabItem Header="Audio and Subtitles">
+                <StackPanel Orientation="Vertical">
+                    <TextBlock Text="Automatic Audio and Subtitle Selection" Grid.Column="0" FontWeight="Bold"/>
+                    <Grid Margin="10,10,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="140" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Text="Preferred Language:" Grid.Column="0"/>
+                        <StackPanel Orientation="Horizontal" Grid.Column="1">
+                            <ComboBox Name="primaryAudioLanguage" Width="120" />
+                            <TextBlock Text="Primary Audio Langauge" FontSize="10" />
+                        </StackPanel>
+                    </Grid>
+
+                    <Grid Margin="10,10,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="100" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+
+                        <TextBlock Text="Additional Tracks:" Grid.Column="0"/>
+                        <StackPanel Orientation="Horizontal" Grid.Column="1">
+                            <Grid Margin="10,10,0,10">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+
+                                <StackPanel Orientation="Vertical" Grid.Column="0">
+                                    <TextBlock Text="Available Langauges" Margin="0,0,0,5"/>
+                                    <ListBox Name="availableLanguages" Height="140"></ListBox>
+                                </StackPanel>
+
+                                <StackPanel Orientation="Vertical" Grid.Column="1" Margin="10,0,10,0">
+                                    <Button Content="Move Left" VerticalAlignment="Center" Width="60"></Button>
+                                    <Button Content="Move Right" VerticalAlignment="Center" Width="60"></Button>
+                                    <Button Content="Clear" VerticalAlignment="Center" Width="60"></Button>
+                                </StackPanel>
+
+                                <StackPanel Orientation="Vertical" Grid.Column="2">
+                                    <TextBlock Text="Available Langauges"  Margin="0,0,0,5"/>
+                                    <ListBox Name="selectedLangauges" Height="140"></ListBox>
+                                </StackPanel>
+
+                                <StackPanel Orientation="Vertical" Grid.Column="3" Margin="10,0,10,0">
+                                    <Button Content="Move Up" VerticalAlignment="Center" Width="60"></Button>
+                                    <Button Content="Move Down" VerticalAlignment="Center" Width="60"></Button>
+                                </StackPanel>
+
+                            </Grid>
+                        </StackPanel>
+                    </Grid>
+
+                    <GroupBox Header="Add Additional Tracks" >
+                        <StackPanel Orientation="Vertical">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="Audio:" Margin="0,0,10,0" Width="100" />
+                                <ComboBox Name="autoAudioMode" Width="120" Margin="0,0,5,0" />
+                                <CheckBox Content="Add only one audio track per langauge" />
+                            </StackPanel>
+
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="Subtitle:" Margin="0,0,10,0" Width="100" />
+                                <ComboBox Name="autoSubtitleMode" Width="120" Margin="0,0,5,0" />
+                            </StackPanel>
+
+                            <CheckBox Content="Add Closed Captions when available" />
+                        </StackPanel>
+                    </GroupBox>
+
+
+                </StackPanel>
+            </TabItem>
+
+            <TabItem Header="System and Logging">
+                <StackPanel Orientation="Vertical">
+                    <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:" />
+                            <ComboBox Name="processPriorityLevel" Width="120" />
+                        </StackPanel>
+                    </Grid>
+
+                    <Grid Margin="10,10,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="100" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="System:" Grid.Column="0" FontWeight="Bold"/>
+                        <StackPanel Orientation="Horizontal" Grid.Column="1">
+                            <CheckBox Content="Prevent the system from sleeping while encoding" />
+                        </StackPanel>
+                    </Grid>
+
+                    <Grid Margin="10,10,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="100" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Text="Logs:" Grid.Column="0" FontWeight="Bold"/>
+
+                        <StackPanel Orientation="Vertical" Grid.Column="1">
+                            <StackPanel Orientation="Horizontal" Grid.Column="1">
+                                <TextBlock Text="Log Verbosity Level:" />
+                                <ComboBox Name="logVerbosityLevel" Width="120" />
+                            </StackPanel>
+
+                            <CheckBox Content="Put a copy of individual encode logs in the same location as the encoded video" />
+                            <CheckBox Content="Put a copy of individual encode logs in a specified location: " />
+                            <StackPanel Orientation="Horizontal" Grid.Column="1">
+                                <TextBlock Text="Log Path:" />
+                                <TextBox Width="120" />
+                                <Button Content="Browse" />
+                            </StackPanel>
+                            <StackPanel Orientation="Horizontal" Grid.Column="1">
+                                <Button Content="View Log Directory" Margin="0,0,5,0" />
+                                <Button Content="Clear Log History" />
+                            </StackPanel>
+
+                            <CheckBox Content="Clear Log files older than 30 days " />
+                        </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)" />
+                            <CheckBox Content="Display status messages from tray icon (balloon popups)" />
+                            <CheckBox Content="Enable 'Query Editor' tab (Requires Restart)" />
+                            <CheckBox Content="Prompt when a manual query does not match GUI settings" Margin="10,0,0,0" />
+                            <CheckBox Content="Disable built-in preset update notification" />
+                            <CheckBox Content="Show CLI window (Allows you to cleanly exit encode with ctrl-c)" />
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="Number of picture previews to scan:" Width="210" />
+                                <ComboBox Name="numberOfPreviews" Width="120" />
+                            </StackPanel>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="Minimum length of title to scan (seconds):" Width="210" />
+                                <TextBox Name="MinTitleLength"  Width="120"/>
+                                <!-- Find a control for this-->
+                            </StackPanel>
+
+                        </StackPanel>
+                    </Grid>
+
+                    <Grid Margin="10,10,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="100" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="x264:" Grid.Column="0" FontWeight="Bold"/>
+                        <StackPanel Orientation="Horizontal" Grid.Column="1">
+                            <TextBlock Text="Constant quality fractional granularity:" Width="210" />
+                            <ComboBox Name="x264Granularity" Width="120"/>
+                        </StackPanel>
+                    </Grid>
+
+                    <Grid Margin="10,10,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="100" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Text="DVD:" Grid.Column="0" FontWeight="Bold"/>
+
+                        <StackPanel Orientation="Vertical" Grid.Column="1">
+                            <CheckBox Content="Disable LibDVDNav. (libdvdread will be used instead)" />
+                        </StackPanel>
+
+                    </Grid>
+                </StackPanel>
+            </TabItem>
+        </TabControl>
+
+        <Button Content="Close" IsDefault="True" cal:Message.Attach="[Event Click] = [Action Close]"
+                    HorizontalAlignment="Right" Padding="10,2" Margin="0,0,10,10" />
+
+
+    </StackPanel>
 </Window>
-- 
cgit v1.2.3