From 10796b2359b63f9fe31e330655386763b5d40a65 Mon Sep 17 00:00:00 2001
From: Devin Lin <espidev@gmail.com>
Date: Thu, 24 Nov 2022 15:11:32 -0500
Subject: [PATCH] Tune up settings to fix inconsistencies and improve layout
 There were some inconsistencies in capitalization and colons, so those were
 fixed in this MR. I also rearranged some settings in the appearance section
 to improve the grouping.

---
 src/qml/Settings/AppearanceSettingsPage.qml | 54 ++++++++++-----------
 src/qml/Settings/ColorScheme.qml            |  2 +-
 src/qml/Settings/GeneralSettingsPage.qml    |  6 +--
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/qml/Settings/AppearanceSettingsPage.qml b/src/qml/Settings/AppearanceSettingsPage.qml
index 6f7b22ca5..543aa41e1 100644
--- a/src/qml/Settings/AppearanceSettingsPage.qml
+++ b/src/qml/Settings/AppearanceSettingsPage.qml
@@ -199,19 +199,26 @@ Kirigami.ScrollablePage {
                         }
                     }
                 }
+                
+                MobileForm.FormDelegateSeparator { below: colorSchemeDelegate.item ; visible: colorSchemeDelegate.visible }
+                
+                Loader {
+                    id: colorSchemeDelegate
+                    visible: item !== null && Qt.platform.os !== "android"
+                    source: "qrc:/ColorScheme.qml"
+                    Layout.fillWidth: true
+                }
             }
         }
+        
         MobileForm.FormCard {
             Layout.topMargin: Kirigami.Units.largeSpacing
             Layout.fillWidth: true
             contentItem: ColumnLayout {
                 spacing: 0
-                MobileForm.FormCardHeader {
-                    title: i18n("Timeline")
-                }
                 MobileForm.FormCheckDelegate {
                     id: showFancyEffectsDelegate
-                    text: i18n("Show Fancy Effects")
+                    text: i18n("Show fancy effects in chat")
                     checked: Config.showFancyEffects
                     enabled: !Config.isShowFancyEffectsImmutable
                     onToggled: {
@@ -220,20 +227,7 @@ Kirigami.ScrollablePage {
                     }
                 }
 
-                MobileForm.FormDelegateSeparator { above: showFancyEffectsDelegate ; below: colorSchemeDelegate }
-
-                Loader {
-                    id: colorSchemeDelegate
-                    visible: item !== null && Qt.platform.os !== "android"
-                    source: "qrc:/ColorScheme.qml"
-                    Layout.fillWidth: true
-                }
-
-                MobileForm.FormDelegateSeparator {
-                    above: colorSchemeDelegate
-                    below: hasWindowSystemDelegate
-                    visible: colorSchemeDelegate.visible
-                }
+                MobileForm.FormDelegateSeparator { above: showFancyEffectsDelegate ; below: hasWindowSystemDelegate }
 
                 MobileForm.FormCheckDelegate {
                     id: hasWindowSystemDelegate
@@ -254,6 +248,7 @@ Kirigami.ScrollablePage {
                     Layout.fillWidth: true
                     visible: Controller.hasWindowSystem && Config.blur
                     enabled: !Config.isTransparancyImmutable
+                    background: Item {}
                     contentItem: ColumnLayout {
                         QQC2.Label {
                             text: i18n("Transparency")
@@ -306,16 +301,21 @@ Kirigami.ScrollablePage {
                         Config.save()
                     }
                 }
-
-                MobileForm.FormDelegateSeparator { above: showLinkPreviewDelegate; below: showAvatarDelegate }
-
-                MobileForm.FormSectionText {
-                    id: showAvatarDelegate
-                    text: i18n("Show Avatar")
+            }
+        }
+        
+        MobileForm.FormCard {
+            Layout.topMargin: Kirigami.Units.largeSpacing
+            Layout.fillWidth: true
+            contentItem: ColumnLayout {
+                spacing: 0
+                
+                MobileForm.FormCardHeader {
+                    title: i18n("Show Avatar")
                 }
-
+                
                 MobileForm.FormCheckDelegate {
-                    text: i18n("In Chat")
+                    text: i18n("In chat")
                     checked: Config.showAvatarInTimeline
                     onToggled: {
                         Config.showAvatarInTimeline = checked
@@ -325,7 +325,7 @@ Kirigami.ScrollablePage {
                 }
 
                 MobileForm.FormCheckDelegate {
-                    text: i18n("In Sidebar")
+                    text: i18n("In sidebar")
                     checked: Config.showAvatarInRoomDrawer
                     enabled: !Config.isShowAvatarInRoomDrawerImmutable
                     onToggled: {
diff --git a/src/qml/Settings/ColorScheme.qml b/src/qml/Settings/ColorScheme.qml
index 056ed995c..79172515e 100644
--- a/src/qml/Settings/ColorScheme.qml
+++ b/src/qml/Settings/ColorScheme.qml
@@ -12,7 +12,7 @@ import org.kde.neochat 1.0
 
 MobileForm.FormComboBoxDelegate {
     Layout.fillWidth: true
-    text: i18n("Themes")
+    text: i18n("Color theme")
     textRole: "display"
     valueRole: "display"
     model: ColorSchemer.model
diff --git a/src/qml/Settings/GeneralSettingsPage.qml b/src/qml/Settings/GeneralSettingsPage.qml
index fc897b796..580f7f38f 100644
--- a/src/qml/Settings/GeneralSettingsPage.qml
+++ b/src/qml/Settings/GeneralSettingsPage.qml
@@ -150,7 +150,7 @@ Kirigami.ScrollablePage {
             contentItem: ColumnLayout {
                 spacing: 0
                 MobileForm.FormCardHeader {
-                    title: i18nc("Chat Editor", "Editor:")
+                    title: i18nc("Chat Editor", "Editor")
                 }
                 MobileForm.FormCheckDelegate {
                     id: quickEditCheckbox
@@ -165,7 +165,7 @@ Kirigami.ScrollablePage {
                 MobileForm.FormDelegateSeparator { above: quickEditCheckbox; below: typingNotificationsDelegate }
                 MobileForm.FormCheckDelegate {
                     id: typingNotificationsDelegate
-                    text: i18n("Send Typing Notifications")
+                    text: i18n("Send typing notifications")
                     checked: Config.typingNotifications
                     enabled: !Config.isTypingNotificationsImmutable
                     onToggled: {
@@ -185,7 +185,7 @@ Kirigami.ScrollablePage {
                     title: i18n("Developer Settings")
                 }
                 MobileForm.FormCheckDelegate {
-                    text: i18n("Enable Developer Tools")
+                    text: i18n("Enable developer tools")
                     checked: Config.developerTools
                     enabled: !Config.isDeveloperToolsImmutable
                     onToggled: {