From 18892700113b28a0a936192590fd69c0d286a883 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 3 Feb 2017 03:01:19 +0100 Subject: [PATCH] refs #617, init hotkey lists with pilot client menus --- src/swiftguistandard/swiftguistd.h | 4 +++- src/swiftguistandard/swiftguistdmenus.cpp | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/swiftguistandard/swiftguistd.h b/src/swiftguistandard/swiftguistd.h index d51f74347..95ec4f045 100644 --- a/src/swiftguistandard/swiftguistd.h +++ b/src/swiftguistandard/swiftguistd.h @@ -23,6 +23,7 @@ #include "blackgui/enableforframelesswindow.h" #include "blackgui/mainwindowaccess.h" #include "blackgui/managedstatusbar.h" +#include "blackgui/guiactionbind.h" #include "blackmisc/audio/notificationsounds.h" #include "blackmisc/identifiable.h" #include "blackmisc/loghandler.h" @@ -104,9 +105,10 @@ protected: private: QScopedPointer ui; QScopedPointer m_navigator{new BlackGui::Components::CNavigatorDialog()}; // if I pass the parent, the dialog is always centered over the parent - bool m_init = false; + BlackCore::CActionBindings m_menuHotkeyHandlers; BlackGui::CManagedStatusBar m_statusBar; BlackMisc::CLogSubscriber m_logSubscriber { this, &SwiftGuiStd::ps_displayStatusMessageInGui }; + bool m_init = false; // contexts bool m_coreAvailable = false; diff --git a/src/swiftguistandard/swiftguistdmenus.cpp b/src/swiftguistandard/swiftguistdmenus.cpp index f354c5f62..f79296a4f 100644 --- a/src/swiftguistandard/swiftguistdmenus.cpp +++ b/src/swiftguistandard/swiftguistdmenus.cpp @@ -9,6 +9,7 @@ #include "blackgui/components/maininfoareacomponent.h" #include "blackgui/components/settingscomponent.h" +#include "blackgui/guiactionbind.h" #include "blackgui/guiapplication.h" #include "blackmisc/aviation/altitude.h" #include "blackmisc/pq/units.h" @@ -74,4 +75,9 @@ void SwiftGuiStd::initMenus() sGui->addMenuWindow(*ui->menu_Window); sGui->addMenuHelp(*ui->menu_Help); ui->menu_InfoAreas->addActions(ui->comp_MainInfoArea->getInfoAreaSelectActions(ui->menu_InfoAreas)); + + // for hotkeys + m_menuHotkeyHandlers.append(CGuiActionBindHandler::bindMenu(ui->menu_InfoAreas, "Info areas")); + m_menuHotkeyHandlers.append(CGuiActionBindHandler::bindMenu(ui->menu_File, "File")); + m_menuHotkeyHandlers.append(CGuiActionBindHandler::bindMenu(ui->menu_Window, "Window")); }