Mon, 29 Aug 2022 22:06:07 -0500
Move network preferences to Adwaita preference widgets
This does make the TURN server settings longer vertically, but that seems more consistent with everything.
Also fix the `leave` event on the TURN server setting.
Testing Done:
Toggled all the options and checked that stuff happened in the Debug Window.
Also, I'm not sure why the `GtkSpinButton` and `GtkEntry` expand to different sizes; they both have `hexpand=1`, and the spin button is next to text that's _shorter_ than the entry, but somehow ends up farther right. Seems like a bug in GTK.
PS, be careful of this page; it tries to get your public IP address and displays it when it succeeds.
Reviewed at https://reviews.imfreedom.org/r/1680/
|
39576
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
1 | <?xml version="1.0" encoding="UTF-8"?> |
|
41591
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
2 | <!-- |
|
40246
7c21a9cdf495
Add metadata to Glade ui files.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39931
diff
changeset
|
3 | Pidgin - Internet Messenger |
|
7c21a9cdf495
Add metadata to Glade ui files.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39931
diff
changeset
|
4 | Copyright (C) Pidgin Developers <devel@pidgin.im> |
|
7c21a9cdf495
Add metadata to Glade ui files.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39931
diff
changeset
|
5 | |
|
7c21a9cdf495
Add metadata to Glade ui files.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39931
diff
changeset
|
6 | This program is free software; you can redistribute it and/or |
|
7c21a9cdf495
Add metadata to Glade ui files.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39931
diff
changeset
|
7 | modify it under the terms of the GNU General Public License |
|
7c21a9cdf495
Add metadata to Glade ui files.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39931
diff
changeset
|
8 | as published by the Free Software Foundation; either version 2 |
|
7c21a9cdf495
Add metadata to Glade ui files.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39931
diff
changeset
|
9 | of the License, or (at your option) any later version. |
|
7c21a9cdf495
Add metadata to Glade ui files.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39931
diff
changeset
|
10 | |
|
7c21a9cdf495
Add metadata to Glade ui files.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39931
diff
changeset
|
11 | This program is distributed in the hope that it will be useful, |
|
7c21a9cdf495
Add metadata to Glade ui files.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39931
diff
changeset
|
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
7c21a9cdf495
Add metadata to Glade ui files.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39931
diff
changeset
|
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
7c21a9cdf495
Add metadata to Glade ui files.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39931
diff
changeset
|
14 | GNU General Public License for more details. |
|
7c21a9cdf495
Add metadata to Glade ui files.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39931
diff
changeset
|
15 | |
|
7c21a9cdf495
Add metadata to Glade ui files.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39931
diff
changeset
|
16 | You should have received a copy of the GNU General Public License |
|
41591
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
17 | along with this library; if not, see <https://www.gnu.org/licenses/>. |
|
40246
7c21a9cdf495
Add metadata to Glade ui files.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39931
diff
changeset
|
18 | --> |
|
39576
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
19 | <interface> |
|
41591
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
20 | <requires lib="gtk" version="4.0"/> |
|
40246
7c21a9cdf495
Add metadata to Glade ui files.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39931
diff
changeset
|
21 | <!-- interface-license-type gplv2 --> |
|
7c21a9cdf495
Add metadata to Glade ui files.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39931
diff
changeset
|
22 | <!-- interface-name Pidgin --> |
|
7c21a9cdf495
Add metadata to Glade ui files.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39931
diff
changeset
|
23 | <!-- interface-description Internet Messenger --> |
|
7c21a9cdf495
Add metadata to Glade ui files.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39931
diff
changeset
|
24 | <!-- interface-copyright Pidgin Developers <devel@pidgin.im> --> |
|
39576
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
25 | <template class="PidginInviteDialog" parent="GtkDialog"> |
|
41591
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
26 | <property name="title" translatable="1">Invite to conversation...</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
27 | <property name="resizable">0</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
28 | <child internal-child="content_area"> |
|
39576
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
29 | <object class="GtkBox"> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
30 | <property name="orientation">vertical</property> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
31 | <property name="spacing">2</property> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
32 | <child> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
33 | <object class="GtkGrid"> |
|
41591
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
34 | <property name="vexpand">1</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
35 | <property name="valign">fill</property> |
|
40824
132c763c26e4
Refresh all of the ui files
Gary Kramlich <grim@reaperworld.com>
parents:
40246
diff
changeset
|
36 | <property name="margin-bottom">6</property> |
|
132c763c26e4
Refresh all of the ui files
Gary Kramlich <grim@reaperworld.com>
parents:
40246
diff
changeset
|
37 | <property name="row-spacing">6</property> |
|
39576
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
38 | <child> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
39 | <object class="GtkLabel"> |
|
41591
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
40 | <property name="label" translatable="1">Please enter the name of the user you wish to invite, along with an optional invite message.</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
41 | <property name="wrap">1</property> |
|
39576
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
42 | <property name="xalign">0</property> |
|
41591
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
43 | <layout> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
44 | <property name="column">0</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
45 | <property name="row">0</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
46 | <property name="column-span">2</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
47 | </layout> |
|
39576
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
48 | </object> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
49 | </child> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
50 | <child> |
|
41591
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
51 | <object class="GtkLabel" id="label_contact"> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
52 | <property name="label" translatable="1">Contact:</property> |
|
39576
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
53 | <property name="xalign">0</property> |
|
41591
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
54 | <layout> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
55 | <property name="column">0</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
56 | <property name="row">1</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
57 | </layout> |
|
39576
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
58 | </object> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
59 | </child> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
60 | <child> |
|
41591
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
61 | <object class="GtkLabel" id="label_message"> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
62 | <property name="label" translatable="1">Message:</property> |
|
39576
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
63 | <property name="xalign">0</property> |
|
41591
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
64 | <layout> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
65 | <property name="column">0</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
66 | <property name="row">2</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
67 | </layout> |
|
39576
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
68 | </object> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
69 | </child> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
70 | <child> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
71 | <object class="GtkEntry" id="contact"> |
|
41591
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
72 | <property name="focusable">1</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
73 | <property name="activates-default">1</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
74 | <layout> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
75 | <property name="column">1</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
76 | <property name="row">1</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
77 | </layout> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
78 | <accessibility> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
79 | <relation name="labelled-by">label_contact</relation> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
80 | </accessibility> |
|
39576
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
81 | </object> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
82 | </child> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
83 | <child> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
84 | <object class="GtkEntry" id="message"> |
|
41591
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
85 | <property name="focusable">1</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
86 | <property name="activates-default">1</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
87 | <layout> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
88 | <property name="column">1</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
89 | <property name="row">2</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
90 | </layout> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
91 | <accessibility> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
92 | <relation name="labelled-by">label_message</relation> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
93 | </accessibility> |
|
39576
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
94 | </object> |
|
40824
132c763c26e4
Refresh all of the ui files
Gary Kramlich <grim@reaperworld.com>
parents:
40246
diff
changeset
|
95 | </child> |
|
39576
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
96 | </object> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
97 | </child> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
98 | </object> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
99 | </child> |
|
41501
e34ec115fc34
Move dialog buttons to action widgets
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40824
diff
changeset
|
100 | <child type="action"> |
|
e34ec115fc34
Move dialog buttons to action widgets
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40824
diff
changeset
|
101 | <object class="GtkButton" id="button1"> |
|
41591
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
102 | <property name="label" translatable="1">Cancel</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
103 | <property name="focusable">1</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
104 | <property name="receives-default">1</property> |
|
41501
e34ec115fc34
Move dialog buttons to action widgets
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40824
diff
changeset
|
105 | </object> |
|
e34ec115fc34
Move dialog buttons to action widgets
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40824
diff
changeset
|
106 | </child> |
|
e34ec115fc34
Move dialog buttons to action widgets
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40824
diff
changeset
|
107 | <child type="action"> |
|
e34ec115fc34
Move dialog buttons to action widgets
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40824
diff
changeset
|
108 | <object class="GtkButton" id="button2"> |
|
41591
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
109 | <property name="label" translatable="1">Invite</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
110 | <property name="focusable">1</property> |
|
ad6f5ffc2825
Port the invite dialog to GTK4
Gary Kramlich <grim@reaperworld.com>
parents:
41501
diff
changeset
|
111 | <property name="receives-default">1</property> |
|
41501
e34ec115fc34
Move dialog buttons to action widgets
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40824
diff
changeset
|
112 | </object> |
|
e34ec115fc34
Move dialog buttons to action widgets
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40824
diff
changeset
|
113 | </child> |
|
39576
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
114 | <action-widgets> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
115 | <action-widget response="-6">button1</action-widget> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
116 | <action-widget response="-3">button2</action-widget> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
117 | </action-widgets> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
118 | </template> |
|
9da340b66f6d
Start of the new invite widget
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
119 | </interface> |