30 files changed, 203 insertions, 2 deletions
diff --git a/win/C#/HandBrakeWPF/HandBrakeWPF.csproj b/win/C#/HandBrakeWPF/HandBrakeWPF.csproj
index a110b96cc..cd2eef097 100644
--- a/win/C#/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/C#/HandBrakeWPF/HandBrakeWPF.csproj
@@ -109,6 +109,44 @@
   <ItemGroup>
     <Folder Include="Model\" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Views\Images\ActivityWindow.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Views\Images\ActivityWindow_small.png" />
+    <Resource Include="Views\Images\copy.png" />
+    <Resource Include="Views\Images\disc_small.png" />
+    <Resource Include="Views\Images\Output_Small.png" />
+    <Resource Include="Views\Images\Pref_Small.png" />
+    <Resource Include="Views\Images\Queue.png" />
+    <Resource Include="Views\Images\Queue_Small.png" />
+    <Resource Include="Views\Images\stop.png" />
+    <Resource Include="Views\Images\save.png" />
+    <Resource Include="Views\Images\Play_small.png" />
+    <Resource Include="Views\Images\Play.png" />
+    <Resource Include="Views\Images\picture.png" />
+    <Resource Include="Views\Images\Pause.png" />
+    <Resource Include="Views\Images\Movies.png" />
+    <Resource Include="Views\Images\logo64.png" />
+    <Resource Include="Views\Images\logo128.png" />
+    <Resource Include="Views\Images\info16.png" />
+    <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\folder.png" />
+    <Resource Include="Views\Images\ErrorX.png" />
+    <Resource Include="Views\Images\download.png" />
+    <Resource Include="Views\Images\AddToQueue_small.png" />
+    <Resource Include="Views\Images\AddToQueue.png" />
+    <Resource Include="Views\Images\window.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\HandBrake.ApplicationServices\HandBrake.ApplicationServices.csproj">
+      <Project>{087A2BA8-BAC2-4577-A46F-07FF9D420016}</Project>
+      <Name>HandBrake.ApplicationServices</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/win/C#/HandBrakeWPF/Views/Images/ActivityWindow.png b/win/C#/HandBrakeWPF/Views/Images/ActivityWindow.png
new file mode 100644
index 000000000..315e0fa17
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/ActivityWindow.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/ActivityWindow_small.png b/win/C#/HandBrakeWPF/Views/Images/ActivityWindow_small.png
new file mode 100644
index 000000000..916b6ef4a
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/ActivityWindow_small.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/AddToQueue.png b/win/C#/HandBrakeWPF/Views/Images/AddToQueue.png
new file mode 100644
index 000000000..8eb079b3d
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/AddToQueue.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/AddToQueue_small.png b/win/C#/HandBrakeWPF/Views/Images/AddToQueue_small.png
new file mode 100644
index 000000000..5bb08184f
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/AddToQueue_small.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/ErrorX.png b/win/C#/HandBrakeWPF/Views/Images/ErrorX.png
new file mode 100644
index 000000000..75c63c08a
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/ErrorX.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/General Preferences.png b/win/C#/HandBrakeWPF/Views/Images/General Preferences.png
new file mode 100644
index 000000000..9814afcc1
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/General Preferences.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/Help16.png b/win/C#/HandBrakeWPF/Views/Images/Help16.png
new file mode 100644
index 000000000..bb5ef99ce
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/Help16.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/Movies.png b/win/C#/HandBrakeWPF/Views/Images/Movies.png
new file mode 100644
index 000000000..ec03eb576
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/Movies.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/Output_Small.png b/win/C#/HandBrakeWPF/Views/Images/Output_Small.png
new file mode 100644
index 000000000..a1017d6fb
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/Output_Small.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/Pause.png b/win/C#/HandBrakeWPF/Views/Images/Pause.png
new file mode 100644
index 000000000..a20833967
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/Pause.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/Play.png b/win/C#/HandBrakeWPF/Views/Images/Play.png
new file mode 100644
index 000000000..23fce8283
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/Play.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/Play_small.png b/win/C#/HandBrakeWPF/Views/Images/Play_small.png
new file mode 100644
index 000000000..3e4647a15
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/Play_small.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/Pref_Small.png b/win/C#/HandBrakeWPF/Views/Images/Pref_Small.png
new file mode 100644
index 000000000..a28fb5b27
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/Pref_Small.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/Queue.png b/win/C#/HandBrakeWPF/Views/Images/Queue.png
new file mode 100644
index 000000000..51962a1b0
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/Queue.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/Queue_Small.png b/win/C#/HandBrakeWPF/Views/Images/Queue_Small.png
new file mode 100644
index 000000000..02c7391a9
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/Queue_Small.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/copy.png b/win/C#/HandBrakeWPF/Views/Images/copy.png
new file mode 100644
index 000000000..c11c6a753
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/copy.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/disc_small.png b/win/C#/HandBrakeWPF/Views/Images/disc_small.png
new file mode 100644
index 000000000..dca0ad228
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/disc_small.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/download.png b/win/C#/HandBrakeWPF/Views/Images/download.png
new file mode 100644
index 000000000..c3206626b
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/download.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/folder.png b/win/C#/HandBrakeWPF/Views/Images/folder.png
new file mode 100644
index 000000000..a54316ea6
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/folder.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/hb16.png b/win/C#/HandBrakeWPF/Views/Images/hb16.png
new file mode 100644
index 000000000..a9f720775
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/hb16.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/hb32.png b/win/C#/HandBrakeWPF/Views/Images/hb32.png
new file mode 100644
index 000000000..5054264d3
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/hb32.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/info16.png b/win/C#/HandBrakeWPF/Views/Images/info16.png
new file mode 100644
index 000000000..6b6b9f01f
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/info16.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/logo128.png b/win/C#/HandBrakeWPF/Views/Images/logo128.png
new file mode 100644
index 000000000..69d76459d
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/logo128.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/logo64.png b/win/C#/HandBrakeWPF/Views/Images/logo64.png
new file mode 100644
index 000000000..12808f636
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/logo64.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/picture.png b/win/C#/HandBrakeWPF/Views/Images/picture.png
new file mode 100644
index 000000000..0072ccfb6
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/picture.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/save.png b/win/C#/HandBrakeWPF/Views/Images/save.png
new file mode 100644
index 000000000..40885d2d3
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/save.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/stop.png b/win/C#/HandBrakeWPF/Views/Images/stop.png
new file mode 100644
index 000000000..c544b5ee4
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/stop.png
diff --git a/win/C#/HandBrakeWPF/Views/Images/window.png b/win/C#/HandBrakeWPF/Views/Images/window.png
new file mode 100644
index 000000000..48a14a35b
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Images/window.png
diff --git a/win/C#/HandBrakeWPF/Views/MainView.xaml b/win/C#/HandBrakeWPF/Views/MainView.xaml
index 438192ea6..493cb357a 100644
--- a/win/C#/HandBrakeWPF/Views/MainView.xaml
+++ b/win/C#/HandBrakeWPF/Views/MainView.xaml
@@ -1,8 +1,171 @@
 <Window x:Class="HandBrakeWPF.Views.MainView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="{Binding Path=WindowTitle}" Height="300" Width="300">
