FEAT(client): Automatically sync theme with OS color scheme #6619
Conversation
This update introduces an automatic theme switch that changes based on the OS color scheme at startup and during runtime. This feature is implemented for Qt 6.2 and includes compatibility for Qt 6.5 once Mumble upgrades. Implements mumble-voip#6515
This update introduces an automatic theme switch that changes based on the OS color scheme at startup and during runtime. This feature is implemented for Qt 6.2 and includes compatibility for Qt 6.5 once Mumble upgrades. -fix Implements mumble-voip#6515
| @@ -9,3 +9,7 @@ qss_MAC=OSX Dark.qss | |||
| name=Lite | |||
| qss=Lite.qss | |||
| qss_MAC=OSX Lite.qss | |||
| [auto] | |||
| name=Auto | |||
There was a problem hiding this comment.
I guess you added this "theme" as a placeholder dummy, right? Take a look at this:
mumble/src/mumble/LookConfig.cpp
Lines 120 to 121 in 70dea60
There we add the "None" theme. We could just as easily add the "Auto" theme there, so we do not need to have a dummy theme in theme.ini
There was a problem hiding this comment.
Originily i tried to add the option with "qcbTheme->addItem(tr("Auto"));" , but it didnt work right as i think it didnt save/load properly. I tried to fix it by changing LookConfig::reloadThemes ,LookConfig::load and LookConfig::save, but to no avail. So I had to resort to doing with putting fake theme in theme.ini .
There was a problem hiding this comment.
You are right just adding qcbTheme->addItem(tr("Auto")); does not seem to be enough. However, from a maintainability point of view and general structure of this sort of this, I would insist that we solve this programmatically. I think that means modification to Themes::getConfiguredStyle and possibly a custom ThemeMap object.
(Please note that I do not have the time currently to properly 100% think this through, so that's also why I am very glad that someone else is taking this feature request 😅)
There was a problem hiding this comment.
We should figure this out programmatically. If you are stuck here, let us know what is failing and we can figure out a way together.
This update introduces an automatic theme switch that changes based on the OS color scheme at startup and during runtime. This feature is implemented for Qt 6.2 and includes compatibility for Qt 6.5 once Mumble upgrades. Implements mumble-voip#6515
This update introduces an automatic theme switch that changes based on the OS color scheme at startup and during runtime. This feature is implemented for Qt 6.2 and includes compatibility for Qt 6.5 once Mumble upgrades. Implements mumble-voip#6515
| @@ -9,3 +9,7 @@ qss_MAC=OSX Dark.qss | |||
| name=Lite | |||
| qss=Lite.qss | |||
| qss_MAC=OSX Lite.qss | |||
| [auto] | |||
| name=Auto | |||
There was a problem hiding this comment.
You are right just adding qcbTheme->addItem(tr("Auto")); does not seem to be enough. However, from a maintainability point of view and general structure of this sort of this, I would insist that we solve this programmatically. I think that means modification to Themes::getConfiguredStyle and possibly a custom ThemeMap object.
(Please note that I do not have the time currently to properly 100% think this through, so that's also why I am very glad that someone else is taking this feature request 😅)
| @@ -8,6 +8,14 @@ | |||
| #include "MumbleApplication.h" | |||
| #include "Global.h" | |||
|
|
|||
| #include <QFile> | |||
| #include <QGuiApplication> | |||
There was a problem hiding this comment.
Please also double check (at least when we are done here), if all of those includes are actually needed.
There was a problem hiding this comment.
I think only these includes are needed "QPalette, QSettings, QStyleHints", but not 100% sure.
This update introduces an automatic theme switch that changes based on the OS color scheme at startup and during runtime. This feature is implemented for Qt 6.2 and includes compatibility for Qt 6.5 once Mumble upgrades. Implements mumble-voip#6515
| boost::optional< ThemeInfo::StyleInfo > style = Themes::getConfiguredStyle(Global::get().s); | ||
| if (!style) { | ||
| return false; | ||
| } | ||
|
|
||
| const QFileInfo qssFile(style->getPlatformQss()); | ||
| QString themePath = style->getPlatformQss().absoluteFilePath(); | ||
| if (style->themeName == "Auto" || style->name == "Auto") { |
There was a problem hiding this comment.
Idea: If you move this to Themes::getConfiguredStyle, you will have access to the user setting strings. If you do this check with something like settings.themeName == "Auto", you could probably simply add the "Auto" to the ComboBox (further investigation required)
This would have the additional benefit of not having to hard-code the path, but rather - in the case of "Auto" - just selecting the appropriate ThemeMap with the name "Dark" or "Lite".
But if you run into any issues with this approach, be sure to let me know.
There was a problem hiding this comment.
I tried that today, to no avail. I don't know if I implemented it wrong, in the wrong section, or it's something else. Furthermore, I have other tasks related to this git, but those only need to stay on my local machine, as well as other tasks from other subjects, so I don't know when I will be able to look at this specific issue again.
This update introduces an automatic theme switch that changes based on the OS color scheme at startup and during runtime. This feature is implemented for Qt 6.2 and includes compatibility for Qt 6.5 once Mumble upgrades.
Implements #6515
Checks