From d5bb0936bf8b16dc4a8b505192077576dbe96149 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sat, 10 Aug 2019 13:14:37 -0400 Subject: Use 'system' theme as default if QT_QPA_PLATFORMTHEME is set On first launch, before the user has configured any settings, check the value of the QT_QPA_PLATFORMTHEME environment var. If it is set, use the system theme as the default instead of the light theme. This fixes #72. --- src/UserSettingsPage.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/UserSettingsPage.cpp') diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp index 49cb2c1f..30e6ea96 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp @@ -22,9 +22,11 @@ #include #include #include +#include #include #include #include +#include #include #include "Config.h" @@ -49,7 +51,7 @@ UserSettings::load() isGroupViewEnabled_ = settings.value("user/group_view", true).toBool(); isTypingNotificationsEnabled_ = settings.value("user/typing_notifications", true).toBool(); isReadReceiptsEnabled_ = settings.value("user/read_receipts", true).toBool(); - theme_ = settings.value("user/theme", "light").toString(); + theme_ = settings.value("user/theme", defaultTheme_).toString(); font_ = settings.value("user/font_family", "default").toString(); emojiFont_ = settings.value("user/emoji_font_family", "default").toString(); baseFontSize_ = settings.value("user/font_size", QFont().pointSizeF()).toDouble(); -- cgit 1.5.1