diff options
| author | sr55 <[email protected]> | 2011-02-19 17:28:58 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2011-02-19 17:28:58 +0000 |
| commit | 0b8918fb48eca14c002657942b199b706fc8959d (patch) | |
| tree | 50c42fa57adf8a92e6d5e13a925353687010ea4c /win | |
| parent | da4025b6af1d0f5550159b87bf6a14c025752107 (diff) | |
WinGui:
- Setting up the structure of the WPF UI. Just empty files with some basic wiring up between them.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3800 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win')
33 files changed, 651 insertions, 16 deletions
diff --git a/win/C#/HandBrakeWPF/HandBrakeWPF.csproj b/win/C#/HandBrakeWPF/HandBrakeWPF.csproj index 512833dc5..efcf37bb7 100644 --- a/win/C#/HandBrakeWPF/HandBrakeWPF.csproj +++ b/win/C#/HandBrakeWPF/HandBrakeWPF.csproj @@ -67,15 +67,59 @@ <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
+ <Compile Include="ViewModels\AboutViewModel.cs" />
+ <Compile Include="ViewModels\AddPresetViewModel.cs" />
+ <Compile Include="ViewModels\PreviewViewModel.cs" />
+ <Compile Include="ViewModels\QueueViewModel.cs" />
+ <Compile Include="ViewModels\OptionsViewModel.cs" />
+ <Compile Include="ViewModels\ViewModelBase.cs" />
+ <Compile Include="Views\AboutView.xaml.cs">
+ <DependentUpon>AboutView.xaml</DependentUpon>
+ </Compile>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="ViewModels\MainViewModel.cs" />
- <Compile Include="ViewModels\ViewModelBase.cs" />
+ <Compile Include="Views\Controls\AdvancedView.xaml.cs">
+ <DependentUpon>AdvancedView.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Views\Controls\AudioView.xaml.cs">
+ <DependentUpon>AudioView.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Views\Controls\ChaptersView.xaml.cs">
+ <DependentUpon>ChaptersView.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Views\AddPresetView.xaml.cs">
+ <DependentUpon>AddPresetView.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Views\PreviewView.xaml.cs">
+ <DependentUpon>PreviewView.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Views\QueueView.xaml.cs">
+ <DependentUpon>QueueView.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Views\Controls\FiltersView.xaml.cs">
+ <DependentUpon>FiltersView.xaml</DependentUpon>
+ </Compile>
<Compile Include="Views\MainView.xaml.cs">
<DependentUpon>MainView.xaml</DependentUpon>
</Compile>
+ <Compile Include="Views\Controls\PictureSettingsView.xaml.cs">
+ <DependentUpon>PictureSettingsView.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Views\Controls\QueryEditorView.xaml.cs">
+ <DependentUpon>QueryEditorView.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Views\Controls\SubtitlesView.xaml.cs">
+ <DependentUpon>SubtitlesView.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Views\Controls\VideoView.xaml.cs">
+ <DependentUpon>VideoView.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Views\OptionsView.xaml.cs">
+ <DependentUpon>OptionsView.xaml</DependentUpon>
+ </Compile>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
@@ -102,13 +146,66 @@ <AppDesigner Include="Properties\" />
</ItemGroup>
<ItemGroup>
+ <Page Include="Views\AboutView.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
+ <Page Include="Views\Controls\AdvancedView.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
+ <Page Include="Views\Controls\AudioView.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
+ <Page Include="Views\Controls\ChaptersView.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
+ <Page Include="Views\AddPresetView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="Views\PreviewView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="Views\QueueView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="Views\Controls\FiltersView.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
<Page Include="Views\MainView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
+ <Page Include="Views\Controls\PictureSettingsView.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
+ <Page Include="Views\Controls\QueryEditorView.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
+ <Page Include="Views\Controls\SubtitlesView.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
+ <Page Include="Views\Controls\VideoView.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
+ <Page Include="Views\OptionsView.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
</ItemGroup>
<ItemGroup>
<Folder Include="Model\" />
+ <Folder Include="Services\" />
</ItemGroup>
<ItemGroup>
<Resource Include="Views\Images\ActivityWindow.png" />
diff --git a/win/C#/HandBrakeWPF/ViewModels/AboutViewModel.cs b/win/C#/HandBrakeWPF/ViewModels/AboutViewModel.cs new file mode 100644 index 000000000..603bfb416 --- /dev/null +++ b/win/C#/HandBrakeWPF/ViewModels/AboutViewModel.cs @@ -0,0 +1,14 @@ +/* AboutViewModel.cs $
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr>.
+ It may be used under the terms of the GNU General Public License. */
+
+namespace HandBrakeWPF.ViewModels
+{
+ /// <summary>
+ /// The About View Model
+ /// </summary>
+ public class AboutViewModel : ViewModelBase
+ {
+ }
+}
diff --git a/win/C#/HandBrakeWPF/ViewModels/AddPresetViewModel.cs b/win/C#/HandBrakeWPF/ViewModels/AddPresetViewModel.cs new file mode 100644 index 000000000..bcd55fcfc --- /dev/null +++ b/win/C#/HandBrakeWPF/ViewModels/AddPresetViewModel.cs @@ -0,0 +1,14 @@ +/* AddPresetViewModel.cs $
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr>.
+ It may be used under the terms of the GNU General Public License. */
+
+namespace HandBrakeWPF.ViewModels
+{
+ /// <summary>
+ /// The Add Preset View Model
+ /// </summary>
+ public class AddPresetViewModel : ViewModelBase
+ {
+ }
+}
diff --git a/win/C#/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/C#/HandBrakeWPF/ViewModels/OptionsViewModel.cs new file mode 100644 index 000000000..62394c167 --- /dev/null +++ b/win/C#/HandBrakeWPF/ViewModels/OptionsViewModel.cs @@ -0,0 +1,14 @@ +/* OptionsViewModel.cs $
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr>.
+ It may be used under the terms of the GNU General Public License. */
+
+namespace HandBrakeWPF.ViewModels
+{
+ /// <summary>
+ /// The Options View Model
+ /// </summary>
+ public class OptionsViewModel : ViewModelBase
+ {
+ }
+}
diff --git a/win/C#/HandBrakeWPF/ViewModels/PreviewViewModel.cs b/win/C#/HandBrakeWPF/ViewModels/PreviewViewModel.cs new file mode 100644 index 000000000..b70d2179f --- /dev/null +++ b/win/C#/HandBrakeWPF/ViewModels/PreviewViewModel.cs @@ -0,0 +1,14 @@ +/* PreviewViewModel.cs $
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr>.
+ It may be used under the terms of the GNU General Public License. */
+
+namespace HandBrakeWPF.ViewModels
+{
+ /// <summary>
+ /// The About View Model
+ /// </summary>
+ public class PreviewViewModel : ViewModelBase
+ {
+ }
+}
diff --git a/win/C#/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/C#/HandBrakeWPF/ViewModels/QueueViewModel.cs new file mode 100644 index 000000000..bbe013d3a --- /dev/null +++ b/win/C#/HandBrakeWPF/ViewModels/QueueViewModel.cs @@ -0,0 +1,14 @@ +/* QueueViewModel.cs $
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr>.
+ It may be used under the terms of the GNU General Public License. */
+
+namespace HandBrakeWPF.ViewModels
+{
+ /// <summary>
+ /// The Preview View Model
+ /// </summary>
+ public class QueueViewModel : ViewModelBase
+ {
+ }
+}
diff --git a/win/C#/HandBrakeWPF/Views/AboutView.xaml b/win/C#/HandBrakeWPF/Views/AboutView.xaml new file mode 100644 index 000000000..155a5f07c --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/AboutView.xaml @@ -0,0 +1,28 @@ +<Window x:Class="HandBrakeWPF.Views.AboutView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ Title="AboutView" Height="268" Width="511">
+
+ <StackPanel Orientation="Horizontal">
+ <Image Source="Images/logo64.png" Width="64" Height="64" SnapsToDevicePixels="True" Margin="10,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top" />
+
+ <StackPanel Orientation="Vertical">
+ <Label Content="HandBrake WPF Demo App" FontWeight="Bold" FontSize="14" Margin="0,10,0,0" />
+ <Label Content="Copyright 2003-2011 HandBrake Team" />
+
+ <Label Content="License:" />
+ <TextBox IsEnabled="False" Width="380" Height="100" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" Margin="10,0,10,10">
+ 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.
+
+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.
+
+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
+ </TextBox>
+
+ <Button Content="OK" HorizontalAlignment="Right" Padding="10,2" Margin="0,0,10,10"></Button>
+
+ </StackPanel>
+
+
+ </StackPanel>
+</Window>
diff --git a/win/C#/HandBrakeWPF/Views/AboutView.xaml.cs b/win/C#/HandBrakeWPF/Views/AboutView.xaml.cs new file mode 100644 index 000000000..22de6967b --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/AboutView.xaml.cs @@ -0,0 +1,15 @@ +namespace HandBrakeWPF.Views
+{
+ using System.Windows;
+
+ /// <summary>
+ /// Interaction logic for AboutView.xaml
+ /// </summary>
+ public partial class AboutView : Window
+ {
+ public AboutView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/win/C#/HandBrakeWPF/Views/AddPresetView.xaml b/win/C#/HandBrakeWPF/Views/AddPresetView.xaml new file mode 100644 index 000000000..74d79f0c8 --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/AddPresetView.xaml @@ -0,0 +1,11 @@ +<UserControl x:Class="HandBrakeWPF.Views.AddPresetView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ mc:Ignorable="d"
+ d:DesignHeight="300" d:DesignWidth="300">
+ <Grid Background="Beige">
+
+ </Grid>
+</UserControl>
diff --git a/win/C#/HandBrakeWPF/Views/AddPresetView.xaml.cs b/win/C#/HandBrakeWPF/Views/AddPresetView.xaml.cs new file mode 100644 index 000000000..b99e48b26 --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/AddPresetView.xaml.cs @@ -0,0 +1,27 @@ +using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace HandBrakeWPF.Views
+{
+ /// <summary>
+ /// Interaction logic for VideoView.xaml
+ /// </summary>
+ public partial class AddPresetView : UserControl
+ {
+ public AddPresetView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/win/C#/HandBrakeWPF/Views/Controls/AdvancedView.xaml b/win/C#/HandBrakeWPF/Views/Controls/AdvancedView.xaml new file mode 100644 index 000000000..3adb82821 --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/Controls/AdvancedView.xaml @@ -0,0 +1,11 @@ +<UserControl x:Class="HandBrakeWPF.Views.AdvancedView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ mc:Ignorable="d"
+ d:DesignHeight="300" d:DesignWidth="300">
+ <Grid Background="Beige">
+
+ </Grid>
+</UserControl>
diff --git a/win/C#/HandBrakeWPF/Views/Controls/AdvancedView.xaml.cs b/win/C#/HandBrakeWPF/Views/Controls/AdvancedView.xaml.cs new file mode 100644 index 000000000..b7ad6ef86 --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/Controls/AdvancedView.xaml.cs @@ -0,0 +1,27 @@ +using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace HandBrakeWPF.Views
+{
+ /// <summary>
+ /// Interaction logic for AdvancedView.xaml
+ /// </summary>
+ public partial class AdvancedView : UserControl
+ {
+ public AdvancedView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/win/C#/HandBrakeWPF/Views/Controls/AudioView.xaml b/win/C#/HandBrakeWPF/Views/Controls/AudioView.xaml new file mode 100644 index 000000000..6087c7d07 --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/Controls/AudioView.xaml @@ -0,0 +1,11 @@ +<UserControl x:Class="HandBrakeWPF.Views.AudioView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ mc:Ignorable="d"
+ d:DesignHeight="300" d:DesignWidth="300">
+ <Grid Background="Beige">
+
+ </Grid>
+</UserControl>
diff --git a/win/C#/HandBrakeWPF/Views/Controls/AudioView.xaml.cs b/win/C#/HandBrakeWPF/Views/Controls/AudioView.xaml.cs new file mode 100644 index 000000000..3518eea56 --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/Controls/AudioView.xaml.cs @@ -0,0 +1,27 @@ +using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace HandBrakeWPF.Views
+{
+ /// <summary>
+ /// Interaction logic for AudioView.xaml
+ /// </summary>
+ public partial class AudioView : UserControl
+ {
+ public AudioView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/win/C#/HandBrakeWPF/Views/Controls/ChaptersView.xaml b/win/C#/HandBrakeWPF/Views/Controls/ChaptersView.xaml new file mode 100644 index 000000000..ac39a7062 --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/Controls/ChaptersView.xaml @@ -0,0 +1,11 @@ +<UserControl x:Class="HandBrakeWPF.Views.ChaptersView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ mc:Ignorable="d"
+ d:DesignHeight="300" d:DesignWidth="300">
+ <Grid Background="Beige">
+
+ </Grid>
+</UserControl>
diff --git a/win/C#/HandBrakeWPF/Views/Controls/ChaptersView.xaml.cs b/win/C#/HandBrakeWPF/Views/Controls/ChaptersView.xaml.cs new file mode 100644 index 000000000..f61b201c9 --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/Controls/ChaptersView.xaml.cs @@ -0,0 +1,27 @@ +using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace HandBrakeWPF.Views
+{
+ /// <summary>
+ /// Interaction logic for ChaptersView.xaml
+ /// </summary>
+ public partial class ChaptersView : UserControl
+ {
+ public ChaptersView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/win/C#/HandBrakeWPF/Views/Controls/FiltersView.xaml b/win/C#/HandBrakeWPF/Views/Controls/FiltersView.xaml new file mode 100644 index 000000000..6ac8f5a10 --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/Controls/FiltersView.xaml @@ -0,0 +1,11 @@ +<UserControl x:Class="HandBrakeWPF.Views.FiltersView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ mc:Ignorable="d"
+ d:DesignHeight="300" d:DesignWidth="300">
+ <Grid Background="Beige">
+
+ </Grid>
+</UserControl>
diff --git a/win/C#/HandBrakeWPF/Views/Controls/FiltersView.xaml.cs b/win/C#/HandBrakeWPF/Views/Controls/FiltersView.xaml.cs new file mode 100644 index 000000000..27f38be95 --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/Controls/FiltersView.xaml.cs @@ -0,0 +1,27 @@ +using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace HandBrakeWPF.Views
+{
+ /// <summary>
+ /// Interaction logic for VideoFilters.xaml
+ /// </summary>
+ public partial class FiltersView : UserControl
+ {
+ public FiltersView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/win/C#/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml b/win/C#/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml new file mode 100644 index 000000000..a60e3b565 --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml @@ -0,0 +1,11 @@ +<UserControl x:Class="HandBrakeWPF.Views.PictureSettingsView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ mc:Ignorable="d"
+ d:DesignHeight="300" d:DesignWidth="300">
+ <Grid Background="Beige">
+
+ </Grid>
+</UserControl>
diff --git a/win/C#/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml.cs b/win/C#/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml.cs new file mode 100644 index 000000000..9401168dc --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml.cs @@ -0,0 +1,27 @@ +using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace HandBrakeWPF.Views
+{
+ /// <summary>
+ /// Interaction logic for PictureSettingsView.xaml
+ /// </summary>
+ public partial class PictureSettingsView : UserControl
+ {
+ public PictureSettingsView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/win/C#/HandBrakeWPF/Views/Controls/QueryEditorView.xaml b/win/C#/HandBrakeWPF/Views/Controls/QueryEditorView.xaml new file mode 100644 index 000000000..694dcd8df --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/Controls/QueryEditorView.xaml @@ -0,0 +1,11 @@ +<UserControl x:Class="HandBrakeWPF.Views.QueryEditorView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ mc:Ignorable="d"
+ d:DesignHeight="300" d:DesignWidth="300">
+ <Grid Background="Beige">
+
+ </Grid>
+</UserControl>
diff --git a/win/C#/HandBrakeWPF/Views/Controls/QueryEditorView.xaml.cs b/win/C#/HandBrakeWPF/Views/Controls/QueryEditorView.xaml.cs new file mode 100644 index 000000000..d67b7eb5c --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/Controls/QueryEditorView.xaml.cs @@ -0,0 +1,27 @@ +using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace HandBrakeWPF.Views
+{
+ /// <summary>
+ /// Interaction logic for QueryEditorView.xaml
+ /// </summary>
+ public partial class QueryEditorView : UserControl
+ {
+ public QueryEditorView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/win/C#/HandBrakeWPF/Views/Controls/SubtitlesView.xaml b/win/C#/HandBrakeWPF/Views/Controls/SubtitlesView.xaml new file mode 100644 index 000000000..4594f62b5 --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/Controls/SubtitlesView.xaml @@ -0,0 +1,11 @@ +<UserControl x:Class="HandBrakeWPF.Views.SubtitlesView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ mc:Ignorable="d"
+ d:DesignHeight="300" d:DesignWidth="300">
+ <Grid Background="Beige">
+
+ </Grid>
+</UserControl>
diff --git a/win/C#/HandBrakeWPF/Views/Controls/SubtitlesView.xaml.cs b/win/C#/HandBrakeWPF/Views/Controls/SubtitlesView.xaml.cs new file mode 100644 index 000000000..589462c40 --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/Controls/SubtitlesView.xaml.cs @@ -0,0 +1,27 @@ +using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace HandBrakeWPF.Views
+{
+ /// <summary>
+ /// Interaction logic for SubtitlesView.xaml
+ /// </summary>
+ public partial class SubtitlesView : UserControl
+ {
+ public SubtitlesView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/win/C#/HandBrakeWPF/Views/Controls/VideoView.xaml b/win/C#/HandBrakeWPF/Views/Controls/VideoView.xaml new file mode 100644 index 000000000..72ab1f67c --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/Controls/VideoView.xaml @@ -0,0 +1,11 @@ +<UserControl x:Class="HandBrakeWPF.Views.VideoView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ mc:Ignorable="d"
+ d:DesignHeight="300" d:DesignWidth="300">
+ <Grid Background="Beige">
+
+ </Grid>
+</UserControl>
diff --git a/win/C#/HandBrakeWPF/Views/Controls/VideoView.xaml.cs b/win/C#/HandBrakeWPF/Views/Controls/VideoView.xaml.cs new file mode 100644 index 000000000..f59435f02 --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/Controls/VideoView.xaml.cs @@ -0,0 +1,27 @@ +using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace HandBrakeWPF.Views
+{
+ /// <summary>
+ /// Interaction logic for VideoView.xaml
+ /// </summary>
+ public partial class VideoView : UserControl
+ {
+ public VideoView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/win/C#/HandBrakeWPF/Views/MainView.xaml b/win/C#/HandBrakeWPF/Views/MainView.xaml index ea4d41ad2..56edca62e 100644 --- a/win/C#/HandBrakeWPF/Views/MainView.xaml +++ b/win/C#/HandBrakeWPF/Views/MainView.xaml @@ -1,6 +1,10 @@ <Window x:Class="HandBrakeWPF.Views.MainView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- 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">
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:PresentationFramework="clr-namespace:Caliburn.PresentationFramework;assembly=Caliburn.PresentationFramework"
+ xmlns:Views="clr-namespace:HandBrakeWPF.Views"
+ xmlns:Data="clr-namespace:System.Windows.Data;assembly=PresentationFramework"
+ Title="{Data:Binding Path=WindowTitle}" Height="655" Width="1015" FontSize="11">
<Grid>
<StackPanel Orientation="Vertical" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
@@ -140,22 +144,22 @@ <!-- Tab Control -->
<TabControl HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="725" Height="330" Margin="10,10,10,10" Name="tabControl" >
<TabItem Header="Picture" Name="pictureTab">
- <Grid />
+ <Views:PictureSettingsView></Views:PictureSettingsView>
</TabItem>
<TabItem Header="Video Filters" Name="filtersTab">
- <Grid />
+ <Views:FiltersView></Views:FiltersView>
</TabItem>
<TabItem Header="Video" Name="videoTab">
- <Grid />
+ <Views:VideoView></Views:VideoView>
</TabItem>
<TabItem Header="Audio" Name="audioTab">
- <Grid />
+ <Views:AudioView></Views:AudioView>
</TabItem>
<TabItem Header="Chapters" Name="chaptersTab">
- <Grid />
+ <Views:ChaptersView></Views:ChaptersView>
</TabItem>
<TabItem Header="Advanced" Name="advancedTab">
- <Grid />
+ <Views:AdvancedView></Views:AdvancedView>
</TabItem>
</TabControl>
@@ -178,8 +182,7 @@ </GroupBox>
</StackPanel>
- </StackPanel>
-
+ </StackPanel>
<!-- Status Bar -->
<StatusBar Grid.Row="6" Height="30" Grid.ColumnSpan="2" VerticalAlignment="Bottom">
@@ -187,11 +190,5 @@ </StatusBar>
</StackPanel>
-
-
-
-
-
-
</Grid>
</Window>
diff --git a/win/C#/HandBrakeWPF/Views/OptionsView.xaml b/win/C#/HandBrakeWPF/Views/OptionsView.xaml new file mode 100644 index 000000000..7573415b7 --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/OptionsView.xaml @@ -0,0 +1,8 @@ +<Window x:Class="HandBrakeWPF.Views.OptionsView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ Title="OptionsView" Height="300" Width="300">
+ <Grid>
+
+ </Grid>
+</Window>
diff --git a/win/C#/HandBrakeWPF/Views/OptionsView.xaml.cs b/win/C#/HandBrakeWPF/Views/OptionsView.xaml.cs new file mode 100644 index 000000000..9d0fc947c --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/OptionsView.xaml.cs @@ -0,0 +1,26 @@ +using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace HandBrakeWPF.Views
+{
+ /// <summary>
+ /// Interaction logic for OptionsView.xaml
+ /// </summary>
+ public partial class OptionsView : Window
+ {
+ public OptionsView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/win/C#/HandBrakeWPF/Views/PreviewView.xaml b/win/C#/HandBrakeWPF/Views/PreviewView.xaml new file mode 100644 index 000000000..e3bd0be52 --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/PreviewView.xaml @@ -0,0 +1,11 @@ +<UserControl x:Class="HandBrakeWPF.Views.PreviewView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ mc:Ignorable="d"
+ d:DesignHeight="300" d:DesignWidth="300">
+ <Grid Background="Beige">
+
+ </Grid>
+</UserControl>
diff --git a/win/C#/HandBrakeWPF/Views/PreviewView.xaml.cs b/win/C#/HandBrakeWPF/Views/PreviewView.xaml.cs new file mode 100644 index 000000000..0bbf84b0a --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/PreviewView.xaml.cs @@ -0,0 +1,15 @@ +namespace HandBrakeWPF.Views
+{
+ using System.Windows.Controls;
+
+ /// <summary>
+ /// Interaction logic for VideoView.xaml
+ /// </summary>
+ public partial class PreviewView : UserControl
+ {
+ public PreviewView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/win/C#/HandBrakeWPF/Views/QueueView.xaml b/win/C#/HandBrakeWPF/Views/QueueView.xaml new file mode 100644 index 000000000..f3fae9b26 --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/QueueView.xaml @@ -0,0 +1,11 @@ +<UserControl x:Class="HandBrakeWPF.Views.QueueView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ mc:Ignorable="d"
+ d:DesignHeight="300" d:DesignWidth="300">
+ <Grid Background="Beige">
+
+ </Grid>
+</UserControl>
diff --git a/win/C#/HandBrakeWPF/Views/QueueView.xaml.cs b/win/C#/HandBrakeWPF/Views/QueueView.xaml.cs new file mode 100644 index 000000000..ae0743166 --- /dev/null +++ b/win/C#/HandBrakeWPF/Views/QueueView.xaml.cs @@ -0,0 +1,15 @@ +namespace HandBrakeWPF.Views
+{
+ using System.Windows.Controls;
+
+ /// <summary>
+ /// Interaction logic for VideoView.xaml
+ /// </summary>
+ public partial class QueueView : UserControl
+ {
+ public QueueView()
+ {
+ InitializeComponent();
+ }
+ }
+}
|