WinGui:

- Initial Layout of the WPF Main Window.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3765 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/HandBrakeWPF/HandBrakeWPF.csproj b/win/C#/HandBrakeWPF/HandBrakeWPF.csproj
index a110b96cc1bcf341145f2409b767ec94877e09e5..cd2eef097cf5f9d8d0e7c32ad12b8910a5b76d8c 100644 (file)
--- a/win/C#/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/C#/HandBrakeWPF/HandBrakeWPF.csproj
@@ -109,6 +109,44 @@
   <ItemGroup>\r
     <Folder Include="Model\" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <Resource Include="Views\Images\ActivityWindow.png" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Resource Include="Views\Images\ActivityWindow_small.png" />\r
+    <Resource Include="Views\Images\copy.png" />\r
+    <Resource Include="Views\Images\disc_small.png" />\r
+    <Resource Include="Views\Images\Output_Small.png" />\r
+    <Resource Include="Views\Images\Pref_Small.png" />\r
+    <Resource Include="Views\Images\Queue.png" />\r
+    <Resource Include="Views\Images\Queue_Small.png" />\r
+    <Resource Include="Views\Images\stop.png" />\r
+    <Resource Include="Views\Images\save.png" />\r
+    <Resource Include="Views\Images\Play_small.png" />\r
+    <Resource Include="Views\Images\Play.png" />\r
+    <Resource Include="Views\Images\picture.png" />\r
+    <Resource Include="Views\Images\Pause.png" />\r
+    <Resource Include="Views\Images\Movies.png" />\r
+    <Resource Include="Views\Images\logo64.png" />\r
+    <Resource Include="Views\Images\logo128.png" />\r
+    <Resource Include="Views\Images\info16.png" />\r
+    <Resource Include="Views\Images\Help16.png" />\r
+    <Resource Include="Views\Images\hb32.png" />\r
+    <Resource Include="Views\Images\hb16.png" />\r
+    <Resource Include="Views\Images\General Preferences.png" />\r
+    <Resource Include="Views\Images\folder.png" />\r
+    <Resource Include="Views\Images\ErrorX.png" />\r
+    <Resource Include="Views\Images\download.png" />\r
+    <Resource Include="Views\Images\AddToQueue_small.png" />\r
+    <Resource Include="Views\Images\AddToQueue.png" />\r
+    <Resource Include="Views\Images\window.png" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="..\HandBrake.ApplicationServices\HandBrake.ApplicationServices.csproj">\r
+      <Project>{087A2BA8-BAC2-4577-A46F-07FF9D420016}</Project>\r
+      <Name>HandBrake.ApplicationServices</Name>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r

