--- a/pidgin/resources/Conversations/invite_dialog.ui Thu Aug 25 21:34:06 2022 -0500 +++ b/pidgin/resources/Conversations/invite_dialog.ui Thu Aug 25 21:34:53 2022 -0500 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.38.2 - +<!-- Pidgin - Internet Messenger Copyright (C) Pidgin Developers <devel@pidgin.im> @@ -15,129 +14,101 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - +along with this library; if not, see <https://www.gnu.org/licenses/>. --> <interface> - <requires lib="gtk+" version="3.22"/> + <requires lib="gtk" version="4.0"/> <!-- interface-license-type gplv2 --> <!-- interface-name Pidgin --> <!-- interface-description Internet Messenger --> <!-- interface-copyright Pidgin Developers <devel@pidgin.im> --> <template class="PidginInviteDialog" parent="GtkDialog"> - <property name="can-focus">False</property> - <property name="border-width">6</property> - <property name="title" translatable="yes">Invite to conversation...</property> - <property name="resizable">False</property> - <property name="type-hint">dialog</property> - <child internal-child="vbox"> + <property name="title" translatable="1">Invite to conversation...</property> + <property name="resizable">0</property> + <child internal-child="content_area"> <object class="GtkBox"> - <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">2</property> <child> - <!-- n-columns=3 n-rows=3 --> <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="vexpand">1</property> + <property name="valign">fill</property> <property name="margin-bottom">6</property> <property name="row-spacing">6</property> <child> <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Please enter the name of the user you wish to invite, along with an optional invite message.</property> - <property name="wrap">True</property> + <property name="label" translatable="1">Please enter the name of the user you wish to invite, along with an optional invite message.</property> + <property name="wrap">1</property> <property name="xalign">0</property> + <layout> + <property name="column">0</property> + <property name="row">0</property> + <property name="column-span">2</property> + </layout> </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - <property name="width">2</property> - </packing> </child> <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Contact:</property> + <object class="GtkLabel" id="label_contact"> + <property name="label" translatable="1">Contact:</property> <property name="xalign">0</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> - </packing> </child> <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Message:</property> + <object class="GtkLabel" id="label_message"> + <property name="label" translatable="1">Message:</property> <property name="xalign">0</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> - </packing> </child> <child> <object class="GtkEntry" id="contact"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="has-focus">True</property> - <property name="activates-default">True</property> + <property name="focusable">1</property> + <property name="activates-default">1</property> + <layout> + <property name="column">1</property> + <property name="row">1</property> + </layout> + <accessibility> + <relation name="labelled-by">label_contact</relation> + </accessibility> </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> - </packing> </child> <child> <object class="GtkEntry" id="message"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="activates-default">True</property> + <property name="focusable">1</property> + <property name="activates-default">1</property> + <layout> + <property name="column">1</property> + <property name="row">2</property> + </layout> + <accessibility> + <relation name="labelled-by">label_message</relation> + </accessibility> </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> </child> <child type="action"> <object class="GtkButton" id="button1"> - <property name="label" translatable="yes">Cancel</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> + <property name="label" translatable="1">Cancel</property> + <property name="focusable">1</property> + <property name="receives-default">1</property> </object> </child> <child type="action"> <object class="GtkButton" id="button2"> - <property name="label" translatable="yes">Invite</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="can-default">True</property> - <property name="has-default">True</property> - <property name="receives-default">True</property> + <property name="label" translatable="1">Invite</property> + <property name="focusable">1</property> + <property name="receives-default">1</property> </object> </child> <action-widgets>