Themeability (#186)

* add css (qss) * Include css * Merge pull request #6 from Fair-Exchange/css Css * fix * beta blue * fix * YellowFevers UI work * Merge pull request #7 from Fair-Exchange/css Css - YellowFevers UI work * Update mainwindow.cpp * Update mainwindow.ui * Merge pull request #6 from OleksandrBlack/css move Tx list to balance tab * Ease of use General usability improvements * Delete main.css * style for tab * Merge pull request #7 from YellowFeveRs/UI-work General UI improvements * updated tab styling * Merge pull request #8 from Fair-Exchange/css Css * fix * fix for Windows * fix for Windows * fix * Merge pull request #10 from Fair-Exchange/master Merge pull request #4 from OleksandrBlack/master * Merge pull request #10 from Fair-Exchange/master Merge pull request #4 from OleksandrBlack/master * Merge pull request #11 from OleksandrBlack/css Css * Merge pull request #12 from OleksandrBlack/style blue prepare * revert * Update zec_qt_wallet_zh.ts * Update zec_qt_wallet_es.ts * Update zec_qt_wallet_fr.ts * Update zec_qt_wallet_it.ts * Update zec_qt_wallet_pt.ts * Update json.hpp * Update json.hpp * Update about.ui * Update mainwindow.ui * Update connection.ui * Update connection.cpp * Update connection.cpp * Update application.qrc * Update mainwindow.cpp * Update settings.ui
2019-09-27 11:27:15 -06:00
parent 77585cf20a
commit e7b08612fa
19 changed files with 2120 additions and 67 deletions
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -29,6 +29,22 @@ MainWindow::MainWindow(QWidget *parent) :
    QMainWindow(parent),
    ui(new Ui::MainWindow)
 {
+	    
+
+	// Include css    
+    QString theme_name;
+    try
+    {
+       theme_name = Settings::getInstance()->get_theme_name();
+    }
+    catch (...)
+    {
+        theme_name = "default";
+    }
+
+    this->slot_change_theme(theme_name);
+
+	    
    ui->setupUi(this);
    logger = new Logger(this, QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("zec-qt-wallet.log"));

@@ -116,6 +132,7 @@ MainWindow::MainWindow(QWidget *parent) :
    // Initialize to the balances tab
    ui->tabWidget->setCurrentIndex(0);

+
    // The zcashd tab is hidden by default, and only later added in if the embedded zcashd is started
    zcashdtab = ui->tabWidget->widget(4);
    ui->tabWidget->removeTab(4);
@@ -484,6 +501,12 @@ void MainWindow::setupSettingsModal() {
            }
        });

+        // Setup theme combo
+        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)));
+
        // Save sent transactions
        settings.chkSaveTxs->setChecked(Settings::getInstance()->getSaveZtxs());

@@ -1602,6 +1625,35 @@ void MainWindow::updateLabels() {
    updateLabelsAutoComplete();
 }

