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

Ref T451, fixed temp. disabled model

Browse Source 
* display info message
* aircraft model list implementing ICallsignObjectList (for message)
* fixed wrong flag in requestTempDisable
This commit is contained in:
Klaus Basan
2019-01-17 00:06:03 +01:00
committed by Mat Sutcliffe
parent 25df1921eb
commit a90d4465a2
8 changed files with 114 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackgui/components/mappingcomponent.cpp
View File

@@ -423,6 +423,8 @@ namespace BlackGui
if (sGui && sGui->getIContextSimulator())
{
sGui->getIContextSimulator()->disableModelsForMatching(models, true);
const CStatusMessage m = CLogMessage(this).info(u"Disabled %1 model(s): %2") << models.size() << models.getCallsignsAsString(", ", true);
this->showOverlayHTMLMessage(m, OverlayMessageMs);
}
}

2
src/blackgui/components/mappingcomponent.h
View File

@@ -181,7 +181,7 @@ namespace BlackGui
QTimer m_updateTimer;
bool m_missedRenderedAircraftUpdate = true; //! Rendered aircraft need update
BlackMisc::CTokenBucket m_bucket { 3, BlackMisc::PhysicalQuantities::CTime(5.0, BlackMisc::PhysicalQuantities::CTimeUnit::s()), 1};
BlackMisc::CSettingReadOnly<BlackGui::Settings::TViewUpdateSettings> m_settings { this, &CMappingComponent::settingsChanged }; //!< settings changed
BlackMisc::CSettingReadOnly<Settings::TViewUpdateSettings> m_settings { this, &CMappingComponent::settingsChanged }; //!< settings changed
Views::CCheckBoxDelegate *m_currentMappingsViewDelegate = nullptr; //! checkbox in view
};
} // namespace

7
src/blackgui/views/aircraftmodelview.cpp
View File

@@ -35,6 +35,7 @@
#include <QString>
#include <QWidget>
#include <QtGlobal>
#include <QStringBuilder>
using namespace BlackMisc;
using namespace BlackMisc::Simulation;
@@ -387,14 +388,14 @@ namespace BlackGui
void CAircraftModelView::toggleHighlightStashedModels()
{
bool h = derivedModel()->highlightModelStrings();
const bool h = derivedModel()->highlightModelStrings();
derivedModel()->setHighlightModelStrings(!h);
emit toggledHighlightStashedModels();
}
void CAircraftModelView::toggleHighlightInvalidModels()
{
bool h = this->highlightModelStrings();
const bool h = this->highlightModelStrings();
this->setHighlightModelStrings(!h);
}
@@ -418,7 +419,7 @@ namespace BlackGui
void CAircraftModelView::requestTempDisable()
{
if (!m_menus.testFlag(MenuCanStashModels)) { return; }
if (!m_menus.testFlag(MenuDisableModelsTemp)) { return; }
if (!this->hasSelection()) { return; }
const CAircraftModelList models(this->selectedObjects());
emit this->requestTempDisableModelsForMatching(models);

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

@@ -162,7 +162,7 @@ namespace BlackGui
void CSimulatedAircraftView::requestTempDisable()
{
if (!m_menus.testFlag(MenuCanStashModels)) { return; }
if (!m_menus.testFlag(MenuDisableModelsTemp)) { return; }
if (!this->hasSelection()) { return; }
const CAircraftModelList models(this->selectedObjects().getModels());
emit this->requestTempDisableModelsForMatching(models);