summaryrefslogtreecommitdiffhomepage
path: root/opentrack/shortcuts.h
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2014-10-28 09:06:16 +0100
committerStanislaw Halik <sthalik@misaki.pl>2014-10-28 09:11:15 +0100
commitf2bb47e9261df4f060fcaec3c808ea6537a68eab (patch)
tree22564a695bf512daacfde1f885b5fde03a6e89a6 /opentrack/shortcuts.h
parent1abdbee5bfa16df9ca8f0e7a9462503e86d672dd (diff)
hook up tray to build
Issue: #64
Diffstat (limited to 'opentrack/shortcuts.h')
-rw-r--r--opentrack/shortcuts.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/opentrack/shortcuts.h b/opentrack/shortcuts.h
index 298907c7..523bc7b2 100644
--- a/opentrack/shortcuts.h
+++ b/opentrack/shortcuts.h
@@ -10,7 +10,8 @@
#include "qxt-mini/QxtGlobalShortcut"
#include "opentrack/plugin-support.h"
#include "opentrack/options.hpp"
-#include "ui_ftnoir_keyboardshortcuts.h"
+#include "opentrack/main-settings.hpp"
+#include "ui_keyboard.h"
using namespace options;
@@ -95,10 +96,12 @@ struct Shortcuts {
struct settings {
pbundle b;
key_opts center, toggle;
+ main_settings s_main;
settings() :
b(bundle("keyboard-shortcuts")),
center(b, "center"),
- toggle(b, "toggle")
+ toggle(b, "toggle"),
+ s_main(bundle("opentrack-ui"))
{}
} s;