WinGui:

- Setting up the structure of the WPF UI. Just empty files with some basic wiring up between them.

git-svn-id: svn://localhost/HandBrake/trunk@3800 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/HandBrakeWPF/HandBrakeWPF.csproj b/win/C#/HandBrakeWPF/HandBrakeWPF.csproj
index 512833d..efcf37b 100644 (file)
--- a/win/C#/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/C#/HandBrakeWPF/HandBrakeWPF.csproj
@@ -67,15 +67,59 @@
       <Generator>MSBuild:Compile</Generator>\r
       <SubType>Designer</SubType>\r
     </ApplicationDefinition>\r
+    <Compile Include="ViewModels\AboutViewModel.cs" />\r
+    <Compile Include="ViewModels\AddPresetViewModel.cs" />\r
+    <Compile Include="ViewModels\PreviewViewModel.cs" />\r
+    <Compile Include="ViewModels\QueueViewModel.cs" />\r
+    <Compile Include="ViewModels\OptionsViewModel.cs" />\r
+    <Compile Include="ViewModels\ViewModelBase.cs" />\r
+    <Compile Include="Views\AboutView.xaml.cs">\r
+      <DependentUpon>AboutView.xaml</DependentUpon>\r
+    </Compile>\r
     <Compile Include="App.xaml.cs">\r
       <DependentUpon>App.xaml</DependentUpon>\r
       <SubType>Code</SubType>\r
     </Compile>\r
     <Compile Include="ViewModels\MainViewModel.cs" />\r
-    <Compile Include="ViewModels\ViewModelBase.cs" />\r
+    <Compile Include="Views\Controls\AdvancedView.xaml.cs">\r
+      <DependentUpon>AdvancedView.xaml</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="Views\Controls\AudioView.xaml.cs">\r
+      <DependentUpon>AudioView.xaml</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="Views\Controls\ChaptersView.xaml.cs">\r
+      <DependentUpon>ChaptersView.xaml</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="Views\AddPresetView.xaml.cs">\r
+      <DependentUpon>AddPresetView.xaml</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="Views\PreviewView.xaml.cs">\r
+      <DependentUpon>PreviewView.xaml</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="Views\QueueView.xaml.cs">\r
+      <DependentUpon>QueueView.xaml</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="Views\Controls\FiltersView.xaml.cs">\r
+      <DependentUpon>FiltersView.xaml</DependentUpon>\r
+    </Compile>\r
     <Compile Include="Views\MainView.xaml.cs">\r
       <DependentUpon>MainView.xaml</DependentUpon>\r
     </Compile>\r
+    <Compile Include="Views\Controls\PictureSettingsView.xaml.cs">\r
+      <DependentUpon>PictureSettingsView.xaml</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="Views\Controls\QueryEditorView.xaml.cs">\r
+      <DependentUpon>QueryEditorView.xaml</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="Views\Controls\SubtitlesView.xaml.cs">\r
+      <DependentUpon>SubtitlesView.xaml</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="Views\Controls\VideoView.xaml.cs">\r
+      <DependentUpon>VideoView.xaml</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="Views\OptionsView.xaml.cs">\r
+      <DependentUpon>OptionsView.xaml</DependentUpon>\r
+    </Compile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Compile Include="Properties\AssemblyInfo.cs">\r
@@ -102,13 +146,66 @@
     <AppDesigner Include="Properties\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <Page Include="Views\AboutView.xaml">\r
+      <SubType>Designer</SubType>\r
+      <Generator>MSBuild:Compile</Generator>\r
+    </Page>\r
+    <Page Include="Views\Controls\AdvancedView.xaml">\r
+      <SubType>Designer</SubType>\r
+      <Generator>MSBuild:Compile</Generator>\r
+    </Page>\r
+    <Page Include="Views\Controls\AudioView.xaml">\r
+      <SubType>Designer</SubType>\r
+      <Generator>MSBuild:Compile</Generator>\r
+    </Page>\r
+    <Page Include="Views\Controls\ChaptersView.xaml">\r
+      <SubType>Designer</SubType>\r
+      <Generator>MSBuild:Compile</Generator>\r
+    </Page>\r
+    <Page Include="Views\AddPresetView.xaml">\r
+      <Generator>MSBuild:Compile</Generator>\r
+      <SubType>Designer</SubType>\r
+    </Page>\r
+    <Page Include="Views\PreviewView.xaml">\r
+      <Generator>MSBuild:Compile</Generator>\r
+      <SubType>Designer</SubType>\r
+    </Page>\r
+    <Page Include="Views\QueueView.xaml">\r
+      <Generator>MSBuild:Compile</Generator>\r
+      <SubType>Designer</SubType>\r
+    </Page>\r
+    <Page Include="Views\Controls\FiltersView.xaml">\r
+      <Generator>MSBuild:Compile</Generator>\r
+      <SubType>Designer</SubType>\r
+    </Page>\r
     <Page Include="Views\MainView.xaml">\r
       <SubType>Designer</SubType>\r
       <Generator>MSBuild:Compile</Generator>\r
     </Page>\r
