Support dark/light mode selection with env var TRIK_STUDIO_THEME

Author: iakov

qrgui/mainWindow/mainWindow.cpp

@@ -713,45 +713,31 @@ bool MainWindow::windowsIsInDarkTheme()
 }
 
 void MainWindow::initDarkPalette() {
-	if (QSysInfo::productType() != "windows") {
-		return;
-	}
-
-	const auto &platform = QString::fromUtf8(qgetenv("TRIK_STUDIO_THEME"));
-	constexpr auto lightThemeMessage = "A LIGHT THEME HAS BEEN SELECTED";
-	QLOG_INFO() << "TRIK_STUDIO_THEME IS" << platform;
-
-	if (platform == "light") {
-		QLOG_INFO() << lightThemeMessage;
-		return;
-	}
-
-	if (platform != "auto" && platform != "dark" && !platform.isEmpty()) {
-		QLOG_INFO() << "INVALID VALUE" << platform << "FOR VARIABLE TRIK_STUDIO_THEME";
-		QLOG_INFO() << "THE THEME WILL BE SELECTED AUTOMATICALLY";
-	}
-
-	auto darkThemeAvailiable = windowsDarkThemeAvailiable();
-	QLOG_INFO() << "windowsDarkThemeAvailiable RETURNS" << darkThemeAvailiable;
-
-	if (!darkThemeAvailiable) {
-		QLOG_INFO() << lightThemeMessage;
-		return;
+	constexpr auto logPrefix = "Initializing color theme";
+	const auto &explicitTheme = QProcessEnvironment::systemEnvironment().value("TRIK_STUDIO_THEME", "auto");
+	QLOG_INFO() << logPrefix << "with" << explicitTheme;
+	bool useDarkTheme;
+
+	if (explicitTheme == "light") {
+		useDarkTheme = false;
+	} else if (explicitTheme == "auto") {
+		// It is hard to guess, but ...
+		useDarkTheme = PlatformInfo::osType() == "windows" && windowsIsInDarkTheme();
+	} else if (explicitTheme != "dark") {
+		QLOG_INFO() << logPrefix << ":" << explicitTheme << "is not a correct option";
+		useDarkTheme = false;
+	} else {
+		useDarkTheme = true;
 	}
 
-	auto isInDarkTheme = windowsIsInDarkTheme();
-	QLOG_INFO() << "windowsIsInDarkTheme RETURNS" << isInDarkTheme;
-
-	if (!isInDarkTheme) {
-		QLOG_INFO() << lightThemeMessage;
-		return;
+	if (useDarkTheme) {
+		QLOG_INFO() << logPrefix <<": enforcing dark mode";
+		QApplication::setPalette(BrandManager::styles()->loadPalette(
+			QCoreApplication::applicationDirPath() +
+			"/palettes/darkWindowsPalette.ini")
+		);
 	}
-
-	QLOG_INFO() << "A DARK THEME HAS BEEN SELECTED";
-	QApplication::setPalette(BrandManager::styles()->loadPalette(
-		QCoreApplication::applicationDirPath() +
-		"/palettes/darkWindowsPalette.ini")
-	);
+	// Light is the default one, just return
 }
 
 // clazy:excludeall=function-args-by-value

qrtranslations/fr/qrgui_mainWindow_fr.ts

@@ -729,7 +729,7 @@ WARNING: The settings will be restored after application restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+783"/>
+        <location line="+769"/>
         <location line="+11"/>
         <source>Error</source>
         <translation>Erreur</translation>

qrtranslations/ru/qrgui_mainWindow_ru.ts

@@ -735,7 +735,7 @@
         <translation type="vanished">О QReal</translation>
     </message>
     <message>
-        <location filename="../../qrgui/mainWindow/mainWindow.cpp" line="+982"/>
+        <location filename="../../qrgui/mainWindow/mainWindow.cpp" line="+968"/>
         <location line="+11"/>
         <source>Error</source>
         <translation>Ошибка</translation>
@@ -788,7 +788,7 @@
         <translation>Создать диаграмму</translation>
     </message>
     <message>
-        <location line="-1157"/>
+        <location line="-1143"/>
         <source>Restore default settings</source>
         <translation>Восстановить настройки по-умолчанию</translation>
     </message>
@@ -807,7 +807,7 @@ WARNING: The settings will be restored after application restart</source>
         <translation>Не удалось сохранить файл, попробуйте сохранить его в другое место</translation>
     </message>
     <message>
-        <location line="+693"/>
+        <location line="+679"/>
         <source>Undo</source>
         <translation>Отменить</translation>
     </message>