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

refs #648, change existing context menus

Browse Source
This commit is contained in:
Klaus Basan
2016-04-29 17:46:58 +02:00
parent acc1d4fd74
commit 2da14e3b62
17 changed files with 312 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/blackgui/menus/aircraftmodelmenus.cpp
View File

@@ -49,7 +49,7 @@ namespace BlackGui
IAircraftModelViewMenu(modelView, separator), m_messageFrame(messageFrame)
{ }
void CShowSimulatorFileMenu::customMenu(QMenu &menu) const
void CShowSimulatorFileMenu::customMenu(CMenuActions &menuActions)
{
CAircraftModelView *mv = modelView();
Q_ASSERT_X(mv, Q_FUNC_INFO, "no view");
@@ -59,23 +59,22 @@ namespace BlackGui
const CAircraftModel model(mv->selectedObject());
if (model.hasFileName() || (!model.getIconPath().isEmpty() && this->m_messageFrame))
{
this->addSeparator(menu);
menuActions.addMenuSimulator();
if (this->m_messageFrame)
{
const CAircraftModel model(mv->selectedObject());
if (!model.getIconPath().isEmpty())
{
this->addSeparator(menu);
menu.addAction(CIcons::appAircraft16(), "Display icon", this, &CShowSimulatorFileMenu::ps_displayIcon);
this->m_iconAction = menuActions.addAction(this->m_iconAction, CIcons::appAircraft16(), "Display icon", CMenuAction::pathSimulator(), { this, &CShowSimulatorFileMenu::ps_displayIcon });
}
}
menu.addAction(CIcons::text16(), "Open simulator file", this, &CShowSimulatorFileMenu::ps_showSimulatorFile);
this->m_fileAction = menuActions.addAction(this->m_fileAction, CIcons::text16(), "Open simulator file", CMenuAction::pathSimulator(), { this, &CShowSimulatorFileMenu::ps_showSimulatorFile });
}
}
this->nestedCustomMenu(menu);
this->nestedCustomMenu(menuActions);
}
void CShowSimulatorFileMenu::ps_showSimulatorFile() const
void CShowSimulatorFileMenu::ps_showSimulatorFile()
{
const CAircraftModelView *mv = modelView();
if (!mv->hasSingleSelectedRow()) { return; }
@@ -118,20 +117,21 @@ namespace BlackGui
}
}
void CMergeWithDbDataMenu::customMenu(QMenu &menu) const
void CMergeWithDbDataMenu::customMenu(CMenuActions &menuActions)
{
const CAircraftModelView *mv = modelView();
if (mv->isEmpty()) { this->nestedCustomMenu(menu); return; }
if (!sGui->hasWebDataServices()) { this->nestedCustomMenu(menu); return; }
if (mv->isEmpty()) { this->nestedCustomMenu(menuActions); return; }
if (!sGui->hasWebDataServices()) { this->nestedCustomMenu(menuActions); return; }
this->addSeparator(menu);
QMenu *mm = menu.addMenu(CIcons::databaseEdit16(), "Merge with DB data");
mm->addAction("All", this, &CMergeWithDbDataMenu::ps_mergeData);
menuActions.addMenuDatabase();
menuActions.addMenu(CIcons::databaseEdit16(), "Merge with DB data", CMenuAction::pathViewDatabaseMerge());
this->m_mergeAll = menuActions.addAction(this->m_mergeAll, "All", CMenuAction::pathViewDatabaseMerge(), { this, &CMergeWithDbDataMenu::ps_mergeData });
if (mv->hasSelection())
{
mm->addAction("Selected only", this, &CMergeWithDbDataMenu::ps_mergeSelectedData);
this->m_mergeSelected = menuActions.addAction(this->m_mergeSelected, "Selected only", CMenuAction::pathViewDatabaseMerge(), { this, &CMergeWithDbDataMenu::ps_mergeSelectedData });
}
this->nestedCustomMenu(menu);
this->nestedCustomMenu(menuActions);
}
void CMergeWithDbDataMenu::ps_mergeData()
@@ -164,14 +164,6 @@ namespace BlackGui
}
}
void CMergeWithDbDataMenu::addSeparator(QMenu &menu) const
{
// when the menu before us is a DB menu, we ignore the separator
if (!this->m_separator) { return; }
if (this->previousMenuItemContains("DB", menu)) { return; }
IAircraftModelViewMenu::addSeparator(menu);
}
IModelsSetable *CMergeWithDbDataMenu::modelsTargetSetable() const
{
return qobject_cast<IModelsSetable *>(this->m_modelsTarget);

18
src/blackgui/menus/aircraftmodelmenus.h
View File

@@ -52,14 +52,16 @@ namespace BlackGui
CShowSimulatorFileMenu(BlackGui::Views::CAircraftModelView *modelView, BlackGui::COverlayMessagesFrame *messageFrame, bool separator = true);
//! \copydoc IMenuDelegate::customMenu
virtual void customMenu(QMenu &menu) const override;
virtual void customMenu(CMenuActions &menuActions) override;
private slots:
void ps_showSimulatorFile() const; //!< simulator file
void ps_displayIcon(); //!< aircraft icon if any
void ps_showSimulatorFile(); //!< simulator file
void ps_displayIcon(); //!< aircraft icon if any
private:
BlackGui::COverlayMessagesFrame *m_messageFrame = nullptr;
QAction *m_fileAction = nullptr;
QAction *m_iconAction = nullptr;
};
//! Merge with DB data
@@ -75,20 +77,18 @@ namespace BlackGui
CMergeWithDbDataMenu(BlackGui::Views::CAircraftModelView *modelView, QObject *modelsTarget, bool separator = true);
//! \copydoc IMenuDelegate::customMenu
virtual void customMenu(QMenu &menu) const override;
virtual void customMenu(CMenuActions &menuActions) override;
private slots:
void ps_mergeData();
void ps_mergeSelectedData();
protected:
//! \copydoc IMenuDelegate::addSeparator
virtual void addSeparator(QMenu &menu) const override;
private:
BlackMisc::Simulation::IModelsSetable *modelsTargetSetable() const;
BlackMisc::Simulation::IModelsUpdatable *modelsTargetUpdatable() const;
QObject *m_modelsTarget = nullptr; //!< optional target for setting/updating the models
QObject *m_modelsTarget = nullptr; //!< optional target for setting/updating the models
QAction *m_mergeAll = nullptr;
QAction *m_mergeSelected = nullptr;
};
} // ns
} // ns