+    <Page Include="Views\Controls\PictureSettingsView.xaml">\r
+      <SubType>Designer</SubType>\r
+      <Generator>MSBuild:Compile</Generator>\r
+    </Page>\r
+    <Page Include="Views\Controls\QueryEditorView.xaml">\r
+      <SubType>Designer</SubType>\r
+      <Generator>MSBuild:Compile</Generator>\r
+    </Page>\r
+    <Page Include="Views\Controls\SubtitlesView.xaml">\r
+      <SubType>Designer</SubType>\r
+      <Generator>MSBuild:Compile</Generator>\r
+    </Page>\r
+    <Page Include="Views\Controls\VideoView.xaml">\r
+      <SubType>Designer</SubType>\r
+      <Generator>MSBuild:Compile</Generator>\r
+    </Page>\r
+    <Page Include="Views\OptionsView.xaml">\r
+      <SubType>Designer</SubType>\r
+      <Generator>MSBuild:Compile</Generator>\r
+    </Page>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Folder Include="Model\" />\r
+    <Folder Include="Services\" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Resource Include="Views\Images\ActivityWindow.png" />\r

diff --git a/win/C#/HandBrakeWPF/ViewModels/AboutViewModel.cs b/win/C#/HandBrakeWPF/ViewModels/AboutViewModel.cs
new file mode 100644 (file)
index 0000000..603bfb4
--- /dev/null
+++ b/win/C#/HandBrakeWPF/ViewModels/AboutViewModel.cs
@@ -0,0 +1,14 @@
+/*  AboutViewModel.cs $\r
+    This file is part of the HandBrake source code.\r
+    Homepage: <http://handbrake.fr>.\r
+    It may be used under the terms of the GNU General Public License. */\r
+\r
+namespace HandBrakeWPF.ViewModels\r
+{\r
+    /// <summary>\r
+    /// The About View Model\r
+    /// </summary>\r
+    public class AboutViewModel : ViewModelBase\r
+    {\r
+    }\r
+}\r

diff --git a/win/C#/HandBrakeWPF/ViewModels/AddPresetViewModel.cs b/win/C#/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
new file mode 100644 (file)
index 0000000..bcd55fc
--- /dev/null
+++ b/win/C#/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
@@ -0,0 +1,14 @@
+/*  AddPresetViewModel.cs $\r
+    This file is part of the HandBrake source code.\r
+    Homepage: <http://handbrake.fr>.\r
+    It may be used under the terms of the GNU General Public License. */\r
+\r
+namespace HandBrakeWPF.ViewModels\r
+{\r
+    /// <summary>\r
+    /// The Add Preset View Model\r
+    /// </summary>\r
+    public class AddPresetViewModel : ViewModelBase\r
+    {\r
+    }\r
+}\r

diff --git a/win/C#/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/C#/HandBrakeWPF/ViewModels/OptionsViewModel.cs
new file mode 100644 (file)
index 0000000..62394c1
--- /dev/null
+++ b/win/C#/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -0,0 +1,14 @@
+/*  OptionsViewModel.cs $\r
+    This file is part of the HandBrake source code.\r
+    Homepage: <http://handbrake.fr>.\r
+    It may be used under the terms of the GNU General Public License. */\r
+\r
+namespace HandBrakeWPF.ViewModels\r
+{\r
+    /// <summary>\r
+    /// The Options View Model\r
+    /// </summary>\r
+    public class OptionsViewModel : ViewModelBase\r
+    {\r
+    }\r
+}\r

