From 0a013fc9067e952290d5ca2452bf861b944b6d78 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 18 Mar 2019 23:54:46 +0100 Subject: [PATCH] Style --- src/blackgui/components/atcbuttoncomponent.cpp | 1 - src/blackgui/components/infobarstatuscomponent.h | 2 +- src/blackgui/components/rawfsdmessagescomponent.cpp | 1 + src/blackgui/components/transpondercodespinbox.cpp | 1 - src/blackgui/components/transpondercodespinbox.h | 2 -- src/blackgui/dockwidgetinfobar.cpp | 5 +++++ src/blackgui/dockwidgetinfobar.h | 1 - src/blackgui/ticklabel.h | 8 +++----- src/blackgui/views/checkboxdelegate.cpp | 7 ++++--- src/swiftdata/swiftdata.cpp | 2 ++ src/swiftguistandard/swiftguistd.ui | 9 ++++++++- 11 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/blackgui/components/atcbuttoncomponent.cpp b/src/blackgui/components/atcbuttoncomponent.cpp index 22c16e20a..2d266a23f 100644 --- a/src/blackgui/components/atcbuttoncomponent.cpp +++ b/src/blackgui/components/atcbuttoncomponent.cpp @@ -76,7 +76,6 @@ namespace BlackGui QPushButton *button = new QPushButton(this); button->setText(station.getCallsignAsString()); if (m_withIcons) { button->setIcon(station.toPixmap()); } - // else { button->setStyleSheet("text-align: left;"); } QObject::connect(button, &QPushButton::released, this, &CAtcButtonComponent::onButtonClicked); const CVariant atcv = CVariant::fromValue(station); layout->addWidget(button, row, col++); diff --git a/src/blackgui/components/infobarstatuscomponent.h b/src/blackgui/components/infobarstatuscomponent.h index 025da8ebc..38ca70201 100644 --- a/src/blackgui/components/infobarstatuscomponent.h +++ b/src/blackgui/components/infobarstatuscomponent.h @@ -37,7 +37,7 @@ namespace BlackGui explicit CInfoBarStatusComponent(QWidget *parent = nullptr); //!Destructor - virtual ~CInfoBarStatusComponent(); + virtual ~CInfoBarStatusComponent() override; //! DBus used? void setDBusStatus(bool dbus); diff --git a/src/blackgui/components/rawfsdmessagescomponent.cpp b/src/blackgui/components/rawfsdmessagescomponent.cpp index bfe8083b7..386c73ddd 100644 --- a/src/blackgui/components/rawfsdmessagescomponent.cpp +++ b/src/blackgui/components/rawfsdmessagescomponent.cpp @@ -81,6 +81,7 @@ namespace BlackGui void CRawFsdMessagesComponent::enableDisableRawFsdMessages() { + //! \fixme KB 2019-03 hardcoded style sheet bool enable; if (ui->pb_EnableDisable->text() == "Enable") { diff --git a/src/blackgui/components/transpondercodespinbox.cpp b/src/blackgui/components/transpondercodespinbox.cpp index 5d863b242..edc91f196 100644 --- a/src/blackgui/components/transpondercodespinbox.cpp +++ b/src/blackgui/components/transpondercodespinbox.cpp @@ -7,7 +7,6 @@ */ #include "blackgui/components/transpondercodespinbox.h" - #include namespace BlackGui diff --git a/src/blackgui/components/transpondercodespinbox.h b/src/blackgui/components/transpondercodespinbox.h index 206513de6..0772168e0 100644 --- a/src/blackgui/components/transpondercodespinbox.h +++ b/src/blackgui/components/transpondercodespinbox.h @@ -17,8 +17,6 @@ #include #include -class QWidget; - namespace BlackGui { namespace Components diff --git a/src/blackgui/dockwidgetinfobar.cpp b/src/blackgui/dockwidgetinfobar.cpp index e932267e2..8f7cd52cc 100644 --- a/src/blackgui/dockwidgetinfobar.cpp +++ b/src/blackgui/dockwidgetinfobar.cpp @@ -24,6 +24,8 @@ namespace BlackGui this->setWindowTitle("Info status bar"); this->setWindowIcon(CIcons::swift24()); this->onStyleSheetsChanged(); // margins from infobar + + // style changed overridden from CDockWidget } void CDockWidgetInfoBar::addToContextMenu(QMenu *contextMenu) const @@ -34,7 +36,10 @@ namespace BlackGui void CDockWidgetInfoBar::onStyleSheetsChanged() { + // overridden from CDockWidget + if (!sGui || sGui->isShuttingDown()) { return; } const QString st = sGui->getStyleSheetUtility().style(CStyleSheetUtility::fileNameInfoBar()); + this->setStyleSheet(""); this->setStyleSheet(st); } } diff --git a/src/blackgui/dockwidgetinfobar.h b/src/blackgui/dockwidgetinfobar.h index 8b55107dd..248223a19 100644 --- a/src/blackgui/dockwidgetinfobar.h +++ b/src/blackgui/dockwidgetinfobar.h @@ -17,7 +17,6 @@ #include class QMenu; -class QWidget; namespace BlackGui { diff --git a/src/blackgui/ticklabel.h b/src/blackgui/ticklabel.h index a0105b670..e74ce9542 100644 --- a/src/blackgui/ticklabel.h +++ b/src/blackgui/ticklabel.h @@ -19,8 +19,6 @@ #include #include -class QWidget; - namespace BlackGui { //! Representing a ticked or crossed icon @@ -49,10 +47,10 @@ namespace BlackGui void tickChanged(bool ticked); private: - bool m_isPixmapTicked = false; //!< ticked state - QString m_toolTipTicked = "on"; + bool m_isPixmapTicked = false; //!< ticked state + QString m_toolTipTicked = "on"; QString m_toolTipUnticked = "off"; - QPixmap m_pixmapTicked = BlackMisc::CIcons::tick16(); + QPixmap m_pixmapTicked = BlackMisc::CIcons::tick16(); QPixmap m_pixmapUnticked = BlackMisc::CIcons::cross16(); //! Set the label diff --git a/src/blackgui/views/checkboxdelegate.cpp b/src/blackgui/views/checkboxdelegate.cpp index d40083dc6..205e93bcf 100644 --- a/src/blackgui/views/checkboxdelegate.cpp +++ b/src/blackgui/views/checkboxdelegate.cpp @@ -40,7 +40,8 @@ namespace BlackGui QCheckBox *cb = new QCheckBox(parent); if (!m_iconCheckedUrl.isEmpty() && !m_iconUncheckedUrl.isEmpty()) { - QString style = CStyleSheetUtility::styleForIconCheckBox(m_iconCheckedUrl, m_iconUncheckedUrl); + const QString style = CStyleSheetUtility::styleForIconCheckBox(m_iconCheckedUrl, m_iconUncheckedUrl); + cb->setStyleSheet(""); cb->setStyleSheet(style); } return cb; @@ -48,7 +49,7 @@ namespace BlackGui void CCheckBoxDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const { - bool v = index.model()->data(index, Qt::UserRole).toBool(); + const bool v = index.model()->data(index, Qt::UserRole).toBool(); QCheckBox *cb = qobject_cast(editor); cb->setChecked(v); } @@ -56,7 +57,7 @@ namespace BlackGui void CCheckBoxDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const { QCheckBox *cb = qobject_cast(editor); - bool v = cb->isChecked(); + const bool v = cb->isChecked(); model->setData(index, QVariant(v), Qt::EditRole); } diff --git a/src/swiftdata/swiftdata.cpp b/src/swiftdata/swiftdata.cpp index f6371bd5b..58b8cf144 100644 --- a/src/swiftdata/swiftdata.cpp +++ b/src/swiftdata/swiftdata.cpp @@ -62,6 +62,8 @@ void CSwiftData::initStyleSheet() CStyleSheetUtility::fileNameStandardWidget(), CStyleSheetUtility::fileNameSwiftData() }); + + this->setStyleSheet(""); this->setStyleSheet(s); } diff --git a/src/swiftguistandard/swiftguistd.ui b/src/swiftguistandard/swiftguistd.ui index c71b9f735..5d701399c 100644 --- a/src/swiftguistandard/swiftguistd.ui +++ b/src/swiftguistandard/swiftguistd.ui @@ -329,7 +329,14 @@ 0 - + + + + 200 + 20 + + +