summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsr55 <[email protected]>2015-08-01 12:10:42 +0000
committersr55 <[email protected]>2015-08-01 12:10:42 +0000
commitcbd824b6343e8a9f462915b50ddb24cd85edf054 (patch)
tree97df70d3c9c066bd87dffd28ee4c4a892320b4c7
parent45f6643b611aaa48ba835acb95b6e4270909ae67 (diff)
WinGui: Layout improvements on add preset window.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7389 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs2
-rw-r--r--win/CS/HandBrakeWPF/Views/AddPresetView.xaml27
2 files changed, 15 insertions, 14 deletions
diff --git a/win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs b/win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs
index 567945300..51d77b8b0 100644
--- 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,
[Display(Name = "Custom")]
Custom = 1,
- [Display(Name = "Source Max Size")]
+ [Display(Name = "Always use Source Resolution")]
SourceMaximum = 2,
}
} \ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
index bc1dbbd62..5287da6d2 100644
--- 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}" />
<TextBox Grid.Row="0"
Grid.Column="1"
- Width="150"
- HorizontalAlignment="Left"
+ HorizontalAlignment="Stretch"
Text="{Binding Preset.Name}" />
+
+ <!-- Description -->
+ <TextBlock Grid.Row="2"
+ Grid.Column="0" Margin="0,10,0,0"
+ Text="{x:Static Properties:ResourcesUI.AddPresetView_Description}" />
+ <TextBox Grid.Row="2"
+ Grid.Column="1" Margin="0,10,0,0"
+
+ Text="{Binding Preset.Description}" />
+
<!-- Settings -->
- <TextBlock Grid.Row="2" Margin="0,10,10,0"
+ <TextBlock Grid.Row="3" Margin="0,10,10,0"
Grid.Column="0"
Style="{StaticResource LongToolTipHolder}"
VerticalAlignment="Center"
ToolTip="{x:Static Properties:Resources.AddPreset_PictureSizeMode}"
Text="{x:Static Properties:ResourcesUI.AddPresetView_SavePictureSize}" />
- <ComboBox Grid.Row="2" Margin="0,10,0,0"
+ <ComboBox Grid.Row="3" Margin="0,10,0,0"
Grid.Column="1"
Width="125"
HorizontalAlignment="Left" VerticalAlignment="Center"
@@ -81,7 +90,7 @@
SelectedItem="{Binding SelectedPictureSettingMode,
Converter={StaticResource enumComboConverter}}" />
- <StackPanel Grid.Row="3"
+ <StackPanel Grid.Row="4"
Grid.Column="1"
Margin="0,10,0,0"
Orientation="Horizontal"
@@ -96,14 +105,6 @@
AllowEmpty="True" />
</StackPanel>
- <!-- Description -->
- <TextBlock Grid.Row="5"
- Grid.Column="0" Margin="0,10,0,0"
- Text="{x:Static Properties:ResourcesUI.AddPresetView_Description}" />
- <TextBox Grid.Row="5"
- Grid.Column="1" Margin="0,10,0,0"
- HorizontalAlignment="Stretch"
- Text="{Binding Preset.Description}" />
</Grid>
<!-- Controls -->