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

Ref T430, follow ups of FG integration fixing wrong distributor handling

Browse Source 
* fixing a bug where the radio button and check box names got mixed
* removed code for FG disabling
* style

Backend T576
This commit is contained in:
Klaus Basan
2019-03-23 18:06:59 +01:00
committed by Mat Sutcliffe
parent cdca20abe9
commit 3988fbdb32
9 changed files with 15 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -325,7 +325,7 @@ namespace BlackGui
}
menuActions.addAction(m_loadActions[3], CMenuAction::pathSimulator());
}
if (CBuildConfig::supportFlightGear() && sims.isFG())
if (sims.isFG())
{
if (!m_loadActions[4])
{
@@ -458,7 +458,7 @@ namespace BlackGui
menuActions.addAction(m_reloadActions[7], CMenuAction::pathSimulatorModelsReload());
}
if (CBuildConfig::supportFlightGear() && sims.isFG())
if (sims.isFG())
{
if (!m_reloadActions[8])
{
@@ -551,7 +551,7 @@ namespace BlackGui
}
menuActions.addAction(m_clearCacheActions[3], CMenuAction::pathSimulatorModelsClearCache());
}
if (CBuildConfig::supportFlightGear() && sims.isFG())
if (sims.isFG())
{
if (!m_clearCacheActions[4])
{

21
src/blackgui/components/simulatorselector.cpp
View File

@@ -36,10 +36,7 @@ namespace BlackGui
{
ui->setupUi(this);
const bool withFG = CBuildConfig::supportFlightGear();
this->enableFG(withFG);
this->addComboxBoxValues();
this->setMode(CheckBoxes, true);
connect(ui->rb_FS9, &QRadioButton::toggled, this, &CSimulatorSelector::radioButtonChanged);
@@ -86,8 +83,8 @@ namespace BlackGui
switch (m_mode)
{
default:
case CheckBoxes: return CSimulatorInfo(ui->cb_FSX->isChecked(), ui->cb_FS9->isChecked(), ui->cb_XPlane->isChecked(), ui->cb_P3D->isChecked(), m_withFG && ui->cb_FG->isChecked());
case RadioButtons: return CSimulatorInfo(ui->rb_FSX->isChecked(), ui->rb_FS9->isChecked(), ui->rb_XPlane->isChecked(), ui->rb_P3D->isChecked(), m_withFG && ui->rb_FG->isChecked());
case CheckBoxes: return CSimulatorInfo(ui->cb_FSX->isChecked(), ui->cb_FS9->isChecked(), ui->cb_XPlane->isChecked(), ui->cb_P3D->isChecked(), ui->cb_FG->isChecked());
case RadioButtons: return CSimulatorInfo(ui->rb_FSX->isChecked(), ui->rb_FS9->isChecked(), ui->rb_XPlane->isChecked(), ui->rb_P3D->isChecked(), ui->rb_FG->isChecked());
case ComboBox: return CSimulatorInfo(ui->cb_Simulators->currentText());
}
}
@@ -112,7 +109,7 @@ namespace BlackGui
if (simulator.isFS9()) { ui->rb_FS9->setChecked(simulator.isFS9()); return; }
if (simulator.isXPlane()) { ui->rb_XPlane->setChecked(simulator.isXPlane()); return; }
if (simulator.isP3D()) { ui->rb_P3D->setChecked(simulator.isP3D()); return; }
if (simulator.isFG()) { ui->rb_FG->setChecked(simulator.isFG()); return; }
if (simulator.isFG()) { ui->rb_FG->setChecked(simulator.isFG()); return; }
}
@@ -181,7 +178,6 @@ namespace BlackGui
void CSimulatorSelector::enableFG(bool enabled)
{
m_withFG = enabled;
ui->cb_FG->setVisible(enabled);
ui->rb_FG->setVisible(enabled);
ui->cb_FG->setChecked(false);
@@ -218,10 +214,10 @@ namespace BlackGui
{
default:
case CheckBoxes:
c = ui->cb_FSX->isChecked() || ui->cb_FS9->isChecked() || ui->cb_XPlane->isChecked() || ui->cb_P3D->isChecked() || (m_withFG && ui->rb_FG->isChecked());
c = ui->cb_FSX->isChecked() || ui->cb_FS9->isChecked() || ui->cb_XPlane->isChecked() || ui->cb_P3D->isChecked() || ui->cb_FG->isChecked();
break;
case RadioButtons:
c = ui->rb_FSX->isChecked() || ui->rb_FS9->isChecked() || ui->rb_XPlane->isChecked() || ui->cb_P3D->isChecked() || (m_withFG && ui->cb_FG->isChecked());
c = ui->rb_FSX->isChecked() || ui->rb_FS9->isChecked() || ui->rb_XPlane->isChecked() || ui->rb_P3D->isChecked() || ui->rb_FG->isChecked();
break;
case ComboBox:
const int i = ui->cb_Simulators->currentIndex();
@@ -238,7 +234,7 @@ namespace BlackGui
{
default:
case CheckBoxes:
c = ui->cb_FSX->isChecked() && ui->cb_FS9->isChecked() && ui->cb_XPlane->isChecked() && ui->cb_P3D->isChecked() && (!m_withFG || ui->cb_FG->isChecked());
c = ui->cb_FSX->isChecked() && ui->cb_FS9->isChecked() && ui->cb_XPlane->isChecked() && ui->cb_P3D->isChecked() && ui->cb_FG->isChecked();
break;
case RadioButtons:
// actually this should never be true
@@ -377,10 +373,7 @@ namespace BlackGui
ui->cb_Simulators->insertItem(cbi++, CSimulatorInfo::fsx().toQString());
ui->cb_Simulators->insertItem(cbi++, CSimulatorInfo::p3d().toQString());
ui->cb_Simulators->insertItem(cbi++, CSimulatorInfo::xplane().toQString());
if (m_withFG)
{
ui->cb_Simulators->insertItem(cbi++, CSimulatorInfo::fg().toQString());
}
ui->cb_Simulators->insertItem(cbi++, CSimulatorInfo::fg().toQString());
}
} // ns
} // ns

3
src/blackgui/components/simulatorselector.h
View File

@@ -45,7 +45,7 @@ namespace BlackGui
explicit CSimulatorSelector(QWidget *parent = nullptr);
//! Destructor
virtual ~CSimulatorSelector();
virtual ~CSimulatorSelector() override;
//! How to display
void setMode(Mode mode, bool forced = false);
@@ -147,7 +147,6 @@ namespace BlackGui
QScopedPointer<Ui::CSimulatorSelector> ui;
Mode m_mode = CheckBoxes;
bool m_withFG = false; //! with FG
bool m_noSelectionMeansAll = false; //!< for filters, no selection means all
bool m_rememberSelection = false; //!< remember last selection
BlackMisc::CDigestSignal m_digestButtonsChanged { this, &CSimulatorSelector::emitChangedSignal, 250, 3 };