WinGui: Change the Audio and Subtitle Tab's "Add" Split Button" to a Dropdown Button...

diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml b/win/CS/HandBrakeWPF/Views/AudioView.xaml
index 16c7a75bd833ea383f6cb46318d5ecf22d417d50..33d5344ac75cc6741448b86af2666389189c0475 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/AudioView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml
@@ -61,13 +61,27 @@
                     <ColumnDefinition Width="Auto" />\r
                 </Grid.ColumnDefinitions>\r
 \r
-                <splitButton:SplitMenuButton Content="{x:Static Properties:ResourcesUI.Shared_AddTrack}" cal:Message.Attach="[Event Click] = [Action Add]"  FontWeight="Bold" Margin="0,0,10,0" Grid.Column="0">\r
-                    <splitButton:SplitMenuButton.ItemSource>\r
-                        <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_AddNewTrack}" cal:Message.Attach="[Event Click] = [Action Add]" />\r
-                        <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_AddAllRemaining}" cal:Message.Attach="[Event Click] = [Action AddAllRemaining]" />\r
-                        <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_AddAllForSelected}" cal:Message.Attach="[Event Click] = [Action AddAllRemainingForSelectedLanguages]" />\r
-                    </splitButton:SplitMenuButton.ItemSource>\r
-                </splitButton:SplitMenuButton>\r
+                <Button x:Name="audioOptionsButton" FontWeight="Bold" Margin="0,0,10,0" Grid.Column="0" Click="AudioOptionsButton_OnClick">\r
+                    <Button.Content>\r
+                        <StackPanel Orientation="Horizontal">\r
+                            <TextBlock Margin="0,0,5,0" Padding="0"\r
+                                       VerticalAlignment="Center"\r
+                                       Text="{x:Static Properties:ResourcesUI.Shared_AddTrack}" />\r
+\r
+                            <Path Height="5" Margin="2,2,0,0" VerticalAlignment="Center" HorizontalAlignment="Center"\r
+                                  Data="M 0 0 L 4 4 L 8 0 Z"\r
+                                  Fill="{DynamicResource GlyphBrush}" x:Name="dropdownArrowPreset" />\r
+                        </StackPanel>\r
+                    </Button.Content>\r
+\r
+                    <Button.ContextMenu>\r
+                        <ContextMenu x:Name="MainContextMenu" PlacementRectangle="{Binding RelativeSource={RelativeSource Self}}">\r
+                            <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_AddNewTrack}" cal:Message.Attach="[Event Click] = [Action Add]" />\r
+                            <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_AddAllRemaining}" cal:Message.Attach="[Event Click] = [Action AddAllRemaining]" />\r
+                            <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_AddAllForSelected}" cal:Message.Attach="[Event Click] = [Action AddAllRemainingForSelectedLanguages]" />\r
+                        </ContextMenu>\r
+                    </Button.ContextMenu>\r
+                </Button>\r
 \r
                 <Button MinWidth="65" Grid.Column="1"\r
                     Margin="0,0,10,0"\r

diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml.cs b/win/CS/HandBrakeWPF/Views/AudioView.xaml.cs
index 0dc1dc9b887f9a42517f6bd82abb82c08aa26999..c76cc158884f6be52b58d5a502a800edf31d63ff 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/AudioView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml.cs
@@ -9,6 +9,7 @@
 \r
 namespace HandBrakeWPF.Views\r
 {\r
+    using System.Windows;\r
     using System.Windows.Controls;\r
 \r
     /// <summary>\r
@@ -21,7 +22,18 @@ namespace HandBrakeWPF.Views
         /// </summary>\r
         public AudioView()\r
         {\r
-            InitializeComponent();\r
+            this.InitializeComponent();\r
+        }\r
+\r
+        private void AudioOptionsButton_OnClick(object sender, RoutedEventArgs e)\r
+        {\r
+            var button = sender as FrameworkElement;\r
+            if (button != null && button.ContextMenu != null)\r
+            {\r
+                button.ContextMenu.PlacementTarget = button;\r
+                button.ContextMenu.Placement = System.Windows.Controls.Primitives.PlacementMode.Bottom;\r
+                button.ContextMenu.IsOpen = true;\r
+            }\r
         }\r
     }\r
 }\r

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 019d8f79085d0f0edf6c3413da2390a98e85f299..60365e104978cbe35ab075251ff6af17b2d0c03d 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -340,7 +340,7 @@
                                        VerticalAlignment="Center"\r
                                        Text="{x:Static Properties:ResourcesUI.MainView_Options}" />\r
 \r