diff --git a/win/C#/HandBrakeWPF/ViewModels/PreviewViewModel.cs b/win/C#/HandBrakeWPF/ViewModels/PreviewViewModel.cs
new file mode 100644 (file)
index 0000000..b70d217
--- /dev/null
+++ b/win/C#/HandBrakeWPF/ViewModels/PreviewViewModel.cs
@@ -0,0 +1,14 @@
+/*  PreviewViewModel.cs $\r
+    This file is part of the HandBrake source code.\r
+    Homepage: <http://handbrake.fr>.\r
+    It may be used under the terms of the GNU General Public License. */\r
+\r
+namespace HandBrakeWPF.ViewModels\r
+{\r
+    /// <summary>\r
+    /// The About View Model\r
+    /// </summary>\r
+    public class PreviewViewModel : ViewModelBase\r
+    {\r
+    }\r
+}\r

diff --git a/win/C#/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/C#/HandBrakeWPF/ViewModels/QueueViewModel.cs
new file mode 100644 (file)
index 0000000..bbe013d
--- /dev/null
+++ b/win/C#/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -0,0 +1,14 @@
+/*  QueueViewModel.cs $\r
+    This file is part of the HandBrake source code.\r
+    Homepage: <http://handbrake.fr>.\r
+    It may be used under the terms of the GNU General Public License. */\r
+\r
+namespace HandBrakeWPF.ViewModels\r
+{\r
+    /// <summary>\r
+    /// The Preview View Model\r
+    /// </summary>\r
+    public class QueueViewModel : ViewModelBase\r
+    {\r
+    }\r
+}\r

diff --git a/win/C#/HandBrakeWPF/Views/AboutView.xaml b/win/C#/HandBrakeWPF/Views/AboutView.xaml
new file mode 100644 (file)
index 0000000..155a5f0
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/AboutView.xaml
@@ -0,0 +1,28 @@
+<Window x:Class="HandBrakeWPF.Views.AboutView"\r
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
+        Title="AboutView" Height="268" Width="511">\r
+    \r
+    <StackPanel Orientation="Horizontal">\r
+        <Image Source="Images/logo64.png" Width="64" Height="64" SnapsToDevicePixels="True" Margin="10,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top" />\r
+\r
+        <StackPanel Orientation="Vertical">\r
+            <Label Content="HandBrake WPF Demo App" FontWeight="Bold" FontSize="14" Margin="0,10,0,0" />\r
+            <Label Content="Copyright 2003-2011 HandBrake Team" />\r
+            \r
+            <Label Content="License:" />\r
+            <TextBox IsEnabled="False" Width="380" Height="100" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" Margin="10,0,10,10">\r
+                This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r
+\r
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r
+\r
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
+            </TextBox>\r
+            \r
+            <Button Content="OK" HorizontalAlignment="Right" Padding="10,2" Margin="0,0,10,10"></Button>\r
+            \r
+         </StackPanel>\r
+\r
+\r
+    </StackPanel>\r
+</Window>\r

diff --git a/win/C#/HandBrakeWPF/Views/AboutView.xaml.cs b/win/C#/HandBrakeWPF/Views/AboutView.xaml.cs
new file mode 100644 (file)
index 0000000..22de696
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/AboutView.xaml.cs
@@ -0,0 +1,15 @@
+namespace HandBrakeWPF.Views\r
+{\r
+    using System.Windows;\r
+\r
+    /// <summary>\r
+    /// Interaction logic for AboutView.xaml\r
+    /// </summary>\r
+    public partial class AboutView : Window\r
+    {\r
+        public AboutView()\r
+        {\r
+            InitializeComponent();\r
+        }\r
+    }\r
+}\r

diff --git a/win/C#/HandBrakeWPF/Views/AddPresetView.xaml b/win/C#/HandBrakeWPF/Views/AddPresetView.xaml
new file mode 100644 (file)
index 0000000..74d79f0
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/AddPresetView.xaml
@@ -0,0 +1,11 @@
+<UserControl x:Class="HandBrakeWPF.Views.AddPresetView"\r
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" \r
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" \r
+             mc:Ignorable="d" \r
+             d:DesignHeight="300" d:DesignWidth="300">\r
+    <Grid Background="Beige">\r
+            \r
+    </Grid>\r
+</UserControl>\r

