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

Split "Display and rendered" aircraft,

Browse Source 
just to avoid accidentally disabling aircraft when using "follow"
This commit is contained in:
Klaus Basan
2020-03-26 19:03:33 +01:00
committed by Mat Sutcliffe
parent dab907df8c
commit cfb2fa9d22
3 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackgui/menus/menuaction.cpp
View File

@@ -102,7 +102,13 @@ namespace BlackGui
const CMenuAction &CMenuAction::subMenuDisplayModels() const CMenuAction &CMenuAction::subMenuDisplayModels()
{ {
static const CMenuAction subdir(CIcons::appAircraft16(), "Display and render models", CMenuAction::pathClientSimulationDisplay()); static const CMenuAction subdir(CIcons::appAircraft16(), "Render models", CMenuAction::pathClientSimulationRender());
return subdir;
}
const CMenuAction &CMenuAction::subMenuRenderModels()
{
static const CMenuAction subdir(CIcons::appAircraft16(), "Display models", CMenuAction::pathClientSimulationDisplay());
return subdir; return subdir;
} }
@@ -494,6 +500,12 @@ namespace BlackGui
return this->addAction(CMenuAction::subMenuDisplayModels()); return this->addAction(CMenuAction::subMenuDisplayModels());
} }
CMenuAction CMenuActions::addMenuRenderModels()
{
if (this->containsMenu(CMenuAction::subMenuRenderModels().getPath())) { return CMenuAction(); }
return this->addAction(CMenuAction::subMenuRenderModels());
}
CMenuAction CMenuActions::addMenuDataTransfer() CMenuAction CMenuActions::addMenuDataTransfer()
{ {
if (this->containsMenu(CMenuAction::subMenuDataTransfer().getPath())) { return CMenuAction(); } if (this->containsMenu(CMenuAction::subMenuDataTransfer().getPath())) { return CMenuAction(); }

7
src/blackgui/menus/menuaction.h
View File

@@ -165,6 +165,9 @@ namespace BlackGui
//! Client simulation/display related //! Client simulation/display related
static const QString &pathClientSimulationDisplay() { static const QString p("ClientSimulation.Display/Display"); return p; } static const QString &pathClientSimulationDisplay() { static const QString p("ClientSimulation.Display/Display"); return p; }
//! Client simulation/display related
static const QString &pathClientSimulationRender() { static const QString p("ClientSimulation.Display/Render"); return p; }
//! Client simulation/display related //! Client simulation/display related
static const QString &pathClientSimulationTransfer() { static const QString p("ClientSimulation.Transfer/Transfer"); return p; } static const QString &pathClientSimulationTransfer() { static const QString p("ClientSimulation.Transfer/Transfer"); return p; }
@@ -222,6 +225,7 @@ namespace BlackGui
static const CMenuAction &subMenuConsolidateModels(); static const CMenuAction &subMenuConsolidateModels();
static const CMenuAction &subMenuCom(); static const CMenuAction &subMenuCom();
static const CMenuAction &subMenuDisplayModels(); static const CMenuAction &subMenuDisplayModels();
static const CMenuAction &subMenuRenderModels();
static const CMenuAction &subMenuDataTransfer(); static const CMenuAction &subMenuDataTransfer();
//! @} //! @}
@@ -372,6 +376,9 @@ namespace BlackGui
//! Add display model menu //! Add display model menu
CMenuAction addMenuDisplayModels(); CMenuAction addMenuDisplayModels();
//! Add render model menu
CMenuAction addMenuRenderModels();
//! Add data transfer menu //! Add data transfer menu
CMenuAction addMenuDataTransfer(); CMenuAction addMenuDataTransfer();

19
src/blackgui/views/simulatedaircraftview.cpp
View File

@@ -67,28 +67,29 @@ namespace BlackGui
// sub menus, only adding the path, the content will be added below // sub menus, only adding the path, the content will be added below
// => configureMenu // => configureMenu
menuActions.addMenuDisplayModels(); menuActions.addMenuDisplayModels();
menuActions.addMenuRenderModels();
menuActions.addMenuDataTransfer(); menuActions.addMenuDataTransfer();
if (m_menus.testFlag(MenuDisableModelsTemp) && this->hasSelection()) if (m_menus.testFlag(MenuDisableModelsTemp) && this->hasSelection())
{ {
menuActions.addAction(CIcons::delete16(), "Temp.disable model from set", CMenuAction::pathClientSimulationDisplay(), { this, &CSimulatedAircraftView::requestTempDisable }); menuActions.addAction(CIcons::delete16(), "Temp.disable model from set", CMenuAction::pathClientSimulationRender(), { this, &CSimulatedAircraftView::requestTempDisable });
} }
if (m_withRecalculate) if (m_withRecalculate)
{ {
menuActions.addAction(CIcons::appInterpolation16(), "Re-calculate all aircraft", CMenuAction::pathClientSimulationDisplay(), { this, &CSimulatedAircraftView::recalculateAllAircraft }); menuActions.addAction(CIcons::appInterpolation16(), "Re-calculate all aircraft", CMenuAction::pathClientSimulationRender(), { this, &CSimulatedAircraftView::recalculateAllAircraft });
menuActions.addAction(CIcons::appInterpolation16(), "Re-matching all aircraft", CMenuAction::pathClientSimulationDisplay(), { this, &CSimulatedAircraftView::doMatchingsAgain }); menuActions.addAction(CIcons::appInterpolation16(), "Re-matching all aircraft", CMenuAction::pathClientSimulationRender(), { this, &CSimulatedAircraftView::doMatchingsAgain });
if (this->hasSelection()) if (this->hasSelection())
{ {
menuActions.addAction(CIcons::appInterpolation16(), "Re-matching selected", CMenuAction::pathClientSimulationDisplay(), { this, &CSimulatedAircraftView::doMatchingsAgainForSelected }); menuActions.addAction(CIcons::appInterpolation16(), "Re-matching selected", CMenuAction::pathClientSimulationRender(), { this, &CSimulatedAircraftView::doMatchingsAgainForSelected });
} }
} }
if (m_withMenuEnableAircraft && !this->isEmpty()) if (m_withMenuEnableAircraft && !this->isEmpty())
{ {
menuActions.addAction(CIcons::appAircraft16(), "Enable all aircraft", CMenuAction::pathClientSimulationDisplay(), { this, &CSimulatedAircraftView::enableAllDisabledAircraft }); menuActions.addAction(CIcons::appAircraft16(), "Enable all aircraft", CMenuAction::pathClientSimulationRender(), { this, &CSimulatedAircraftView::enableAllDisabledAircraft });
menuActions.addAction(CIcons::appAircraft16(), "Re-enable unrendered aircraft", CMenuAction::pathClientSimulationDisplay(), { this, &CSimulatedAircraftView::reEnableAllUnrenderedAircraft }); menuActions.addAction(CIcons::appAircraft16(), "Re-enable unrendered aircraft", CMenuAction::pathClientSimulationRender(), { this, &CSimulatedAircraftView::reEnableAllUnrenderedAircraft });
menuActions.addAction(CIcons::appAircraft16(), "Disable all aircraft", CMenuAction::pathClientSimulationDisplay(), { this, &CSimulatedAircraftView::disableAllEnabledAircraft }); menuActions.addAction(CIcons::appAircraft16(), "Disable all aircraft", CMenuAction::pathClientSimulationRender(), { this, &CSimulatedAircraftView::disableAllEnabledAircraft });
} }
if (this->hasSelection()) if (this->hasSelection())
@@ -107,11 +108,11 @@ namespace BlackGui
} }
if (m_withMenuEnableAircraft) if (m_withMenuEnableAircraft)
{ {
menuActions.addAction(CIcons::appAircraft16(), aircraft.isEnabled() ? "Disable aircraft" : "Enabled aircraft", CMenuAction::pathClientSimulationDisplay(), { this, &CSimulatedAircraftView::toggleEnabledAircraft }); menuActions.addAction(CIcons::appAircraft16(), aircraft.isEnabled() ? "Disable aircraft" : "Enabled aircraft", CMenuAction::pathClientSimulationRender(), { this, &CSimulatedAircraftView::toggleEnabledAircraft });
} }
if (m_withMenuHighlightAndFollow) if (m_withMenuHighlightAndFollow)
{ {
menuActions.addAction(CIcons::appAircraft16(), "Follow in simulator", CMenuAction::pathClientSimulationDisplay(), { this, &CSimulatedAircraftView::requestFollowInSimulator }); menuActions.addAction(CIcons::appAircraft16(), "Follow in simulator", CMenuAction::pathClientSimulationDisplay(), { this, &CSimulatedAircraftView::requestFollowInSimulator });
menuActions.addAction(CIcons::appSimulator16(), "Highlight in simulator", CMenuAction::pathClientSimulationDisplay(), { this, &CSimulatedAircraftView::requestHighlightInSimulator }); menuActions.addAction(CIcons::appSimulator16(), "Highlight in simulator", CMenuAction::pathClientSimulationDisplay(), { this, &CSimulatedAircraftView::requestHighlightInSimulator });
} }
if (m_withMenuEnableGndFlag) if (m_withMenuEnableGndFlag)