Fixed functionality for changing the theme (custom or standard)

Nighty3098 · Jul 17, 2024 · 9b15a73 · 9b15a73
1 parent f73238a
commit 9b15a73
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/src/CodeKeeper/main.cpp b/src/CodeKeeper/main.cpp
@@ -27,16 +27,16 @@ bool loadApp(QSplashScreen *psplash)
 
 int main(int argc, char *argv[])
 {
-    QFile file(":/stylesheet/custom_stylesheet.qss");
-    file.open(QFile::ReadOnly);
+    // QFile file(":/stylesheet/custom_stylesheet.qss");
+    // file.open(QFile::ReadOnly);
 
     QApplication a(argc, argv);
 
     // QSplashScreen splash(QPixmap(":/icon.png"));
     // splash.show();
 
     MainWindow keeper;
-    a.setStyleSheet(file.readAll());
+    // a.setStyleSheet(file.readAll());
 
     keeper.setWindowIcon(QIcon(":/icon.png"));
 

diff --git a/src/CodeKeeper/mainwindow.cpp b/src/CodeKeeper/mainwindow.cpp
@@ -35,21 +35,26 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 
     getSettingsData();
 
-    if(isCustomTheme == true) {
+    if (isCustomTheme) {
         QFile custom_theme(":/stylesheet/custom_stylesheet.qss");
-        custom_theme.open(QFile::ReadOnly);
-
-        qDebug() << "Loading custom stylesheet..." << custom_theme.readAll();
-
-        setStyleSheet(custom_theme.readAll());
-    }
-    else {
+        if (custom_theme.open(QFile::ReadOnly)) {
+            QString customStyleSheet = custom_theme.readAll();
+            qDebug() << "Loading custom stylesheet:" << customStyleSheet;
+            setStyleSheet(customStyleSheet);
+            custom_theme.close();
+        } else {
+            qDebug() << "Failed to open custom stylesheet file";
+        }
+    } else {
         QFile theme_file(":/stylesheet/stylesheet.qss");
-        theme_file.open(QFile::ReadOnly);
-
-        qDebug() << "Loading default stylesheet..." << theme_file.readAll();
-
-        setStyleSheet(theme_file.readAll());
+        if (theme_file.open(QFile::ReadOnly)) {
+            QString defaultStyleSheet = theme_file.readAll();
+            qDebug() << "Loading default stylesheet:" << defaultStyleSheet;
+            setStyleSheet(defaultStyleSheet);
+            theme_file.close();
+        } else {
+            qDebug() << "Failed to open default stylesheet file";
+        }
     }
 
     closeBtn = new QPushButton();