diff options
Diffstat (limited to 'main/data/preferences_window')
| -rw-r--r-- | main/data/preferences_window/account_preferences_subpage.ui | 225 | ||||
| -rw-r--r-- | main/data/preferences_window/add_account_dialog.ui | 6 | ||||
| -rw-r--r-- | main/data/preferences_window/change_password_dialog.ui | 124 | ||||
| -rw-r--r-- | main/data/preferences_window/preferences_dialog.ui (renamed from main/data/preferences_window/preferences_window.ui) | 10 |
4 files changed, 185 insertions, 180 deletions
diff --git a/main/data/preferences_window/account_preferences_subpage.ui b/main/data/preferences_window/account_preferences_subpage.ui index 0615428c..d9bdd076 100644 --- a/main/data/preferences_window/account_preferences_subpage.ui +++ b/main/data/preferences_window/account_preferences_subpage.ui @@ -2,100 +2,59 @@ <interface> <requires lib="gtk" version="4.0"/> <template class="DinoUiAccountPreferencesSubpage"> - <property name="orientation">vertical</property> <child> - <object class="AdwHeaderBar" id="headerbar"> - <style> - <class name="flat"/> - </style> + <object class="GtkBox"> + <property name="orientation">vertical</property> <child> - <object class="GtkButton" id="back_button"> - <property name="icon-name">go-previous-symbolic</property> + <object class="AdwHeaderBar" id="headerbar"> + <style> + <class name="flat"/> + </style> </object> </child> - </object> - </child> - <child> - <object class="GtkScrolledWindow"> - <property name="vexpand">True</property> - <property name="hexpand">True</property> <child> - <object class="AdwClamp"> + <object class="GtkScrolledWindow"> + <property name="vexpand">True</property> + <property name="hexpand">True</property> <child> - <object class="GtkBox"> - <property name="margin-top">24</property> - <property name="margin-bottom">24</property> - <property name="margin-start">12</property> - <property name="margin-end">12</property> - <property name="spacing">24</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkOverlay"> - <property name="halign">center</property> - <property name="child"> - <object class="DinoUiAvatarPicture" id="avatar"> - <property name="height-request">144</property> - <property name="width-request">144</property> - </object> - </property> - <child type="overlay"> - <object class="GtkBox" id="avatar_menu_box"> - <property name="opacity">0.9</property> - <property name="margin-end">6</property> - <property name="margin-bottom">6</property> - <property name="halign">end</property> - <property name="valign">end</property> - <style> - <class name="card"/> - <class name="toolbar"/> - <class name="overlay-toolbar"/> - </style> - <child> - <object class="GtkButton" id="edit_avatar_button"> - <property name="icon-name">document-edit-symbolic</property> - </object> - </child> - <child> - <object class="GtkButton" id="remove_avatar_button"> - <property name="icon-name">user-trash-symbolic</property> - </object> - </child> - </object> - </child> - </object> - </child> + <object class="AdwClamp"> <child> - <object class="AdwPreferencesGroup"> - <child> - <object class="AdwActionRow" id="xmpp_address"> - <property name="title" translatable="yes">XMPP Address</property> - <property name="subtitle_selectable">True</property> - <style> - <class name="property"/> - </style> - </object> - </child> - <child> - <object class="AdwEntryRow" id="local_alias"> - <property name="title" translatable="yes">Local alias</property> - </object> - </child> + <object class="GtkBox"> + <property name="margin-top">24</property> + <property name="margin-bottom">24</property> + <property name="margin-start">12</property> + <property name="margin-end">12</property> + <property name="spacing">24</property> + <property name="orientation">vertical</property> <child> - <object class="AdwActionRow" id="password_change"> - <property name="title" translatable="yes">Password</property> - <child type="suffix"> - <object class="GtkBox"> - <property name="opacity">0.7</property> - <property name="spacing">6</property> - <property name="orientation">horizontal</property> + <object class="GtkOverlay"> + <property name="halign">center</property> + <property name="child"> + <object class="DinoUiAvatarPicture" id="avatar"> + <property name="height-request">144</property> + <property name="width-request">144</property> + </object> + </property> + <child type="overlay"> + <object class="GtkBox" id="avatar_menu_box"> + <property name="opacity">0.9</property> + <property name="margin-end">6</property> + <property name="margin-bottom">6</property> + <property name="halign">end</property> + <property name="valign">end</property> + <style> + <class name="card"/> + <class name="toolbar"/> + <class name="overlay-toolbar"/> + </style> <child> - <object class="GtkLabel"> - <property name="label">•••••</property> + <object class="GtkButton" id="edit_avatar_button"> + <property name="icon-name">document-edit-symbolic</property> </object> </child> <child> - <object class="GtkImage"> - <property name="icon-name">go-next-symbolic</property> + <object class="GtkButton" id="remove_avatar_button"> + <property name="icon-name">user-trash-symbolic</property> </object> </child> </object> @@ -103,43 +62,83 @@ </object> </child> <child> - <object class="AdwActionRow" id="connection_status"> - <property name="title" translatable="yes">Connection status</property> - <style> - <class name="property"/> - </style> - <child type="suffix"> - <object class="GtkButton" id="enter_password_button"> - <property name="label">Enter password</property> - <property name="valign">center</property> - <property name="visible">False</property> + <object class="AdwPreferencesGroup"> + <child> + <object class="AdwActionRow" id="xmpp_address"> + <property name="title" translatable="yes">XMPP Address</property> + <property name="subtitle_selectable">True</property> + <style> + <class name="property"/> + </style> + </object> + </child> + <child> + <object class="AdwEntryRow" id="local_alias"> + <property name="title" translatable="yes">Local alias</property> + </object> + </child> + <child> + <object class="AdwActionRow" id="password_change"> + <property name="title" translatable="yes">Password</property> + <child type="suffix"> + <object class="GtkBox"> + <property name="opacity">0.7</property> + <property name="spacing">6</property> + <property name="orientation">horizontal</property> + <child> + <object class="GtkLabel"> + <property name="label">•••••</property> + </object> + </child> + <child> + <object class="GtkImage"> + <property name="icon-name">go-next-symbolic</property> + </object> + </child> + </object> + </child> + </object> + </child> + <child> + <object class="AdwActionRow" id="connection_status"> + <property name="title" translatable="yes">Connection status</property> + <style> + <class name="property"/> + </style> + <child type="suffix"> + <object class="GtkButton" id="enter_password_button"> + <property name="label">Enter password</property> + <property name="valign">center</property> + <property name="visible">False</property> + </object> + </child> </object> </child> - </object> - </child> - </object> - </child> - <child> - <object class="GtkBox" id="button_container"> - <property name="halign">center</property> - <property name="spacing">24</property> - <child> - <object class="GtkButton" id="disable_account_button"> - <property name="label" translatable="1">Disable account</property> - <property name="halign">center</property> - <style> - <class name="pill"/> - </style> </object> </child> <child> - <object class="GtkButton" id="remove_account_button"> - <property name="label" translatable="1">Remove account</property> + <object class="GtkBox" id="button_container"> <property name="halign">center</property> - <style> - <class name="pill"/> - <class name="destructive-action"/> - </style> + <property name="spacing">24</property> + <child> + <object class="GtkButton" id="disable_account_button"> + <property name="label" translatable="1">Disable account</property> + <property name="halign">center</property> + <style> + <class name="pill"/> + </style> + </object> + </child> + <child> + <object class="GtkButton" id="remove_account_button"> + <property name="label" translatable="1">Remove account</property> + <property name="halign">center</property> + <style> + <class name="pill"/> + <class name="destructive-action"/> + </style> + </object> + </child> </object> </child> </object> diff --git a/main/data/preferences_window/add_account_dialog.ui b/main/data/preferences_window/add_account_dialog.ui index 243004d6..362e493c 100644 --- a/main/data/preferences_window/add_account_dialog.ui +++ b/main/data/preferences_window/add_account_dialog.ui @@ -2,9 +2,9 @@ <interface> <requires lib="gtk" version="4.0"/> <template class="DinoUiManageAccountsAddAccountDialog"> - <property name="default_width">450</property> - <property name="default_height">260</property> - <property name="modal">True</property> + <property name="content-width">450</property> + <property name="content-height">260</property> + <property name="follows-content-size">False</property> <child> <object class="GtkBox"> <property name="orientation">vertical</property> diff --git a/main/data/preferences_window/change_password_dialog.ui b/main/data/preferences_window/change_password_dialog.ui index 350d2a2d..05feda60 100644 --- a/main/data/preferences_window/change_password_dialog.ui +++ b/main/data/preferences_window/change_password_dialog.ui @@ -3,78 +3,84 @@ <requires lib="gtk" version="4.0"/> <template class="DinoUiChangePasswordDialog"> <property name="title" translatable="1">Change password</property> - <property name="default-width">430</property> - <property name="default-height">270</property> - <property name="modal">True</property> - <child type="titlebar"> - <object class="GtkHeaderBar"> - <property name="show-title-buttons">False</property> + <property name="content-width">430</property> + <property name="content-height">270</property> + <property name="follows-content-size">False</property> + <child> + <object class="GtkBox"> + <property name="orientation">vertical</property> <child> - <object class="GtkButton" id="cancel_button"> - <property name="label" translatable="yes">Cancel</property> - </object> - </child> - <child type="end"> - <object class="GtkButton" id="change_password_button"> - <property name="sensitive">0</property> - <style> - <class name="suggested-action"/> - </style> + <object class="AdwHeaderBar"> + <property name="show-end-title-buttons">False</property> + <property name="show-start-title-buttons">False</property> <child> - <object class="GtkStack" id="change_password_stack"> + <object class="GtkButton" id="cancel_button"> + <property name="label" translatable="yes">Cancel</property> + </object> + </child> + <child type="end"> + <object class="GtkButton" id="change_password_button"> + <property name="sensitive">0</property> + <style> + <class name="suggested-action"/> + </style> <child> - <object class="GtkStackPage"> - <property name="name">label</property> - <property name="child"> - <object class="GtkLabel" > - <property name="label" translatable="1">Change</property> + <object class="GtkStack" id="change_password_stack"> + <child> + <object class="GtkStackPage"> + <property name="name">label</property> + <property name="child"> + <object class="GtkLabel" > + <property name="label" translatable="1">Change</property> + </object> + </property> </object> - </property> - </object> - </child> - <child> - <object class="GtkStackPage"> - <property name="name">spinner</property> - <property name="child"> - <object class="GtkSpinner"> - <property name="spinning">True</property> + </child> + <child> + <object class="GtkStackPage"> + <property name="name">spinner</property> + <property name="child"> + <object class="GtkSpinner"> + <property name="spinning">True</property> + </object> + </property> </object> - </property> + </child> </object> </child> </object> </child> </object> </child> - </object> - </child> - <child> - <object class="AdwPreferencesPage"> <child> - <object class="AdwPreferencesGroup"> - <child> - <object class="AdwPasswordEntryRow" id="current_password_entry"> - <property name="title" translatable="yes">Current password</property> - </object> - </child> - <child> - <object class="AdwPasswordEntryRow" id="new_password_entry"> - <property name="title" translatable="yes">New password</property> - </object> - </child> - <child> - <object class="AdwPasswordEntryRow" id="confirm_new_password_entry"> - <property name="title" translatable="yes">Confirm password</property> - </object> - </child> + <object class="AdwPreferencesPage"> <child> - <object class="GtkLabel" id="change_password_error_label"> - <property name="halign">center</property> - <property name="hexpand">True</property> - <property name="margin-top">7</property> - <attributes> - <attribute name="scale" value="0.9"></attribute> - </attributes> + <object class="AdwPreferencesGroup"> + <child> + <object class="AdwPasswordEntryRow" id="current_password_entry"> + <property name="title" translatable="yes">Current password</property> + </object> + </child> + <child> + <object class="AdwPasswordEntryRow" id="new_password_entry"> + <property name="title" translatable="yes">New password</property> + </object> + </child> + <child> + <object class="AdwPasswordEntryRow" id="confirm_new_password_entry"> + <property name="title" translatable="yes">Confirm password</property> + </object> + </child> + <child> + <object class="GtkLabel" id="change_password_error_label"> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="margin-top">7</property> + <attributes> + <attribute name="scale" value="0.9"></attribute> + </attributes> + </object> + </child> </object> </child> </object> diff --git a/main/data/preferences_window/preferences_window.ui b/main/data/preferences_window/preferences_dialog.ui index 0b9abd84..323a4968 100644 --- a/main/data/preferences_window/preferences_window.ui +++ b/main/data/preferences_window/preferences_dialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> <requires lib="gtk" version="4.0"/> - <object class="DinoUiViewModelPreferencesWindow" id="model" /> - <template class="DinoUiPreferencesWindow"> - <property name="default-width">700</property> - <property name="default-height">550</property> - <property name="modal">True</property> + <object class="DinoUiViewModelPreferencesDialog" id="model" /> + <template class="DinoUiPreferencesDialog"> + <property name="content-width">700</property> + <property name="content-height">550</property> + <property name="follows-content-size">False</property> <child> <object class="DinoUiPreferencesWindowAccounts" id="accounts_page"> <property name="title" translatable="yes">Accounts</property> |