Commit 6e65c1d6 authored by GitLab CI's avatar GitLab CI

Merge remote-tracking branch 'upstream/master' into master-build

* upstream/master:
  WinGui: Since the UI now has active storage space left monitoring, set the default to 2GB rather than 10GB. Users can up this if they desire.
  WinGui: Remove the experimental embedded queue. It's not been working right for a while and I don't intend to develop it out.
parents 40a9aa1f f99a5981
Pipeline #70966893 failed with stages
in 47 minutes and 16 seconds
......@@ -364,9 +364,6 @@
<Compile Include="Views\MiniView.xaml.cs">
<DependentUpon>MiniView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\Queue\Embedded.xaml.cs">
<DependentUpon>Embedded.xaml</DependentUpon>
</Compile>
<Compile Include="Views\ShellView.xaml.cs">
<DependentUpon>ShellView.xaml</DependentUpon>
</Compile>
......@@ -575,10 +572,6 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Views\Queue\Embedded.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Views\ShellView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
......
......@@ -2976,15 +2976,6 @@ namespace HandBrakeWPF.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Show Queue in line with the main UI. (Experimental Feature).
/// </summary>
public static string Options_ShowQueueInline {
get {
return ResourceManager.GetString("Options_ShowQueueInline", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Show &apos;Add All to Queue&apos; on the toolbar.
/// </summary>
......
......@@ -1300,9 +1300,6 @@ Would you like to overwrite it?</value>
<data name="Options_ShowExperimentalQueueDesign" xml:space="preserve">
<value>Show the new experimental queue design.</value>
</data>
<data name="Options_ShowQueueInline" xml:space="preserve">
<value>Show Queue in line with the main UI. (Experimental Feature)</value>
</data>
<data name="Options_TitleCase" xml:space="preserve">
<value>Change case to Title Case</value>
</data>
......
......@@ -53,7 +53,6 @@ namespace HandBrakeWPF
public const string SaveLogWithVideo = "SaveLogWithVideo";
public const string SaveLogCopyDirectory = "SaveLogCopyDirectory";
public const string ClearCompletedFromQueue = "ClearCompletedFromQueue";
public const string ShowQueueInline = "ShowQueueInline";
public const string ForcePresetReset = "ForcePresetReset";
public const string PresetExpandedStateList = "PresetExpandedStateList";
public const string ShowStatusInTitleBar = "ShowStatusInTitleBar";
......
......@@ -16,8 +16,6 @@ namespace HandBrakeWPF.ViewModels.Interfaces
/// </summary>
public interface IQueueViewModel
{
bool IsInline { set; }
/// <summary>
/// The when done action after a queue completes.
/// </summary>
......
......@@ -1265,41 +1265,22 @@ namespace HandBrakeWPF.ViewModels
/// </summary>
public void OpenQueueWindow()
{
bool showQueueInline = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowQueueInline) && VersionHelper.IsNightly();
this.QueueViewModel.IsInline = showQueueInline;
this.IsQueueShowingInLine = false;
this.NotifyOfPropertyChange(() => this.IsQueueShowingInLine);
if (showQueueInline)
Window window = Application.Current.Windows.Cast<Window>().FirstOrDefault(x => x.GetType() == typeof(QueueView));
if (window != null)
{
this.IsQueueShowingInLine = !this.IsQueueShowingInLine;
if (this.IsQueueShowingInLine)
{
this.QueueViewModel.Activate();
}
else
if (window.WindowState == WindowState.Minimized)
{
this.QueueViewModel.Deactivate();
window.WindowState = WindowState.Normal;
}
this.NotifyOfPropertyChange(() => this.IsQueueShowingInLine);
window.Activate();
}
else
{
this.IsQueueShowingInLine = false;
this.NotifyOfPropertyChange(() => this.IsQueueShowingInLine);
Window window = Application.Current.Windows.Cast<Window>().FirstOrDefault(x => x.GetType() == typeof(QueueView));
if (window != null)
{
if (window.WindowState == WindowState.Minimized)
{
window.WindowState = WindowState.Normal;
}
window.Activate();
}
else
{
this.windowManager.ShowWindow(IoC.Get<IQueueViewModel>());
}
this.windowManager.ShowWindow(IoC.Get<IQueueViewModel>());
}
}
......
......@@ -91,7 +91,6 @@ namespace HandBrakeWPF.ViewModels
private bool removePunctuation;
private bool resetWhenDoneAction;
private bool enableQuickSyncDecoding;
private bool showQueueInline;
private bool pauseOnLowDiskspace;
private long pauseOnLowDiskspaceLevel;
private bool useQsvDecodeForNonQsvEnc;
......@@ -387,26 +386,6 @@ namespace HandBrakeWPF.ViewModels
}
}
/// <summary>
/// Gets or sets a value indicating whether show queue inline.
/// </summary>
public bool ShowQueueInline
{
get
{
return this.showQueueInline;
}
set
{
if (value == this.showQueueInline)
{
return;
}
this.showQueueInline = value;
this.NotifyOfPropertyChange(() => this.ShowQueueInline);
}
}
/// <summary>
/// Gets or sets a value indicating whether to show encode status in the tile bar.
/// </summary>
......@@ -1470,7 +1449,6 @@ namespace HandBrakeWPF.ViewModels
this.CheckForUpdatesFrequency = 1;
}
this.ShowQueueInline = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowQueueInline);
this.ShowStatusInTitleBar = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowStatusInTitleBar);
this.ShowPreviewOnSummaryTab = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowPreviewOnSummaryTab);
this.ShowAddAllToQueue = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAddAllToQueue);
......@@ -1683,9 +1661,6 @@ namespace HandBrakeWPF.ViewModels
this.userSettingService.SetUserSetting(UserSettingConstants.ShowAddAllToQueue, this.ShowAddAllToQueue);
this.userSettingService.SetUserSetting(UserSettingConstants.ShowAddSelectionToQueue, this.ShowAddSelectionToQueue);
/* Experiments */
this.userSettingService.SetUserSetting(UserSettingConstants.ShowQueueInline, this.ShowQueueInline);
/* When Done */
this.userSettingService.SetUserSetting(UserSettingConstants.WhenCompleteAction, (int)this.WhenDone);
this.userSettingService.SetUserSetting(UserSettingConstants.ResetWhenDoneAction, this.ResetWhenDoneAction);
......
......@@ -248,8 +248,6 @@ namespace HandBrakeWPF.ViewModels
}
}
public bool IsInline { get; set; }
public bool StatsVisible
{
get
......
......@@ -121,7 +121,6 @@
<CheckBox Content="{x:Static Properties:Resources.Options_ClearCompleted}" IsChecked="{Binding ClearQueueOnEncodeCompleted}" />
<CheckBox Content="{x:Static Properties:Resources.OptionsView_ShowStatusInTitleBar}" IsChecked="{Binding ShowStatusInTitleBar}" />
<CheckBox Content="{x:Static Properties:Resources.OptionsView_ShowPreviewOnSummaryTab}" IsChecked="{Binding ShowPreviewOnSummaryTab}" />
<CheckBox Content="{x:Static Properties:Resources.Options_ShowQueueInline}" IsChecked="{Binding ShowQueueInline}" />
</StackPanel>
......
This diff is collapsed.
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="Embedded.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
// </copyright>
// <summary>
// Interaction logic for Embedded.xaml
// </summary>
// --------------------------------------------------------------------------------------------------------------------
namespace HandBrakeWPF.Views.Queue
{
using System.Windows.Controls;
/// <summary>
/// Interaction logic for VideoView
/// </summary>
public partial class Embedded : UserControl
{
/// <summary>
/// Initializes a new instance of the <see cref="Embedded"/> class.
/// </summary>
public Embedded()
{
this.InitializeComponent();
}
}
}
......@@ -384,14 +384,6 @@
<anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
</value>
</item>
<item>
<key>
<string>ShowQueueInline</string>
</key>
<value>
<anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
</value>
</item>
<item>
<key>
<string>PauseOnLowDiskspace</string>
......@@ -405,7 +397,7 @@
<string>LowDiskSpaceWarningLevelInBytes</string>
</key>
<value>
<anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:long" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">10000000000</anyType>
<anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:long" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">2000000000</anyType>
</value>
</item>
<item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment