From cd095dbb3fcdee745eb8fa0a63cd5c159d4c4ef7 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 2 Jan 2019 06:43:26 +0100 Subject: [PATCH] Misc. smaller UI adjustments/style --- src/blackgui/components/colorselector.ui | 27 ---- .../components/dbaircrafticaocomponent.ui | 13 +- src/blackgui/components/dbliverycomponent.cpp | 3 +- src/blackgui/components/dbliverycomponent.ui | 8 +- .../components/dbquickmappingwizard.cpp | 23 ++- .../components/dbquickmappingwizard.h | 9 +- .../components/dbquickmappingwizard.ui | 142 +++++++++++------- src/blackgui/editors/aircraftmodelform.ui | 14 +- src/blackgui/editors/validationindicator.cpp | 18 +-- src/blackgui/filters/aircrafticaofilterbar.h | 6 +- src/blackgui/stylesheetutility.cpp | 5 +- 11 files changed, 130 insertions(+), 138 deletions(-) diff --git a/src/blackgui/components/colorselector.ui b/src/blackgui/components/colorselector.ui index 04007edc5..09acfa484 100644 --- a/src/blackgui/components/colorselector.ui +++ b/src/blackgui/components/colorselector.ui @@ -2,14 +2,6 @@ CColorSelector - - - 0 - 0 - 136 - 24 - - 140 @@ -22,12 +14,6 @@ select a color - - QFrame::StyledPanel - - - QFrame::Raised - 0 @@ -77,19 +63,6 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - diff --git a/src/blackgui/components/dbaircrafticaocomponent.ui b/src/blackgui/components/dbaircrafticaocomponent.ui index 5cb81d2c3..6fb78e85b 100644 --- a/src/blackgui/components/dbaircrafticaocomponent.ui +++ b/src/blackgui/components/dbaircrafticaocomponent.ui @@ -2,14 +2,6 @@ CDbAircraftIcaoComponent - - - 0 - 0 - 400 - 300 - - Search and find aircraft ICAO codes @@ -46,11 +38,8 @@ 100 - - QFrame::StyledPanel - - QFrame::Raised + QFrame::Plain diff --git a/src/blackgui/components/dbliverycomponent.cpp b/src/blackgui/components/dbliverycomponent.cpp index afd5ac8d6..e2bea4867 100644 --- a/src/blackgui/components/dbliverycomponent.cpp +++ b/src/blackgui/components/dbliverycomponent.cpp @@ -20,6 +20,7 @@ using namespace BlackCore; using namespace BlackGui::Views; +using namespace BlackMisc::Aviation; using namespace BlackMisc::Network; namespace BlackGui @@ -57,7 +58,7 @@ namespace BlackGui ui->filter_Livery->filter(livery); } - void CDbLiveryComponent::filterByAirline(const BlackMisc::Aviation::CAirlineIcaoCode &icao) + void CDbLiveryComponent::filterByAirline(const CAirlineIcaoCode &icao) { ui->filter_Livery->filter(icao); } diff --git a/src/blackgui/components/dbliverycomponent.ui b/src/blackgui/components/dbliverycomponent.ui index ea37c6afc..774b9efca 100644 --- a/src/blackgui/components/dbliverycomponent.ui +++ b/src/blackgui/components/dbliverycomponent.ui @@ -41,8 +41,14 @@ 0 - + + + + 200 + 0 + + QFrame::StyledPanel diff --git a/src/blackgui/components/dbquickmappingwizard.cpp b/src/blackgui/components/dbquickmappingwizard.cpp index 8c1c6354e..52c54b356 100644 --- a/src/blackgui/components/dbquickmappingwizard.cpp +++ b/src/blackgui/components/dbquickmappingwizard.cpp @@ -16,6 +16,7 @@ #include "blackgui/views/distributorview.h" #include "blackgui/uppercasevalidator.h" #include "blackgui/guiapplication.h" +#include "blackgui/guiutility.h" #include "blackcore/webdataservices.h" #include "blackcore/db/databasewriter.h" @@ -44,6 +45,8 @@ namespace BlackGui ui->selector_AirlineIcaoCode->displayWithIcaoDescription(false); ui->editor_AircraftModel->allowDrop(false); ui->editor_AircraftModel->setReadOnly(true); + CGuiUtility::checkBoxReadOnly(ui->cb_Military, true); + CGuiUtility::checkBoxReadOnly(ui->cb_VirtualAirline, true); connect(sGui->getWebDataServices(), &CWebDataServices::swiftDbAllDataRead, this, &CDbQuickMappingWizard::onWebDataRead, Qt::QueuedConnection); connect(sGui->getWebDataServices()->getDatabaseWriter(), &CDatabaseWriter::publishedModels, this, &CDbQuickMappingWizard::onPublishedModels, Qt::QueuedConnection); @@ -118,12 +121,12 @@ namespace BlackGui ui->rb_ColorLivery->setChecked(true); } - this->m_model = model; + m_model = model; } void CDbQuickMappingWizard::clear() { - this->m_lastId = 0; + m_lastId = 0; ui->editor_AircraftModel->clear(); ui->comp_Log->clear(); this->restart(); @@ -201,9 +204,9 @@ namespace BlackGui void CDbQuickMappingWizard::currentWizardPageChanged(int id) { - const bool forward = id > this->m_lastId; + const bool forward = id > m_lastId; const bool colorMode = ui->rb_ColorLivery->isChecked(); - this->m_lastId = id; + m_lastId = id; const Pages page = static_cast(id); switch (page) @@ -251,9 +254,15 @@ namespace BlackGui ui->comp_Log->clear(); } break; + case PageLastConfirmation: + { + // void + } + break; case PageSendStatus: { this->writeModelToDb(); + this->button(BackButton)->hide(); } break; default: @@ -301,17 +310,17 @@ namespace BlackGui void CDbQuickMappingWizard::consolidateModel() { - CAircraftModel model = this->m_model; + CAircraftModel model = m_model; model.setAircraftIcaoCode(ui->editor_AircraftModel->getAircraftIcao()); model.setDistributor(ui->editor_AircraftModel->getDistributor()); model.setLivery(ui->editor_AircraftModel->getLivery()); - this->m_model = model; + m_model = model; } void CDbQuickMappingWizard::writeModelToDb() { this->consolidateModel(); - const CStatusMessageList msgs = sGui->getWebDataServices()->getDatabaseWriter()->asyncPublishModel(this->m_model); + const CStatusMessageList msgs = sGui->getWebDataServices()->getDatabaseWriter()->asyncPublishModel(m_model); ui->comp_Log->appendStatusMessagesToList(msgs); } diff --git a/src/blackgui/components/dbquickmappingwizard.h b/src/blackgui/components/dbquickmappingwizard.h index 93e1e92aa..070248368 100644 --- a/src/blackgui/components/dbquickmappingwizard.h +++ b/src/blackgui/components/dbquickmappingwizard.h @@ -38,8 +38,9 @@ namespace BlackGui PageColor, PageLiverySelect, PageDistributorSelect, - PageConfirmation, + PageConfirmation, //!< model from and validation PageCredentials, + PageLastConfirmation, //!< just info to say data will be send PageSendStatus }; @@ -102,9 +103,9 @@ namespace BlackGui //! Models published void onPublishedModels(const BlackMisc::Simulation::CAircraftModelList &modelsPublished, - const BlackMisc::Simulation::CAircraftModelList &modelsSkipped, - const BlackMisc::CStatusMessageList &messages, - bool requestSuccessful, bool directWrite); + const BlackMisc::Simulation::CAircraftModelList &modelsSkipped, + const BlackMisc::CStatusMessageList &messages, + bool requestSuccessful, bool directWrite); //! Web data have been read void onWebDataRead(); diff --git a/src/blackgui/components/dbquickmappingwizard.ui b/src/blackgui/components/dbquickmappingwizard.ui index 5f4f07449..35fd841cf 100644 --- a/src/blackgui/components/dbquickmappingwizard.ui +++ b/src/blackgui/components/dbquickmappingwizard.ui @@ -188,6 +188,47 @@ + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 20 + 16777215 + + + + + + + :/pastel/icons/pastel/16/infomation.png + + + + + + + Hint: Start virtual airlines with "V", e.g. "VLHA" + + + + + + @@ -242,7 +283,14 @@ - + + + + 50 + 16777215 + + + @@ -252,47 +300,13 @@ - - - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - + - 20 + 50 16777215 - - - - - :/pastel/icons/pastel/16/infomation.png - - - - - - - Hint: Start virtual airlines with "V", e.g. "VLHA" - @@ -356,25 +370,34 @@ - - - - 0 - 60 - - - - - 300 - 16777215 - - - - QFrame::StyledPanel - - - QFrame::Raised + + + Select color + + + + + + 0 + 60 + + + + + 300 + 16777215 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + @@ -408,7 +431,14 @@ - + + + + 0 + 250 + + + diff --git a/src/blackgui/editors/aircraftmodelform.ui b/src/blackgui/editors/aircraftmodelform.ui index e46140cdf..e81195af1 100644 --- a/src/blackgui/editors/aircraftmodelform.ui +++ b/src/blackgui/editors/aircraftmodelform.ui @@ -11,7 +11,7 @@ - Frame + Aircraft model form @@ -28,12 +28,6 @@ - - QFrame::NoFrame - - - QFrame::Plain - 0 @@ -125,12 +119,6 @@ Qt::StrongFocus - - QFrame::StyledPanel - - - QFrame::Raised - diff --git a/src/blackgui/editors/validationindicator.cpp b/src/blackgui/editors/validationindicator.cpp index 91da44ae4..361cf721d 100644 --- a/src/blackgui/editors/validationindicator.cpp +++ b/src/blackgui/editors/validationindicator.cpp @@ -32,10 +32,10 @@ namespace BlackGui this->setFrameStyle(QFrame::StyledPanel); this->setFrameShadow(QFrame::Raised); this->setAutoFillBackground(true); - this->m_originalStyleSheet = this->styleSheet(); - connect(&this->m_resetTimer, &QTimer::timeout, this, &CValidationIndicator::clear); - this->m_resetTimer.setObjectName(this->objectName().append(":").append("resetTimer")); - this->m_resetTimer.start(ResetInterval); + m_originalStyleSheet = this->styleSheet(); + connect(&m_resetTimer, &QTimer::timeout, this, &CValidationIndicator::clear); + m_resetTimer.setObjectName(this->objectName().append(":").append("resetTimer")); + m_resetTimer.start(ResetInterval); } CValidationIndicator::~CValidationIndicator() @@ -44,27 +44,27 @@ namespace BlackGui void CValidationIndicator::passed() { this->show(); - setBackgroundColor("green"); + this->setBackgroundColor("green"); ui->lbl_Icon->setPixmap(CIcons::tick16()); } void CValidationIndicator::failed() { this->show(); - setBackgroundColor("red"); + this->setBackgroundColor("red"); ui->lbl_Icon->setPixmap(CStatusMessage::convertToIcon(CStatusMessage::SeverityError)); } void CValidationIndicator::warnings() { this->show(); - setBackgroundColor("yellow"); + this->setBackgroundColor("yellow"); ui->lbl_Icon->setPixmap(CStatusMessage::convertToIcon(CStatusMessage::SeverityWarning)); } void CValidationIndicator::clear() { - setBackgroundColor(""); + this->setBackgroundColor(""); ui->lbl_Icon->clear(); this->hide(); } @@ -107,7 +107,7 @@ namespace BlackGui { if (colorName.isEmpty()) { - this->setStyleSheet(this->m_originalStyleSheet); + this->setStyleSheet(m_originalStyleSheet); } else { diff --git a/src/blackgui/filters/aircrafticaofilterbar.h b/src/blackgui/filters/aircrafticaofilterbar.h index df5f8c59a..fadba7cf9 100644 --- a/src/blackgui/filters/aircrafticaofilterbar.h +++ b/src/blackgui/filters/aircrafticaofilterbar.h @@ -20,8 +20,7 @@ #include #include -class QWidget; - +namespace Ui { class CAircraftIcaoFilterBar; } namespace BlackMisc { namespace Aviation @@ -30,7 +29,6 @@ namespace BlackMisc class CAircraftIcaoCodeList; } } -namespace Ui { class CAircraftIcaoFilterBar; } namespace BlackGui { namespace Filters @@ -40,7 +38,7 @@ namespace BlackGui */ class BLACKGUI_EXPORT CAircraftIcaoFilterBar : public CFilterWidget, - public BlackGui::Models::IModelFilterProvider + public Models::IModelFilterProvider { Q_OBJECT diff --git a/src/blackgui/stylesheetutility.cpp b/src/blackgui/stylesheetutility.cpp index 1c91c135b..165f3dd9e 100644 --- a/src/blackgui/stylesheetutility.cpp +++ b/src/blackgui/stylesheetutility.cpp @@ -278,10 +278,7 @@ namespace BlackGui const QString c = combinedStyleAndWeight.toLower(); for (const QString &w : fontWeights()) { - if (c.contains(w)) - { - return w; - } + if (c.contains(w)) { return w; } } return n; }