diff --git a/win/C#/HandBrakeWPF/Views/AddPresetView.xaml.cs b/win/C#/HandBrakeWPF/Views/AddPresetView.xaml.cs
new file mode 100644 (file)
index 0000000..b99e48b
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/AddPresetView.xaml.cs
@@ -0,0 +1,27 @@
+using System;\r
+using System.Collections.Generic;\r
+using System.Linq;\r
+using System.Text;\r
+using System.Windows;\r
+using System.Windows.Controls;\r
+using System.Windows.Data;\r
+using System.Windows.Documents;\r
+using System.Windows.Input;\r
+using System.Windows.Media;\r
+using System.Windows.Media.Imaging;\r
+using System.Windows.Navigation;\r
+using System.Windows.Shapes;\r
+\r
+namespace HandBrakeWPF.Views\r
+{\r
+    /// <summary>\r
+    /// Interaction logic for VideoView.xaml\r
+    /// </summary>\r
+    public partial class AddPresetView : UserControl\r
+    {\r
+        public AddPresetView()\r
+        {\r
+            InitializeComponent();\r
+        }\r
+    }\r
+}\r

diff --git a/win/C#/HandBrakeWPF/Views/Controls/AdvancedView.xaml b/win/C#/HandBrakeWPF/Views/Controls/AdvancedView.xaml
new file mode 100644 (file)
index 0000000..3adb828
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/AdvancedView.xaml
@@ -0,0 +1,11 @@
+<UserControl x:Class="HandBrakeWPF.Views.AdvancedView"\r
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" \r
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" \r
+             mc:Ignorable="d" \r
+             d:DesignHeight="300" d:DesignWidth="300">\r
+    <Grid Background="Beige">\r
+            \r
+    </Grid>\r
+</UserControl>\r

diff --git a/win/C#/HandBrakeWPF/Views/Controls/AdvancedView.xaml.cs b/win/C#/HandBrakeWPF/Views/Controls/AdvancedView.xaml.cs
new file mode 100644 (file)
index 0000000..b7ad6ef
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/AdvancedView.xaml.cs
@@ -0,0 +1,27 @@
+using System;\r
+using System.Collections.Generic;\r
+using System.Linq;\r
+using System.Text;\r
+using System.Windows;\r
+using System.Windows.Controls;\r
+using System.Windows.Data;\r
+using System.Windows.Documents;\r
+using System.Windows.Input;\r
+using System.Windows.Media;\r
+using System.Windows.Media.Imaging;\r
+using System.Windows.Navigation;\r
+using System.Windows.Shapes;\r
+\r
+namespace HandBrakeWPF.Views\r
+{\r
+    /// <summary>\r
+    /// Interaction logic for AdvancedView.xaml\r
+    /// </summary>\r
+    public partial class AdvancedView : UserControl\r
+    {\r
+        public AdvancedView()\r
+        {\r
+            InitializeComponent();\r
+        }\r
+    }\r
+}\r

diff --git a/win/C#/HandBrakeWPF/Views/Controls/AudioView.xaml b/win/C#/HandBrakeWPF/Views/Controls/AudioView.xaml
new file mode 100644 (file)
index 0000000..6087c7d
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/AudioView.xaml
@@ -0,0 +1,11 @@
+<UserControl x:Class="HandBrakeWPF.Views.AudioView"\r
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" \r
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" \r
+             mc:Ignorable="d" \r
+             d:DesignHeight="300" d:DesignWidth="300">\r
+    <Grid Background="Beige">\r
+            \r
+    </Grid>\r
+</UserControl>\r

diff --git a/win/C#/HandBrakeWPF/Views/Controls/AudioView.xaml.cs b/win/C#/HandBrakeWPF/Views/Controls/AudioView.xaml.cs
new file mode 100644 (file)
index 0000000..3518eea
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/AudioView.xaml.cs
@@ -0,0 +1,27 @@
+using System;\r
+using System.Collections.Generic;\r
+using System.Linq;\r
+using System.Text;\r
+using System.Windows;\r
+using System.Windows.Controls;\r
+using System.Windows.Data;\r
+using System.Windows.Documents;\r
+using System.Windows.Input;\r
+using System.Windows.Media;\r
+using System.Windows.Media.Imaging;\r
+using System.Windows.Navigation;\r
+using System.Windows.Shapes;\r
+\r
+namespace HandBrakeWPF.Views\r
+{\r
+    /// <summary>\r
+    /// Interaction logic for AudioView.xaml\r
+    /// </summary>\r
+    public partial class AudioView : UserControl\r
+    {\r
+        public AudioView()\r
+        {\r
+            InitializeComponent();\r
+        }\r
+    }\r
+}\r

