summaryrefslogtreecommitdiffhomepage
path: root/gui/options-dialog.cpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-05-15 12:30:35 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-05-15 12:30:35 +0200
commit7ed453de4a77266e7e29f2f944b285b4fe3b248b (patch)
treec03ef2cee93ee78c259542ad2fdc8594ae0c7264 /gui/options-dialog.cpp
parent2ab0343a75e165684dba64aea4b54a5abbe8086c (diff)
api,gui: disable all keyboard shortcuts while binding a key
Previous disallowed binding an already-bound key on Unix since Qxt doesn't pass through bound keys unlike the Windows implementation. Refactor some common code. The Windows implementation isn't even compile-tested.
Diffstat (limited to 'gui/options-dialog.cpp')
-rwxr-xr-xgui/options-dialog.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/gui/options-dialog.cpp b/gui/options-dialog.cpp
index c99bc730..e7a54bb2 100755
--- a/gui/options-dialog.cpp
+++ b/gui/options-dialog.cpp
@@ -30,10 +30,8 @@ static QString kopts_to_string(const key_opts& kopts)
}
OptionsDialog::OptionsDialog(main_settings& main,
- std::function<void()> register_global_keys,
std::function<void(bool)> pause_keybindings) :
main(main),
- register_global_keys(register_global_keys),
pause_keybindings(pause_keybindings)
{
ui.setupUi(this);
@@ -131,7 +129,6 @@ void OptionsDialog::bind_key(key_opts& kopts, QLabel* label)
d.show();
d.exec();
pause_keybindings(false);
- register_global_keys();
label->setText(kopts_to_string(kopts));
delete l;
}