diff options
author | fiaxh <git@lightrise.org> | 2024-09-15 20:38:00 +0200 |
---|---|---|
committer | fiaxh <git@lightrise.org> | 2024-09-15 21:01:24 +0200 |
commit | 228640a881aead53d307775cc2d3726fe64f3fc2 (patch) | |
tree | ec77540ec9b1fbc0a84beabccf3b1d866c1f7aa0 /main/data | |
parent | e8f82fd328697542d2ee0233635b694827a5cc79 (diff) | |
download | dino-228640a881aead53d307775cc2d3726fe64f3fc2.tar.gz dino-228640a881aead53d307775cc2d3726fe64f3fc2.zip |
Code cleanup: Remove remnants of previous accounts dialog
Diffstat (limited to 'main/data')
-rw-r--r-- | main/data/gresource.xml | 12 | ||||
-rw-r--r-- | main/data/manage_accounts/account_row.ui | 33 | ||||
-rw-r--r-- | main/data/manage_accounts/dialog.ui | 248 | ||||
-rw-r--r-- | main/data/preferences_window/account_preferences_subpage.ui (renamed from main/data/preferences_window_account.ui) | 0 | ||||
-rw-r--r-- | main/data/preferences_window/add_account_dialog.ui (renamed from main/data/manage_accounts/add_account_dialog.ui) | 0 | ||||
-rw-r--r-- | main/data/preferences_window/general_preferences_page.ui (renamed from main/data/preferences_window_general.ui) | 0 | ||||
-rw-r--r-- | main/data/preferences_window/preferences_window.ui (renamed from main/data/preferences_window.ui) | 0 |
7 files changed, 6 insertions, 287 deletions
diff --git a/main/data/gresource.xml b/main/data/gresource.xml index 647f5116..304fa7a4 100644 --- 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 deleted file mode 100644 index 91891b91..00000000 --- a/main/data/manage_accounts/account_row.ui +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<interface> - <requires lib="gtk" version="4.0"/> - <template class="DinoUiManageAccountsAccountRow"> - <child> - <object class="GtkGrid"> - <property name="margin-start">6</property> - <property name="margin-end">6</property> - <property name="margin-top">6</property> - <property name="margin-bottom">6</property> - <property name="column-spacing">6</property> - <child> - <object class="DinoUiAvatarPicture" id="picture"> - <property name="height-request">40</property> - <property name="width-request">40</property> - </object> - </child> - <child> - <object class="GtkLabel" id="jid_label"> - <property name="xalign">0</property> - <property name="hexpand">1</property> - </object> - </child> - <child> - <object class="GtkImage" id="icon"> - <property name="visible">False</property> - <property name="icon-name">dialog-warning-symbolic</property> - </object> - </child> - </object> - </child> - </template> -</interface> diff --git a/main/data/manage_accounts/dialog.ui b/main/data/manage_accounts/dialog.ui deleted file mode 100644 index 4931507c..00000000 --- a/main/data/manage_accounts/dialog.ui +++ /dev/null @@ -1,248 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<interface> - <requires lib="gtk" version="4.0"/> - <template class="DinoUiManageAccountsDialog"> - <property name="title" translatable="1">Accounts</property> - <property name="width-request">700</property> - <property name="height-request">400</property> - <property name="modal">True</property> - <child type="titlebar"> - <object class="GtkHeaderBar"/> - </child> - <child internal-child="content_area"> - <object class="GtkBox"> - <child> - <object class="GtkStack" id="main_stack"> - <child> - <object class="GtkStackPage"> - <property name="name">accounts_exist</property> - <property name="child"> - <object class="GtkBox"> - <property name="focusable">1</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child> - <object class="GtkBox"> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="margin-start">15</property> - <property name="margin-end">15</property> - <property name="margin-top">15</property> - <property name="margin-bottom">15</property> - <property name="spacing">20</property> - <child> - <object class="GtkBox"> - <property name="orientation">vertical</property> - <property name="width-request">250</property> - <property name="vexpand">1</property> - <property name="hexpand">0</property> - <child> - <object class="GtkScrolledWindow"> -<!-- <property name="shadow-type">in</property>--> - <property name="hexpand">1</property> - <property name="vexpand">1</property> - <property name="child"> - <object class="GtkBox"> - <property name="orientation">vertical</property> - <child> - <object class="GtkListBox" id="account_list"> - <property name="hexpand">1</property> - <property name="vexpand">1</property> - </object> - </child> - </object> - </property> - </object> - </child> - <child> - <object class="GtkBox"> - <property name="css-classes">toolbar</property> - <style> - <class name="inline-toolbar"/> - </style> - <child> - <object class="GtkButton" id="add_account_button"> - <property name="icon-name">list-add-symbolic</property> - </object> - </child> - <child> - <object class="GtkButton" id="remove_account_button"> - <property name="icon-name">list-remove-symbolic</property> - </object> - </child> - </object> - </child> - </object> - </child> - <child> - <object class="GtkGrid" id="settings_list"> - <property name="hexpand">1</property> - <property name="vexpand">1</property> - <property name="column-spacing">10</property> - <property name="row-spacing">5</property> - <child> - <object class="GtkBox"> - <property name="halign">end</property> - <child> - <object class="GtkBox"/> - </child> - <child> - <object class="GtkButton" id="image_button"> - <property name="has-frame">False</property> - <style> - <class name="image-button"/> - </style> - <child> - <object class="DinoUiAvatarPicture" id="picture"> - <property name="height-request">50</property> - <property name="width-request">50</property> - </object> - </child> - </object> - </child> - <layout> - <property name="column">0</property> - <property name="row">0</property> - <property name="row-span">2</property> - </layout> - </object> - </child> - <child> - <object class="GtkLabel" id="jid_label"> - <property name="xalign">0</property> - <property name="yalign">1</property> - <attributes> - <attribute name="weight" value="PANGO_WEIGHT_BOLD"></attribute> - </attributes> - <layout> - <property name="column">1</property> - <property name="row">0</property> - </layout> - </object> - </child> - <child> - <object class="GtkLabel" id="state_label"> - <property name="xalign">0</property> - <property name="yalign">0</property> - <style> - <class name="dim-label"/> - </style> - <layout> - <property name="column">1</property> - <property name="row">1</property> - </layout> - </object> - </child> - <child> - <object class="GtkSwitch" id="active_switch"> - <property name="halign">end</property> - <property name="valign">center</property> - <layout> - <property name="column">2</property> - <property name="row">0</property> - <property name="row-span">2</property> - </layout> - </object> - </child> - <child> - <object class="GtkLabel"> - <property name="label" translatable="1">Password</property> - <property name="xalign">1</property> - <style> - <class name="dim-label"/> - </style> - <layout> - <property name="column">0</property> - <property name="row">2</property> - </layout> - </object> - </child> - <child> - <object class="DinoUiUtilEntryLabelHybrid" id="password_hybrid"> - <property name="xalign">0</property> - <property name="width_request">200</property> - <property name="visibility">False</property> - <layout> - <property name="column">1</property> - <property name="row">2</property> - <property name="column-span">2</property> - </layout> - </object> - </child> - <child> - <object class="GtkLabel"> - <property name="label" translatable="1">Local alias</property> - <property name="xalign">1</property> - <style> - <class name="dim-label"/> - </style> - <layout> - <property name="column">0</property> - <property name="row">3</property> - </layout> - </object> - </child> - <child> - <object class="DinoUiUtilEntryLabelHybrid" id="alias_hybrid"> - <property name="xalign">0</property> - <property name="width_request">200</property> -` <layout> - <property name="column">1</property> - <property name="row">3</property> - <property name="column-span">2</property> - </layout> - </object> - </child> - </object> - </child> - </object> - </child> - </object> - </property> - </object> - </child> - <child> - <object class="GtkStackPage"> - <property name="name">no_accounts</property> - <property name="child"> - <object class="GtkBox"> - <property name="orientation">vertical</property> - <property name="spacing">10</property> - <property name="valign">center</property> - <child> - <object class="GtkImage"> - <property name="icon-name">system-users-symbolic</property> - <property name="pixel-size">72</property> - <style> - <class name="dim-label"/> - </style> - </object> - </child> - <child> - <object class="GtkLabel"> - <property name="label" translatable="1">No accounts configured</property> - <style> - <class name="dim-label"/> - </style> - </object> - </child> - <child> - <object class="GtkButton" id="no_accounts_add"> - <property name="label" translatable="1">Add an account</property> - <property name="halign">center</property> - <style> - <class name="text-button"/> - <class name="suggested-action"/> - </style> - </object> - </child> - </object> - </property> - </object> - </child> - </object> - </child> - </object> - </child> - </template> -</interface> diff --git a/main/data/preferences_window_account.ui b/main/data/preferences_window/account_preferences_subpage.ui index e0fa4f76..e0fa4f76 100644 --- a/main/data/preferences_window_account.ui +++ b/main/data/preferences_window/account_preferences_subpage.ui diff --git a/main/data/manage_accounts/add_account_dialog.ui b/main/data/preferences_window/add_account_dialog.ui index 243004d6..243004d6 100644 --- a/main/data/manage_accounts/add_account_dialog.ui +++ b/main/data/preferences_window/add_account_dialog.ui diff --git a/main/data/preferences_window_general.ui b/main/data/preferences_window/general_preferences_page.ui index 33d1a2c9..33d1a2c9 100644 --- a/main/data/preferences_window_general.ui +++ b/main/data/preferences_window/general_preferences_page.ui diff --git a/main/data/preferences_window.ui b/main/data/preferences_window/preferences_window.ui index d262dd76..d262dd76 100644 --- a/main/data/preferences_window.ui +++ b/main/data/preferences_window/preferences_window.ui |