Ref T515, highlight by models and changed naming

This commit is contained in:
Klaus Basan
2019-01-23 15:41:42 +01:00
committed by Mat Sutcliffe
parent 6acde8799f
commit 019cc6259e
6 changed files with 52 additions and 36 deletions

View File

@@ -172,19 +172,24 @@ namespace BlackGui
this->derivedModel()->setHighlightModelStrings(highlightModels);
}
void CAircraftModelView::setHighlightModelStrings(bool highlight)
void CAircraftModelView::setHighlightModels(const CAircraftModelList &highlightModels)
{
this->derivedModel()->setHighlightModelStrings(highlight);
this->derivedModel()->setHighlightModels(highlightModels);
}
void CAircraftModelView::setHighlightModelStringsColor(const QBrush &brush)
void CAircraftModelView::setHighlight(bool highlight)
{
this->derivedModel()->setHighlightModelStringsColor(brush);
this->derivedModel()->setHighlight(highlight);
}
bool CAircraftModelView::highlightModelStrings() const
void CAircraftModelView::setHighlightColor(const QBrush &brush)
{
return this->derivedModel()->highlightModelStrings();
this->derivedModel()->setHighlightColor(brush);
}
bool CAircraftModelView::highlightModels() const
{
return this->derivedModel()->highlightModels();
}
void CAircraftModelView::dropEvent(QDropEvent *event)
@@ -332,7 +337,7 @@ namespace BlackGui
m_menuFlagActions.insert(MenuHighlightStashed, ma);
}
QAction *a = menuActions.addActions(initMenuActions(CViewBaseNonTemplate::MenuHighlightStashed)).first();
a->setChecked(this->derivedModel()->highlightModelStrings());
a->setChecked(this->derivedModel()->highlightModels());
addStashMenu = true;
}
@@ -390,15 +395,15 @@ namespace BlackGui
void CAircraftModelView::toggleHighlightStashedModels()
{
const bool h = derivedModel()->highlightModelStrings();
derivedModel()->setHighlightModelStrings(!h);
const bool h = derivedModel()->highlightModels();
derivedModel()->setHighlight(!h);
emit toggledHighlightStashedModels();
}
void CAircraftModelView::toggleHighlightInvalidModels()
{
const bool h = this->highlightModelStrings();
this->setHighlightModelStrings(!h);
const bool h = this->highlightModels();
this->setHighlight(!h);
}
void CAircraftModelView::stashingClearsSelection()

View File

@@ -95,17 +95,20 @@ namespace BlackGui
//! Replace models with sme model string, otherwise add
int replaceOrAddModelsWithString(const BlackMisc::Simulation::CAircraftModelList &models, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive);
//! \copydoc BlackGui::Models::CAircraftModelListModel::setHighlightModels
void setHighlightModels(const BlackMisc::Simulation::CAircraftModelList &highlightModels);
//! \copydoc BlackGui::Models::CAircraftModelListModel::setHighlightModelStrings(const QStringList &)
void setHighlightModelStrings(const QStringList &highlightModels);
//! \copydoc BlackGui::Models::CAircraftModelListModel::setHighlightModelStrings(bool)
void setHighlightModelStrings(bool highlight);
//! \copydoc BlackGui::Models::CAircraftModelListModel::setHighlight
void setHighlight(bool highlight);
//! \copydoc BlackGui::Models::CAircraftModelListModel::setHighlightModelStringsColor
void setHighlightModelStringsColor(const QBrush &brush);
//! \copydoc BlackGui::Models::CAircraftModelListModel::setHighlightColor
void setHighlightColor(const QBrush &brush);
//! \copydoc BlackGui::Models::CAircraftModelListModel::highlightModelStrings
bool highlightModelStrings() const;
//! \copydoc BlackGui::Models::CAircraftModelListModel::highlightModels
bool highlightModels() const;
//! Loading data will be restricted to simulator
void setSimulatorForLoading(const BlackMisc::Simulation::CSimulatorInfo &simulator) { m_loadingRequiresSimulator = simulator; }