diff options
| author | sr55 <[email protected]> | 2012-06-14 09:59:24 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2012-06-14 09:59:24 +0000 |
| commit | ed72f7ae22fd5b3aae3958704c09b2ecbabd4a0c (patch) | |
| tree | 9f3da3fab144395666fab79232f1bbef3323e864 /win/CS/HandBrakeWPF | |
| parent | 9be558d961413ee242da53dfc18a7c819b0faf41 (diff) | |
WinGui: Some layout tweaks by beta-tester
- disabling sizing on windows, where sizing makes no sense;
- limit sizing on windows, where sizing in a wrong directions makes problems;
- make controls full sizable, where the readability/information will benefit from;
- all windows appears now in ScreenCenter;
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4730 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF')
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/AboutView.xaml | 75 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/AddPresetView.xaml | 135 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/AdvancedView.xaml | 4 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/AudioView.xaml | 275 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/ErrorView.xaml | 76 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/LogView.xaml | 39 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/PreviewView.xaml | 88 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/QueueView.xaml | 233 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/SubtitlesView.xaml | 205 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/TitleSpecificView.xaml | 68 |
10 files changed, 860 insertions, 338 deletions
diff --git a/win/CS/HandBrakeWPF/Views/AboutView.xaml b/win/CS/HandBrakeWPF/Views/AboutView.xaml index c4e048bc5..7743dfc2d 100644 --- a/win/CS/HandBrakeWPF/Views/AboutView.xaml +++ b/win/CS/HandBrakeWPF/Views/AboutView.xaml @@ -1,12 +1,17 @@ <Window x:Class="HandBrakeWPF.Views.AboutView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro" Title="{Binding Title}"
- Height="320" Width="600">
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"
+ Title="{Binding Title}"
+ Width="600"
+ Height="320"
+ ResizeMode="NoResize"
+ WindowStartupLocation="CenterScreen">
<Grid>
<Grid.RowDefinitions>
- <RowDefinition Height="*"/>
- <RowDefinition Height="Auto"/>
+ <RowDefinition Height="*" />
+ <RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid Grid.Row="0">
@@ -14,8 +19,15 @@ <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
-
- <Image Source="Images/logo64.png" Width="64" Height="64" Grid.Column="0" SnapsToDevicePixels="True" Margin="10,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top" />
+
+ <Image Grid.Column="0"
+ Width="64"
+ Height="64"
+ Margin="10,10,10,10"
+ HorizontalAlignment="Left"
+ VerticalAlignment="Top"
+ SnapsToDevicePixels="True"
+ Source="Images/logo64.png" />
<Grid Grid.Column="1">
<Grid.RowDefinitions>
@@ -25,29 +37,50 @@ <RowDefinition Height="*" />
</Grid.RowDefinitions>
- <StackPanel Orientation="Horizontal" Margin="5,10,0,0" Grid.Row="0">
- <TextBlock Text="HandBrake" FontWeight="Bold" FontSize="14" Margin="0,0,5,0" />
- <TextBlock Text="{Binding Version}" Margin="0,0,0,1" VerticalAlignment="Bottom" />
+ <StackPanel Grid.Row="0"
+ Margin="5,10,0,0"
+ Orientation="Horizontal">
+ <TextBlock Margin="0,0,5,0"
+ FontSize="14"
+ FontWeight="Bold"
+ Text="HandBrake" />
+ <TextBlock Margin="0,0,0,1"
+ VerticalAlignment="Bottom"
+ Text="{Binding Version}" />
</StackPanel>
-
- <TextBlock Text="Copyright 2003-2012 HandBrake Team" Margin="5,0,0,0 " Grid.Row="1" />
-
- <TextBlock Text="License:" Margin="5,10,0,5" Grid.Row="2" />
- <TextBox VerticalAlignment="Stretch" HorizontalAlignment="Stretch" IsReadOnly="True" TextWrapping="Wrap"
- VerticalScrollBarVisibility="Auto" Margin="10,0,10,10" Grid.Row="3">
- 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.
+ <TextBlock Grid.Row="1"
+ Margin="5,0,0,0 "
+ Text="Copyright 2003-2012 HandBrake Team" />
-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
+ <TextBlock Grid.Row="2"
+ Margin="5,10,0,5"
+ Text="License:" />
+ <TextBox Grid.Row="3"
+ Margin="10,0,10,10"
+ HorizontalAlignment="Stretch"
+ VerticalAlignment="Stretch"
+ IsReadOnly="True"
+ TextWrapping="Wrap"
+ VerticalScrollBarVisibility="Auto">
+ 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>
</Grid>
</Grid>
- <StackPanel HorizontalAlignment="Stretch" Background="LightGray" Grid.Row="1">
- <Button Content="Close" IsDefault="True" Micro:Message.Attach="[Event Click] = [Action Close]"
- HorizontalAlignment="Right" Padding="12,2" Margin="0,5,10,5" VerticalAlignment="Center" />
+ <StackPanel Grid.Row="1"
+ HorizontalAlignment="Stretch"
+ Background="LightGray">
+ <Button Margin="0,5,10,5"
+ HorizontalAlignment="Right"
+ VerticalAlignment="Center"
+ Content="Close"
+ IsDefault="True"
+ Micro:Message.Attach="[Event Click] = [Action Close]"
+ Padding="12,2" />
</StackPanel>
</Grid>
</Window>
diff --git a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml index 33229ca35..b6e186575 100644 --- a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml +++ b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml @@ -1,39 +1,54 @@ <Window 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" xmlns:cal="http://www.caliburnproject.org"
- xmlns:Converters="clr-namespace:HandBrakeWPF.Converters" mc:Ignorable="d"
- Title="{Binding Title}"
- Width="350" SizeToContent="Height">
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:cal="http://www.caliburnproject.org"
+ xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ Title="{Binding Title}"
+ Width="350"
+ ResizeMode="NoResize"
+ SizeToContent="Height"
+ WindowStartupLocation="CenterScreen"
+ mc:Ignorable="d">
<Window.Resources>
<Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
<Converters:EnumComboConverter x:Key="enumComboConverter" />
</Window.Resources>
- <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Background="#FFF1F0EF">
+ <Grid HorizontalAlignment="Stretch"
+ VerticalAlignment="Stretch"
+ Background="#FFF1F0EF">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
-
- <!-- Header -->
- <StackPanel Orientation="Horizontal" Grid.Row="0" Background="White" Height="30" Margin="0,0,0,10" >
- <Image Source="Images/Add16.png" Margin="10,0,5,0" Width="24" Height="24" VerticalAlignment="Center" />
- <StackPanel Orientation="Vertical" VerticalAlignment="Center">
- <TextBlock Text="Add a Preset" FontWeight="Bold" />
+
+ <!-- Header -->
+ <StackPanel Grid.Row="0"
+ Height="30"
+ Margin="0,0,0,10"
+ Background="White"
+ Orientation="Horizontal">
+ <Image Width="24"
+ Height="24"
+ Margin="10,0,5,0"
+ VerticalAlignment="Center"
+ Source="Images/Add16.png" />
+ <StackPanel VerticalAlignment="Center" Orientation="Vertical">
+ <TextBlock FontWeight="Bold" Text="Add a Preset" />
</StackPanel>
</StackPanel>
- <Grid Margin="10,0,10,0" Grid.Row="1">
+ <Grid Grid.Row="1" Margin="10,0,10,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
-
+
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
@@ -45,43 +60,87 @@ <RowDefinition Height="Auto" />
</Grid.RowDefinitions>
- <!-- Name -->
- <TextBlock Text="Preset Name:" Grid.Row="0" Grid.Column="0" />
- <TextBox Width="150" Text="{Binding Preset.Name}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left"/>
+ <!-- Name -->
+ <TextBlock Grid.Row="0"
+ Grid.Column="0"
+ Text="Preset Name:" />
+ <TextBox Grid.Row="0"
+ Grid.Column="1"
+ Width="150"
+ HorizontalAlignment="Left"
+ Text="{Binding Preset.Name}" />
+
+ <!-- Settings -->
+ <TextBlock Grid.Row="1"
+ Grid.Column="0"
+ Margin="0,20,0,0"
+ FontWeight="Bold"
+ Text="Picture Settings:" />
- <!-- Settings -->
- <TextBlock Text="Picture Settings:" FontWeight="Bold" Grid.Row="1" Grid.Column="0" Margin="0,20,0,0" />
+ <TextBlock Grid.Row="2"
+ Grid.Column="0"
+ Text="Use Picture Size:" />
+ <ComboBox Grid.Row="2"
+ Grid.Column="1"
+ Width="125"
+ HorizontalAlignment="Left"
+ ItemsSource="{Binding PictureSettingsModes,
+ Converter={StaticResource enumComboConverter}}"
+ SelectedItem="{Binding SelectedPictureSettingMode,
+ Converter={StaticResource enumComboConverter}}" />
- <TextBlock Text="Use Picture Size:" Grid.Row="2" Grid.Column="0" />
- <ComboBox Width="125" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left"
- ItemsSource="{Binding PictureSettingsModes, Converter={StaticResource enumComboConverter}}"
- SelectedItem="{Binding SelectedPictureSettingMode, Converter={StaticResource enumComboConverter}}"/>
-
- <StackPanel Orientation="Horizontal" Margin="0,10,0,0" Visibility="{Binding ShowCustomInputs, Converter={StaticResource boolToVisConverter}}" Grid.Row="3" Grid.Column="1">
+ <StackPanel Grid.Row="3"
+ Grid.Column="1"
+ Margin="0,10,0,0"
+ Orientation="Horizontal"
+ Visibility="{Binding ShowCustomInputs,
+ Converter={StaticResource boolToVisConverter}}">
<TextBox Width="50" Text="{Binding CustomWidth}" />
- <TextBlock Text="X" FontWeight="Bold" Margin="10,0,10,0" />
+ <TextBlock Margin="10,0,10,0"
+ FontWeight="Bold"
+ Text="X" />
<TextBox Width="50" Text="{Binding CustomHeight}" />
</StackPanel>
- <CheckBox Content="Use Picture Filters" IsChecked="{Binding Preset.UsePictureFilters}" Margin="0,10,0,0" Grid.Row="4" Grid.Column="1"/>
+ <CheckBox Grid.Row="4"
+ Grid.Column="1"
+ Margin="0,10,0,0"
+ Content="Use Picture Filters"
+ IsChecked="{Binding Preset.UsePictureFilters}" />
- <!-- Description -->
- <TextBlock Text="Description:" FontWeight="Bold" Grid.Row="5" Grid.Column="0" />
- <TextBox Text="{Binding Preset.Description}" Grid.Row="6" Grid.ColumnSpan="2" HorizontalAlignment="Stretch"/>
+ <!-- Description -->
+ <TextBlock Grid.Row="5"
+ Grid.Column="0"
+ FontWeight="Bold"
+ Text="Description:" />
+ <TextBox Grid.Row="6"
+ Grid.ColumnSpan="2"
+ HorizontalAlignment="Stretch"
+ Text="{Binding Preset.Description}" />
</Grid>
- <!-- Controls -->
- <Grid Background="LightGray" Grid.Row="3" Margin="0,20,0,0">
+ <!-- Controls -->
+ <Grid Grid.Row="3"
+ Margin="0,20,0,0"
+ Background="LightGray">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
- <Button Content="Cancel" Padding="8,2" Margin="0,5,10,5" Grid.Column="1"
- IsCancel="True" cal:Message.Attach="[Event Click] = [Action Cancel]" />
- <Button Content="Add" Padding="8,2" Margin="0,5,10,5" Grid.Column="2"
- IsDefault="True" cal:Message.Attach="[Event Click] = [Action Add]" />
+ <Button Grid.Column="1"
+ Margin="0,5,10,5"
+ cal:Message.Attach="[Event Click] = [Action Cancel]"
+ Content="Cancel"
+ IsCancel="True"
+ Padding="8,2" />
+ <Button Grid.Column="2"
+ Margin="0,5,10,5"
+ cal:Message.Attach="[Event Click] = [Action Add]"
+ Content="Add"
+ IsDefault="True"
+ Padding="8,2" />
</Grid>
</Grid>
diff --git a/win/CS/HandBrakeWPF/Views/AdvancedView.xaml b/win/CS/HandBrakeWPF/Views/AdvancedView.xaml index 0e47ddf10..bea0cb814 100644 --- a/win/CS/HandBrakeWPF/Views/AdvancedView.xaml +++ b/win/CS/HandBrakeWPF/Views/AdvancedView.xaml @@ -43,7 +43,7 @@ />
<StackPanel Orientation="Vertical">
-
+
<!-- Other Encoders -->
<Grid Visibility="{Binding DisplayX264Options, Converter={StaticResource BooleanVisibilityConverter}, ConverterParameter=true}">
<Grid.RowDefinitions>
@@ -63,7 +63,7 @@ TextWrapping="Wrap"
/>
</Grid>
-
+
<!-- X264 -->
<Grid Visibility="{Binding DisplayX264Options, Converter={StaticResource BooleanVisibilityConverter}, ConverterParameter=false}">
<Grid.RowDefinitions>
diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml b/win/CS/HandBrakeWPF/Views/AudioView.xaml index 15bf24113..ccc74e5cf 100644 --- a/win/CS/HandBrakeWPF/Views/AudioView.xaml +++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml @@ -1,14 +1,17 @@ <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"
- xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+ xmlns:Audio="clr-namespace:HandBrakeWPF.Converters.Audio"
xmlns:cal="http://www.caliburnproject.org"
- xmlns:NumericUpDown="clr-namespace:EagleBoost.Wpf.Presentation.Controls.NumericUpDown;assembly=EagleBoost.Wpf.Presentation"
xmlns:Conveters="clr-namespace:HandBrakeWPF.Converters"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
- xmlns:Audio="clr-namespace:HandBrakeWPF.Converters.Audio" mc:Ignorable="d">
+ xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:NumericUpDown="clr-namespace:EagleBoost.Wpf.Presentation.Controls.NumericUpDown;assembly=EagleBoost.Wpf.Presentation"
+ d:DesignHeight="170"
+ d:DesignWidth="616"
+ mc:Ignorable="d">
<UserControl.Resources>
<Conveters:EnumComboConverter x:Key="enumComboConverter" />
@@ -24,7 +27,10 @@ <RowDefinition Height="*" />
</Grid.RowDefinitions>
- <TextBlock Text="Audio Tracks" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>
+ <TextBlock Grid.Row="0"
+ Margin="10,5,0,0"
+ FontWeight="Bold"
+ Text="Audio Tracks" />
<Grid Grid.Row="1" Margin="10,5,10,0">
<Grid.ColumnDefinitions>
@@ -32,30 +38,58 @@ <ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
- <Button Content="Add Track" cal:Message.Attach="[Event Click] = [Action Add]" Grid.Column="0" Width="75" Margin="0,0,10,0" />
-
- <StackPanel Orientation="Horizontal" Grid.Column="2" Visibility="{Binding ShowPassthruOptions, Converter={StaticResource boolToVisConverter}}" >
- <TextBlock Text="Auto Passthru:" Margin="5,0,5,0" />
- <CheckBox Content="MP3" Margin="0,0,5,0" IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowMP3Pass}" />
- <CheckBox Content="AAC" Margin="0,0,5,0" IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowAACPass}" />
- <CheckBox Content="AC3" Margin="0,0,5,0" IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowAC3Pass}" />
- <CheckBox Content="DTS" Margin="0,0,5,0" IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowDTSPass}" />
- <CheckBox Content="DTSHD" Margin="0,0,5,0" IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowDTSHDPass}" />
- <TextBlock Text="Fallback:" Margin="5,0,5,0" />
- <ComboBox Width="100" Grid.Column="3" Margin="10,0,5,0" Height="22"
- ItemsSource="{Binding DataContext.AudioEncoders, Converter={StaticResource enumComboConverter}, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
- SelectedItem="{Binding Task.AllowedPassthruOptions.AudioEncoderFallback, Converter={StaticResource enumComboConverter}}"/>
+ <Button Grid.Column="0"
+ Width="75"
+ Margin="0,0,10,0"
+ cal:Message.Attach="[Event Click] = [Action Add]"
+ Content="Add Track" />
+
+ <StackPanel Grid.Column="2"
+ Orientation="Horizontal"
+ Visibility="{Binding ShowPassthruOptions,
+ Converter={StaticResource boolToVisConverter}}">
+ <TextBlock Margin="5,0,5,0" Text="Auto Passthru:" />
+ <CheckBox Margin="0,0,5,0"
+ Content="MP3"
+ IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowMP3Pass}" />
+ <CheckBox Margin="0,0,5,0"
+ Content="AAC"
+ IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowAACPass}" />
+ <CheckBox Margin="0,0,5,0"
+ Content="AC3"
+ IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowAC3Pass}" />
+ <CheckBox Margin="0,0,5,0"
+ Content="DTS"
+ IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowDTSPass}" />
+ <CheckBox Margin="0,0,5,0"
+ Content="DTSHD"
+ IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowDTSHDPass}" />
+ <TextBlock Margin="5,0,5,0" Text="Fallback:" />
+ <ComboBox Grid.Column="3"
+ Width="100"
+ Height="22"
+ Margin="10,0,5,0"
+ ItemsSource="{Binding DataContext.AudioEncoders,
+ Converter={StaticResource enumComboConverter},
+ RelativeSource={RelativeSource FindAncestor,
+ AncestorType={x:Type UserControl}}}"
+ SelectedItem="{Binding Task.AllowedPassthruOptions.AudioEncoderFallback,
+ Converter={StaticResource enumComboConverter}}" />
</StackPanel>
</Grid>
- <ListBox Grid.Row="2" ItemsSource="{Binding Task.AudioTracks}"
- SelectionMode="Extended" Background="LightGray" Margin="10,10,10,10"
- dd:DragDrop.IsDragSource="True" dd:DragDrop.IsDropTarget="True"
- dd:DragDrop.DropHandler="{Binding}">
+ <ListBox Grid.Row="2"
+ Margin="10,10,10,10"
+ Background="LightGray"
+ dd:DragDrop.DropHandler="{Binding}"
+ dd:DragDrop.IsDragSource="True"
+ dd:DragDrop.IsDropTarget="True"
+ ItemsSource="{Binding Task.AudioTracks}"
+ SelectionMode="Extended">
<ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem">
- <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+ <Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="Background" Value="WhiteSmoke" />
<Setter Property="Margin" Value="0,0,0,1" />
</Style>
@@ -71,14 +105,18 @@ <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
- <!-- Marker -->
- <Image Source="Images/Movies.png" Width="16" Height="16" Grid.Column="0" Margin="10,0,10,0" />
+ <!-- Marker -->
+ <Image Grid.Column="0"
+ Width="16"
+ Height="16"
+ Margin="10,0,10,0"
+ Source="Images/Movies.png" />
- <!-- Settings -->
+ <!-- Settings -->
<Grid Grid.Column="1" HorizontalAlignment="Stretch">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" MaxWidth="300" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
@@ -95,15 +133,30 @@ <RowDefinition Height="28" />
</Grid.RowDefinitions>
- <!-- Row 1-->
+ <!-- Row 1 -->
- <TextBlock Text="Source" FontWeight="Bold" Grid.Column="0" VerticalAlignment="Center" />
- <ComboBox Width="100" Grid.Column="1" Margin="5,0,5,0" Height="22"
- ItemsSource="{Binding DataContext.SourceTracks, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
- SelectedItem="{Binding ScannedTrack}"/>
+ <TextBlock Grid.Column="0"
+ VerticalAlignment="Center"
+ FontWeight="Bold"
+ Text="Source" />
+ <ComboBox Grid.Column="1"
+ Height="22"
+ MaxWidth="300"
+ Margin="5,0,5,0"
+ HorizontalAlignment="Stretch"
+ ItemsSource="{Binding DataContext.SourceTracks,
+ RelativeSource={RelativeSource FindAncestor,
+ AncestorType={x:Type UserControl}}}"
+ SelectedItem="{Binding ScannedTrack}" />
- <TextBlock Text="Codec" FontWeight="Bold" Grid.Column="2" VerticalAlignment="Center" />
- <ComboBox Width="100" Grid.Column="3" Margin="5,0,5,0" Height="22">
+ <TextBlock Grid.Column="2"
+ VerticalAlignment="Center"
+ FontWeight="Bold"
+ Text="Codec" />
+ <ComboBox Grid.Column="3"
+ Width="100"
+ Height="22"
+ Margin="5,0,5,0">
<ComboBox.SelectedItem>
<MultiBinding Converter="{StaticResource audioEncoderConverter}">
<Binding Path="Encoder" />
@@ -111,52 +164,132 @@ </ComboBox.SelectedItem>
<ComboBox.ItemsSource>
<MultiBinding Converter="{StaticResource audioEncoderConverter}">
- <Binding Path="DataContext.AudioEncoders"
- RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
- <Binding Path="DataContext.Task"
- RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
+ <Binding Path="DataContext.AudioEncoders" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
+ <Binding Path="DataContext.Task" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
</MultiBinding>
</ComboBox.ItemsSource>
</ComboBox>
- <TextBlock Text="Bitrate" FontWeight="Bold" Grid.Column="4" VerticalAlignment="Center"
- Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
- <ComboBox Width="70" Grid.Column="5" Margin="5,0,5,0" Height="22"
+ <TextBlock Grid.Column="4"
+ VerticalAlignment="Center"
+ FontWeight="Bold"
+ Text="Bitrate"
+ Visibility="{Binding IsPassthru,
+ Converter={StaticResource boolToVisConverter},
+ ConverterParameter=true}" />
+ <ComboBox Grid.Column="5"
+ Width="70"
+ Height="22"
+ Margin="5,0,5,0"
+ ItemsSource="{Binding TrackReference,
+ Converter={StaticResource audioBitrateConverter}}"
SelectedItem="{Binding Bitrate}"
- ItemsSource="{Binding TrackReference, Converter={StaticResource audioBitrateConverter}}"
- Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ Visibility="{Binding IsPassthru,
+ Converter={StaticResource boolToVisConverter},
+ ConverterParameter=true}" />
- <TextBlock Text="Samplerate" FontWeight="Bold" Grid.Column="6" VerticalAlignment="Center"
- Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
- <ComboBox Width="70" Grid.Column="7" Margin="5,0,5,0" Height="22"
- ItemsSource="{Binding DataContext.SampleRates, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
+ <TextBlock Grid.Column="6"
+ VerticalAlignment="Center"
+ FontWeight="Bold"
+ Text="Samplerate"
+ Visibility="{Binding IsPassthru,
+ Converter={StaticResource boolToVisConverter},
+ ConverterParameter=true}" />
+ <ComboBox Grid.Column="7"
+ Width="70"
+ Height="22"
+ Margin="5,0,5,0"
+ ItemsSource="{Binding DataContext.SampleRates,
+ RelativeSource={RelativeSource FindAncestor,
+ AncestorType={x:Type UserControl}}}"
SelectedItem="{Binding SampleRateDisplayValue}"
- Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
-
- <!-- Row 2-->
- <TextBlock Text="Mixdown" FontWeight="Bold" Grid.Column="0" Grid.Row="1" VerticalAlignment="Center"
- Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
- <ComboBox Width="100" Grid.Column="1" Margin="5,0,5,0" Grid.Row="1" Height="22"
- ItemsSource="{Binding DataContext.AudioMixdowns, Converter={StaticResource enumComboConverter}, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
- SelectedItem="{Binding MixDown, Converter={StaticResource enumComboConverter}}"
- Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
-
- <TextBlock Text="DRC" FontWeight="Bold" Grid.Column="2" Grid.Row="1" VerticalAlignment="Center"
- Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
- <NumericUpDown:NumericUpDown Name="drcNumericCtl" Width="45" Value="{Binding DRC, Mode=TwoWay}" Grid.Row="1" Grid.Column="3" HorizontalAlignment="Left" Margin="5,0,5,0"
- Minimum="0" Maximum="4" DecimalPlace="1" LargeChange="0.1" SmallChange="0.1"
- Visibility="{Binding IsPassthru, Converter={StaticResource boolToHiddenVisConverter}, ConverterParameter=true}" />
-
- <TextBlock Text="Gain" FontWeight="Bold" Grid.Column="4" Grid.Row="1" VerticalAlignment="Center"
- Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
- <NumericUpDown:NumericUpDown Name="gainNumericCtl" Width="45" Value="{Binding Gain, Mode=TwoWay}" Grid.Row="1" Grid.Column="5" HorizontalAlignment="Left" Margin="5,0,5,0"
- Minimum="-20" Maximum="20" DecimalPlace="0" SmallChange="1" LargeChange="1"
- Visibility="{Binding IsPassthru, Converter={StaticResource boolToHiddenVisConverter}, ConverterParameter=true}"/>
+ Visibility="{Binding IsPassthru,
+ Converter={StaticResource boolToVisConverter},
+ ConverterParameter=true}" />
+
+ <!-- Row 2 -->
+ <TextBlock Grid.Row="1"
+ Grid.Column="0"
+ VerticalAlignment="Center"
+ FontWeight="Bold"
+ Text="Mixdown"
+ Visibility="{Binding IsPassthru,
+ Converter={StaticResource boolToVisConverter},
+ ConverterParameter=true}" />
+ <ComboBox Grid.Row="1"
+ Grid.Column="1"
+ Height="22"
+ MaxWidth="300"
+ Margin="5,0,5,0"
+ HorizontalAlignment="Stretch"
+ ItemsSource="{Binding DataContext.AudioMixdowns,
+ Converter={StaticResource enumComboConverter},
+ RelativeSource={RelativeSource FindAncestor,
+ AncestorType={x:Type UserControl}}}"
+ SelectedItem="{Binding MixDown,
+ Converter={StaticResource enumComboConverter}}"
+ Visibility="{Binding IsPassthru,
+ Converter={StaticResource boolToVisConverter},
+ ConverterParameter=true}" />
+
+ <TextBlock Grid.Row="1"
+ Grid.Column="2"
+ VerticalAlignment="Center"
+ FontWeight="Bold"
+ Text="DRC"
+ Visibility="{Binding IsPassthru,
+ Converter={StaticResource boolToVisConverter},
+ ConverterParameter=true}" />
+ <NumericUpDown:NumericUpDown Name="drcNumericCtl"
+ Grid.Row="1"
+ Grid.Column="3"
+ Width="45"
+ Margin="5,0,5,0"
+ HorizontalAlignment="Left"
+ DecimalPlace="1"
+ LargeChange="0.1"
+ Maximum="4"
+ Minimum="0"
+ SmallChange="0.1"
+ Visibility="{Binding IsPassthru,
+ Converter={StaticResource boolToHiddenVisConverter},
+ ConverterParameter=true}"
+ Value="{Binding DRC,
+ Mode=TwoWay}" />
+
+ <TextBlock Grid.Row="1"
+ Grid.Column="4"
+ VerticalAlignment="Center"
+ FontWeight="Bold"
+ Text="Gain"
+ Visibility="{Binding IsPassthru,
+ Converter={StaticResource boolToVisConverter},
+ ConverterParameter=true}" />
+ <NumericUpDown:NumericUpDown Name="gainNumericCtl"
+ Grid.Row="1"
+ Grid.Column="5"
+ Width="45"
+ Margin="5,0,5,0"
+ HorizontalAlignment="Left"
+ DecimalPlace="0"
+ LargeChange="1"
+ Maximum="20"
+ Minimum="-20"
+ SmallChange="1"
+ Visibility="{Binding IsPassthru,
+ Converter={StaticResource boolToHiddenVisConverter},
+ ConverterParameter=true}"
+ Value="{Binding Gain,
+ Mode=TwoWay}" />
</Grid>
- <!-- Delete -->
- <Image Source="Images/delete.png" Width="16" Height="16" Grid.Column="2" Margin="10,0,10,0">
+ <!-- Delete -->
+ <Image Grid.Column="2"
+ Width="16"
+ Height="16"
+ Margin="10,0,10,0"
+ Source="Images/delete.png">
<i:Interaction.Triggers>
<i:EventTrigger EventName="MouseDown">
<cal:ActionMessage MethodName="Remove">
diff --git a/win/CS/HandBrakeWPF/Views/ErrorView.xaml b/win/CS/HandBrakeWPF/Views/ErrorView.xaml index 263d2486a..17acaddb3 100644 --- a/win/CS/HandBrakeWPF/Views/ErrorView.xaml +++ b/win/CS/HandBrakeWPF/Views/ErrorView.xaml @@ -1,7 +1,15 @@ <Window x:Class="HandBrakeWPF.Views.ErrorView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cal="http://www.caliburnproject.org"
- Title="{Binding Title}" Height="380" Width="680" FontSize="11" Background="#FFF0F0F0">
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:cal="http://www.caliburnproject.org"
+ Title="{Binding Title}"
+ Width="680"
+ Height="380"
+ MinWidth="680"
+ MinHeight="380"
+ Background="#FFF0F0F0"
+ FontSize="11"
+ WindowStartupLocation="CenterScreen">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="70" />
@@ -9,47 +17,79 @@ <RowDefinition Height="Auto" />
</Grid.RowDefinitions>
- <!-- Header -->
- <StackPanel Orientation="Horizontal" Grid.Row="0" Margin="0,0,0,0" Background="White">
- <Image Source="Images/ErrorX.png" Width="64" Height="64" Margin="10,0,0,0" />
- <Grid Margin="10,0,0,0" Height="64">
+ <!-- Header -->
+ <StackPanel Grid.Row="0"
+ Margin="0,0,0,0"
+ Background="White"
+ Orientation="Horizontal">
+ <Image Width="64"
+ Height="64"
+ Margin="10,0,0,0"
+ Source="Images/ErrorX.png" />
+ <Grid Height="64" Margin="10,0,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
- <TextBlock Text="{Binding ErrorMessage}" FontWeight="Bold" Grid.Row="0" Margin="0,5,0,0" />
- <TextBlock Text="{Binding Solution}" Grid.Row="1" Margin="0,5,0,0" />
+ <TextBlock Grid.Row="0"
+ Margin="0,5,0,0"
+ FontWeight="Bold"
+ Text="{Binding ErrorMessage}" />
+ <TextBlock Grid.Row="1"
+ Margin="0,5,0,0"
+ Text="{Binding Solution}" />
- <TextBlock Text="Error Details:" FontWeight="Bold" Margin="0,0,0,2" VerticalAlignment="Bottom" Grid.Row="2" />
+ <TextBlock Grid.Row="2"
+ Margin="0,0,0,2"
+ VerticalAlignment="Bottom"
+ FontWeight="Bold"
+ Text="Error Details:" />
</Grid>
</StackPanel>
- <!-- Details -->
- <TextBox Text="{Binding Details}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" IsReadOnly="True" TextWrapping="Wrap"
- VerticalScrollBarVisibility="Auto" Margin="84,10,10,10" Grid.Row="1" />
+ <!-- Details -->
+ <TextBox Grid.Row="1"
+ Margin="84,10,10,10"
+ HorizontalAlignment="Stretch"
+ VerticalAlignment="Stretch"
+ IsReadOnly="True"
+ Text="{Binding Details}"
+ TextWrapping="Wrap"
+ VerticalScrollBarVisibility="Auto" />
- <!-- Controls -->
- <Grid Grid.Row ="2" Background="LightGray">
+ <!-- Controls -->
+ <Grid Grid.Row="2" Background="LightGray">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
- <Button Padding="8,2" Margin="5" Grid.Column="1" cal:Message.Attach="[Event Click] = [Action Copy]">
+ <Button Grid.Column="1"
+ Margin="5"
+ cal:Message.Attach="[Event Click] = [Action Copy]"
+ Padding="8,2">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
- <Image Source="Images/copy.png" Grid.Column="0" Width="16" Height="16" Margin="0,0,5,0" />
- <TextBlock Text="Copy to Clipboard" Grid.Column="1" />
+ <Image Grid.Column="0"
+ Width="16"
+ Height="16"
+ Margin="0,0,5,0"
+ Source="Images/copy.png" />
+ <TextBlock Grid.Column="1" Text="Copy to Clipboard" />
</Grid>
</Button>
- <Button Content="Close" Padding="8,2" Margin="0,5,10,5" Grid.Column="2" cal:Message.Attach="[Event Click] = [Action Close]"></Button>
+ <Button Grid.Column="2"
+ Margin="0,5,10,5"
+ cal:Message.Attach="[Event Click] = [Action Close]"
+ Content="Close"
+ Padding="8,2" />
</Grid>
</Grid>
</Window>
diff --git a/win/CS/HandBrakeWPF/Views/LogView.xaml b/win/CS/HandBrakeWPF/Views/LogView.xaml index 017601471..1d67ceae4 100644 --- a/win/CS/HandBrakeWPF/Views/LogView.xaml +++ b/win/CS/HandBrakeWPF/Views/LogView.xaml @@ -1,7 +1,13 @@ <Window x:Class="HandBrakeWPF.Views.LogView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cal="http://www.caliburnproject.org"
- Title="{Binding Title}" Height="600" Width="500">
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:cal="http://www.caliburnproject.org"
+ Title="{Binding Title}"
+ Width="500"
+ Height="600"
+ MinWidth="500"
+ MinHeight="600"
+ WindowStartupLocation="CenterScreen">
<Grid>
<Grid>
<Grid.RowDefinitions>
@@ -11,25 +17,36 @@ <ToolBar Grid.Row="0">
<Button cal:Message.Attach="[Event Click] = [Action CopyLog]">
<StackPanel Orientation="Horizontal">
- <Image Source="Images/copy.png" Width="16"/>
- <TextBlock Text="Copy to clipboard" Margin="2,0,0,0" />
+ <Image Width="16" Source="Images/copy.png" />
+ <TextBlock Margin="2,0,0,0" Text="Copy to clipboard" />
</StackPanel>
</Button>
<Button Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action OpenLogDirectory]">
<StackPanel Orientation="Horizontal">
- <Image Source="Images/folder.png" Width="16"/>
- <TextBlock Text="Open Log Directory" Margin="2,0,0,0" />
+ <Image Width="16" Source="Images/folder.png" />
+ <TextBlock Margin="2,0,0,0" Text="Open Log Directory" />
</StackPanel>
</Button>
-
+
<Separator />
- <TextBlock Text="Choose Log:" FontWeight="Bold" VerticalAlignment="Center" Margin="10,0,10,0" />
- <ComboBox Width="100" HorizontalAlignment="Right" ItemsSource="{Binding LogModes}" SelectedIndex="{Binding SelectedMode}">
- </ComboBox>
+ <TextBlock Margin="10,0,10,0"
+ VerticalAlignment="Center"
+ FontWeight="Bold"
+ Text="Choose Log:" />
+ <ComboBox Width="100"
+ HorizontalAlignment="Right"
+ ItemsSource="{Binding LogModes}"
+ SelectedIndex="{Binding SelectedMode}" />
</ToolBar>
- <TextBox AcceptsReturn="True" TextWrapping="Wrap" ScrollViewer.VerticalScrollBarVisibility="Visible" IsReadOnly="True" Grid.Row="1" Text="{Binding Log, Mode=OneWay}" />
+ <TextBox Grid.Row="1"
+ AcceptsReturn="True"
+ IsReadOnly="True"
+ ScrollViewer.VerticalScrollBarVisibility="Visible"
+ Text="{Binding Log,
+ Mode=OneWay}"
+ TextWrapping="Wrap" />
</Grid>
</Grid>
diff --git a/win/CS/HandBrakeWPF/Views/PreviewView.xaml b/win/CS/HandBrakeWPF/Views/PreviewView.xaml index 460501930..e1ffbda19 100644 --- a/win/CS/HandBrakeWPF/Views/PreviewView.xaml +++ b/win/CS/HandBrakeWPF/Views/PreviewView.xaml @@ -1,11 +1,16 @@ <Window 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" xmlns:cal="http://www.caliburnproject.org"
- mc:Ignorable="d"
- Title="{Binding Title}"
- Width="380" SizeToContent="Height" Background="#FFF1F0EF">
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:cal="http://www.caliburnproject.org"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ Title="{Binding Title}"
+ Width="380"
+ Background="#FFF1F0EF"
+ ResizeMode="NoResize"
+ SizeToContent="Height"
+ WindowStartupLocation="CenterScreen"
+ mc:Ignorable="d">
<Window.Resources>
<Style TargetType="Button">
@@ -16,33 +21,62 @@ <Setter Property="VerticalAlignment" Value="Center" />
</Style>
</Window.Resources>
-
- <StackPanel Orientation="Vertical" >
- <StackPanel Orientation="Horizontal" Grid.Row="0" Background="White" Height="30" Margin="0,0,0,10" >
- <Image Source="Images/window.png" Margin="10,0,5,0" Width="24" Height="24" VerticalAlignment="Center" />
- <StackPanel Orientation="Vertical" VerticalAlignment="Center">
- <TextBlock Text="Create a video preview" FontWeight="Bold" />
+ <StackPanel Orientation="Vertical">
+
+ <StackPanel Grid.Row="0"
+ Height="30"
+ Margin="0,0,0,10"
+ Background="White"
+ Orientation="Horizontal">
+ <Image Width="24"
+ Height="24"
+ Margin="10,0,5,0"
+ VerticalAlignment="Center"
+ Source="Images/window.png" />
+ <StackPanel VerticalAlignment="Center" Orientation="Vertical">
+ <TextBlock FontWeight="Bold" Text="Create a video preview" />
</StackPanel>
</StackPanel>
-
- <StackPanel Orientation="Horizontal" Margin="10,0,0,0">
- <TextBlock Text="Start at Preview:" Margin="0,0,5,0" VerticalAlignment="Center" />
- <ComboBox ItemsSource="{Binding StartPoints}" Width="60" SelectedItem="{Binding StartAt}" />
- <TextBlock Text="Duration:" VerticalAlignment="Center" Margin="10,0,5,0" />
- <ComboBox ItemsSource="{Binding AvailableDurations}" Width="60" SelectedItem="{Binding Duration}" />
+ <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
+ <TextBlock Margin="0,0,5,0"
+ VerticalAlignment="Center"
+ Text="Start at Preview:" />
+ <ComboBox Width="60"
+ ItemsSource="{Binding StartPoints}"
+ SelectedItem="{Binding StartAt}" />
+
+ <TextBlock Margin="10,0,5,0"
+ VerticalAlignment="Center"
+ Text="Duration:" />
+ <ComboBox Width="60"
+ ItemsSource="{Binding AvailableDurations}"
+ SelectedItem="{Binding Duration}" />
</StackPanel>
-
- <StackPanel Orientation="Horizontal" Margin="10,10,0,0">
- <ProgressBar Minimum="0" Maximum="100" Width="310" Height="22" Value="{Binding PercentageValue}" />
- <TextBlock Text="{Binding Percentage}" Margin="5,0,0,0" />
+
+ <StackPanel Margin="10,10,0,0" Orientation="Horizontal">
+ <ProgressBar Width="310"
+ Height="22"
+ Maximum="100"
+ Minimum="0"
+ Value="{Binding PercentageValue}" />
+ <TextBlock Margin="5,0,0,0" Text="{Binding Percentage}" />
</StackPanel>
- <StackPanel Orientation="Horizontal" Margin="10,10,0,10" Width="360">
- <CheckBox Content="Use system default player" VerticalAlignment="Center" IsChecked="{Binding UseSystemDefaultPlayer}" />
- <Button Content="Play" HorizontalAlignment="Right" IsDefault="True" VerticalAlignment="Center" Padding="8,2" Margin="10,0,0,0"
- cal:Message.Attach="[Event Click] = [Action Play]" />
+ <StackPanel Width="360"
+ Margin="10,10,0,10"
+ Orientation="Horizontal">
+ <CheckBox VerticalAlignment="Center"
+ Content="Use system default player"
+ IsChecked="{Binding UseSystemDefaultPlayer}" />
+ <Button Margin="10,0,0,0"
+ HorizontalAlignment="Right"
+ VerticalAlignment="Center"
+ cal:Message.Attach="[Event Click] = [Action Play]"
+ Content="Play"
+ IsDefault="True"
+ Padding="8,2" />
</StackPanel>
</StackPanel>
</Window>
diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml index affd2b959..2fcc8e8c2 100644 --- a/win/CS/HandBrakeWPF/Views/QueueView.xaml +++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml @@ -1,14 +1,22 @@ <Window 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" xmlns:cal="http://www.caliburnproject.org"
- xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
- xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:cal="http://www.caliburnproject.org"
+ xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
- xmlns:YourNamespace="clr-namespace:HandBrakeWPF.AttachedProperties" mc:Ignorable="d" Title="{Binding Title}"
- Width="600" Height="400"
- Background="#FFF0F0F0">
+ xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:YourNamespace="clr-namespace:HandBrakeWPF.AttachedProperties"
+ Title="{Binding Title}"
+ Width="600"
+ Height="400"
+ MinWidth="600"
+ MinHeight="400"
+ MaxWidth="600"
+ Background="#FFF0F0F0"
+ WindowStartupLocation="CenterScreen"
+ mc:Ignorable="d">
<Window.Resources>
<Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
@@ -17,60 +25,105 @@ <Converters:QueueStatusToVisibilityConverter x:Key="queueStatusVisConverter" />
</Window.Resources>
- <Grid >
+ <Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
- <ToolBar Name="mainToolBar" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="True">
+ <ToolBar Name="mainToolBar"
+ HorizontalAlignment="Stretch"
+ VerticalAlignment="Stretch"
+ SnapsToDevicePixels="True">
- <DockPanel Background="Transparent" Width="{Binding Path=ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type ToolBarPanel}}}">
+ <DockPanel Width="{Binding Path=ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type ToolBarPanel}}}" Background="Transparent">
<DockPanel.Resources>
- <Style TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
- <Style TargetType="{x:Type Menu}" BasedOn="{StaticResource {x:Static ToolBar.MenuStyleKey}}" />
+ <Style BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" TargetType="{x:Type Button}" />
+ <Style BasedOn="{StaticResource {x:Static ToolBar.MenuStyleKey}}" TargetType="{x:Type Menu}" />
</DockPanel.Resources>
- <Button Name="Start" cal:Message.Attach="[Event Click] = [Action StartEncode]"
- Visibility="{Binding IsEncoding, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">
+ <Button Name="Start"
+ cal:Message.Attach="[Event Click] = [Action StartEncode]"
+ Visibility="{Binding IsEncoding,
+ Converter={StaticResource boolToVisConverter},
+ ConverterParameter=true}">
<StackPanel Orientation="Horizontal">
- <Image Source="Images/Play.png" Height="32" Width="32" />
- <Label Content="Start" Margin="8,0,0,0" VerticalAlignment="Center" />
+ <Image Width="32"
+ Height="32"
+ Source="Images/Play.png" />
+ <Label Margin="8,0,0,0"
+ VerticalAlignment="Center"
+ Content="Start" />
</StackPanel>
</Button>
- <Button Name="Pause" cal:Message.Attach="[Event Click] = [Action PauseEncode]"
- Visibility="{Binding IsEncoding, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}">
+ <Button Name="Pause"
+ cal:Message.Attach="[Event Click] = [Action PauseEncode]"
+ Visibility="{Binding IsEncoding,
+ Converter={StaticResource boolToVisConverter},
+ ConverterParameter=false}">
<StackPanel Orientation="Horizontal">
- <Image Source="Images/Pause.png" Height="32" Width="32" />
- <Label Content="Pause" Margin="8,0,0,0" VerticalAlignment="Center" />
+ <Image Width="32"
+ Height="32"
+ Source="Images/Pause.png" />
+ <Label Margin="8,0,0,0"
+ VerticalAlignment="Center"
+ Content="Pause" />
</StackPanel>
</Button>
- <Menu Background="Transparent" HorizontalAlignment="Right">
+ <Menu HorizontalAlignment="Right" Background="Transparent">
<MenuItem>
<MenuItem.Header>
- <StackPanel Orientation="Horizontal" Height="32">
- <TextBlock FontWeight="Bold" Text="When Done: " VerticalAlignment="Center" />
- <Label Content="{Binding WhenDoneAction}" Margin="8,0,0,0" VerticalAlignment="Center" />
- <Path Fill="{DynamicResource GlyphBrush}" Data="M 0 0 L 4 4 L 8 0 Z" Height="5" Margin="2,2,2,0"/>
+ <StackPanel Height="32" Orientation="Horizontal">
+ <TextBlock VerticalAlignment="Center"
+ FontWeight="Bold"
+ Text="When Done: " />
+ <Label Margin="8,0,0,0"
+ VerticalAlignment="Center"
+ Content="{Binding WhenDoneAction}" />
+ <Path Height="5"
+ Margin="2,2,2,0"
+ Data="M 0 0 L 4 4 L 8 0 Z"
+ Fill="{DynamicResource GlyphBrush}" />
</StackPanel>
</MenuItem.Header>
- <MenuItem Header="Do nothing" IsCheckable="True" YourNamespace:MenuItemExtensions.GroupName="whenDone"
- cal:Message.Attach="[Event Click] = [Action WhenDone(doNothing.Header)]" x:Name="doNothing" />
- <MenuItem Header="Shutdown" IsCheckable="True" YourNamespace:MenuItemExtensions.GroupName="whenDone"
- cal:Message.Attach="[Event Click] = [Action WhenDone(shutdown.Header)]" x:Name="shutdown" />
- <MenuItem Header="Suspend" IsCheckable="True" YourNamespace:MenuItemExtensions.GroupName="whenDone"
- cal:Message.Attach="[Event Click] = [Action WhenDone(suspend.Header)]" x:Name="suspend" />
- <MenuItem Header="Hibernate" IsCheckable="True" YourNamespace:MenuItemExtensions.GroupName="whenDone"
- cal:Message.Attach="[Event Click] = [Action WhenDone(hibernate.Header)]" x:Name="hibernate" />
- <MenuItem Header="Lock system" IsCheckable="True" YourNamespace:MenuItemExtensions.GroupName="whenDone"
- cal:Message.Attach="[Event Click] = [Action WhenDone(lock.Header)]" x:Name="lock" />
- <MenuItem Header="Log off" IsCheckable="True" YourNamespace:MenuItemExtensions.GroupName="whenDone"
- cal:Message.Attach="[Event Click] = [Action WhenDone(logoff.Header)]" x:Name="logoff" />
- <MenuItem Header="Quit HandBrake" IsCheckable="True" YourNamespace:MenuItemExtensions.GroupName="whenDone"
- cal:Message.Attach="[Event Click] = [Action WhenDone(quit.Header)]" x:Name="quit" />
+ <MenuItem x:Name="doNothing"
+ cal:Message.Attach="[Event Click] = [Action WhenDone(doNothing.Header)]"
+ Header="Do nothing"
+ IsCheckable="True"
+ YourNamespace:MenuItemExtensions.GroupName="whenDone" />
+ <MenuItem x:Name="shutdown"
+ cal:Message.Attach="[Event Click] = [Action WhenDone(shutdown.Header)]"
+ Header="Shutdown"
+ IsCheckable="True"
+ YourNamespace:MenuItemExtensions.GroupName="whenDone" />
+ <MenuItem x:Name="suspend"
+ cal:Message.Attach="[Event Click] = [Action WhenDone(suspend.Header)]"
+ Header="Suspend"
+ IsCheckable="True"
+ YourNamespace:MenuItemExtensions.GroupName="whenDone" />
+ <MenuItem x:Name="hibernate"
+ cal:Message.Attach="[Event Click] = [Action WhenDone(hibernate.Header)]"
+ Header="Hibernate"
+ IsCheckable="True"
+ YourNamespace:MenuItemExtensions.GroupName="whenDone" />
+ <MenuItem x:Name="lock"
+ cal:Message.Attach="[Event Click] = [Action WhenDone(lock.Header)]"
+ Header="Lock system"
+ IsCheckable="True"
+ YourNamespace:MenuItemExtensions.GroupName="whenDone" />
+ <MenuItem x:Name="logoff"
+ cal:Message.Attach="[Event Click] = [Action WhenDone(logoff.Header)]"
+ Header="Log off"
+ IsCheckable="True"
+ YourNamespace:MenuItemExtensions.GroupName="whenDone" />
+ <MenuItem x:Name="quit"
+ cal:Message.Attach="[Event Click] = [Action WhenDone(quit.Header)]"
+ Header="Quit HandBrake"
+ IsCheckable="True"
+ YourNamespace:MenuItemExtensions.GroupName="whenDone" />
</MenuItem>
</Menu>
</DockPanel>
@@ -81,17 +134,22 @@ <TextBlock Text="{Binding JobStatus}" />
</StackPanel>
- <ListBox Grid.Row="2" ItemsSource="{Binding QueueJobs}" SelectionMode="Extended" Background="LightGray" Margin="10,0,10,10"
- dd:DragDrop.IsDragSource="True" dd:DragDrop.IsDropTarget="True"
- dd:DragDrop.DropHandler="{Binding}">
+ <ListBox Grid.Row="2"
+ Margin="10,0,10,10"
+ Background="LightGray"
+ dd:DragDrop.DropHandler="{Binding}"
+ dd:DragDrop.IsDragSource="True"
+ dd:DragDrop.IsDropTarget="True"
+ ItemsSource="{Binding QueueJobs}"
+ SelectionMode="Extended">
<ListBox.ContextMenu>
<ContextMenu>
- <MenuItem Header="Import Queue" cal:Message.Attach="[Event Click] = [Action Import]" />
- <MenuItem Header="Export Queue" cal:Message.Attach="[Event Click] = [Action Export]" />
+ <MenuItem cal:Message.Attach="[Event Click] = [Action Import]" Header="Import Queue" />
+ <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="Export Queue" />
<Separator />
- <MenuItem Header="Clear" cal:Message.Attach="[Event Click] = [Action Clear]" />
- <MenuItem Header="Clear Completed" cal:Message.Attach="[Event Click] = [Action ClearCompleted]" />
+ <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="Clear" />
+ <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="Clear Completed" />
</ContextMenu>
</ListBox.ContextMenu>
@@ -106,70 +164,83 @@ <ListBox.ItemTemplate>
<DataTemplate x:Name="QueueItemTemplate">
- <Grid HorizontalAlignment="Stretch" >
+ <Grid HorizontalAlignment="Stretch">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
- <!-- Marker -->
- <Image Width="16" Height="16" Grid.Column="0" Margin="10,0,10,0" >
+ <!-- Marker -->
+ <Image Grid.Column="0"
+ Width="16"
+ Height="16"
+ Margin="10,0,10,0">
<Image.Style>
<Style TargetType="{x:Type Image}">
<Style.Triggers>
<DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Waiting">
- <Setter Property="Source" Value="Images\Movies.png"/>
+ <Setter Property="Source" Value="Images\Movies.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="In Progress">
- <Setter Property="Source" Value="Images\Working0.png"/>
+ <Setter Property="Source" Value="Images\Working0.png" />
</DataTrigger>
- <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Completed" >
- <Setter Property="Source" Value="Images\Complete.png"/>
+ <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Completed">
+ <Setter Property="Source" Value="Images\Complete.png" />
</DataTrigger>
- <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Error" >
- <Setter Property="Source" Value="Images\WarningSmall.png"/>
+ <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Error">
+ <Setter Property="Source" Value="Images\WarningSmall.png" />
</DataTrigger>
</Style.Triggers>
</Style>
</Image.Style>
</Image>
- <!-- Settings -->
- <StackPanel Grid.Column="1" HorizontalAlignment="Stretch" Margin="0,5,0,5">
+ <!-- Settings -->
+ <StackPanel Grid.Column="1"
+ Margin="0,5,0,5"
+ HorizontalAlignment="Stretch">
<StackPanel Orientation="Horizontal">
- <TextBlock Text="Title: " FontWeight="Bold" />
- <TextBlock Text="{Binding Task.Title}"/>
-
- <TextBlock Text="{Binding Task.PointToPointMode}" FontWeight="Bold" Margin="10,0,0,0" />
- <TextBlock Text=": " />
- <TextBlock Text="{Binding Task.StartPoint}"/>
- <TextBlock Text="to" Margin="5,0,5,0" />
- <TextBlock Text="{Binding Task.EndPoint}"/>
+ <TextBlock FontWeight="Bold" Text="Title: " />
+ <TextBlock Text="{Binding Task.Title}" />
+
+ <TextBlock Margin="10,0,0,0"
+ FontWeight="Bold"
+ Text="{Binding Task.PointToPointMode}" />
+ <TextBlock Text=": " />
+ <TextBlock Text="{Binding Task.StartPoint}" />
+ <TextBlock Margin="5,0,5,0" Text="to" />
+ <TextBlock Text="{Binding Task.EndPoint}" />
</StackPanel>
- <!-- TODO Support Drive Label Name-->
+ <!-- TODO Support Drive Label Name -->
<StackPanel Orientation="Horizontal">
- <TextBlock Text="Source: " FontWeight="Bold" />
- <TextBlock Text="{Binding Task.Source, Converter={StaticResource filePathToFilenameConverter}}"/>
+ <TextBlock FontWeight="Bold" Text="Source: " />
+ <TextBlock Text="{Binding Task.Source, Converter={StaticResource filePathToFilenameConverter}}" />
</StackPanel>
<StackPanel Orientation="Horizontal">
- <TextBlock Text="Destination: " FontWeight="Bold" />
- <TextBlock Text="{Binding Task.Destination, Converter={StaticResource filePathToFilenameConverter}}"/>
+ <TextBlock FontWeight="Bold" Text="Destination: " />
+ <TextBlock Text="{Binding Task.Destination, Converter={StaticResource filePathToFilenameConverter}}" />
</StackPanel>
<StackPanel Orientation="Horizontal">
- <TextBlock Text="Status: " FontWeight="Bold" />
- <TextBlock Text="{Binding Status, Converter={StaticResource enumComboConverter}}"/>
+ <TextBlock FontWeight="Bold" Text="Status: " />
+ <TextBlock Text="{Binding Status, Converter={StaticResource enumComboConverter}}" />
</StackPanel>
</StackPanel>
- <!-- Delete -->
- <Grid VerticalAlignment="Center" Grid.Column="2" Margin="10,0,10,0">
+ <!-- Delete -->
+ <Grid Grid.Column="2"
+ Margin="10,0,10,0"
+ VerticalAlignment="Center">
<StackPanel Orientation="Vertical">
- <Image Source="Images/Refresh.ico" Width="20" Height="20" ToolTip="Reset job status to Waiting."
- Visibility="{Binding Status, Converter={StaticResource queueStatusVisConverter}}" >
+ <Image Width="20"
+ Height="20"
+ Source="Images/Refresh.ico"
+ ToolTip="Reset job status to Waiting."
+ Visibility="{Binding Status,
+ Converter={StaticResource queueStatusVisConverter}}">
<i:Interaction.Triggers>
<i:EventTrigger EventName="MouseDown">
<cal:ActionMessage MethodName="RetryJob">
@@ -179,7 +250,11 @@ </i:Interaction.Triggers>
</Image>
- <Image Source="Images/delete.png" Width="20" Height="20" Margin="0,5,0,0" ToolTip="Remove this Job">
+ <Image Width="20"
+ Height="20"
+ Margin="0,5,0,0"
+ Source="Images/delete.png"
+ ToolTip="Remove this Job">
<i:Interaction.Triggers>
<i:EventTrigger EventName="MouseDown">
<cal:ActionMessage MethodName="RemoveJob">
diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml index a1b32527d..93f0ba7c5 100644 --- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml +++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml @@ -1,16 +1,20 @@ <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" xmlns:cal="http://www.caliburnproject.org"
+ xmlns:cal="http://www.caliburnproject.org"
+ xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:NumericUpDown="clr-namespace:EagleBoost.Wpf.Presentation.Controls.NumericUpDown;assembly=EagleBoost.Wpf.Presentation"
- xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
- xmlns:Converters="clr-namespace:HandBrakeWPF.Converters" mc:Ignorable="d">
+ d:DesignHeight="153"
+ d:DesignWidth="319"
+ mc:Ignorable="d">
<UserControl.Resources>
<Converters:BooleanToVisibilityConverter x:Key="booleanToVisConverter" />
</UserControl.Resources>
-
+
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@@ -18,7 +22,10 @@ <RowDefinition Height="*" />
</Grid.RowDefinitions>
- <TextBlock Text="Subtitles" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>
+ <TextBlock Grid.Row="0"
+ Margin="10,5,0,0"
+ FontWeight="Bold"
+ Text="Subtitles" />
<Grid Grid.Row="1" Margin="10,5,10,0">
<Grid.ColumnDefinitions>
@@ -26,17 +33,29 @@ <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
- <Button Content="Add" Name="AddTrack" Grid.Column="0" Width="75" Margin="0,0,10,0" cal:Message.Attach="[Event Click] = [Action Add]" />
- <Button Content="Import SRT" Grid.Column="2" Width="85" cal:Message.Attach="[Event Click] = [Action Import]" />
+ <Button Name="AddTrack"
+ Grid.Column="0"
+ Width="75"
+ Margin="0,0,10,0"
+ cal:Message.Attach="[Event Click] = [Action Add]"
+ Content="Add" />
+ <Button Grid.Column="2"
+ Width="85"
+ cal:Message.Attach="[Event Click] = [Action Import]"
+ Content="Import SRT" />
</Grid>
- <ListBox Grid.Row="2" ItemsSource="{Binding Task.SubtitleTracks}"
- SelectionMode="Extended" Background="LightGray" Margin="10,10,10,10"
- dd:DragDrop.IsDragSource="True" dd:DragDrop.IsDropTarget="True"
- dd:DragDrop.DropHandler="{Binding}">
+ <ListBox Grid.Row="2"
+ Margin="10,10,10,10"
+ Background="LightGray"
+ dd:DragDrop.DropHandler="{Binding}"
+ dd:DragDrop.IsDragSource="True"
+ dd:DragDrop.IsDropTarget="True"
+ ItemsSource="{Binding Task.SubtitleTracks}"
+ SelectionMode="Extended">
<ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem">
- <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+ <Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="Background" Value="WhiteSmoke" />
<Setter Property="Margin" Value="0,0,0,1" />
</Style>
@@ -52,14 +71,18 @@ <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
- <!-- Marker -->
- <Image Source="Images/Movies.png" Width="16" Height="16" Grid.Column="0" Margin="10,0,10,0" />
+ <!-- Marker -->
+ <Image Grid.Column="0"
+ Width="16"
+ Height="16"
+ Margin="10,0,10,0"
+ Source="Images/Movies.png" />
- <!-- Settings -->
+ <!-- Settings -->
<Grid Grid.Column="1" HorizontalAlignment="Stretch">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" MaxWidth="300" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
@@ -76,23 +99,59 @@ <RowDefinition Height="28" />
</Grid.RowDefinitions>
- <!-- Row 1-->
-
- <TextBlock Text="Source" FontWeight="Bold" Grid.Column="0" VerticalAlignment="Center" />
- <ComboBox Width="120" ItemsSource="{Binding DataContext.SourceTracks, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
- SelectedItem="{Binding SourceTrack}" Grid.Column="1" Margin="5,0,5,0" Height="22"
- Visibility="{Binding IsSrtSubtitle, Converter={StaticResource booleanToVisConverter}, ConverterParameter=true}"/>
- <TextBlock Text="{Binding SrtFileName}" Grid.Column="1" VerticalAlignment="Center"
- Visibility="{Binding IsSrtSubtitle, Converter={StaticResource booleanToVisConverter}, ConverterParameter=false}" />
-
- <TextBlock Text="Forced Only" FontWeight="Bold" Grid.Column="2" VerticalAlignment="Center"
- Visibility="{Binding IsSrtSubtitle, Converter={StaticResource booleanToVisConverter}, ConverterParameter=true}" />
- <CheckBox Grid.Column="3" IsChecked="{Binding Forced}" VerticalAlignment="Center" Margin="5,0,5,0"
- Visibility="{Binding IsSrtSubtitle, Converter={StaticResource booleanToVisConverter}, ConverterParameter=true}" />
- <TextBlock Text="Burn In" FontWeight="Bold" Grid.Column="4" VerticalAlignment="Center"
- Visibility="{Binding IsSrtSubtitle, Converter={StaticResource booleanToVisConverter}, ConverterParameter=true}"/>
- <CheckBox Grid.Column="5" IsChecked="{Binding Burned}" VerticalAlignment="Center" Margin="5,0,5,0"
- Visibility="{Binding IsSrtSubtitle, Converter={StaticResource booleanToVisConverter}, ConverterParameter=true}">
+ <!-- Row 1 -->
+
+ <TextBlock Grid.Column="0"
+ VerticalAlignment="Center"
+ FontWeight="Bold"
+ Text="Source" />
+ <ComboBox Grid.Column="1"
+ Height="22"
+ MaxWidth="300"
+ Margin="5,0,5,0"
+ HorizontalAlignment="Stretch"
+ ItemsSource="{Binding DataContext.SourceTracks,
+ RelativeSource={RelativeSource FindAncestor,
+ AncestorType={x:Type UserControl}}}"
+ SelectedItem="{Binding SourceTrack}"
+ Visibility="{Binding IsSrtSubtitle,
+ Converter={StaticResource booleanToVisConverter},
+ ConverterParameter=true}" />
+ <TextBlock Grid.Column="1"
+ VerticalAlignment="Center"
+ Text="{Binding SrtFileName}"
+ Visibility="{Binding IsSrtSubtitle,
+ Converter={StaticResource booleanToVisConverter},
+ ConverterParameter=false}" />
+
+ <TextBlock Grid.Column="2"
+ VerticalAlignment="Center"
+ FontWeight="Bold"
+ Text="Forced Only"
+ Visibility="{Binding IsSrtSubtitle,
+ Converter={StaticResource booleanToVisConverter},
+ ConverterParameter=true}" />
+ <CheckBox Grid.Column="3"
+ Margin="5,0,5,0"
+ VerticalAlignment="Center"
+ IsChecked="{Binding Forced}"
+ Visibility="{Binding IsSrtSubtitle,
+ Converter={StaticResource booleanToVisConverter},
+ ConverterParameter=true}" />
+ <TextBlock Grid.Column="4"
+ VerticalAlignment="Center"
+ FontWeight="Bold"
+ Text="Burn In"
+ Visibility="{Binding IsSrtSubtitle,
+ Converter={StaticResource booleanToVisConverter},
+ ConverterParameter=true}" />
+ <CheckBox Grid.Column="5"
+ Margin="5,0,5,0"
+ VerticalAlignment="Center"
+ IsChecked="{Binding Burned}"
+ Visibility="{Binding IsSrtSubtitle,
+ Converter={StaticResource booleanToVisConverter},
+ ConverterParameter=true}">
<i:Interaction.Triggers>
<i:EventTrigger EventName="Click">
<cal:ActionMessage MethodName="SelectBurnedInTrack">
@@ -101,8 +160,14 @@ </i:EventTrigger>
</i:Interaction.Triggers>
</CheckBox>
- <TextBlock Text="Default" FontWeight="Bold" Grid.Column="6" VerticalAlignment="Center" />
- <CheckBox Grid.Column="7" IsChecked="{Binding Default}" VerticalAlignment="Center" Margin="5,0,5,0">
+ <TextBlock Grid.Column="6"
+ VerticalAlignment="Center"
+ FontWeight="Bold"
+ Text="Default" />
+ <CheckBox Grid.Column="7"
+ Margin="5,0,5,0"
+ VerticalAlignment="Center"
+ IsChecked="{Binding Default}">
<i:Interaction.Triggers>
<i:EventTrigger EventName="Click">
<cal:ActionMessage MethodName="SelectDefaultTrack">
@@ -112,25 +177,59 @@ </i:Interaction.Triggers>
</CheckBox>
- <!-- Row 2-->
- <TextBlock Text="Language" FontWeight="Bold" Grid.Column="0" Grid.Row="1" VerticalAlignment="Center"/>
- <ComboBox Width="120" Grid.Column="1"
- ItemsSource="{Binding DataContext.Langauges, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
- SelectedItem="{Binding SrtLang}" Margin="5,0,5,0" Grid.Row="1" Height="22"
- IsEnabled="{Binding IsSrtSubtitle}"/>
- <TextBlock Text="Char Code" FontWeight="Bold" Grid.Column="2" Grid.Row="1" VerticalAlignment="Center"/>
- <ComboBox Width="100" Grid.Column="3"
- ItemsSource="{Binding DataContext.CharacterCodes, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
- SelectedItem="{Binding SrtCharCode}" Grid.Row="1" Margin="5,0,5,0" Height="22"
- IsEnabled="{Binding IsSrtSubtitle}" />
- <TextBlock Text="Offset (ms)" FontWeight="Bold" Grid.Column="4" Grid.Row="1" VerticalAlignment="Center"/>
- <NumericUpDown:NumericUpDown Width="65" Value="{Binding SrtOffset}" Grid.Row="1" Grid.Column="5" HorizontalAlignment="Left"
- IsEnabled="{Binding IsSrtSubtitle}" Margin="5,0,5,0" />
+ <!-- Row 2 -->
+ <TextBlock Grid.Row="1"
+ Grid.Column="0"
+ VerticalAlignment="Center"
+ FontWeight="Bold"
+ Text="Language" />
+ <ComboBox Grid.Row="1"
+ Grid.Column="1"
+ Height="22"
+ MaxWidth="300"
+ Margin="5,0,5,0"
+ HorizontalAlignment="Stretch"
+ IsEnabled="{Binding IsSrtSubtitle}"
+ ItemsSource="{Binding DataContext.Langauges,
+ RelativeSource={RelativeSource FindAncestor,
+ AncestorType={x:Type UserControl}}}"
+ SelectedItem="{Binding SrtLang}" />
+ <TextBlock Grid.Row="1"
+ Grid.Column="2"
+ VerticalAlignment="Center"
+ FontWeight="Bold"
+ Text="Char Code" />
+ <ComboBox Grid.Row="1"
+ Grid.Column="3"
+ Width="100"
+ Height="22"
+ Margin="5,0,5,0"
+ IsEnabled="{Binding IsSrtSubtitle}"
+ ItemsSource="{Binding DataContext.CharacterCodes,
+ RelativeSource={RelativeSource FindAncestor,
+ AncestorType={x:Type UserControl}}}"
+ SelectedItem="{Binding SrtCharCode}" />
+ <TextBlock Grid.Row="1"
+ Grid.Column="4"
+ VerticalAlignment="Center"
+ FontWeight="Bold"
+ Text="Offset (ms)" />
+ <NumericUpDown:NumericUpDown Grid.Row="1"
+ Grid.Column="5"
+ Width="65"
+ Margin="5,0,5,0"
+ HorizontalAlignment="Left"
+ IsEnabled="{Binding IsSrtSubtitle}"
+ Value="{Binding SrtOffset}" />
</Grid>
- <!-- Delete -->
- <Image Source="Images/delete.png" Width="16" Height="16" Grid.Column="2" Margin="10,0,10,0">
+ <!-- Delete -->
+ <Image Grid.Column="2"
+ Width="16"
+ Height="16"
+ Margin="10,0,10,0"
+ Source="Images/delete.png">
<i:Interaction.Triggers>
<i:EventTrigger EventName="MouseDown">
<cal:ActionMessage MethodName="Remove">
@@ -147,6 +246,6 @@ </ListBox.ItemTemplate>
</ListBox>
-
+
</Grid>
</UserControl>
diff --git a/win/CS/HandBrakeWPF/Views/TitleSpecificView.xaml b/win/CS/HandBrakeWPF/Views/TitleSpecificView.xaml index 5f4c15c58..573236170 100644 --- a/win/CS/HandBrakeWPF/Views/TitleSpecificView.xaml +++ b/win/CS/HandBrakeWPF/Views/TitleSpecificView.xaml @@ -1,13 +1,17 @@ <Window x:Class="HandBrakeWPF.Views.TitleSpecificView"
- 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"
- xmlns:NumericUpDown="clr-namespace:EagleBoost.Wpf.Presentation.Controls.NumericUpDown;assembly=EagleBoost.Wpf.Presentation"
- xmlns:cal="http://www.caliburnproject.org" mc:Ignorable="d" Title="Scan Title"
- Width="250" SizeToContent="Height"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:cal="http://www.caliburnproject.org"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:NumericUpDown="clr-namespace:EagleBoost.Wpf.Presentation.Controls.NumericUpDown;assembly=EagleBoost.Wpf.Presentation"
+ Title="Scan Title"
+ Width="250"
Background="#FFF1F0EF"
- >
+ ResizeMode="NoResize"
+ SizeToContent="Height"
+ WindowStartupLocation="CenterScreen"
+ mc:Ignorable="d">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@@ -15,22 +19,50 @@ <RowDefinition Height="Auto" />
</Grid.RowDefinitions>
- <!-- Header -->
- <StackPanel Orientation="Horizontal" Grid.Row="0" Background="White" Height="30" Margin="0,0,0,10" >
- <Image Source="Images/Movies.png" Margin="10,0,5,0" Width="24" Height="24" VerticalAlignment="Center" />
- <StackPanel Orientation="Vertical" VerticalAlignment="Center">
- <TextBlock Text="Title Specific Scan" FontWeight="Bold" />
+ <!-- Header -->
+ <StackPanel Grid.Row="0"
+ Height="30"
+ Margin="0,0,0,10"
+ Background="White"
+ Orientation="Horizontal">
+ <Image Width="24"
+ Height="24"
+ Margin="10,0,5,0"
+ VerticalAlignment="Center"
+ Source="Images/Movies.png" />
+ <StackPanel VerticalAlignment="Center" Orientation="Vertical">
+ <TextBlock FontWeight="Bold" Text="Title Specific Scan" />
</StackPanel>
</StackPanel>
- <StackPanel Orientation="Horizontal" Grid.Row="1" Margin="10,10,0,10">
+ <StackPanel Grid.Row="1"
+ Margin="10,10,0,10"
+ Orientation="Horizontal">
<TextBlock Text="Choose a title to scan:" />
- <NumericUpDown:NumericUpDown Value="{Binding SelectedTitle, Mode=TwoWay}" Minimum="0" Maximum="1000" Width="60" Margin="10,0,0,0" />
+ <NumericUpDown:NumericUpDown Width="60"
+ Margin="10,0,0,0"
+ Maximum="1000"
+ Minimum="0"
+ Value="{Binding SelectedTitle,
+ Mode=TwoWay}" />
</StackPanel>
- <StackPanel Orientation="Horizontal" Grid.Row="2" HorizontalAlignment="Right" Margin="0,0,0,10">
- <Button Name="Cancel" IsCancel="True" Content="Cancel" cal:Message.Attach="[Event Click] = [Action Cancel]" Padding="8,1" Margin="0,0,10,0" />
- <Button Name="OpenTitle" IsDefault="True" Content="Open Title" cal:Message.Attach="[Event Click] = [Action Open]" Padding="8,1" Margin="0,0,10,0" />
+ <StackPanel Grid.Row="2"
+ Margin="0,0,0,10"
+ HorizontalAlignment="Right"
+ Orientation="Horizontal">
+ <Button Name="Cancel"
+ Margin="0,0,10,0"
+ cal:Message.Attach="[Event Click] = [Action Cancel]"
+ Content="Cancel"
+ IsCancel="True"
+ Padding="8,1" />
+ <Button Name="OpenTitle"
+ Margin="0,0,10,0"
+ cal:Message.Attach="[Event Click] = [Action Open]"
+ Content="Open Title"
+ IsDefault="True"
+ Padding="8,1" />
</StackPanel>
</Grid>
|