WinGui: Fixed an issue with the Queue toolbar where resizing the widow to a smaller...

Added new icons for "Folder" and "Copy" based on the current style.

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

diff --git a/win/CS/HandBrakeWPF/Views/Images/copy.png b/win/CS/HandBrakeWPF/Views/Images/copy.png
index c11c6a7531ddc1c8e599605f27799bca6fe81a65..c5549709f16b246c101c44daa6e574bb7ddaad83 100644 (file)
Binary files a/win/CS/HandBrakeWPF/Views/Images/copy.png and b/win/CS/HandBrakeWPF/Views/Images/copy.png differ

diff --git a/win/CS/HandBrakeWPF/Views/Images/folder.png b/win/CS/HandBrakeWPF/Views/Images/folder.png
index a54316ea6cf7ca930474fbc714eb2d6eafb61d6d..dcd98c95b7fb7b3784df5c474e480a8a2f72878e 100644 (file)
Binary files a/win/CS/HandBrakeWPF/Views/Images/folder.png and b/win/CS/HandBrakeWPF/Views/Images/folder.png differ

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index dc6354ea500d146562cde41c92d943bec77be571..77532e9249402ce91d64e9b19493f9c60e2c54fc 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -14,8 +14,8 @@
         Title="{Binding Title}"\r
         Width="700"\r
         Height="500"\r
-        MinWidth="200"\r
-        MinHeight="200"\r
+        MinWidth="350"\r
+        MinHeight="250"\r
         Background="#FFF0F0F0"\r
         WindowStartupLocation="CenterScreen"\r
         TextOptions.TextFormattingMode="Display"\r
@@ -44,18 +44,25 @@
             <RowDefinition Height="Auto" />\r
             <RowDefinition Height="*" />\r
         </Grid.RowDefinitions>\r
+\r
+\r
         <ToolBar Name="mainToolBar"\r
                  HorizontalAlignment="Stretch"\r
                  VerticalAlignment="Stretch"\r
-                 SnapsToDevicePixels="True">\r
+                 SnapsToDevicePixels="True" \r
+                 AllowDrop="False" Focusable="False" >\r
+            <ToolBar.Resources>\r
+                <Style TargetType="{x:Type ToolBarPanel}">\r
+                    <Setter Property="Orientation" Value="Vertical"/>\r
+                </Style>\r
 \r
-            <DockPanel Width="{Binding Path=ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type ToolBarPanel}}}" Background="Transparent">\r
-                <DockPanel.Resources>\r
-                    <Style BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" TargetType="{x:Type Button}" />\r
-                    <Style BasedOn="{StaticResource {x:Static ToolBar.MenuStyleKey}}" TargetType="{x:Type Menu}" />\r
-                </DockPanel.Resources>\r
+                <Style BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" TargetType="{x:Type Button}" />\r
+                <Style BasedOn="{StaticResource {x:Static ToolBar.MenuStyleKey}}" TargetType="{x:Type Menu}" />\r
+            </ToolBar.Resources>\r
 \r
-                <Button Name="Start"\r
+            <DockPanel Background="Transparent" HorizontalAlignment="Stretch">\r
+\r
+                <Button Name="Start" DockPanel.Dock="Left"\r
                         cal:Message.Attach="[Event Click] = [Action StartEncode]"\r
                         Visibility="{Binding IsEncoding,\r
                                              Converter={StaticResource boolToVisConverter},\r
@@ -70,7 +77,7 @@
                     </StackPanel>\r
                 </Button>\r
 \r
-                <Button Name="Pause"\r
+                <Button Name="Pause" DockPanel.Dock="Left"\r
                         cal:Message.Attach="[Event Click] = [Action PauseEncode]"\r
                         Visibility="{Binding IsEncoding,\r
                                              Converter={StaticResource boolToVisConverter},\r
@@ -85,7 +92,7 @@
                     </StackPanel>\r
                 </Button>\r
 \r
-                <Menu HorizontalAlignment="Right" Background="Transparent">\r
+                <Menu HorizontalAlignment="Right" DockPanel.Dock="Right" Background="Transparent">\r
                     <MenuItem>\r
                         <MenuItem.Header>\r
                             <StackPanel Height="32" Orientation="Horizontal">\r
@@ -138,6 +145,7 @@
                                   YourNamespace:MenuItemExtensions.GroupName="whenDone" />\r
                     </MenuItem>\r
                 </Menu>\r
+\r
             </DockPanel>\r
         </ToolBar>\r
 \r