From f962b24212b19080dcb12ff21d1c0ffe04c9d340 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 5 Oct 2018 01:58:57 +0200 Subject: [PATCH] Fixed mixed action names --- src/blackgui/views/atcstationview.cpp | 14 +++++++------- src/blackgui/views/atcstationview.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/blackgui/views/atcstationview.cpp b/src/blackgui/views/atcstationview.cpp index 12ff390c4..4c8e2179a 100644 --- a/src/blackgui/views/atcstationview.cpp +++ b/src/blackgui/views/atcstationview.cpp @@ -57,18 +57,18 @@ namespace BlackGui menuActions.addMenuCom(); if (CBuildConfig::isDebugBuild()) { - if (m_debugActions.isEmpty()) { m_actions = QList({nullptr, nullptr}); } - m_actions[0] = menuActions.addAction(m_actions[0], CIcons::tableSheet16(), "Test: 1k ATC online stations", CMenuAction::pathClientCom(), { this, &CAtcStationView::emitTestRequest1kAtcOnlineDummies }); - m_actions[1] = menuActions.addAction(m_actions[1], CIcons::tableSheet16(), "Test: 3k ATC online stations", CMenuAction::pathClientCom(), { this, &CAtcStationView::emitTestRequest3kAtcOnlineDummies }); + if (m_debugActions.isEmpty()) { m_debugActions = QList({nullptr, nullptr}); } + m_debugActions[0] = menuActions.addAction(m_debugActions[0], CIcons::tableSheet16(), "Test: 1k ATC online stations", CMenuAction::pathClientCom(), { this, &CAtcStationView::emitTestRequest1kAtcOnlineDummies }); + m_debugActions[1] = menuActions.addAction(m_debugActions[1], CIcons::tableSheet16(), "Test: 3k ATC online stations", CMenuAction::pathClientCom(), { this, &CAtcStationView::emitTestRequest3kAtcOnlineDummies }); } if (this->hasSelection()) { - if (m_debugActions.isEmpty()) { m_debugActions = QList({nullptr, nullptr, nullptr}); } + if (m_actions.isEmpty()) { m_actions = QList({nullptr, nullptr, nullptr}); } - m_debugActions[0] = menuActions.addAction(m_debugActions[0], CIcons::appCockpit16(), "Tune in COM1", CMenuAction::pathClientCom(), { this, &CAtcStationView::tuneInAtcCom1 }); - m_debugActions[1] = menuActions.addAction(m_debugActions[1], CIcons::appCockpit16(), "Tune in COM2", CMenuAction::pathClientCom(), { this, &CAtcStationView::tuneInAtcCom2 }); - m_debugActions[2] = menuActions.addAction(m_debugActions[2], CIcons::appTextMessages16(), "Show text messages", CMenuAction::pathClientCom(), { this, &CAtcStationView::requestTextMessage }); + m_actions[0] = menuActions.addAction(m_actions[0], CIcons::appCockpit16(), "Tune in COM1", CMenuAction::pathClientCom(), { this, &CAtcStationView::tuneInAtcCom1 }); + m_actions[1] = menuActions.addAction(m_actions[1], CIcons::appCockpit16(), "Tune in COM2", CMenuAction::pathClientCom(), { this, &CAtcStationView::tuneInAtcCom2 }); + m_actions[2] = menuActions.addAction(m_actions[2], CIcons::appTextMessages16(), "Show text messages", CMenuAction::pathClientCom(), { this, &CAtcStationView::requestTextMessage }); } CViewBase::customMenu(menuActions); } diff --git a/src/blackgui/views/atcstationview.h b/src/blackgui/views/atcstationview.h index 1f167fe35..f69ec79da 100644 --- a/src/blackgui/views/atcstationview.h +++ b/src/blackgui/views/atcstationview.h @@ -68,8 +68,8 @@ namespace BlackGui void tuneInAtcCom2(); void requestTextMessage(); - QList m_actions; - QList m_debugActions; + QList m_actions; //!< real actions + QList m_debugActions; //!< used for debug context menu }; } } // ns