From 4b6c4b8a48b6885ffc35f59f0e3ba06f6a925a75 Mon Sep 17 00:00:00 2001
From: Aline Gondim Santos <aline.gondimsantos@savoirfairelinux.com>
Date: Thu, 17 Nov 2022 08:57:41 -0300
Subject: [PATCH] theme: set system as first option
To homogenize with language preference, let "System" theme to be
the first option in the combobox followed by "Light" and "Dark".
GitLab: #723
Change-Id: I8d95c58e4cf08c8dd36304ba661d287dda5c14f6
---
.../components/SystemSettings.qml | 47 +++++++++----------
1 file changed, 22 insertions(+), 25 deletions(-)
diff --git a/src/app/settingsview/components/SystemSettings.qml b/src/app/settingsview/components/SystemSettings.qml
index 00dd39d0c..169428dcd 100644
--- a/src/app/settingsview/components/SystemSettings.qml
+++ b/src/app/settingsview/components/SystemSettings.qml
@@ -72,16 +72,18 @@ ColumnLayout {
Layout.fillWidth: true
Layout.leftMargin: JamiTheme.preferredMarginSize
+ property var nativeDarkThemeShift: UtilsAdapter.hasNativeDarkTheme() ? 1 : 0
+
labelText: JamiStrings.applicationTheme
fontPointSize: JamiTheme.settingsFontSize
comboModel: ListModel {
id: themeModel
Component.onCompleted: {
- append({ textDisplay: JamiStrings.dark })
- append({ textDisplay: JamiStrings.light })
- if (UtilsAdapter.hasNativeDarkTheme())
+ if (themeComboBoxSettings.nativeDarkThemeShift)
append({ textDisplay: JamiStrings.system })
+ append({ textDisplay: JamiStrings.light })
+ append({ textDisplay: JamiStrings.dark })
}
}
widthOfComboBox: itemWidth
@@ -89,29 +91,24 @@ ColumnLayout {
role: "textDisplay"
modelIndex: {
- if (UtilsAdapter.hasNativeDarkTheme()) {
- var theme = UtilsAdapter.getAppValue(Settings.Key.AppTheme)
- if (theme === "Dark") {
- return 0
- } else if (theme === "Light") {
- return 1
- }
- return 2
+ var theme = UtilsAdapter.getAppValue(Settings.Key.AppTheme)
+ if (themeComboBoxSettings.nativeDarkThemeShift && theme === "System")
+ return 0
+ if (theme === "Light") {
+ return 0 + nativeDarkThemeShift
+ } else if (theme === "Dark") {
+ return 1 + nativeDarkThemeShift
}
- return UtilsAdapter.getAppValue(Settings.Key.EnableDarkTheme) ? 0 : 1
+ return nativeDarkThemeShift
}
onActivated: {
- if (UtilsAdapter.hasNativeDarkTheme()) {
- if (modelIndex === 0)
- UtilsAdapter.setAppValue(Settings.Key.AppTheme, "Dark")
- else if (modelIndex === 1)
- UtilsAdapter.setAppValue(Settings.Key.AppTheme, "Light")
- else if (modelIndex === 2)
- UtilsAdapter.setAppValue(Settings.Key.AppTheme, "System")
- } else {
- UtilsAdapter.setAppValue(Settings.Key.EnableDarkTheme, modelIndex === 0)
- }
+ if (modelIndex === 0 + nativeDarkThemeShift)
+ UtilsAdapter.setAppValue(Settings.Key.AppTheme, "Light")
+ else if (modelIndex === 1 + nativeDarkThemeShift)
+ UtilsAdapter.setAppValue(Settings.Key.AppTheme, "Dark")
+ else if (modelIndex === 0)
+ UtilsAdapter.setAppValue(Settings.Key.AppTheme, "System")
}
}
@@ -234,10 +231,10 @@ ColumnLayout {
function onChangeLanguage() {
var idx = themeComboBoxSettings.modelIndex
themeModel.clear()
- themeModel.append({ textDisplay: JamiStrings.dark })
- themeModel.append({ textDisplay: JamiStrings.light })
- if (UtilsAdapter.hasNativeDarkTheme())
+ if (themeComboBoxSettings.nativeDarkThemeShift)
themeModel.append({ textDisplay: JamiStrings.system })
+ themeModel.append({ textDisplay: JamiStrings.light })
+ themeModel.append({ textDisplay: JamiStrings.dark })
themeComboBoxSettings.modelIndex = idx
}
}
--
GitLab