Unify emoji and sticker settings pages

2023-05-30 22:45:16 +02:00
parent a2a27e78d1
commit 1f4b984664
7 changed files with 175 additions and 267 deletions
--- a/src/qml/Settings/SettingsPage.qml
+++ b/src/qml/Settings/SettingsPage.qml
@@ -33,17 +33,12 @@ Kirigami.CategorizedSettings {
            page: Qt.resolvedUrl("AccountsPage.qml")
        },
        Kirigami.SettingAction {
-            actionName: "customEmojis"
-            text: i18n("Custom Emojis")
+            actionName: "emoticons"
+            text: i18n("Stickers & Emojis")
            icon.name: "preferences-desktop-emoticons"
-            page: Qt.resolvedUrl("Emoticons.qml")
-        },
-        Kirigami.SettingAction {
-            actionName: "stickers"
-            text: i18n("Stickers")
-            icon.name: "stickers"
-            page: Qt.resolvedUrl("StickersPage.qml")
+            page: Qt.resolvedUrl("EmoticonsPage.qml")
        },
+
        Kirigami.SettingAction {
            actionName: "spellChecking"
            text: i18n("Spell Checking")