diff options
| author | sr55 <[email protected]> | 2015-07-18 20:10:15 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2015-07-18 20:10:15 +0000 |
| commit | 358cb88d56078fab57c5daf9493704b111217839 (patch) | |
| tree | 4d16284ff2a4e69227b763f50d99b74826348dcb /win/CS/HandBrakeWPF/Views | |
| parent | 074663b7aa8e85a85fd6d298ada3cd50500348c8 (diff) | |
WinGui: Add a Mini Status Display window that can be accessed via the tray notify icon when the app is minimised to tray.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7350 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/Views')
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/MiniView.xaml | 34 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/ShellView.xaml.cs | 23 |
2 files changed, 56 insertions, 1 deletions
diff --git a/win/CS/HandBrakeWPF/Views/MiniView.xaml b/win/CS/HandBrakeWPF/Views/MiniView.xaml new file mode 100644 index 000000000..4069d3ffa --- /dev/null +++ b/win/CS/HandBrakeWPF/Views/MiniView.xaml @@ -0,0 +1,34 @@ +<Window x:Class="HandBrakeWPF.Views.MiniView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:cal="http://www.caliburnproject.org"
+ AllowDrop="True"
+ SnapsToDevicePixels="True"
+ UseLayoutRounding="True"
+ Width="300"
+ Height="165"
+ MinWidth="300"
+ MinHeight="165"
+ TextOptions.TextFormattingMode="Display" ShowActivated="True" ShowInTaskbar="True"
+ WindowStyle="ToolWindow"
+ x:Name="miniView"
+ Title="{Binding Path=WindowTitle}"
+ >
+
+ <Grid Margin="5,0,5,0">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+ <TextBlock Text="Status" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="5,0,10,5" Grid.Row="0" />
+
+ <TextBlock Text="{Binding Task}" Grid.Row="1" Margin="10,0,0,5" TextWrapping="WrapWithOverflow" />
+ <TextBlock Text="{Binding Progress}" Grid.Row="2" Margin="10,0,0,5" TextWrapping="WrapWithOverflow" />
+ <TextBlock Text="{Binding QueueStatus}" Grid.Row="3" Margin="10,0,0,0" TextWrapping="WrapWithOverflow" />
+
+ <Button Content="Close" cal:Message.Attach="[Event Click] = [Action Close]" Grid.Row="3" HorizontalAlignment="Right" Margin="0,5,5,0" Padding="8,2" />
+ </Grid>
+</Window>
diff --git a/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs b/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs index fc5a141b9..4071eeb3c 100644 --- a/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs +++ b/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs @@ -50,7 +50,7 @@ namespace HandBrakeWPF.Views if (minimiseToTray)
{
this.notifyIcon = new NotifyIcon();
- this.notifyIcon.ContextMenu = new ContextMenu(new[] { new MenuItem("Restore", NotifyIconClick) });
+ this.notifyIcon.ContextMenu = new ContextMenu(new[] { new MenuItem("Restore", NotifyIconClick), new MenuItem("Mini Status Display", ShowMiniStatusDisplay) });
StreamResourceInfo streamResourceInfo = Application.GetResourceStream(new Uri("pack://application:,,,/handbrakepineapple.ico"));
if (streamResourceInfo != null)
@@ -81,6 +81,27 @@ namespace HandBrakeWPF.Views }
/// <summary>
+ /// The show mini status display.
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
+ private void ShowMiniStatusDisplay(object sender, EventArgs e)
+ {
+ IMiniViewModel titleSpecificView = IoC.Get<IMiniViewModel>();
+ IWindowManager windowManager = IoC.Get<IWindowManager>();
+ Execute.OnUIThread(
+ () =>
+ {
+ titleSpecificView.Activate();
+ windowManager.ShowWindow(titleSpecificView);
+ });
+ }
+
+ /// <summary>
/// The notify icon_ click.
/// </summary>
/// <param name="sender">
|