diff --git a/win/C#/HandBrakeWPF/Views/Controls/ChaptersView.xaml b/win/C#/HandBrakeWPF/Views/Controls/ChaptersView.xaml
new file mode 100644 (file)
index 0000000..ac39a70
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/ChaptersView.xaml
@@ -0,0 +1,11 @@
+<UserControl x:Class="HandBrakeWPF.Views.ChaptersView"\r
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" \r
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" \r
+             mc:Ignorable="d" \r
+             d:DesignHeight="300" d:DesignWidth="300">\r
+    <Grid Background="Beige">\r
+            \r
+    </Grid>\r
+</UserControl>\r

diff --git a/win/C#/HandBrakeWPF/Views/Controls/ChaptersView.xaml.cs b/win/C#/HandBrakeWPF/Views/Controls/ChaptersView.xaml.cs
new file mode 100644 (file)
index 0000000..f61b201
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/ChaptersView.xaml.cs
@@ -0,0 +1,27 @@
+using System;\r
+using System.Collections.Generic;\r
+using System.Linq;\r
+using System.Text;\r
+using System.Windows;\r
+using System.Windows.Controls;\r
+using System.Windows.Data;\r
+using System.Windows.Documents;\r
+using System.Windows.Input;\r
+using System.Windows.Media;\r
+using System.Windows.Media.Imaging;\r
+using System.Windows.Navigation;\r
+using System.Windows.Shapes;\r
+\r
+namespace HandBrakeWPF.Views\r
+{\r
+    /// <summary>\r
+    /// Interaction logic for ChaptersView.xaml\r
+    /// </summary>\r
+    public partial class ChaptersView : UserControl\r
+    {\r
+        public ChaptersView()\r
+        {\r
+            InitializeComponent();\r
+        }\r
+    }\r
+}\r

diff --git a/win/C#/HandBrakeWPF/Views/Controls/FiltersView.xaml b/win/C#/HandBrakeWPF/Views/Controls/FiltersView.xaml
new file mode 100644 (file)
index 0000000..6ac8f5a
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/FiltersView.xaml
@@ -0,0 +1,11 @@
+<UserControl x:Class="HandBrakeWPF.Views.FiltersView"\r
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" \r
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" \r
+             mc:Ignorable="d" \r
+             d:DesignHeight="300" d:DesignWidth="300">\r
+    <Grid Background="Beige">\r
+            \r
+    </Grid>\r
+</UserControl>\r

diff --git a/win/C#/HandBrakeWPF/Views/Controls/FiltersView.xaml.cs b/win/C#/HandBrakeWPF/Views/Controls/FiltersView.xaml.cs
new file mode 100644 (file)
index 0000000..27f38be
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/FiltersView.xaml.cs
@@ -0,0 +1,27 @@
+using System;\r
+using System.Collections.Generic;\r
+using System.Linq;\r
+using System.Text;\r
+using System.Windows;\r
+using System.Windows.Controls;\r
+using System.Windows.Data;\r
+using System.Windows.Documents;\r
+using System.Windows.Input;\r
+using System.Windows.Media;\r
+using System.Windows.Media.Imaging;\r
+using System.Windows.Navigation;\r
+using System.Windows.Shapes;\r
+\r
+namespace HandBrakeWPF.Views\r
+{\r
+    /// <summary>\r
+    /// Interaction logic for VideoFilters.xaml\r
+    /// </summary>\r
+    public partial class FiltersView : UserControl\r
+    {\r
+        public FiltersView()\r
+        {\r
+            InitializeComponent();\r
+        }\r
+    }\r
+}\r

diff --git a/win/C#/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml b/win/C#/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml
new file mode 100644 (file)
index 0000000..a60e3b5
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml
@@ -0,0 +1,11 @@
+<UserControl x:Class="HandBrakeWPF.Views.PictureSettingsView"\r
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" \r
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" \r
+             mc:Ignorable="d" \r
+             d:DesignHeight="300" d:DesignWidth="300">\r
+    <Grid Background="Beige">\r
+            \r
+    </Grid>\r
+</UserControl>\r