-                                <Path Height="5" Margin="2,2,2,0" VerticalAlignment="Center" HorizontalAlignment="Center"\r
+                                <Path Height="5" Margin="2,2,0,0" VerticalAlignment="Center" HorizontalAlignment="Center"\r
                                   Data="M 0 0 L 4 4 L 8 0 Z"\r
                                   Fill="{DynamicResource GlyphBrush}" x:Name="dropdownArrowPreset" />\r
                             </StackPanel>\r

diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index 54df67b38130170b880112b256feec31e4a53e77..a945b6fccaefe39332fb210262e14e8f8414b03d 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -57,14 +57,28 @@
                 <ColumnDefinition Width="Auto" />\r
             </Grid.ColumnDefinitions>\r
 \r
-            <splitButton:SplitMenuButton Content="{x:Static Properties:ResourcesUI.Shared_AddTrack}" cal:Message.Attach="[Event Click] = [Action Add]"  FontWeight="Bold" Margin="0,0,10,0" Grid.Column="0">\r
-                <splitButton:SplitMenuButton.ItemSource>\r
-                    <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_AddNewTrack}" cal:Message.Attach="[Event Click] = [Action Add]" />\r
-                    <MenuItem Header="Add All Remaining Tracks" cal:Message.Attach="[Event Click] = [Action AddAllRemaining]" />\r
-                    <MenuItem Header="Add All Remaining Closed Captions" cal:Message.Attach="[Event Click] = [Action AddAllClosedCaptions]" />\r
-                    <MenuItem Header="Add All Remaining Selected Languages" cal:Message.Attach="[Event Click] = [Action AddAllRemainingForSelectedLanguages]" />\r
-                </splitButton:SplitMenuButton.ItemSource>\r
-            </splitButton:SplitMenuButton>\r
+            <Button x:Name="subtitleOptionsButton" FontWeight="Bold" Margin="0,0,10,0" Grid.Column="0" Click="SubtitleOptionsButton_OnClick">\r
+                <Button.Content>\r
+                    <StackPanel Orientation="Horizontal">\r
+                        <TextBlock Margin="0,0,5,0" Padding="0"\r
+                                   VerticalAlignment="Center"\r
+                                   Text="{x:Static Properties:ResourcesUI.Shared_AddTrack}" />\r
+\r
+                        <Path Height="5" Margin="2,2,0,0" VerticalAlignment="Center" HorizontalAlignment="Center"\r
+                              Data="M 0 0 L 4 4 L 8 0 Z"\r
+                              Fill="{DynamicResource GlyphBrush}" x:Name="dropdownArrowPreset" />\r
+                    </StackPanel>\r
+                </Button.Content>\r
+\r
+                <Button.ContextMenu>\r
+                    <ContextMenu x:Name="MainContextMenu" PlacementRectangle="{Binding RelativeSource={RelativeSource Self}}">\r
+                        <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_AddNewTrack}" cal:Message.Attach="[Event Click] = [Action Add]" />\r
+                        <MenuItem Header="Add All Remaining Tracks" cal:Message.Attach="[Event Click] = [Action AddAllRemaining]" />\r
+                        <MenuItem Header="Add All Remaining Closed Captions" cal:Message.Attach="[Event Click] = [Action AddAllClosedCaptions]" />\r
+                        <MenuItem Header="Add All Remaining Selected Languages" cal:Message.Attach="[Event Click] = [Action AddAllRemainingForSelectedLanguages]" />\r
+                    </ContextMenu>\r
+                </Button.ContextMenu>\r
+            </Button>\r
 \r
             <Button MinWidth="75" Grid.Column="1"\r
                     cal:Message.Attach="[Event Click] = [Action Import]"\r

diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml.cs b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml.cs
index ea3e67114389c8d557ba50c45e1277d8d10036d3..373734bb0b74264a8a52878cb95be1b8b7acfd09 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml.cs
@@ -9,6 +9,7 @@
 \r
 namespace HandBrakeWPF.Views\r
 {\r
+    using System.Windows;\r
     using System.Windows.Controls;\r
 \r
     /// <summary>\r
@@ -21,7 +22,18 @@ namespace HandBrakeWPF.Views
         /// </summary>\r
         public SubtitlesView()\r
         {\r
-            InitializeComponent();\r
+            this.InitializeComponent();\r
+        }\r
+\r
+        private void SubtitleOptionsButton_OnClick(object sender, RoutedEventArgs e)\r
+        {\r
+            var button = sender as FrameworkElement;\r
+            if (button != null && button.ContextMenu != null)\r
+            {\r
+                button.ContextMenu.PlacementTarget = button;\r
+                button.ContextMenu.Placement = System.Windows.Controls.Primitives.PlacementMode.Bottom;\r
+                button.ContextMenu.IsOpen = true;\r
+            }\r
         }\r
     }\r
 }\r