diff --git a/win/C#/HandBrakeWPF/Views/Images/ActivityWindow.png b/win/C#/HandBrakeWPF/Views/Images/ActivityWindow.png
new file mode 100644 (file)
index 0000000..315e0fa
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/ActivityWindow.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/ActivityWindow_small.png b/win/C#/HandBrakeWPF/Views/Images/ActivityWindow_small.png
new file mode 100644 (file)
index 0000000..916b6ef
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/ActivityWindow_small.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/AddToQueue.png b/win/C#/HandBrakeWPF/Views/Images/AddToQueue.png
new file mode 100644 (file)
index 0000000..8eb079b
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/AddToQueue.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/AddToQueue_small.png b/win/C#/HandBrakeWPF/Views/Images/AddToQueue_small.png
new file mode 100644 (file)
index 0000000..5bb0818
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/AddToQueue_small.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/ErrorX.png b/win/C#/HandBrakeWPF/Views/Images/ErrorX.png
new file mode 100644 (file)
index 0000000..75c63c0
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/ErrorX.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/General Preferences.png b/win/C#/HandBrakeWPF/Views/Images/General Preferences.png
new file mode 100644 (file)
index 0000000..9814afc
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/General Preferences.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/Help16.png b/win/C#/HandBrakeWPF/Views/Images/Help16.png
new file mode 100644 (file)
index 0000000..bb5ef99
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/Help16.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/Movies.png b/win/C#/HandBrakeWPF/Views/Images/Movies.png
new file mode 100644 (file)
index 0000000..ec03eb5
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/Movies.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/Output_Small.png b/win/C#/HandBrakeWPF/Views/Images/Output_Small.png
new file mode 100644 (file)
index 0000000..a1017d6
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/Output_Small.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/Pause.png b/win/C#/HandBrakeWPF/Views/Images/Pause.png
new file mode 100644 (file)
index 0000000..a208339
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/Pause.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/Play.png b/win/C#/HandBrakeWPF/Views/Images/Play.png
new file mode 100644 (file)
index 0000000..23fce82
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/Play.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/Play_small.png b/win/C#/HandBrakeWPF/Views/Images/Play_small.png
new file mode 100644 (file)
index 0000000..3e4647a
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/Play_small.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/Pref_Small.png b/win/C#/HandBrakeWPF/Views/Images/Pref_Small.png
new file mode 100644 (file)
index 0000000..a28fb5b
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/Pref_Small.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/Queue.png b/win/C#/HandBrakeWPF/Views/Images/Queue.png
new file mode 100644 (file)
index 0000000..51962a1
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/Queue.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/Queue_Small.png b/win/C#/HandBrakeWPF/Views/Images/Queue_Small.png
new file mode 100644 (file)
index 0000000..02c7391
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/Queue_Small.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/copy.png b/win/C#/HandBrakeWPF/Views/Images/copy.png
new file mode 100644 (file)
index 0000000..c11c6a7
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/copy.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/disc_small.png b/win/C#/HandBrakeWPF/Views/Images/disc_small.png
new file mode 100644 (file)
index 0000000..dca0ad2
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/disc_small.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/download.png b/win/C#/HandBrakeWPF/Views/Images/download.png
new file mode 100644 (file)
index 0000000..c320662
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/download.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/folder.png b/win/C#/HandBrakeWPF/Views/Images/folder.png
new file mode 100644 (file)
index 0000000..a54316e
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/folder.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/hb16.png b/win/C#/HandBrakeWPF/Views/Images/hb16.png
new file mode 100644 (file)
index 0000000..a9f7207
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/hb16.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/hb32.png b/win/C#/HandBrakeWPF/Views/Images/hb32.png
new file mode 100644 (file)
index 0000000..5054264
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/hb32.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/info16.png b/win/C#/HandBrakeWPF/Views/Images/info16.png
new file mode 100644 (file)
index 0000000..6b6b9f0
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/info16.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/logo128.png b/win/C#/HandBrakeWPF/Views/Images/logo128.png
new file mode 100644 (file)
index 0000000..69d7645
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/logo128.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/logo64.png b/win/C#/HandBrakeWPF/Views/Images/logo64.png
new file mode 100644 (file)
index 0000000..12808f6
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/logo64.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/picture.png b/win/C#/HandBrakeWPF/Views/Images/picture.png
new file mode 100644 (file)
index 0000000..0072ccf
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/picture.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/save.png b/win/C#/HandBrakeWPF/Views/Images/save.png
new file mode 100644 (file)
index 0000000..40885d2
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/save.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/stop.png b/win/C#/HandBrakeWPF/Views/Images/stop.png
new file mode 100644 (file)
index 0000000..c544b5e
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/stop.png differ

diff --git a/win/C#/HandBrakeWPF/Views/Images/window.png b/win/C#/HandBrakeWPF/Views/Images/window.png
new file mode 100644 (file)
index 0000000..48a14a3
Binary files /dev/null and b/win/C#/HandBrakeWPF/Views/Images/window.png differ

diff --git a/win/C#/HandBrakeWPF/Views/MainView.xaml b/win/C#/HandBrakeWPF/Views/MainView.xaml
index 438192ea695267af588111f659b562b910d1b75e..493cb357adb9b61f3a027eec306642d7eb21d0ea 100644 (file)
--- a/win/C#/HandBrakeWPF/Views/MainView.xaml
+++ b/win/C#/HandBrakeWPF/Views/MainView.xaml
@@ -1,8 +1,171 @@
 <Window x:Class="HandBrakeWPF.Views.MainView"\r
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
-        Title="{Binding Path=WindowTitle}" Height="300" Width="300">\r
+        Title="{Binding Path=WindowTitle}" Height="645" Width="1015" FontSize="11">\r
+    \r
     <Grid>\r
