flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-09 21:45:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #883, added menus for core and assigned shortcuts to menu items

Browse Source
This commit is contained in:
Klaus Basan
2017-02-14 20:06:30 +01:00
committed by Mathew Sutcliffe
parent a57b83f9de
commit 455d9c7b7d
6 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/swiftcore/swiftcore.cpp
View File

@@ -54,6 +54,7 @@ CSwiftCore::CSwiftCore(QWidget *parent) :
initSlots();
initStyleSheet();
initDBusMode();
initMenus();
if (sGui->isParserOptionSet("start")) { startCore(sGui->getCmdDBusAddressValue()); }
}
@@ -144,6 +145,13 @@ void CSwiftCore::initLogDisplay()
ui->comp_InfoArea->getLogComponent()->showFilterDialog(); // add a filter dialog
}
void CSwiftCore::initMenus()
{
sGui->addMenuFile(*ui->menu_File);
sGui->addMenuWindow(*ui->menu_Window);
sGui->addMenuHelp(*ui->menu_Help);
}
void CSwiftCore::startCore(const QString &dBusAdress)
{
if (dBusAdress.isEmpty()) { return; }

3
src/swiftcore/swiftcore.h
View File

@@ -57,11 +57,12 @@ private slots:
private:
//! \name Init
//! @[
//! @{
void initSlots();
void initLogDisplay();
void initStyleSheet();
void initDBusMode();
void initMenus();
//! @}
void startCore(const QString &dBusAdress);

28
src/swiftcore/swiftcore.ui
View File

@@ -132,6 +132,34 @@ QTextEdit {
</item>
</layout>
</widget>
<widget class="QMenuBar" name="mb_SwiftCore">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>460</width>
<height>21</height>
</rect>
</property>
<widget class="QMenu" name="menu_File">
<property name="title">
<string>&amp;File</string>
</property>
</widget>
<widget class="QMenu" name="menu_Help">
<property name="title">
<string>&amp;Help</string>
</property>
</widget>
<widget class="QMenu" name="menu_Window">
<property name="title">
<string>&amp;Window</string>
</property>
</widget>
<addaction name="menu_File"/>
<addaction name="menu_Window"/>
<addaction name="menu_Help"/>
</widget>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>

6
src/swiftdata/swiftdata.ui
View File

@@ -77,13 +77,13 @@
</property>
<widget class="QMenu" name="menu_File">
<property name="title">
<string>File</string>
<string>&amp;File</string>
</property>
<addaction name="separator"/>
</widget>
<widget class="QMenu" name="menu_Window">
<property name="title">
<string>Window</string>
<string>&amp;Window</string>
</property>
<addaction name="menu_WindowFont"/>
</widget>
@@ -107,7 +107,7 @@
</widget>
<widget class="QMenu" name="menu_Help">
<property name="title">
<string>Help</string>
<string>&amp;Help</string>
</property>
</widget>
<addaction name="menu_File"/>

18
src/swiftguistandard/swiftguistd.ui
View File

@@ -258,12 +258,12 @@
</widget>
<widget class="QMenu" name="menu_Help">
<property name="title">
<string>Help</string>
<string>&amp;Help</string>
</property>
</widget>
<widget class="QMenu" name="menu_File">
<property name="title">
<string>File</string>
<string>&amp;File</string>
</property>
<addaction name="separator"/>
</widget>
@@ -274,7 +274,7 @@
</widget>
<widget class="QMenu" name="menu_Window">
<property name="title">
<string>Window</string>
<string>&amp;Window</string>
</property>
<addaction name="menu_WindowFont"/>
<addaction name="menu_WindowToggleNavigator"/>
@@ -502,6 +502,12 @@
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>BlackGui::Components::CInfoBarStatusComponent</class>
<extends>QWidget</extends>
<header>blackgui/components/infobarstatuscomponent.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::COverlayMessagesFrame</class>
<extends>QFrame</extends>
@@ -520,12 +526,6 @@
<header>blackgui/dockwidgetinfobar.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Components::CInfoBarStatusComponent</class>
<extends>QWidget</extends>
<header>blackgui/components/infobarstatuscomponent.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Components::CMainKeypadAreaComponent</class>
<extends>QFrame</extends>

6
src/swiftguistandard/swiftguistdmenus.cpp
View File

@@ -29,9 +29,6 @@ using namespace BlackMisc;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Aviation;
/*
* Menu clicked
*/
void SwiftGuiStd::ps_onMenuClicked()
{
QObject *sender = QObject::sender();
@@ -78,7 +75,8 @@ void SwiftGuiStd::initMenus()
// for hotkeys
const QString swift(CGuiActionBindHandler::pathSwiftPilotClient());
static const CActionBind swiftRoot(swift, CIcons::swift16());
static const CActionBind swiftRoot(swift, CIcons::swift16()); // inserts action for root folder
Q_UNUSED(swiftRoot);
m_menuHotkeyHandlers.append(CGuiActionBindHandler::bindMenu(ui->menu_InfoAreas, swift + "Info areas"));
m_menuHotkeyHandlers.append(CGuiActionBindHandler::bindMenu(ui->menu_File, swift + "File"));
m_menuHotkeyHandlers.append(CGuiActionBindHandler::bindMenu(ui->menu_Window, swift + "Window"));