WinGui: Couple UI tidyup's

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5184 b64f7644-9d1e-0410-96f1-a4d463321fa5

3 files changed, 11 insertions, 14 deletions

diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml b/win/CS/HandBrakeWPF/Views/AudioView.xaml
index af5b81514..c63346642 100644
--- a/win/CS/HandBrakeWPF/Views/AudioView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml
@@ -9,6 +9,7 @@
              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:controls="clr-namespace:HandBrakeWPF.Controls"

              d:DesignHeight="170"

              d:DesignWidth="616"

              mc:Ignorable="d">

@@ -265,6 +266,7 @@
                                        Visibility="{Binding IsPassthru,

                                                             Converter={StaticResource boolToVisConverter},

                                                             ConverterParameter=true}" />

+

                             <NumericUpDown:NumericUpDown Name="drcNumericCtl"

                                                          Grid.Row="1"

                                                          Grid.Column="3"

diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index 362734851..a99989189 100644
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -8,6 +8,7 @@
              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:controls="clr-namespace:HandBrakeWPF.Controls"

              d:DesignHeight="153"

              d:DesignWidth="319"

              mc:Ignorable="d">

@@ -229,15 +230,11 @@
                                        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}"

-                                                         Minimum="-10800"

-                                                         Value="{Binding SrtOffset, Mode=TwoWay}" />

 

+                            <controls:NumberBox Grid.Row="1" Grid.Column="5" Width="65" Height="24" Margin="5,0,5,0"

+                                            Minimum="-900000" Maximum="900000" IsEnabled="{Binding IsSrtSubtitle}"

+                                            Number="{Binding SrtOffset, Mode=TwoWay}" />

+                            

                         </Grid>

 

                         <!--  Delete  -->

diff --git a/win/CS/HandBrakeWPF/Views/TitleSpecificView.xaml b/win/CS/HandBrakeWPF/Views/TitleSpecificView.xaml
index 573236170..00add413e 100644
--- a/win/CS/HandBrakeWPF/Views/TitleSpecificView.xaml
+++ b/win/CS/HandBrakeWPF/Views/TitleSpecificView.xaml
@@ -5,6 +5,7 @@
         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"

+        xmlns:controls="clr-namespace:HandBrakeWPF.Controls"

         Title="Scan Title"

         Width="250"

         Background="#FFF1F0EF"

@@ -39,12 +40,9 @@
                     Margin="10,10,0,10"

                     Orientation="Horizontal">

             <TextBlock Text="Choose a title to scan:" />

-            <NumericUpDown:NumericUpDown Width="60"

-                                         Margin="10,0,0,0"

-                                         Maximum="1000"

-                                         Minimum="0"

-                                         Value="{Binding SelectedTitle,

-                                                         Mode=TwoWay}" />

+

+            <controls:NumberBox Width="60" Height="24" Margin="10,0,0,0"

+                                Minimum="0" Maximum="1000" Number="{Binding SelectedTitle, Mode=TwoWay}" />

         </StackPanel>

 

         <StackPanel Grid.Row="2"