From 5cff40c63ef4bb37a17b419c5532a5e5042228f5 Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Fri, 27 Sep 2019 10:29:36 -0700 Subject: [PATCH] Update CSS and add restart warning --- res/css/dark.css | 2 +- res/css/default.css | 2 +- res/css/light.css | 2 +- src/mainwindow.cpp | 11 +++++------ 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/res/css/dark.css b/res/css/dark.css index 826ed99..7846b25 100644 --- a/res/css/dark.css +++ b/res/css/dark.css @@ -1,5 +1,5 @@ -QWidget, QMainWindow, QMenuBar, QMenu, QDialog, QTabWidget, QTableView, QTableView::item, QScrollArea, QGroupBox, QPlainTextEdit, QLineEdit, QLabel +QWidget, QMainWindow, QMenuBar, QMenu, QDialog, QTabWidget, QTableView, QTableView::item, QScrollArea, QGroupBox, QPlainTextEdit, QLineEdit, QLabel, MainWindow { background-color: #303335; color: #ffffff; diff --git a/res/css/default.css b/res/css/default.css index f34f1dc..ac10db5 100644 --- a/res/css/default.css +++ b/res/css/default.css @@ -1,4 +1,4 @@ -QWidget, QMainWindow, QMenuBar, QMenu, QDialog, QTabWidget, QTableView, QTableView::item, QScrollArea, QGroupBox, QPlainTextEdit, QLineEdit, QLabel +QWidget, QMainWindow, QMenuBar, QMenu, QDialog, QTabWidget, QTableView, QTableView::item, QScrollArea, QGroupBox, QPlainTextEdit, QLineEdit, QLabel, MainWindow { /**/ diff --git a/res/css/light.css b/res/css/light.css index e48c6bb..16b9a0b 100644 --- a/res/css/light.css +++ b/res/css/light.css @@ -1,4 +1,4 @@ -QWidget, QMainWindow, QMenuBar, QMenu, QDialog, QTabWidget, QTableView, QTableView::item, QScrollArea, QGroupBox, QWidget, QPlainTextEdit, QLineEdit, QLabel +QWidget, QMainWindow, QMenuBar, QMenu, QDialog, QTabWidget, QTableView, QTableView::item, QScrollArea, QGroupBox, QWidget, QPlainTextEdit, QLineEdit, QLabel, MainWindow { background-color: #dadada; color: #000000; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 5335853..240b492 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -505,7 +505,11 @@ void MainWindow::setupSettingsModal() { int theme_index = settings.comboBoxTheme->findText(Settings::getInstance()->get_theme_name(), Qt::MatchExactly); settings.comboBoxTheme->setCurrentIndex(theme_index); - QObject::connect(settings.comboBoxTheme, SIGNAL(currentIndexChanged(QString)), this, SLOT(slot_change_theme(QString))); + QObject::connect(settings.comboBoxTheme, &QComboBox::currentTextChanged, [=] (QString theme_name) { + this->slot_change_theme(theme_name); + // Tell the user to restart + QMessageBox::information(this, tr("Restart"), tr("Please restart ZecWallet to have the theme apply"), QMessageBox::Ok); + }); // Save sent transactions settings.chkSaveTxs->setChecked(Settings::getInstance()->getSaveZtxs()); @@ -1627,11 +1631,6 @@ void MainWindow::updateLabels() { void MainWindow::slot_change_theme(const QString& theme_name) { - /* - QMessageBox msgBox; - msgBox.setText(theme_name); - msgBox.exec(); - */ Settings::getInstance()->set_theme_name(theme_name); // Include css