diff options
| author | sr55 <[email protected]> | 2011-11-20 20:02:49 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2011-11-20 20:02:49 +0000 |
| commit | 02ef15e82e63c3d4924fde8a03ef277ee4339785 (patch) | |
| tree | d6de272b833e11bde58bffc1307bf173434261d3 /win/CS | |
| parent | c0c88720f5f59104770be38f0e84d7c2897ef465 (diff) | |
WinGui: (WPF) Some further UI Work.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4362 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS')
16 files changed, 204 insertions, 130 deletions
diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj index ce8a1b9d9..1f9a1b1a8 100644 --- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj +++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj @@ -129,24 +129,15 @@ <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>
@@ -213,10 +204,6 @@ <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>
@@ -225,18 +212,10 @@ <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>
diff --git a/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml b/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml index 9b2010852..78c784a37 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml +++ b/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml @@ -5,7 +5,18 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
- <Grid Background="Beige">
-
+ <Grid>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ </Grid.RowDefinitions>
+
+ <TextBlock Text="Advanced" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>
+
+ <TextBox Grid.Row="2" Margin="10" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+
+ </TextBox>
+
</Grid>
</UserControl>
diff --git a/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml.cs index 247100750..fa9a38d72 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml.cs +++ b/win/CS/HandBrakeWPF/Views/Controls/AdvancedView.xaml.cs @@ -1,5 +1,15 @@ -namespace HandBrakeWPF.Views.Controls
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AdvancedView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Interaction logic for AdvancedView.xaml
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Views.Controls
{
+ using System.Windows;
using System.Windows.Controls;
/// <summary>
@@ -7,9 +17,26 @@ /// </summary>
public partial class AdvancedView : UserControl
{
+ /// <summary>
+ /// Initializes a new instance of the <see cref="AdvancedView"/> class.
+ /// </summary>
public AdvancedView()
{
InitializeComponent();
}
+
+ /// <summary>
+ /// The "Query" Dependancy Property
+ /// </summary>
+ public static readonly DependencyProperty QueryProperty = DependencyProperty.Register("Query", typeof(string), typeof(AdvancedView), new PropertyMetadata(null));
+
+ /// <summary>
+ /// Gets or sets State.
+ /// </summary>
+ public string Query
+ {
+ get { return (string)this.GetValue(QueryProperty); }
+ set { this.SetValue(QueryProperty, value); }
+ }
}
}
diff --git a/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml b/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml index 0ec8c866c..5fafa01af 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml +++ b/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml @@ -3,9 +3,28 @@ 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">
-
+ mc:Ignorable="d">
+ <Grid>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ </Grid.RowDefinitions>
+
+ <TextBlock Text="Audio Tracks" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>
+
+ <Grid Grid.Row="1" Margin="10,5,10,0">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+ <Button Content="Add Track" Grid.Column="0" Width="75" Margin="0,0,10,0" />
+ <Button Content="Remove" Grid.Column="1" Width="75" />
+ </Grid>
+
+ <DataGrid Grid.Row="2" Margin="10" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+
+ </DataGrid>
+
</Grid>
</UserControl>
diff --git a/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml.cs index ad4bb96c8..74fe9e057 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml.cs +++ b/win/CS/HandBrakeWPF/Views/Controls/AudioView.xaml.cs @@ -1,15 +1,64 @@ -namespace HandBrakeWPF.Views.Controls
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AudioView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Interaction logic for AudioView.xaml
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Views.Controls
{
+ using System;
+ using System.ComponentModel;
+ using System.Windows;
using System.Windows.Controls;
+ using HandBrake.ApplicationServices.Model.Encoding;
+
/// <summary>
/// Interaction logic for AudioView.xaml
/// </summary>
public partial class AudioView : UserControl
{
+ /// <summary>
+ /// Initializes a new instance of the <see cref="AudioView"/> class.
+ /// </summary>
public AudioView()
{
InitializeComponent();
+ this.AudioTracks = new BindingList<AudioTrack>();
+ }
+
+ /// <summary>
+ /// The "Query" Dependancy Property
+ /// </summary>
+ public static readonly DependencyProperty QueryProperty = DependencyProperty.Register("AudioTracks", typeof(BindingList<AudioTrack>), typeof(AudioView), new PropertyMetadata(null));
+
+
+ /// <summary>
+ /// Gets or sets State.
+ /// </summary>
+ public BindingList<AudioTrack> AudioTracks
+ {
+ get { return (BindingList<AudioTrack>)this.GetValue(QueryProperty); }
+ set { this.SetValue(QueryProperty, value); }
+ }
+
+ /// <summary>
+ /// Add an audio track.
+ /// </summary>
+ public void Add()
+ {
+ this.AudioTracks.Add(new AudioTrack());
+ }
+
+ /// <summary>
+ /// Remove an Audio Track
+ /// </summary>
+ public void Remove()
+ {
+ throw new NotImplementedException("Not Done Yet!");
}
}
}
diff --git a/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml b/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml index 982142385..7e787cf82 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml +++ b/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml @@ -3,9 +3,33 @@ 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">
+ mc:Ignorable="d" >
+ <Grid>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ </Grid.RowDefinitions>
+
+ <TextBlock Text="Chapter Markers" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>
+
+ <Grid Grid.Row="1" Margin="10,5,10,0">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+ <CheckBox Content="Create chapter markers" Grid.Column="0" VerticalAlignment="Center" />
+ <Button Content="Import" Grid.Column="2" Width="75" Margin="0,0,10,0" />
+ <Button Content="Export" Grid.Column="3" Width="75" />
+ </Grid>
+
+ <DataGrid Grid.Row="2" Margin="10" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+ </DataGrid>
+
+
+
</Grid>
</UserControl>
diff --git a/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml.cs index 4bb0e2d1f..4ad791fb1 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml.cs +++ b/win/CS/HandBrakeWPF/Views/Controls/ChaptersView.xaml.cs @@ -1,15 +1,62 @@ -namespace HandBrakeWPF.Views.Controls
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ChaptersView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Interaction logic for ChaptersView.xaml
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Views.Controls
{
+ using System;
+ using System.Collections.Generic;
+ using System.Windows;
using System.Windows.Controls;
+ using HandBrake.ApplicationServices.Parsing;
+
/// <summary>
/// Interaction logic for ChaptersView.xaml
/// </summary>
public partial class ChaptersView : UserControl
{
+ /// <summary>
+ /// Initializes a new instance of the <see cref="ChaptersView"/> class.
+ /// </summary>
public ChaptersView()
{
InitializeComponent();
}
+
+ /// <summary>
+ /// The "Query" Dependancy Property
+ /// </summary>
+ public static readonly DependencyProperty QueryProperty = DependencyProperty.Register("Chapters", typeof(IList<Chapter>), typeof(ChaptersView), new PropertyMetadata(null));
+
+ /// <summary>
+ /// Gets or sets State.
+ /// </summary>
+ public IList<Chapter> Query
+ {
+ get { return (IList<Chapter>)this.GetValue(QueryProperty); }
+ set { this.SetValue(QueryProperty, value); }
+ }
+
+ /// <summary>
+ /// Import from CSV
+ /// </summary>
+ public void Import()
+ {
+ throw new NotImplementedException("Not Implemented Yet");
+ }
+
+ /// <summary>
+ /// Export to CSV
+ /// </summary>
+ public void Export()
+ {
+ throw new NotImplementedException("Not Implemented Yet");
+ }
}
}
diff --git a/win/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml b/win/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml deleted file mode 100644 index 7729dc553..000000000 --- a/win/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml +++ /dev/null @@ -1,11 +0,0 @@ -<UserControl x:Class="HandBrakeWPF.Views.Controls.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/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml.cs deleted file mode 100644 index a8b26716a..000000000 --- a/win/CS/HandBrakeWPF/Views/Controls/FiltersView.xaml.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace HandBrakeWPF.Views.Controls
-{
- using System.Windows.Controls;
-
- /// <summary>
- /// Interaction logic for VideoFilters.xaml
- /// </summary>
- public partial class FiltersView : UserControl
- {
- public FiltersView()
- {
- InitializeComponent();
- }
- }
-}
diff --git a/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml index 0261513f8..0cb59f301 100644 --- a/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml +++ b/win/CS/HandBrakeWPF/Views/Controls/PictureSettingsView.xaml @@ -1,7 +1,8 @@ <UserControl x:Class="HandBrakeWPF.Views.Controls.PictureSettingsView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:NumericUpDown="clr-namespace:EagleBoost.Wpf.Presentation.Controls.NumericUpDown;assembly=EagleBoost.Wpf.Presentation">
+
<StackPanel Orientation="Horizontal" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
<!-- Size Panel-->
@@ -17,9 +18,9 @@ <!-- Row 2-->
<StackPanel Orientation="Horizontal" Margin="5,0,5,0">
<Label Content="Width:" Grid.Row="1" Grid.Column="0" />
- <!--<Controls:NumericUpDown Name="width" Minimum="0" Grid.Row="1" Grid.Column="1" Width="45" />-->
+ <NumericUpDown:NumericUpDown Name="width" Minimum="0" Grid.Row="1" Grid.Column="1" Width="45" />
<Label Content="Height:" Grid.Row="1" Grid.Column="2" />
- <!--<Controls:NumericUpDown Name="height" Minimum="0" Grid.Row="1" Grid.Column="3" Width="45" />-->
+ <NumericUpDown:NumericUpDown Name="height" Minimum="0" Grid.Row="1" Grid.Column="3" Width="45" />
<CheckBox Content="Keep Aspect Ratio" VerticalAlignment="Center" Margin="5,0,0,0" />
</StackPanel>
@@ -48,9 +49,9 @@ <ComboBox Width="110" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
<ComboBox Width="110" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
- <!--<Controls:NumericUpDown Width="45" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
- <Controls:NumericUpDown Width="45" Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
- <Controls:NumericUpDown Width="45" Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />-->
+ <NumericUpDown:NumericUpDown Width="45" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
+ <NumericUpDown:NumericUpDown Width="45" Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
+ <NumericUpDown:NumericUpDown Width="45" Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
<Label Content="---" Grid.Row="5" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
</Grid>
</StackPanel>
@@ -60,7 +61,7 @@ <Label Content="Cropping" FontWeight="Bold" />
<RadioButton Content="Automatic" Margin="10,0,0,0"/>
<RadioButton Content="Custom" Margin="10,0,0,0" />
-
+
<Grid Margin="0,10,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@@ -83,16 +84,13 @@ <Label Content="Left" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" />
<Label Content="Right" Grid.Row="2" Grid.Column="4" HorizontalAlignment="Center" />
- <!--<Controls:NumericUpDown Width="45" Grid.Row="1" Grid.Column="2" HorizontalAlignment="Left" Margin="0,0,0,5" />
- <Controls:NumericUpDown Width="45" Grid.Row="3" Grid.Column="2" HorizontalAlignment="Left" Margin="0,0,0,5" />
- <Controls:NumericUpDown Width="45" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
- <Controls:NumericUpDown Width="45" Grid.Row="2" Grid.Column="3" HorizontalAlignment="Left" Margin="0,0,0,5" />-->
+ <NumericUpDown:NumericUpDown Width="45" Grid.Row="1" Grid.Column="2" HorizontalAlignment="Left" Margin="0,0,0,5" />
+ <NumericUpDown:NumericUpDown Width="45" Grid.Row="3" Grid.Column="2" HorizontalAlignment="Left" Margin="0,0,0,5" />
+ <NumericUpDown:NumericUpDown Width="45" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
+ <NumericUpDown:NumericUpDown Width="45" Grid.Row="2" Grid.Column="3" HorizontalAlignment="Left" Margin="0,0,0,5" />
</Grid>
-
-
- </StackPanel>
-
+ </StackPanel>
</StackPanel>
</UserControl>
diff --git a/win/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml b/win/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml deleted file mode 100644 index 86d19f5ff..000000000 --- a/win/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml +++ /dev/null @@ -1,11 +0,0 @@ -<UserControl x:Class="HandBrakeWPF.Views.Controls.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/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml.cs deleted file mode 100644 index 6b1735815..000000000 --- a/win/CS/HandBrakeWPF/Views/Controls/QueryEditorView.xaml.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace HandBrakeWPF.Views.Controls
-{
- using System.Windows.Controls;
-
- /// <summary>
- /// Interaction logic for QueryEditorView.xaml
- /// </summary>
- public partial class QueryEditorView : UserControl
- {
- public QueryEditorView()
- {
- InitializeComponent();
- }
- }
-}
diff --git a/win/CS/HandBrakeWPF/Views/Controls/VideoView.xaml b/win/CS/HandBrakeWPF/Views/Controls/VideoView.xaml deleted file mode 100644 index d1b22c15b..000000000 --- a/win/CS/HandBrakeWPF/Views/Controls/VideoView.xaml +++ /dev/null @@ -1,11 +0,0 @@ -<UserControl x:Class="HandBrakeWPF.Views.Controls.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/CS/HandBrakeWPF/Views/Controls/VideoView.xaml.cs b/win/CS/HandBrakeWPF/Views/Controls/VideoView.xaml.cs deleted file mode 100644 index 12f96979d..000000000 --- a/win/CS/HandBrakeWPF/Views/Controls/VideoView.xaml.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace HandBrakeWPF.Views.Controls
-{
- using System.Windows.Controls;
-
- /// <summary>
- /// Interaction logic for VideoView.xaml
- /// </summary>
- public partial class VideoView : UserControl
- {
- public VideoView()
- {
- InitializeComponent();
- }
- }
-}
diff --git a/win/CS/HandBrakeWPF/Views/ErrorView.xaml b/win/CS/HandBrakeWPF/Views/ErrorView.xaml index c0c7f8d45..cf6ddd97a 100644 --- a/win/CS/HandBrakeWPF/Views/ErrorView.xaml +++ b/win/CS/HandBrakeWPF/Views/ErrorView.xaml @@ -44,7 +44,7 @@ <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
- <Image Source="Images/copy.png" Grid.Column="0" Width="16" Height="16" />
+ <Image Source="Images/copy.png" Grid.Column="0" Width="16" Height="16" Margin="0,0,5,0" />
<TextBlock Text="Copy" Grid.Column="1" />
</Grid>
</Button>
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml index f85b7a1a5..0a545a0c4 100644 --- a/win/CS/HandBrakeWPF/Views/MainView.xaml +++ b/win/CS/HandBrakeWPF/Views/MainView.xaml @@ -155,10 +155,8 @@ <Controls:PictureSettingsView x:Name="pictureSettingsView"></Controls:PictureSettingsView>
</TabItem>
<TabItem Header="Video Filters" Name="filtersTab">
- <Controls:FiltersView></Controls:FiltersView>
</TabItem>
<TabItem Header="Video" Name="videoTab">
- <Controls:VideoView></Controls:VideoView>
</TabItem>
<TabItem Header="Audio" Name="audioTab">
<Controls:AudioView></Controls:AudioView>
|