From e7073202bd7e28535348850d5c849d733b92786d Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 7 Jan 2018 03:06:59 +0100 Subject: [PATCH] Ref T219, adjusted existing forms --- src/blackgui/editors/aircrafticaoform.cpp | 22 +++++++-------- src/blackgui/editors/aircrafticaoform.h | 16 +++++------ src/blackgui/editors/airlineicaoform.cpp | 2 +- src/blackgui/editors/liveryform.cpp | 2 +- src/blackgui/editors/modelmappingform.cpp | 10 +++---- src/blackgui/editors/modelmappingform.h | 8 +++--- .../editors/modelmappingmodifyform.cpp | 20 +++++++------- src/blackgui/editors/modelmappingmodifyform.h | 27 +++++++++---------- 8 files changed, 51 insertions(+), 56 deletions(-) diff --git a/src/blackgui/editors/aircrafticaoform.cpp b/src/blackgui/editors/aircrafticaoform.cpp index 811fc6cbf..cb439d1e9 100644 --- a/src/blackgui/editors/aircrafticaoform.cpp +++ b/src/blackgui/editors/aircrafticaoform.cpp @@ -52,11 +52,11 @@ namespace BlackGui connect(ui->aircraft_Selector, &CDbAircraftIcaoSelectorComponent::changedAircraftIcao, this, &CAircraftIcaoForm::setValue); // Id - connect(ui->le_Id, &QLineEdit::returnPressed, this, &CAircraftIcaoForm::ps_idEntered); + connect(ui->le_Id, &QLineEdit::returnPressed, this, &CAircraftIcaoForm::idEntered); // drag and drop, pasted - connect(ui->drop_DropData, &CDropSite::droppedValueObject, this, &CAircraftIcaoForm::ps_droppedCode); - connect(ui->tb_Paste, &QToolButton::clicked, this, &CAircraftIcaoForm::ps_pasted); + connect(ui->drop_DropData, &CDropSite::droppedValueObject, this, &CAircraftIcaoForm::droppedCode); + connect(ui->tb_Paste, &QToolButton::clicked, this, &CAircraftIcaoForm::pasted); ui->drop_DropData->setInfoText(""); ui->drop_DropData->setAcceptedMetaTypeIds({ qMetaTypeId(), qMetaTypeId()}); } @@ -66,8 +66,8 @@ namespace BlackGui bool CAircraftIcaoForm::setValue(const BlackMisc::Aviation::CAircraftIcaoCode &icao) { - if (icao == this->m_originalCode) { return false; } - this->m_originalCode = icao; + if (icao == m_originalCode) { return false; } + m_originalCode = icao; ui->le_Id->setText(icao.getDbKeyAsString()); ui->aircraft_Selector->setAircraftIcao(icao); @@ -173,7 +173,7 @@ namespace BlackGui void CAircraftIcaoForm::setReadOnly(bool readOnly) { - this->m_readOnly = readOnly; + m_readOnly = readOnly; ui->aircraft_Selector->setReadOnly(readOnly); ui->le_Manufacturer->setReadOnly(readOnly); ui->le_ModelDescription->setReadOnly(readOnly); @@ -203,7 +203,7 @@ namespace BlackGui void CAircraftIcaoForm::clear() { - setValue(CAircraftIcaoCode()); + this->setValue(CAircraftIcaoCode()); } void CAircraftIcaoForm::resetValue() @@ -211,7 +211,7 @@ namespace BlackGui this->setValue(m_originalCode); } - void CAircraftIcaoForm::ps_droppedCode(const BlackMisc::CVariant &variantDropped) + void CAircraftIcaoForm::droppedCode(const BlackMisc::CVariant &variantDropped) { CAircraftIcaoCode icao; if (variantDropped.canConvert()) @@ -220,9 +220,9 @@ namespace BlackGui } else if (variantDropped.canConvert()) { - CAircraftIcaoCodeList icaoList(variantDropped.value()); + const CAircraftIcaoCodeList icaoList(variantDropped.value()); if (icaoList.isEmpty()) { return; } - icao = icaoList.front(); + icao = icaoList.front(); } else { @@ -231,7 +231,7 @@ namespace BlackGui this->setValue(icao); } - void CAircraftIcaoForm::ps_idEntered() + void CAircraftIcaoForm::idEntered() { if (!sGui || !sGui->hasWebDataServices()) { diff --git a/src/blackgui/editors/aircrafticaoform.h b/src/blackgui/editors/aircrafticaoform.h index 0a3a15583..270e9bdd4 100644 --- a/src/blackgui/editors/aircrafticaoform.h +++ b/src/blackgui/editors/aircrafticaoform.h @@ -31,8 +31,7 @@ namespace BlackGui /*! * Aircraft ICAO form */ - class BLACKGUI_EXPORT CAircraftIcaoForm : - public CForm + class BLACKGUI_EXPORT CAircraftIcaoForm : public CForm { Q_OBJECT @@ -73,17 +72,16 @@ namespace BlackGui //! \copydoc CForm::jsonPasted virtual void jsonPasted(const QString &json) override; - private slots: - //! Variant has been dropped - void ps_droppedCode(const BlackMisc::CVariant &variantDropped); - - //! Id has been entered - void ps_idEntered(); - private: QScopedPointer ui; BlackMisc::Aviation::CAircraftIcaoCode m_originalCode; + //! Variant has been dropped + void droppedCode(const BlackMisc::CVariant &variantDropped); + + //! Id has been entered + void idEntered(); + //! Key from GUI int getDbKeyFromGui() const; }; diff --git a/src/blackgui/editors/airlineicaoform.cpp b/src/blackgui/editors/airlineicaoform.cpp index 6c9495203..bbbb1fae5 100644 --- a/src/blackgui/editors/airlineicaoform.cpp +++ b/src/blackgui/editors/airlineicaoform.cpp @@ -52,7 +52,7 @@ namespace BlackGui connect(ui->le_Id, &QLineEdit::returnPressed, this, &CAirlineIcaoForm::ps_idEntered); // drag and drop, paste - connect(ui->tb_Paste, &QToolButton::clicked, this, &CAirlineIcaoForm::ps_pasted); + connect(ui->tb_Paste, &QToolButton::clicked, this, &CAirlineIcaoForm::pasted); connect(ui->drop_DropData, &CDropSite::droppedValueObject, this, &CAirlineIcaoForm::ps_droppedCode); ui->drop_DropData->setInfoText(""); ui->drop_DropData->setAcceptedMetaTypeIds({ qMetaTypeId(), qMetaTypeId()}); diff --git a/src/blackgui/editors/liveryform.cpp b/src/blackgui/editors/liveryform.cpp index 5feff4081..404f9390a 100644 --- a/src/blackgui/editors/liveryform.cpp +++ b/src/blackgui/editors/liveryform.cpp @@ -53,7 +53,7 @@ namespace BlackGui connect(ui->comp_LiverySelector, &CDbLiverySelectorComponent::changedLivery, this, &CLiveryForm::setValue); // drag and drop, paste - connect(ui->tb_Paste, &QToolButton::clicked, this, &CLiveryForm::ps_pasted); + connect(ui->tb_Paste, &QToolButton::clicked, this, &CLiveryForm::pasted); connect(ui->drop_DropData, &CDropSite::droppedValueObject, this, &CLiveryForm::ps_droppedLivery); ui->drop_DropData->setInfoText(""); ui->drop_DropData->setAcceptedMetaTypeIds({ qMetaTypeId(), qMetaTypeId()}); diff --git a/src/blackgui/editors/modelmappingform.cpp b/src/blackgui/editors/modelmappingform.cpp index d638bd040..b8bebea03 100644 --- a/src/blackgui/editors/modelmappingform.cpp +++ b/src/blackgui/editors/modelmappingform.cpp @@ -28,7 +28,7 @@ namespace BlackGui namespace Editors { CModelMappingForm::CModelMappingForm(QWidget *parent) : - CForm(parent), + CFormDbUser(parent), ui(new Ui::CModelMappingForm) { ui->setupUi(this); @@ -38,7 +38,7 @@ namespace BlackGui connect(ui->pb_Stash, &QPushButton::clicked, this, &CModelMappingForm::requestStash); // for setting mode (include/exclude) - this->ps_userChanged(); + this->userChanged(); } CModelMappingForm::~CModelMappingForm() @@ -58,7 +58,7 @@ namespace BlackGui CStatusMessageList CModelMappingForm::validate(bool withNestedObjects) const { const CAircraftModel model(getValue()); - CStatusMessageList msgs(model.validate(withNestedObjects)); + const CStatusMessageList msgs(model.validate(withNestedObjects)); ui->val_Indicator->setState(msgs); return msgs; } @@ -88,7 +88,7 @@ namespace BlackGui m_originalModel = model; } - void CModelMappingForm::ps_userChanged() + void CModelMappingForm::userChanged() { const CAuthenticatedUser user(this->getSwiftDbUser()); if (user.hasAdminRole()) @@ -101,7 +101,7 @@ namespace BlackGui ui->selector_ModelMode->setReadOnly(true); } - CForm::ps_userChanged(); + CFormDbUser::userChanged(); } } // ns } // ns diff --git a/src/blackgui/editors/modelmappingform.h b/src/blackgui/editors/modelmappingform.h index a515c736a..3b5c10d90 100644 --- a/src/blackgui/editors/modelmappingform.h +++ b/src/blackgui/editors/modelmappingform.h @@ -30,7 +30,7 @@ namespace BlackGui /*! * Model mapping form */ - class BLACKGUI_EXPORT CModelMappingForm : public CForm + class BLACKGUI_EXPORT CModelMappingForm : public CFormDbUser { Q_OBJECT @@ -61,9 +61,9 @@ namespace BlackGui //! Request stashing for model void requestStash(); - protected slots: - //! \copydoc CForm::ps_userChanged - virtual void ps_userChanged() override; + protected: + //! \copydoc CFormDbUser::userChanged + virtual void userChanged() override; private: QScopedPointer ui; diff --git a/src/blackgui/editors/modelmappingmodifyform.cpp b/src/blackgui/editors/modelmappingmodifyform.cpp index 0d51f1afe..e82febdd1 100644 --- a/src/blackgui/editors/modelmappingmodifyform.cpp +++ b/src/blackgui/editors/modelmappingmodifyform.cpp @@ -29,16 +29,16 @@ namespace BlackGui namespace Editors { CModelMappingModifyForm::CModelMappingModifyForm(QWidget *parent) : - CForm(parent), + CFormDbUser(parent), ui(new Ui::CModelMappingModifyForm) { ui->setupUi(this); - connect(ui->le_Description, &QLineEdit::returnPressed, this, &CModelMappingModifyForm::ps_returnPressed); - connect(ui->le_Name, &QLineEdit::returnPressed, this, &CModelMappingModifyForm::ps_returnPressed); - connect(ui->selector_ModeSelector, &CModelModeSelector::changed, this, &CModelMappingModifyForm::ps_changed); - connect(ui->selector_SimulatorSelector, &CSimulatorSelector::changed, this, &CModelMappingModifyForm::ps_changed); + connect(ui->le_Description, &QLineEdit::returnPressed, this, &CModelMappingModifyForm::returnPressed); + connect(ui->le_Name, &QLineEdit::returnPressed, this, &CModelMappingModifyForm::returnPressed); + connect(ui->selector_ModeSelector, &CModelModeSelector::changed, this, &CModelMappingModifyForm::changed); + connect(ui->selector_SimulatorSelector, &CSimulatorSelector::changed, this, &CModelMappingModifyForm::changed); - this->ps_userChanged(); + this->userChanged(); } CModelMappingModifyForm::~CModelMappingModifyForm() @@ -90,7 +90,7 @@ namespace BlackGui Q_UNUSED(readOnly); } - void CModelMappingModifyForm::ps_userChanged() + void CModelMappingModifyForm::userChanged() { const CAuthenticatedUser user(this->getSwiftDbUser()); if (user.hasAdminRole()) @@ -103,17 +103,17 @@ namespace BlackGui ui->selector_ModeSelector->setReadOnly(true); } - CForm::ps_userChanged(); + CFormDbUser::userChanged(); } - void CModelMappingModifyForm::ps_returnPressed() + void CModelMappingModifyForm::returnPressed() { QCheckBox *cb = widgetToCheckbox(sender()); if (!cb) { return; } cb->setChecked(true); } - void CModelMappingModifyForm::ps_changed() + void CModelMappingModifyForm::changed() { QCheckBox *cb = widgetToCheckbox(sender()); if (!cb) { return; } diff --git a/src/blackgui/editors/modelmappingmodifyform.h b/src/blackgui/editors/modelmappingmodifyform.h index 5d8352b1a..719e10291 100644 --- a/src/blackgui/editors/modelmappingmodifyform.h +++ b/src/blackgui/editors/modelmappingmodifyform.h @@ -15,7 +15,6 @@ #include "form.h" #include "blackgui/blackguiexport.h" #include "blackmisc/propertyindexvariantmap.h" - #include #include #include @@ -23,9 +22,8 @@ class QCheckBox; class QWidget; -namespace BlackMisc { namespace Simulation { class CAircraftModel; } } namespace Ui { class CModelMappingModifyForm; } - +namespace BlackMisc { namespace Simulation { class CAircraftModel; } } namespace BlackGui { namespace Editors @@ -33,7 +31,7 @@ namespace BlackGui /*! * Allows to modify individual fields of the model form */ - class BLACKGUI_EXPORT CModelMappingModifyForm : public CForm + class BLACKGUI_EXPORT CModelMappingModifyForm : public CFormDbUser { Q_OBJECT @@ -42,7 +40,7 @@ namespace BlackGui explicit CModelMappingModifyForm(QWidget *parent = nullptr); //! Destructor - ~CModelMappingModifyForm(); + virtual ~CModelMappingModifyForm(); //! Get the values BlackMisc::CPropertyIndexVariantMap getValues() const; @@ -53,18 +51,17 @@ namespace BlackGui //! \copydoc CForm::setReadOnly virtual void setReadOnly(bool readOnly) override; - protected slots: - //! \copydoc CForm::ps_userChanged - virtual void ps_userChanged() override; - - private slots: - //! Return pressed - void ps_returnPressed(); - - //! Data changed - void ps_changed(); + protected: + //! \copydoc CFormDbUser::userChanged + virtual void userChanged() override; private: + //! Return pressed + void returnPressed(); + + //! Data changed + void changed(); + //! Checkbox from its corresponding widgte QCheckBox *widgetToCheckbox(QObject *widget) const;