1 files changed, 12 insertions, 5 deletions
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 1994f7434..5273a008a 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Data="clr-namespace:System.Windows.Data;assembly=PresentationFramework" 
         xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro" xmlns:Controls="clr-namespace:HandBrakeWPF.Views.Controls" 
-        Title="{Data:Binding Path=WindowTitle}" Height="655" Width="1015" FontSize="11">
+        Title="{Data:Binding Path=WindowTitle}" Height="655" Width="1015" FontSize="11" Background="#FFF0F0F0">
 
     <Window.Resources>
         <Style TargetType="Button">
@@ -21,7 +21,8 @@
                 <!-- Main Menu -->
                 <Menu Height="23" VerticalAlignment="Top" HorizontalAlignment="Stretch">
                     <MenuItem Header="File">
-                        <MenuItem Header="Cancel Scan" />
+                        <MenuItem Header="Cancel Scan" Micro:Message.Attach="[Event Click] = [Action CancelScan]" />
+                        <Separator />
                         <MenuItem Header="Exit" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
                     </MenuItem>
 
@@ -33,9 +34,9 @@
                     </MenuItem>
 
                     <MenuItem Header="Help">
-                        <MenuItem Header="HandBrake User Guide" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
+                        <MenuItem Header="HandBrake User Guide" Micro:Message.Attach="[Event Click] = [Action LaunchHelp]" />
                         <Separator />
-                        <MenuItem Header="Check for Updates" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
+                        <MenuItem Header="Check for Updates" Micro:Message.Attach="[Event Click] = [Action CheckForUpdates]" />
                         <Separator />
                         <MenuItem Header="About..." Micro:Message.Attach="[Event Click] = [Action OpenAboutApplication]" />
                     </MenuItem>
@@ -49,6 +50,12 @@
                             <Image Source="Images/Movies.png" Height="32" Width="32" />
                             <Label Content="Source"  Margin="8,0,0,0" VerticalAlignment="Center" />
                         </StackPanel>
+                        <Button.ContextMenu>
+                            <ContextMenu  >
+                                <MenuItem Header="Open Folder" Micro:Message.Attach="[Event Click] = [Action FolderScan]"/>
+                                <MenuItem Header="Open File" Micro:Message.Attach="[Event Click] = [Action FileScan]"/>
+                            </ContextMenu>
+                        </Button.ContextMenu>
                     </Button>
 
                     <Separator />
@@ -104,7 +111,7 @@
 
                         <StackPanel Orientation="Horizontal">
                             <Label Content="Title" Margin="8,0,0,0" />
-                            <ComboBox Name="Titles" Margin="8,0,0,0" MinWidth="100" SelectedItem="{Binding Path=CurrentTask.Title}" />
+                            <ComboBox Name="Titles" Margin="8,0,0,0" MinWidth="100" ItemsSource="{Binding ScannedSource.Titles}" SelectedItem="{Binding Path=CurrentTask.Title}" />
 
                             <Label Content="Angle" Margin="8,0,0,0" />
                             <ComboBox Name="Angles" Margin="8,0,0,0" MinWidth="60"  SelectedItem="{Binding Path=CurrentTask.Angle}"/>