* Added new command wrapper, abstracts static and dynamic commands - All uses of the `Command` are replaced with either `AppCommand`, for a command that is static to the scope of the application, or a reference to an ICommand (specifically, an `EnumCommand<AppCommand>()` instance), which provides the abstract wrapper. - Functionality seems intact. - Next step is to have the MainViewModel add the per-shell commands via SettingsService.CreateShellKeyboardShortcuts(), and have the SettingsService.ParseCommandString() function parse the command strings passed around properly. - Finally, add the keyboard chord input to each shell's settings page. * First kick at adding a new terminal keyboard command. - It isn't presented anywhere, but references to keybindings should be using the ICommand key as their identifier for recognizing anything, and when xterm passes back a keyboard command event, the SettingsService is asked to convert the string into an ICommand. * Renaming ICommand to Command. It's not longer an interface, so this makes more sense. * Renaming back to Command, and new class is AbstractCommand. Going to simplify the PR diff considerably. * Shortcuts for default shells work. Need to get the shell profile edit UI elements working. * Added keyboard shortcut UI elements to shell profile pages. * New and deleted shell profiles propagate to all terminal views. * A bit of cleanup. * Camel-casing command text to fix Ctrl+C and copy behaviour. * Fixed failing test. The new on disk store uses a .ToString(), not the Enum description, since the command isn't an Enum, it's a class now in general, and those semantics make more sense. * Adding default value for null keybindings in shell profiles. * Merge branch 'shell_commands' of https://github.com/Riebart/FluentTerminal into pr/85 Improved default value for keybinding property * Renamed KeyBinding collection to KeyBindings * Use strings as Command parameter of KeyBinding * Added missing Commands to keyBindings of default shellProfiles * fix build and unit tests after merge with master * improve UI * Split OnShellProfileCollectionChanged event
90 lines
2.9 KiB
C#
90 lines
2.9 KiB
C#
using FluentTerminal.App.Services;
|
|
using FluentTerminal.Models;
|
|
using GalaSoft.MvvmLight;
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Collections.ObjectModel;
|
|
using System.Threading.Tasks;
|
|
|
|
namespace FluentTerminal.App.ViewModels.Settings
|
|
{
|
|
public class KeyBindingsViewModel : ViewModelBase
|
|
{
|
|
private readonly IDialogService _dialogService;
|
|
private readonly ICollection<KeyBinding> _keyBindings;
|
|
private bool _editable;
|
|
|
|
public KeyBindingsViewModel(string command, ICollection<KeyBinding> keyBindings, IDialogService dialogService, string commandName, bool editable)
|
|
{
|
|
Command = command;
|
|
_keyBindings = keyBindings;
|
|
_dialogService = dialogService;
|
|
|
|
CommandName = commandName;
|
|
_editable = editable;
|
|
|
|
foreach (var binding in keyBindings)
|
|
{
|
|
var viewModel = new KeyBindingViewModel(binding, _dialogService, this);
|
|
viewModel.Deleted += ViewModel_Deleted;
|
|
viewModel.Edited += ViewModel_Edited;
|
|
KeyBindings.Add(viewModel);
|
|
}
|
|
}
|
|
|
|
public delegate void EditedEvent(string command, ICollection<KeyBinding> keyBindings);
|
|
|
|
public event EditedEvent Edited;
|
|
|
|
public string Command { get; }
|
|
|
|
public string CommandName { get; }
|
|
|
|
/// <summary>
|
|
/// Whether or not the "Edit" and "Delete" links appear next to the key binding list.
|
|
/// </summary>
|
|
public bool Editable
|
|
{
|
|
get => _editable;
|
|
set => Set(ref _editable, value);
|
|
}
|
|
|
|
public ObservableCollection<KeyBindingViewModel> KeyBindings { get; } = new ObservableCollection<KeyBindingViewModel>();
|
|
|
|
public async Task ShowAddKeyBindingDialog()
|
|
{
|
|
var newKeyBinding = new KeyBindingViewModel(new KeyBinding { Command = Command }, _dialogService, this);
|
|
|
|
if (await newKeyBinding.Edit().ConfigureAwait(true))
|
|
{
|
|
Add(newKeyBinding.Model);
|
|
}
|
|
}
|
|
|
|
public void Add(KeyBinding keyBinding)
|
|
{
|
|
var viewModel = new KeyBindingViewModel(keyBinding, _dialogService, this);
|
|
|
|
viewModel.Deleted += ViewModel_Deleted;
|
|
viewModel.Edited += ViewModel_Edited;
|
|
KeyBindings.Add(viewModel);
|
|
_keyBindings.Add(viewModel.Model);
|
|
Edited?.Invoke(Command, _keyBindings);
|
|
}
|
|
|
|
private void ViewModel_Deleted(object sender, EventArgs e)
|
|
{
|
|
if (sender is KeyBindingViewModel keyBinding)
|
|
{
|
|
_keyBindings.Remove(keyBinding.Model);
|
|
KeyBindings.Remove(keyBinding);
|
|
Edited?.Invoke(Command, _keyBindings);
|
|
}
|
|
}
|
|
|
|
private void ViewModel_Edited(object sender, EventArgs e)
|
|
{
|
|
Edited?.Invoke(Command, _keyBindings);
|
|
}
|
|
}
|
|
} |