Replaced theme selection with colorschemes

Author: murtisoft

CMakeLists.txt

@@ -64,9 +64,7 @@ qt6_add_translations(LanMessenger
 #==========================================================================================================================================<< TO DO
 #Search for NEED2TEST within the project.
 #Remove themes.
-#qApp->styleHints()->setColorScheme(Qt::ColorScheme::Dark);
-#qApp->styleHints()->setColorScheme(Qt::ColorScheme::Light);
-#qApp->styleHints()->setColorScheme(Qt::ColorScheme::Unknown);
+#colorschemes are a complete mess. How do you even get these to behave?!
 
 #File transfers dont have a timestamp parameter, but they generate their own for now. Should change this.
 #Crashing somewhere after "New connection received" and before "Accepted connection from user", (when a new peer joins network.)

sources/aformmain.cpp

@@ -25,6 +25,7 @@
 #include "messagelog.h"
 #include "history.h"
 #include <cstdlib>
+#include <qstylehints.h>
 
 lmFormMain::lmFormMain(QWidget *parent, Qt::WindowFlags flags) : QWidget(parent, flags) {
 	ui.setupUi(this);
@@ -136,6 +137,24 @@ void lmFormMain::start(void) {
 	// and the program will connect to the network before start() is called.
 	setAvatar();
 	pTrayIcon->setVisible(showSysTray);
+
+    int colorSchemeIndex = pSettings->value(IDS_COLORSCHEME, IDS_COLORSCHEME_VAL).toInt();  //NEED2TEST Kinda had to, but its messy, i dont like this.
+    switch (colorSchemeIndex) {
+    case 0:
+        qApp->styleHints()->setColorScheme(Qt::ColorScheme::Unknown);
+        break;
+    case 1:
+        qApp->styleHints()->setColorScheme(Qt::ColorScheme::Light);
+        break;
+    case 2:
+        qApp->styleHints()->setColorScheme(Qt::ColorScheme::Dark);
+        break;
+    default:
+        break;
+    }
+    QEvent event(QEvent::ThemeChange);
+    QCoreApplication::sendEvent(qApp, &event);
+
 	if(pSettings->value(IDS_AUTOSHOW, IDS_AUTOSHOW_VAL).toBool())
 		show();
 }

sources/aformsettings.cpp

@@ -22,6 +22,7 @@
 #include <QSystemTrayIcon>
 #include <QLocale>
 #include <QMessageBox>
+#include <qstylehints.h>
 #include "aformsettings.h"
 #include "soundplayer.h"
 #include "chathelper.h"
@@ -64,7 +65,6 @@ lmFormSettings::lmFormSettings(QWidget *parent, Qt::WindowFlags flags) : QDialog
 	connect(ui.btnPlaySound, SIGNAL(clicked()), this, SLOT(btnPlaySound_clicked()));
 	connect(ui.btnSoundPath, SIGNAL(clicked()), this, SLOT(btnSoundPath_clicked()));
 	connect(ui.btnResetSounds, SIGNAL(clicked()), this, SLOT(btnResetSounds_clicked()));
-    connect(ui.btnRefresfTheme, SIGNAL(clicked()), this, SLOT(btnRefreshTheme_clicked()));
 }
 
 lmFormSettings::~lmFormSettings(void) {
@@ -111,16 +111,12 @@ void lmFormSettings::init(void) {
     }
 //=========================================================
 
-	Themes themes = lmTheme::availableThemes();
-	for(int index = 0; index < themes.count(); index++)
-		ui.cboTheme->addItem(themes.at(index).name, themes.at(index).path);
-
 	for(int index = 0; index < ULV_Max; index++)
 		ui.cboUserListView->addItem(lmStrings::userListView()[index], index);
 
-	fontSize = 0;
-	font = QApplication::font();
-	color = QApplication::palette().text().color();
+    fontSize = 0;
+    font = QApplication::font();
+    color = QApplication::palette().text().color();
 	ui.lvCategories->setCurrentRow(0);
 
 	setWindowIcon(QIcon(IDR_APPICON));
@@ -298,13 +294,14 @@ void lmFormSettings::btnReset_clicked(void) {
 }
 
 void lmFormSettings::cboTheme_currentIndexChanged(int index) {
-	QString themePath = ui.cboTheme->itemData(index, Qt::UserRole).toString();
+    int colorSchemeIndex = ui.cboTheme->currentIndex();
+    changeColorScheme(colorSchemeIndex);
 
 	pMessageLog->fontSizeVal = FS_SMALL;
 	pMessageLog->localId = "Myself";
 	pMessageLog->peerId = "Jack";
 	pMessageLog->messageTime = true;
-    pMessageLog->initMessageLog(themePath);
+    pMessageLog->initMessageLog("");  //initializing empty theme path, so it retargets to default. remove later. NEED2TEST
 
 	MessageXml msg;
 	msg.addData(XN_TIME, QString::number(QDateTime::currentMSecsSinceEpoch()));
@@ -442,12 +439,6 @@ void lmFormSettings::btnResetSounds_clicked(void) {
     lvSounds_currentRowChanged(ui.lvSounds->currentRow());
 }
 
-void lmFormSettings::btnRefreshTheme_clicked()
-{
-    pMessageLog->reloadTheme();
-    cboTheme_currentIndexChanged(ui.cboTheme->currentIndex());
-}
-
 void lmFormSettings::setPageHeaderStyle(QLabel* pLabel) {
     QFont font = pLabel->font();
     int fontSize = pLabel->fontInfo().pixelSize();
@@ -599,14 +590,9 @@ void lmFormSettings::loadSettings(void) {
 	ui.rdbFileBottom->setChecked(!pSettings->value(IDS_FILETOP, IDS_FILETOP_VAL).toBool());
 	ui.txtFilePath->setText(DefinitionsDir::fileStorageDir());
 
-	QString themePath = pSettings->value(IDS_THEME, IDS_THEME_VAL).toString();
-	for(int index = 0; index < ui.cboTheme->count(); index ++) {
-		QString theme = ui.cboTheme->itemData(index, Qt::UserRole).toString();
-		if(themePath.compare(theme) == 0) {
-			ui.cboTheme->setCurrentIndex(index);
-			break;
-		}
-	}
+    int colorSchemeIndex = pSettings->value(IDS_COLORSCHEME, IDS_COLORSCHEME_VAL).toInt();
+    ui.cboTheme->setCurrentIndex(colorSchemeIndex);
+
 	int userListView = pSettings->value(IDS_USERLISTVIEW, IDS_USERLISTVIEW_VAL).toInt();
 	ui.cboUserListView->setCurrentIndex(userListView);
 	ui.chkUserListToolTip->setChecked(pSettings->value(IDS_STATUSTOOLTIP, IDS_STATUSTOOLTIP_VAL).toBool());
@@ -615,6 +601,24 @@ void lmFormSettings::loadSettings(void) {
 	ui.rdbCmdEnter->setChecked(pSettings->value(IDS_SENDKEYMOD, IDS_SENDKEYMOD_VAL).toBool());
 }
 
+void lmFormSettings::changeColorScheme(int index){
+    switch (index) {
+    case 0:
+        qApp->styleHints()->setColorScheme(Qt::ColorScheme::Unknown);
+        break;
+    case 1:
+        qApp->styleHints()->setColorScheme(Qt::ColorScheme::Light);
+        break;
+    case 2:
+        qApp->styleHints()->setColorScheme(Qt::ColorScheme::Dark);
+        break;
+    default:
+        break;
+    }
+    QEvent event(QEvent::ThemeChange);
+    QCoreApplication::sendEvent(qApp, &event);
+}
+
 void lmFormSettings::saveSettings(void) {
 	pSettings->setValue(IDS_VERSION, IDA_VERSION);
 
@@ -717,8 +721,8 @@ void lmFormSettings::saveSettings(void) {
 	pSettings->setValue(IDS_FILETOP, ui.rdbFileTop->isChecked(), IDS_FILETOP_VAL);
 	pSettings->setValue(IDS_FILESTORAGEPATH, ui.txtFilePath->text(), IDS_FILESTORAGEPATH_VAL);
 
-	QString themePath = ui.cboTheme->itemData(ui.cboTheme->currentIndex(), Qt::UserRole).toString();
-	pSettings->setValue(IDS_THEME, themePath, IDS_THEME_VAL);
+    int colorSchemeIndex = ui.cboTheme->currentIndex();
+    pSettings->setValue(IDS_COLORSCHEME, colorSchemeIndex, IDS_COLORSCHEME_VAL);
 	pSettings->setValue(IDS_USERLISTVIEW, ui.cboUserListView->currentIndex(), IDS_USERLISTVIEW_VAL);
 	pSettings->setValue(IDS_STATUSTOOLTIP, ui.chkUserListToolTip->isChecked(), IDS_STATUSTOOLTIP_VAL);
 

sources/aformsettings.h

@@ -53,6 +53,7 @@ class lmFormSettings : public QDialog {
 
 	void init(void);
 	void settingsChanged(void);
+    void changeColorScheme(int index);
 
 signals:
 	void historyCleared(void);
@@ -87,7 +88,6 @@ private slots:
 	void btnPlaySound_clicked(void);
 	void btnSoundPath_clicked(void);
 	void btnResetSounds_clicked(void);
-    void btnRefreshTheme_clicked(void);
 
 
 private:

sources/aformsettings.ui

@@ -115,7 +115,7 @@
         <enum>QFrame::Shadow::Plain</enum>
        </property>
        <property name="currentIndex">
-        <number>3</number>
+        <number>0</number>
        </property>
        <widget class="QWidget" name="pageGeneral">
         <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -2161,6 +2161,21 @@
                   <verstretch>0</verstretch>
                  </sizepolicy>
                 </property>
+                <item>
+                 <property name="text">
+                  <string>System</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>Light</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>Dark</string>
+                 </property>
+                </item>
                </widget>
               </item>
               <item>
@@ -2176,13 +2191,6 @@
                 </property>
                </spacer>
               </item>
-              <item>
-               <widget class="QPushButton" name="btnRefresfTheme">
-                <property name="text">
-                 <string>Refresh</string>
-                </property>
-               </widget>
-              </item>
              </layout>
             </item>
             <item>

sources/settings.h

@@ -144,6 +144,8 @@
 #define IDS_THEME_OLD_VAL		":/themes/Classic"
 #define IDS_THEME				"Appearance/Theme"
 #define IDS_THEME_VAL			":/themes/Classic"
+#define IDS_COLORSCHEME			"Appearance/ColorScheme"
+#define IDS_COLORSCHEME_VAL		"0"
 #define IDS_USERLISTVIEW		"Appearance/UserListView"
 #define IDS_USERLISTVIEW_VAL	ULV_Detailed
 #define IDS_STATUSTOOLTIP		"Appearance/StatusToolTip"