diff --git a/win/C#/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml.cs b/win/C#/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml.cs
new file mode 100644 (file)
index 0000000..9401168
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml.cs
@@ -0,0 +1,27 @@
+using System;\r
+using System.Collections.Generic;\r
+using System.Linq;\r
+using System.Text;\r
+using System.Windows;\r
+using System.Windows.Controls;\r
+using System.Windows.Data;\r
+using System.Windows.Documents;\r
+using System.Windows.Input;\r
+using System.Windows.Media;\r
+using System.Windows.Media.Imaging;\r
+using System.Windows.Navigation;\r
+using System.Windows.Shapes;\r
+\r
+namespace HandBrakeWPF.Views\r
+{\r
+    /// <summary>\r
+    /// Interaction logic for PictureSettingsView.xaml\r
+    /// </summary>\r
+    public partial class PictureSettingsView : UserControl\r
+    {\r
+        public PictureSettingsView()\r
+        {\r
+            InitializeComponent();\r
+        }\r
+    }\r
+}\r

diff --git a/win/C#/HandBrakeWPF/Views/Controls/QueryEditorView.xaml b/win/C#/HandBrakeWPF/Views/Controls/QueryEditorView.xaml
new file mode 100644 (file)
index 0000000..694dcd8
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/QueryEditorView.xaml
@@ -0,0 +1,11 @@
+<UserControl x:Class="HandBrakeWPF.Views.QueryEditorView"\r
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" \r
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" \r
+             mc:Ignorable="d" \r
+             d:DesignHeight="300" d:DesignWidth="300">\r
+    <Grid Background="Beige">\r
+            \r
+    </Grid>\r
+</UserControl>\r

diff --git a/win/C#/HandBrakeWPF/Views/Controls/QueryEditorView.xaml.cs b/win/C#/HandBrakeWPF/Views/Controls/QueryEditorView.xaml.cs
new file mode 100644 (file)
index 0000000..d67b7eb
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/QueryEditorView.xaml.cs
@@ -0,0 +1,27 @@
+using System;\r
+using System.Collections.Generic;\r
+using System.Linq;\r
+using System.Text;\r
+using System.Windows;\r
+using System.Windows.Controls;\r
+using System.Windows.Data;\r
+using System.Windows.Documents;\r
+using System.Windows.Input;\r
+using System.Windows.Media;\r
+using System.Windows.Media.Imaging;\r
+using System.Windows.Navigation;\r
+using System.Windows.Shapes;\r
+\r
+namespace HandBrakeWPF.Views\r
+{\r
+    /// <summary>\r
+    /// Interaction logic for QueryEditorView.xaml\r
+    /// </summary>\r
+    public partial class QueryEditorView : UserControl\r
+    {\r
+        public QueryEditorView()\r
+        {\r
+            InitializeComponent();\r
+        }\r
+    }\r
+}\r

diff --git a/win/C#/HandBrakeWPF/Views/Controls/SubtitlesView.xaml b/win/C#/HandBrakeWPF/Views/Controls/SubtitlesView.xaml
new file mode 100644 (file)
index 0000000..4594f62
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/SubtitlesView.xaml
@@ -0,0 +1,11 @@
+<UserControl x:Class="HandBrakeWPF.Views.SubtitlesView"\r
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" \r
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" \r
+             mc:Ignorable="d" \r
+             d:DesignHeight="300" d:DesignWidth="300">\r
+    <Grid Background="Beige">\r
+\r
+    </Grid>\r
+</UserControl>\r

diff --git a/win/C#/HandBrakeWPF/Views/Controls/SubtitlesView.xaml.cs b/win/C#/HandBrakeWPF/Views/Controls/SubtitlesView.xaml.cs
new file mode 100644 (file)
index 0000000..589462c
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/SubtitlesView.xaml.cs
@@ -0,0 +1,27 @@
+using System;\r
+using System.Collections.Generic;\r
+using System.Linq;\r
+using System.Text;\r
+using System.Windows;\r
+using System.Windows.Controls;\r
+using System.Windows.Data;\r
+using System.Windows.Documents;\r
+using System.Windows.Input;\r
+using System.Windows.Media;\r
+using System.Windows.Media.Imaging;\r
+using System.Windows.Navigation;\r
+using System.Windows.Shapes;\r
+\r
+namespace HandBrakeWPF.Views\r
+{\r
+    /// <summary>\r
+    /// Interaction logic for SubtitlesView.xaml\r
+    /// </summary>\r
+    public partial class SubtitlesView : UserControl\r
+    {\r
+        public SubtitlesView()\r
+        {\r
+            InitializeComponent();\r
+        }\r
+    }\r
+}\r

