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

refs #587, use modify form as dialog in mapping component

Browse Source
This commit is contained in:
Klaus Basan
2016-01-29 21:39:04 +01:00
parent f544b0cd3f
commit cb5e48fdd8
3 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/blackgui/components/dbmappingcomponent.cpp
View File

@@ -167,7 +167,7 @@ namespace BlackGui
void CDbMappingComponent::setProvider(BlackMisc::Network::IWebDataServicesProvider *provider) void CDbMappingComponent::setProvider(BlackMisc::Network::IWebDataServicesProvider *provider)
{ {
CWebDataServicesAware::setProvider(provider); CWebDataServicesAware::setProvider(provider);
this->m_autostashDialog->setProvider(provider); this->m_autoStashDialog->setProvider(provider);
this->ui->editor_Livery->setProvider(provider); this->ui->editor_Livery->setProvider(provider);
this->ui->editor_Distributor->setProvider(provider); this->ui->editor_Distributor->setProvider(provider);
this->ui->editor_AircraftIcao->setProvider(provider); this->ui->editor_AircraftIcao->setProvider(provider);
@@ -325,7 +325,7 @@ namespace BlackGui
void CDbMappingComponent::ps_displayAutoStashingDialog() void CDbMappingComponent::ps_displayAutoStashingDialog()
{ {
this->m_autostashDialog->exec(); this->m_autoStashDialog->exec();
} }
void CDbMappingComponent::ps_removeDbModelsFromView() void CDbMappingComponent::ps_removeDbModelsFromView()
@@ -392,6 +392,20 @@ namespace BlackGui
} }
} }
void CDbMappingComponent::ps_modifyModelDialog()
{
// only one model selected, use as default
if (this->ui->comp_StashAircraft->getView()->hasSingleSelectedRow())
{
this->m_modelModifyDialog->setValue(this->ui->comp_StashAircraft->getView()->selectedObject());
}
QDialog::DialogCode s = static_cast<QDialog::DialogCode>(this->m_modelModifyDialog->exec());
if (s == QDialog::Rejected) { return; }
CPropertyIndexVariantMap vm = this->m_modelModifyDialog->getValues();
this->ui->comp_StashAircraft->applyToSelected(vm);
}
void CDbMappingComponent::resizeForSelect() void CDbMappingComponent::resizeForSelect()
{ {
int h = this->height(); int h = this->height();
@@ -742,9 +756,9 @@ namespace BlackGui
const QString msgAutoStash("Auto stashing"); const QString msgAutoStash("Auto stashing");
menu.addAction(CIcons::appDbStash16(), msgAutoStash, mapComp, SLOT(ps_displayAutoStashingDialog())); menu.addAction(CIcons::appDbStash16(), msgAutoStash, mapComp, SLOT(ps_displayAutoStashingDialog()));
if (mapComp->m_autostashDialog && mapComp->m_autostashDialog->isCompleted()) if (mapComp->m_autoStashDialog && mapComp->m_autoStashDialog->isCompleted())
{ {
menu.addAction(CIcons::appDbStash16(), "Last auto stash run", mapComp->m_autostashDialog.data(), SLOT(showLastResults())); menu.addAction(CIcons::appDbStash16(), "Last auto stash run", mapComp->m_autoStashDialog.data(), SLOT(showLastResults()));
} }
// auto filter in DB views // auto filter in DB views
@@ -783,6 +797,8 @@ namespace BlackGui
// a = subMenu->addAction(CIcons::appAirlineIcao16(), "Current airline ICAO", mapComp, SLOT(ps_applyDbData())); // a = subMenu->addAction(CIcons::appAirlineIcao16(), "Current airline ICAO", mapComp, SLOT(ps_applyDbData()));
// a->setData(CAirlineIcaoCode().getClassName()); // a->setData(CAirlineIcaoCode().getClassName());
menu.addAction(CIcons::databaseTable16(), "Modify model data", mapComp, SLOT(ps_modifyModelDialog()));
} }
this->nestedCustomMenu(menu); this->nestedCustomMenu(menu);
} }

7
src/blackgui/components/dbmappingcomponent.h
View File

@@ -20,6 +20,7 @@
#include "blackgui/enableforviewbasedindicator.h" #include "blackgui/enableforviewbasedindicator.h"
#include "blackgui/components/enablefordockwidgetinfoarea.h" #include "blackgui/components/enablefordockwidgetinfoarea.h"
#include "blackgui/components/dbautostashingcomponent.h" #include "blackgui/components/dbautostashingcomponent.h"
#include "blackgui/components/dbmodelmappingmodifycomponent.h"
#include "blackgui/views/aircraftmodelview.h" #include "blackgui/views/aircraftmodelview.h"
#include "blackmisc/simulation/aircraftmodelloader.h" #include "blackmisc/simulation/aircraftmodelloader.h"
#include "blackmisc/simulation/fscommon/vpilotrulesreader.h" #include "blackmisc/simulation/fscommon/vpilotrulesreader.h"
@@ -202,9 +203,13 @@ namespace BlackGui
//! Apply current DB data from form //! Apply current DB data from form
void ps_applyDbData(); void ps_applyDbData();
//! Open model modify dialog
void ps_modifyModelDialog();
private: private:
QScopedPointer<Ui::CDbMappingComponent> ui; QScopedPointer<Ui::CDbMappingComponent> ui;
QScopedArrayPointer<CDbAutoStashingComponent> m_autostashDialog { new CDbAutoStashingComponent(this) }; QScopedPointer<CDbAutoStashingComponent> m_autoStashDialog { new CDbAutoStashingComponent(this) };
QScopedPointer<CDbModelMappingModifyComponent> m_modelModifyDialog { new CDbModelMappingModifyComponent(this) };
BlackMisc::Simulation::FsCommon::CVPilotRulesReader m_vPilotReader; //!< read vPilot rules BlackMisc::Simulation::FsCommon::CVPilotRulesReader m_vPilotReader; //!< read vPilot rules
BlackMisc::CData<BlackCore::Data::VPilotAircraftModels> m_cachedVPilotModels { this, &CDbMappingComponent::ps_onVPilotCacheChanged }; //!< cache for latest vPilot rules BlackMisc::CData<BlackCore::Data::VPilotAircraftModels> m_cachedVPilotModels { this, &CDbMappingComponent::ps_onVPilotCacheChanged }; //!< cache for latest vPilot rules
std::unique_ptr<BlackMisc::Simulation::IAircraftModelLoader> m_modelLoader; //!< read own aircraft models std::unique_ptr<BlackMisc::Simulation::IAircraftModelLoader> m_modelLoader; //!< read own aircraft models

1
src/blackgui/components/dbmappingcomponentaware.h
View File

@@ -13,6 +13,7 @@
#define BLACKGUI_COMPONENTS_DBMAPPINGCOMPONENTAWARE_H #define BLACKGUI_COMPONENTS_DBMAPPINGCOMPONENTAWARE_H
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include <QObject>
namespace BlackGui namespace BlackGui
{ {