diff options
| author | sr55 <[email protected]> | 2013-11-02 12:36:12 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2013-11-02 12:36:12 +0000 |
| commit | 027d6745f293a4c28988cd38c71e5bf904435d65 (patch) | |
| tree | 12006e530e7b6aeabc0d1792b02a794676118795 /win/CS | |
| parent | 33c6b8001165d5acbb318140a66b49c96475135a (diff) | |
WinGui: Fixed an issue with the Queue toolbar where resizing the widow to a smaller side made the toolbar hide the buttons in the dropdown.
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
Diffstat (limited to 'win/CS')
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/Images/copy.png | bin | 3291 -> 1267 bytes | |||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/Images/folder.png | bin | 463 -> 235 bytes | |||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/QueueView.xaml | 30 |
3 files changed, 19 insertions, 11 deletions
diff --git a/win/CS/HandBrakeWPF/Views/Images/copy.png b/win/CS/HandBrakeWPF/Views/Images/copy.png Binary files differindex c11c6a753..c5549709f 100644 --- a/win/CS/HandBrakeWPF/Views/Images/copy.png +++ b/win/CS/HandBrakeWPF/Views/Images/copy.png diff --git a/win/CS/HandBrakeWPF/Views/Images/folder.png b/win/CS/HandBrakeWPF/Views/Images/folder.png Binary files differindex a54316ea6..dcd98c95b 100644 --- a/win/CS/HandBrakeWPF/Views/Images/folder.png +++ b/win/CS/HandBrakeWPF/Views/Images/folder.png diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml index dc6354ea5..77532e924 100644 --- a/win/CS/HandBrakeWPF/Views/QueueView.xaml +++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml @@ -14,8 +14,8 @@ Title="{Binding Title}"
Width="700"
Height="500"
- MinWidth="200"
- MinHeight="200"
+ MinWidth="350"
+ MinHeight="250"
Background="#FFF0F0F0"
WindowStartupLocation="CenterScreen"
TextOptions.TextFormattingMode="Display"
@@ -44,18 +44,25 @@ <RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
+
+
<ToolBar Name="mainToolBar"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
- SnapsToDevicePixels="True">
+ SnapsToDevicePixels="True"
+ AllowDrop="False" Focusable="False" >
+ <ToolBar.Resources>
+ <Style TargetType="{x:Type ToolBarPanel}">
+ <Setter Property="Orientation" Value="Vertical"/>
+ </Style>
- <DockPanel Width="{Binding Path=ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type ToolBarPanel}}}" Background="Transparent">
- <DockPanel.Resources>
- <Style BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" TargetType="{x:Type Button}" />
- <Style BasedOn="{StaticResource {x:Static ToolBar.MenuStyleKey}}" TargetType="{x:Type Menu}" />
- </DockPanel.Resources>
+ <Style BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" TargetType="{x:Type Button}" />
+ <Style BasedOn="{StaticResource {x:Static ToolBar.MenuStyleKey}}" TargetType="{x:Type Menu}" />
+ </ToolBar.Resources>
- <Button Name="Start"
+ <DockPanel Background="Transparent" HorizontalAlignment="Stretch">
+
+ <Button Name="Start" DockPanel.Dock="Left"
cal:Message.Attach="[Event Click] = [Action StartEncode]"
Visibility="{Binding IsEncoding,
Converter={StaticResource boolToVisConverter},
@@ -70,7 +77,7 @@ </StackPanel>
</Button>
- <Button Name="Pause"
+ <Button Name="Pause" DockPanel.Dock="Left"
cal:Message.Attach="[Event Click] = [Action PauseEncode]"
Visibility="{Binding IsEncoding,
Converter={StaticResource boolToVisConverter},
@@ -85,7 +92,7 @@ </StackPanel>
</Button>
- <Menu HorizontalAlignment="Right" Background="Transparent">
+ <Menu HorizontalAlignment="Right" DockPanel.Dock="Right" Background="Transparent">
<MenuItem>
<MenuItem.Header>
<StackPanel Height="32" Orientation="Horizontal">
@@ -138,6 +145,7 @@ YourNamespace:MenuItemExtensions.GroupName="whenDone" />
</MenuItem>
</Menu>
+
</DockPanel>
</ToolBar>
|