diff --git a/win/C#/HandBrakeWPF/Views/Controls/VideoView.xaml b/win/C#/HandBrakeWPF/Views/Controls/VideoView.xaml
new file mode 100644 (file)
index 0000000..72ab1f6
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/VideoView.xaml
@@ -0,0 +1,11 @@
+<UserControl x:Class="HandBrakeWPF.Views.VideoView"\r
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" \r
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" \r
+             mc:Ignorable="d" \r
+             d:DesignHeight="300" d:DesignWidth="300">\r
+    <Grid Background="Beige">\r
+            \r
+    </Grid>\r
+</UserControl>\r

diff --git a/win/C#/HandBrakeWPF/Views/Controls/VideoView.xaml.cs b/win/C#/HandBrakeWPF/Views/Controls/VideoView.xaml.cs
new file mode 100644 (file)
index 0000000..f59435f
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/VideoView.xaml.cs
@@ -0,0 +1,27 @@
+using System;\r
+using System.Collections.Generic;\r
+using System.Linq;\r
+using System.Text;\r
+using System.Windows;\r
+using System.Windows.Controls;\r
+using System.Windows.Data;\r
+using System.Windows.Documents;\r
+using System.Windows.Input;\r
+using System.Windows.Media;\r
+using System.Windows.Media.Imaging;\r
+using System.Windows.Navigation;\r
+using System.Windows.Shapes;\r
+\r
+namespace HandBrakeWPF.Views\r
+{\r
+    /// <summary>\r
+    /// Interaction logic for VideoView.xaml\r
+    /// </summary>\r
+    public partial class VideoView : UserControl\r
+    {\r
+        public VideoView()\r
+        {\r
+            InitializeComponent();\r
+        }\r
+    }\r
+}\r

diff --git a/win/C#/HandBrakeWPF/Views/MainView.xaml b/win/C#/HandBrakeWPF/Views/MainView.xaml
index ea4d41a..56edca6 100644 (file)
--- a/win/C#/HandBrakeWPF/Views/MainView.xaml
+++ b/win/C#/HandBrakeWPF/Views/MainView.xaml
@@ -1,6 +1,10 @@
 <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" xmlns:PresentationFramework="clr-namespace:Caliburn.PresentationFramework;assembly=Caliburn.PresentationFramework" Title="{Binding Path=WindowTitle}" Height="655" Width="1015" FontSize="11">\r
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" \r
+        xmlns:PresentationFramework="clr-namespace:Caliburn.PresentationFramework;assembly=Caliburn.PresentationFramework" \r
+        xmlns:Views="clr-namespace:HandBrakeWPF.Views"\r
+        xmlns:Data="clr-namespace:System.Windows.Data;assembly=PresentationFramework" \r
+        Title="{Data:Binding Path=WindowTitle}" Height="655" Width="1015" FontSize="11">\r
 \r
     <Grid>\r
         <StackPanel Orientation="Vertical" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">\r
@@ -140,22 +144,22 @@
                     <!-- Tab Control -->\r
                     <TabControl HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="725" Height="330" Margin="10,10,10,10" Name="tabControl" >\r
                         <TabItem Header="Picture" Name="pictureTab">\r
-                            <Grid />\r
+                            <Views:PictureSettingsView></Views:PictureSettingsView>\r
                         </TabItem>\r
                         <TabItem Header="Video Filters" Name="filtersTab">\r
-                            <Grid />\r
+                            <Views:FiltersView></Views:FiltersView>\r
                         </TabItem>\r
                         <TabItem Header="Video" Name="videoTab">\r
-                            <Grid />\r
+                            <Views:VideoView></Views:VideoView>\r
                         </TabItem>\r
                         <TabItem Header="Audio" Name="audioTab">\r
-                            <Grid />\r
+                            <Views:AudioView></Views:AudioView>\r
                         </TabItem>\r
                         <TabItem Header="Chapters" Name="chaptersTab">\r
-                            <Grid />\r
+                            <Views:ChaptersView></Views:ChaptersView>\r
                         </TabItem>\r
                         <TabItem Header="Advanced" Name="advancedTab">\r
-                            <Grid />\r
+                            <Views:AdvancedView></Views:AdvancedView>\r
                         </TabItem>\r
                     </TabControl>\r
 \r
@@ -178,8 +182,7 @@
                     </GroupBox>\r
                 </StackPanel>\r
 \r
-            </StackPanel>\r
-            \r
+            </StackPanel>      \r
   \r
             <!-- Status Bar -->\r
             <StatusBar Grid.Row="6" Height="30" Grid.ColumnSpan="2" VerticalAlignment="Bottom">\r
