diff --git a/src/blackgui/components/dbmappingcomponent.cpp b/src/blackgui/components/dbmappingcomponent.cpp index 5fa6f723c..577640e16 100644 --- a/src/blackgui/components/dbmappingcomponent.cpp +++ b/src/blackgui/components/dbmappingcomponent.cpp @@ -153,11 +153,11 @@ namespace BlackGui { m_vPilot1stInit = false; connect(ui->tvp_AircraftModelsForVPilot, &CAircraftModelView::doubleClicked, this, &CDbMappingComponent::onModelRowSelected); - connect(ui->tvp_AircraftModelsForVPilot, &CAircraftModelView::modelDataChanged, this, &CDbMappingComponent::ps_onVPilotDataChanged); - connect(&m_vPilotReader, &CVPilotRulesReader::readFinished, this, &CDbMappingComponent::ps_onLoadVPilotDataFinished); + connect(ui->tvp_AircraftModelsForVPilot, &CAircraftModelView::modelDataChanged, this, &CDbMappingComponent::onVPilotDataChanged); + connect(&m_vPilotReader, &CVPilotRulesReader::readFinished, this, &CDbMappingComponent::onLoadVPilotDataFinished); connect(ui->tvp_AircraftModelsForVPilot, &CAircraftModelView::requestStash, this, &CDbMappingComponent::stashSelectedModels); connect(ui->tvp_AircraftModelsForVPilot, &CAircraftModelView::toggledHighlightStashedModels, this, &CDbMappingComponent::onStashedModelsChanged); - connect(ui->tvp_AircraftModelsForVPilot, &CAircraftModelView::requestUpdate, this, &CDbMappingComponent::ps_requestVPilotDataUpdate); + connect(ui->tvp_AircraftModelsForVPilot, &CAircraftModelView::requestUpdate, this, &CDbMappingComponent::requestVPilotDataUpdate); ui->tvp_AircraftModelsForVPilot->setCustomMenu(new CMappingVPilotMenu(this, true)); ui->tvp_AircraftModelsForVPilot->setCustomMenu(new CStashToolsMenu(this, false)); @@ -175,8 +175,7 @@ namespace BlackGui { // create / restore tab ui->tw_ModelsToBeMapped->addTab(ui->tab_VPilot, tabName); - this->ps_onVPilotDataChanged(ui->tvp_AircraftModelsForVPilot->rowCount(), - ui->tvp_AircraftModelsForVPilot->hasFilter()); + this->onVPilotDataChanged(ui->tvp_AircraftModelsForVPilot->rowCount(), ui->tvp_AircraftModelsForVPilot->hasFilter()); } else { @@ -518,7 +517,7 @@ namespace BlackGui ui->sp_MappingComponent->setSizes(sizes); } - void CDbMappingComponent::ps_loadVPilotData() + void CDbMappingComponent::loadVPilotData() { if (m_vPilotReader.readInBackground(true)) { @@ -531,7 +530,7 @@ namespace BlackGui } } - void CDbMappingComponent::ps_onLoadVPilotDataFinished(bool success) + void CDbMappingComponent::onLoadVPilotDataFinished(bool success) { if (!m_vPilotEnabled) { return; } if (success) @@ -550,7 +549,7 @@ namespace BlackGui ui->tvp_AircraftModelsForVPilot->hideLoadIndicator(); } - void CDbMappingComponent::ps_onVPilotCacheChanged() + void CDbMappingComponent::onVPilotCacheChanged() { if (ui->tvp_AircraftModelsForVPilot->displayAutomatically()) { @@ -562,9 +561,9 @@ namespace BlackGui } } - void CDbMappingComponent::ps_requestVPilotDataUpdate() + void CDbMappingComponent::requestVPilotDataUpdate() { - this->ps_onVPilotCacheChanged(); + this->onVPilotCacheChanged(); } void CDbMappingComponent::onStashedModelsChanged() @@ -635,7 +634,7 @@ namespace BlackGui emit this->requestUpdatedData(CEntityFlags::ModelEntity); } - void CDbMappingComponent::ps_onVPilotDataChanged(int count, bool withFilter) + void CDbMappingComponent::onVPilotDataChanged(int count, bool withFilter) { Q_UNUSED(count); Q_UNUSED(withFilter); @@ -668,7 +667,7 @@ namespace BlackGui CLogMessage::preformatted(m); } - void CDbMappingComponent::ps_mergeWithVPilotModels() + void CDbMappingComponent::mergeWithVPilotModels() { if (!ui->comp_OwnAircraftModels->modelLoader()) { return; } if (m_vPilotReader.getModelsCount() < 1) { return; } @@ -681,7 +680,7 @@ namespace BlackGui ui->comp_OwnAircraftModels->updateViewAndCache(ownModels); } - void CDbMappingComponent::ps_mergeSelectedWithVPilotModels() + void CDbMappingComponent::mergeSelectedWithVPilotModels() { if (!ui->comp_OwnAircraftModels->modelLoader()) { return; } if (m_vPilotReader.getModelsCount() < 1) { return; } @@ -900,7 +899,7 @@ namespace BlackGui const bool canUseVPilot = mappingComponent()->withVPilot(); if (canUseVPilot) { - m_menuAction = menuActions.addAction(m_menuAction, CIcons::appMappings16(), "Load vPilot Rules", CMenuAction::pathVPilot(), this, { mapComp, &CDbMappingComponent::ps_loadVPilotData }); + m_menuAction = menuActions.addAction(m_menuAction, CIcons::appMappings16(), "Load vPilot Rules", CMenuAction::pathVPilot(), this, { mapComp, &CDbMappingComponent::loadVPilotData }); } this->nestedCustomMenu(menuActions); } @@ -1028,10 +1027,10 @@ namespace BlackGui if (m_menuActions.isEmpty()) { m_menuActions = QList({ nullptr, nullptr }); } menuActions.addMenu("Merge with vPilot data", CMenuAction::pathVPilot()); - m_menuActions[0] = menuActions.addAction(m_menuActions[0], "All", CMenuAction::pathVPilot(), this, { mappingComponent(), &CDbMappingComponent::ps_mergeWithVPilotModels }); + m_menuActions[0] = menuActions.addAction(m_menuActions[0], "All", CMenuAction::pathVPilot(), this, { mappingComponent(), &CDbMappingComponent::mergeWithVPilotModels }); if (mv->hasSelection()) { - m_menuActions[1] = menuActions.addAction(m_menuActions[1], "Selected only", CMenuAction::pathVPilot(), this, { mappingComponent(), &CDbMappingComponent::ps_mergeSelectedWithVPilotModels }); + m_menuActions[1] = menuActions.addAction(m_menuActions[1], "Selected only", CMenuAction::pathVPilot(), this, { mappingComponent(), &CDbMappingComponent::mergeSelectedWithVPilotModels }); } this->nestedCustomMenu(menuActions); } diff --git a/src/blackgui/components/dbmappingcomponent.h b/src/blackgui/components/dbmappingcomponent.h index f772ce09a..ccfab688f 100644 --- a/src/blackgui/components/dbmappingcomponent.h +++ b/src/blackgui/components/dbmappingcomponent.h @@ -64,9 +64,9 @@ namespace BlackGui * Mapping component */ class BLACKGUI_EXPORT CDbMappingComponent : - public BlackGui::COverlayMessagesFrame, + public COverlayMessagesFrame, public CEnableForDockWidgetInfoArea, - public BlackGui::CEnableForViewBasedIndicator + public CEnableForViewBasedIndicator { Q_OBJECT @@ -225,31 +225,31 @@ namespace BlackGui void ps_digestStashedModelsChanged(); private slots: - //! Load the vPilot rules - void ps_loadVPilotData(); - - //! Data for vPilot have been loaded - void ps_onLoadVPilotDataFinished(bool success); - - //! vPilot cached models changed - void ps_onVPilotCacheChanged(); - - //! vPilot data changed - void ps_onVPilotDataChanged(int count, bool withFilter); - - //! Request update of vPilot data - void ps_requestVPilotDataUpdate(); - - //! Merge with vPilot models - void ps_mergeWithVPilotModels(); - - //! Merge selected with vPilot models - void ps_mergeSelectedWithVPilotModels(); - //! Add to own model set - void ps_addToOwnModelSet(); + void ps_addToOwnModelSet(); // still used with QShortcut private: + //! Data for vPilot have been loaded + void onLoadVPilotDataFinished(bool success); + + //! Merge with vPilot models + void mergeWithVPilotModels(); + + //! vPilot cached models changed + void onVPilotCacheChanged(); + + //! Load the vPilot rules + void loadVPilotData(); + + //! Request update of vPilot data + void requestVPilotDataUpdate(); + + //! Merge selected with vPilot models + void mergeSelectedWithVPilotModels(); + + //! vPilot data changed + void onVPilotDataChanged(int count, bool withFilter); + //! Tab index changed void onTabIndexChanged(int index); diff --git a/src/blackgui/models/aircraftmodellistmodel.cpp b/src/blackgui/models/aircraftmodellistmodel.cpp index 263245882..38960b01a 100644 --- a/src/blackgui/models/aircraftmodellistmodel.cpp +++ b/src/blackgui/models/aircraftmodellistmodel.cpp @@ -53,16 +53,16 @@ namespace BlackGui case OwnAircraftModelClient: m_columns.addColumn(CColumn::standardString("model", { CAircraftModel::IndexModelString})); m_columns.addColumn(CColumn("DB", "DB metadata", CAircraftModel::IndexDatabaseIcon, new CPixmapFormatter())); - m_columns.addColumn(CColumn::standardString("DB", "parts from DB", { CAircraftModel::IndexMembersDbStatus})); + m_columns.addColumn(CColumn::standardString("DB", "parts from DB", { CAircraftModel::IndexMembersDbStatus })); m_columns.addColumn(CColumn("mode", "model mode(include, exclude)", CAircraftModel::IndexModelModeAsIcon, new CPixmapFormatter())); - m_columns.addColumn(CColumn::standardString("description", { CAircraftModel::IndexDescription})); + m_columns.addColumn(CColumn::standardString("description", { CAircraftModel::IndexDescription })); m_columns.addColumn(CColumn::standardString("sim.", "simulator supported", CAircraftModel::IndexSimulatorInfoAsString)); - m_columns.addColumn(CColumn::standardString("dist.", "distributor", { CAircraftModel::IndexDistributor, CDistributor::IndexDbStringKey})); + m_columns.addColumn(CColumn::standardString("dist.", "distributor", { CAircraftModel::IndexDistributor, CDistributor::IndexDbStringKey })); - m_columns.addColumn(CColumn::standardString("aircraft", { CAircraftModel::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexDesignatorManufacturer})); + m_columns.addColumn(CColumn::standardString("aircraft", { CAircraftModel::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexDesignatorManufacturer })); m_columns.addColumn(CColumn::standardString("livery", { CAircraftModel::IndexLivery, CLivery::IndexCombinedCode})); - m_columns.addColumn(CColumn::standardString("airline", { CAircraftModel::IndexLivery, CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexDesignatorNameCountry})); + m_columns.addColumn(CColumn::standardString("airline", { CAircraftModel::IndexLivery, CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexDesignatorNameCountry })); m_columns.addColumn(CColumn::standardString("name", { CAircraftModel::IndexName})); m_columns.addColumn(CColumn::standardString("filename", { CAircraftModel::IndexFileName})); @@ -85,15 +85,15 @@ namespace BlackGui m_columns.addColumn(CColumn::standardString("flags", "parts from DB", { CAircraftModel::IndexMembersDbStatus})); } m_columns.addColumn(CColumn("mode", "model mode(include, exclude)", CAircraftModel::IndexModelModeAsIcon, new CPixmapFormatter())); - m_columns.addColumn(CColumn::standardString("dist.", "distributor", { CAircraftModel::IndexDistributor, CDistributor::IndexDbStringKey})); + m_columns.addColumn(CColumn::standardString("dist.", "distributor", { CAircraftModel::IndexDistributor, CDistributor::IndexDbStringKey })); if (mode == OwnModelSet) { - m_columns.addColumn(CColumn::standardString("d#", "distributor order", { CAircraftModel::IndexDistributor, CDistributor::IndexOrderString})); + m_columns.addColumn(CColumn::standardString("d#", "distributor order", { CAircraftModel::IndexDistributor, CDistributor::IndexOrderString })); } - m_columns.addColumn(CColumn::standardString("ac", "aircraft ICAO", { CAircraftModel::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexAircraftDesignator})); - m_columns.addColumn(CColumn::standardString("fam.", "aircraft family", { CAircraftModel::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexFamily})); + m_columns.addColumn(CColumn::standardString("ac", "aircraft ICAO", { CAircraftModel::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexAircraftDesignator })); + m_columns.addColumn(CColumn::standardString("fam.", "aircraft family", { CAircraftModel::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexFamily })); m_columns.addColumn(CColumn::standardString("livery", { CAircraftModel::IndexLivery, CLivery::IndexCombinedCode})); - m_columns.addColumn(CColumn::standardString("al", "airline ICAO", { CAircraftModel::IndexLivery, CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexAirlineDesignator})); + m_columns.addColumn(CColumn::standardString("al", "airline ICAO", { CAircraftModel::IndexLivery, CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexAirlineDesignator })); m_columns.addColumn(CColumn::standardString("description", CAircraftModel::IndexDescription)); m_columns.addColumn(CColumn::standardString("filename", CAircraftModel::IndexFileName)); m_columns.addColumn(CColumn::standardString("file ts.", "file timestamp", CAircraftModel::IndexFileTimestampFormattedYmdhms)); @@ -115,18 +115,18 @@ namespace BlackGui m_columns.addColumn(CColumn::standardString("description", CAircraftModel::IndexDescription)); m_columns.addColumn(CColumn::standardString("sim.", "simulator supported", CAircraftModel::IndexSimulatorInfoAsString)); - m_columns.addColumn(CColumn::standardString("ac", "aircraft ICAO", { CAircraftModel::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexAircraftDesignator})); - m_columns.addColumn(CColumn::standardString("fam.", "aircraft family", { CAircraftModel::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexFamily})); - m_columns.addColumn(CColumn::standardString("manufacturer", "aircraft ICAO", { CAircraftModel::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexManufacturer})); + m_columns.addColumn(CColumn::standardString("ac", "aircraft ICAO", { CAircraftModel::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexAircraftDesignator })); + m_columns.addColumn(CColumn::standardString("fam.", "aircraft family", { CAircraftModel::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexFamily })); + m_columns.addColumn(CColumn::standardString("manufacturer", "aircraft ICAO", { CAircraftModel::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexManufacturer })); m_columns.addColumn(CColumn::standardString("code", { CAircraftModel::IndexLivery, CLivery::IndexCombinedCode})); m_columns.addColumn(CColumn::standardString("liv.desc.", "livery description", { CAircraftModel::IndexLivery, CLivery::IndexDescription})); - m_columns.addColumn(CColumn::standardString("al", "airline ICAO", { CAircraftModel::IndexLivery, CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexAirlineDesignator})); + m_columns.addColumn(CColumn::standardString("al", "airline ICAO", { CAircraftModel::IndexLivery, CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexAirlineDesignator })); m_columns.addColumn(CColumn::standardString("al.name", "airline name", { CAircraftModel::IndexLivery, CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexAirlineName })); m_columns.addColumn(CColumn("fuse.", "fuselage color", { CAircraftModel::IndexLivery, CLivery::IndexColorFuselage }, new CColorFormatter())); m_columns.addColumn(CColumn("tail", "tail color", { CAircraftModel::IndexLivery, CLivery::IndexColorTail }, new CColorFormatter())); - m_columns.addColumn(CColumn("mil.", "military livery", { CAircraftModel::IndexLivery, CLivery::IndexIsMilitary}, new CBoolIconFormatter("military", "civil"))); + m_columns.addColumn(CColumn("mil.", "military livery", { CAircraftModel::IndexLivery, CLivery::IndexIsMilitary }, new CBoolIconFormatter("military", "civil"))); m_columns.addColumn(CColumn::standardString("changed", CAircraftModel::IndexUtcTimestampFormattedYmdhms)); // default sort order