summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--win/CS/HandBrakeWPF/HandBrakeWPF.csproj3
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.Designer.cs2
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.resx2
-rw-r--r--win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs4
-rw-r--r--win/CS/HandBrakeWPF/Properties/ResourcesUI.resx4
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs5
-rw-r--r--win/CS/HandBrakeWPF/Views/Images/Presets2.pngbin0 -> 1467 bytes
-rw-r--r--win/CS/HandBrakeWPF/Views/MainView.xaml14
8 files changed, 27 insertions, 7 deletions
diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 0e2d5c5ea..c366fe1c6 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -742,6 +742,9 @@
<ItemGroup>
<Resource Include="Views\Images\Movies_small.png" />
</ItemGroup>
+ <ItemGroup>
+ <Resource Include="Views\Images\Presets2.png" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 8f70f5be4..1166457aa 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -897,7 +897,7 @@ namespace HandBrakeWPF.Properties {
}
/// <summary>
- /// Looks up a localized string similar to Show Queue{0}.
+ /// Looks up a localized string similar to Queue{0}.
/// </summary>
public static string Main_QueueLabel {
get {
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 936c39741..2e57bf7a7 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -532,7 +532,7 @@ This could be due to one of the following reasons:
The Activity log may have further information.</value>
</data>
<data name="Main_QueueLabel" xml:space="preserve">
- <value>Show Queue{0}</value>
+ <value>Queue{0}</value>
</data>
<data name="Main_Start" xml:space="preserve">
<value>Start Encode</value>
diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
index 4868b37f5..46ef28a19 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
@@ -1006,7 +1006,7 @@ namespace HandBrakeWPF.Properties {
}
/// <summary>
- /// Looks up a localized string similar to Show Preview.
+ /// Looks up a localized string similar to Preview.
/// </summary>
public static string MainView_ShowPreview {
get {
@@ -1015,7 +1015,7 @@ namespace HandBrakeWPF.Properties {
}
/// <summary>
- /// Looks up a localized string similar to Show Queue.
+ /// Looks up a localized string similar to Queue.
/// </summary>
public static string MainView_ShowQueue {
get {
diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
index 8379ecb7d..d7e1da499 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
@@ -184,7 +184,7 @@
<value>Remove</value>
</data>
<data name="MainView_ShowQueue" xml:space="preserve">
- <value>Show Queue</value>
+ <value>Queue</value>
</data>
<data name="MainView_Source" xml:space="preserve">
<value>Source:</value>
@@ -1020,6 +1020,6 @@ This will not affect your current settings in the Subtitle tab.</value>
<value>Save New Preset</value>
</data>
<data name="MainView_ShowPreview" xml:space="preserve">
- <value>Show Preview</value>
+ <value>Preview</value>
</data>
</root> \ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 9fce1956c..68b59817e 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1433,6 +1433,11 @@ namespace HandBrakeWPF.ViewModels
}
}
+ public void ShowPresetPane()
+ {
+ this.IsPresetPanelShowing = !this.IsPresetPanelShowing;
+ }
+
/// <summary>
/// Launch the Help pages.
/// </summary>
diff --git a/win/CS/HandBrakeWPF/Views/Images/Presets2.png b/win/CS/HandBrakeWPF/Views/Images/Presets2.png
new file mode 100644
index 000000000..f4205306e
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Presets2.png
Binary files differ
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 4de963c1f..dfbc93c7c 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -228,7 +228,7 @@
<Separator />
- <Button Name="ShowQueue" AutomationProperties.Name="Show Queue" cal:Message.Attach="[Event Click] = [Action OpenQueueWindow]">
+ <Button Name="ShowQueue" AutomationProperties.Name="Queue" cal:Message.Attach="[Event Click] = [Action OpenQueueWindow]">
<StackPanel Orientation="Horizontal">
<Image Width="32"
Height="32"
@@ -262,6 +262,18 @@
Content="Activity Log"/>
</StackPanel>
</Button>
+
+
+ <Button Name="PresetPane" AutomationProperties.Name="Show Preset Pane" cal:Message.Attach="[Event Click] = [Action ShowPresetPane]">
+ <StackPanel Orientation="Horizontal">
+ <Image Width="32"
+ Height="32"
+ Source="Images/Presets2.png"/>
+ <Label Margin="8,0,0,0"
+ VerticalAlignment="Center"
+ Content="Presets"/>
+ </StackPanel>
+ </Button>
</ToolBar>
</StackPanel>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 05:41:53 +0000