From 649939589305d92e9d6edf3c28955dfa37774722 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Sun, 1 Apr 2012 17:09:11 +0000
Subject: WinGui: (WPF) Cleanup and fixes to the main window and preferences
 screen.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4579 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 win/CS/HandBrakeWPF/Views/MainView.xaml    | 22 ++--------------------
 win/CS/HandBrakeWPF/Views/MainView.xaml.cs |  1 +
 win/CS/HandBrakeWPF/Views/OptionsView.xaml |  7 ++++---
 3 files changed, 7 insertions(+), 23 deletions(-)

(limited to 'win/CS/HandBrakeWPF/Views')

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 4f243237f..79cc340eb 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -113,32 +113,14 @@
 
                 <!-- ToolBar -->
                 <ToolBar Name="mainToolBar" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"  SnapsToDevicePixels="False">
-
                     <Menu Background="Transparent" >
-                        <MenuItem>
+                        <MenuItem ItemsSource="{Binding SourceToolbarMenu}">
                             <MenuItem.Header>
                                 <StackPanel Orientation="Horizontal">
                                     <Image Source="Images/Movies.png" Height="32" Width="32" />
                                     <Label Content="Source"  Margin="8,0,0,0" VerticalAlignment="Center" />
                                 </StackPanel>
                             </MenuItem.Header>
-
-                            <MenuItem Micro:Message.Attach="[Event Click] = [Action FolderScan]">
-                                <MenuItem.Header>
-                                    <StackPanel Orientation="Horizontal">
-                                        <Image Source="Images/folder.png" Height="20" Width="20" />
-                                        <Label Content="Open Folder"  Margin="8,0,0,0" VerticalAlignment="Center" />
-                                    </StackPanel>
-                                </MenuItem.Header>
-                            </MenuItem>
-                            <MenuItem Micro:Message.Attach="[Event Click] = [Action FileScan]">
-                                <MenuItem.Header>
-                                    <StackPanel Orientation="Horizontal">
-                                        <Image Source="Images/Movies.png" Height="20" Width="20" />
-                                        <Label Content="Open File"  Margin="8,0,0,0" VerticalAlignment="Center" />
-                                    </StackPanel>
-                                </MenuItem.Header>
-                            </MenuItem>
                         </MenuItem>
                     </Menu>
 
@@ -239,7 +221,7 @@
 
                     <!-- Output Options -->
                     <StackPanel Margin="10,5,10,5" MaxWidth="725" Width="725" HorizontalAlignment="Left">
-                        <Label Content="Output Settings (Preset: None)" FontWeight="Bold" />
+                        <Label Content="Output Settings" FontWeight="Bold" />
                         <StackPanel Orientation="Horizontal">
                             <Label Content="Container" Margin="8,0,0,0" />
                             <ComboBox Name="Container" Margin="8,0,0,0" MinWidth="100" ItemsSource="{Binding OutputFormats}" SelectedItem="{Binding SelectedOutputFormat}" />
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml.cs b/win/CS/HandBrakeWPF/Views/MainView.xaml.cs
index 165e74923..057a35a5e 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml.cs
@@ -9,6 +9,7 @@
 
 namespace HandBrakeWPF.Views
 {
+    using System;
     using System.Windows;
 
     /// <summary>
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 6852e5704..c3f60077b 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -50,7 +50,7 @@
                             <CheckBox Content="Check for Updates" IsChecked="{Binding CheckForUpdates}" />
                             <ComboBox Name="checkForUpdateFrequency" ItemsSource="{Binding CheckForUpdatesFrequencies}" SelectedIndex="{Binding CheckForUpdatesFrequency}" Margin="25,0,0,5" HorizontalAlignment="Left" Width="120"></ComboBox>
 
-                            <CheckBox Content="Enable Tooltips" IsChecked="{Binding EnableGuiTooltips}" />
+                            <CheckBox Content="Enable Tooltips"  Visibility="Collapsed"  IsChecked="{Binding EnableGuiTooltips}" />
                         </StackPanel>
                     </Grid>
 
@@ -320,10 +320,11 @@
 
                         <TextBlock Text="GUI:" Grid.Column="0" FontWeight="Bold"/>
                         <StackPanel Orientation="Vertical" Grid.Column="1">
-                            <CheckBox Content="Minimize to system tray (Requires Restart)" IsChecked="{Binding MinimiseToTray}" />
-                            <CheckBox Content="Display status messages from tray icon (balloon popups)" IsChecked="{Binding DisplayStatusMessagesTrayIcon}" />
+                            <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" />
-- 
cgit v1.2.3