diff options
| author | fiaxh <git@lightrise.org> | 2022-02-14 14:55:59 +0100 |
|---|---|---|
| committer | fiaxh <git@lightrise.org> | 2022-07-27 20:34:20 +0200 |
| commit | 7e7dcedaf31ee35499875491c9f569c575d28435 (patch) | |
| tree | 0c5fee2b28baf320775fbc92b3c252e97d9d054f /main/data/add_conversation | |
| parent | f25bfb00969a7e09996da2d5500e6718f4cc0148 (diff) | |
| download | dino-7e7dcedaf31ee35499875491c9f569c575d28435.tar.gz dino-7e7dcedaf31ee35499875491c9f569c575d28435.zip | |
Port from GTK3 to GTK4
Diffstat (limited to 'main/data/add_conversation')
| -rw-r--r-- | main/data/add_conversation/add_contact_dialog.ui | 112 | ||||
| -rw-r--r-- | main/data/add_conversation/add_groupchat_dialog.ui | 198 | ||||
| -rw-r--r-- | main/data/add_conversation/conference_details_fragment.ui | 301 | ||||
| -rw-r--r-- | main/data/add_conversation/list_row.ui | 89 | ||||
| -rw-r--r-- | main/data/add_conversation/select_jid_fragment.ui | 80 |
5 files changed, 326 insertions, 454 deletions
diff --git a/main/data/add_conversation/add_contact_dialog.ui b/main/data/add_conversation/add_contact_dialog.ui index 6185c5ba..1abc9a7a 100644 --- a/main/data/add_conversation/add_contact_dialog.ui +++ b/main/data/add_conversation/add_contact_dialog.ui @@ -1,128 +1,102 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> + <requires lib="gtk" version="4.0"/> <template class="DinoUiAddContactDialog"> + <property name="title" translatable="1">Add Contact</property> <property name="valign">center</property> <property name="modal">True</property> <child type="titlebar"> <object class="GtkHeaderBar"> - <property name="title" translatable="yes">Add Contact</property> - <property name="visible">True</property> + <property name="show-title-buttons">False</property> <child> <object class="GtkButton" id="cancel_button"> - <property name="label" translatable="yes">Cancel</property> - <property name="sensitive">True</property> - <property name="visible">True</property> + <property name="label" translatable="1">Cancel</property> </object> - <packing> - <property name="pack_type">start</property> - </packing> </child> - <child> + <child type="end"> <object class="GtkButton" id="ok_button"> - <property name="has_default">True</property> - <property name="can_default">True</property> - <property name="label" translatable="yes">Add</property> - <property name="sensitive">False</property> - <property name="visible">True</property> + <property name="label" translatable="1">Add</property> + <property name="sensitive">0</property> <style> <class name="suggested-action"/> </style> </object> - <packing> - <property name="pack_type">end</property> - </packing> </child> </object> </child> - <child internal-child="vbox"> + <child internal-child="content_area"> <object class="GtkBox"> - <property name="visible">True</property> <child> <object class="GtkGrid" id="info_grid"> <property name="orientation">vertical</property> - <property name="margin">20</property> + <property name="margin-start">20</property> + <property name="margin-end">20</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> <property name="row-spacing">7</property> <property name="column-spacing">10</property> - <property name="visible">True</property> <child> <object class="GtkLabel"> - <property name="label" translatable="yes">Account</property> + <property name="label" translatable="1">Account</property> <property name="xalign">1</property> - <property name="visible">True</property> + <layout> + <property name="column">0</property> + <property name="row">0</property> + </layout> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="DinoUiAccountComboBox" id="account_combobox"> <property name="hexpand">True</property> <property name="width_request">200</property> <property name="visible">True</property> + <layout> + <property name="column">1</property> + <property name="row">0</property> + </layout> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkLabel"> <property name="label">JID</property> <property name="xalign">1</property> - <property name="visible">True</property> + <layout> + <property name="column">0</property> + <property name="row">1</property> + </layout> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkEntry" id="jid_entry"> - <property name="activates_default">True</property> - <property name="hexpand">True</property> + <property name="activates_default">1</property> + <property name="hexpand">1</property> <property name="width_request">200</property> - <property name="visible">True</property> + <layout> + <property name="column">1</property> + <property name="row">1</property> + </layout> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkLabel"> - <property name="label" translatable="yes">Alias</property> + <property name="label" translatable="1">Alias</property> <property name="xalign">1</property> - <property name="visible">True</property> + <layout> + <property name="column">0</property> + <property name="row">2</property> + </layout> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkEntry" id="alias_entry"> - <property name="activates_default">True</property> - <property name="hexpand">True</property> + <property name="activates_default">1</property> + <property name="hexpand">1</property> <property name="width_request">200</property> - <property name="visible">True</property> + <layout> + <property name="column">1</property> + <property name="row">2</property> + </layout> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> </object> </child> @@ -133,4 +107,4 @@ <action-widget response="ok" default="true">ok_button</action-widget> </action-widgets> </template> -</interface> +</interface>
\ No newline at end of file diff --git a/main/data/add_conversation/add_groupchat_dialog.ui b/main/data/add_conversation/add_groupchat_dialog.ui index 29638f53..5acd6891 100644 --- a/main/data/add_conversation/add_groupchat_dialog.ui +++ b/main/data/add_conversation/add_groupchat_dialog.ui @@ -1,201 +1,165 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> + <requires lib="gtk" version="4.0"/> <template class="DinoUiAddGroupchatDialog"> <property name="valign">center</property> <property name="modal">True</property> <child type="titlebar"> <object class="GtkHeaderBar"> - <property name="visible">True</property> + <property name="show-title-buttons">False</property> <child> <object class="GtkButton" id="cancel_button"> - <property name="label" translatable="yes">Cancel</property> - <property name="sensitive">True</property> - <property name="visible">True</property> + <property name="label" translatable="1">Cancel</property> </object> - <packing> - <property name="pack_type">start</property> - </packing> </child> - <child> + <child type="end"> <object class="GtkButton" id="ok_button"> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="sensitive">False</property> - <property name="visible">True</property> + <property name="sensitive">0</property> <style> <class name="suggested-action"/> </style> </object> - <packing> - <property name="pack_type">end</property> - </packing> </child> </object> </child> - <child internal-child="vbox"> + <child internal-child="content_area"> <object class="GtkBox" id="main"> - <property name="visible">True</property> <child> <object class="GtkGrid"> <property name="orientation">vertical</property> - <property name="margin">20</property> + <property name="margin-start">20</property> + <property name="margin-end">20</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> <property name="margin-start">40</property> <property name="margin-end">40</property> <property name="row-spacing">7</property> <property name="column-spacing">10</property> - <property name="visible">True</property> <child> <object class="GtkLabel"> - <property name="label" translatable="yes">Account</property> + <property name="label" translatable="1">Account</property> <property name="xalign">1</property> - <property name="visible">True</property> + <layout> + <property name="column">0</property> + <property name="row">0</property> + </layout> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkStack" id="accounts_stack"> - <property name="visible">True</property> <child> - <object class="DinoUiAccountComboBox" id="account_combobox"> - <property name="hexpand">True</property> - <property name="width_request">200</property> - <property name="visible">True</property> - </object> - <packing> + <object class="GtkStackPage"> <property name="name">combobox</property> - </packing> + <property name="child"> + <object class="DinoUiAccountComboBox" id="account_combobox"> + <property name="hexpand">True</property> + <property name="width_request">200</property> + <property name="visible">True</property> + </object> + </property> + </object> </child> <child> - <object class="GtkLabel" id="account_label"> - <property name="xalign">0</property> - <property name="can_focus">True</property> - <property name="visible">True</property> - </object> - <packing> + <object class="GtkStackPage"> <property name="name">label</property> - </packing> + <property name="child"> + <object class="GtkLabel" id="account_label"> + <property name="xalign">0</property> + <property name="focusable">1</property> + </object> + </property> + </object> </child> + <layout> + <property name="column">1</property> + <property name="row">0</property> + </layout> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkLabel"> <property name="label">JID</property> <property name="xalign">1</property> - <property name="visible">True</property> + <layout> + <property name="column">0</property> + <property name="row">1</property> + </layout> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkEntry" id="jid_entry"> - <property name="activates_default">True</property> - <property name="hexpand">True</property> + <property name="activates_default">1</property> + <property name="hexpand">1</property> <property name="width_request">200</property> - <property name="visible">True</property> + <layout> + <property name="column">1</property> + <property name="row">1</property> + </layout> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkLabel"> - <property name="label" translatable="yes">Nick</property> + <property name="label" translatable="1">Nick</property> <property name="xalign">1</property> - <property name="visible">True</property> + <layout> + <property name="column">0</property> + <property name="row">2</property> + </layout> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkEntry" id="nick_entry"> - <property name="activates_default">True</property> - <property name="hexpand">True</property> + <property name="activates_default">1</property> + <property name="hexpand">1</property> <property name="width_request">200</property> - <property name="visible">True</property> + <layout> + <property name="column">1</property> + <property name="row">2</property> + </layout> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkLabel"> - <property name="label" translatable="yes">Password</property> + <property name="label" translatable="1">Password</property> <property name="xalign">1</property> - <property name="visible">True</property> + <layout> + <property name="column">0</property> + <property name="row">3</property> + </layout> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkEntry" id="password_entry"> - <property name="activates_default">True</property> - <property name="visibility">False</property> - <property name="hexpand">True</property> + <property name="activates_default">1</property> + <property name="visibility">0</property> + <property name="hexpand">1</property> <property name="width_request">200</property> - <property name="visible">True</property> + <layout> + <property name="column">1</property> + <property name="row">3</property> + </layout> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkLabel" id="alias_label"> - <property name="label" translatable="yes">Alias</property> + <property name="label" translatable="1">Alias</property> <property name="xalign">1</property> - <property name="visible">True</property> + <layout> + <property name="column">0</property> + <property name="row">5</property> + </layout> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkEntry" id="alias_entry"> - <property name="activates_default">True</property> - <property name="hexpand">True</property> + <property name="activates_default">1</property> + <property name="hexpand">1</property> <property name="width_request">200</property> - <property name="visible">True</property> + <layout> + <property name="column">1</property> + <property name="row">5</property> + </layout> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> </object> </child> @@ -206,4 +170,4 @@ <action-widget response="ok" default="true">ok_button</action-widget> </action-widgets> </template> -</interface> +</interface>
\ No newline at end of file diff --git a/main/data/add_conversation/conference_details_fragment.ui b/main/data/add_conversation/conference_details_fragment.ui index a4f6f5d3..0fdf2b8e 100644 --- a/main/data/add_conversation/conference_details_fragment.ui +++ b/main/data/add_conversation/conference_details_fragment.ui @@ -1,272 +1,238 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> + <requires lib="gtk" version="4.0"/> <template class="DinoUiConferenceDetailsFragment"> <property name="visible">True</property> <child> <object class="GtkOverlay"> - <property name="visible">True</property> - <child> + <property name="child"> <object class="GtkGrid"> <property name="orientation">vertical</property> - <property name="margin">20</property> + <property name="margin-start">20</property> + <property name="margin-end">20</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> <property name="margin_end">40</property> <property name="margin_start">40</property> <property name="row-spacing">7</property> <property name="column-spacing">10</property> - <property name="visible">True</property> <child> <object class="GtkLabel"> - <property name="label" translatable="yes">Account</property> + <property name="label" translatable="1">Account</property> <property name="xalign">1</property> - <property name="visible">True</property> <style> <class name="dim-label"/> </style> + <layout> + <property name="column">0</property> + <property name="row">0</property> + </layout> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkStack" id="accounts_stack"> - <property name="visible">True</property> <child> - <object class="GtkButton" id="accounts_button"> - <property name="relief">none</property> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="accounts_label"> - <property name="xalign">0</property> - <property name="visible">True</property> + <object class="GtkStackPage"> + <property name="name">label</property> + <property name="child"> + <object class="GtkButton" id="accounts_button"> + <property name="has-frame">False</property> + <child> + <object class="GtkLabel" id="accounts_label"> + <property name="xalign">0</property> + </object> + </child> </object> - </child> + </property> </object> - <packing> - <property name="name">label</property> - </packing> </child> <child> - <object class="DinoUiAccountComboBox" id="account_combobox"> - <property name="hexpand">True</property> - <property name="width_request">200</property> - <property name="visible">True</property> - </object> - <packing> + <object class="GtkStackPage"> <property name="name">entry</property> - </packing> + <property name="child"> + <object class="DinoUiAccountComboBox" id="account_combobox"> + <property name="hexpand">True</property> + <property name="width_request">200</property> + <property name="visible">True</property> + </object> + </property> + </object> </child> + <layout> + <property name="column">1</property> + <property name="row">0</property> + </layout> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkLabel"> <property name="label">JID</property> <property name="xalign">1</property> - <property name="visible">True</property> <style> <class name="dim-label"/> </style> + <layout> + <property name="column">0</property> + <property name="row">1</property> + </layout> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkStack" id="jid_stack"> - <property name="visible">True</property> <child> - <object class="GtkButton" id="jid_button"> - <property name="relief">none</property> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="jid_label"> - <property name="xalign">0</property> - <property name="visible">True</property> + <object class="GtkStackPage"> + <property name="name">label</property> + <property name="child"> + <object class="GtkButton" id="jid_button"> + <property name="has-frame">False</property> + <child> + <object class="GtkLabel" id="jid_label"> + <property name="xalign">0</property> + </object> + </child> </object> - </child> + </property> </object> - <packing> - <property name="name">label</property> - </packing> </child> <child> - <object class="GtkEntry" id="jid_entry"> - <property name="hexpand">True</property> - <property name="width_request">200</property> - <property name="visible">True</property> - </object> - <packing> + <object class="GtkStackPage"> <property name="name">entry</property> - </packing> + <property name="child"> + <object class="GtkEntry" id="jid_entry"> + <property name="hexpand">1</property> + <property name="width_request">200</property> + </object> + </property> + </object> </child> + <layout> + <property name="column">1</property> + <property name="row">1</property> + </layout> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkLabel"> - <property name="label" translatable="yes">Nick</property> + <property name="label" translatable="1">Nick</property> <property name="xalign">1</property> - <property name="visible">True</property> <style> <class name="dim-label"/> </style> + <layout> + <property name="column">0</property> + <property name="row">2</property> + </layout> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkStack" id="nick_stack"> - <property name="visible">True</property> <child> - <object class="GtkButton" id="nick_button"> - <property name="relief">none</property> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="nick_label"> - <property name="xalign">0</property> - <property name="visible">True</property> + <object class="GtkStackPage"> + <property name="name">label</property> + <property name="child"> + <object class="GtkButton" id="nick_button"> + <property name="has-frame">False</property> + <child> + <object class="GtkLabel" id="nick_label"> + <property name="xalign">0</property> + </object> + </child> </object> - </child> + </property> </object> - <packing> - <property name="name">label</property> - </packing> </child> <child> - <object class="GtkEntry" id="nick_entry"> - <property name="hexpand">True</property> - <property name="width_request">200</property> - <property name="visible">True</property> - </object> - <packing> + <object class="GtkStackPage"> <property name="name">entry</property> - </packing> + <property name="child"> + <object class="GtkEntry" id="nick_entry"> + <property name="hexpand">1</property> + <property name="width_request">200</property> + </object> + </property> + </object> </child> + <layout> + <property name="column">1</property> + <property name="row">2</property> + </layout> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkLabel" id="password_text_label"> - <property name="label" translatable="yes">Password</property> + <property name="visible">0</property> + <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">3</property> + </layout> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkStack" id="password_stack"> + <property name="visible">0</property> <child> - <object class="GtkButton" id="password_button"> - <property name="relief">none</property> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="password_label"> - <property name="xalign">0</property> - <property name="visible">True</property> + <object class="GtkStackPage"> + <property name="name">label</property> + <property name="child"> + <object class="GtkButton" id="password_button"> + <property name="has-frame">False</property> + <child> + <object class="GtkLabel" id="password_label"> + <property name="xalign">0</property> + </object> + </child> </object> - </child> + </property> </object> - <packing> - <property name="name">label</property> - </packing> </child> <child> - <object class="GtkEntry" id="password_entry"> - <property name="hexpand">True</property> - <property name="width_request">200</property> - <property name="visibility">False</property> - <property name="visible">True</property> - </object> - <packing> + <object class="GtkStackPage"> <property name="name">entry</property> - </packing> + <property name="child"> + <object class="GtkEntry" id="password_entry"> + <property name="hexpand">1</property> + <property name="width_request">200</property> + <property name="visibility">0</property> + </object> + </property> + </object> </child> + <layout> + <property name="column">1</property> + <property name="row">3</property> + </layout> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> </object> - <packing> - <property name="index">-1</property> - </packing> - </child> + </property> <child type="overlay"> <object class="GtkRevealer" id="notification_revealer"> - <property name="visible">True</property> - <property name="can_focus">False</property> <property name="halign">center</property> <property name="valign">start</property> - <child> + <property name="child"> <object class="GtkFrame" id="frame2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> +<!-- <property name="shadow_type">none</property>--> <style> <class name="app-notification"/> </style> - <child> + <property name="child"> <object class="GtkBox" id="box2"> - <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">20</property> <child> - <object class="GtkLabel" id="notification_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> + <object class="GtkLabel" id="notification_label"/> </child> <child> <object class="GtkButton" id="notification_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="relief">none</property> + <property name="focusable">1</property> + <property name="receives_default">1</property> + <property name="has-frame">False</property> <child> <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="can_focus">False</property> <property name="icon_name">window-close-symbolic</property> </object> </child> @@ -274,19 +240,14 @@ <class name="image-button"/> </style> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> - </child> + </property> <child type="label_item"> <placeholder/> </child> </object> - </child> + </property> </object> </child> </object> diff --git a/main/data/add_conversation/list_row.ui b/main/data/add_conversation/list_row.ui index 2eabec11..06b6dc7f 100644 --- a/main/data/add_conversation/list_row.ui +++ b/main/data/add_conversation/list_row.ui @@ -1,62 +1,51 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> - <template class="DinoUiListRow" parent="GtkListBoxRow"> - <property name="visible">True</property> + <requires lib="gtk" version="4.0"/> + <object class="GtkGrid" id="outer_grid"> + <property name="margin-start">3</property> + <property name="margin-end">3</property> + <property name="margin-top">3</property> + <property name="margin-bottom">3</property> + <property name="column-spacing">10</property> <child> - <object class="GtkGrid" id="outer_grid"> - <property name="orientation">horizontal</property> - <property name="margin">3</property> - <property name="column-spacing">10</property> - <property name="visible">True</property> + <object class="DinoUiAvatarImage" id="image"> + <property name="allow_gray">False</property> + <property name="height">30</property> + <property name="width">30</property> + <property name="valign">center</property> + </object> + </child> + <child> + <object class="GtkGrid"> + <property name="orientation">vertical</property> <child> - <object class="DinoUiAvatarImage" id="image"> - <property name="allow_gray">False</property> - <property name="height">30</property> - <property name="width">30</property> - <property name="valign">center</property> - <property name="visible">True</property> + <object class="GtkLabel" id="name_label"> + <property name="max_width_chars">1</property> + <property name="ellipsize">end</property> + <property name="hexpand">1</property> + <property name="xalign">0</property> + <layout> + <property name="column">0</property> + <property name="row">0</property> + </layout> </object> </child> <child> - <object class="GtkGrid"> - <property name="orientation">vertical</property> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="name_label"> - <property name="max_width_chars">1</property> - <property name="ellipsize">end</property> - <property name="expand">True</property> - <property name="xalign">0</property> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="via_label"> - <property name="max_width_chars">1</property> - <property name="ellipsize">end</property> - <property name="expand">True</property> - <property name="xalign">0</property> - <property name="visible">True</property> - <attributes> - <attribute name="scale" value="0.8"/> - </attributes> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> + <object class="GtkLabel" id="via_label"> + <property name="max_width_chars">1</property> + <property name="ellipsize">end</property> + <property name="hexpand">1</property> + <property name="xalign">0</property> + <attributes> + <attribute name="scale" value="0.8"></attribute> + </attributes> + <layout> + <property name="column">0</property> + <property name="row">1</property> + </layout> </object> </child> </object> </child> - </template> + </object> </interface> diff --git a/main/data/add_conversation/select_jid_fragment.ui b/main/data/add_conversation/select_jid_fragment.ui index 50bc0e36..8ead3207 100644 --- a/main/data/add_conversation/select_jid_fragment.ui +++ b/main/data/add_conversation/select_jid_fragment.ui @@ -1,86 +1,70 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> + <requires lib="gtk" version="4.0"/> <template class="DinoUiSelectJidFragment"> <property name="height_request">500</property> <property name="width_request">460</property> <property name="visible">True</property> <child> <object class="GtkGrid"> - <property name="expand">True</property> + <property name="hexpand">1</property> <property name="margin-top">20</property> - <property name="margin-right">80</property> + <property name="margin-end">80</property> <property name="margin-bottom">20</property> - <property name="margin-left">80</property> + <property name="margin-start">80</property> <property name="orientation">vertical</property> <property name="row-spacing">10</property> - <property name="visible">True</property> <child> <object class="GtkEntry" id="entry"> - <property name="activates_default">True</property> - <property name="hexpand">True</property> - <property name="visible">True</property> + <property name="activates_default">1</property> + <property name="hexpand">1</property> </object> </child> <child> <object class="GtkBox"> - <property name="expand">True</property> + <property name="hexpand">1</property> + <property name="vexpand">1</property> <property name="orientation">vertical</property> - <property name="visible">True</property> <child> <object class="GtkFrame"> - <property name="visible">True</property> - <child> + <property name="child"> <object class="GtkScrolledWindow" id="scrolled_window"> <property name="hscrollbar_policy">never</property> - <property name="expand">True</property> - <property name="visible">True</property> - <child> + <property name="hexpand">1</property> + <property name="vexpand">1</property> + <property name="child"> <object class="GtkBox" id="box"> <property name="orientation">vertical</property> - <property name="visible">True</property> </object> - </child> + </property> </object> - </child> + </property> </object> </child> <child> - <object class="GtkToolbar"> - <property name="visible">True</property> + <object class="GtkBox"> + <property name="css-classes">toolbar</property> <style> + <class name="toolbar"/> <class name="inline-toolbar"/> </style> <child> - <object class="GtkToolItem"> - <property name="visible">True</property> + <object class="GtkButton" id="add_button"> + <child> + <object class="GtkImage"> + <property name="icon-name">list-add-symbolic</property> + <property name="icon-size">normal</property> + </object> + </child> + </object> + </child> + <child> + <object class="GtkButton" id="remove_button"> + <property name="sensitive">0</property> <child> - <object class="GtkBox"> - <property name="visible">True</property> - <child> - <object class="GtkButton" id="add_button"> - <property name="visible">True</property> - <child> - <object class="GtkImage"> - <property name="icon-name">list-add-symbolic</property> - <property name="icon-size">1</property> - <property name="visible">True</property> - </object> - </child> - </object> - </child> - <child> - <object class="GtkButton" id="remove_button"> - <property name="sensitive">False</property> - <property name="visible">True</property> - <child> - <object class="GtkImage"> - <property name="icon-name">list-remove-symbolic</property> - <property name="icon-size">1</property> - <property name="visible">True</property> - </object> - </child> - </object> - </child> + <object class="GtkImage"> + <property name="icon-name">list-remove-symbolic</property> + <property name="icon-size">normal</property> </object> </child> </object> |