From f963e069832b1921f364850793339760c2ead5bf Mon Sep 17 00:00:00 2001
From: James Graham <james.h.graham@protonmail.com>
Date: Tue, 16 Jan 2024 19:39:42 +0000
Subject: [PATCH] Remove the option to merge the room list

---
 src/neochatconfig.kcfg            |  4 ----
 src/qml/CollapsedRoomDelegate.qml |  2 +-
 src/qml/GeneralSettingsPage.qml   | 23 -----------------------
 src/qml/RoomListPage.qml          |  6 +++---
 4 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/src/neochatconfig.kcfg b/src/neochatconfig.kcfg
index ee592333f..fbdc9001f 100644
--- a/src/neochatconfig.kcfg
+++ b/src/neochatconfig.kcfg
@@ -22,10 +22,6 @@
       <label>Background transparency value</label>
       <default>0.3</default>
     </entry>
-    <entry name="MergeRoomList" type="bool">
-      <label>Merge Room Lists</label>
-      <default>false</default>
-    </entry>
     <entry name="AllowQuickEdit" type="bool">
       <label>Use s/text/replacement syntax to edit your last message.</label>
       <default>false</default>
diff --git a/src/qml/CollapsedRoomDelegate.qml b/src/qml/CollapsedRoomDelegate.qml
index cb2432d2d..0df4e721c 100644
--- a/src/qml/CollapsedRoomDelegate.qml
+++ b/src/qml/CollapsedRoomDelegate.qml
@@ -30,7 +30,7 @@ QQC2.ItemDelegate {
     width: ListView.view.width
     height: visible ? ListView.view.width : 0
 
-    visible: root.categoryVisible || filterText.length > 0 || Config.mergeRoomList
+    visible: root.categoryVisible || filterText.length > 0
 
     contentItem: KirigamiComponents.Avatar {
         source: root.avatar ? `image://mxc/${root.avatar}` : ""
diff --git a/src/qml/GeneralSettingsPage.qml b/src/qml/GeneralSettingsPage.qml
index dae4a30a7..87d4f614a 100644
--- a/src/qml/GeneralSettingsPage.qml
+++ b/src/qml/GeneralSettingsPage.qml
@@ -140,29 +140,6 @@ FormCard.FormCardPage {
             }
         }
     }
-    FormCard.FormHeader {
-        title: i18n("Rooms and private chats")
-    }
-    FormCard.FormCard {
-        FormCard.FormRadioDelegate {
-            text: i18n("Separated")
-            checked: !Config.mergeRoomList
-            enabled: !Config.isMergeRoomListImmutable
-            onToggled: {
-                Config.mergeRoomList = false
-                Config.save()
-            }
-        }
-        FormCard.FormRadioDelegate {
-            text: i18n("Intermixed")
-            checked: Config.mergeRoomList
-            enabled: !Config.isMergeRoomListImmutable
-            onToggled: {
-                Config.mergeRoomList = true
-                Config.save()
-            }
-        }
-    }
     FormCard.FormHeader {
         title: i18nc("Chat Editor", "Editor")
     }
diff --git a/src/qml/RoomListPage.qml b/src/qml/RoomListPage.qml
index ef928253e..919faf488 100644
--- a/src/qml/RoomListPage.qml
+++ b/src/qml/RoomListPage.qml
@@ -191,7 +191,7 @@ Kirigami.Page {
                     id: sortFilterRoomListModel
 
                     sourceModel: root.roomListModel
-                    roomSortOrder: Config.mergeRoomList ? SortFilterRoomListModel.LastActivity : SortFilterRoomListModel.Categories
+                    roomSortOrder: SortFilterRoomListModel.Categories
                     onLayoutChanged: {
                         listView.currentIndex = sortFilterRoomListModel.mapFromSource(itemSelection.currentIndex).row
                     }
@@ -200,7 +200,7 @@ Kirigami.Page {
                 }
 
                 section {
-                    property: sortFilterRoomListModel.filterText.length === 0 && !Config.mergeRoomList ? "category" : null
+                    property: "category"
                     delegate: root.collapsed ? foldButton : sectionHeader
                 }
 
@@ -278,7 +278,7 @@ Kirigami.Page {
 
                         height: visible ? implicitHeight : 0
 
-                        visible: categoryVisible || filterText.length > 0 || Config.mergeRoomList
+                        visible: categoryVisible || filterText.length > 0
 
                         onSelected: RoomManager.enterRoom(currentRoom)