From 718d5abf90ee14398f3d3d46dc084f1e3686a862 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 13 Jan 2018 05:00:19 +0100 Subject: [PATCH] Ref T219, unified selector namings and keep editable even without DB completer data. Also "private slots" -> "private" --- .../dbaircrafticaoselectorcomponent.cpp | 15 +++++------ .../dbaircrafticaoselectorcomponent.h | 27 +++++++++---------- .../dbaircrafticaoselectorcomponent.ui | 5 +--- .../dbairlineicaoselectorcomponent.cpp | 4 +-- .../dbairlineicaoselectorcomponent.h | 15 +++++------ 5 files changed, 30 insertions(+), 36 deletions(-) diff --git a/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp b/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp index 8318801b8..a5c2e1a94 100644 --- a/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp +++ b/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp @@ -50,9 +50,9 @@ namespace BlackGui this->setAcceptDrops(true); this->setAcceptedMetaTypeIds({qMetaTypeId(), qMetaTypeId()}); ui->le_Aircraft->setValidator(new CUpperCaseValidator(this)); - connect(ui->le_Aircraft, &QLineEdit::editingFinished, this, &CDbAircraftIcaoSelectorComponent::ps_dataChanged); - connect(sApp->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbAircraftIcaoSelectorComponent::ps_codesRead); - this->ps_codesRead(CEntityFlags::AircraftIcaoEntity, CEntityFlags::ReadFinished, sApp->getWebDataServices()->getAircraftIcaoCodesCount()); + connect(ui->le_Aircraft, &QLineEdit::editingFinished, this, &CDbAircraftIcaoSelectorComponent::onDataChanged); + connect(sApp->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbAircraftIcaoSelectorComponent::onCodesRead); + this->onCodesRead(CEntityFlags::AircraftIcaoEntity, CEntityFlags::ReadFinished, sApp->getWebDataServices()->getAircraftIcaoCodesCount()); } CDbAircraftIcaoSelectorComponent::~CDbAircraftIcaoSelectorComponent() @@ -188,7 +188,7 @@ namespace BlackGui return m_completerStrings; } - void CDbAircraftIcaoSelectorComponent::ps_codesRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count) + void CDbAircraftIcaoSelectorComponent::onCodesRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count) { if (!sGui || !sGui->hasWebDataServices()) { return; } if (entity.testFlag(CEntityFlags::AircraftIcaoEntity) && readState == CEntityFlags::ReadFinished) @@ -200,7 +200,7 @@ namespace BlackGui c->setCompletionMode(QCompleter::PopupCompletion); c->setMaxVisibleItems(10); c->popup()->setMinimumWidth(175); - connect(c, static_cast(&QCompleter::activated), this, &CDbAircraftIcaoSelectorComponent::ps_completerActivated); + connect(c, static_cast(&QCompleter::activated), this, &CDbAircraftIcaoSelectorComponent::onCompleterActivated); ui->le_Aircraft->setCompleter(c); m_completerIcaoDescription.reset(c); // deletes any old completer @@ -209,12 +209,11 @@ namespace BlackGui else { this->m_completerIcaoDescription.reset(nullptr); - this->setReadOnly(true); } } } - void CDbAircraftIcaoSelectorComponent::ps_dataChanged() + void CDbAircraftIcaoSelectorComponent::onDataChanged() { if (!sGui || !sGui->hasWebDataServices()) { return; } const int key = CDatastoreUtility::extractIntegerKey(ui->le_Aircraft->text()); @@ -232,7 +231,7 @@ namespace BlackGui this->setAircraftIcao(icao); } - void CDbAircraftIcaoSelectorComponent::ps_completerActivated(const QString &icaoString) + void CDbAircraftIcaoSelectorComponent::onCompleterActivated(const QString &icaoString) { const int dbKey = CDatastoreUtility::extractIntegerKey(icaoString); if (dbKey < 0) { return; } diff --git a/src/blackgui/components/dbaircrafticaoselectorcomponent.h b/src/blackgui/components/dbaircrafticaoselectorcomponent.h index 94cb61ff4..67138deb9 100644 --- a/src/blackgui/components/dbaircrafticaoselectorcomponent.h +++ b/src/blackgui/components/dbaircrafticaoselectorcomponent.h @@ -103,26 +103,25 @@ namespace BlackGui //! \copydoc QWidget::dropEvent virtual void dropEvent(QDropEvent *event) override; - private slots: - //! Distributors have been read - void ps_codesRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState readState, int count); - - //! Data have been changed - void ps_dataChanged(); - - //! Data have been changed - void ps_completerActivated(const QString &icaoString); - private: + //! Distributors have been read + void onCodesRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState readState, int count); + + //! Data have been changed + void onCompleterActivated(const QString &icaoString); + + //! Data have been changed + void onDataChanged(); + + //! Get the completer strings + //! \remark shared for performance reasons + const QStringList &completerStrings(); + QScopedPointer ui; QScopedPointer m_completerIcaoDescription; BlackMisc::Aviation::CAircraftIcaoCode m_currentIcao; Display m_display = DisplayIcaoAndId; QStringList m_completerStrings; //!< the completer strings - - //! Get the completer strings - //! \remark shared for performance reasons - const QStringList &completerStrings(); }; } // ns } // ns diff --git a/src/blackgui/components/dbaircrafticaoselectorcomponent.ui b/src/blackgui/components/dbaircrafticaoselectorcomponent.ui index f87f02b14..a82dac2b4 100644 --- a/src/blackgui/components/dbaircrafticaoselectorcomponent.ui +++ b/src/blackgui/components/dbaircrafticaoselectorcomponent.ui @@ -19,11 +19,8 @@ search for correct ICAO code - - QFrame::StyledPanel - - QFrame::Raised + QFrame::Sunken diff --git a/src/blackgui/components/dbairlineicaoselectorcomponent.cpp b/src/blackgui/components/dbairlineicaoselectorcomponent.cpp index 3645aa739..78c481767 100644 --- a/src/blackgui/components/dbairlineicaoselectorcomponent.cpp +++ b/src/blackgui/components/dbairlineicaoselectorcomponent.cpp @@ -39,7 +39,7 @@ namespace BlackGui ui->setupUi(this); this->setFocusProxy(ui->le_Airline); ui->le_Airline->setValidator(new CUpperCaseValidator(this)); - connect(ui->le_Airline, &QLineEdit::editingFinished, this, &CDbAirlineIcaoSelectorComponent::ps_dataChanged); + connect(ui->le_Airline, &QLineEdit::editingFinished, this, &CDbAirlineIcaoSelectorComponent::onDataChanged); } CDbAirlineIcaoSelectorComponent::~CDbAirlineIcaoSelectorComponent() @@ -97,7 +97,7 @@ namespace BlackGui return c; } - void CDbAirlineIcaoSelectorComponent::ps_dataChanged() + void CDbAirlineIcaoSelectorComponent::onDataChanged() { if (!sGui) { return; } QString s(ui->le_Airline->text()); diff --git a/src/blackgui/components/dbairlineicaoselectorcomponent.h b/src/blackgui/components/dbairlineicaoselectorcomponent.h index abc9d2cc5..4dbd31115 100644 --- a/src/blackgui/components/dbairlineicaoselectorcomponent.h +++ b/src/blackgui/components/dbairlineicaoselectorcomponent.h @@ -49,7 +49,7 @@ namespace BlackGui //! Destructor //! \note needed for forward declared QScopedPointer and needs to be in .cpp - ~CDbAirlineIcaoSelectorComponent(); + virtual ~CDbAirlineIcaoSelectorComponent(); //! \name Base class overrides //! @{ @@ -71,17 +71,16 @@ namespace BlackGui //! \copydoc CDbAirlineIcaoSelectorBase::createCompleter virtual QCompleter *createCompleter() override; - private slots: - //! Data have been changed - void ps_dataChanged(); - private: - QScopedPointer ui; - Display m_display = DisplayVDesignatorAndId; - //! Get the completer strings //! \remark shared for performance reasons static const QStringList &completerStrings(); + + //! Data have been changed + void onDataChanged(); + + QScopedPointer ui; + Display m_display = DisplayVDesignatorAndId; }; } // ns } // ns