summaryrefslogtreecommitdiffhomepage
path: root/gui/options-dialog.hpp
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.hpp
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.hpp')
-rw-r--r--gui/options-dialog.hpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/gui/options-dialog.hpp b/gui/options-dialog.hpp
index 7700162b..a879a208 100644
--- a/gui/options-dialog.hpp
+++ b/gui/options-dialog.hpp
@@ -12,10 +12,9 @@ class OptionsDialog: public QWidget
signals:
void reload();
public:
- OptionsDialog(main_settings& main, std::function<void()> register_global_keys, std::function<void(bool)> pause_keybindings);
+ OptionsDialog(main_settings& main, std::function<void(bool)> pause_keybindings);
private:
main_settings& main;
- std::function<void()> register_global_keys;
std::function<void(bool)> pause_keybindings;
Ui::UI_Settings ui;
void closeEvent(QCloseEvent *) override { doCancel(); }