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

Init simulator display field, shorter text, typo

Browse Source
This commit is contained in:
Klaus Basan
2018-08-27 16:39:01 +02:00
parent d320f590b4
commit 0db1683aa3
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blackgui/components/dbownmodelscomponent.cpp
View File

@@ -64,6 +64,7 @@ namespace BlackGui
const CSimulatorInfo simulator = ui->comp_SimulatorSelector->getValue(); const CSimulatorInfo simulator = ui->comp_SimulatorSelector->getValue();
if (simulator.isSingleSimulator()) if (simulator.isSingleSimulator())
{ {
ui->le_Simulator->setText(simulator.toQString(true));
m_simulator = simulator; m_simulator = simulator;
const bool success = this->initModelLoader(simulator, IAircraftModelLoader::CacheOnly); const bool success = this->initModelLoader(simulator, IAircraftModelLoader::CacheOnly);
if (!success) if (!success)

4
src/blackgui/components/dbownmodelsetcomponent.cpp
View File

@@ -73,6 +73,7 @@ namespace BlackGui
ui->comp_SimulatorSelector->setMode(CSimulatorSelector::RadioButtons); ui->comp_SimulatorSelector->setMode(CSimulatorSelector::RadioButtons);
ui->comp_SimulatorSelector->setRememberSelectionAndSetToLastSelection(); ui->comp_SimulatorSelector->setRememberSelectionAndSetToLastSelection();
const CSimulatorInfo simulator = ui->comp_SimulatorSelector->getValue(); const CSimulatorInfo simulator = ui->comp_SimulatorSelector->getValue();
ui->le_Simulator->setText(simulator.toQString(true));
//! \fixme maybe it would be better to set those in stylesheet file //! \fixme maybe it would be better to set those in stylesheet file
ui->pb_SaveAsSetForSimulator->setStyleSheet("padding-left: 3px; padding-right: 3px;"); ui->pb_SaveAsSetForSimulator->setStyleSheet("padding-left: 3px; padding-right: 3px;");
@@ -263,8 +264,9 @@ namespace BlackGui
ui->pb_SaveAsSetForSimulator->setEnabled(canSave); ui->pb_SaveAsSetForSimulator->setEnabled(canSave);
if (canSave) if (canSave)
{ {
static const QString ss("save %1");
this->setSaveFileName(this->getModelSetSimulator()); this->setSaveFileName(this->getModelSetSimulator());
ui->pb_SaveAsSetForSimulator->setText("save for " + this->getModelSetSimulator().toQString(true)); ui->pb_SaveAsSetForSimulator->setText(ss.arg(this->getModelSetSimulator().toQString(true)));
} }
else else
{ {

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

@@ -162,7 +162,7 @@ namespace BlackGui
bool loadOnlyIfNotEmpty = true; bool loadOnlyIfNotEmpty = true;
if (m_modelsDialog->getOwnModelsCount() > 0) if (m_modelsDialog->getOwnModelsCount() > 0)
{ {
const QMessageBox::StandardButton reply = QMessageBox::warning(this->mainWindow(), "Model loading", "Reload the models?\nThe xisting cache data will we overridden.", QMessageBox::Yes | QMessageBox::No); const QMessageBox::StandardButton reply = QMessageBox::warning(this->mainWindow(), "Model loading", "Reload the models?\nThe existing cache data will we overridden.", QMessageBox::Yes | QMessageBox::No);
if (reply == QMessageBox::Yes) { loadOnlyIfNotEmpty = false; } if (reply == QMessageBox::Yes) { loadOnlyIfNotEmpty = false; }
} }
m_modelsDialog->requestModelsInBackground(simulator, loadOnlyIfNotEmpty); m_modelsDialog->requestModelsInBackground(simulator, loadOnlyIfNotEmpty);