-        <TextBlock Text="{Binding Path=WindowTitle}" /> \r
+        <Grid.RowDefinitions>\r
+            <RowDefinition Height="Auto" />\r
+            <RowDefinition Height="Auto" />\r
+            <RowDefinition Height="Auto" />\r
+            <RowDefinition Height="Auto" />\r
+            <RowDefinition Height="Auto" />\r
+            <RowDefinition Height="Auto" />\r
+            <RowDefinition Height="*" />\r
+            <RowDefinition Height="Auto" />\r
+        </Grid.RowDefinitions>\r
+        \r
+        <!-- Main Menu -->\r
+        <Menu Height="23" Grid.Row="0" VerticalAlignment="Top" HorizontalAlignment="Stretch">\r
+            <MenuItem Header="File">\r
+                <MenuItem Header="Cancel Scan" />\r
+                <MenuItem Header="Exit" />\r
+            </MenuItem>\r
+\r
+            <MenuItem Header="Tools">\r
+                <MenuItem Header="Show Queue" />\r
+                <MenuItem Header="Activity Window" />\r
+            </MenuItem>\r
+\r
+            <MenuItem Header="Presets">\r
+                <MenuItem Header="Reset Built-in Presets" />\r
+                <MenuItem Header="Delete Built-in Presets" />\r
+                <Separator />\r
+                <MenuItem Header="Save As New Preset" />\r
+                <MenuItem Header="Import" />\r
+                <MenuItem Header="Export" />\r
+                <MenuItem Header="Set as Default" />\r
+            </MenuItem>\r
+\r
+            <MenuItem Header="Help">\r
+                <MenuItem Header="HandBrake User Guide" />\r
+                <Separator />\r
+                <MenuItem Header="Check for Updates" />\r
+                <Separator />\r
+                <MenuItem Header="About..." />\r
+            </MenuItem>\r
+        </Menu>\r
+        \r
+        <!-- ToolBar -->\r
+        <ToolBar Grid.Row="1" Name="mainToolBar" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"  SnapsToDevicePixels="False">\r
+\r
+            <Button Name="Source">\r
+                <StackPanel Orientation="Horizontal">\r
+                    <Image Source="Images/Movies.png" Height="32" Width="32" />\r
+                    <Label Content="Source"  Margin="8,0,0,0" VerticalAlignment="Center" />\r
+                </StackPanel>\r
+            </Button>\r
+            \r
+            <Separator />\r
+            \r
+            <Button Name="Start">\r
+                <StackPanel Orientation="Horizontal">\r
+                    <Image Source="Images/Play.png" Height="32" Width="32" />\r
+                    <Label Content="Start"  Margin="8,0,0,0" VerticalAlignment="Center" />\r
+                </StackPanel>\r
+            </Button>\r
+            <Button Name="AddToQueue">\r
+                <StackPanel Orientation="Horizontal">\r
+                    <Image Source="Images/AddToQueue.png" Height="32" Width="32" />\r
+                    <Label Content="Add To Queue"  Margin="8,0,0,0" VerticalAlignment="Center" />\r
+                </StackPanel>\r
+            </Button>\r
+\r
+            <Button Name="ShowQueue">\r
+                <StackPanel Orientation="Horizontal">\r
+                    <Image Source="Images/Queue.png" Height="32" Width="32" />\r
+                    <Label Content="Show Queue"  Margin="8,0,0,0" VerticalAlignment="Center" />\r
+                </StackPanel>\r
+            </Button>\r
+\r
+            <Separator />\r
+            \r
+            <Button Name="Preview">\r
+                <StackPanel Orientation="Horizontal">\r
+                    <Image Source="Images/window.png" Height="32" Width="32" />\r
+                    <Label Content="Preview"  Margin="8,0,0,0" VerticalAlignment="Center" />\r
+                </StackPanel>\r
+            </Button>\r
+            <Button Name="ActivityWindow">\r
+                <StackPanel Orientation="Horizontal">\r
+                    <Image Source="Images/ActivityWindow.png" Height="32" Width="32" />\r
+                    <Label Content="Activity Window"  Margin="8,0,0,0" VerticalAlignment="Center" />\r
+                </StackPanel>\r
+            </Button>\r
+        </ToolBar>\r
+ \r
+        <!-- Source -->\r
+        <StackPanel Grid.Row="2" Margin="10,5,10,5" MaxWidth="725" Width="725" HorizontalAlignment="Left">\r
+            <StackPanel Orientation="Horizontal">\r
+                <Label Content="Source" FontWeight="Bold" />\r
+                <Label Content="Select 'Source' to continue" />\r
+            </StackPanel>\r
+            \r
+            <StackPanel Orientation="Horizontal">\r
+                <Label Content="Title" Margin="8,0,0,0" />\r
+                <ComboBox Name="Titles" Margin="8,0,0,0" MinWidth="100" />\r
+\r
+                <Label Content="Angle" Margin="8,0,0,0" />\r
+                <ComboBox Name="Angles" Margin="8,0,0,0" MinWidth="60"/>\r
+\r
+                <ComboBox Name="PointToPointMode" Margin="8,0,0,0" MinWidth="80" />\r
+                <ComboBox Name="StartPoint" Margin="8,0,0,0" MinWidth="60" />\r
+                <Label Content="through" Margin="8,0,0,0" />\r
+                <ComboBox Name="EndPoint" Margin="8,0,0,0" MinWidth="60" />\r
+                <Label Content="Duration" Margin="8,0,0,0" />\r
+                <Label Content="--:--:--" Margin="8,0,0,0" />\r
+            </StackPanel>\r
+        </StackPanel>\r
+        \r
+        <!-- Destination -->\r
+        <StackPanel Grid.Row="3" Margin="10,5,10,5" MaxWidth="725" Width="725" HorizontalAlignment="Left">\r
+            <Label Content="Destination" FontWeight="Bold" />\r
+            <StackPanel Orientation="Horizontal">\r
+                <Label Content="File" Margin="8,0,0,0" />\r
+                <TextBox Name="Destination" Margin="8,0,0,0" Width="600" />\r
+                <Button Name="DestinationBrowser" Margin="8,0,0,0" Padding="8,0,8,0" Content="Browse" />\r
+            </StackPanel>\r
+        </StackPanel>\r
+\r
+        <!-- Output Options -->\r
+        <StackPanel Grid.Row="4" Margin="10,5,10,5" MaxWidth="725" Width="725" HorizontalAlignment="Left">\r
+            <Label Content="Output Settings (Preset: None)" FontWeight="Bold" />\r
+            <StackPanel Orientation="Horizontal">\r
+                <Label Content="Container" Margin="8,0,0,0" />\r
+                <ComboBox Name="Container" Margin="8,0,0,0" MinWidth="100" />\r
+\r
+                <CheckBox Name="LargeFileMp4" Content="Large File Size" VerticalAlignment="Center" Margin="8,0,0,0" />\r
+                <CheckBox Name="WebOptimized" Content="Web Optimized" VerticalAlignment="Center" Margin="8,0,0,0" />\r
+                <CheckBox Name="iPod5G" Content="iPod 5G Support" VerticalAlignment="Center" Margin="8,0,0,0" />\r
+            </StackPanel>\r
+        </StackPanel>\r
+\r
+        <!-- Tab Control -->\r
+        <TabControl HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="725" Height="330" Grid.Row="5" Margin="10,10,10,10" Name="tabControl" >\r
+            <TabItem Header="Picture" Name="pictureTab">\r
+                <Grid />\r
+            </TabItem>\r
+            <TabItem Header="Video Filters" Name="filtersTab">\r
+                <Grid />\r
+            </TabItem>\r
+            <TabItem Header="Video" Name="videoTab">\r
+                <Grid />\r
+            </TabItem>\r
+            <TabItem Header="Audio" Name="audioTab">\r
+                <Grid />\r
+            </TabItem>\r
+            <TabItem Header="Chapters" Name="chaptersTab">\r
+                <Grid />\r
+            </TabItem>\r
+            <TabItem Header="Advanced" Name="advancedTab">\r
+                <Grid />\r
+            </TabItem>\r
+        </TabControl>\r
+        \r
+        <!-- Status Bar -->\r
+        <StatusBar Grid.Row="6" Height="30" VerticalAlignment="Bottom">\r
+            <Label Content="Ready" FontSize="11" />\r
+        </StatusBar>\r
+        \r
     </Grid>\r
 </Window>\r