diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-05-26 14:59:54 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-05-26 14:59:54 +0000 |
commit | ec453e83017e0d1e8a7860dd85e2616ff24ad674 (patch) | |
tree | 39d0467a965453b01d041046d8c65c9a6b589eb9 | |
parent | 79434e322280ecfbd3f328991c9b595f03a28223 (diff) | |
download | gnunet-gtk-ec453e83017e0d1e8a7860dd85e2616ff24ad674.tar.gz gnunet-gtk-ec453e83017e0d1e8a7860dd85e2616ff24ad674.zip |
cleaning up conversation UI to avoid duplicate/confusing buttons
-rw-r--r-- | contrib/gnunet_conversation_gtk_main_window.glade | 1355 | ||||
-rw-r--r-- | contrib/gnunet_peerinfo_gtk_main_window.glade | 26 | ||||
-rw-r--r-- | contrib/gnunet_setup_calendar_dialog.glade | 9 |
3 files changed, 641 insertions, 749 deletions
diff --git a/contrib/gnunet_conversation_gtk_main_window.glade b/contrib/gnunet_conversation_gtk_main_window.glade index 6c8061c1..d9633293 100644 --- a/contrib/gnunet_conversation_gtk_main_window.glade +++ b/contrib/gnunet_conversation_gtk_main_window.glade | |||
@@ -1,7 +1,61 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | <!-- Generated with glade 3.18.3 --> | ||
2 | <interface> | 3 | <interface> |
3 | <!-- interface-requires gtk+ 3.0 --> | 4 | <requires lib="gtk+" version="3.0"/> |
4 | <object class="GtkAction" id="action1"/> | 5 | <object class="GtkListStore" id="gnunet_conversation_gtk_active_calls_liststore"> |
6 | <columns> | ||
7 | <!-- column-name caller_id --> | ||
8 | <column type="gchararray"/> | ||
9 | <!-- column-name caller --> | ||
10 | <column type="gpointer"/> | ||
11 | <!-- column-name caller_num --> | ||
12 | <column type="gint"/> | ||
13 | <!-- column-name caller_type --> | ||
14 | <column type="gint"/> | ||
15 | <!-- column-name caller_state --> | ||
16 | <column type="gint"/> | ||
17 | <!-- column-name call --> | ||
18 | <column type="gpointer"/> | ||
19 | <!-- column-name call_state --> | ||
20 | <column type="gint"/> | ||
21 | <!-- column-name call_id --> | ||
22 | <column type="gint"/> | ||
23 | </columns> | ||
24 | </object> | ||
25 | <object class="GtkListStore" id="gnunet_conversation_gtk_caller_id_zone_liststore"> | ||
26 | <columns> | ||
27 | <!-- column-name ego_name --> | ||
28 | <column type="gchararray"/> | ||
29 | <!-- column-name ego --> | ||
30 | <column type="gpointer"/> | ||
31 | </columns> | ||
32 | </object> | ||
33 | <object class="GtkListStore" id="gnunet_conversation_gtk_contacts_liststore"> | ||
34 | <columns> | ||
35 | <!-- column-name contactName --> | ||
36 | <column type="gchararray"/> | ||
37 | <!-- column-name contactType --> | ||
38 | <column type="gchararray"/> | ||
39 | </columns> | ||
40 | </object> | ||
41 | <object class="GtkListStore" id="gnunet_conversation_gtk_contacts_zone_liststore"> | ||
42 | <columns> | ||
43 | <!-- column-name ego_name --> | ||
44 | <column type="gchararray"/> | ||
45 | <!-- column-name ego --> | ||
46 | <column type="gpointer"/> | ||
47 | </columns> | ||
48 | </object> | ||
49 | <object class="GtkListStore" id="gnunet_conversation_gtk_history_liststore"> | ||
50 | <columns> | ||
51 | <!-- column-name logTime --> | ||
52 | <column type="gchararray"/> | ||
53 | <!-- column-name logEvent --> | ||
54 | <column type="gchararray"/> | ||
55 | <!-- column-name logContact --> | ||
56 | <column type="gchararray"/> | ||
57 | </columns> | ||
58 | </object> | ||
5 | <object class="GtkWindow" id="GNUNET_GTK_conversation_window"> | 59 | <object class="GtkWindow" id="GNUNET_GTK_conversation_window"> |
6 | <property name="can_focus">False</property> | 60 | <property name="can_focus">False</property> |
7 | <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property> | 61 | <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property> |
@@ -9,7 +63,7 @@ | |||
9 | <property name="icon_name">contact-new</property> | 63 | <property name="icon_name">contact-new</property> |
10 | <signal name="delete-event" handler="GNUNET_GTK_conversation_quit_cb" swapped="no"/> | 64 | <signal name="delete-event" handler="GNUNET_GTK_conversation_quit_cb" swapped="no"/> |
11 | <child> | 65 | <child> |
12 | <object class="GtkBox" id="box1"> | 66 | <object class="GtkBox" id="gnunet_conversation_gtk_main_vbox"> |
13 | <property name="visible">True</property> | 67 | <property name="visible">True</property> |
14 | <property name="can_focus">False</property> | 68 | <property name="can_focus">False</property> |
15 | <property name="orientation">vertical</property> | 69 | <property name="orientation">vertical</property> |
@@ -44,6 +98,36 @@ | |||
44 | </object> | 98 | </object> |
45 | </child> | 99 | </child> |
46 | <child> | 100 | <child> |
101 | <object class="GtkMenuItem" id="gnunet_conversation_gtk_view_menu"> | ||
102 | <property name="visible">True</property> | ||
103 | <property name="can_focus">False</property> | ||
104 | <property name="label" translatable="yes">_View</property> | ||
105 | <property name="use_underline">True</property> | ||
106 | <child type="submenu"> | ||
107 | <object class="GtkMenu" id="gnunet_conversation_gtk_view_sub_menu"> | ||
108 | <property name="visible">True</property> | ||
109 | <property name="can_focus">False</property> | ||
110 | <child> | ||
111 | <object class="GtkCheckMenuItem" id="gnunet_conversation_gtk_view_history_checkmenuitem"> | ||
112 | <property name="visible">True</property> | ||
113 | <property name="can_focus">False</property> | ||
114 | <property name="label" translatable="yes">_History</property> | ||
115 | <property name="use_underline">True</property> | ||
116 | </object> | ||
117 | </child> | ||
118 | <child> | ||
119 | <object class="GtkCheckMenuItem" id="gnunet_conversation_gtk_view_log_checkmenuitem"> | ||
120 | <property name="visible">True</property> | ||
121 | <property name="can_focus">False</property> | ||
122 | <property name="label" translatable="yes">_Logs</property> | ||
123 | <property name="use_underline">True</property> | ||
124 | </object> | ||
125 | </child> | ||
126 | </object> | ||
127 | </child> | ||
128 | </object> | ||
129 | </child> | ||
130 | <child> | ||
47 | <object class="GtkMenuItem" id="GNUNET_GTK_conversation_help_menuitem"> | 131 | <object class="GtkMenuItem" id="GNUNET_GTK_conversation_help_menuitem"> |
48 | <property name="use_action_appearance">False</property> | 132 | <property name="use_action_appearance">False</property> |
49 | <property name="visible">True</property> | 133 | <property name="visible">True</property> |
@@ -77,181 +161,79 @@ | |||
77 | </packing> | 161 | </packing> |
78 | </child> | 162 | </child> |
79 | <child> | 163 | <child> |
80 | <object class="GtkGrid" id="grid1"> | 164 | <object class="GtkPaned" id="gnunet_conversation_main_paned"> |
81 | <property name="visible">True</property> | 165 | <property name="visible">True</property> |
82 | <property name="can_focus">False</property> | 166 | <property name="can_focus">True</property> |
167 | <property name="position">400</property> | ||
168 | <property name="position_set">True</property> | ||
83 | <child> | 169 | <child> |
84 | <object class="GtkGrid" id="grid4"> | 170 | <object class="GtkFrame" id="gnunet_conversation_call_frame"> |
85 | <property name="visible">True</property> | 171 | <property name="visible">True</property> |
86 | <property name="can_focus">False</property> | 172 | <property name="can_focus">False</property> |
173 | <property name="label_xalign">0</property> | ||
174 | <property name="shadow_type">none</property> | ||
87 | <child> | 175 | <child> |
88 | <object class="GtkBox" id="GNUNET_CONVERSATION_log_box"> | 176 | <object class="GtkAlignment" id="gnunet_conversation_call_alignment"> |
89 | <property name="can_focus">False</property> | ||
90 | <property name="orientation">vertical</property> | ||
91 | <property name="spacing">1</property> | ||
92 | <child> | ||
93 | <object class="GtkLabel" id="log_label"> | ||
94 | <property name="visible">True</property> | ||
95 | <property name="can_focus">False</property> | ||
96 | <property name="label" translatable="yes">Debug Log</property> | ||
97 | </object> | ||
98 | <packing> | ||
99 | <property name="expand">False</property> | ||
100 | <property name="fill">True</property> | ||
101 | <property name="position">0</property> | ||
102 | </packing> | ||
103 | </child> | ||
104 | <child> | ||
105 | <object class="GtkButtonBox" id="log_buttonbox"> | ||
106 | <property name="visible">True</property> | ||
107 | <property name="can_focus">False</property> | ||
108 | <property name="layout_style">start</property> | ||
109 | <child> | ||
110 | <object class="GtkButton" id="gnunet-contact-test"> | ||
111 | <property name="label" translatable="yes">test_button</property> | ||
112 | <property name="use_action_appearance">False</property> | ||
113 | <property name="visible">True</property> | ||
114 | <property name="can_focus">True</property> | ||
115 | <property name="receives_default">True</property> | ||
116 | <property name="use_action_appearance">False</property> | ||
117 | <signal name="clicked" handler="GNUNET_contact_test" swapped="no"/> | ||
118 | </object> | ||
119 | <packing> | ||
120 | <property name="expand">False</property> | ||
121 | <property name="fill">True</property> | ||
122 | <property name="position">0</property> | ||
123 | </packing> | ||
124 | </child> | ||
125 | <child> | ||
126 | <object class="GtkButton" id="GNUNET_GTK_conversation_status_button"> | ||
127 | <property name="label" translatable="yes">test_update_status</property> | ||
128 | <property name="use_action_appearance">False</property> | ||
129 | <property name="visible">True</property> | ||
130 | <property name="can_focus">True</property> | ||
131 | <property name="receives_default">True</property> | ||
132 | <property name="use_action_appearance">False</property> | ||
133 | <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_status_clicked" swapped="no"/> | ||
134 | </object> | ||
135 | <packing> | ||
136 | <property name="expand">False</property> | ||
137 | <property name="fill">True</property> | ||
138 | <property name="position">1</property> | ||
139 | </packing> | ||
140 | </child> | ||
141 | <child> | ||
142 | <object class="GtkButton" id="GNUNET_GTK_conversation_test_button_two"> | ||
143 | <property name="label" translatable="yes">test 2</property> | ||
144 | <property name="use_action_appearance">False</property> | ||
145 | <property name="visible">True</property> | ||
146 | <property name="can_focus">True</property> | ||
147 | <property name="receives_default">True</property> | ||
148 | <property name="use_action_appearance">False</property> | ||
149 | <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_test_button_two" swapped="no"/> | ||
150 | </object> | ||
151 | <packing> | ||
152 | <property name="expand">False</property> | ||
153 | <property name="fill">True</property> | ||
154 | <property name="position">2</property> | ||
155 | </packing> | ||
156 | </child> | ||
157 | <child> | ||
158 | <object class="GtkButton" id="GNUNET_GTK_conversation_test_button_three"> | ||
159 | <property name="label" translatable="yes">test 2</property> | ||
160 | <property name="use_action_appearance">False</property> | ||
161 | <property name="visible">True</property> | ||
162 | <property name="can_focus">True</property> | ||
163 | <property name="receives_default">True</property> | ||
164 | <property name="use_action_appearance">False</property> | ||
165 | <signal name="clicked" handler="test_notification" swapped="no"/> | ||
166 | </object> | ||
167 | <packing> | ||
168 | <property name="expand">False</property> | ||
169 | <property name="fill">True</property> | ||
170 | <property name="position">3</property> | ||
171 | </packing> | ||
172 | </child> | ||
173 | </object> | ||
174 | <packing> | ||
175 | <property name="expand">False</property> | ||
176 | <property name="fill">True</property> | ||
177 | <property name="position">1</property> | ||
178 | </packing> | ||
179 | </child> | ||
180 | <child> | ||
181 | <object class="GtkScrolledWindow" id="GNUNET_GTK_conversation_log_scroll"> | ||
182 | <property name="visible">True</property> | ||
183 | <property name="can_focus">True</property> | ||
184 | <property name="hscrollbar_policy">always</property> | ||
185 | <property name="shadow_type">in</property> | ||
186 | <child> | ||
187 | <object class="GtkTextView" id="GNUNET_GTK_conversation_log"> | ||
188 | <property name="visible">True</property> | ||
189 | <property name="can_focus">True</property> | ||
190 | <property name="editable">False</property> | ||
191 | <property name="left_margin">1</property> | ||
192 | <property name="right_margin">1</property> | ||
193 | <property name="indent">1</property> | ||
194 | </object> | ||
195 | </child> | ||
196 | </object> | ||
197 | <packing> | ||
198 | <property name="expand">True</property> | ||
199 | <property name="fill">True</property> | ||
200 | <property name="position">2</property> | ||
201 | </packing> | ||
202 | </child> | ||
203 | </object> | ||
204 | <packing> | ||
205 | <property name="left_attach">0</property> | ||
206 | <property name="top_attach">4</property> | ||
207 | <property name="width">1</property> | ||
208 | <property name="height">1</property> | ||
209 | </packing> | ||
210 | </child> | ||
211 | <child> | ||
212 | <object class="GtkBox" id="call_toplevel_box"> | ||
213 | <property name="visible">True</property> | 177 | <property name="visible">True</property> |
214 | <property name="can_focus">False</property> | 178 | <property name="can_focus">False</property> |
215 | <property name="orientation">vertical</property> | 179 | <property name="left_padding">12</property> |
216 | <child> | 180 | <child> |
217 | <object class="GtkLabel" id="call_label"> | 181 | <object class="GtkBox" id="gnunet_conversation_call_vbox"> |
218 | <property name="visible">True</property> | ||
219 | <property name="can_focus">False</property> | ||
220 | <property name="label" translatable="yes">Phone Controls</property> | ||
221 | <attributes> | ||
222 | <attribute name="style" value="oblique"/> | ||
223 | </attributes> | ||
224 | </object> | ||
225 | <packing> | ||
226 | <property name="expand">False</property> | ||
227 | <property name="fill">True</property> | ||
228 | <property name="position">0</property> | ||
229 | </packing> | ||
230 | </child> | ||
231 | <child> | ||
232 | <object class="GtkLabel" id="GNUNET_CONVERSATION_GTK_my_address"> | ||
233 | <property name="visible">True</property> | ||
234 | <property name="can_focus">False</property> | ||
235 | <property name="tooltip_text" translatable="yes">This is the address the phone is listening on.</property> | ||
236 | <property name="label" translatable="yes">my address</property> | ||
237 | <property name="selectable">True</property> | ||
238 | <property name="single_line_mode">True</property> | ||
239 | </object> | ||
240 | <packing> | ||
241 | <property name="expand">False</property> | ||
242 | <property name="fill">True</property> | ||
243 | <property name="position">1</property> | ||
244 | </packing> | ||
245 | </child> | ||
246 | <child> | ||
247 | <object class="GtkBox" id="outgoing_ego_chooser_box"> | ||
248 | <property name="visible">True</property> | 182 | <property name="visible">True</property> |
249 | <property name="can_focus">False</property> | 183 | <property name="can_focus">False</property> |
184 | <property name="orientation">vertical</property> | ||
250 | <child> | 185 | <child> |
251 | <object class="GtkLabel" id="ego_label"> | 186 | <object class="GtkBox" id="outgoing_ego_chooser_box"> |
252 | <property name="visible">True</property> | 187 | <property name="visible">True</property> |
253 | <property name="can_focus">False</property> | 188 | <property name="can_focus">False</property> |
254 | <property name="label" translatable="yes">Ego:</property> | 189 | <child> |
190 | <object class="GtkLabel" id="ego_label"> | ||
191 | <property name="visible">True</property> | ||
192 | <property name="can_focus">False</property> | ||
193 | <property name="label" translatable="yes">Ego:</property> | ||
194 | </object> | ||
195 | <packing> | ||
196 | <property name="expand">False</property> | ||
197 | <property name="fill">False</property> | ||
198 | <property name="padding">5</property> | ||
199 | <property name="position">0</property> | ||
200 | </packing> | ||
201 | </child> | ||
202 | <child> | ||
203 | <object class="GtkComboBox" id="gnunet_conversation_gtk_outgoing_zone_combobox"> | ||
204 | <property name="visible">True</property> | ||
205 | <property name="can_focus">False</property> | ||
206 | <property name="model">gnunet_conversation_gtk_contacts_zone_liststore</property> | ||
207 | <signal name="changed" handler="gnunet_conversation_gtk_outgoing_zone_combobox_changed_cb" swapped="no"/> | ||
208 | <child> | ||
209 | <object class="GtkCellRendererText" id="gnunet_conversation_gtk_outgoing_zone_ego_name_cellrenderertext"/> | ||
210 | <attributes> | ||
211 | <attribute name="text">0</attribute> | ||
212 | </attributes> | ||
213 | </child> | ||
214 | </object> | ||
215 | <packing> | ||
216 | <property name="expand">True</property> | ||
217 | <property name="fill">True</property> | ||
218 | <property name="padding">5</property> | ||
219 | <property name="position">1</property> | ||
220 | </packing> | ||
221 | </child> | ||
222 | <child> | ||
223 | <object class="GtkImage" id="GNUNET_GTK_status_icon"> | ||
224 | <property name="visible">True</property> | ||
225 | <property name="can_focus">False</property> | ||
226 | <property name="tooltip_text" translatable="yes">Status indicator</property> | ||
227 | <property name="hexpand">True</property> | ||
228 | <property name="icon_name">bluefish</property> | ||
229 | </object> | ||
230 | <packing> | ||
231 | <property name="expand">False</property> | ||
232 | <property name="fill">False</property> | ||
233 | <property name="padding">5</property> | ||
234 | <property name="position">2</property> | ||
235 | </packing> | ||
236 | </child> | ||
255 | </object> | 237 | </object> |
256 | <packing> | 238 | <packing> |
257 | <property name="expand">False</property> | 239 | <property name="expand">False</property> |
@@ -260,71 +242,185 @@ | |||
260 | </packing> | 242 | </packing> |
261 | </child> | 243 | </child> |
262 | <child> | 244 | <child> |
263 | <object class="GtkComboBox" id="gnunet_conversation_gtk_outgoing_zone_combobox"> | 245 | <object class="GtkBox" id="gnunet_conversation_gtk_address_and_action_button_hbox"> |
264 | <property name="visible">True</property> | 246 | <property name="visible">True</property> |
265 | <property name="can_focus">False</property> | 247 | <property name="can_focus">False</property> |
266 | <property name="model">gnunet_conversation_gtk_contacts_zone_liststore</property> | ||
267 | <signal name="changed" handler="gnunet_conversation_gtk_outgoing_zone_combobox_changed_cb" swapped="no"/> | ||
268 | <child> | 248 | <child> |
269 | <object class="GtkCellRendererText" id="gnunet_conversation_gtk_outgoing_zone_ego_name_cellrenderertext"/> | 249 | <object class="GtkLabel" id="gnunet_conversation_address_label"> |
270 | <attributes> | 250 | <property name="visible">True</property> |
271 | <attribute name="text">0</attribute> | 251 | <property name="can_focus">False</property> |
272 | </attributes> | 252 | <property name="label" translatable="yes">Target:</property> |
253 | </object> | ||
254 | <packing> | ||
255 | <property name="expand">False</property> | ||
256 | <property name="fill">False</property> | ||
257 | <property name="padding">5</property> | ||
258 | <property name="position">0</property> | ||
259 | </packing> | ||
260 | </child> | ||
261 | <child> | ||
262 | <object class="GtkEntry" id="GNUNET_GTK_conversation_address"> | ||
263 | <property name="visible">True</property> | ||
264 | <property name="can_focus">True</property> | ||
265 | <property name="invisible_char">•</property> | ||
266 | </object> | ||
267 | <packing> | ||
268 | <property name="expand">True</property> | ||
269 | <property name="fill">True</property> | ||
270 | <property name="padding">5</property> | ||
271 | <property name="position">1</property> | ||
272 | </packing> | ||
273 | </child> | ||
274 | <child> | ||
275 | <object class="GtkButton" id="GNUNET_GTK_conversation_call_button"> | ||
276 | <property name="label">gtk-connect</property> | ||
277 | <property name="use_action_appearance">False</property> | ||
278 | <property name="visible">True</property> | ||
279 | <property name="can_focus">True</property> | ||
280 | <property name="receives_default">True</property> | ||
281 | <property name="use_underline">True</property> | ||
282 | <property name="use_stock">True</property> | ||
283 | <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_call_clicked" swapped="no"/> | ||
284 | </object> | ||
285 | <packing> | ||
286 | <property name="expand">False</property> | ||
287 | <property name="fill">False</property> | ||
288 | <property name="padding">5</property> | ||
289 | <property name="position">2</property> | ||
290 | </packing> | ||
291 | </child> | ||
292 | <child> | ||
293 | <object class="GtkButton" id="GNUNET_GTK_conversation_suspend_button"> | ||
294 | <property name="label">gtk-media-pause</property> | ||
295 | <property name="use_action_appearance">False</property> | ||
296 | <property name="sensitive">False</property> | ||
297 | <property name="can_focus">True</property> | ||
298 | <property name="receives_default">True</property> | ||
299 | <property name="use_stock">True</property> | ||
300 | <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_pause_clicked" swapped="no"/> | ||
301 | </object> | ||
302 | <packing> | ||
303 | <property name="expand">False</property> | ||
304 | <property name="fill">False</property> | ||
305 | <property name="padding">5</property> | ||
306 | <property name="position">3</property> | ||
307 | </packing> | ||
308 | </child> | ||
309 | <child> | ||
310 | <object class="GtkButton" id="GNUNET_GTK_conversation_hangup_button"> | ||
311 | <property name="label">gtk-disconnect</property> | ||
312 | <property name="use_action_appearance">False</property> | ||
313 | <property name="sensitive">False</property> | ||
314 | <property name="can_focus">True</property> | ||
315 | <property name="receives_default">True</property> | ||
316 | <property name="use_stock">True</property> | ||
317 | <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_hangup_clicked" swapped="no"/> | ||
318 | </object> | ||
319 | <packing> | ||
320 | <property name="expand">False</property> | ||
321 | <property name="fill">False</property> | ||
322 | <property name="padding">5</property> | ||
323 | <property name="position">4</property> | ||
324 | </packing> | ||
273 | </child> | 325 | </child> |
274 | </object> | 326 | </object> |
275 | <packing> | 327 | <packing> |
276 | <property name="expand">True</property> | 328 | <property name="expand">False</property> |
277 | <property name="fill">True</property> | 329 | <property name="fill">True</property> |
278 | <property name="position">1</property> | 330 | <property name="position">1</property> |
279 | </packing> | 331 | </packing> |
280 | </child> | 332 | </child> |
281 | <child> | 333 | <child> |
282 | <placeholder/> | 334 | <object class="GtkBox" id="active_calls"> |
283 | </child> | ||
284 | </object> | ||
285 | <packing> | ||
286 | <property name="expand">False</property> | ||
287 | <property name="fill">True</property> | ||
288 | <property name="position">2</property> | ||
289 | </packing> | ||
290 | </child> | ||
291 | <child> | ||
292 | <object class="GtkBox" id="call_hbox"> | ||
293 | <property name="visible">True</property> | ||
294 | <property name="can_focus">False</property> | ||
295 | <child> | ||
296 | <object class="GtkBox" id="address_active_calls_box"> | ||
297 | <property name="visible">True</property> | 335 | <property name="visible">True</property> |
298 | <property name="can_focus">False</property> | 336 | <property name="can_focus">False</property> |
299 | <property name="orientation">vertical</property> | ||
300 | <child> | 337 | <child> |
301 | <object class="GtkBox" id="addres_and_call_button"> | 338 | <object class="GtkScrolledWindow" id="active_calls_scrolledwindow"> |
302 | <property name="visible">True</property> | 339 | <property name="visible">True</property> |
303 | <property name="can_focus">False</property> | 340 | <property name="can_focus">True</property> |
341 | <property name="shadow_type">in</property> | ||
304 | <child> | 342 | <child> |
305 | <object class="GtkEntry" id="GNUNET_GTK_conversation_address"> | 343 | <object class="GtkTreeView" id="gnunet_conversation_gtk_active_calls_treeview"> |
306 | <property name="visible">True</property> | 344 | <property name="visible">True</property> |
307 | <property name="can_focus">True</property> | 345 | <property name="can_focus">True</property> |
308 | <property name="invisible_char">•</property> | 346 | <property name="model">gnunet_conversation_gtk_active_calls_liststore</property> |
309 | <property name="text" translatable="yes">Address</property> | 347 | <property name="headers_clickable">False</property> |
310 | <property name="invisible_char_set">True</property> | 348 | <property name="enable_search">False</property> |
349 | <property name="search_column">0</property> | ||
350 | <child internal-child="selection"> | ||
351 | <object class="GtkTreeSelection" id="treeview-selection5"> | ||
352 | <signal name="changed" handler="GNUNET_CONVERSATION_GTK_on_active_calls_selection_changed" swapped="no"/> | ||
353 | </object> | ||
354 | </child> | ||
355 | <child> | ||
356 | <object class="GtkTreeViewColumn" id="caller_numColumn"> | ||
357 | <property name="title" translatable="yes">#</property> | ||
358 | <child> | ||
359 | <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_active_calls_num"> | ||
360 | <property name="background_gdk">#000000000000</property> | ||
361 | <property name="font">Normal</property> | ||
362 | <property name="foreground_gdk">#000000000000</property> | ||
363 | <property name="background_rgba">rgba(0,0,0,0)</property> | ||
364 | <property name="foreground_rgba">rgba(0,0,0,0)</property> | ||
365 | </object> | ||
366 | <attributes> | ||
367 | <attribute name="text">2</attribute> | ||
368 | </attributes> | ||
369 | </child> | ||
370 | </object> | ||
371 | </child> | ||
372 | <child> | ||
373 | <object class="GtkTreeViewColumn" id="caller_stateColumn"> | ||
374 | <property name="title" translatable="yes">state</property> | ||
375 | <child> | ||
376 | <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_active_calls_state"/> | ||
377 | <attributes> | ||
378 | <attribute name="markup">4</attribute> | ||
379 | <attribute name="text">4</attribute> | ||
380 | </attributes> | ||
381 | </child> | ||
382 | </object> | ||
383 | </child> | ||
384 | <child> | ||
385 | <object class="GtkTreeViewColumn" id="caller_idColumn"> | ||
386 | <property name="title" translatable="yes">Caller ID</property> | ||
387 | <child> | ||
388 | <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_active_calls_id"/> | ||
389 | <attributes> | ||
390 | <attribute name="text">0</attribute> | ||
391 | </attributes> | ||
392 | </child> | ||
393 | </object> | ||
394 | </child> | ||
311 | </object> | 395 | </object> |
312 | <packing> | 396 | </child> |
313 | <property name="expand">False</property> | 397 | </object> |
314 | <property name="fill">True</property> | 398 | <packing> |
315 | <property name="position">0</property> | 399 | <property name="expand">True</property> |
316 | </packing> | 400 | <property name="fill">True</property> |
401 | <property name="position">0</property> | ||
402 | </packing> | ||
403 | </child> | ||
404 | <child> | ||
405 | <object class="GtkButtonBox" id="GNUNET_GTK_conversation_active_call_list_buttons"> | ||
406 | <property name="visible">True</property> | ||
407 | <property name="can_focus">False</property> | ||
408 | <property name="border_width">2</property> | ||
409 | <property name="orientation">vertical</property> | ||
410 | <property name="layout_style">start</property> | ||
411 | <child> | ||
412 | <placeholder/> | ||
317 | </child> | 413 | </child> |
318 | <child> | 414 | <child> |
319 | <object class="GtkButton" id="GNUNET_GTK_conversation_call_button"> | 415 | <object class="GtkButton" id="GNUNET_GTK_conversation_use_current_button"> |
320 | <property name="label" translatable="yes">call</property> | 416 | <property name="label" translatable="yes">> contact</property> |
321 | <property name="use_action_appearance">False</property> | 417 | <property name="use_action_appearance">False</property> |
322 | <property name="visible">True</property> | 418 | <property name="visible">True</property> |
419 | <property name="sensitive">False</property> | ||
323 | <property name="can_focus">True</property> | 420 | <property name="can_focus">True</property> |
324 | <property name="receives_default">True</property> | 421 | <property name="receives_default">True</property> |
325 | <property name="use_action_appearance">False</property> | 422 | <property name="xalign">0.4699999988079071</property> |
326 | <property name="use_underline">True</property> | 423 | <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_use_current_button_clicked" swapped="no"/> |
327 | <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_call_clicked" swapped="no"/> | ||
328 | </object> | 424 | </object> |
329 | <packing> | 425 | <packing> |
330 | <property name="expand">False</property> | 426 | <property name="expand">False</property> |
@@ -333,13 +429,14 @@ | |||
333 | </packing> | 429 | </packing> |
334 | </child> | 430 | </child> |
335 | <child> | 431 | <child> |
336 | <object class="GtkButton" id="GNUNET_GTK_conversation_hangup_button_extra"> | 432 | <object class="GtkButton" id="GNUNET_GTK_conversation_accept_button"> |
337 | <property name="label" translatable="yes">hangup</property> | 433 | <property name="label" translatable="yes">accept</property> |
338 | <property name="use_action_appearance">False</property> | 434 | <property name="use_action_appearance">False</property> |
339 | <property name="visible">True</property> | 435 | <property name="visible">True</property> |
436 | <property name="sensitive">False</property> | ||
340 | <property name="can_focus">True</property> | 437 | <property name="can_focus">True</property> |
341 | <property name="receives_default">True</property> | 438 | <property name="receives_default">True</property> |
342 | <property name="use_action_appearance">False</property> | 439 | <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_accept_clicked" swapped="no"/> |
343 | </object> | 440 | </object> |
344 | <packing> | 441 | <packing> |
345 | <property name="expand">False</property> | 442 | <property name="expand">False</property> |
@@ -348,572 +445,421 @@ | |||
348 | </packing> | 445 | </packing> |
349 | </child> | 446 | </child> |
350 | <child> | 447 | <child> |
351 | <object class="GtkImage" id="GNUNET_GTK_status_icon"> | 448 | <object class="GtkButton" id="GNUNET_GTK_conversation_refuse_button"> |
352 | <property name="visible">True</property> | 449 | <property name="label" translatable="yes">refuse</property> |
353 | <property name="can_focus">False</property> | 450 | <property name="use_action_appearance">False</property> |
354 | <property name="tooltip_text" translatable="yes">Status indicator</property> | ||
355 | <property name="hexpand">True</property> | ||
356 | <property name="icon_name">bluefish</property> | ||
357 | </object> | ||
358 | <packing> | ||
359 | <property name="expand">False</property> | ||
360 | <property name="fill">True</property> | ||
361 | <property name="position">3</property> | ||
362 | </packing> | ||
363 | </child> | ||
364 | </object> | ||
365 | <packing> | ||
366 | <property name="expand">False</property> | ||
367 | <property name="fill">True</property> | ||
368 | <property name="position">0</property> | ||
369 | </packing> | ||
370 | </child> | ||
371 | <child> | ||
372 | <object class="GtkBox" id="active_calls"> | ||
373 | <property name="visible">True</property> | ||
374 | <property name="can_focus">False</property> | ||
375 | <child> | ||
376 | <object class="GtkScrolledWindow" id="active_calls_scrolledwindow"> | ||
377 | <property name="visible">True</property> | 451 | <property name="visible">True</property> |
452 | <property name="sensitive">False</property> | ||
378 | <property name="can_focus">True</property> | 453 | <property name="can_focus">True</property> |
379 | <property name="shadow_type">in</property> | 454 | <property name="receives_default">True</property> |
380 | <child> | 455 | <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_resume_clicked" swapped="no"/> |
381 | <object class="GtkTreeView" id="gnunet_conversation_gtk_active_calls_treeview"> | ||
382 | <property name="visible">True</property> | ||
383 | <property name="can_focus">True</property> | ||
384 | <property name="model">gnunet_conversation_gtk_active_calls_liststore</property> | ||
385 | <property name="headers_clickable">False</property> | ||
386 | <property name="enable_search">False</property> | ||
387 | <property name="search_column">0</property> | ||
388 | <child internal-child="selection"> | ||
389 | <object class="GtkTreeSelection" id="treeview-selection5"> | ||
390 | <signal name="changed" handler="GNUNET_CONVERSATION_GTK_on_active_calls_selection_changed" swapped="no"/> | ||
391 | </object> | ||
392 | </child> | ||
393 | <child> | ||
394 | <object class="GtkTreeViewColumn" id="caller_numColumn"> | ||
395 | <property name="title" translatable="yes">#</property> | ||
396 | <child> | ||
397 | <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_active_calls_num"> | ||
398 | <property name="background_gdk">#000000000000</property> | ||
399 | <property name="font">Normal</property> | ||
400 | <property name="foreground_gdk">#000000000000</property> | ||
401 | <property name="background_rgba">rgba(0,0,0,0)</property> | ||
402 | <property name="foreground_rgba">rgba(0,0,0,0)</property> | ||
403 | </object> | ||
404 | <attributes> | ||
405 | <attribute name="text">2</attribute> | ||
406 | </attributes> | ||
407 | </child> | ||
408 | </object> | ||
409 | </child> | ||
410 | <child> | ||
411 | <object class="GtkTreeViewColumn" id="GNUNET_CONVERSATION_GTK_caller_typeColumn"> | ||
412 | <property name="title" translatable="yes">type</property> | ||
413 | <child> | ||
414 | <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_active_calls_type"/> | ||
415 | <attributes> | ||
416 | <attribute name="markup">3</attribute> | ||
417 | <attribute name="text">3</attribute> | ||
418 | </attributes> | ||
419 | </child> | ||
420 | </object> | ||
421 | </child> | ||
422 | <child> | ||
423 | <object class="GtkTreeViewColumn" id="caller_stateColumn"> | ||
424 | <property name="title" translatable="yes">state</property> | ||
425 | <child> | ||
426 | <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_active_calls_state"/> | ||
427 | <attributes> | ||
428 | <attribute name="markup">4</attribute> | ||
429 | <attribute name="text">4</attribute> | ||
430 | </attributes> | ||
431 | </child> | ||
432 | </object> | ||
433 | </child> | ||
434 | <child> | ||
435 | <object class="GtkTreeViewColumn" id="caller_idColumn"> | ||
436 | <property name="title" translatable="yes">Caller ID</property> | ||
437 | <child> | ||
438 | <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_active_calls_id"/> | ||
439 | <attributes> | ||
440 | <attribute name="text">0</attribute> | ||
441 | </attributes> | ||
442 | </child> | ||
443 | </object> | ||
444 | </child> | ||
445 | <child> | ||
446 | <object class="GtkTreeViewColumn" id="caller_testcolumn"> | ||
447 | <property name="title" translatable="yes">type</property> | ||
448 | <property name="clickable">True</property> | ||
449 | <property name="sort_column_id">0</property> | ||
450 | </object> | ||
451 | </child> | ||
452 | <child> | ||
453 | <object class="GtkTreeViewColumn" id="call_stateColumn"> | ||
454 | <property name="title" translatable="yes">call_state</property> | ||
455 | <child> | ||
456 | <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_active_call_state"/> | ||
457 | <attributes> | ||
458 | <attribute name="markup">6</attribute> | ||
459 | <attribute name="text">6</attribute> | ||
460 | </attributes> | ||
461 | </child> | ||
462 | </object> | ||
463 | </child> | ||
464 | </object> | ||
465 | </child> | ||
466 | </object> | ||
467 | <packing> | ||
468 | <property name="expand">True</property> | ||
469 | <property name="fill">True</property> | ||
470 | <property name="position">0</property> | ||
471 | </packing> | ||
472 | </child> | ||
473 | <child> | ||
474 | <object class="GtkButtonBox" id="GNUNET_GTK_conversation_active_call_list_buttons"> | ||
475 | <property name="visible">True</property> | ||
476 | <property name="can_focus">False</property> | ||
477 | <property name="border_width">2</property> | ||
478 | <property name="orientation">vertical</property> | ||
479 | <property name="layout_style">start</property> | ||
480 | <child> | ||
481 | <placeholder/> | ||
482 | </child> | ||
483 | <child> | ||
484 | <object class="GtkButton" id="GNUNET_GTK_conversation_use_current_button"> | ||
485 | <property name="label" translatable="yes">> contact</property> | ||
486 | <property name="use_action_appearance">False</property> | ||
487 | <property name="visible">True</property> | ||
488 | <property name="sensitive">False</property> | ||
489 | <property name="can_focus">True</property> | ||
490 | <property name="receives_default">True</property> | ||
491 | <property name="use_action_appearance">False</property> | ||
492 | <property name="xalign">0.4699999988079071</property> | ||
493 | <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_use_current_button_clicked" swapped="no"/> | ||
494 | </object> | ||
495 | <packing> | ||
496 | <property name="expand">False</property> | ||
497 | <property name="fill">True</property> | ||
498 | <property name="position">1</property> | ||
499 | </packing> | ||
500 | </child> | ||
501 | <child> | ||
502 | <object class="GtkButton" id="GNUNET_GTK_conversation_accept_button"> | ||
503 | <property name="label" translatable="yes">accept</property> | ||
504 | <property name="use_action_appearance">False</property> | ||
505 | <property name="visible">True</property> | ||
506 | <property name="sensitive">False</property> | ||
507 | <property name="can_focus">True</property> | ||
508 | <property name="receives_default">True</property> | ||
509 | <property name="use_action_appearance">False</property> | ||
510 | <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_accept_clicked" swapped="no"/> | ||
511 | </object> | ||
512 | <packing> | ||
513 | <property name="expand">False</property> | ||
514 | <property name="fill">True</property> | ||
515 | <property name="position">2</property> | ||
516 | </packing> | ||
517 | </child> | ||
518 | <child> | ||
519 | <object class="GtkButton" id="GNUNET_GTK_conversation_hangup_button"> | ||
520 | <property name="label" translatable="yes">hangup</property> | ||
521 | <property name="use_action_appearance">False</property> | ||
522 | <property name="visible">True</property> | ||
523 | <property name="sensitive">False</property> | ||
524 | <property name="can_focus">True</property> | ||
525 | <property name="receives_default">True</property> | ||
526 | <property name="use_action_appearance">False</property> | ||
527 | <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_hangup_clicked" swapped="no"/> | ||
528 | </object> | ||
529 | <packing> | ||
530 | <property name="expand">False</property> | ||
531 | <property name="fill">True</property> | ||
532 | <property name="position">3</property> | ||
533 | </packing> | ||
534 | </child> | ||
535 | <child> | ||
536 | <object class="GtkButton" id="GNUNET_GTK_conversation_suspend_button"> | ||
537 | <property name="label" translatable="yes">suspend</property> | ||
538 | <property name="use_action_appearance">False</property> | ||
539 | <property name="visible">True</property> | ||
540 | <property name="sensitive">False</property> | ||
541 | <property name="can_focus">True</property> | ||
542 | <property name="receives_default">True</property> | ||
543 | <property name="use_action_appearance">False</property> | ||
544 | <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_pause_clicked" swapped="no"/> | ||
545 | </object> | ||
546 | <packing> | ||
547 | <property name="expand">False</property> | ||
548 | <property name="fill">True</property> | ||
549 | <property name="position">4</property> | ||
550 | </packing> | ||
551 | </child> | ||
552 | <child> | ||
553 | <object class="GtkButton" id="GNUNET_GTK_conversation_resume_button"> | ||
554 | <property name="label" translatable="yes">resume</property> | ||
555 | <property name="use_action_appearance">False</property> | ||
556 | <property name="visible">True</property> | ||
557 | <property name="sensitive">False</property> | ||
558 | <property name="can_focus">True</property> | ||
559 | <property name="receives_default">True</property> | ||
560 | <property name="use_action_appearance">False</property> | ||
561 | <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_resume_clicked" swapped="no"/> | ||
562 | </object> | ||
563 | <packing> | ||
564 | <property name="expand">False</property> | ||
565 | <property name="fill">True</property> | ||
566 | <property name="position">5</property> | ||
567 | </packing> | ||
568 | </child> | ||
569 | </object> | 456 | </object> |
570 | <packing> | 457 | <packing> |
571 | <property name="expand">False</property> | 458 | <property name="expand">False</property> |
572 | <property name="fill">True</property> | 459 | <property name="fill">True</property> |
573 | <property name="position">1</property> | 460 | <property name="position">3</property> |
574 | </packing> | 461 | </packing> |
575 | </child> | 462 | </child> |
576 | </object> | 463 | </object> |
577 | <packing> | 464 | <packing> |
578 | <property name="expand">False</property> | 465 | <property name="expand">False</property> |
579 | <property name="fill">True</property> | 466 | <property name="fill">True</property> |
580 | <property name="position">2</property> | 467 | <property name="position">1</property> |
581 | </packing> | 468 | </packing> |
582 | </child> | 469 | </child> |
583 | </object> | 470 | </object> |
584 | <packing> | 471 | <packing> |
585 | <property name="expand">True</property> | 472 | <property name="expand">False</property> |
586 | <property name="fill">True</property> | 473 | <property name="fill">True</property> |
587 | <property name="position">0</property> | 474 | <property name="position">2</property> |
588 | </packing> | 475 | </packing> |
589 | </child> | 476 | </child> |
590 | </object> | 477 | </object> |
591 | <packing> | ||
592 | <property name="expand">False</property> | ||
593 | <property name="fill">True</property> | ||
594 | <property name="position">3</property> | ||
595 | </packing> | ||
596 | </child> | 478 | </child> |
597 | </object> | 479 | </object> |
598 | <packing> | ||
599 | <property name="left_attach">0</property> | ||
600 | <property name="top_attach">0</property> | ||
601 | <property name="width">1</property> | ||
602 | <property name="height">1</property> | ||
603 | </packing> | ||
604 | </child> | 480 | </child> |
481 | <child type="label"> | ||
482 | <object class="GtkLabel" id="gnunet_conversation_gtk_call_label"> | ||
483 | <property name="visible">True</property> | ||
484 | <property name="can_focus">False</property> | ||
485 | <property name="label" translatable="yes">Call Information</property> | ||
486 | </object> | ||
487 | </child> | ||
488 | </object> | ||
489 | <packing> | ||
490 | <property name="resize">False</property> | ||
491 | <property name="shrink">True</property> | ||
492 | </packing> | ||
493 | </child> | ||
494 | <child> | ||
495 | <object class="GtkFrame" id="gnunet_conversation_gtk_contact_list_frame"> | ||
496 | <property name="visible">True</property> | ||
497 | <property name="can_focus">False</property> | ||
498 | <property name="label_xalign">0</property> | ||
499 | <property name="shadow_type">none</property> | ||
605 | <child> | 500 | <child> |
606 | <object class="GtkBox" id="call_history_toplevel_box"> | 501 | <object class="GtkAlignment" id="gnunet_conversation_gtk_contact_list_alignment"> |
607 | <property name="visible">True</property> | 502 | <property name="visible">True</property> |
608 | <property name="can_focus">False</property> | 503 | <property name="can_focus">False</property> |
609 | <property name="orientation">vertical</property> | 504 | <property name="left_padding">12</property> |
610 | <child> | 505 | <child> |
611 | <object class="GtkLabel" id="call_history_label"> | 506 | <object class="GtkBox" id="gnunet_conversation_gtk_contacts_toplevel_vbox"> |
612 | <property name="visible">True</property> | 507 | <property name="visible">True</property> |
613 | <property name="can_focus">False</property> | 508 | <property name="can_focus">False</property> |
614 | <property name="label" translatable="yes">Call History</property> | 509 | <property name="orientation">vertical</property> |
615 | <attributes> | ||
616 | <attribute name="style" value="oblique"/> | ||
617 | </attributes> | ||
618 | </object> | ||
619 | <packing> | ||
620 | <property name="expand">False</property> | ||
621 | <property name="fill">True</property> | ||
622 | <property name="position">0</property> | ||
623 | </packing> | ||
624 | </child> | ||
625 | <child> | ||
626 | <object class="GtkScrolledWindow" id="call_history_scrolledwindow"> | ||
627 | <property name="visible">True</property> | ||
628 | <property name="can_focus">True</property> | ||
629 | <property name="shadow_type">in</property> | ||
630 | <child> | 510 | <child> |
631 | <object class="GtkTreeView" id="gnunet_conversation_gtk_history_treeview"> | 511 | <object class="GtkBox" id="gnunet_conversation_gtk_zone_hbox"> |
632 | <property name="visible">True</property> | 512 | <property name="visible">True</property> |
633 | <property name="can_focus">True</property> | 513 | <property name="can_focus">False</property> |
634 | <property name="model">gnunet_conversation_gtk_history_liststore</property> | 514 | <child> |
635 | <property name="headers_clickable">False</property> | 515 | <object class="GtkLabel" id="gnunet_conversation_gtk_contacts_zone_chooser_label"> |
636 | <property name="search_column">0</property> | 516 | <property name="visible">True</property> |
637 | <child internal-child="selection"> | 517 | <property name="can_focus">False</property> |
638 | <object class="GtkTreeSelection" id="treeview-selection4"/> | 518 | <property name="label" translatable="yes">Zone:</property> |
519 | </object> | ||
520 | <packing> | ||
521 | <property name="expand">False</property> | ||
522 | <property name="fill">False</property> | ||
523 | <property name="padding">5</property> | ||
524 | <property name="position">0</property> | ||
525 | </packing> | ||
639 | </child> | 526 | </child> |
640 | <child> | 527 | <child> |
641 | <object class="GtkTreeViewColumn" id="timeColumn"> | 528 | <object class="GtkComboBox" id="gnunet_conversation_gtk_contacts_zone_combobox"> |
642 | <property name="title" translatable="yes">Time</property> | 529 | <property name="visible">True</property> |
530 | <property name="can_focus">False</property> | ||
531 | <property name="model">gnunet_conversation_gtk_contacts_zone_liststore</property> | ||
532 | <property name="tearoff_title">Phonebook:</property> | ||
533 | <signal name="changed" handler="gnunet_conversation_gtk_contacts_zone_combobox_changed_cb" swapped="no"/> | ||
643 | <child> | 534 | <child> |
644 | <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_time_window_renderer"/> | 535 | <object class="GtkCellRendererText" id="gnunet_conversation_gtk_contacts_zone_ego_name_cellrenderertext"/> |
645 | <attributes> | 536 | <attributes> |
646 | <attribute name="text">0</attribute> | 537 | <attribute name="text">0</attribute> |
647 | </attributes> | 538 | </attributes> |
648 | </child> | 539 | </child> |
649 | </object> | 540 | </object> |
541 | <packing> | ||
542 | <property name="expand">True</property> | ||
543 | <property name="fill">True</property> | ||
544 | <property name="padding">5</property> | ||
545 | <property name="position">1</property> | ||
546 | </packing> | ||
547 | </child> | ||
548 | </object> | ||
549 | <packing> | ||
550 | <property name="expand">False</property> | ||
551 | <property name="fill">True</property> | ||
552 | <property name="position">0</property> | ||
553 | </packing> | ||
554 | </child> | ||
555 | <child> | ||
556 | <object class="GtkBox" id="gnunet_conversation_gtk_contact_add_hbox"> | ||
557 | <property name="visible">True</property> | ||
558 | <property name="can_focus">False</property> | ||
559 | <child> | ||
560 | <object class="GtkLabel" id="gnunet_conversation_contact_book_add_name_label"> | ||
561 | <property name="visible">True</property> | ||
562 | <property name="can_focus">False</property> | ||
563 | <property name="label" translatable="yes">Name:</property> | ||
564 | </object> | ||
565 | <packing> | ||
566 | <property name="expand">False</property> | ||
567 | <property name="fill">False</property> | ||
568 | <property name="padding">5</property> | ||
569 | <property name="position">0</property> | ||
570 | </packing> | ||
571 | </child> | ||
572 | <child> | ||
573 | <object class="GtkEntry" id="GNUNET_GTK_conversation_nameAdd"> | ||
574 | <property name="visible">True</property> | ||
575 | <property name="can_focus">True</property> | ||
576 | <property name="invisible_char">•</property> | ||
577 | </object> | ||
578 | <packing> | ||
579 | <property name="expand">True</property> | ||
580 | <property name="fill">True</property> | ||
581 | <property name="position">1</property> | ||
582 | </packing> | ||
583 | </child> | ||
584 | <child> | ||
585 | <object class="GtkLabel" id="gnunet_conversation_contact_book_add_address_label"> | ||
586 | <property name="visible">True</property> | ||
587 | <property name="can_focus">False</property> | ||
588 | <property name="label" translatable="yes">Address:</property> | ||
589 | </object> | ||
590 | <packing> | ||
591 | <property name="expand">False</property> | ||
592 | <property name="fill">False</property> | ||
593 | <property name="padding">5</property> | ||
594 | <property name="position">2</property> | ||
595 | </packing> | ||
596 | </child> | ||
597 | <child> | ||
598 | <object class="GtkEntry" id="GNUNET_GTK_conversation_addressAdd"> | ||
599 | <property name="visible">True</property> | ||
600 | <property name="can_focus">True</property> | ||
601 | <property name="invisible_char">•</property> | ||
602 | </object> | ||
603 | <packing> | ||
604 | <property name="expand">True</property> | ||
605 | <property name="fill">True</property> | ||
606 | <property name="position">4</property> | ||
607 | </packing> | ||
608 | </child> | ||
609 | <child> | ||
610 | <object class="GtkButton" id="GNUNET_GTK_conversation_add_contact_button"> | ||
611 | <property name="label">gtk-add</property> | ||
612 | <property name="use_action_appearance">False</property> | ||
613 | <property name="visible">True</property> | ||
614 | <property name="can_focus">True</property> | ||
615 | <property name="receives_default">True</property> | ||
616 | <property name="use_stock">True</property> | ||
617 | <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_add_clicked" swapped="no"/> | ||
618 | </object> | ||
619 | <packing> | ||
620 | <property name="expand">False</property> | ||
621 | <property name="fill">False</property> | ||
622 | <property name="padding">5</property> | ||
623 | <property name="position">5</property> | ||
624 | </packing> | ||
650 | </child> | 625 | </child> |
626 | </object> | ||
627 | <packing> | ||
628 | <property name="expand">False</property> | ||
629 | <property name="fill">True</property> | ||
630 | <property name="position">1</property> | ||
631 | </packing> | ||
632 | </child> | ||
633 | <child> | ||
634 | <object class="GtkBox" id="gnunet_conversation_contact_hbox"> | ||
635 | <property name="visible">True</property> | ||
636 | <property name="can_focus">False</property> | ||
651 | <child> | 637 | <child> |
652 | <object class="GtkTreeViewColumn" id="eventColumn"> | 638 | <object class="GtkTreeView" id="gnunet_conversation_gtk_treeview"> |
653 | <property name="title" translatable="yes">Event</property> | 639 | <property name="visible">True</property> |
640 | <property name="can_focus">True</property> | ||
641 | <property name="model">gnunet_conversation_gtk_contacts_liststore</property> | ||
642 | <property name="headers_clickable">False</property> | ||
643 | <property name="search_column">0</property> | ||
644 | <signal name="row-activated" handler="GNUNET_CONVERSATION_GTK_row_activated" swapped="no"/> | ||
645 | <child internal-child="selection"> | ||
646 | <object class="GtkTreeSelection" id="treeview-selection"/> | ||
647 | </child> | ||
654 | <child> | 648 | <child> |
655 | <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_event_window_renderer"/> | 649 | <object class="GtkTreeViewColumn" id="contactName"> |
656 | <attributes> | 650 | <property name="title" translatable="yes">Type</property> |
657 | <attribute name="text">1</attribute> | 651 | <child> |
658 | </attributes> | 652 | <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_type_window_name_renderer"/> |
653 | <attributes> | ||
654 | <attribute name="text">1</attribute> | ||
655 | </attributes> | ||
656 | </child> | ||
657 | </object> | ||
658 | </child> | ||
659 | <child> | ||
660 | <object class="GtkTreeViewColumn" id="contactType"> | ||
661 | <property name="title" translatable="yes">Contact</property> | ||
662 | <child> | ||
663 | <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_main_window_name_renderer"/> | ||
664 | <attributes> | ||
665 | <attribute name="text">0</attribute> | ||
666 | </attributes> | ||
667 | </child> | ||
668 | </object> | ||
659 | </child> | 669 | </child> |
660 | </object> | 670 | </object> |
671 | <packing> | ||
672 | <property name="expand">True</property> | ||
673 | <property name="fill">True</property> | ||
674 | <property name="position">0</property> | ||
675 | </packing> | ||
661 | </child> | 676 | </child> |
662 | <child> | 677 | <child> |
663 | <object class="GtkTreeViewColumn" id="contactColumn"> | 678 | <object class="GtkBox" id="gnunet_conversation_contact_action_vbox"> |
664 | <property name="title" translatable="yes">Contact</property> | 679 | <property name="visible">True</property> |
680 | <property name="can_focus">False</property> | ||
681 | <property name="orientation">vertical</property> | ||
665 | <child> | 682 | <child> |
666 | <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_contact_window_renderer"/> | 683 | <placeholder/> |
667 | <attributes> | 684 | </child> |
668 | <attribute name="text">2</attribute> | 685 | <child> |
669 | </attributes> | 686 | <object class="GtkButton" id="GNUNET_GTK_conversation_remove_contact_button"> |
687 | <property name="label">gtk-delete</property> | ||
688 | <property name="use_action_appearance">False</property> | ||
689 | <property name="visible">True</property> | ||
690 | <property name="can_focus">True</property> | ||
691 | <property name="receives_default">True</property> | ||
692 | <property name="use_stock">True</property> | ||
693 | <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_remove_clicked" swapped="no"/> | ||
694 | </object> | ||
695 | <packing> | ||
696 | <property name="expand">False</property> | ||
697 | <property name="fill">False</property> | ||
698 | <property name="padding">5</property> | ||
699 | <property name="position">1</property> | ||
700 | </packing> | ||
670 | </child> | 701 | </child> |
671 | </object> | 702 | </object> |
703 | <packing> | ||
704 | <property name="expand">False</property> | ||
705 | <property name="fill">False</property> | ||
706 | <property name="padding">5</property> | ||
707 | <property name="position">1</property> | ||
708 | </packing> | ||
672 | </child> | 709 | </child> |
673 | </object> | 710 | </object> |
711 | <packing> | ||
712 | <property name="expand">True</property> | ||
713 | <property name="fill">True</property> | ||
714 | <property name="padding">5</property> | ||
715 | <property name="position">2</property> | ||
716 | </packing> | ||
674 | </child> | 717 | </child> |
675 | </object> | 718 | </object> |
676 | <packing> | ||
677 | <property name="expand">True</property> | ||
678 | <property name="fill">True</property> | ||
679 | <property name="position">1</property> | ||
680 | </packing> | ||
681 | </child> | 719 | </child> |
682 | </object> | 720 | </object> |
683 | <packing> | ||
684 | <property name="left_attach">0</property> | ||
685 | <property name="top_attach">2</property> | ||
686 | <property name="width">1</property> | ||
687 | <property name="height">1</property> | ||
688 | </packing> | ||
689 | </child> | 721 | </child> |
690 | <child> | 722 | <child type="label"> |
691 | <placeholder/> | 723 | <object class="GtkLabel" id="gnunet_conversation_address_book_label"> |
692 | </child> | 724 | <property name="visible">True</property> |
693 | <child> | 725 | <property name="can_focus">False</property> |
694 | <placeholder/> | 726 | <property name="label" translatable="yes">Address Book</property> |
727 | </object> | ||
695 | </child> | 728 | </child> |
696 | </object> | 729 | </object> |
697 | <packing> | 730 | <packing> |
698 | <property name="left_attach">0</property> | 731 | <property name="resize">True</property> |
699 | <property name="top_attach">0</property> | 732 | <property name="shrink">True</property> |
700 | <property name="width">1</property> | ||
701 | <property name="height">1</property> | ||
702 | </packing> | 733 | </packing> |
703 | </child> | 734 | </child> |
735 | </object> | ||
736 | <packing> | ||
737 | <property name="expand">False</property> | ||
738 | <property name="fill">True</property> | ||
739 | <property name="position">1</property> | ||
740 | </packing> | ||
741 | </child> | ||
742 | <child> | ||
743 | <object class="GtkFrame" id="gnunet_conversation_gtk_history_frame"> | ||
744 | <property name="visible">True</property> | ||
745 | <property name="can_focus">False</property> | ||
746 | <property name="label_xalign">0</property> | ||
747 | <property name="shadow_type">none</property> | ||
704 | <child> | 748 | <child> |
705 | <object class="GtkBox" id="box2"> | 749 | <object class="GtkAlignment" id="gnunet_conversation_gtk_history_alignment"> |
706 | <property name="visible">True</property> | 750 | <property name="visible">True</property> |
707 | <property name="can_focus">False</property> | 751 | <property name="can_focus">False</property> |
708 | <property name="orientation">vertical</property> | 752 | <property name="left_padding">12</property> |
709 | <child> | 753 | <child> |
710 | <object class="GtkBox" id="contacts_toplevel_box"> | 754 | <object class="GtkScrolledWindow" id="gnunet_conversation_gtk_history_scrolledwindow"> |
711 | <property name="visible">True</property> | 755 | <property name="visible">True</property> |
712 | <property name="can_focus">False</property> | 756 | <property name="can_focus">True</property> |
713 | <property name="orientation">vertical</property> | 757 | <property name="shadow_type">in</property> |
714 | <child> | ||
715 | <object class="GtkLabel" id="contacts_label"> | ||
716 | <property name="visible">True</property> | ||
717 | <property name="can_focus">False</property> | ||
718 | <property name="label" translatable="yes">Contacts</property> | ||
719 | <attributes> | ||
720 | <attribute name="style" value="oblique"/> | ||
721 | </attributes> | ||
722 | </object> | ||
723 | <packing> | ||
724 | <property name="expand">False</property> | ||
725 | <property name="fill">True</property> | ||
726 | <property name="position">0</property> | ||
727 | </packing> | ||
728 | </child> | ||
729 | <child> | 758 | <child> |
730 | <object class="GtkGrid" id="contacts_buttons_grid"> | 759 | <object class="GtkTreeView" id="gnunet_conversation_gtk_history_treeview"> |
731 | <property name="visible">True</property> | 760 | <property name="visible">True</property> |
732 | <property name="can_focus">False</property> | 761 | <property name="can_focus">True</property> |
733 | <child> | 762 | <property name="model">gnunet_conversation_gtk_history_liststore</property> |
734 | <object class="GtkLabel" id="contacts_zone_chooser_label"> | 763 | <property name="headers_clickable">False</property> |
735 | <property name="visible">True</property> | 764 | <property name="search_column">0</property> |
736 | <property name="can_focus">False</property> | 765 | <child internal-child="selection"> |
737 | <property name="label" translatable="yes">Zone:</property> | 766 | <object class="GtkTreeSelection" id="treeview-selection4"/> |
738 | </object> | ||
739 | <packing> | ||
740 | <property name="left_attach">1</property> | ||
741 | <property name="top_attach">0</property> | ||
742 | <property name="width">1</property> | ||
743 | <property name="height">1</property> | ||
744 | </packing> | ||
745 | </child> | 767 | </child> |
746 | <child> | 768 | <child> |
747 | <object class="GtkComboBox" id="gnunet_conversation_gtk_contacts_zone_combobox"> | 769 | <object class="GtkTreeViewColumn" id="timeColumn"> |
748 | <property name="visible">True</property> | 770 | <property name="title" translatable="yes">Time</property> |
749 | <property name="can_focus">False</property> | ||
750 | <property name="model">gnunet_conversation_gtk_contacts_zone_liststore</property> | ||
751 | <property name="tearoff_title">Phonebook:</property> | ||
752 | <signal name="changed" handler="gnunet_conversation_gtk_contacts_zone_combobox_changed_cb" swapped="no"/> | ||
753 | <child> | 771 | <child> |
754 | <object class="GtkCellRendererText" id="gnunet_conversation_gtk_contacts_zone_ego_name_cellrenderertext"/> | 772 | <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_time_window_renderer"/> |
755 | <attributes> | 773 | <attributes> |
756 | <attribute name="text">0</attribute> | 774 | <attribute name="text">0</attribute> |
757 | </attributes> | 775 | </attributes> |
758 | </child> | 776 | </child> |
759 | </object> | 777 | </object> |
760 | <packing> | ||
761 | <property name="left_attach">2</property> | ||
762 | <property name="top_attach">0</property> | ||
763 | <property name="width">1</property> | ||
764 | <property name="height">1</property> | ||
765 | </packing> | ||
766 | </child> | 778 | </child> |
767 | <child> | 779 | <child> |
768 | <placeholder/> | 780 | <object class="GtkTreeViewColumn" id="eventColumn"> |
769 | </child> | 781 | <property name="title" translatable="yes">Event</property> |
770 | </object> | 782 | <child> |
771 | <packing> | 783 | <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_event_window_renderer"/> |
772 | <property name="expand">False</property> | 784 | <attributes> |
773 | <property name="fill">True</property> | 785 | <attribute name="text">1</attribute> |
774 | <property name="position">1</property> | 786 | </attributes> |
775 | </packing> | 787 | </child> |
776 | </child> | ||
777 | <child> | ||
778 | <object class="GtkEntry" id="GNUNET_GTK_conversation_nameAdd"> | ||
779 | <property name="visible">True</property> | ||
780 | <property name="can_focus">True</property> | ||
781 | <property name="invisible_char">•</property> | ||
782 | <property name="text" translatable="yes">Name of contact</property> | ||
783 | <property name="invisible_char_set">True</property> | ||
784 | </object> | ||
785 | <packing> | ||
786 | <property name="expand">False</property> | ||
787 | <property name="fill">True</property> | ||
788 | <property name="position">2</property> | ||
789 | </packing> | ||
790 | </child> | ||
791 | <child> | ||
792 | <object class="GtkEntry" id="GNUNET_GTK_conversation_addressAdd"> | ||
793 | <property name="visible">True</property> | ||
794 | <property name="can_focus">True</property> | ||
795 | <property name="invisible_char">•</property> | ||
796 | <property name="text" translatable="yes">Address of contact</property> | ||
797 | <property name="invisible_char_set">True</property> | ||
798 | </object> | ||
799 | <packing> | ||
800 | <property name="expand">False</property> | ||
801 | <property name="fill">True</property> | ||
802 | <property name="position">3</property> | ||
803 | </packing> | ||
804 | </child> | ||
805 | <child> | ||
806 | <object class="GtkGrid" id="grid2"> | ||
807 | <property name="visible">True</property> | ||
808 | <property name="can_focus">False</property> | ||
809 | <child> | ||
810 | <object class="GtkButton" id="GNUNET_GTK_conversation_add_contact_button"> | ||
811 | <property name="label" translatable="yes">Add contact</property> | ||
812 | <property name="use_action_appearance">False</property> | ||
813 | <property name="visible">True</property> | ||
814 | <property name="can_focus">True</property> | ||
815 | <property name="receives_default">True</property> | ||
816 | <property name="use_action_appearance">False</property> | ||
817 | <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_add_clicked" swapped="no"/> | ||
818 | </object> | 788 | </object> |
819 | <packing> | ||
820 | <property name="left_attach">0</property> | ||
821 | <property name="top_attach">0</property> | ||
822 | <property name="width">1</property> | ||
823 | <property name="height">1</property> | ||
824 | </packing> | ||
825 | </child> | 789 | </child> |
826 | <child> | 790 | <child> |
827 | <object class="GtkButton" id="GNUNET_GTK_conversation_remove_contact_button"> | 791 | <object class="GtkTreeViewColumn" id="contactColumn"> |
828 | <property name="label" translatable="yes">Remove contact</property> | 792 | <property name="title" translatable="yes">Contact</property> |
829 | <property name="use_action_appearance">False</property> | 793 | <child> |
830 | <property name="visible">True</property> | 794 | <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_contact_window_renderer"/> |
831 | <property name="can_focus">True</property> | 795 | <attributes> |
832 | <property name="receives_default">True</property> | 796 | <attribute name="text">2</attribute> |
833 | <property name="use_action_appearance">False</property> | 797 | </attributes> |
834 | <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_remove_clicked" swapped="no"/> | 798 | </child> |
835 | </object> | 799 | </object> |
836 | <packing> | ||
837 | <property name="left_attach">1</property> | ||
838 | <property name="top_attach">0</property> | ||
839 | <property name="width">1</property> | ||
840 | <property name="height">1</property> | ||
841 | </packing> | ||
842 | </child> | 800 | </child> |
843 | </object> | 801 | </object> |
844 | <packing> | ||
845 | <property name="expand">False</property> | ||
846 | <property name="fill">True</property> | ||
847 | <property name="position">4</property> | ||
848 | </packing> | ||
849 | </child> | 802 | </child> |
803 | </object> | ||
804 | </child> | ||
805 | </object> | ||
806 | </child> | ||
807 | <child type="label"> | ||
808 | <object class="GtkLabel" id="gnunet_conversation_gtk_history_label"> | ||
809 | <property name="visible">True</property> | ||
810 | <property name="can_focus">False</property> | ||
811 | <property name="label" translatable="yes">History</property> | ||
812 | </object> | ||
813 | </child> | ||
814 | </object> | ||
815 | <packing> | ||
816 | <property name="expand">False</property> | ||
817 | <property name="fill">True</property> | ||
818 | <property name="position">2</property> | ||
819 | </packing> | ||
820 | </child> | ||
821 | <child> | ||
822 | <object class="GtkFrame" id="gnunet_conversation_gtk_log_frame"> | ||
823 | <property name="visible">True</property> | ||
824 | <property name="can_focus">False</property> | ||
825 | <property name="label_xalign">0</property> | ||
826 | <property name="shadow_type">none</property> | ||
827 | <child> | ||
828 | <object class="GtkAlignment" id="gnunet_conversation_gtk_log_alignment"> | ||
829 | <property name="visible">True</property> | ||
830 | <property name="can_focus">False</property> | ||
831 | <property name="left_padding">12</property> | ||
832 | <child> | ||
833 | <object class="GtkScrolledWindow" id="GNUNET_GTK_conversation_log_scroll"> | ||
834 | <property name="visible">True</property> | ||
835 | <property name="can_focus">True</property> | ||
836 | <property name="shadow_type">in</property> | ||
850 | <child> | 837 | <child> |
851 | <object class="GtkScrolledWindow" id="contacts_scrolledwindow"> | 838 | <object class="GtkTextView" id="GNUNET_GTK_conversation_log"> |
852 | <property name="visible">True</property> | 839 | <property name="visible">True</property> |
853 | <property name="can_focus">True</property> | 840 | <property name="can_focus">True</property> |
854 | <property name="shadow_type">in</property> | 841 | <property name="editable">False</property> |
855 | <child> | 842 | <property name="left_margin">1</property> |
856 | <object class="GtkTreeView" id="gnunet_conversation_gtk_treeview"> | 843 | <property name="right_margin">1</property> |
857 | <property name="visible">True</property> | 844 | <property name="indent">1</property> |
858 | <property name="can_focus">True</property> | ||
859 | <property name="model">gnunet_conversation_gtk_contacts_liststore</property> | ||
860 | <property name="headers_clickable">False</property> | ||
861 | <property name="search_column">0</property> | ||
862 | <signal name="row-activated" handler="GNUNET_CONVERSATION_GTK_row_activated" swapped="no"/> | ||
863 | <child internal-child="selection"> | ||
864 | <object class="GtkTreeSelection" id="treeview-selection"/> | ||
865 | </child> | ||
866 | <child> | ||
867 | <object class="GtkTreeViewColumn" id="contactName"> | ||
868 | <property name="title" translatable="yes">Type</property> | ||
869 | <child> | ||
870 | <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_type_window_name_renderer"/> | ||
871 | <attributes> | ||
872 | <attribute name="text">1</attribute> | ||
873 | </attributes> | ||
874 | </child> | ||
875 | </object> | ||
876 | </child> | ||
877 | <child> | ||
878 | <object class="GtkTreeViewColumn" id="contactType"> | ||
879 | <property name="title" translatable="yes">Contact</property> | ||
880 | <child> | ||
881 | <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_main_window_name_renderer"/> | ||
882 | <attributes> | ||
883 | <attribute name="text">0</attribute> | ||
884 | </attributes> | ||
885 | </child> | ||
886 | </object> | ||
887 | </child> | ||
888 | </object> | ||
889 | </child> | ||
890 | </object> | 845 | </object> |
891 | <packing> | ||
892 | <property name="expand">True</property> | ||
893 | <property name="fill">True</property> | ||
894 | <property name="position">5</property> | ||
895 | </packing> | ||
896 | </child> | 846 | </child> |
897 | </object> | 847 | </object> |
898 | <packing> | ||
899 | <property name="expand">False</property> | ||
900 | <property name="fill">True</property> | ||
901 | <property name="position">0</property> | ||
902 | </packing> | ||
903 | </child> | 848 | </child> |
904 | </object> | 849 | </object> |
905 | <packing> | 850 | </child> |
906 | <property name="left_attach">1</property> | 851 | <child type="label"> |
907 | <property name="top_attach">0</property> | 852 | <object class="GtkLabel" id="gnunet_conversation_gtk_log_label"> |
908 | <property name="width">1</property> | 853 | <property name="visible">True</property> |
909 | <property name="height">1</property> | 854 | <property name="can_focus">False</property> |
910 | </packing> | 855 | <property name="label" translatable="yes">Logs</property> |
856 | </object> | ||
911 | </child> | 857 | </child> |
912 | </object> | 858 | </object> |
913 | <packing> | 859 | <packing> |
914 | <property name="expand">False</property> | 860 | <property name="expand">False</property> |
915 | <property name="fill">True</property> | 861 | <property name="fill">True</property> |
916 | <property name="position">1</property> | 862 | <property name="position">3</property> |
917 | </packing> | 863 | </packing> |
918 | </child> | 864 | </child> |
919 | <child> | 865 | <child> |
@@ -926,65 +872,10 @@ | |||
926 | <packing> | 872 | <packing> |
927 | <property name="expand">False</property> | 873 | <property name="expand">False</property> |
928 | <property name="fill">True</property> | 874 | <property name="fill">True</property> |
929 | <property name="pack_type">end</property> | 875 | <property name="position">4</property> |
930 | <property name="position">2</property> | ||
931 | </packing> | 876 | </packing> |
932 | </child> | 877 | </child> |
933 | </object> | 878 | </object> |
934 | </child> | 879 | </child> |
935 | </object> | 880 | </object> |
936 | <object class="GtkListStore" id="gnunet_conversation_gtk_active_calls_liststore"> | ||
937 | <columns> | ||
938 | <!-- column-name caller_id --> | ||
939 | <column type="gchararray"/> | ||
940 | <!-- column-name caller --> | ||
941 | <column type="gpointer"/> | ||
942 | <!-- column-name caller_num --> | ||
943 | <column type="gint"/> | ||
944 | <!-- column-name caller_type --> | ||
945 | <column type="gint"/> | ||
946 | <!-- column-name caller_state --> | ||
947 | <column type="gint"/> | ||
948 | <!-- column-name call --> | ||
949 | <column type="gpointer"/> | ||
950 | <!-- column-name call_state --> | ||
951 | <column type="gint"/> | ||
952 | <!-- column-name call_id --> | ||
953 | <column type="gint"/> | ||
954 | </columns> | ||
955 | </object> | ||
956 | <object class="GtkListStore" id="gnunet_conversation_gtk_caller_id_zone_liststore"> | ||
957 | <columns> | ||
958 | <!-- column-name ego_name --> | ||
959 | <column type="gchararray"/> | ||
960 | <!-- column-name ego --> | ||
961 | <column type="gpointer"/> | ||
962 | </columns> | ||
963 | </object> | ||
964 | <object class="GtkListStore" id="gnunet_conversation_gtk_contacts_liststore"> | ||
965 | <columns> | ||
966 | <!-- column-name contactName --> | ||
967 | <column type="gchararray"/> | ||
968 | <!-- column-name contactType --> | ||
969 | <column type="gchararray"/> | ||
970 | </columns> | ||
971 | </object> | ||
972 | <object class="GtkListStore" id="gnunet_conversation_gtk_contacts_zone_liststore"> | ||
973 | <columns> | ||
974 | <!-- column-name ego_name --> | ||
975 | <column type="gchararray"/> | ||
976 | <!-- column-name ego --> | ||
977 | <column type="gpointer"/> | ||
978 | </columns> | ||
979 | </object> | ||
980 | <object class="GtkListStore" id="gnunet_conversation_gtk_history_liststore"> | ||
981 | <columns> | ||
982 | <!-- column-name logTime --> | ||
983 | <column type="gchararray"/> | ||
984 | <!-- column-name logEvent --> | ||
985 | <column type="gchararray"/> | ||
986 | <!-- column-name logContact --> | ||
987 | <column type="gchararray"/> | ||
988 | </columns> | ||
989 | </object> | ||
990 | </interface> | 881 | </interface> |
diff --git a/contrib/gnunet_peerinfo_gtk_main_window.glade b/contrib/gnunet_peerinfo_gtk_main_window.glade index 2b6f2b05..b7dd590e 100644 --- a/contrib/gnunet_peerinfo_gtk_main_window.glade +++ b/contrib/gnunet_peerinfo_gtk_main_window.glade | |||
@@ -1,7 +1,7 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | <!-- Generated with glade 3.18.3 --> | ||
2 | <interface> | 3 | <interface> |
3 | <requires lib="gtk+" version="2.20"/> | 4 | <requires lib="gtk+" version="3.0"/> |
4 | <!-- interface-naming-policy project-wide --> | ||
5 | <object class="GtkTreeStore" id="GNUNET_PEERINFO_GTK_tree_store"> | 5 | <object class="GtkTreeStore" id="GNUNET_PEERINFO_GTK_tree_store"> |
6 | <columns> | 6 | <columns> |
7 | <!-- column-name peer_identity --> | 7 | <!-- column-name peer_identity --> |
@@ -70,6 +70,12 @@ | |||
70 | <property name="page_increment">10</property> | 70 | <property name="page_increment">10</property> |
71 | <property name="page_size">10</property> | 71 | <property name="page_size">10</property> |
72 | </object> | 72 | </object> |
73 | <object class="GtkImage" id="connected_image_ats"> | ||
74 | <property name="visible">True</property> | ||
75 | <property name="can_focus">False</property> | ||
76 | <property name="tooltip_text" translatable="yes">ATS</property> | ||
77 | <property name="stock">gtk-connect</property> | ||
78 | </object> | ||
73 | <object class="GtkImage" id="connected_image_core"> | 79 | <object class="GtkImage" id="connected_image_core"> |
74 | <property name="visible">True</property> | 80 | <property name="visible">True</property> |
75 | <property name="can_focus">False</property> | 81 | <property name="can_focus">False</property> |
@@ -83,17 +89,10 @@ | |||
83 | <property name="stock">gtk-connect</property> | 89 | <property name="stock">gtk-connect</property> |
84 | </object> | 90 | </object> |
85 | <object class="GtkImage" id="connected_image_plugin"> | 91 | <object class="GtkImage" id="connected_image_plugin"> |
86 | <property name="visible">False</property> | ||
87 | <property name="can_focus">False</property> | 92 | <property name="can_focus">False</property> |
88 | <property name="tooltip_text" translatable="yes">PLUGIN</property> | 93 | <property name="tooltip_text" translatable="yes">PLUGIN</property> |
89 | <property name="stock">gtk-connect</property> | 94 | <property name="stock">gtk-connect</property> |
90 | </object> | 95 | </object> |
91 | <object class="GtkImage" id="connected_image_ats"> | ||
92 | <property name="visible">True</property> | ||
93 | <property name="can_focus">False</property> | ||
94 | <property name="tooltip_text" translatable="yes">ATS</property> | ||
95 | <property name="stock">gtk-connect</property> | ||
96 | </object> | ||
97 | <object class="GtkImage" id="validated_image"> | 96 | <object class="GtkImage" id="validated_image"> |
98 | <property name="visible">True</property> | 97 | <property name="visible">True</property> |
99 | <property name="can_focus">False</property> | 98 | <property name="can_focus">False</property> |
@@ -155,17 +154,18 @@ | |||
155 | <property name="can_focus">True</property> | 154 | <property name="can_focus">True</property> |
156 | <property name="hadjustment">adjustment3</property> | 155 | <property name="hadjustment">adjustment3</property> |
157 | <property name="vadjustment">adjustment4</property> | 156 | <property name="vadjustment">adjustment4</property> |
158 | <property name="hscrollbar_policy">automatic</property> | ||
159 | <property name="vscrollbar_policy">automatic</property> | ||
160 | <child> | 157 | <child> |
161 | <object class="GtkTreeView" id="GNUNET_PEERINFO_GTK_main_window_treeview"> | 158 | <object class="GtkTreeView" id="GNUNET_PEERINFO_GTK_main_window_treeview"> |
162 | <property name="visible">True</property> | 159 | <property name="visible">True</property> |
163 | <property name="can_focus">True</property> | 160 | <property name="can_focus">True</property> |
164 | <property name="model">GNUNET_PEERINFO_GTK_tree_store</property> | ||
165 | <property name="hadjustment">adjustment3</property> | 161 | <property name="hadjustment">adjustment3</property> |
166 | <property name="vadjustment">adjustment4</property> | 162 | <property name="vadjustment">adjustment4</property> |
163 | <property name="model">GNUNET_PEERINFO_GTK_tree_store</property> | ||
167 | <property name="reorderable">True</property> | 164 | <property name="reorderable">True</property> |
168 | <property name="search_column">0</property> | 165 | <property name="search_column">0</property> |
166 | <child internal-child="selection"> | ||
167 | <object class="GtkTreeSelection" id="treeview-selection1"/> | ||
168 | </child> | ||
169 | <child> | 169 | <child> |
170 | <object class="GtkTreeViewColumn" id="GNUNET_PEERINFO_GTK_main_window_name_column"> | 170 | <object class="GtkTreeViewColumn" id="GNUNET_PEERINFO_GTK_main_window_name_column"> |
171 | <property name="spacing">5</property> | 171 | <property name="spacing">5</property> |
@@ -205,9 +205,9 @@ | |||
205 | </child> | 205 | </child> |
206 | <child> | 206 | <child> |
207 | <object class="GtkTreeViewColumn" id="GNUNET_PEERINFO_GTK_main_window_plugin_connectivity_treeviewcolumn"> | 207 | <object class="GtkTreeViewColumn" id="GNUNET_PEERINFO_GTK_main_window_plugin_connectivity_treeviewcolumn"> |
208 | <property name="visible">False</property> | ||
208 | <property name="widget">connected_image_plugin</property> | 209 | <property name="widget">connected_image_plugin</property> |
209 | <property name="reorderable">True</property> | 210 | <property name="reorderable">True</property> |
210 | <property name="visible">False</property> | ||
211 | <property name="sort_indicator">True</property> | 211 | <property name="sort_indicator">True</property> |
212 | <property name="sort_column_id">22</property> | 212 | <property name="sort_column_id">22</property> |
213 | <child> | 213 | <child> |
diff --git a/contrib/gnunet_setup_calendar_dialog.glade b/contrib/gnunet_setup_calendar_dialog.glade index 0b9ef0ab..1723c643 100644 --- a/contrib/gnunet_setup_calendar_dialog.glade +++ b/contrib/gnunet_setup_calendar_dialog.glade | |||
@@ -1,7 +1,7 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | <!-- Generated with glade 3.18.3 --> | ||
2 | <interface> | 3 | <interface> |
3 | <requires lib="gtk+" version="2.24"/> | 4 | <requires lib="gtk+" version="3.0"/> |
4 | <!-- interface-naming-policy project-wide --> | ||
5 | <object class="GtkDialog" id="GNUNET_setup_calendar_dialog"> | 5 | <object class="GtkDialog" id="GNUNET_setup_calendar_dialog"> |
6 | <property name="can_focus">False</property> | 6 | <property name="can_focus">False</property> |
7 | <property name="border_width">5</property> | 7 | <property name="border_width">5</property> |
@@ -9,12 +9,13 @@ | |||
9 | <property name="type_hint">dialog</property> | 9 | <property name="type_hint">dialog</property> |
10 | <signal name="response" handler="GNUNET_setup_calendar_dialog_response_cb" swapped="no"/> | 10 | <signal name="response" handler="GNUNET_setup_calendar_dialog_response_cb" swapped="no"/> |
11 | <child internal-child="vbox"> | 11 | <child internal-child="vbox"> |
12 | <object class="GtkVBox" id="GNUNET_setup_calendar_dialog-vbox"> | 12 | <object class="GtkBox" id="GNUNET_setup_calendar_dialog-vbox"> |
13 | <property name="visible">True</property> | 13 | <property name="visible">True</property> |
14 | <property name="can_focus">False</property> | 14 | <property name="can_focus">False</property> |
15 | <property name="orientation">vertical</property> | ||
15 | <property name="spacing">2</property> | 16 | <property name="spacing">2</property> |
16 | <child internal-child="action_area"> | 17 | <child internal-child="action_area"> |
17 | <object class="GtkHButtonBox" id="GNUNET_setup_calendar_dialog-action_area"> | 18 | <object class="GtkButtonBox" id="GNUNET_setup_calendar_dialog-action_area"> |
18 | <property name="visible">True</property> | 19 | <property name="visible">True</property> |
19 | <property name="can_focus">False</property> | 20 | <property name="can_focus">False</property> |
20 | <property name="layout_style">end</property> | 21 | <property name="layout_style">end</property> |