OSDN -- オープンソース・ソフトウェアの開発とダウンロード
日本語の翻訳状況 translation status for ja
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

コミット

タグ
未設定

よく使われているワード(クリックで追加)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

githubのコードからのfolk


コミットメタ情報

リビジョンea5c464ecca846ae0167d31a541680eda8e2791e (tree)
日時2011-02-20 02:28:58
作者sr55 <sr55@b64f...>
コミッターsr55

ログメッセージ

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

変更サマリ

差分

--- a/win/C#/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/C#/HandBrakeWPF/HandBrakeWPF.csproj
@@ -67,15 +67,59 @@
6767 <Generator>MSBuild:Compile</Generator>
6868 <SubType>Designer</SubType>
6969 </ApplicationDefinition>
70+ <Compile Include="ViewModels\AboutViewModel.cs" />
71+ <Compile Include="ViewModels\AddPresetViewModel.cs" />
72+ <Compile Include="ViewModels\PreviewViewModel.cs" />
73+ <Compile Include="ViewModels\QueueViewModel.cs" />
74+ <Compile Include="ViewModels\OptionsViewModel.cs" />
75+ <Compile Include="ViewModels\ViewModelBase.cs" />
76+ <Compile Include="Views\AboutView.xaml.cs">
77+ <DependentUpon>AboutView.xaml</DependentUpon>
78+ </Compile>
7079 <Compile Include="App.xaml.cs">
7180 <DependentUpon>App.xaml</DependentUpon>
7281 <SubType>Code</SubType>
7382 </Compile>
7483 <Compile Include="ViewModels\MainViewModel.cs" />
75- <Compile Include="ViewModels\ViewModelBase.cs" />
84+ <Compile Include="Views\Controls\AdvancedView.xaml.cs">
85+ <DependentUpon>AdvancedView.xaml</DependentUpon>
86+ </Compile>
87+ <Compile Include="Views\Controls\AudioView.xaml.cs">
88+ <DependentUpon>AudioView.xaml</DependentUpon>
89+ </Compile>
90+ <Compile Include="Views\Controls\ChaptersView.xaml.cs">
91+ <DependentUpon>ChaptersView.xaml</DependentUpon>
92+ </Compile>
93+ <Compile Include="Views\AddPresetView.xaml.cs">
94+ <DependentUpon>AddPresetView.xaml</DependentUpon>
95+ </Compile>
96+ <Compile Include="Views\PreviewView.xaml.cs">
97+ <DependentUpon>PreviewView.xaml</DependentUpon>
98+ </Compile>
99+ <Compile Include="Views\QueueView.xaml.cs">
100+ <DependentUpon>QueueView.xaml</DependentUpon>
101+ </Compile>
102+ <Compile Include="Views\Controls\FiltersView.xaml.cs">
103+ <DependentUpon>FiltersView.xaml</DependentUpon>
104+ </Compile>
76105 <Compile Include="Views\MainView.xaml.cs">
77106 <DependentUpon>MainView.xaml</DependentUpon>
78107 </Compile>
108+ <Compile Include="Views\Controls\PictureSettingsView.xaml.cs">
109+ <DependentUpon>PictureSettingsView.xaml</DependentUpon>
110+ </Compile>
111+ <Compile Include="Views\Controls\QueryEditorView.xaml.cs">
112+ <DependentUpon>QueryEditorView.xaml</DependentUpon>
113+ </Compile>
114+ <Compile Include="Views\Controls\SubtitlesView.xaml.cs">
115+ <DependentUpon>SubtitlesView.xaml</DependentUpon>
116+ </Compile>
117+ <Compile Include="Views\Controls\VideoView.xaml.cs">
118+ <DependentUpon>VideoView.xaml</DependentUpon>
119+ </Compile>
120+ <Compile Include="Views\OptionsView.xaml.cs">
121+ <DependentUpon>OptionsView.xaml</DependentUpon>
122+ </Compile>
79123 </ItemGroup>
80124 <ItemGroup>
81125 <Compile Include="Properties\AssemblyInfo.cs">
@@ -102,13 +146,66 @@
102146 <AppDesigner Include="Properties\" />
103147 </ItemGroup>
104148 <ItemGroup>
149+ <Page Include="Views\AboutView.xaml">
150+ <SubType>Designer</SubType>
151+ <Generator>MSBuild:Compile</Generator>
152+ </Page>
153+ <Page Include="Views\Controls\AdvancedView.xaml">
154+ <SubType>Designer</SubType>
155+ <Generator>MSBuild:Compile</Generator>
156+ </Page>
157+ <Page Include="Views\Controls\AudioView.xaml">
158+ <SubType>Designer</SubType>
159+ <Generator>MSBuild:Compile</Generator>
160+ </Page>
161+ <Page Include="Views\Controls\ChaptersView.xaml">
162+ <SubType>Designer</SubType>
163+ <Generator>MSBuild:Compile</Generator>
164+ </Page>
165+ <Page Include="Views\AddPresetView.xaml">
166+ <Generator>MSBuild:Compile</Generator>
167+ <SubType>Designer</SubType>
168+ </Page>
169+ <Page Include="Views\PreviewView.xaml">
170+ <Generator>MSBuild:Compile</Generator>
171+ <SubType>Designer</SubType>
172+ </Page>
173+ <Page Include="Views\QueueView.xaml">
174+ <Generator>MSBuild:Compile</Generator>
175+ <SubType>Designer</SubType>
176+ </Page>
177+ <Page Include="Views\Controls\FiltersView.xaml">
178+ <Generator>MSBuild:Compile</Generator>
179+ <SubType>Designer</SubType>
180+ </Page>
105181 <Page Include="Views\MainView.xaml">
106182 <SubType>Designer</SubType>
107183 <Generator>MSBuild:Compile</Generator>
108184 </Page>
185+ <Page Include="Views\Controls\PictureSettingsView.xaml">
186+ <SubType>Designer</SubType>
187+ <Generator>MSBuild:Compile</Generator>
188+ </Page>
189+ <Page Include="Views\Controls\QueryEditorView.xaml">
190+ <SubType>Designer</SubType>
191+ <Generator>MSBuild:Compile</Generator>
192+ </Page>
193+ <Page Include="Views\Controls\SubtitlesView.xaml">
194+ <SubType>Designer</SubType>
195+ <Generator>MSBuild:Compile</Generator>
196+ </Page>
197+ <Page Include="Views\Controls\VideoView.xaml">
198+ <SubType>Designer</SubType>
199+ <Generator>MSBuild:Compile</Generator>
200+ </Page>
201+ <Page Include="Views\OptionsView.xaml">
202+ <SubType>Designer</SubType>
203+ <Generator>MSBuild:Compile</Generator>
204+ </Page>
109205 </ItemGroup>
110206 <ItemGroup>
111207 <Folder Include="Model\" />
208+ <Folder Include="Services\" />
112209 </ItemGroup>
113210 <ItemGroup>
114211 <Resource Include="Views\Images\ActivityWindow.png" />
--- /dev/null
+++ b/win/C#/HandBrakeWPF/ViewModels/AboutViewModel.cs
@@ -0,0 +1,14 @@
1+/* AboutViewModel.cs $
2+ This file is part of the HandBrake source code.
3+ Homepage: <http://handbrake.fr>.
4+ It may be used under the terms of the GNU General Public License. */
5+
6+namespace HandBrakeWPF.ViewModels
7+{
8+ /// <summary>
9+ /// The About View Model
10+ /// </summary>
11+ public class AboutViewModel : ViewModelBase
12+ {
13+ }
14+}
--- /dev/null
+++ b/win/C#/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
@@ -0,0 +1,14 @@
1+/* AddPresetViewModel.cs $
2+ This file is part of the HandBrake source code.
3+ Homepage: <http://handbrake.fr>.
4+ It may be used under the terms of the GNU General Public License. */
5+
6+namespace HandBrakeWPF.ViewModels
7+{
8+ /// <summary>
9+ /// The Add Preset View Model
10+ /// </summary>
11+ public class AddPresetViewModel : ViewModelBase
12+ {
13+ }
14+}
--- /dev/null
+++ b/win/C#/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -0,0 +1,14 @@
1+/* OptionsViewModel.cs $
2+ This file is part of the HandBrake source code.
3+ Homepage: <http://handbrake.fr>.
4+ It may be used under the terms of the GNU General Public License. */
5+
6+namespace HandBrakeWPF.ViewModels
7+{
8+ /// <summary>
9+ /// The Options View Model
10+ /// </summary>
11+ public class OptionsViewModel : ViewModelBase
12+ {
13+ }
14+}
--- /dev/null
+++ b/win/C#/HandBrakeWPF/ViewModels/PreviewViewModel.cs
@@ -0,0 +1,14 @@
1+/* PreviewViewModel.cs $
2+ This file is part of the HandBrake source code.
3+ Homepage: <http://handbrake.fr>.
4+ It may be used under the terms of the GNU General Public License. */
5+
6+namespace HandBrakeWPF.ViewModels
7+{
8+ /// <summary>
9+ /// The About View Model
10+ /// </summary>
11+ public class PreviewViewModel : ViewModelBase
12+ {
13+ }
14+}
--- /dev/null
+++ b/win/C#/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -0,0 +1,14 @@
1+/* QueueViewModel.cs $
2+ This file is part of the HandBrake source code.
3+ Homepage: <http://handbrake.fr>.
4+ It may be used under the terms of the GNU General Public License. */
5+
6+namespace HandBrakeWPF.ViewModels
7+{
8+ /// <summary>
9+ /// The Preview View Model
10+ /// </summary>
11+ public class QueueViewModel : ViewModelBase
12+ {
13+ }
14+}
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/AboutView.xaml
@@ -0,0 +1,28 @@
1+<Window x:Class="HandBrakeWPF.Views.AboutView"
2+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+ Title="AboutView" Height="268" Width="511">
5+
6+ <StackPanel Orientation="Horizontal">
7+ <Image Source="Images/logo64.png" Width="64" Height="64" SnapsToDevicePixels="True" Margin="10,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top" />
8+
9+ <StackPanel Orientation="Vertical">
10+ <Label Content="HandBrake WPF Demo App" FontWeight="Bold" FontSize="14" Margin="0,10,0,0" />
11+ <Label Content="Copyright 2003-2011 HandBrake Team" />
12+
13+ <Label Content="License:" />
14+ <TextBox IsEnabled="False" Width="380" Height="100" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" Margin="10,0,10,10">
15+ 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.
16+
17+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.
18+
19+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
20+ </TextBox>
21+
22+ <Button Content="OK" HorizontalAlignment="Right" Padding="10,2" Margin="0,0,10,10"></Button>
23+
24+ </StackPanel>
25+
26+
27+ </StackPanel>
28+</Window>
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/AboutView.xaml.cs
@@ -0,0 +1,15 @@
1+namespace HandBrakeWPF.Views
2+{
3+ using System.Windows;
4+
5+ /// <summary>
6+ /// Interaction logic for AboutView.xaml
7+ /// </summary>
8+ public partial class AboutView : Window
9+ {
10+ public AboutView()
11+ {
12+ InitializeComponent();
13+ }
14+ }
15+}
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/AddPresetView.xaml
@@ -0,0 +1,11 @@
1+<UserControl x:Class="HandBrakeWPF.Views.AddPresetView"
2+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+ mc:Ignorable="d"
7+ d:DesignHeight="300" d:DesignWidth="300">
8+ <Grid Background="Beige">
9+
10+ </Grid>
11+</UserControl>
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/AddPresetView.xaml.cs
@@ -0,0 +1,27 @@
1+using System;
2+using System.Collections.Generic;
3+using System.Linq;
4+using System.Text;
5+using System.Windows;
6+using System.Windows.Controls;
7+using System.Windows.Data;
8+using System.Windows.Documents;
9+using System.Windows.Input;
10+using System.Windows.Media;
11+using System.Windows.Media.Imaging;
12+using System.Windows.Navigation;
13+using System.Windows.Shapes;
14+
15+namespace HandBrakeWPF.Views
16+{
17+ /// <summary>
18+ /// Interaction logic for VideoView.xaml
19+ /// </summary>
20+ public partial class AddPresetView : UserControl
21+ {
22+ public AddPresetView()
23+ {
24+ InitializeComponent();
25+ }
26+ }
27+}
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/AdvancedView.xaml
@@ -0,0 +1,11 @@
1+<UserControl x:Class="HandBrakeWPF.Views.AdvancedView"
2+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+ mc:Ignorable="d"
7+ d:DesignHeight="300" d:DesignWidth="300">
8+ <Grid Background="Beige">
9+
10+ </Grid>
11+</UserControl>
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/AdvancedView.xaml.cs
@@ -0,0 +1,27 @@
1+using System;
2+using System.Collections.Generic;
3+using System.Linq;
4+using System.Text;
5+using System.Windows;
6+using System.Windows.Controls;
7+using System.Windows.Data;
8+using System.Windows.Documents;
9+using System.Windows.Input;
10+using System.Windows.Media;
11+using System.Windows.Media.Imaging;
12+using System.Windows.Navigation;
13+using System.Windows.Shapes;
14+
15+namespace HandBrakeWPF.Views
16+{
17+ /// <summary>
18+ /// Interaction logic for AdvancedView.xaml
19+ /// </summary>
20+ public partial class AdvancedView : UserControl
21+ {
22+ public AdvancedView()
23+ {
24+ InitializeComponent();
25+ }
26+ }
27+}
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/AudioView.xaml
@@ -0,0 +1,11 @@
1+<UserControl x:Class="HandBrakeWPF.Views.AudioView"
2+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+ mc:Ignorable="d"
7+ d:DesignHeight="300" d:DesignWidth="300">
8+ <Grid Background="Beige">
9+
10+ </Grid>
11+</UserControl>
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/AudioView.xaml.cs
@@ -0,0 +1,27 @@
1+using System;
2+using System.Collections.Generic;
3+using System.Linq;
4+using System.Text;
5+using System.Windows;
6+using System.Windows.Controls;
7+using System.Windows.Data;
8+using System.Windows.Documents;
9+using System.Windows.Input;
10+using System.Windows.Media;
11+using System.Windows.Media.Imaging;
12+using System.Windows.Navigation;
13+using System.Windows.Shapes;
14+
15+namespace HandBrakeWPF.Views
16+{
17+ /// <summary>
18+ /// Interaction logic for AudioView.xaml
19+ /// </summary>
20+ public partial class AudioView : UserControl
21+ {
22+ public AudioView()
23+ {
24+ InitializeComponent();
25+ }
26+ }
27+}
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/ChaptersView.xaml
@@ -0,0 +1,11 @@
1+<UserControl x:Class="HandBrakeWPF.Views.ChaptersView"
2+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+ mc:Ignorable="d"
7+ d:DesignHeight="300" d:DesignWidth="300">
8+ <Grid Background="Beige">
9+
10+ </Grid>
11+</UserControl>
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/ChaptersView.xaml.cs
@@ -0,0 +1,27 @@
1+using System;
2+using System.Collections.Generic;
3+using System.Linq;
4+using System.Text;
5+using System.Windows;
6+using System.Windows.Controls;
7+using System.Windows.Data;
8+using System.Windows.Documents;
9+using System.Windows.Input;
10+using System.Windows.Media;
11+using System.Windows.Media.Imaging;
12+using System.Windows.Navigation;
13+using System.Windows.Shapes;
14+
15+namespace HandBrakeWPF.Views
16+{
17+ /// <summary>
18+ /// Interaction logic for ChaptersView.xaml
19+ /// </summary>
20+ public partial class ChaptersView : UserControl
21+ {
22+ public ChaptersView()
23+ {
24+ InitializeComponent();
25+ }
26+ }
27+}
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/FiltersView.xaml
@@ -0,0 +1,11 @@
1+<UserControl x:Class="HandBrakeWPF.Views.FiltersView"
2+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+ mc:Ignorable="d"
7+ d:DesignHeight="300" d:DesignWidth="300">
8+ <Grid Background="Beige">
9+
10+ </Grid>
11+</UserControl>
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/FiltersView.xaml.cs
@@ -0,0 +1,27 @@
1+using System;
2+using System.Collections.Generic;
3+using System.Linq;
4+using System.Text;
5+using System.Windows;
6+using System.Windows.Controls;
7+using System.Windows.Data;
8+using System.Windows.Documents;
9+using System.Windows.Input;
10+using System.Windows.Media;
11+using System.Windows.Media.Imaging;
12+using System.Windows.Navigation;
13+using System.Windows.Shapes;
14+
15+namespace HandBrakeWPF.Views
16+{
17+ /// <summary>
18+ /// Interaction logic for VideoFilters.xaml
19+ /// </summary>
20+ public partial class FiltersView : UserControl
21+ {
22+ public FiltersView()
23+ {
24+ InitializeComponent();
25+ }
26+ }
27+}
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml
@@ -0,0 +1,11 @@
1+<UserControl x:Class="HandBrakeWPF.Views.PictureSettingsView"
2+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+ mc:Ignorable="d"
7+ d:DesignHeight="300" d:DesignWidth="300">
8+ <Grid Background="Beige">
9+
10+ </Grid>
11+</UserControl>
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml.cs
@@ -0,0 +1,27 @@
1+using System;
2+using System.Collections.Generic;
3+using System.Linq;
4+using System.Text;
5+using System.Windows;
6+using System.Windows.Controls;
7+using System.Windows.Data;
8+using System.Windows.Documents;
9+using System.Windows.Input;
10+using System.Windows.Media;
11+using System.Windows.Media.Imaging;
12+using System.Windows.Navigation;
13+using System.Windows.Shapes;
14+
15+namespace HandBrakeWPF.Views
16+{
17+ /// <summary>
18+ /// Interaction logic for PictureSettingsView.xaml
19+ /// </summary>
20+ public partial class PictureSettingsView : UserControl
21+ {
22+ public PictureSettingsView()
23+ {
24+ InitializeComponent();
25+ }
26+ }
27+}
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/QueryEditorView.xaml
@@ -0,0 +1,11 @@
1+<UserControl x:Class="HandBrakeWPF.Views.QueryEditorView"
2+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+ mc:Ignorable="d"
7+ d:DesignHeight="300" d:DesignWidth="300">
8+ <Grid Background="Beige">
9+
10+ </Grid>
11+</UserControl>
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/QueryEditorView.xaml.cs
@@ -0,0 +1,27 @@
1+using System;
2+using System.Collections.Generic;
3+using System.Linq;
4+using System.Text;
5+using System.Windows;
6+using System.Windows.Controls;
7+using System.Windows.Data;
8+using System.Windows.Documents;
9+using System.Windows.Input;
10+using System.Windows.Media;
11+using System.Windows.Media.Imaging;
12+using System.Windows.Navigation;
13+using System.Windows.Shapes;
14+
15+namespace HandBrakeWPF.Views
16+{
17+ /// <summary>
18+ /// Interaction logic for QueryEditorView.xaml
19+ /// </summary>
20+ public partial class QueryEditorView : UserControl
21+ {
22+ public QueryEditorView()
23+ {
24+ InitializeComponent();
25+ }
26+ }
27+}
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/SubtitlesView.xaml
@@ -0,0 +1,11 @@
1+<UserControl x:Class="HandBrakeWPF.Views.SubtitlesView"
2+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+ mc:Ignorable="d"
7+ d:DesignHeight="300" d:DesignWidth="300">
8+ <Grid Background="Beige">
9+
10+ </Grid>
11+</UserControl>
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/SubtitlesView.xaml.cs
@@ -0,0 +1,27 @@
1+using System;
2+using System.Collections.Generic;
3+using System.Linq;
4+using System.Text;
5+using System.Windows;
6+using System.Windows.Controls;
7+using System.Windows.Data;
8+using System.Windows.Documents;
9+using System.Windows.Input;
10+using System.Windows.Media;
11+using System.Windows.Media.Imaging;
12+using System.Windows.Navigation;
13+using System.Windows.Shapes;
14+
15+namespace HandBrakeWPF.Views
16+{
17+ /// <summary>
18+ /// Interaction logic for SubtitlesView.xaml
19+ /// </summary>
20+ public partial class SubtitlesView : UserControl
21+ {
22+ public SubtitlesView()
23+ {
24+ InitializeComponent();
25+ }
26+ }
27+}
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/VideoView.xaml
@@ -0,0 +1,11 @@
1+<UserControl x:Class="HandBrakeWPF.Views.VideoView"
2+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+ mc:Ignorable="d"
7+ d:DesignHeight="300" d:DesignWidth="300">
8+ <Grid Background="Beige">
9+
10+ </Grid>
11+</UserControl>
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/Controls/VideoView.xaml.cs
@@ -0,0 +1,27 @@
1+using System;
2+using System.Collections.Generic;
3+using System.Linq;
4+using System.Text;
5+using System.Windows;
6+using System.Windows.Controls;
7+using System.Windows.Data;
8+using System.Windows.Documents;
9+using System.Windows.Input;
10+using System.Windows.Media;
11+using System.Windows.Media.Imaging;
12+using System.Windows.Navigation;
13+using System.Windows.Shapes;
14+
15+namespace HandBrakeWPF.Views
16+{
17+ /// <summary>
18+ /// Interaction logic for VideoView.xaml
19+ /// </summary>
20+ public partial class VideoView : UserControl
21+ {
22+ public VideoView()
23+ {
24+ InitializeComponent();
25+ }
26+ }
27+}
--- a/win/C#/HandBrakeWPF/Views/MainView.xaml
+++ b/win/C#/HandBrakeWPF/Views/MainView.xaml
@@ -1,6 +1,10 @@
11 <Window x:Class="HandBrakeWPF.Views.MainView"
22 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3- 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">
3+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+ xmlns:PresentationFramework="clr-namespace:Caliburn.PresentationFramework;assembly=Caliburn.PresentationFramework"
5+ xmlns:Views="clr-namespace:HandBrakeWPF.Views"
6+ xmlns:Data="clr-namespace:System.Windows.Data;assembly=PresentationFramework"
7+ Title="{Data:Binding Path=WindowTitle}" Height="655" Width="1015" FontSize="11">
48
59 <Grid>
610 <StackPanel Orientation="Vertical" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
@@ -140,22 +144,22 @@
140144 <!-- Tab Control -->
141145 <TabControl HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="725" Height="330" Margin="10,10,10,10" Name="tabControl" >
142146 <TabItem Header="Picture" Name="pictureTab">
143- <Grid />
147+ <Views:PictureSettingsView></Views:PictureSettingsView>
144148 </TabItem>
145149 <TabItem Header="Video Filters" Name="filtersTab">
146- <Grid />
150+ <Views:FiltersView></Views:FiltersView>
147151 </TabItem>
148152 <TabItem Header="Video" Name="videoTab">
149- <Grid />
153+ <Views:VideoView></Views:VideoView>
150154 </TabItem>
151155 <TabItem Header="Audio" Name="audioTab">
152- <Grid />
156+ <Views:AudioView></Views:AudioView>
153157 </TabItem>
154158 <TabItem Header="Chapters" Name="chaptersTab">
155- <Grid />
159+ <Views:ChaptersView></Views:ChaptersView>
156160 </TabItem>
157161 <TabItem Header="Advanced" Name="advancedTab">
158- <Grid />
162+ <Views:AdvancedView></Views:AdvancedView>
159163 </TabItem>
160164 </TabControl>
161165
@@ -178,8 +182,7 @@
178182 </GroupBox>
179183 </StackPanel>
180184
181- </StackPanel>
182-
185+ </StackPanel>
183186
184187 <!-- Status Bar -->
185188 <StatusBar Grid.Row="6" Height="30" Grid.ColumnSpan="2" VerticalAlignment="Bottom">
@@ -187,11 +190,5 @@
187190 </StatusBar>
188191
189192 </StackPanel>
190-
191-
192-
193-
194-
195-
196193 </Grid>
197194 </Window>
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/OptionsView.xaml
@@ -0,0 +1,8 @@
1+<Window x:Class="HandBrakeWPF.Views.OptionsView"
2+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+ Title="OptionsView" Height="300" Width="300">
5+ <Grid>
6+
7+ </Grid>
8+</Window>
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/OptionsView.xaml.cs
@@ -0,0 +1,26 @@
1+using System;
2+using System.Collections.Generic;
3+using System.Linq;
4+using System.Text;
5+using System.Windows;
6+using System.Windows.Controls;
7+using System.Windows.Data;
8+using System.Windows.Documents;
9+using System.Windows.Input;
10+using System.Windows.Media;
11+using System.Windows.Media.Imaging;
12+using System.Windows.Shapes;
13+
14+namespace HandBrakeWPF.Views
15+{
16+ /// <summary>
17+ /// Interaction logic for OptionsView.xaml
18+ /// </summary>
19+ public partial class OptionsView : Window
20+ {
21+ public OptionsView()
22+ {
23+ InitializeComponent();
24+ }
25+ }
26+}
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/PreviewView.xaml
@@ -0,0 +1,11 @@
1+<UserControl x:Class="HandBrakeWPF.Views.PreviewView"
2+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+ mc:Ignorable="d"
7+ d:DesignHeight="300" d:DesignWidth="300">
8+ <Grid Background="Beige">
9+
10+ </Grid>
11+</UserControl>
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/PreviewView.xaml.cs
@@ -0,0 +1,15 @@
1+namespace HandBrakeWPF.Views
2+{
3+ using System.Windows.Controls;
4+
5+ /// <summary>
6+ /// Interaction logic for VideoView.xaml
7+ /// </summary>
8+ public partial class PreviewView : UserControl
9+ {
10+ public PreviewView()
11+ {
12+ InitializeComponent();
13+ }
14+ }
15+}
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/QueueView.xaml
@@ -0,0 +1,11 @@
1+<UserControl x:Class="HandBrakeWPF.Views.QueueView"
2+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+ mc:Ignorable="d"
7+ d:DesignHeight="300" d:DesignWidth="300">
8+ <Grid Background="Beige">
9+
10+ </Grid>
11+</UserControl>
--- /dev/null
+++ b/win/C#/HandBrakeWPF/Views/QueueView.xaml.cs
@@ -0,0 +1,15 @@
1+namespace HandBrakeWPF.Views
2+{
3+ using System.Windows.Controls;
4+
5+ /// <summary>
6+ /// Interaction logic for VideoView.xaml
7+ /// </summary>
8+ public partial class QueueView : UserControl
9+ {
10+ public QueueView()
11+ {
12+ InitializeComponent();
13+ }
14+ }
15+}