mir/PowerToys
2
0
Fork 0
mirror of https://github.com/microsoft/PowerToys synced 2025-09-09 02:45:17 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

[Run] ViewModels Cleanup (#12209)

Browse Source 
* view models cleanup

* removed unused commands
This commit is contained in:
Davide Giacometti
2021-07-15 16:34:27 +02:00
committed by GitHub
parent cdfb566137
commit 55923f2790
7 changed files with 57 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs
View File

@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation
// Copyright (c) Microsoft Corporation
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
@@ -11,7 +11,6 @@ using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Threading;
using interop;
using Microsoft.PowerLauncher.Telemetry;
@@ -51,7 +50,7 @@ namespace PowerLauncher.ViewModel
private bool _saved;
private ushort _hotkeyHandle;
internal HotkeyManager HotkeyManager { get; set; }
internal HotkeyManager HotkeyManager { get; private set; }
public MainViewModel(PowerToysRunSettings settings)
{
@@ -257,8 +256,6 @@ namespace PowerLauncher.ViewModel
SelectedResults.SelectPrevPage();
});
SelectFirstResultCommand = new RelayCommand(_ => SelectedResults.SelectFirstResult());
OpenResultWithKeyboardCommand = new RelayCommand(index =>
{
OpenResultsEvent(index, false);
@@ -269,31 +266,6 @@ namespace PowerLauncher.ViewModel
OpenResultsEvent(index, true);
});
LoadContextMenuCommand = new RelayCommand(_ =>
{
if (SelectedIsFromQueryResults())
{
SelectedResults = ContextMenu;
}
else
{
SelectedResults = Results;
}
});
LoadHistoryCommand = new RelayCommand(_ =>
{
if (SelectedIsFromQueryResults())
{
SelectedResults = History;
History.SelectedIndex = _history.Items.Count - 1;
}
else
{
SelectedResults = Results;
}
});
ClearQueryCommand = new RelayCommand(_ =>
{
if (!string.IsNullOrEmpty(QueryText))
@@ -306,10 +278,6 @@ namespace PowerLauncher.ViewModel
});
}
public Brush MainWindowBackground { get; set; }
public Brush MainWindowBorderBrush { get; set; }
private ResultsViewModel _results;
public ResultsViewModel Results
@@ -402,27 +370,12 @@ namespace PowerLauncher.ViewModel
{
Results.Visibility = Visibility.Hidden;
_queryTextBeforeLeaveResults = QueryText;
// Because of Fody's optimization
// setter won't be called when property value is not changed.
// so we need manually call Query()
// http://stackoverflow.com/posts/25895769/revisions
if (string.IsNullOrEmpty(QueryText))
{
Query();
}
else
{
QueryText = string.Empty;
}
}
_selectedResults.Visibility = Visibility.Visible;
}
}
public Visibility ProgressBarVisibility { get; set; }
private Visibility _visibility;
public Visibility MainWindowVisibility
@@ -451,37 +404,31 @@ namespace PowerLauncher.ViewModel
}
}
public ICommand IgnoreCommand { get; set; }
public ICommand IgnoreCommand { get; private set; }
public ICommand EscCommand { get; set; }
public ICommand EscCommand { get; private set; }
public ICommand SelectNextItemCommand { get; set; }
public ICommand SelectNextItemCommand { get; private set; }
public ICommand SelectPrevItemCommand { get; set; }
public ICommand SelectPrevItemCommand { get; private set; }
public ICommand SelectNextContextMenuItemCommand { get; set; }
public ICommand SelectNextContextMenuItemCommand { get; private set; }
public ICommand SelectPreviousContextMenuItemCommand { get; set; }
public ICommand SelectPreviousContextMenuItemCommand { get; private set; }
public ICommand SelectNextTabItemCommand { get; set; }
public ICommand SelectNextTabItemCommand { get; private set; }
public ICommand SelectPrevTabItemCommand { get; set; }
public ICommand SelectPrevTabItemCommand { get; private set; }
public ICommand SelectNextPageCommand { get; set; }
public ICommand SelectNextPageCommand { get; private set; }
public ICommand SelectPrevPageCommand { get; set; }
public ICommand SelectPrevPageCommand { get; private set; }
public ICommand SelectFirstResultCommand { get; set; }
public ICommand OpenResultWithKeyboardCommand { get; private set; }
public ICommand LoadContextMenuCommand { get; set; }
public ICommand OpenResultWithMouseCommand { get; private set; }
public ICommand LoadHistoryCommand { get; set; }
public ICommand OpenResultWithKeyboardCommand { get; set; }
public ICommand OpenResultWithMouseCommand { get; set; }
public ICommand ClearQueryCommand { get; set; }
public ICommand ClearQueryCommand { get; private set; }
public void Query()
{