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

Some renaming and minor improvements in mapping view

Browse Source 
* fixed issue with ambigious title
* renamed to ps_toogleEnabledAircraft
This commit is contained in:
Klaus Basan
2016-11-08 03:38:19 +01:00
parent 94d6b8d6b8
commit c86f56fae9
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,7 @@ namespace BlackGui
connect(ui->tvp_RenderedAircraft, &CSimulatedAircraftView::clicked, this, &CMappingComponent::ps_onAircraftSelectedInView);
connect(ui->tvp_RenderedAircraft, &CSimulatedAircraftView::requestUpdate, this, &CMappingComponent::ps_markRenderedViewForUpdate);
connect(ui->tvp_RenderedAircraft, &CSimulatedAircraftView::requestTextMessageWidget, this, &CMappingComponent::requestTextMessageWidget);
connect(ui->tvp_RenderedAircraft, &CSimulatedAircraftView::requestEnableAircraft, this, &CMappingComponent::ps_onMenuEnableAircraft);
connect(ui->tvp_RenderedAircraft, &CSimulatedAircraftView::requestEnableAircraft, this, &CMappingComponent::ps_onMenuToggleEnableAircraft);
connect(ui->tvp_RenderedAircraft, &CSimulatedAircraftView::requestFastPositionUpdates, this, &CMappingComponent::ps_onMenuChangeFastPositionUpdates);
connect(ui->tvp_RenderedAircraft, &CSimulatedAircraftView::requestHighlightInSimulator, this, &CMappingComponent::ps_onMenuHighlightInSimulator);
@@ -92,7 +92,7 @@ namespace BlackGui
// Aircraft previews
connect(ui->cb_AircraftIconDisplayed, &QCheckBox::stateChanged, this, &CMappingComponent::ps_onModelPreviewChanged);
ui->lbl_AircraftIconDisplayed->setText("Icon displayed here");
ui->lbl_AircraftIconDisplayed->setText("[icon]");
// model string completer
ui->completer_ModelStrings->setSourceVisible(CAircraftModelStringCompleter::OwnModels, false);
@@ -279,12 +279,19 @@ namespace BlackGui
CLogMessage(this).validationError("No model for title: %1") << modelString;
return;
}
else if (models.size() > 1)
{
CLogMessage(this).validationError("Ambigious title: %1") << modelString;
return;
}
CAircraftModel model(models.front());
if (models.size() > 1)
{
if (models.containsModelString(modelString))
{
model = models.findByModelString(modelString).front(); // exact match
}
else
{
CLogMessage(this).validationInfo("Ambigious title: %1, using %2") << modelString << model.getModelString();
}
}
model.setModelType(CAircraftModel::TypeManuallySet);
CLogMessage(this).info("Requesting changes for %1") << callsign.asString();
changed = sGui->getIContextNetwork()->updateAircraftModel(aircraftFromBackend.getCallsign(), model, identifier());
@@ -388,7 +395,7 @@ namespace BlackGui
Q_UNUSED(message);
}
void CMappingComponent::ps_onMenuEnableAircraft(const CSimulatedAircraft &aircraft)
void CMappingComponent::ps_onMenuToggleEnableAircraft(const CSimulatedAircraft &aircraft)
{
if (sGui->getIContextNetwork())
{

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

@@ -113,7 +113,7 @@ namespace BlackGui
void ps_onMenuChangeFastPositionUpdates(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
//! Enable / disable aircraft
void ps_onMenuEnableAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
void ps_onMenuToggleEnableAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
//! Highlight in simulator
void ps_onMenuHighlightInSimulator(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);

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

@@ -58,7 +58,7 @@ namespace BlackGui
CSimulatedAircraft aircraft(selectedObject());
Q_ASSERT(!aircraft.getCallsign().isEmpty());
menuActions.addAction(CIcons::appTextMessages16(), "Show text messages", CMenuAction::pathClientCom(), { this, &CSimulatedAircraftView::ps_requestTextMessage });
if (m_withMenuEnable) { menuActions.addAction(CIcons::appAircraft16(), aircraft.isEnabled() ? "Disable aircraft" : "Enabled aircraft", CMenuAction::pathClientSimulation(), { this, &CSimulatedAircraftView::ps_enableAircraft }); }
if (m_withMenuEnable) { menuActions.addAction(CIcons::appAircraft16(), aircraft.isEnabled() ? "Disable aircraft" : "Enabled aircraft", CMenuAction::pathClientSimulation(), { this, &CSimulatedAircraftView::ps_toogleEnabledAircraft }); }
if (m_withMenuHighlight) { menuActions.addAction(CIcons::appSimulator16(), "Highlight in simulator", CMenuAction::pathClientSimulation(), { this, &CSimulatedAircraftView::ps_highlightInSimulator }); }
if (m_withMenuFastPosition) { menuActions.addAction(CIcons::globe16(), aircraft.fastPositionUpdates() ? "Normal updates" : "Fast position updates", CMenuAction::pathClientSimulation(), { this, &CSimulatedAircraftView::ps_fastPositionUpdates }); }
}
@@ -72,7 +72,7 @@ namespace BlackGui
emit requestTextMessageWidget(aircraft.getCallsign());
}
void CSimulatedAircraftView::ps_enableAircraft()
void CSimulatedAircraftView::ps_toogleEnabledAircraft()
{
CSimulatedAircraft aircraft(selectedObject());
if (aircraft.getCallsign().isEmpty()) { return; }

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

@@ -67,7 +67,7 @@ namespace BlackGui
private slots:
void ps_requestTextMessage();
void ps_enableAircraft();
void ps_toogleEnabledAircraft();
void ps_fastPositionUpdates();
void ps_highlightInSimulator();