diff options
| author | Scott <[email protected]> | 2015-10-24 20:54:18 +0100 |
|---|---|---|
| committer | Scott <[email protected]> | 2015-10-24 20:54:18 +0100 |
| commit | 0c541998fd82d300293ce9b7ab508d2f25627543 (patch) | |
| tree | a108e0a1f4ab0190c119b03e5974081772cf8f81 /win/CS/HandBrakeWPF/ViewModels | |
| parent | f08c123b7723df0a84b5b72cbb485c052cb7747a (diff) | |
Improve the In-line queue display.
Diffstat (limited to 'win/CS/HandBrakeWPF/ViewModels')
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | 6 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index 7a1f586a2..64b75e793 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -1228,16 +1228,14 @@ namespace HandBrakeWPF.ViewModels this.NotifyOfPropertyChange(() => this.IsQueueShowingInLine);
this.QueueViewModel.Activate(false);
- Window window = Application.Current.Windows.Cast<Window>().FirstOrDefault(x => x.Content.GetType() == typeof(QueueView));
-
+ Window window = Application.Current.Windows.Cast<Window>().FirstOrDefault(x => x.GetType() == typeof(QueueView));
if (window != null)
{
window.Activate();
}
else
{
- // TODO to control the size of this window, we will probably have to create a new window for hosting the queue.
- this.windowManager.ShowWindow(this.QueueViewModel);
+ this.windowManager.ShowWindow(IoC.Get<IQueueViewModel>());
}
}
}
diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs index 18bb49284..cd3405d78 100644 --- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs @@ -165,7 +165,7 @@ namespace HandBrakeWPF.ViewModels /// <summary>
/// Display the current job status information.
/// </summary>
- public bool DisplayJobStatusInfo { get; set; } = false;
+ public bool IsQueueEmbedded { get; set; } = false;
#endregion
@@ -393,8 +393,8 @@ namespace HandBrakeWPF.ViewModels /// <param name="isInline">Indicdates if this panel is displayed in-line with the main view.</param>
public void Activate(bool isInline)
{
- this.DisplayJobStatusInfo = !isInline;
- this.NotifyOfPropertyChange(() => this.DisplayJobStatusInfo);
+ this.IsQueueEmbedded = !isInline;
+ this.NotifyOfPropertyChange(() => this.IsQueueEmbedded);
}
#endregion
|