Code cleanup: Remove remnants of previous accounts dialog

dino · Sep 15, 2024 · 228640a · 228640a
1 parent e8f82fd
commit 228640a
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 587 deletions.
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
@@ -60,6 +60,11 @@ set(RESOURCE_LIST
     add_conversation/list_row.ui
     add_conversation/select_jid_fragment.ui
 
+    preferences_window/account_preferences_subpage.ui
+    preferences_window/add_account_dialog.ui
+    preferences_window/general_preferences_page.ui
+    preferences_window/preferences_window.ui
+
     account_picker_row.ui
     call_widget.ui
     chat_input.ui
@@ -77,19 +82,13 @@ set(RESOURCE_LIST
     join_room_dialog2.ui
     conversation_content_view/item_metadata_header.ui
     conversation_content_view/view.ui
-    manage_accounts/account_row.ui
-    manage_accounts/add_account_dialog.ui
-    manage_accounts/dialog.ui
     menu_add.ui
     menu_app.ui
     menu_conversation.ui
     menu_encryption.ui
     message_item_widget_edit_mode.ui
     occupant_list.ui
     occupant_list_item.ui
-    preferences_window.ui
-    preferences_window_account.ui
-    preferences_window_general.ui
     quote.ui
     search_autocomplete.ui
     unified_main_content.ui
@@ -214,10 +213,6 @@ SOURCES
     src/ui/conversation_titlebar/search_entry.vala
     src/ui/conversation_titlebar/conversation_titlebar.vala
 
-    src/ui/manage_accounts/account_row.vala
-    src/ui/manage_accounts/add_account_dialog.vala
-    src/ui/manage_accounts/dialog.vala
-
     src/ui/occupant_menu/list.vala
     src/ui/occupant_menu/list_row.vala
     src/ui/occupant_menu/view.vala
@@ -245,6 +240,7 @@ SOURCES
 
     src/windows/preferences_window/account_preferences_subpage.vala
     src/windows/preferences_window/accounts_preferences_page.vala
+    src/windows/preferences_window/add_account_dialog.vala
     src/windows/preferences_window/encryption_preferences_page.vala
     src/windows/preferences_window/general_preferences_page.vala
     src/windows/preferences_window/preferences_window.vala

diff --git a/main/data/gresource.xml b/main/data/gresource.xml
@@ -54,12 +54,15 @@
     <file>icons/scalable/status/dino-tick-symbolic.svg</file>
     <file>icons/scalable/status/dino-video-off-symbolic.svg</file>
     <file>icons/scalable/status/dino-video-symbolic.svg</file>
+
+    <file>preferences_window/account_preferences_subpage.ui</file>
+    <file>preferences_window/add_account_dialog.ui</file>
+    <file>preferences_window/general_preferences_page.ui</file>
+    <file>preferences_window/preferences_window.ui</file>
+
     <file>join_room_dialog.ui</file>
     <file>join_room_dialog1.ui</file>
     <file>join_room_dialog2.ui</file>
-    <file>manage_accounts/account_row.ui</file>
-    <file>manage_accounts/add_account_dialog.ui</file>
-    <file>manage_accounts/dialog.ui</file>
     <file>menu_add.ui</file>
     <file>menu_app.ui</file>
     <file>menu_conversation.ui</file>
@@ -68,9 +71,6 @@
     <file>occupant_list.ui</file>
     <file>occupant_list_item.ui</file>
     <file>quote.ui</file>
-    <file>preferences_window.ui</file>
-    <file>preferences_window_account.ui</file>
-    <file>preferences_window_general.ui</file>
     <file>search_autocomplete.ui</file>
     <file>style-dark.css</file>
     <file>style.css</file>

diff --git a/main/data/manage_accounts/account_row.ui b/main/data/manage_accounts/account_row.ui
diff --git a/main/data/manage_accounts/dialog.ui b/main/data/manage_accounts/dialog.ui
diff --git a/main/data/preferences_window_account.ui → ...ces_window/account_preferences_subpage.ui b/main/data/preferences_window_account.ui → ...ces_window/account_preferences_subpage.ui
diff --git a/...ata/manage_accounts/add_account_dialog.ui → .../preferences_window/add_account_dialog.ui b/...ata/manage_accounts/add_account_dialog.ui → .../preferences_window/add_account_dialog.ui
diff --git a/main/data/preferences_window_general.ui → ...rences_window/general_preferences_page.ui b/main/data/preferences_window_general.ui → ...rences_window/general_preferences_page.ui
diff --git a/main/data/preferences_window.ui → .../preferences_window/preferences_window.ui b/main/data/preferences_window.ui → .../preferences_window/preferences_window.ui
diff --git a/main/meson.build b/main/meson.build
@@ -69,9 +69,6 @@ sources = files(
     'src/ui/global_search.vala',
     'src/ui/main_window.vala',
     'src/ui/main_window_controller.vala',
-    'src/ui/manage_accounts/account_row.vala',
-    'src/ui/manage_accounts/add_account_dialog.vala',
-    'src/ui/manage_accounts/dialog.vala',
     'src/ui/notifier_freedesktop.vala',
     'src/ui/notifier_gnotifications.vala',
     'src/ui/occupant_menu/list.vala',
@@ -95,6 +92,7 @@ sources = files(
     'src/view_model/preferences_window.vala',
     'src/windows/preferences_window/account_preferences_subpage.vala',
     'src/windows/preferences_window/accounts_preferences_page.vala',
+    'src/windows/preferences_window/add_account_dialog.vala',
     'src/windows/preferences_window/encryption_preferences_page.vala',
     'src/windows/preferences_window/general_preferences_page.vala',
     'src/windows/preferences_window/preferences_window.vala',

diff --git a/main/src/ui/manage_accounts/account_row.vala b/main/src/ui/manage_accounts/account_row.vala