@@ -187,11 +190,5 @@
             </StatusBar>\r
 \r
         </StackPanel>\r
-       \r
-\r
-\r
-\r
-    \r
-\r
     </Grid>\r
 </Window>\r

diff --git a/win/C#/HandBrakeWPF/Views/OptionsView.xaml b/win/C#/HandBrakeWPF/Views/OptionsView.xaml
new file mode 100644 (file)
index 0000000..7573415
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/OptionsView.xaml
@@ -0,0 +1,8 @@
+<Window x:Class="HandBrakeWPF.Views.OptionsView"\r
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
+        Title="OptionsView" Height="300" Width="300">\r
+    <Grid>\r
+        \r
+    </Grid>\r
+</Window>\r

diff --git a/win/C#/HandBrakeWPF/Views/OptionsView.xaml.cs b/win/C#/HandBrakeWPF/Views/OptionsView.xaml.cs
new file mode 100644 (file)
index 0000000..9d0fc94
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/OptionsView.xaml.cs
@@ -0,0 +1,26 @@
+using System;\r
+using System.Collections.Generic;\r
+using System.Linq;\r
+using System.Text;\r
+using System.Windows;\r
+using System.Windows.Controls;\r
+using System.Windows.Data;\r
+using System.Windows.Documents;\r
+using System.Windows.Input;\r
+using System.Windows.Media;\r
+using System.Windows.Media.Imaging;\r
+using System.Windows.Shapes;\r
+\r
+namespace HandBrakeWPF.Views\r
+{\r
+    /// <summary>\r
+    /// Interaction logic for OptionsView.xaml\r
+    /// </summary>\r
+    public partial class OptionsView : Window\r
+    {\r
+        public OptionsView()\r
+        {\r
+            InitializeComponent();\r
+        }\r
+    }\r
+}\r

diff --git a/win/C#/HandBrakeWPF/Views/PreviewView.xaml b/win/C#/HandBrakeWPF/Views/PreviewView.xaml
new file mode 100644 (file)
index 0000000..e3bd0be
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/PreviewView.xaml
@@ -0,0 +1,11 @@
+<UserControl x:Class="HandBrakeWPF.Views.PreviewView"\r
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" \r
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" \r
+             mc:Ignorable="d" \r
+             d:DesignHeight="300" d:DesignWidth="300">\r
+    <Grid Background="Beige">\r
+            \r
+    </Grid>\r
+</UserControl>\r

diff --git a/win/C#/HandBrakeWPF/Views/PreviewView.xaml.cs b/win/C#/HandBrakeWPF/Views/PreviewView.xaml.cs
new file mode 100644 (file)
index 0000000..0bbf84b
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/PreviewView.xaml.cs
@@ -0,0 +1,15 @@
+namespace HandBrakeWPF.Views\r
+{\r
+    using System.Windows.Controls;\r
+\r
+    /// <summary>\r
+    /// Interaction logic for VideoView.xaml\r
+    /// </summary>\r
+    public partial class PreviewView : UserControl\r
+    {\r
+        public PreviewView()\r
+        {\r
+            InitializeComponent();\r
+        }\r
+    }\r
+}\r

diff --git a/win/C#/HandBrakeWPF/Views/QueueView.xaml b/win/C#/HandBrakeWPF/Views/QueueView.xaml
new file mode 100644 (file)
index 0000000..f3fae9b
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/QueueView.xaml
@@ -0,0 +1,11 @@
+<UserControl x:Class="HandBrakeWPF.Views.QueueView"\r
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" \r
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" \r
+             mc:Ignorable="d" \r
+             d:DesignHeight="300" d:DesignWidth="300">\r
+    <Grid Background="Beige">\r
+            \r
+    </Grid>\r
+</UserControl>\r

diff --git a/win/C#/HandBrakeWPF/Views/QueueView.xaml.cs b/win/C#/HandBrakeWPF/Views/QueueView.xaml.cs
new file mode 100644 (file)
index 0000000..ae07431
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/QueueView.xaml.cs
@@ -0,0 +1,15 @@
+namespace HandBrakeWPF.Views\r
+{\r
+    using System.Windows.Controls;\r
+\r
+    /// <summary>\r
+    /// Interaction logic for VideoView.xaml\r
+    /// </summary>\r
+    public partial class QueueView : UserControl\r
+    {\r
+        public QueueView()\r
+        {\r
+            InitializeComponent();\r
+        }\r
+    }\r
+}\r