+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
+    QString saved_theme_name;
+    try
+    {
+       saved_theme_name = Settings::getInstance()->get_theme_name();
+    }
+    catch (...)
+    {
+        saved_theme_name = "default";
+    }
+
+    QFile qFile(":/css/res/css/" + saved_theme_name +".css");
+    if (qFile.open(QFile::ReadOnly))
+    {
+      QString styleSheet = QLatin1String(qFile.readAll());
+      this->setStyleSheet(styleSheet);
+    }
+
+}
+
 MainWindow::~MainWindow()
 {
    delete ui;
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -81,6 +81,9 @@ public:

    void doClose();

+public slots:
+    void slot_change_theme(const QString& themeName);
+
 private:    
    void closeEvent(QCloseEvent* event);

--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -149,6 +149,15 @@ void Settings::setAllowCustomFees(bool allow) {
    QSettings().setValue("options/customfees", allow);
 }

+QString Settings::get_theme_name() {
+    // Load from the QT Settings.
+    return QSettings().value("options/theme_name", false).toString();
+}
+
+void Settings::set_theme_name(QString theme_name) {
+    QSettings().setValue("options/theme_name", theme_name);
+}
+
 bool Settings::getSaveZtxs() {
    // Load from the QT Settings. 
    return QSettings().value("options/savesenttx", true).toBool();
--- a/src/settings.h
+++ b/src/settings.h
@@ -68,7 +68,10 @@ public:

    bool    getCheckForUpdates();
    void    setCheckForUpdates(bool allow);
-            
+
+    QString get_theme_name();
+    void set_theme_name(QString theme_name);
+
    bool    isSaplingActive();

    void    setUsingZcashConf(QString confLocation);
@@ -142,4 +145,4 @@ private:
    double  zecPrice          = 0.0;
 };

-#endif // SETTINGS_H
+#endif // SETTINGS_H
--- a/src/settings.ui
+++ b/src/settings.ui
@@ -7,7 +7,7 @@
    <x>0</x>
    <y>0</y>
    <width>540</width>
-    <height>504</height>
+    <height>539</height>
   </rect>
  </property>
  <property name="minimumSize">
@@ -145,18 +145,43 @@
       <string>Options</string>
      </attribute>
      <layout class="QGridLayout" name="gridLayout">
-       <item row="14" column="0" colspan="2">
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
+       <item row="10" column="0" colspan="2">
+        <widget class="QLabel" name="label_8">
+         <property name="text">
+          <string>Connect to github on startup to check for updates</string>
         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
+        </widget>
+       </item>
+       <item row="6" column="0" colspan="2">
+        <widget class="QLabel" name="label_7">
+         <property name="text">
+          <string>Normally, change from t-Addresses goes to another t-Address. Checking this option will send the change to your shielded sapling address instead. Check this option to increase your privacy.</string>
         </property>
-        </spacer>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QPushButton" name="btnClearSaved">
+         <property name="text">
+          <string>Clear History</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0" colspan="2">
+        <widget class="QCheckBox" name="chkSaveTxs">
+         <property name="text">
+          <string>Remember shielded transactions</string>
+         </property>
+        </widget>
+       </item>
+       <item row="12" column="0" colspan="2">
+        <widget class="QLabel" name="label_10">
+         <property name="text">
+          <string>Connect to the internet to fetch ZEC prices</string>
+         </property>
+        </widget>
       </item>
       <item row="2" column="0">
        <spacer name="horizontalSpacer">
@@ -171,44 +196,6 @@
         </property>
        </spacer>
       </item>
-       <item row="7" column="0">
-        <widget class="QCheckBox" name="chkTor">
-         <property name="text">
-          <string>Connect via Tor</string>
-         </property>
-        </widget>
-       </item>
-       <item row="9" column="0" colspan="2">
-        <widget class="QCheckBox" name="chkCheckUpdates">
-         <property name="text">
-          <string>Check github for updates at startup</string>
-         </property>
-        </widget>
-       </item>
-       <item row="13" column="0" colspan="2">
-        <widget class="Line" name="line_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0" colspan="2">
-        <widget class="QCheckBox" name="chkSaveTxs">
-         <property name="text">
-          <string>Remember shielded transactions</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="0" colspan="2">
-        <widget class="QLabel" name="label_7">
-         <property name="text">
-          <string>Normally, change from t-Addresses goes to another t-Address. Checking this option will send the change to your shielded sapling address instead. Check this option to increase your privacy.</string>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
       <item row="4" column="0" colspan="2">
        <widget class="QLabel" name="label_6">
         <property name="text">
@@ -219,10 +206,10 @@
         </property>
        </widget>
       </item>
-       <item row="2" column="1">
-        <widget class="QPushButton" name="btnClearSaved">
+       <item row="9" column="0" colspan="2">
+        <widget class="QCheckBox" name="chkCheckUpdates">
         <property name="text">
-          <string>Clear History</string>
+          <string>Check github for updates at startup</string>
         </property>
        </widget>
       </item>
@@ -236,13 +223,6 @@
         </property>
        </widget>
       </item>
-       <item row="3" column="0">
-        <widget class="QCheckBox" name="chkCustomFees">
-         <property name="text">
-          <string>Allow custom fees</string>
-         </property>
-        </widget>
-       </item>
       <item row="5" column="0" colspan="2">
        <widget class="QCheckBox" name="chkAutoShield">
         <property name="text">
@@ -250,6 +230,19 @@
         </property>
        </widget>
       </item>
+       <item row="16" column="0" colspan="2">
+        <widget class="Line" name="line_2">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
       <item row="8" column="0" colspan="2">
        <widget class="QLabel" name="lblTor">
         <property name="text">
@@ -260,17 +253,30 @@
         </property>
        </widget>
       </item>
-       <item row="10" column="0" colspan="2">
-        <widget class="QLabel" name="label_8">
+       <item row="17" column="0" colspan="2">
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="7" column="0">
+        <widget class="QCheckBox" name="chkTor">
         <property name="text">
-          <string>Connect to github on startup to check for updates</string>
+          <string>Connect via Tor</string>
         </property>
        </widget>
       </item>
-       <item row="12" column="0" colspan="2">
-        <widget class="QLabel" name="label_10">
+       <item row="3" column="0">
+        <widget class="QCheckBox" name="chkCustomFees">
         <property name="text">
-          <string>Connect to the internet to fetch ZEC prices</string>
+          <string>Allow custom fees</string>
         </property>
        </widget>
       </item>
@@ -281,6 +287,52 @@
         </property>
        </widget>
       </item>
+       <item row="15" column="0">
+        <widget class="QLabel" name="label_20">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Theme</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="15" column="1">
+        <widget class="QComboBox" name="comboBoxTheme">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <item>
+          <property name="text">
+           <string>default</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>blue</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>light</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>dark</string>
+          </property>
+         </item>
+        </widget>
+       </item>
      </layout>
     </widget>
     <widget class="QWidget" name="tab_3">