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

Style

Browse Source
This commit is contained in:
Klaus Basan
2019-04-15 19:25:42 +02:00
parent 8cf79a512a
commit 4ed0d6befd
7 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackgui/components/cockpitcomcomponent.cpp
View File

@@ -61,14 +61,14 @@ namespace BlackGui
this->updateCockpitFromContext(ownAircraft, CIdentifier("dummyInitialValues")); // intentionally different name here this->updateCockpitFromContext(ownAircraft, CIdentifier("dummyInitialValues")); // intentionally different name here
// COM form // COM form
connect(ui->editor_Com, &CCockpitComForm::testSelcal, this, &CCockpitComComponent::testSelcal); connect(ui->editor_Com, &CCockpitComForm::testSelcal, this, &CCockpitComComponent::testSelcal);
connect(ui->editor_Com, &CCockpitComForm::changedCockpitValues, this, &CCockpitComComponent::updateOwnCockpitInContext); connect(ui->editor_Com, &CCockpitComForm::changedCockpitValues, this, &CCockpitComComponent::updateOwnCockpitInContext);
connect(ui->editor_Com, &CCockpitComForm::changedSelcal, this, &CCockpitComComponent::updateSelcalInContext); connect(ui->editor_Com, &CCockpitComForm::changedSelcal, this, &CCockpitComComponent::updateSelcalInContext);
connect(ui->editor_Com, &CCockpitComForm::requestCom1TextMessage, this, &CCockpitComComponent::requestCom1TextMessage); connect(ui->editor_Com, &CCockpitComForm::requestCom1TextMessage, this, &CCockpitComComponent::requestCom1TextMessage);
connect(ui->editor_Com, &CCockpitComForm::requestCom2TextMessage, this, &CCockpitComComponent::requestCom2TextMessage); connect(ui->editor_Com, &CCockpitComForm::requestCom2TextMessage, this, &CCockpitComComponent::requestCom2TextMessage);
// Relay COM form signals // Relay COM form signals
connect(ui->editor_Com, &CCockpitComForm::transponderModeChanged, this, &CCockpitComComponent::transponderModeChanged); connect(ui->editor_Com, &CCockpitComForm::transponderModeChanged, this, &CCockpitComComponent::transponderModeChanged);
connect(ui->editor_Com, &CCockpitComForm::transponderStateIdentEnded, this, &CCockpitComComponent::transponderStateIdentEnded); connect(ui->editor_Com, &CCockpitComForm::transponderStateIdentEnded, this, &CCockpitComComponent::transponderStateIdentEnded);
// hook up with changes from own aircraft context // hook up with changes from own aircraft context
@@ -110,7 +110,7 @@ namespace BlackGui
ui->editor_Com->setTransponder(transponder); ui->editor_Com->setTransponder(transponder);
// selected stations // selected stations
if (sGui->getIContextNetwork()) if (sGui && sGui->getIContextNetwork())
{ {
const CAtcStationList selectedStations = sGui->getIContextNetwork()->getSelectedAtcStations(); const CAtcStationList selectedStations = sGui->getIContextNetwork()->getSelectedAtcStations();
ui->editor_Com->setSelectedAtcStations(selectedStations); ui->editor_Com->setSelectedAtcStations(selectedStations);

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

@@ -33,7 +33,7 @@ namespace BlackGui
explicit CDbOwnModelsDialog(QWidget *parent = nullptr); explicit CDbOwnModelsDialog(QWidget *parent = nullptr);
//! Destructor //! Destructor
virtual ~CDbOwnModelsDialog(); virtual ~CDbOwnModelsDialog() override;
//! \copydoc CDbOwnModelsComponent::setSimulator //! \copydoc CDbOwnModelsComponent::setSimulator
void setSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator); void setSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator);

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

@@ -32,7 +32,7 @@ namespace BlackGui
explicit CDbOwnModelSetDialog(QWidget *parent = nullptr); explicit CDbOwnModelSetDialog(QWidget *parent = nullptr);
//! Destructor //! Destructor
virtual ~CDbOwnModelSetDialog(); virtual ~CDbOwnModelSetDialog() override;
//! \copydoc CDbOwnModelSetComponent::setSimulator //! \copydoc CDbOwnModelSetComponent::setSimulator
void setSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator); void setSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator);

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

@@ -43,7 +43,7 @@ namespace BlackGui
{ {
ui->setupUi(this); ui->setupUi(this);
connect(ui->pb_Cancel, &QPushButton::clicked, this, &CDbOwnModelSetFormDialog::buttonClicked); connect(ui->pb_Cancel, &QPushButton::clicked, this, &CDbOwnModelSetFormDialog::buttonClicked);
connect(ui->pb_Ok, &QPushButton::clicked, this, &CDbOwnModelSetFormDialog::buttonClicked); connect(ui->pb_Ok, &QPushButton::clicked, this, &CDbOwnModelSetFormDialog::buttonClicked);
connect(ui->form_OwnModelSet, &COwnModelSetForm::simulatorChanged, this, &CDbOwnModelSetFormDialog::simulatorChanged); connect(ui->form_OwnModelSet, &COwnModelSetForm::simulatorChanged, this, &CDbOwnModelSetFormDialog::simulatorChanged);
} }

4
src/blackgui/components/dbownmodelsetformdialog.h
View File

@@ -19,10 +19,8 @@
#include <QObject> #include <QObject>
#include <QScopedPointer> #include <QScopedPointer>
class QWidget;
namespace BlackMisc { class CLogCategoryList; }
namespace Ui { class CDbOwnModelSetFormDialog; } namespace Ui { class CDbOwnModelSetFormDialog; }
namespace BlackMisc { class CLogCategoryList; }
namespace BlackGui namespace BlackGui
{ {
namespace Components namespace Components

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

@@ -26,7 +26,7 @@ namespace BlackGui
ui->bb_UpdateInfolDialog->button(QDialogButtonBox::Ok)->setText(" Download and install "); ui->bb_UpdateInfolDialog->button(QDialogButtonBox::Ok)->setText(" Download and install ");
ui->cb_DontShowAgain->setChecked(!m_setting.get()); ui->cb_DontShowAgain->setChecked(!m_setting.get());
this->selectionChanged(); this->selectionChanged();
connect(ui->comp_UpdateInfo, &CUpdateInfoComponent::selectionChanged, this, &CUpdateInfoDialog::selectionChanged); connect(ui->comp_UpdateInfo, &CUpdateInfoComponent::selectionChanged, this, &CUpdateInfoDialog::selectionChanged);
connect(ui->cb_DontShowAgain, &QCheckBox::toggled, this, &CUpdateInfoDialog::onDontShowAgain); connect(ui->cb_DontShowAgain, &QCheckBox::toggled, this, &CUpdateInfoDialog::onDontShowAgain);
} }

2
src/blackgui/guiapplication.cpp
View File

@@ -1052,7 +1052,7 @@ namespace BlackGui
m_updateDialog = new CUpdateInfoDialog(this->mainApplicationWidget()); m_updateDialog = new CUpdateInfoDialog(this->mainApplicationWidget());
} }
if (onlyIfNew && !m_updateDialog->isNewVersionAvailable()) return; if (onlyIfNew && !m_updateDialog->isNewVersionAvailable()) { return; }
const int result = m_updateDialog->exec(); const int result = m_updateDialog->exec();
if (result != QDialog::Accepted) { return; } if (result != QDialog::Accepted) { return; }
} }