+        Title="{Binding Path=WindowTitle}" Height="645" Width="1015" FontSize="11">
+    
     <Grid>
-        <TextBlock Text="{Binding Path=WindowTitle}" /> 
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        
+        <!-- Main Menu -->
+        <Menu Height="23" Grid.Row="0" VerticalAlignment="Top" HorizontalAlignment="Stretch">
+            <MenuItem Header="File">
+                <MenuItem Header="Cancel Scan" />
+                <MenuItem Header="Exit" />
+            </MenuItem>
+
+            <MenuItem Header="Tools">
+                <MenuItem Header="Show Queue" />
+                <MenuItem Header="Activity Window" />
+            </MenuItem>
+
+            <MenuItem Header="Presets">
+                <MenuItem Header="Reset Built-in Presets" />
+                <MenuItem Header="Delete Built-in Presets" />
+                <Separator />
+                <MenuItem Header="Save As New Preset" />
+                <MenuItem Header="Import" />
+                <MenuItem Header="Export" />
+                <MenuItem Header="Set as Default" />
+            </MenuItem>
+
+            <MenuItem Header="Help">
+                <MenuItem Header="HandBrake User Guide" />
+                <Separator />
+                <MenuItem Header="Check for Updates" />
+                <Separator />
+                <MenuItem Header="About..." />
+            </MenuItem>
+        </Menu>
+        
+        <!-- ToolBar -->
+        <ToolBar Grid.Row="1" Name="mainToolBar" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"  SnapsToDevicePixels="False">
+
+            <Button Name="Source">
+                <StackPanel Orientation="Horizontal">
+                    <Image Source="Images/Movies.png" Height="32" Width="32" />
+                    <Label Content="Source"  Margin="8,0,0,0" VerticalAlignment="Center" />
+                </StackPanel>
+            </Button>
+            
+            <Separator />
+            
+            <Button Name="Start">
+                <StackPanel Orientation="Horizontal">
+                    <Image Source="Images/Play.png" Height="32" Width="32" />
+                    <Label Content="Start"  Margin="8,0,0,0" VerticalAlignment="Center" />
+                </StackPanel>
+            </Button>
+            <Button Name="AddToQueue">
+                <StackPanel Orientation="Horizontal">
+                    <Image Source="Images/AddToQueue.png" Height="32" Width="32" />
+                    <Label Content="Add To Queue"  Margin="8,0,0,0" VerticalAlignment="Center" />
+                </StackPanel>
+            </Button>
+
+            <Button Name="ShowQueue">
+                <StackPanel Orientation="Horizontal">
+                    <Image Source="Images/Queue.png" Height="32" Width="32" />
+                    <Label Content="Show Queue"  Margin="8,0,0,0" VerticalAlignment="Center" />
+                </StackPanel>
+            </Button>
+
+            <Separator />
+            
+            <Button Name="Preview">
+                <StackPanel Orientation="Horizontal">
+                    <Image Source="Images/window.png" Height="32" Width="32" />
+                    <Label Content="Preview"  Margin="8,0,0,0" VerticalAlignment="Center" />
+                </StackPanel>
+            </Button>
+            <Button Name="ActivityWindow">
+                <StackPanel Orientation="Horizontal">
+                    <Image Source="Images/ActivityWindow.png" Height="32" Width="32" />
+                    <Label Content="Activity Window"  Margin="8,0,0,0" VerticalAlignment="Center" />
+                </StackPanel>
+            </Button>
+        </ToolBar>
+ 
+        <!-- Source -->
+        <StackPanel Grid.Row="2" Margin="10,5,10,5" MaxWidth="725" Width="725" HorizontalAlignment="Left">
+            <StackPanel Orientation="Horizontal">
+                <Label Content="Source" FontWeight="Bold" />
+                <Label Content="Select 'Source' to continue" />
+            </StackPanel>
+            
+            <StackPanel Orientation="Horizontal">
+                <Label Content="Title" Margin="8,0,0,0" />
+                <ComboBox Name="Titles" Margin="8,0,0,0" MinWidth="100" />
+
+                <Label Content="Angle" Margin="8,0,0,0" />
+                <ComboBox Name="Angles" Margin="8,0,0,0" MinWidth="60"/>
+
+                <ComboBox Name="PointToPointMode" Margin="8,0,0,0" MinWidth="80" />
+                <ComboBox Name="StartPoint" Margin="8,0,0,0" MinWidth="60" />
+                <Label Content="through" Margin="8,0,0,0" />
+                <ComboBox Name="EndPoint" Margin="8,0,0,0" MinWidth="60" />
+                <Label Content="Duration" Margin="8,0,0,0" />
+                <Label Content="--:--:--" Margin="8,0,0,0" />
+            </StackPanel>
+        </StackPanel>
+        
+        <!-- Destination -->
+        <StackPanel Grid.Row="3" Margin="10,5,10,5" MaxWidth="725" Width="725" HorizontalAlignment="Left">
+            <Label Content="Destination" FontWeight="Bold" />
+            <StackPanel Orientation="Horizontal">
+                <Label Content="File" Margin="8,0,0,0" />
+                <TextBox Name="Destination" Margin="8,0,0,0" Width="600" />
+                <Button Name="DestinationBrowser" Margin="8,0,0,0" Padding="8,0,8,0" Content="Browse" />
+            </StackPanel>
+        </StackPanel>
+
+        <!-- Output Options -->
+        <StackPanel Grid.Row="4" Margin="10,5,10,5" MaxWidth="725" Width="725" HorizontalAlignment="Left">
+            <Label Content="Output Settings (Preset: None)" FontWeight="Bold" />
+            <StackPanel Orientation="Horizontal">
+                <Label Content="Container" Margin="8,0,0,0" />
+                <ComboBox Name="Container" Margin="8,0,0,0" MinWidth="100" />
+
+                <CheckBox Name="LargeFileMp4" Content="Large File Size" VerticalAlignment="Center" Margin="8,0,0,0" />
+                <CheckBox Name="WebOptimized" Content="Web Optimized" VerticalAlignment="Center" Margin="8,0,0,0" />
+                <CheckBox Name="iPod5G" Content="iPod 5G Support" VerticalAlignment="Center" Margin="8,0,0,0" />
+            </StackPanel>
+        </StackPanel>
+
+        <!-- Tab Control -->
+        <TabControl HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="725" Height="330" Grid.Row="5" Margin="10,10,10,10" Name="tabControl" >
+            <TabItem Header="Picture" Name="pictureTab">
+                <Grid />
+            </TabItem>
+            <TabItem Header="Video Filters" Name="filtersTab">
+                <Grid />
+            </TabItem>
+            <TabItem Header="Video" Name="videoTab">
+                <Grid />
+            </TabItem>
+            <TabItem Header="Audio" Name="audioTab">
+                <Grid />
+            </TabItem>
+            <TabItem Header="Chapters" Name="chaptersTab">
+                <Grid />
+            </TabItem>
+            <TabItem Header="Advanced" Name="advancedTab">
+                <Grid />
+            </TabItem>
+        </TabControl>
+        
+        <!-- Status Bar -->
+        <StatusBar Grid.Row="6" Height="30" VerticalAlignment="Bottom">
+            <Label Content="Ready" FontSize="11" />
+        </StatusBar>
+        
     </Grid>
 </Window>