Better dark styling than previous.

alimogh · Apr 25, 2019 · 5420dc0 · 5420dc0
1 parent a5536af
commit 5420dc0
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 14 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "QDarkStyleSheet"]
-	path = QDarkStyleSheet
-	url = https://github.com/ColinDuquesnoy/QDarkStyleSheet
+[submodule "Qt-Frameless-Window-DarkStyle"]
+	path = Qt-Frameless-Window-DarkStyle
+	url = https://github.com/Jorgen-VikingGod/Qt-Frameless-Window-DarkStyle
diff --git a/QDarkStyleSheet b/QDarkStyleSheet
diff --git a/Qt-Frameless-Window-DarkStyle b/Qt-Frameless-Window-DarkStyle
diff --git a/apkstudio.pro b/apkstudio.pro
@@ -6,6 +6,7 @@ TEMPLATE = app
 CONFIG += c++11
 
 HEADERS += \
+    Qt-Frameless-Window-DarkStyle/DarkStyle.h \
     sources/adbinstallworker.h \
     sources/apkdecompiledialog.h \
     sources/apkdecompileworker.h \
@@ -24,6 +25,7 @@ HEADERS += \
     sources/versionresolveworker.h
 
 SOURCES += \
+    Qt-Frameless-Window-DarkStyle/DarkStyle.cpp \
     sources/main.cpp \
     sources/adbinstallworker.cpp \
     sources/apkdecompiledialog.cpp \
@@ -43,7 +45,7 @@ SOURCES += \
     sources/versionresolveworker.cpp
 
 RESOURCES += \
-    QDarkStyleSheet/qdarkstyle/style.qrc \
+    Qt-Frameless-Window-DarkStyle/darkstyle.qrc \
     build/linux.sh \
     build/osx.sh \
     build/windows.bat \

diff --git a/resources/all.qrc b/resources/all.qrc
@@ -18,4 +18,8 @@
         <file>fugue/gear.png</file>
         <file>fugue/color.png</file>
     </qresource>
+    <qresource prefix="/styles">
+        <file>dark.qss</file>
+        <file>light.qss</file>
+    </qresource>
 </RCC>
diff --git a/resources/dark.qss b/resources/dark.qss
@@ -0,0 +1,13 @@
+SourceCodeEdit {
+    background-color: #222;
+    color: #ccc;
+    selection-background-color: #000;
+    selection-color: #fff;
+}
+
+SourceCodeSidebarWidget {
+    background-color: #000;
+    color: #aaa;
+    selection-background-color: #222;
+    selection-color: #ccc;
+}
diff --git a/resources/light.qss b/resources/light.qss
@@ -0,0 +1,16 @@
+SourceCodeEdit {
+    alternate-background-color: #ced7df;
+    background-color: #fff;
+    color: #222;
+    font-family: Courier;
+    font-size: 10pt;
+    selection-background-color: #c4dff6;
+    selection-color: #205081;
+}
+
+SourceCodeSidebarWidget {
+    background-color: #eff3f6;
+    color: #59626a;
+    selection-background-color: #ced7df;
+    selection-color: #323b43;
+}
diff --git a/sources/main.cpp b/sources/main.cpp
@@ -1,8 +1,7 @@
-#include "splashwindow.h"
 #include <QApplication>
-#include <QFile>
 #include <QSettings>
-#include <QTextStream>
+#include "splashwindow.h"
+#include "../Qt-Frameless-Window-DarkStyle/DarkStyle.h"
 
 int main(int argc, char *argv[])
 {
@@ -14,12 +13,7 @@ int main(int argc, char *argv[])
     QSettings settings;
     const bool dark = settings.value("dark_theme", false).toBool();
     if (dark) {
-        QFile qss(":/qdarkstyle/style.qss");
-        if (qss.exists() && qss.open(QFile::ReadOnly | QFile::Text)) {
-            QTextStream styles(&qss);
-            app.setStyleSheet(styles.readAll());
-            qss.close();
-        }
+        app.setStyle(new DarkStyle);
     }
     SplashWindow window;
     window.show();

diff --git a/sources/mainwindow.cpp b/sources/mainwindow.cpp
@@ -64,6 +64,12 @@ MainWindow::MainWindow(QWidget *parent)
     connect(QApplication::clipboard(), &QClipboard::dataChanged, this, &MainWindow::handleClipboardDataChanged);
     thread->start();
     QSettings settings;
+    const bool dark = settings.value("dark_theme", false).toBool();
+    QFile qss(QString(":/styles/%1.qss").arg(dark ? "dark" : "light"));
+    qss.open(QIODevice::ReadOnly | QIODevice::Text);
+    QTextStream contents(&qss);
+    setStyleSheet(contents.readAll());
+    qss.close();
     if (settings.value("app_maximized").toBool()) {
         showMaximized();
     } else {