summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.Designer.cs85
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.resx31
-rw-r--r--win/CS/HandBrakeWPF/Views/MetaDataView.xaml84
3 files changed, 154 insertions, 46 deletions
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 584540135..149010d2e 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -1926,7 +1926,7 @@ namespace HandBrakeWPF.Properties {
}
/// <summary>
- /// Looks up a localized string similar to Meta Data.
+ /// Looks up a localized string similar to Metadata.
/// </summary>
public static string MainView_MetaDataTab {
get {
@@ -2457,7 +2457,70 @@ namespace HandBrakeWPF.Properties {
}
/// <summary>
- /// Looks up a localized string similar to Meta Data.
+ /// Looks up a localized string similar to Actors:.
+ /// </summary>
+ public static string MetadataView_Actors {
+ get {
+ return ResourceManager.GetString("MetadataView_Actors", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Comments:.
+ /// </summary>
+ public static string MetadataView_Comments {
+ get {
+ return ResourceManager.GetString("MetadataView_Comments", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Description:.
+ /// </summary>
+ public static string MetadataView_Description {
+ get {
+ return ResourceManager.GetString("MetadataView_Description", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Director:.
+ /// </summary>
+ public static string MetadataView_Director {
+ get {
+ return ResourceManager.GetString("MetadataView_Director", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Genre:.
+ /// </summary>
+ public static string MetadataView_Genre {
+ get {
+ return ResourceManager.GetString("MetadataView_Genre", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Plot:.
+ /// </summary>
+ public static string MetadataView_Plot {
+ get {
+ return ResourceManager.GetString("MetadataView_Plot", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Release Date:.
+ /// </summary>
+ public static string MetadataView_ReleaseDate {
+ get {
+ return ResourceManager.GetString("MetadataView_ReleaseDate", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Metadata.
/// </summary>
public static string MetaDataView_Title {
get {
@@ -2466,6 +2529,15 @@ namespace HandBrakeWPF.Properties {
}
/// <summary>
+ /// Looks up a localized string similar to Title:.
+ /// </summary>
+ public static string MetadataView_TitleTag {
+ get {
+ return ResourceManager.GetString("MetadataView_TitleTag", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Encoding: Pass {0} of {1}, {2:00.00}%
///FPS: {3:000.0}, Avg FPS: {4:000.0}
///Time Remaining: {5}, Elapsed: {6:d\:hh\:mm\:ss}.
@@ -2995,6 +3067,15 @@ namespace HandBrakeWPF.Properties {
}
/// <summary>
+ /// Looks up a localized string similar to System.
+ /// </summary>
+ public static string Options_SystemOptions {
+ get {
+ return ResourceManager.GetString("Options_SystemOptions", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Change case to Title Case.
/// </summary>
public static string Options_TitleCase {
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index e40d9f7c9..123e45e9a 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -1022,7 +1022,7 @@ Would you like to overwrite it?</value>
<value>iPod 5G Support</value>
</data>
<data name="MainView_MetaDataTab" xml:space="preserve">
- <value>Meta Data</value>
+ <value>Metadata</value>
</data>
<data name="MainView_ModifiedPreset" xml:space="preserve">
<value>(Modified)</value>
@@ -1142,7 +1142,7 @@ Would you like to overwrite it?</value>
<value>Manage Preset</value>
</data>
<data name="MetaDataView_Title" xml:space="preserve">
- <value>Meta Data</value>
+ <value>Metadata</value>
</data>
<data name="OptionsView_EnableNvencEncoding" xml:space="preserve">
<value>Allow use of the Nvidia NVENC Encoders</value>
@@ -2018,4 +2018,31 @@ Where supported, any user presets will have been imported.</value>
<data name="SubtitlesDefaultsView_PaneTitle" xml:space="preserve">
<value>Configure Automatic Subtitle Selections</value>
</data>
+ <data name="Options_SystemOptions" xml:space="preserve">
+ <value>System</value>
+ </data>
+ <data name="MetadataView_Actors" xml:space="preserve">
+ <value>Actors:</value>
+ </data>
+ <data name="MetadataView_Comments" xml:space="preserve">
+ <value>Comments:</value>
+ </data>
+ <data name="MetadataView_Description" xml:space="preserve">
+ <value>Description:</value>
+ </data>
+ <data name="MetadataView_Director" xml:space="preserve">
+ <value>Director:</value>
+ </data>
+ <data name="MetadataView_Genre" xml:space="preserve">
+ <value>Genre:</value>
+ </data>
+ <data name="MetadataView_Plot" xml:space="preserve">
+ <value>Plot:</value>
+ </data>
+ <data name="MetadataView_ReleaseDate" xml:space="preserve">
+ <value>Release Date:</value>
+ </data>
+ <data name="MetadataView_TitleTag" xml:space="preserve">
+ <value>Title:</value>
+ </data>
</root> \ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Views/MetaDataView.xaml b/win/CS/HandBrakeWPF/Views/MetaDataView.xaml
index f8c62a6da..aa998eced 100644
--- a/win/CS/HandBrakeWPF/Views/MetaDataView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MetaDataView.xaml
@@ -10,33 +10,36 @@
<UserControl.Resources>
<converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
+
+ <Style TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
+ <Setter Property="Margin" Value="0,5,0,0"></Setter>
+ </Style>
</UserControl.Resources>
- <Grid>
+ <Grid Margin="10,0,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
- <TextBlock Text="{x:Static Properties:Resources.MetaDataView_Title}" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" />
+ <TextBlock Text="{x:Static Properties:Resources.MetaDataView_Title}" FontWeight="Bold" Margin="0,5,0,0" Grid.Row="0" />
<!-- Metadata Input Area -->
- <Grid Grid.Row="1" Margin="10,10,0,0">
+ <Grid Grid.Row="2" Margin="0,10,0,10">
<Grid.RowDefinitions>
- <RowDefinition Height="Auto" MinHeight="25" />
- <RowDefinition Height="Auto" MinHeight="25" />
- <RowDefinition Height="Auto" MinHeight="25" />
- <RowDefinition Height="Auto" MinHeight="25" />
- <RowDefinition Height="Auto" MinHeight="25" />
- <RowDefinition Height="Auto" MinHeight="25" />
- <RowDefinition Height="Auto" MinHeight="25" />
- <RowDefinition Height="Auto" MinHeight="25" />
- <RowDefinition Height="Auto" MinHeight="25" />
- <RowDefinition Height="Auto" MinHeight="25" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
@@ -44,35 +47,32 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
- <TextBlock Text="Album Artist:" Grid.Row="0" />
- <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding MetaData.AlbumArtist, UpdateSourceTrigger=PropertyChanged}" Width="350" VerticalAlignment="Center" />
-
- <TextBlock Text="Album:" Grid.Row="1" Grid.Column="0" />
- <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding MetaData.Album, UpdateSourceTrigger=PropertyChanged}" Width="350" VerticalAlignment="Center" />
-
- <TextBlock Text="Artist:" Grid.Row="2" Grid.Column="0" />
- <TextBox Grid.Row="2" Grid.Column="1" Text="{Binding MetaData.Artist, UpdateSourceTrigger=PropertyChanged}" Width="350" VerticalAlignment="Center" />
-
- <TextBlock Text="Comment:" Grid.Row="3" Grid.Column="0" />
- <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding MetaData.Comment, UpdateSourceTrigger=PropertyChanged}" Width="350" VerticalAlignment="Center" />
-
- <TextBlock Text="Composer:" Grid.Row="4" Grid.Column="0" />
- <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding MetaData.Composer, UpdateSourceTrigger=PropertyChanged}" Width="350" VerticalAlignment="Center" />
-
- <TextBlock Text="Description:" Grid.Row="5" Grid.Column="0" />
- <TextBox Grid.Row="5" Grid.Column="1" Text="{Binding MetaData.Description, UpdateSourceTrigger=PropertyChanged}" Width="350" VerticalAlignment="Center" />
-
- <TextBlock Text="Genre:" Grid.Row="6" Grid.Column="0" />
- <TextBox Grid.Row="6" Grid.Column="1" Text="{Binding MetaData.Genre, UpdateSourceTrigger=PropertyChanged}" Width="350" VerticalAlignment="Center" />
-
- <TextBlock Text="Long Description:" Grid.Row="7" Grid.Column="0" />
- <TextBox Grid.Row="7" Grid.Column="1" Text="{Binding MetaData.LongDescription, UpdateSourceTrigger=PropertyChanged}" Width="350" VerticalAlignment="Center" />
-
- <TextBlock Text="Name:" Grid.Row="8" Grid.Column="0" />
- <TextBox Grid.Row="8" Grid.Column="1" Text="{Binding MetaData.Name, UpdateSourceTrigger=PropertyChanged}" Width="350" VerticalAlignment="Center" />
-
- <TextBlock Text="Release Date:" Grid.Row="9" Grid.Column="0" />
- <TextBox Grid.Row="9" Grid.Column="1" Text="{Binding MetaData.ReleaseDate, UpdateSourceTrigger=PropertyChanged}" Width="350" VerticalAlignment="Center" />
+
+ <TextBlock Text="{x:Static Properties:Resources.MetadataView_TitleTag}" Grid.Row="0" Grid.Column="0" />
+ <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding MetaData.Name, UpdateSourceTrigger=PropertyChanged}" Width="450" VerticalAlignment="Center" />
+
+ <TextBlock Text="{x:Static Properties:Resources.MetadataView_Actors}" Grid.Row="1" Grid.Column="0" />
+ <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding MetaData.Artist, UpdateSourceTrigger=PropertyChanged}" Width="450" VerticalAlignment="Center" />
+
+ <TextBlock Text="{x:Static Properties:Resources.MetadataView_Director}" Grid.Row="2" />
+ <TextBox Grid.Row="2" Grid.Column="1" Text="{Binding MetaData.AlbumArtist, UpdateSourceTrigger=PropertyChanged}" Width="450" VerticalAlignment="Center" />
+
+ <TextBlock Text="{x:Static Properties:Resources.MetadataView_ReleaseDate}" Grid.Row="3" Grid.Column="0" />
+ <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding MetaData.ReleaseDate, UpdateSourceTrigger=PropertyChanged}" Width="450" VerticalAlignment="Center" />
+
+ <TextBlock Text="{x:Static Properties:Resources.MetadataView_Comments}" Grid.Row="4" Grid.Column="0" />
+ <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding MetaData.Comment, UpdateSourceTrigger=PropertyChanged}" Width="450" VerticalAlignment="Center" />
+
+ <TextBlock Text="{x:Static Properties:Resources.MetadataView_Genre}" Grid.Row="5" Grid.Column="0" />
+ <TextBox Grid.Row="5" Grid.Column="1" Text="{Binding MetaData.Genre, UpdateSourceTrigger=PropertyChanged}" Width="450" VerticalAlignment="Center" />
+
+ <TextBlock Text="{x:Static Properties:Resources.MetadataView_Description}" Grid.Row="6" Grid.Column="0" />
+ <TextBox Grid.Row="6" Grid.Column="1" Text="{Binding MetaData.Description, UpdateSourceTrigger=PropertyChanged}" Width="450" VerticalAlignment="Center" />
+
+ <TextBlock Text="{x:Static Properties:Resources.MetadataView_Plot}" Grid.Row="7" Grid.Column="0" />
+ <TextBox Grid.Row="7" Grid.Column="1" Text="{Binding MetaData.LongDescription, UpdateSourceTrigger=PropertyChanged}" Width="450"
+ VerticalAlignment="Stretch" TextWrapping="WrapWithOverflow" VerticalContentAlignment="Stretch" />
+
</Grid>
</Grid>