WinGui: Layout improvements on add preset window.

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

diff --git a/win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs b/win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs
index 567945300a2d8762ddc8ae6a941071bbb21919be..51d77b8b01540eb88a614c8ca57fb66cbe204c1f 100644 (file)
--- a/win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs
+++ b/win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs
@@ -20,7 +20,7 @@ namespace HandBrakeWPF.Model.Picture
         None = 0,\r
         [Display(Name = "Custom")]\r
         Custom = 1,\r
-        [Display(Name = "Source Max Size")]\r
+        [Display(Name = "Always use Source Resolution")]\r
         SourceMaximum = 2,\r
     }\r
 }
\ No newline at end of file

diff --git a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
index bc1dbbd62f190846f35ffcd6cb98dc378fb6e65c..5287da6d2048afef1957918c7c42c2e90c2160cb 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
@@ -59,18 +59,27 @@
                        Text="{x:Static Properties:ResourcesUI.AddPresetView_Name}" />\r
             <TextBox Grid.Row="0"\r
                      Grid.Column="1"\r
-                     Width="150"\r
-                     HorizontalAlignment="Left"\r
+                     HorizontalAlignment="Stretch"\r
                      Text="{Binding Preset.Name}" />\r
 \r
+\r
+            <!--  Description  -->\r
+            <TextBlock Grid.Row="2"\r
+                       Grid.Column="0" Margin="0,10,0,0"\r
+                       Text="{x:Static Properties:ResourcesUI.AddPresetView_Description}" />\r
+            <TextBox Grid.Row="2"\r
+                     Grid.Column="1" Margin="0,10,0,0"\r
+                     \r
+                     Text="{Binding Preset.Description}" />\r
+\r
             <!--  Settings  -->\r
-            <TextBlock Grid.Row="2" Margin="0,10,10,0"\r
+            <TextBlock Grid.Row="3" Margin="0,10,10,0"\r
                        Grid.Column="0"\r
                        Style="{StaticResource LongToolTipHolder}"\r
                        VerticalAlignment="Center"\r
                        ToolTip="{x:Static Properties:Resources.AddPreset_PictureSizeMode}"\r
                        Text="{x:Static Properties:ResourcesUI.AddPresetView_SavePictureSize}" />\r
-            <ComboBox Grid.Row="2" Margin="0,10,0,0"\r
+            <ComboBox Grid.Row="3" Margin="0,10,0,0"\r
                       Grid.Column="1"\r
                       Width="125"\r
                       HorizontalAlignment="Left" VerticalAlignment="Center"\r
@@ -81,7 +90,7 @@
                       SelectedItem="{Binding SelectedPictureSettingMode,\r
                                              Converter={StaticResource enumComboConverter}}" />\r
 \r
-            <StackPanel Grid.Row="3"\r
+            <StackPanel Grid.Row="4"\r
                         Grid.Column="1"\r
                         Margin="0,10,0,0"\r
                         Orientation="Horizontal"\r
@@ -96,14 +105,6 @@
                                     AllowEmpty="True" />\r
             </StackPanel>\r
 \r
-            <!--  Description  -->\r
-            <TextBlock Grid.Row="5"\r
-                       Grid.Column="0" Margin="0,10,0,0"\r
-                       Text="{x:Static Properties:ResourcesUI.AddPresetView_Description}" />\r
-            <TextBox Grid.Row="5"\r
-                     Grid.Column="1" Margin="0,10,0,0"\r
-                     HorizontalAlignment="Stretch"\r
-                     Text="{Binding Preset.Description}" />\r
         </Grid>\r
 \r
         <!--  Controls  -->\r