--- a/pidgin/resources/Dialogs/addchat.ui Mon Nov 07 21:51:11 2022 -0600 +++ b/pidgin/resources/Dialogs/addchat.ui Mon Nov 07 23:27:06 2022 -0600 @@ -31,20 +31,19 @@ <signal name="response" handler="pidgin_add_chat_dialog_response_cb" swapped="no"/> <child internal-child="content_area"> <object class="GtkBox"> + <property name="margin-bottom">24</property> + <property name="margin-end">24</property> + <property name="margin-start">24</property> + <property name="margin-top">24</property> <property name="orientation">vertical</property> - <property name="spacing">12</property> + <property name="spacing">24</property> <child> <object class="GtkLabel"> - <property name="label" translatable="1">Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.</property> - <property name="wrap">1</property> - <property name="xalign">0</property> - <property name="yalign">0</property> + <property name="css-classes">title-1</property> + <property name="label" translatable="1">Add a chat</property> </object> </child> <child> - <object class="GtkLabel" id="spacer"/> - </child> - <child> <object class="GtkBox"> <property name="spacing">5</property> <child> @@ -53,7 +52,6 @@ <property name="use-underline">1</property> <property name="mnemonic-widget">account</property> <property name="xalign">0</property> - <property name="yalign">0</property> </object> </child> <child> @@ -70,73 +68,69 @@ </object> </property> <signal name="notify::account" handler="pidgin_add_chat_dialog_account_changed_cb" swapped="no"/> + <accessibility> + <relation name="labelled-by">label1</relation> + </accessibility> </object> </child> </object> </child> <child> - <object class="GtkBox" id="dynamic_box"> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <property name="hexpand">1</property> - <child> - <placeholder/> - </child> - </object> - </child> - <child> - <object class="GtkBox"> - <property name="spacing">5</property> - <child> - <object class="GtkLabel" id="label4"> - <property name="label" translatable="1">A_lias:</property> - <property name="use-underline">1</property> - <property name="mnemonic-widget">alias</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - </object> - </child> - <child> - <object class="GtkEntry" id="alias"> - <property name="hexpand">1</property> - <property name="focusable">1</property> - </object> - </child> + <object class="AdwPreferencesGroup" id="dynamic_group"> + <property name="title" translatable="1">Chat information</property> + <property name="description" translatable="1">Please enter the appropriate information about the chat you would like to add to your buddy list.</property> </object> </child> <child> - <object class="GtkBox"> - <property name="spacing">5</property> + <object class="AdwPreferencesGroup"> + <property name="title" translatable="1">Local information</property> + <child> + <object class="AdwEntryRow" id="alias"> + <property name="title" translatable="1">A_lias</property> + <property name="use-underline">1</property> + </object> + </child> <child> - <object class="GtkLabel" id="label5"> - <property name="label" translatable="1">_Group:</property> + <object class="AdwActionRow"> + <property name="activatable-widget">group</property> + <property name="focusable">0</property> + <property name="title" translatable="1">_Group</property> <property name="use-underline">1</property> - <property name="xalign">0</property> - <property name="yalign">0</property> + <child> + <object class="GtkComboBoxText" id="group"> + <property name="hexpand">1</property> + <property name="has-entry">1</property> + <property name="valign">center</property> + </object> + </child> </object> </child> <child> - <object class="GtkComboBoxText" id="group"> - <property name="hexpand">1</property> - <property name="has-entry">1</property> + <object class="AdwActionRow"> + <property name="activatable-widget">autojoin</property> + <property name="focusable">0</property> + <property name="title" translatable="1">Automatically _join when account connects</property> + <property name="use-underline">1</property> + <child> + <object class="GtkSwitch" id="autojoin"> + <property name="valign">center</property> + </object> + </child> </object> </child> - </object> - </child> - <child> - <object class="GtkCheckButton" id="autojoin"> - <property name="label" translatable="1">Automatically _join when account connects</property> - <property name="focusable">1</property> - <property name="halign">start</property> - <property name="use-underline">1</property> - </object> - </child> - <child> - <object class="GtkCheckButton" id="persistent"> - <property name="label" translatable="1">_Remain in chat after window is closed</property> - <property name="focusable">1</property> - <property name="halign">start</property> - <property name="use-underline">1</property> + <child> + <object class="AdwActionRow"> + <property name="activatable-widget">persistent</property> + <property name="focusable">0</property> + <property name="title" translatable="1">_Remain in chat after window is closed</property> + <property name="use-underline">1</property> + <child> + <object class="GtkSwitch" id="persistent"> + <property name="valign">center</property> + </object> + </child> + </object> + </child> </object> </child> </object> @@ -171,11 +165,4 @@ <action-widget response="ok">button2</action-widget> </action-widgets> </template> - <object class="GtkSizeGroup" id="sg"> - <widgets> - <widget name="label1"/> - <widget name="label4"/> - <widget name="label5"/> - </widgets> - </object> </interface>