Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding keymapping for access to Settings #684

Merged
merged 6 commits into from
May 14, 2019
Merged

Adding keymapping for access to Settings #684

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e1fb796
Adding vsconfig file for VS2019 help to prompt for missing components…
timheuer May 8, 2019
56ce0da
Merge remote-tracking branch 'upstream/master'
timheuer May 9, 2019
c5cadf7
Adding a keybinding for launching the settings. Suggested fix for #683
timheuer May 10, 2019
f00e8ce
merged with updstream and resolved conflict
timheuer May 10, 2019
8833deb
Merge remote-tracking branch 'upstream/master'
timheuer May 13, 2019
bd0c8e9
Modified to comma per PR feedback
timheuer May 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/cascadia/TerminalApp/App.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,7 @@ namespace winrt::TerminalApp::implementation
bindings.NextTab([this]() { _SelectNextTab(true); });
bindings.PrevTab([this]() { _SelectNextTab(false); });
bindings.SwitchToTab([this](const auto index) { _SelectTab({ index }); });
bindings.OpenSettings([this]() { _OpenSettings(); });
}

// Method Description:
Expand Down Expand Up @@ -658,6 +659,11 @@ namespace winrt::TerminalApp::implementation
return _tabView.SelectedIndex();
}

void App::_OpenSettings()
{
LaunchSettings();
}

// Method Description:
// - Close the currently focused tab. Focus will move to the left, if possible.
void App::_CloseFocusedTab()
Expand Down
2 changes: 2 additions & 0 deletions src/cascadia/TerminalApp/App.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ namespace winrt::TerminalApp::implementation
void _CreateNewTabFlyout();

void _LoadSettings();
void _OpenSettings();

void _HookupKeyBindings(TerminalApp::AppKeyBindings bindings) noexcept;

void _RegisterSettingsChange();
Expand Down
4 changes: 4 additions & 0 deletions src/cascadia/TerminalApp/AppKeyBindings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ namespace winrt::TerminalApp::implementation
case ShortcutAction::NewTab:
_NewTabHandlers();
return true;
case ShortcutAction::OpenSettings:
_OpenSettingsHandlers();
return true;

case ShortcutAction::NewTabProfile0:
_NewTabWithProfileHandlers(0);
Expand Down Expand Up @@ -143,6 +146,7 @@ namespace winrt::TerminalApp::implementation
DEFINE_EVENT(AppKeyBindings, DecreaseFontSize, _DecreaseFontSizeHandlers, TerminalApp::DecreaseFontSizeEventArgs);
DEFINE_EVENT(AppKeyBindings, ScrollUp, _ScrollUpHandlers, TerminalApp::ScrollUpEventArgs);
DEFINE_EVENT(AppKeyBindings, ScrollDown, _ScrollDownHandlers, TerminalApp::ScrollDownEventArgs);
DEFINE_EVENT(AppKeyBindings, OpenSettings, _OpenSettingsHandlers, TerminalApp::OpenSettingsEventArgs);


}
1 change: 1 addition & 0 deletions src/cascadia/TerminalApp/AppKeyBindings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ namespace winrt::TerminalApp::implementation
DECLARE_EVENT(DecreaseFontSize, _DecreaseFontSizeHandlers, TerminalApp::DecreaseFontSizeEventArgs);
DECLARE_EVENT(ScrollUp, _ScrollUpHandlers, TerminalApp::ScrollUpEventArgs);
DECLARE_EVENT(ScrollDown, _ScrollDownHandlers, TerminalApp::ScrollDownEventArgs);
DECLARE_EVENT(OpenSettings, _OpenSettingsHandlers, TerminalApp::OpenSettingsEventArgs);

private:
std::unordered_map<winrt::Microsoft::Terminal::Settings::KeyChord, TerminalApp::ShortcutAction, KeyChordHash, KeyChordEquality> _keyShortcuts;
Expand Down
5 changes: 4 additions & 1 deletion src/cascadia/TerminalApp/AppKeyBindings.idl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ namespace TerminalApp
IncreaseFontSize,
DecreaseFontSize,
ScrollUp,
ScrollDown
ScrollDown,
OpenSettings
};

delegate void CopyTextEventArgs();
Expand All @@ -53,6 +54,7 @@ namespace TerminalApp
delegate void DecreaseFontSizeEventArgs();
delegate void ScrollUpEventArgs();
delegate void ScrollDownEventArgs();
delegate void OpenSettingsEventArgs();

[default_interface]
runtimeclass AppKeyBindings : Microsoft.Terminal.Settings.IKeyBindings
Expand All @@ -75,5 +77,6 @@ namespace TerminalApp
event DecreaseFontSizeEventArgs DecreaseFontSize;
event ScrollUpEventArgs ScrollUp;
event ScrollDownEventArgs ScrollDown;
event OpenSettingsEventArgs OpenSettings;
}
}
3 changes: 3 additions & 0 deletions src/cascadia/TerminalApp/CascadiaSettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,9 @@ void CascadiaSettings::_CreateDefaultKeybindings()
keyBindings.SetKeyBinding(ShortcutAction::CloseTab,
KeyChord{ KeyModifiers::Ctrl,
static_cast<int>('W') });
keyBindings.SetKeyBinding(ShortcutAction::OpenSettings,
KeyChord{ KeyModifiers::Ctrl,
static_cast<int>('S') });

keyBindings.SetKeyBinding(ShortcutAction::NextTab,
KeyChord{ KeyModifiers::Ctrl,
Expand Down