From 07a44dfc086712164a7ac937e2b97e72c0208df5 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 8 Aug 2018 20:36:30 +0200 Subject: [PATCH] UI adjustmnets settings dialog, overview button --- src/blackgui/components/coresettingsdialog.cpp | 9 +++++++++ src/blackgui/components/coresettingsdialog.h | 3 +++ src/blackgui/components/coresettingsdialog.ui | 14 +------------- src/blackgui/share/qss/stdwidget.qss | 8 ++++++++ 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/blackgui/components/coresettingsdialog.cpp b/src/blackgui/components/coresettingsdialog.cpp index 2e1c6cef0..586e5754d 100644 --- a/src/blackgui/components/coresettingsdialog.cpp +++ b/src/blackgui/components/coresettingsdialog.cpp @@ -10,6 +10,7 @@ #include "coresettingsdialog.h" #include "ui_coresettingsdialog.h" #include "blackgui/guiapplication.h" +#include namespace BlackGui { @@ -22,9 +23,17 @@ namespace BlackGui Q_ASSERT(sGui); ui->setupUi(this); this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); + QPushButton *overview = ui->bb_CoreSettingsDialog->button(QDialogButtonBox::Reset); + overview->setText("Overview"); + connect(overview, &QPushButton::released, this, &CCoreSettingsDialog::showOverview); } CCoreSettingsDialog::~CCoreSettingsDialog() { } + + void CCoreSettingsDialog::showOverview() + { + ui->comp_SettingsComponent->setSettingsOverviewTab(); + } } // ns } // ns diff --git a/src/blackgui/components/coresettingsdialog.h b/src/blackgui/components/coresettingsdialog.h index a307dcccf..3ca0c7ada 100644 --- a/src/blackgui/components/coresettingsdialog.h +++ b/src/blackgui/components/coresettingsdialog.h @@ -37,6 +37,9 @@ namespace BlackGui private: QScopedPointer ui; + + //! Show the overview tab + void showOverview(); }; } // ns } // ns diff --git a/src/blackgui/components/coresettingsdialog.ui b/src/blackgui/components/coresettingsdialog.ui index f4643e369..c1412abfc 100644 --- a/src/blackgui/components/coresettingsdialog.ui +++ b/src/blackgui/components/coresettingsdialog.ui @@ -20,18 +20,6 @@ swift settings - - 4 - - - 4 - - - 4 - - - 4 - @@ -41,7 +29,7 @@ Qt::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset diff --git a/src/blackgui/share/qss/stdwidget.qss b/src/blackgui/share/qss/stdwidget.qss index 5239c19bc..062ae15e2 100644 --- a/src/blackgui/share/qss/stdwidget.qss +++ b/src/blackgui/share/qss/stdwidget.qss @@ -99,6 +99,14 @@ BlackGui--Components--CSetupLoadingDialog #fr_Details { } */ +/* core settings */ +/* needed for CCoreSettingsDialog */ +/* BlackGui::Components::CSettingsComponent */ +BlackGui--Components--CCoreSettingsDialog { + background: black; /* background is background color here */ + background-image: url(:/textures/icons/textures/texture-inner.jpg); +} + QFileDialog #sidebar { background: black; }