diff options
| author | sr55 <[email protected]> | 2013-12-01 16:46:16 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2013-12-01 16:46:16 +0000 |
| commit | 01f80ca032c708b7cae8118f83390ce56eb1988c (patch) | |
| tree | 825d549c8d727121bcc268b9cb24728a07a10c67 /win/CS/HandBrakeWPF/Views | |
| parent | ad9f61d20e531e2f99df7de4980bc4d7e658b78c (diff) | |
WinGui: Redesigned the Source Selection Menu dropdown, to an overlay window. Hopefully this is a bit cleaner but feedback is welcome on the forum. This may get reverted later if it doesn't work out.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5909 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/Views')
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml | 1 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/Images/File32.png | bin | 0 -> 328 bytes | |||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/Images/folder32.png | bin | 0 -> 314 bytes | |||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/MainView.xaml | 26 |
4 files changed, 23 insertions, 4 deletions
diff --git a/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml b/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml index 121f43595..b013096e4 100644 --- a/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml +++ b/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml @@ -13,7 +13,6 @@ <StackPanel Grid.Row="0"
Height="30"
Margin="0,0,0,10"
- Background="White"
Orientation="Horizontal">
<Image Width="24"
Height="24"
diff --git a/win/CS/HandBrakeWPF/Views/Images/File32.png b/win/CS/HandBrakeWPF/Views/Images/File32.png Binary files differnew file mode 100644 index 000000000..2b2ecba65 --- /dev/null +++ b/win/CS/HandBrakeWPF/Views/Images/File32.png diff --git a/win/CS/HandBrakeWPF/Views/Images/folder32.png b/win/CS/HandBrakeWPF/Views/Images/folder32.png Binary files differnew file mode 100644 index 000000000..6a5b8e19f --- /dev/null +++ b/win/CS/HandBrakeWPF/Views/Images/folder32.png diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml index d1add8edf..46fc614f0 100644 --- a/win/CS/HandBrakeWPF/Views/MainView.xaml +++ b/win/CS/HandBrakeWPF/Views/MainView.xaml @@ -6,7 +6,6 @@ xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"
xmlns:attachedProperties="clr-namespace:HandBrakeWPF.AttachedProperties"
- xmlns:handBrakeWpf="clr-namespace:HandBrakeWPF"
AllowDrop="True"
FontSize="11"
Micro:Message.Attach="[Event Loaded] = [Action Load]"
@@ -187,7 +186,23 @@ ToolBar.OverflowMode="Never"
ToolBarTray.IsLocked="True"
>
- <Menu Background="Transparent">
+
+ <Button Name="SelectSource"
+ Micro:Message.Attach="[Event Click] = [Action SelectSourceWindow]">
+ <StackPanel Orientation="Horizontal">
+ <Image Width="32"
+ Height="32"
+ Source="Images/Movies.png"
+ />
+ <Label Margin="8,0,0,0"
+ VerticalAlignment="Center"
+ Content="Source"
+ />
+ </StackPanel>
+ </Button>
+
+
+ <Menu Background="Transparent" Visibility="Collapsed">
<MenuItem ItemsSource="{Binding SourceMenu}" attachedProperties:DriveMenu.ShowAvailableDrives="true">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
@@ -201,6 +216,7 @@ />
</StackPanel>
</MenuItem.Header>
+
<MenuItem.Resources>
<Image x:Key="Movie" x:Shared="False" MaxWidth="16" SnapsToDevicePixels="True" Source="Images/file.png" />
<Image x:Key="Folder" x:Shared="False" MaxWidth="16" SnapsToDevicePixels="True" Source="Images/folder.png" />
@@ -667,7 +683,11 @@ </Grid>
</GroupBox>
</Grid>
-
+
+ <!-- Source Selection-->
+ <Controls:SourceSelection Grid.Row="1" Width="400" VerticalAlignment="Stretch" BorderThickness="1" BorderBrush="DarkGray"
+ Visibility="{Binding ShowSourceSelection, Converter={StaticResource boolToVisConverter}}" />
+
<!-- StatusPanel -->
<Controls:StatusPanel x:Name="loadingPanel"
Grid.Row="1"
|
