Merge lp:~stan/openobject-client/client_toolbar_both_horiz into lp:openobject-client

Proposed by Tristan Hill
Status: Needs review
Proposed branch: lp:~stan/openobject-client/client_toolbar_both_horiz
Merge into: lp:openobject-client
Diff against target: 4767 lines (+1038/-864)
2 files modified
bin/modules/gui/main.py (+1/-1)
bin/openerp.glade (+1037/-863)
To merge this branch: bzr merge lp:~stan/openobject-client/client_toolbar_both_horiz
Reviewer Review Type Date Requested Status
Naresh(OpenERP) Needs Fixing
Review via email: mp+41267@code.launchpad.net

Description of the change

Proposed changes for Bug 677175

* Use TOOLBAR_BOTH_HORIZ by default.
* Make various toolbar buttons important so they show text in TOOLBAR_BOTH_HORIZ style.

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Hello Tristan,

Thanks for the contribution !

AS of trunk the gtk.glade (deprecated) by gtk.Builder API ,gtk.Builder is the GTK build-in replacement for libglade, since GTK 2.16.
So can you please make the necessary changes and resubmit

regards,

review: Needs Fixing

Unmerged revisions

1694. By Tristan Hill

Use TOOLBAR_BOTH_HORIZ by default.
Make various toolbar buttons important so they show text in TOOLBAR_BOTH_HORIZ style.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/modules/gui/main.py'
2--- bin/modules/gui/main.py 2010-11-10 12:47:34 +0000
3+++ bin/modules/gui/main.py 2010-11-19 07:41:25 +0000
4@@ -891,7 +891,7 @@
5 def sig_menubar(self, option):
6 options.options['client.toolbar'] = option
7 if option=='both':
8- self.toolbar.set_style(gtk.TOOLBAR_BOTH)
9+ self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
10 elif option=='text':
11 self.toolbar.set_style(gtk.TOOLBAR_TEXT)
12 elif option=='icons':
13
14=== modified file 'bin/openerp.glade'
15--- bin/openerp.glade 2010-11-10 07:19:31 +0000
16+++ bin/openerp.glade 2010-11-19 07:41:25 +0000
17@@ -1,14 +1,13 @@
18-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
19-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
20-<!--*- mode: xml -*-->
21+<?xml version="1.0" encoding="UTF-8"?>
22 <glade-interface>
23+ <!-- interface-requires gtk+ 2.6 -->
24+ <!-- interface-naming-policy toplevel-contextual -->
25 <widget class="GtkDialog" id="win_login">
26 <property name="title" translatable="yes">OpenERP - Login</property>
27 <property name="modal">True</property>
28- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
29+ <property name="window_position">center-on-parent</property>
30 <property name="destroy_with_parent">True</property>
31- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
32- <property name="has_separator">False</property>
33+ <property name="type_hint">normal</property>
34 <child internal-child="vbox">
35 <widget class="GtkVBox" id="dialog-vbox1">
36 <property name="visible">True</property>
37@@ -22,6 +21,9 @@
38 <property name="visible">True</property>
39 <property name="stock">gtk-missing-image</property>
40 </widget>
41+ <packing>
42+ <property name="position">0</property>
43+ </packing>
44 </child>
45 <child>
46 <widget class="GtkTable" id="table1">
47@@ -93,11 +95,11 @@
48 </child>
49 <child>
50 <widget class="GtkButton" id="but_server">
51- <property name="visible">True</property>
52- <property name="can_focus">True</property>
53 <property name="label" translatable="yes">Change</property>
54+ <property name="visible">True</property>
55+ <property name="can_focus">True</property>
56+ <property name="receives_default">False</property>
57 <property name="use_underline">True</property>
58- <property name="response_id">0</property>
59 <signal name="activate" handler="on_but_server_activate"/>
60 </widget>
61 <packing>
62@@ -144,7 +146,7 @@
63 <property name="xpad">3</property>
64 <property name="ypad">3</property>
65 <property name="label" translatable="yes">Password:</property>
66- <property name="justify">GTK_JUSTIFY_RIGHT</property>
67+ <property name="justify">right</property>
68 </widget>
69 <packing>
70 <property name="top_attach">3</property>
71@@ -160,6 +162,19 @@
72 <widget class="GtkComboBox" id="combo_db">
73 <property name="visible">True</property>
74 </widget>
75+ <packing>
76+ <property name="position">0</property>
77+ </packing>
78+ </child>
79+ <child>
80+ <widget class="GtkEntry" id="ent_db">
81+ <property name="visible">True</property>
82+ </widget>
83+ <packing>
84+ <property name="expand">False</property>
85+ <property name="fill">False</property>
86+ <property name="position">1</property>
87+ </packing>
88 </child>
89 <child>
90 <widget class="GtkLabel" id="combo_label">
91@@ -174,16 +189,6 @@
92 <property name="position">1</property>
93 </packing>
94 </child>
95- <child>
96- <widget class="GtkEntry" id="ent_db">
97- <property name="visible">True</property>
98- </widget>
99- <packing>
100- <property name="expand">False</property>
101- <property name="fill">False</property>
102- <property name="position">1</property>
103- </packing>
104- </child>
105 </widget>
106 <packing>
107 <property name="left_attach">1</property>
108@@ -207,35 +212,45 @@
109 <child internal-child="action_area">
110 <widget class="GtkHButtonBox" id="dialog-action_area1">
111 <property name="visible">True</property>
112- <property name="layout_style">GTK_BUTTONBOX_END</property>
113+ <property name="layout_style">end</property>
114 <child>
115 <widget class="GtkButton" id="okbutton1">
116+ <property name="label">gtk-cancel</property>
117+ <property name="response_id">-6</property>
118 <property name="visible">True</property>
119 <property name="can_focus">True</property>
120 <property name="can_default">True</property>
121- <property name="label">gtk-cancel</property>
122+ <property name="receives_default">False</property>
123 <property name="use_stock">True</property>
124- <property name="response_id">-6</property>
125 </widget>
126+ <packing>
127+ <property name="expand">False</property>
128+ <property name="fill">False</property>
129+ <property name="position">0</property>
130+ </packing>
131 </child>
132 <child>
133 <widget class="GtkButton" id="button_connect">
134+ <property name="label">gtk-ok</property>
135+ <property name="response_id">-5</property>
136 <property name="visible">True</property>
137 <property name="can_focus">True</property>
138 <property name="can_default">True</property>
139 <property name="has_default">True</property>
140- <property name="label">gtk-ok</property>
141+ <property name="receives_default">False</property>
142 <property name="use_stock">True</property>
143- <property name="response_id">-5</property>
144 </widget>
145 <packing>
146+ <property name="expand">False</property>
147+ <property name="fill">False</property>
148 <property name="position">1</property>
149 </packing>
150 </child>
151 </widget>
152 <packing>
153 <property name="expand">False</property>
154- <property name="pack_type">GTK_PACK_END</property>
155+ <property name="pack_type">end</property>
156+ <property name="position">0</property>
157 </packing>
158 </child>
159 </widget>
160@@ -246,7 +261,7 @@
161 <property name="height_request">400</property>
162 <property name="visible">True</property>
163 <property name="title">OpenERP</property>
164- <property name="window_position">GTK_WIN_POS_CENTER</property>
165+ <property name="window_position">center</property>
166 <property name="default_width">920</property>
167 <property name="default_height">780</property>
168 <signal name="destroy_event" handler="on_win_main_destroy_event"/>
169@@ -268,33 +283,21 @@
170 <widget class="GtkMenu" id="menuitem1_menu">
171 <child>
172 <widget class="GtkImageMenuItem" id="login">
173+ <property name="label">_Connect...</property>
174 <property name="visible">True</property>
175- <property name="label" translatable="yes">_Connect...</property>
176 <property name="use_underline">True</property>
177+ <property name="use_stock">True</property>
178 <signal name="activate" handler="on_login_activate"/>
179- <accelerator key="O" modifiers="GDK_CONTROL_MASK" signal="activate"/>
180- <child internal-child="image">
181- <widget class="GtkImage" id="image4209">
182- <property name="visible">True</property>
183- <property name="stock">gtk-connect</property>
184- <property name="icon_size">1</property>
185- </widget>
186- </child>
187+ <accelerator key="O" signal="activate" modifiers="GDK_CONTROL_MASK"/>
188 </widget>
189 </child>
190 <child>
191 <widget class="GtkImageMenuItem" id="logout">
192+ <property name="label">_Disconnect</property>
193 <property name="visible">True</property>
194- <property name="label" translatable="yes">_Disconnect</property>
195 <property name="use_underline">True</property>
196+ <property name="use_stock">True</property>
197 <signal name="activate" handler="on_logout_activate"/>
198- <child internal-child="image">
199- <widget class="GtkImage" id="image4210">
200- <property name="visible">True</property>
201- <property name="stock">gtk-disconnect</property>
202- <property name="icon_size">1</property>
203- </widget>
204- </child>
205 </widget>
206 </child>
207 <child>
208@@ -304,69 +307,46 @@
209 </child>
210 <child>
211 <widget class="GtkImageMenuItem" id="Databases">
212+ <property name="label">Databases</property>
213 <property name="visible">True</property>
214- <property name="label" translatable="yes">Databases</property>
215 <property name="use_underline">True</property>
216+ <property name="use_stock">True</property>
217 <child>
218 <widget class="GtkMenu" id="Databases_menu">
219 <child>
220 <widget class="GtkImageMenuItem" id="db_new">
221+ <property name="label">_New database</property>
222 <property name="visible">True</property>
223- <property name="label" translatable="yes">_New database</property>
224 <property name="use_underline">True</property>
225+ <property name="use_stock">True</property>
226 <signal name="activate" handler="on_db_new_activate"/>
227- <child internal-child="image">
228- <widget class="GtkImage" id="image4212">
229- <property name="visible">True</property>
230- <property name="stock">gtk-new</property>
231- <property name="icon_size">1</property>
232- </widget>
233- </child>
234 </widget>
235 </child>
236 <child>
237 <widget class="GtkImageMenuItem" id="db_restore">
238+ <property name="label">_Restore database</property>
239 <property name="visible">True</property>
240- <property name="label" translatable="yes">_Restore database</property>
241 <property name="use_underline">True</property>
242+ <property name="use_stock">True</property>
243 <signal name="activate" handler="on_db_restore_activate"/>
244- <child internal-child="image">
245- <widget class="GtkImage" id="image4213">
246- <property name="visible">True</property>
247- <property name="stock">gtk-open</property>
248- <property name="icon_size">1</property>
249- </widget>
250- </child>
251 </widget>
252 </child>
253 <child>
254 <widget class="GtkImageMenuItem" id="db_backup">
255+ <property name="label">_Backup database</property>
256 <property name="visible">True</property>
257- <property name="label" translatable="yes">_Backup database</property>
258 <property name="use_underline">True</property>
259+ <property name="use_stock">True</property>
260 <signal name="activate" handler="on_db_backup_activate"/>
261- <child internal-child="image">
262- <widget class="GtkImage" id="image4214">
263- <property name="visible">True</property>
264- <property name="stock">gtk-save-as</property>
265- <property name="icon_size">1</property>
266- </widget>
267- </child>
268 </widget>
269 </child>
270 <child>
271 <widget class="GtkImageMenuItem" id="db_drop">
272+ <property name="label">Dro_p database</property>
273 <property name="visible">True</property>
274- <property name="label" translatable="yes">Dro_p database</property>
275 <property name="use_underline">True</property>
276+ <property name="use_stock">True</property>
277 <signal name="activate" handler="on_db_drop_activate"/>
278- <child internal-child="image">
279- <widget class="GtkImage" id="image4215">
280- <property name="visible">True</property>
281- <property name="stock">gtk-delete</property>
282- <property name="icon_size">1</property>
283- </widget>
284- </child>
285 </widget>
286 </child>
287 <child>
288@@ -376,32 +356,20 @@
289 </child>
290 <child>
291 <widget class="GtkImageMenuItem" id="db_migrate_retrieve_script">
292+ <property name="label">_Download Migrations Code</property>
293 <property name="visible">True</property>
294- <property name="label" translatable="yes">_Download Migrations Code</property>
295 <property name="use_underline">True</property>
296+ <property name="use_stock">True</property>
297 <signal name="activate" handler="on_db_migrate_retrieve_script_activate"/>
298- <child internal-child="image">
299- <widget class="GtkImage" id="image_retrieve_script">
300- <property name="visible">True</property>
301- <property name="stock">gtk-sort-descending</property>
302- <property name="icon_size">1</property>
303- </widget>
304- </child>
305 </widget>
306 </child>
307 <child>
308 <widget class="GtkImageMenuItem" id="db_migrate">
309+ <property name="label">_Migrate Database(s)</property>
310 <property name="visible">True</property>
311- <property name="label" translatable="yes">_Migrate Database(s)</property>
312 <property name="use_underline">True</property>
313+ <property name="use_stock">True</property>
314 <signal name="activate" handler="on_db_migrate_activate"/>
315- <child internal-child="image">
316- <widget class="GtkImage" id="image_migrate">
317- <property name="visible">True</property>
318- <property name="stock">gtk-refresh</property>
319- <property name="icon_size">1</property>
320- </widget>
321- </child>
322 </widget>
323 </child>
324 <child>
325@@ -411,28 +379,15 @@
326 </child>
327 <child>
328 <widget class="GtkImageMenuItem" id="admin_password">
329+ <property name="label">Administrator Password</property>
330 <property name="visible">True</property>
331- <property name="label" translatable="yes">Administrator Password</property>
332 <property name="use_underline">True</property>
333+ <property name="use_stock">True</property>
334 <signal name="activate" handler="on_admin_password_activate"/>
335- <child internal-child="image">
336- <widget class="GtkImage" id="image4216">
337- <property name="visible">True</property>
338- <property name="stock">gtk-dialog-question</property>
339- <property name="icon_size">1</property>
340- </widget>
341- </child>
342 </widget>
343 </child>
344 </widget>
345 </child>
346- <child internal-child="image">
347- <widget class="GtkImage" id="image4211">
348- <property name="visible">True</property>
349- <property name="stock">gtk-network</property>
350- <property name="icon_size">1</property>
351- </widget>
352- </child>
353 </widget>
354 </child>
355 <child>
356@@ -442,8 +397,8 @@
357 </child>
358 <child>
359 <widget class="GtkImageMenuItem" id="quitter1">
360- <property name="visible">True</property>
361 <property name="label">gtk-quit</property>
362+ <property name="visible">True</property>
363 <property name="use_underline">True</property>
364 <property name="use_stock">True</property>
365 <signal name="activate" handler="on_quit_activate"/>
366@@ -464,17 +419,11 @@
367 <widget class="GtkMenu" id="user_menu">
368 <child>
369 <widget class="GtkImageMenuItem" id="preference">
370+ <property name="label">_Preferences</property>
371 <property name="visible">True</property>
372- <property name="label" translatable="yes">_Preferences</property>
373 <property name="use_underline">True</property>
374+ <property name="use_stock">True</property>
375 <signal name="activate" handler="on_preference_activate"/>
376- <child internal-child="image">
377- <widget class="GtkImage" id="image4217">
378- <property name="visible">True</property>
379- <property name="stock">gtk-preferences</property>
380- <property name="icon_size">1</property>
381- </widget>
382- </child>
383 </widget>
384 </child>
385 <child>
386@@ -484,32 +433,20 @@
387 </child>
388 <child>
389 <widget class="GtkImageMenuItem" id="send_request">
390+ <property name="label">_Send a request</property>
391 <property name="visible">True</property>
392- <property name="label" translatable="yes">_Send a request</property>
393 <property name="use_underline">True</property>
394+ <property name="use_stock">True</property>
395 <signal name="activate" handler="on_send_request_activate"/>
396- <child internal-child="image">
397- <widget class="GtkImage" id="image4218">
398- <property name="visible">True</property>
399- <property name="stock">gtk-new</property>
400- <property name="icon_size">1</property>
401- </widget>
402- </child>
403 </widget>
404 </child>
405 <child>
406 <widget class="GtkImageMenuItem" id="read_requests">
407+ <property name="label">_Read my requests</property>
408 <property name="visible">True</property>
409- <property name="label" translatable="yes">_Read my requests</property>
410 <property name="use_underline">True</property>
411+ <property name="use_stock">True</property>
412 <signal name="activate" handler="on_read_requests_activate"/>
413- <child internal-child="image">
414- <widget class="GtkImage" id="image4219">
415- <property name="visible">True</property>
416- <property name="stock">gtk-find</property>
417- <property name="icon_size">1</property>
418- </widget>
419- </child>
420 </widget>
421 </child>
422 <child>
423@@ -540,67 +477,43 @@
424 <widget class="GtkMenu" id="form_menu">
425 <child>
426 <widget class="GtkImageMenuItem" id="form_new">
427+ <property name="label">_New</property>
428 <property name="visible">True</property>
429- <property name="label" translatable="yes">_New</property>
430 <property name="use_underline">True</property>
431+ <property name="use_stock">True</property>
432 <signal name="activate" handler="on_form_new_activate"/>
433- <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>
434- <child internal-child="image">
435- <widget class="GtkImage" id="image4220">
436- <property name="visible">True</property>
437- <property name="stock">gtk-new</property>
438- <property name="icon_size">1</property>
439- </widget>
440- </child>
441+ <accelerator key="N" signal="activate" modifiers="GDK_CONTROL_MASK"/>
442 </widget>
443 </child>
444 <child>
445 <widget class="GtkImageMenuItem" id="form_save">
446+ <property name="label">_Save</property>
447 <property name="visible">True</property>
448- <property name="label" translatable="yes">_Save</property>
449 <property name="use_underline">True</property>
450+ <property name="use_stock">True</property>
451 <signal name="activate" handler="on_form_save_activate"/>
452- <accelerator key="S" modifiers="GDK_CONTROL_MASK" signal="activate"/>
453- <child internal-child="image">
454- <widget class="GtkImage" id="image4221">
455- <property name="visible">True</property>
456- <property name="stock">gtk-save</property>
457- <property name="icon_size">1</property>
458- </widget>
459- </child>
460+ <accelerator key="S" signal="activate" modifiers="GDK_CONTROL_MASK"/>
461 </widget>
462 </child>
463 <child>
464 <widget class="GtkImageMenuItem" id="copy">
465+ <property name="label">_Duplicate</property>
466 <property name="visible">True</property>
467 <property name="tooltip" translatable="yes">Copy this resource</property>
468- <property name="label" translatable="yes">_Duplicate</property>
469 <property name="use_underline">True</property>
470+ <property name="use_stock">True</property>
471 <signal name="activate" handler="on_form_copy_activate"/>
472- <accelerator key="D" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK" signal="activate"/>
473- <child internal-child="image">
474- <widget class="GtkImage" id="image4222">
475- <property name="visible">True</property>
476- <property name="stock">gtk-copy</property>
477- <property name="icon_size">1</property>
478- </widget>
479- </child>
480+ <accelerator key="D" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
481 </widget>
482 </child>
483 <child>
484 <widget class="GtkImageMenuItem" id="form_delete">
485+ <property name="label">_Delete</property>
486 <property name="visible">True</property>
487- <property name="label" translatable="yes">_Delete</property>
488 <property name="use_underline">True</property>
489+ <property name="use_stock">True</property>
490 <signal name="activate" handler="on_form_del_activate"/>
491- <accelerator key="D" modifiers="GDK_CONTROL_MASK" signal="activate"/>
492- <child internal-child="image">
493- <widget class="GtkImage" id="image4223">
494- <property name="visible">True</property>
495- <property name="stock">gtk-delete</property>
496- <property name="icon_size">1</property>
497- </widget>
498- </child>
499+ <accelerator key="D" signal="activate" modifiers="GDK_CONTROL_MASK"/>
500 </widget>
501 </child>
502 <child>
503@@ -610,82 +523,52 @@
504 </child>
505 <child>
506 <widget class="GtkImageMenuItem" id="form_search">
507+ <property name="label">Find</property>
508 <property name="visible">True</property>
509- <property name="label" translatable="yes">Find</property>
510 <property name="use_underline">True</property>
511+ <property name="use_stock">True</property>
512 <signal name="activate" handler="on_form_search_activate"/>
513- <accelerator key="F" modifiers="GDK_CONTROL_MASK" signal="activate"/>
514- <child internal-child="image">
515- <widget class="GtkImage" id="image4224">
516- <property name="visible">True</property>
517- <property name="stock">gtk-find</property>
518- <property name="icon_size">1</property>
519- </widget>
520- </child>
521+ <accelerator key="F" signal="activate" modifiers="GDK_CONTROL_MASK"/>
522 </widget>
523 </child>
524 <child>
525 <widget class="GtkImageMenuItem" id="form_next">
526+ <property name="label">Ne_xt</property>
527 <property name="visible">True</property>
528- <property name="label" translatable="yes">Ne_xt</property>
529 <property name="use_underline">True</property>
530+ <property name="use_stock">True</property>
531 <signal name="activate" handler="on_form_next_activate"/>
532- <accelerator key="Page_Down" modifiers="" signal="activate"/>
533- <child internal-child="image">
534- <widget class="GtkImage" id="image4225">
535- <property name="visible">True</property>
536- <property name="stock">gtk-go-forward</property>
537- <property name="icon_size">1</property>
538- </widget>
539- </child>
540+ <accelerator key="Page_Down" signal="activate"/>
541 </widget>
542 </child>
543 <child>
544 <widget class="GtkImageMenuItem" id="form_previous">
545+ <property name="label">Pre_vious</property>
546 <property name="visible">True</property>
547- <property name="label" translatable="yes">Pre_vious</property>
548 <property name="use_underline">True</property>
549+ <property name="use_stock">True</property>
550 <signal name="activate" handler="on_form_previous_activate"/>
551- <accelerator key="Page_Up" modifiers="" signal="activate"/>
552- <child internal-child="image">
553- <widget class="GtkImage" id="image4226">
554- <property name="visible">True</property>
555- <property name="stock">gtk-go-back</property>
556- <property name="icon_size">1</property>
557- </widget>
558- </child>
559+ <accelerator key="Page_Up" signal="activate"/>
560 </widget>
561 </child>
562 <child>
563 <widget class="GtkImageMenuItem" id="switch_lf">
564+ <property name="label">Switch to list/form</property>
565 <property name="visible">True</property>
566- <property name="label" translatable="yes">Switch to list/form</property>
567 <property name="use_underline">True</property>
568+ <property name="use_stock">True</property>
569 <signal name="activate" handler="on_but_switch_clicked"/>
570- <accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="activate"/>
571- <child internal-child="image">
572- <widget class="GtkImage" id="image4227">
573- <property name="visible">True</property>
574- <property name="stock">gtk-justify-fill</property>
575- <property name="icon_size">1</property>
576- </widget>
577- </child>
578+ <accelerator key="L" signal="activate" modifiers="GDK_CONTROL_MASK"/>
579 </widget>
580 </child>
581 <child>
582 <widget class="GtkImageMenuItem" id="win_new">
583+ <property name="label">_Menu</property>
584 <property name="visible">True</property>
585- <property name="label" translatable="yes">_Menu</property>
586 <property name="use_underline">True</property>
587+ <property name="use_stock">True</property>
588 <signal name="activate" handler="on_win_new_activate"/>
589- <accelerator key="T" modifiers="GDK_CONTROL_MASK" signal="activate"/>
590- <child internal-child="image">
591- <widget class="GtkImage" id="image4228">
592- <property name="visible">True</property>
593- <property name="stock">gtk-index</property>
594- <property name="icon_size">1</property>
595- </widget>
596- </child>
597+ <accelerator key="T" signal="activate" modifiers="GDK_CONTROL_MASK"/>
598 </widget>
599 </child>
600 <child>
601@@ -695,34 +578,22 @@
602 </child>
603 <child>
604 <widget class="GtkImageMenuItem" id="win_home">
605+ <property name="label">_New Home Tab</property>
606 <property name="visible">True</property>
607- <property name="label" translatable="yes">_New Home Tab</property>
608 <property name="use_underline">True</property>
609+ <property name="use_stock">True</property>
610 <signal name="activate" handler="on_win_home_activate"/>
611- <accelerator key="H" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK" signal="activate"/>
612- <child internal-child="image">
613- <widget class="GtkImage" id="image4229">
614- <property name="visible">True</property>
615- <property name="stock">gtk-home</property>
616- <property name="icon_size">1</property>
617- </widget>
618- </child>
619+ <accelerator key="H" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
620 </widget>
621 </child>
622 <child>
623 <widget class="GtkImageMenuItem" id="win_close">
624+ <property name="label">Close Tab</property>
625 <property name="visible">True</property>
626- <property name="label" translatable="yes">Close Tab</property>
627 <property name="use_underline">True</property>
628+ <property name="use_stock">True</property>
629 <signal name="activate" handler="on_win_close_activate"/>
630- <accelerator key="W" modifiers="GDK_CONTROL_MASK" signal="activate"/>
631- <child internal-child="image">
632- <widget class="GtkImage" id="image4230">
633- <property name="visible">True</property>
634- <property name="stock">gtk-close</property>
635- <property name="icon_size">1</property>
636- </widget>
637- </child>
638+ <accelerator key="W" signal="activate" modifiers="GDK_CONTROL_MASK"/>
639 </widget>
640 </child>
641 <child>
642@@ -731,7 +602,7 @@
643 <property name="label" translatable="yes">Previous Tab</property>
644 <property name="use_underline">True</property>
645 <signal name="activate" handler="on_win_prev_activate"/>
646- <accelerator key="Page_Up" modifiers="GDK_CONTROL_MASK" signal="activate"/>
647+ <accelerator key="Page_Up" signal="activate" modifiers="GDK_CONTROL_MASK"/>
648 </widget>
649 </child>
650 <child>
651@@ -740,7 +611,7 @@
652 <property name="label" translatable="yes">Next Tab</property>
653 <property name="use_underline">True</property>
654 <signal name="activate" handler="on_win_next_activate"/>
655- <accelerator key="Page_Down" modifiers="GDK_CONTROL_MASK" signal="activate"/>
656+ <accelerator key="Page_Down" signal="activate" modifiers="GDK_CONTROL_MASK"/>
657 </widget>
658 </child>
659 <child>
660@@ -762,7 +633,7 @@
661 <property name="label" translatable="yes">_Go to resource ID...</property>
662 <property name="use_underline">True</property>
663 <signal name="activate" handler="on_goto_id_activate"/>
664- <accelerator key="G" modifiers="GDK_CONTROL_MASK" signal="activate"/>
665+ <accelerator key="G" signal="activate" modifiers="GDK_CONTROL_MASK"/>
666 </widget>
667 </child>
668 <child>
669@@ -772,33 +643,21 @@
670 </child>
671 <child>
672 <widget class="GtkImageMenuItem" id="form_open">
673+ <property name="label">_Open</property>
674 <property name="visible">True</property>
675- <property name="label" translatable="yes">_Open</property>
676 <property name="use_underline">True</property>
677+ <property name="use_stock">True</property>
678 <signal name="activate" handler="on_form_open_activate"/>
679- <child internal-child="image">
680- <widget class="GtkImage" id="image4231">
681- <property name="visible">True</property>
682- <property name="stock">gtk-open</property>
683- <property name="icon_size">1</property>
684- </widget>
685- </child>
686 </widget>
687 </child>
688 <child>
689 <widget class="GtkImageMenuItem" id="form_reload">
690+ <property name="label">Reloa_d / Undo</property>
691 <property name="visible">True</property>
692- <property name="label" translatable="yes">Reloa_d / Undo</property>
693 <property name="use_underline">True</property>
694+ <property name="use_stock">True</property>
695 <signal name="activate" handler="on_form_reload_activate"/>
696- <accelerator key="R" modifiers="GDK_CONTROL_MASK" signal="activate"/>
697- <child internal-child="image">
698- <widget class="GtkImage" id="image4232">
699- <property name="visible">True</property>
700- <property name="stock">gtk-redo</property>
701- <property name="icon_size">1</property>
702- </widget>
703- </child>
704+ <accelerator key="R" signal="activate" modifiers="GDK_CONTROL_MASK"/>
705 </widget>
706 </child>
707 <child>
708@@ -812,7 +671,7 @@
709 <property name="label" translatable="yes">Repeat latest _action</property>
710 <property name="use_underline">True</property>
711 <signal name="activate" handler="on_form_repeat_activate"/>
712- <accelerator key="Y" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK" signal="activate"/>
713+ <accelerator key="Y" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
714 </widget>
715 </child>
716 <child>
717@@ -822,33 +681,21 @@
718 </child>
719 <child>
720 <widget class="GtkImageMenuItem" id="form_print">
721+ <property name="label">_Preview in PDF</property>
722 <property name="visible">True</property>
723- <property name="label" translatable="yes">_Preview in PDF</property>
724 <property name="use_underline">True</property>
725+ <property name="use_stock">True</property>
726 <signal name="activate" handler="on_form_print_activate"/>
727- <accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
728- <child internal-child="image">
729- <widget class="GtkImage" id="image4233">
730- <property name="visible">True</property>
731- <property name="stock">gtk-print-preview</property>
732- <property name="icon_size">1</property>
733- </widget>
734- </child>
735+ <accelerator key="P" signal="activate" modifiers="GDK_CONTROL_MASK"/>
736 </widget>
737 </child>
738 <child>
739 <widget class="GtkImageMenuItem" id="form_print_html">
740+ <property name="label">Previe_w in editor</property>
741 <property name="visible">True</property>
742- <property name="label" translatable="yes">Previe_w in editor</property>
743 <property name="use_underline">True</property>
744+ <property name="use_stock">True</property>
745 <signal name="activate" handler="on_form_print_html_activate"/>
746- <child internal-child="image">
747- <widget class="GtkImage" id="image4234">
748- <property name="visible">True</property>
749- <property name="stock">gtk-print-preview</property>
750- <property name="icon_size">1</property>
751- </widget>
752- </child>
753 </widget>
754 </child>
755 <child>
756@@ -858,17 +705,11 @@
757 </child>
758 <child>
759 <widget class="GtkImageMenuItem" id="form_save_as">
760+ <property name="label">Expor_t data...</property>
761 <property name="visible">True</property>
762- <property name="label" translatable="yes">Expor_t data...</property>
763 <property name="use_underline">True</property>
764+ <property name="use_stock">True</property>
765 <signal name="activate" handler="on_form_save_as_activate"/>
766- <child internal-child="image">
767- <widget class="GtkImage" id="image4235">
768- <property name="visible">True</property>
769- <property name="stock">gtk-save-as</property>
770- <property name="icon_size">1</property>
771- </widget>
772- </child>
773 </widget>
774 </child>
775 <child>
776@@ -1034,9 +875,10 @@
777 </child>
778 <child>
779 <widget class="GtkImageMenuItem" id="printer">
780+ <property name="label">_Print</property>
781 <property name="visible">True</property>
782- <property name="label" translatable="yes">_Print</property>
783 <property name="use_underline">True</property>
784+ <property name="use_stock">True</property>
785 <child>
786 <widget class="GtkMenu" id="printer_menu">
787 <child>
788@@ -1049,13 +891,6 @@
789 </child>
790 </widget>
791 </child>
792- <child internal-child="image">
793- <widget class="GtkImage" id="image4238">
794- <property name="visible">True</property>
795- <property name="stock">gtk-print</property>
796- <property name="icon_size">1</property>
797- </widget>
798- </child>
799 </widget>
800 </child>
801 <child>
802@@ -1065,17 +900,11 @@
803 </child>
804 <child>
805 <widget class="GtkImageMenuItem" id="opt_save">
806+ <property name="label">_Save options</property>
807 <property name="visible">True</property>
808- <property name="label" translatable="yes">_Save options</property>
809 <property name="use_underline">True</property>
810+ <property name="use_stock">True</property>
811 <signal name="activate" handler="on_opt_save_activate"/>
812- <child internal-child="image">
813- <widget class="GtkImage" id="image4239">
814- <property name="visible">True</property>
815- <property name="stock">gtk-save</property>
816- <property name="icon_size">1</property>
817- </widget>
818- </child>
819 </widget>
820 </child>
821 </widget>
822@@ -1093,17 +922,11 @@
823 <widget class="GtkMenu" id="plugins_menu">
824 <child>
825 <widget class="GtkImageMenuItem" id="plugin_execute">
826+ <property name="label">_Execute a plugin</property>
827 <property name="visible">True</property>
828- <property name="label" translatable="yes">_Execute a plugin</property>
829 <property name="use_underline">True</property>
830+ <property name="use_stock">True</property>
831 <signal name="activate" handler="on_plugin_execute_activate"/>
832- <child internal-child="image">
833- <widget class="GtkImage" id="image4240">
834- <property name="visible">True</property>
835- <property name="stock">gtk-network</property>
836- <property name="icon_size">1</property>
837- </widget>
838- </child>
839 </widget>
840 </child>
841 </widget>
842@@ -1126,7 +949,7 @@
843 <property name="use_underline">True</property>
844 <child>
845 <widget class="GtkMenu" id="help_menu">
846- <child>
847+ <child>
848 <widget class="GtkCheckMenuItem" id="opt_debug_mode_tooltip">
849 <property name="visible">True</property>
850 <property name="label" translatable="yes">Enable Debug Mode Tooltips</property>
851@@ -1136,17 +959,11 @@
852 </child>
853 <child>
854 <widget class="GtkImageMenuItem" id="support">
855+ <property name="label">Support Request</property>
856 <property name="visible">True</property>
857- <property name="label" translatable="yes">Support Request</property>
858 <property name="use_underline">True</property>
859+ <property name="use_stock">True</property>
860 <signal name="activate" handler="on_support_activate"/>
861- <child internal-child="image">
862- <widget class="GtkImage" id="image4241">
863- <property name="visible">True</property>
864- <property name="stock">gtk-help</property>
865- <property name="icon_size">1</property>
866- </widget>
867- </child>
868 </widget>
869 </child>
870 <child>
871@@ -1156,33 +973,21 @@
872 </child>
873 <child>
874 <widget class="GtkImageMenuItem" id="help_index">
875+ <property name="label">User _Manual</property>
876 <property name="visible">True</property>
877- <property name="label" translatable="yes">User _Manual</property>
878 <property name="use_underline">True</property>
879+ <property name="use_stock">True</property>
880 <signal name="activate" handler="on_help_index_activate"/>
881- <child internal-child="image">
882- <widget class="GtkImage" id="image4242">
883- <property name="visible">True</property>
884- <property name="stock">gtk-zoom-fit</property>
885- <property name="icon_size">1</property>
886- </widget>
887- </child>
888 </widget>
889 </child>
890 <child>
891 <widget class="GtkImageMenuItem" id="help_contextual">
892+ <property name="label">_Contextual Help</property>
893 <property name="visible">True</property>
894- <property name="label" translatable="yes">_Contextual Help</property>
895 <property name="use_underline">True</property>
896+ <property name="use_stock">True</property>
897 <signal name="activate" handler="on_help_contextual_activate"/>
898- <accelerator key="H" modifiers="GDK_CONTROL_MASK" signal="activate"/>
899- <child internal-child="image">
900- <widget class="GtkImage" id="image4243">
901- <property name="visible">True</property>
902- <property name="stock">gtk-jump-to</property>
903- <property name="icon_size">1</property>
904- </widget>
905- </child>
906+ <accelerator key="H" signal="activate" modifiers="GDK_CONTROL_MASK"/>
907 </widget>
908 </child>
909 <child>
910@@ -1200,32 +1005,20 @@
911 </child>
912 <child>
913 <widget class="GtkImageMenuItem" id="help_licence">
914+ <property name="label">_License</property>
915 <property name="visible">True</property>
916- <property name="label" translatable="yes">_License</property>
917 <property name="use_underline">True</property>
918+ <property name="use_stock">True</property>
919 <signal name="activate" handler="on_help_licence_activate"/>
920- <child internal-child="image">
921- <widget class="GtkImage" id="image4245">
922- <property name="visible">True</property>
923- <property name="stock">gtk-justify-center</property>
924- <property name="icon_size">1</property>
925- </widget>
926- </child>
927 </widget>
928 </child>
929 <child>
930 <widget class="GtkImageMenuItem" id="about1">
931+ <property name="label">_About...</property>
932 <property name="visible">True</property>
933- <property name="label" translatable="yes">_About...</property>
934 <property name="use_underline">True</property>
935+ <property name="use_stock">True</property>
936 <signal name="activate" handler="on_about_activate"/>
937- <child internal-child="image">
938- <widget class="GtkImage" id="image4246">
939- <property name="visible">True</property>
940- <property name="stock">gtk-about</property>
941- <property name="icon_size">1</property>
942- </widget>
943- </child>
944 </widget>
945 </child>
946 </widget>
947@@ -1238,12 +1031,13 @@
948 <packing>
949 <property name="expand">False</property>
950 <property name="fill">False</property>
951+ <property name="position">0</property>
952 </packing>
953 </child>
954 <child>
955 <widget class="GtkToolbar" id="main_toolbar">
956 <property name="visible">True</property>
957- <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
958+ <property name="toolbar_style">both</property>
959 <child>
960 <widget class="GtkToolButton" id="but_new">
961 <property name="visible">True</property>
962@@ -1252,6 +1046,7 @@
963 <signal name="clicked" handler="on_but_new_clicked"/>
964 </widget>
965 <packing>
966+ <property name="expand">False</property>
967 <property name="homogeneous">True</property>
968 </packing>
969 </child>
970@@ -1263,6 +1058,7 @@
971 <signal name="clicked" handler="on_but_save_clicked"/>
972 </widget>
973 <packing>
974+ <property name="expand">False</property>
975 <property name="homogeneous">True</property>
976 </packing>
977 </child>
978@@ -1270,19 +1066,30 @@
979 <widget class="GtkSeparatorToolItem" id="separatortoolitem5">
980 <property name="visible">True</property>
981 </widget>
982+ <packing>
983+ <property name="expand">False</property>
984+ </packing>
985 </child>
986 <child>
987 <widget class="GtkToolButton" id="but_remove">
988 <property name="visible">True</property>
989 <property name="tooltip" translatable="yes">Delete this resource</property>
990+ <property name="is_important">True</property>
991 <property name="stock_id">gtk-delete</property>
992 <signal name="clicked" handler="on_but_remove_clicked"/>
993 </widget>
994+ <packing>
995+ <property name="expand">False</property>
996+ <property name="homogeneous">True</property>
997+ </packing>
998 </child>
999 <child>
1000 <widget class="GtkSeparatorToolItem" id="separatortoolitem1">
1001 <property name="visible">True</property>
1002 </widget>
1003+ <packing>
1004+ <property name="expand">False</property>
1005+ </packing>
1006 </child>
1007 <child>
1008 <widget class="GtkToolButton" id="but_previous">
1009@@ -1293,6 +1100,7 @@
1010 <signal name="clicked" handler="on_but_previous_clicked"/>
1011 </widget>
1012 <packing>
1013+ <property name="expand">False</property>
1014 <property name="homogeneous">True</property>
1015 </packing>
1016 </child>
1017@@ -1304,27 +1112,37 @@
1018 <property name="stock_id">gtk-go-forward</property>
1019 <signal name="clicked" handler="on_but_next_clicked"/>
1020 </widget>
1021+ <packing>
1022+ <property name="expand">False</property>
1023+ <property name="homogeneous">True</property>
1024+ </packing>
1025 </child>
1026 <child>
1027 <widget class="GtkSeparatorToolItem" id="separatortoolitem888">
1028 <property name="visible">True</property>
1029 </widget>
1030+ <packing>
1031+ <property name="expand">False</property>
1032+ </packing>
1033 </child>
1034 <child>
1035 <widget class="GtkRadioToolButton" id="radio_tree">
1036 <property name="visible">True</property>
1037+ <property name="is_important">True</property>
1038 <property name="label" translatable="yes">List</property>
1039 <property name="use_underline">True</property>
1040 <property name="stock_id">gtk-find</property>
1041 <signal name="toggled" handler="on_radio_tree_clicked"/>
1042 </widget>
1043 <packing>
1044+ <property name="expand">False</property>
1045 <property name="homogeneous">True</property>
1046 </packing>
1047 </child>
1048 <child>
1049 <widget class="GtkRadioToolButton" id="radio_form">
1050 <property name="visible">True</property>
1051+ <property name="is_important">True</property>
1052 <property name="label" translatable="yes">Form</property>
1053 <property name="use_underline">True</property>
1054 <property name="stock_id">gtk-new</property>
1055@@ -1332,6 +1150,7 @@
1056 <signal name="clicked" handler="on_radio_form_clicked"/>
1057 </widget>
1058 <packing>
1059+ <property name="expand">False</property>
1060 <property name="homogeneous">True</property>
1061 </packing>
1062 </child>
1063@@ -1344,6 +1163,10 @@
1064 <property name="group">radio_tree</property>
1065 <signal name="clicked" handler="on_radio_calendar_clicked"/>
1066 </widget>
1067+ <packing>
1068+ <property name="expand">False</property>
1069+ <property name="homogeneous">True</property>
1070+ </packing>
1071 </child>
1072 <child>
1073 <widget class="GtkRadioToolButton" id="radio_diagram">
1074@@ -1354,6 +1177,10 @@
1075 <property name="group">radio_tree</property>
1076 <signal name="clicked" handler="on_radio_diagram_clicked"/>
1077 </widget>
1078+ <packing>
1079+ <property name="expand">False</property>
1080+ <property name="homogeneous">True</property>
1081+ </packing>
1082 </child>
1083 <child>
1084 <widget class="GtkRadioToolButton" id="radio_graph">
1085@@ -1365,12 +1192,12 @@
1086 <signal name="clicked" handler="on_radio_graph_clicked"/>
1087 </widget>
1088 <packing>
1089+ <property name="expand">False</property>
1090 <property name="homogeneous">True</property>
1091 </packing>
1092 </child>
1093 <child>
1094 <widget class="GtkRadioToolButton" id="radio_gantt">
1095- <property name="visible">False</property>
1096 <property name="label" translatable="yes">Gantt</property>
1097 <property name="use_underline">True</property>
1098 <property name="stock_id">gtk-justify-right</property>
1099@@ -1378,6 +1205,7 @@
1100 <signal name="clicked" handler="on_radio_gantt_clicked"/>
1101 </widget>
1102 <packing>
1103+ <property name="expand">False</property>
1104 <property name="homogeneous">True</property>
1105 </packing>
1106 </child>
1107@@ -1385,6 +1213,9 @@
1108 <widget class="GtkSeparatorToolItem" id="separatortoolitem9">
1109 <property name="visible">True</property>
1110 </widget>
1111+ <packing>
1112+ <property name="expand">False</property>
1113+ </packing>
1114 </child>
1115 <child>
1116 <widget class="GtkToolButton" id="but_print">
1117@@ -1394,6 +1225,7 @@
1118 <signal name="clicked" handler="on_but_print_clicked"/>
1119 </widget>
1120 <packing>
1121+ <property name="expand">False</property>
1122 <property name="homogeneous">True</property>
1123 </packing>
1124 </child>
1125@@ -1401,12 +1233,14 @@
1126 <widget class="GtkToolButton" id="but_action">
1127 <property name="visible">True</property>
1128 <property name="tooltip" translatable="yes">Launch actions about this resource</property>
1129+ <property name="is_important">True</property>
1130 <property name="label" translatable="yes">Action</property>
1131 <property name="use_underline">True</property>
1132 <property name="stock_id">gtk-execute</property>
1133 <signal name="clicked" handler="on_but_action_clicked"/>
1134 </widget>
1135 <packing>
1136+ <property name="expand">False</property>
1137 <property name="homogeneous">True</property>
1138 </packing>
1139 </child>
1140@@ -1414,16 +1248,24 @@
1141 <widget class="GtkToolButton" id="but_attach">
1142 <property name="visible">True</property>
1143 <property name="tooltip" translatable="yes">Add an attachment to this resource</property>
1144+ <property name="is_important">True</property>
1145 <property name="label" translatable="yes">Attachment</property>
1146 <property name="use_underline">True</property>
1147 <property name="stock_id">gtk-paste</property>
1148 <signal name="clicked" handler="on_but_attach_clicked"/>
1149 </widget>
1150+ <packing>
1151+ <property name="expand">False</property>
1152+ <property name="homogeneous">True</property>
1153+ </packing>
1154 </child>
1155 <child>
1156 <widget class="GtkSeparatorToolItem" id="separatortoolitem10">
1157 <property name="visible">True</property>
1158 </widget>
1159+ <packing>
1160+ <property name="expand">False</property>
1161+ </packing>
1162 </child>
1163 <child>
1164 <widget class="GtkToolButton" id="but_menu">
1165@@ -1436,6 +1278,7 @@
1166 <signal name="clicked" handler="on_but_menu_clicked"/>
1167 </widget>
1168 <packing>
1169+ <property name="expand">False</property>
1170 <property name="homogeneous">True</property>
1171 </packing>
1172 </child>
1173@@ -1443,24 +1286,31 @@
1174 <widget class="GtkSeparatorToolItem" id="separatortoolitem8">
1175 <property name="visible">True</property>
1176 </widget>
1177+ <packing>
1178+ <property name="expand">False</property>
1179+ </packing>
1180 </child>
1181 <child>
1182 <widget class="GtkToolButton" id="but_reload">
1183- <property name="visible">True</property>
1184- <property name="tooltip" translatable="yes">Reload</property>
1185- <property name="label" translatable="yes">Reload</property>
1186- <property name="use_underline">True</property>
1187- <property name="stock_id">gtk-redo</property>
1188- <signal name="clicked" handler="on_form_reload_activate"/>
1189+ <property name="visible">True</property>
1190+ <property name="tooltip" translatable="yes">Reload</property>
1191+ <property name="label" translatable="yes">Reload</property>
1192+ <property name="use_underline">True</property>
1193+ <property name="stock_id">gtk-redo</property>
1194+ <signal name="clicked" handler="on_form_reload_activate"/>
1195 </widget>
1196 <packing>
1197- <property name="expand">False</property>
1198+ <property name="expand">False</property>
1199+ <property name="homogeneous">True</property>
1200 </packing>
1201 </child>
1202 <child>
1203- <widget class="GtkSeparatorToolItem" id="separatortoolitem19">
1204+ <widget class="GtkSeparatorToolItem" id="separatortoolitem19">
1205 <property name="visible">True</property>
1206 </widget>
1207+ <packing>
1208+ <property name="expand">False</property>
1209+ </packing>
1210 </child>
1211 <child>
1212 <widget class="GtkToolButton" id="but_close">
1213@@ -1471,6 +1321,7 @@
1214 </widget>
1215 <packing>
1216 <property name="expand">False</property>
1217+ <property name="homogeneous">True</property>
1218 </packing>
1219 </child>
1220 </widget>
1221@@ -1493,6 +1344,9 @@
1222 <property name="border_width">2</property>
1223 <property name="has_resize_grip">False</property>
1224 </widget>
1225+ <packing>
1226+ <property name="position">0</property>
1227+ </packing>
1228 </child>
1229 <child>
1230 <widget class="GtkStatusbar" id="sb_user_name">
1231@@ -1552,23 +1406,12 @@
1232 </packing>
1233 </child>
1234 <child>
1235- <widget class="GtkButton" id="req_search_but">
1236+ <widget class="GtkImage" id="secure_img">
1237 <property name="visible">True</property>
1238- <property name="can_focus">True</property>
1239- <property name="tooltip" translatable="yes">Read my Requests</property>
1240- <property name="relief">GTK_RELIEF_NONE</property>
1241- <property name="response_id">0</property>
1242- <signal name="clicked" handler="on_read_requests_activate"/>
1243- <child>
1244- <widget class="GtkImage" id="image376">
1245- <property name="visible">True</property>
1246- <property name="stock">gtk-find</property>
1247- </widget>
1248- </child>
1249+ <property name="stock">gtk-dialog-authentication</property>
1250 </widget>
1251 <packing>
1252 <property name="expand">False</property>
1253- <property name="fill">False</property>
1254 <property name="position">6</property>
1255 </packing>
1256 </child>
1257@@ -1576,9 +1419,9 @@
1258 <widget class="GtkButton" id="request_new_but">
1259 <property name="visible">True</property>
1260 <property name="can_focus">True</property>
1261+ <property name="receives_default">False</property>
1262 <property name="tooltip" translatable="yes">Send a new request</property>
1263- <property name="relief">GTK_RELIEF_NONE</property>
1264- <property name="response_id">0</property>
1265+ <property name="relief">none</property>
1266 <signal name="clicked" handler="on_send_request_activate"/>
1267 <child>
1268 <widget class="GtkImage" id="image377">
1269@@ -1594,12 +1437,23 @@
1270 </packing>
1271 </child>
1272 <child>
1273- <widget class="GtkImage" id="secure_img">
1274+ <widget class="GtkButton" id="req_search_but">
1275 <property name="visible">True</property>
1276- <property name="stock">gtk-dialog-authentication</property>
1277+ <property name="can_focus">True</property>
1278+ <property name="receives_default">False</property>
1279+ <property name="tooltip" translatable="yes">Read my Requests</property>
1280+ <property name="relief">none</property>
1281+ <signal name="clicked" handler="on_read_requests_activate"/>
1282+ <child>
1283+ <widget class="GtkImage" id="image376">
1284+ <property name="visible">True</property>
1285+ <property name="stock">gtk-find</property>
1286+ </widget>
1287+ </child>
1288 </widget>
1289 <packing>
1290 <property name="expand">False</property>
1291+ <property name="fill">False</property>
1292 <property name="position">6</property>
1293 </packing>
1294 </child>
1295@@ -1607,7 +1461,7 @@
1296 <packing>
1297 <property name="expand">False</property>
1298 <property name="fill">False</property>
1299- <property name="pack_type">GTK_PACK_END</property>
1300+ <property name="pack_type">end</property>
1301 <property name="position">1</property>
1302 </packing>
1303 </child>
1304@@ -1637,8 +1491,8 @@
1305 <child>
1306 <widget class="GtkToolbar" id="tree_toolbar">
1307 <property name="visible">True</property>
1308- <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
1309- <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</property>
1310+ <property name="orientation">vertical</property>
1311+ <property name="toolbar_style">both-horiz</property>
1312 </widget>
1313 <packing>
1314 <property name="resize">True</property>
1315@@ -1649,12 +1503,12 @@
1316 <widget class="GtkScrolledWindow" id="scrolledwindow3">
1317 <property name="visible">True</property>
1318 <property name="can_focus">True</property>
1319- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1320- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1321+ <property name="hscrollbar_policy">automatic</property>
1322+ <property name="vscrollbar_policy">automatic</property>
1323 <child>
1324 <widget class="GtkViewport" id="viewport1">
1325 <property name="visible">True</property>
1326- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
1327+ <property name="shadow_type">etched-in</property>
1328 <child>
1329 <widget class="GtkVBox" id="vbox13">
1330 <property name="visible">True</property>
1331@@ -1664,7 +1518,7 @@
1332 <child>
1333 <widget class="GtkToolbar" id="toolbar10">
1334 <property name="visible">True</property>
1335- <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
1336+ <property name="toolbar_style">icons</property>
1337 <property name="show_arrow">False</property>
1338 <child>
1339 <widget class="GtkToolButton" id="tbsc">
1340@@ -1673,23 +1527,32 @@
1341 <property name="use_underline">True</property>
1342 <signal name="clicked" handler="on_tbsc_clicked"/>
1343 </widget>
1344+ <packing>
1345+ <property name="expand">False</property>
1346+ <property name="homogeneous">True</property>
1347+ </packing>
1348 </child>
1349 </widget>
1350 <packing>
1351 <property name="expand">False</property>
1352 <property name="fill">False</property>
1353+ <property name="position">0</property>
1354 </packing>
1355 </child>
1356 <child>
1357 <widget class="GtkToolbar" id="toolbar1">
1358 <property name="visible">True</property>
1359- <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
1360+ <property name="toolbar_style">icons</property>
1361 <child>
1362 <widget class="GtkToolButton" id="button4">
1363 <property name="visible">True</property>
1364 <property name="stock_id">gtk-add</property>
1365 <signal name="clicked" handler="on_but_sc_add_clicked"/>
1366 </widget>
1367+ <packing>
1368+ <property name="expand">False</property>
1369+ <property name="homogeneous">True</property>
1370+ </packing>
1371 </child>
1372 <child>
1373 <widget class="GtkToolButton" id="button6">
1374@@ -1698,6 +1561,7 @@
1375 <signal name="clicked" handler="on_but_sc_del_clicked"/>
1376 </widget>
1377 <packing>
1378+ <property name="expand">False</property>
1379 <property name="homogeneous">True</property>
1380 </packing>
1381 </child>
1382@@ -1705,6 +1569,9 @@
1383 <widget class="GtkSeparatorToolItem" id="separatortoolitem7">
1384 <property name="visible">True</property>
1385 </widget>
1386+ <packing>
1387+ <property name="expand">False</property>
1388+ </packing>
1389 </child>
1390 <child>
1391 <widget class="GtkToolButton" id="button7">
1392@@ -1713,6 +1580,7 @@
1393 <signal name="clicked" handler="on_but_expand_collapse_clicked"/>
1394 </widget>
1395 <packing>
1396+ <property name="expand">False</property>
1397 <property name="homogeneous">True</property>
1398 </packing>
1399 </child>
1400@@ -1724,6 +1592,7 @@
1401 </widget>
1402 <packing>
1403 <property name="expand">False</property>
1404+ <property name="position">0</property>
1405 </packing>
1406 </child>
1407 <child>
1408@@ -1748,6 +1617,9 @@
1409 </packing>
1410 </child>
1411 </widget>
1412+ <packing>
1413+ <property name="position">0</property>
1414+ </packing>
1415 </child>
1416 </widget>
1417 <packing>
1418@@ -1759,8 +1631,8 @@
1419 <widget class="GtkScrolledWindow" id="main_tree_sw">
1420 <property name="visible">True</property>
1421 <property name="can_focus">True</property>
1422- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1423- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1424+ <property name="hscrollbar_policy">automatic</property>
1425+ <property name="vscrollbar_policy">automatic</property>
1426 <child>
1427 <placeholder/>
1428 </child>
1429@@ -1771,13 +1643,16 @@
1430 </packing>
1431 </child>
1432 </widget>
1433+ <packing>
1434+ <property name="position">0</property>
1435+ </packing>
1436 </child>
1437 </widget>
1438 </child>
1439 </widget>
1440 <widget class="GtkWindow" id="win_form">
1441 <property name="visible">True</property>
1442- <property name="extension_events">GDK_EXTENSION_EVENTS_ALL</property>
1443+ <property name="extension_events">all</property>
1444 <property name="title" translatable="yes">OpenERP - Forms</property>
1445 <child>
1446 <widget class="GtkVBox" id="win_form_container">
1447@@ -1797,6 +1672,9 @@
1448 <property name="border_width">1</property>
1449 <property name="has_resize_grip">False</property>
1450 </widget>
1451+ <packing>
1452+ <property name="position">0</property>
1453+ </packing>
1454 </child>
1455 <child>
1456 <widget class="GtkLabel" id="label37">
1457@@ -1824,7 +1702,7 @@
1458 <packing>
1459 <property name="expand">False</property>
1460 <property name="fill">False</property>
1461- <property name="pack_type">GTK_PACK_END</property>
1462+ <property name="pack_type">end</property>
1463 <property name="position">1</property>
1464 </packing>
1465 </child>
1466@@ -1835,8 +1713,8 @@
1467 <property name="width_request">430</property>
1468 <property name="height_request">360</property>
1469 <property name="title" translatable="yes">OpenERP - About</property>
1470- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
1471- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
1472+ <property name="window_position">center-on-parent</property>
1473+ <property name="type_hint">dialog</property>
1474 <child internal-child="vbox">
1475 <widget class="GtkVBox" id="dialog-vbox2">
1476 <property name="visible">True</property>
1477@@ -1851,13 +1729,14 @@
1478 <property name="label" translatable="yes">&lt;b&gt;About OpenERP&lt;/b&gt;
1479 &lt;i&gt;The most advanced Open Source ERP &amp;amp; CRM !&lt;/i&gt;</property>
1480 <property name="use_markup">True</property>
1481- <property name="justify">GTK_JUSTIFY_CENTER</property>
1482+ <property name="justify">center</property>
1483 <property name="wrap">True</property>
1484 </widget>
1485 <packing>
1486 <property name="expand">False</property>
1487 <property name="fill">False</property>
1488 <property name="padding">2</property>
1489+ <property name="position">0</property>
1490 </packing>
1491 </child>
1492 <child>
1493@@ -1878,15 +1757,15 @@
1494 <widget class="GtkScrolledWindow" id="scrolledwindow14">
1495 <property name="visible">True</property>
1496 <property name="can_focus">True</property>
1497- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1498- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1499- <property name="window_placement">GTK_CORNER_BOTTOM_LEFT</property>
1500+ <property name="hscrollbar_policy">automatic</property>
1501+ <property name="vscrollbar_policy">automatic</property>
1502+ <property name="window_placement">bottom-left</property>
1503 <child>
1504 <widget class="GtkTextView" id="textview2">
1505 <property name="visible">True</property>
1506 <property name="can_focus">True</property>
1507 <property name="editable">False</property>
1508- <property name="justification">GTK_JUSTIFY_CENTER</property>
1509+ <property name="justification">center</property>
1510 <property name="text" translatable="yes">
1511 OpenERP - GTK Client - v%s
1512
1513@@ -1911,6 +1790,9 @@
1514 <property name="visible">True</property>
1515 <property name="stock">gtk-network</property>
1516 </widget>
1517+ <packing>
1518+ <property name="position">0</property>
1519+ </packing>
1520 </child>
1521 <child>
1522 <widget class="GtkLabel" id="label98">
1523@@ -1926,22 +1808,22 @@
1524 </child>
1525 </widget>
1526 <packing>
1527+ <property name="tab_fill">False</property>
1528 <property name="type">tab</property>
1529- <property name="tab_fill">False</property>
1530 </packing>
1531 </child>
1532 <child>
1533 <widget class="GtkScrolledWindow" id="scrolledwindow15">
1534 <property name="visible">True</property>
1535 <property name="can_focus">True</property>
1536- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1537- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1538+ <property name="hscrollbar_policy">automatic</property>
1539+ <property name="vscrollbar_policy">automatic</property>
1540 <child>
1541 <widget class="GtkTextView" id="textview3">
1542 <property name="visible">True</property>
1543 <property name="can_focus">True</property>
1544 <property name="editable">False</property>
1545- <property name="justification">GTK_JUSTIFY_CENTER</property>
1546+ <property name="justification">center</property>
1547 <property name="accepts_tab">False</property>
1548 <property name="text" translatable="yes">
1549 (c) 2003-TODAY - Tiny sprl
1550@@ -1970,6 +1852,9 @@
1551 <property name="visible">True</property>
1552 <property name="stock">gtk-home</property>
1553 </widget>
1554+ <packing>
1555+ <property name="position">0</property>
1556+ </packing>
1557 </child>
1558 <child>
1559 <widget class="GtkLabel" id="label99">
1560@@ -1985,9 +1870,9 @@
1561 </child>
1562 </widget>
1563 <packing>
1564- <property name="type">tab</property>
1565 <property name="position">1</property>
1566 <property name="tab_fill">False</property>
1567+ <property name="type">tab</property>
1568 </packing>
1569 </child>
1570 </widget>
1571@@ -2003,22 +1888,29 @@
1572 <child internal-child="action_area">
1573 <widget class="GtkHButtonBox" id="dialog-action_area2">
1574 <property name="visible">True</property>
1575- <property name="layout_style">GTK_BUTTONBOX_END</property>
1576+ <property name="layout_style">end</property>
1577 <child>
1578 <widget class="GtkButton" id="okbutton2">
1579+ <property name="label">gtk-close</property>
1580+ <property name="response_id">-5</property>
1581 <property name="visible">True</property>
1582 <property name="can_focus">True</property>
1583 <property name="can_default">True</property>
1584- <property name="label">gtk-close</property>
1585+ <property name="receives_default">False</property>
1586 <property name="use_stock">True</property>
1587- <property name="response_id">-5</property>
1588 <signal name="pressed" handler="on_but_ok_pressed"/>
1589 </widget>
1590+ <packing>
1591+ <property name="expand">False</property>
1592+ <property name="fill">False</property>
1593+ <property name="position">0</property>
1594+ </packing>
1595 </child>
1596 </widget>
1597 <packing>
1598 <property name="expand">False</property>
1599- <property name="pack_type">GTK_PACK_END</property>
1600+ <property name="pack_type">end</property>
1601+ <property name="position">0</property>
1602 </packing>
1603 </child>
1604 </widget>
1605@@ -2031,7 +1923,7 @@
1606 <widget class="GtkScrolledWindow" id="scrolledwindow44">
1607 <property name="visible">True</property>
1608 <property name="can_focus">True</property>
1609- <property name="shadow_type">GTK_SHADOW_IN</property>
1610+ <property name="shadow_type">in</property>
1611 <child>
1612 <widget class="GtkViewport" id="viewport5">
1613 <property name="visible">True</property>
1614@@ -2047,7 +1939,7 @@
1615 <child>
1616 <widget class="GtkHBox" id="toolbar11">
1617 <property name="visible">True</property>
1618- <child>
1619+ <child>
1620 <widget class="GtkToggleToolButton" id="toggle_underline">
1621 <property name="visible">True</property>
1622 <property name="stock_id">gtk-underline</property>
1623@@ -2055,6 +1947,7 @@
1624 </widget>
1625 <packing>
1626 <property name="expand">False</property>
1627+ <property name="position">0</property>
1628 </packing>
1629 </child>
1630 <child>
1631@@ -2065,6 +1958,7 @@
1632 </widget>
1633 <packing>
1634 <property name="expand">False</property>
1635+ <property name="position">1</property>
1636 </packing>
1637 </child>
1638 <child>
1639@@ -2075,9 +1969,10 @@
1640 </widget>
1641 <packing>
1642 <property name="expand">False</property>
1643+ <property name="position">2</property>
1644 </packing>
1645 </child>
1646- <child>
1647+ <child>
1648 <widget class="GtkToggleToolButton" id="toggle_strikethrough">
1649 <property name="visible">True</property>
1650 <property name="stock_id">gtk-strikethrough</property>
1651@@ -2085,6 +1980,7 @@
1652 </widget>
1653 <packing>
1654 <property name="expand">False</property>
1655+ <property name="position">3</property>
1656 </packing>
1657 </child>
1658 <child>
1659@@ -2095,6 +1991,7 @@
1660 </widget>
1661 <packing>
1662 <property name="expand">False</property>
1663+ <property name="position">4</property>
1664 </packing>
1665 </child>
1666 <child>
1667@@ -2106,6 +2003,7 @@
1668 </widget>
1669 <packing>
1670 <property name="expand">False</property>
1671+ <property name="position">5</property>
1672 </packing>
1673 </child>
1674 <child>
1675@@ -2117,6 +2015,7 @@
1676 </widget>
1677 <packing>
1678 <property name="expand">False</property>
1679+ <property name="position">6</property>
1680 </packing>
1681 </child>
1682 <child>
1683@@ -2128,46 +2027,25 @@
1684 </widget>
1685 <packing>
1686 <property name="expand">False</property>
1687- </packing>
1688- </child>
1689- <child>
1690- <widget class="GtkToolbar" id="toolbar111">
1691- <property name="visible">True</property>
1692- <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
1693- <child>
1694- <widget class="GtkFontButton" id="font_button">
1695- <property name="visible">True</property>
1696- <property name="can_focus">True</property>
1697- <signal name="font-set" handler="on_font_button_clicked"/>
1698- </widget>
1699- <packing>
1700- <property name="padding">0</property>
1701- <property name="expand">False</property>
1702- <property name="fill">False</property>
1703- </packing>
1704- </child>
1705- <child>
1706- <widget class="GtkColorButton" id="color_button">
1707- <property name="visible">True</property>
1708- <property name="can_focus">True</property>
1709- <signal name="color-set" handler="on_color_button_clicked"/>
1710- </widget>
1711- <packing>
1712- <property name="padding">0</property>
1713- <property name="expand">False</property>
1714- <property name="fill">False</property>
1715- </packing>
1716- </child>
1717- </widget>
1718- <packing>
1719- <property name="expand">False</property>
1720- <property name="fill">False</property>
1721- </packing>
1722- </child>
1723+ <property name="position">7</property>
1724+ </packing>
1725+ </child>
1726+ <child>
1727+ <widget class="GtkToolbar" id="toolbar111">
1728+ <property name="visible">True</property>
1729+ <property name="toolbar_style">icons</property>
1730+ </widget>
1731+ <packing>
1732+ <property name="expand">False</property>
1733+ <property name="fill">False</property>
1734+ <property name="position">8</property>
1735+ </packing>
1736+ </child>
1737 </widget>
1738 <packing>
1739 <property name="expand">False</property>
1740 <property name="fill">False</property>
1741+ <property name="position">0</property>
1742 </packing>
1743 </child>
1744 <child>
1745@@ -2177,8 +2055,8 @@
1746 <widget class="GtkScrolledWindow" id="scrolledwindow31">
1747 <property name="visible">True</property>
1748 <property name="can_focus">True</property>
1749- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1750- <property name="window_placement">GTK_CORNER_BOTTOM_LEFT</property>
1751+ <property name="hscrollbar_policy">automatic</property>
1752+ <property name="window_placement">bottom-left</property>
1753 <child>
1754 <widget class="GtkTextView" id="widget_textbox_tag_tv">
1755 <property name="visible">True</property>
1756@@ -2207,8 +2085,8 @@
1757 <property name="height_request">150</property>
1758 <property name="title" translatable="yes">OpenERP - Confirmation</property>
1759 <property name="modal">True</property>
1760- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
1761- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
1762+ <property name="window_position">center-on-parent</property>
1763+ <property name="type_hint">dialog</property>
1764 <child internal-child="vbox">
1765 <widget class="GtkVBox" id="dialog-vbox4">
1766 <property name="visible">True</property>
1767@@ -2221,11 +2099,12 @@
1768 <property name="xpad">15</property>
1769 <property name="ypad">15</property>
1770 <property name="stock">gtk-dialog-question</property>
1771- <property name="icon_size">6</property>
1772+ <property name="icon-size">6</property>
1773 </widget>
1774 <packing>
1775 <property name="expand">False</property>
1776 <property name="fill">False</property>
1777+ <property name="position">0</property>
1778 </packing>
1779 </child>
1780 <child>
1781@@ -2233,12 +2112,9 @@
1782 <property name="visible">True</property>
1783 <property name="label">Are you sure?</property>
1784 <property name="wrap">True</property>
1785- <property name="single_line_mode">False</property>
1786 </widget>
1787 <packing>
1788 <property name="position">1</property>
1789- <property name="expand">True</property>
1790- <property name="fill">True</property>
1791 </packing>
1792 </child>
1793 </widget>
1794@@ -2250,34 +2126,44 @@
1795 <child internal-child="action_area">
1796 <widget class="GtkHButtonBox" id="dialog-action_area4">
1797 <property name="visible">True</property>
1798- <property name="layout_style">GTK_BUTTONBOX_END</property>
1799+ <property name="layout_style">end</property>
1800 <child>
1801 <widget class="GtkButton" id="cancelbutton2">
1802+ <property name="label">gtk-cancel</property>
1803+ <property name="response_id">-6</property>
1804 <property name="visible">True</property>
1805 <property name="can_focus">True</property>
1806 <property name="can_default">True</property>
1807- <property name="label">gtk-cancel</property>
1808+ <property name="receives_default">False</property>
1809 <property name="use_stock">True</property>
1810- <property name="response_id">-6</property>
1811 </widget>
1812+ <packing>
1813+ <property name="expand">False</property>
1814+ <property name="fill">False</property>
1815+ <property name="position">0</property>
1816+ </packing>
1817 </child>
1818 <child>
1819 <widget class="GtkButton" id="okbutton4">
1820+ <property name="label">gtk-ok</property>
1821+ <property name="response_id">-5</property>
1822 <property name="visible">True</property>
1823 <property name="can_focus">True</property>
1824 <property name="can_default">True</property>
1825- <property name="label">gtk-ok</property>
1826+ <property name="receives_default">False</property>
1827 <property name="use_stock">True</property>
1828- <property name="response_id">-5</property>
1829 </widget>
1830 <packing>
1831+ <property name="expand">False</property>
1832+ <property name="fill">False</property>
1833 <property name="position">1</property>
1834 </packing>
1835 </child>
1836 </widget>
1837 <packing>
1838 <property name="expand">False</property>
1839- <property name="pack_type">GTK_PACK_END</property>
1840+ <property name="pack_type">end</property>
1841+ <property name="position">0</property>
1842 </packing>
1843 </child>
1844 </widget>
1845@@ -2285,10 +2171,10 @@
1846 </widget>
1847 <widget class="GtkDialog" id="win_selection">
1848 <property name="title" translatable="yes">OpenERP - Selection</property>
1849- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
1850+ <property name="window_position">center-on-parent</property>
1851 <property name="default_width">400</property>
1852 <property name="default_height">400</property>
1853- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
1854+ <property name="type_hint">dialog</property>
1855 <child internal-child="vbox">
1856 <widget class="GtkVBox" id="dialog-vbox6">
1857 <property name="visible">True</property>
1858@@ -2303,6 +2189,7 @@
1859 <packing>
1860 <property name="expand">False</property>
1861 <property name="fill">False</property>
1862+ <property name="position">0</property>
1863 </packing>
1864 </child>
1865 <child>
1866@@ -2319,8 +2206,8 @@
1867 <widget class="GtkScrolledWindow" id="scrolledwindow5">
1868 <property name="visible">True</property>
1869 <property name="can_focus">True</property>
1870- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1871- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1872+ <property name="hscrollbar_policy">automatic</property>
1873+ <property name="vscrollbar_policy">automatic</property>
1874 <child>
1875 <widget class="GtkTreeView" id="win_sel_tree">
1876 <property name="visible">True</property>
1877@@ -2341,36 +2228,46 @@
1878 <child internal-child="action_area">
1879 <widget class="GtkHButtonBox" id="dialog-action_area8">
1880 <property name="visible">True</property>
1881- <property name="layout_style">GTK_BUTTONBOX_END</property>
1882+ <property name="layout_style">end</property>
1883 <child>
1884 <widget class="GtkButton" id="cancelbutton5">
1885+ <property name="label">gtk-cancel</property>
1886+ <property name="response_id">-6</property>
1887 <property name="visible">True</property>
1888 <property name="can_focus">True</property>
1889 <property name="can_default">True</property>
1890- <property name="label">gtk-cancel</property>
1891+ <property name="receives_default">False</property>
1892 <property name="use_stock">True</property>
1893- <property name="response_id">-6</property>
1894 <signal name="clicked" handler="on_cancelbutton5_clicked"/>
1895 </widget>
1896+ <packing>
1897+ <property name="expand">False</property>
1898+ <property name="fill">False</property>
1899+ <property name="position">0</property>
1900+ </packing>
1901 </child>
1902 <child>
1903 <widget class="GtkButton" id="okbutton6">
1904+ <property name="label">gtk-ok</property>
1905+ <property name="response_id">-5</property>
1906 <property name="visible">True</property>
1907 <property name="can_focus">True</property>
1908 <property name="can_default">True</property>
1909- <property name="label">gtk-ok</property>
1910+ <property name="receives_default">False</property>
1911 <property name="use_stock">True</property>
1912- <property name="response_id">-5</property>
1913 <signal name="clicked" handler="on_okbutton6_clicked"/>
1914 </widget>
1915 <packing>
1916+ <property name="expand">False</property>
1917+ <property name="fill">False</property>
1918 <property name="position">1</property>
1919 </packing>
1920 </child>
1921 </widget>
1922 <packing>
1923 <property name="expand">False</property>
1924- <property name="pack_type">GTK_PACK_END</property>
1925+ <property name="pack_type">end</property>
1926+ <property name="position">0</property>
1927 </packing>
1928 </child>
1929 </widget>
1930@@ -2379,7 +2276,7 @@
1931 <widget class="GtkDialog" id="win_dialog">
1932 <property name="visible">True</property>
1933 <property name="title" translatable="yes">OpenERP - Dialog</property>
1934- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
1935+ <property name="type_hint">dialog</property>
1936 <child internal-child="vbox">
1937 <widget class="GtkVBox" id="dia_vbox_main">
1938 <property name="visible">True</property>
1939@@ -2389,11 +2286,12 @@
1940 <child internal-child="action_area">
1941 <widget class="GtkHButtonBox" id="dia_hbox_button">
1942 <property name="visible">True</property>
1943- <property name="layout_style">GTK_BUTTONBOX_END</property>
1944+ <property name="layout_style">end</property>
1945 </widget>
1946 <packing>
1947 <property name="expand">False</property>
1948- <property name="pack_type">GTK_PACK_END</property>
1949+ <property name="pack_type">end</property>
1950+ <property name="position">0</property>
1951 </packing>
1952 </child>
1953 </widget>
1954@@ -2403,8 +2301,8 @@
1955 <property name="width_request">440</property>
1956 <property name="height_request">268</property>
1957 <property name="title" translatable="yes">OpenERP, Field Preference target</property>
1958- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
1959- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
1960+ <property name="window_position">center-on-parent</property>
1961+ <property name="type_hint">dialog</property>
1962 <child internal-child="vbox">
1963 <widget class="GtkVBox" id="dialog-vbox8">
1964 <property name="visible">True</property>
1965@@ -2431,25 +2329,26 @@
1966 <property name="homogeneous">True</property>
1967 <child>
1968 <widget class="GtkRadioButton" id="radio_user_pref">
1969- <property name="visible">True</property>
1970- <property name="can_focus">True</property>
1971 <property name="label" translatable="yes">_only for you</property>
1972+ <property name="visible">True</property>
1973+ <property name="can_focus">True</property>
1974+ <property name="receives_default">False</property>
1975 <property name="use_underline">True</property>
1976- <property name="response_id">0</property>
1977 <property name="draw_indicator">True</property>
1978 </widget>
1979 <packing>
1980 <property name="expand">False</property>
1981 <property name="fill">False</property>
1982+ <property name="position">0</property>
1983 </packing>
1984 </child>
1985 <child>
1986 <widget class="GtkRadioButton" id="radiobutton2">
1987- <property name="visible">True</property>
1988- <property name="can_focus">True</property>
1989 <property name="label" translatable="yes">for _all users</property>
1990+ <property name="visible">True</property>
1991+ <property name="can_focus">True</property>
1992+ <property name="receives_default">False</property>
1993 <property name="use_underline">True</property>
1994- <property name="response_id">0</property>
1995 <property name="active">True</property>
1996 <property name="draw_indicator">True</property>
1997 <property name="group">radio_user_pref</property>
1998@@ -2523,7 +2422,7 @@
1999 <property name="xalign">1</property>
2000 <property name="label" translatable="yes">Field _Name:</property>
2001 <property name="use_underline">True</property>
2002- <property name="justify">GTK_JUSTIFY_RIGHT</property>
2003+ <property name="justify">right</property>
2004 <property name="mnemonic_widget">ent_field</property>
2005 </widget>
2006 <packing>
2007@@ -2537,7 +2436,7 @@
2008 <property name="xalign">1</property>
2009 <property name="label" translatable="yes">_Domain:</property>
2010 <property name="use_underline">True</property>
2011- <property name="justify">GTK_JUSTIFY_RIGHT</property>
2012+ <property name="justify">right</property>
2013 <property name="mnemonic_widget">ent_domain</property>
2014 </widget>
2015 <packing>
2016@@ -2613,34 +2512,44 @@
2017 <child internal-child="action_area">
2018 <widget class="GtkHButtonBox" id="dialog-action_area10">
2019 <property name="visible">True</property>
2020- <property name="layout_style">GTK_BUTTONBOX_END</property>
2021+ <property name="layout_style">end</property>
2022 <child>
2023 <widget class="GtkButton" id="cancelbutton7">
2024+ <property name="label">gtk-cancel</property>
2025+ <property name="response_id">-6</property>
2026 <property name="visible">True</property>
2027 <property name="can_focus">True</property>
2028 <property name="can_default">True</property>
2029- <property name="label">gtk-cancel</property>
2030+ <property name="receives_default">False</property>
2031 <property name="use_stock">True</property>
2032- <property name="response_id">-6</property>
2033 </widget>
2034+ <packing>
2035+ <property name="expand">False</property>
2036+ <property name="fill">False</property>
2037+ <property name="position">0</property>
2038+ </packing>
2039 </child>
2040 <child>
2041 <widget class="GtkButton" id="okbutton8">
2042+ <property name="label">gtk-ok</property>
2043+ <property name="response_id">-5</property>
2044 <property name="visible">True</property>
2045 <property name="can_focus">True</property>
2046 <property name="can_default">True</property>
2047- <property name="label">gtk-ok</property>
2048+ <property name="receives_default">False</property>
2049 <property name="use_stock">True</property>
2050- <property name="response_id">-5</property>
2051 </widget>
2052 <packing>
2053+ <property name="expand">False</property>
2054+ <property name="fill">False</property>
2055 <property name="position">1</property>
2056 </packing>
2057 </child>
2058 </widget>
2059 <packing>
2060 <property name="expand">False</property>
2061- <property name="pack_type">GTK_PACK_END</property>
2062+ <property name="pack_type">end</property>
2063+ <property name="position">0</property>
2064 </packing>
2065 </child>
2066 </widget>
2067@@ -2650,8 +2559,8 @@
2068 <property name="width_request">723</property>
2069 <property name="height_request">569</property>
2070 <property name="title" translatable="yes">OpenERP - Export to CSV</property>
2071- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
2072- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
2073+ <property name="window_position">center-on-parent</property>
2074+ <property name="type_hint">dialog</property>
2075 <child internal-child="vbox">
2076 <widget class="GtkVBox" id="dialog-vbox9">
2077 <property name="visible">True</property>
2078@@ -2673,7 +2582,7 @@
2079 <widget class="GtkButton" id="button85">
2080 <property name="visible">True</property>
2081 <property name="can_focus">True</property>
2082- <property name="response_id">0</property>
2083+ <property name="receives_default">False</property>
2084 <signal name="clicked" handler="on_but_predefined_clicked"/>
2085 <child>
2086 <widget class="GtkAlignment" id="alignment46">
2087@@ -2692,6 +2601,7 @@
2088 <packing>
2089 <property name="expand">False</property>
2090 <property name="fill">False</property>
2091+ <property name="position">0</property>
2092 </packing>
2093 </child>
2094 <child>
2095@@ -2699,7 +2609,7 @@
2096 <property name="visible">True</property>
2097 <property name="label" translatable="yes">Save List</property>
2098 <property name="use_underline">True</property>
2099- <property name="justify">GTK_JUSTIFY_CENTER</property>
2100+ <property name="justify">center</property>
2101 </widget>
2102 <packing>
2103 <property name="expand">False</property>
2104@@ -2715,13 +2625,14 @@
2105 <packing>
2106 <property name="expand">False</property>
2107 <property name="fill">False</property>
2108+ <property name="position">0</property>
2109 </packing>
2110 </child>
2111 <child>
2112 <widget class="GtkButton" id="button11">
2113 <property name="visible">True</property>
2114 <property name="can_focus">True</property>
2115- <property name="response_id">0</property>
2116+ <property name="receives_default">False</property>
2117 <signal name="clicked" handler="on_but_delpredefined_clicked"/>
2118 <child>
2119 <widget class="GtkAlignment" id="alignment1">
2120@@ -2740,6 +2651,7 @@
2121 <packing>
2122 <property name="expand">False</property>
2123 <property name="fill">False</property>
2124+ <property name="position">0</property>
2125 </packing>
2126 </child>
2127 <child>
2128@@ -2747,7 +2659,7 @@
2129 <property name="visible">True</property>
2130 <property name="label" translatable="yes">Remove List</property>
2131 <property name="use_underline">True</property>
2132- <property name="justify">GTK_JUSTIFY_CENTER</property>
2133+ <property name="justify">center</property>
2134 </widget>
2135 <packing>
2136 <property name="expand">False</property>
2137@@ -2767,6 +2679,9 @@
2138 </packing>
2139 </child>
2140 </widget>
2141+ <packing>
2142+ <property name="position">0</property>
2143+ </packing>
2144 </child>
2145 <child>
2146 <widget class="GtkFrame" id="frame19">
2147@@ -2774,7 +2689,7 @@
2148 <property name="visible">True</property>
2149 <property name="border_width">2</property>
2150 <property name="label_xalign">0</property>
2151- <property name="shadow_type">GTK_SHADOW_NONE</property>
2152+ <property name="shadow_type">none</property>
2153 <child>
2154 <widget class="GtkAlignment" id="alignment45">
2155 <property name="visible">True</property>
2156@@ -2784,7 +2699,7 @@
2157 <property name="visible">True</property>
2158 <property name="can_focus">True</property>
2159 <property name="border_width">2</property>
2160- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
2161+ <property name="hscrollbar_policy">automatic</property>
2162 <child>
2163 <widget class="GtkViewport" id="predefined_exports">
2164 <property name="visible">True</property>
2165@@ -2828,50 +2743,7 @@
2166 <packing>
2167 <property name="expand">False</property>
2168 <property name="fill">False</property>
2169- </packing>
2170- </child>
2171-
2172- <child>
2173- <widget class="GtkFrame" id="frame100">
2174- <property name="visible">True</property>
2175- <property name="border_width">2</property>
2176- <property name="label_xalign">0</property>
2177- <child>
2178- <widget class="GtkHBox" id="hbox100">
2179- <property name="visible">True</property>
2180- <child>
2181- <widget class="GtkCheckButton" id="import_compatible">
2182- <property name="visible">True</property>
2183- <property name="can_focus">True</property>
2184- <property name="label" translatable="yes">Import Compatible</property>
2185- <property name="use_underline">True</property>
2186- <property name="response_id">0</property>
2187- <property name="draw_indicator">True</property>
2188- </widget>
2189- <packing>
2190- <property name="expand">False</property>
2191- <property name="fill">False</property>
2192- <property name="position">2</property>
2193- </packing>
2194- </child>
2195- </widget>
2196- </child>
2197- <child>
2198- <widget class="GtkLabel" id="label100">
2199- <property name="visible">True</property>
2200- <property name="label" translatable="yes">&lt;b&gt;Select an Option to Export&lt;/b&gt;</property>
2201- <property name="use_markup">True</property>
2202- <property name="use_underline">True</property>
2203- </widget>
2204- <packing>
2205- <property name="type">label_item</property>
2206- </packing>
2207- </child>
2208- </widget>
2209- <packing>
2210- <property name="expand">False</property>
2211- <property name="fill">False</property>
2212- <property name="position">2</property>
2213+ <property name="position">0</property>
2214 </packing>
2215 </child>
2216 <child>
2217@@ -2881,7 +2753,7 @@
2218 <widget class="GtkFrame" id="frame3">
2219 <property name="visible">True</property>
2220 <property name="label_xalign">0</property>
2221- <property name="shadow_type">GTK_SHADOW_NONE</property>
2222+ <property name="shadow_type">none</property>
2223 <child>
2224 <widget class="GtkAlignment" id="alignment6">
2225 <property name="visible">True</property>
2226@@ -2890,7 +2762,7 @@
2227 <widget class="GtkScrolledWindow" id="scrolledwindow10">
2228 <property name="visible">True</property>
2229 <property name="can_focus">True</property>
2230- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
2231+ <property name="hscrollbar_policy">automatic</property>
2232 <child>
2233 <widget class="GtkViewport" id="exp_vp1">
2234 <property name="visible">True</property>
2235@@ -2914,6 +2786,9 @@
2236 </packing>
2237 </child>
2238 </widget>
2239+ <packing>
2240+ <property name="position">0</property>
2241+ </packing>
2242 </child>
2243 <child>
2244 <widget class="GtkVBox" id="vbox25">
2245@@ -2925,7 +2800,7 @@
2246 <widget class="GtkButton" id="but_select1">
2247 <property name="visible">True</property>
2248 <property name="can_focus">True</property>
2249- <property name="response_id">0</property>
2250+ <property name="receives_default">False</property>
2251 <signal name="clicked" handler="on_but_select_clicked"/>
2252 <child>
2253 <widget class="GtkAlignment" id="alignment8">
2254@@ -2944,6 +2819,7 @@
2255 <packing>
2256 <property name="expand">False</property>
2257 <property name="fill">False</property>
2258+ <property name="position">0</property>
2259 </packing>
2260 </child>
2261 <child>
2262@@ -2966,13 +2842,14 @@
2263 <packing>
2264 <property name="expand">False</property>
2265 <property name="fill">False</property>
2266+ <property name="position">0</property>
2267 </packing>
2268 </child>
2269 <child>
2270 <widget class="GtkButton" id="but_unselect1">
2271 <property name="visible">True</property>
2272 <property name="can_focus">True</property>
2273- <property name="response_id">0</property>
2274+ <property name="receives_default">False</property>
2275 <signal name="clicked" handler="on_but_unselect_clicked"/>
2276 <child>
2277 <widget class="GtkAlignment" id="alignment9">
2278@@ -2991,6 +2868,7 @@
2279 <packing>
2280 <property name="expand">False</property>
2281 <property name="fill">False</property>
2282+ <property name="position">0</property>
2283 </packing>
2284 </child>
2285 <child>
2286@@ -3020,7 +2898,7 @@
2287 <widget class="GtkButton" id="but_unselect_all">
2288 <property name="visible">True</property>
2289 <property name="can_focus">True</property>
2290- <property name="response_id">0</property>
2291+ <property name="receives_default">False</property>
2292 <signal name="clicked" handler="on_but_unselect_all_clicked"/>
2293 <child>
2294 <widget class="GtkAlignment" id="alignment10">
2295@@ -3039,6 +2917,7 @@
2296 <packing>
2297 <property name="expand">False</property>
2298 <property name="fill">False</property>
2299+ <property name="position">0</property>
2300 </packing>
2301 </child>
2302 <child>
2303@@ -3074,7 +2953,7 @@
2304 <widget class="GtkFrame" id="frame4">
2305 <property name="visible">True</property>
2306 <property name="label_xalign">0</property>
2307- <property name="shadow_type">GTK_SHADOW_NONE</property>
2308+ <property name="shadow_type">none</property>
2309 <child>
2310 <widget class="GtkAlignment" id="alignment7">
2311 <property name="visible">True</property>
2312@@ -3083,7 +2962,7 @@
2313 <widget class="GtkScrolledWindow" id="scrolledwindow9">
2314 <property name="visible">True</property>
2315 <property name="can_focus">True</property>
2316- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
2317+ <property name="hscrollbar_policy">automatic</property>
2318 <child>
2319 <widget class="GtkViewport" id="exp_vp2">
2320 <property name="visible">True</property>
2321@@ -3132,6 +3011,9 @@
2322 <property name="items" translatable="yes">Open in Excel
2323 Save as CSV</property>
2324 </widget>
2325+ <packing>
2326+ <property name="position">0</property>
2327+ </packing>
2328 </child>
2329 <child>
2330 <widget class="GtkVSeparator" id="vseparator9">
2331@@ -3146,11 +3028,11 @@
2332 </child>
2333 <child>
2334 <widget class="GtkCheckButton" id="add_field_names_cb">
2335- <property name="visible">True</property>
2336- <property name="can_focus">True</property>
2337 <property name="label" translatable="yes">Add _field names</property>
2338+ <property name="visible">True</property>
2339+ <property name="can_focus">True</property>
2340+ <property name="receives_default">False</property>
2341 <property name="use_underline">True</property>
2342- <property name="response_id">0</property>
2343 <property name="active">True</property>
2344 <property name="draw_indicator">True</property>
2345 </widget>
2346@@ -3180,6 +3062,49 @@
2347 <property name="position">2</property>
2348 </packing>
2349 </child>
2350+ <child>
2351+ <widget class="GtkFrame" id="frame100">
2352+ <property name="visible">True</property>
2353+ <property name="border_width">2</property>
2354+ <property name="label_xalign">0</property>
2355+ <child>
2356+ <widget class="GtkHBox" id="hbox100">
2357+ <property name="visible">True</property>
2358+ <child>
2359+ <widget class="GtkCheckButton" id="import_compatible">
2360+ <property name="label" translatable="yes">Import Compatible</property>
2361+ <property name="visible">True</property>
2362+ <property name="can_focus">True</property>
2363+ <property name="receives_default">False</property>
2364+ <property name="use_underline">True</property>
2365+ <property name="draw_indicator">True</property>
2366+ </widget>
2367+ <packing>
2368+ <property name="expand">False</property>
2369+ <property name="fill">False</property>
2370+ <property name="position">2</property>
2371+ </packing>
2372+ </child>
2373+ </widget>
2374+ </child>
2375+ <child>
2376+ <widget class="GtkLabel" id="label100">
2377+ <property name="visible">True</property>
2378+ <property name="label" translatable="yes">&lt;b&gt;Select an Option to Export&lt;/b&gt;</property>
2379+ <property name="use_markup">True</property>
2380+ <property name="use_underline">True</property>
2381+ </widget>
2382+ <packing>
2383+ <property name="type">label_item</property>
2384+ </packing>
2385+ </child>
2386+ </widget>
2387+ <packing>
2388+ <property name="expand">False</property>
2389+ <property name="fill">False</property>
2390+ <property name="position">2</property>
2391+ </packing>
2392+ </child>
2393 </widget>
2394 <packing>
2395 <property name="position">2</property>
2396@@ -3188,34 +3113,44 @@
2397 <child internal-child="action_area">
2398 <widget class="GtkHButtonBox" id="dialog-action_area11">
2399 <property name="visible">True</property>
2400- <property name="layout_style">GTK_BUTTONBOX_END</property>
2401+ <property name="layout_style">end</property>
2402 <child>
2403 <widget class="GtkButton" id="cancelbutton8">
2404+ <property name="label">gtk-cancel</property>
2405+ <property name="response_id">-6</property>
2406 <property name="visible">True</property>
2407 <property name="can_focus">True</property>
2408 <property name="can_default">True</property>
2409- <property name="label">gtk-cancel</property>
2410+ <property name="receives_default">False</property>
2411 <property name="use_stock">True</property>
2412- <property name="response_id">-6</property>
2413 </widget>
2414+ <packing>
2415+ <property name="expand">False</property>
2416+ <property name="fill">False</property>
2417+ <property name="position">0</property>
2418+ </packing>
2419 </child>
2420 <child>
2421 <widget class="GtkButton" id="okbutton9">
2422+ <property name="label">gtk-ok</property>
2423+ <property name="response_id">-5</property>
2424 <property name="visible">True</property>
2425 <property name="can_focus">True</property>
2426 <property name="can_default">True</property>
2427- <property name="label">gtk-ok</property>
2428+ <property name="receives_default">False</property>
2429 <property name="use_stock">True</property>
2430- <property name="response_id">-5</property>
2431 </widget>
2432 <packing>
2433+ <property name="expand">False</property>
2434+ <property name="fill">False</property>
2435 <property name="position">1</property>
2436 </packing>
2437 </child>
2438 </widget>
2439 <packing>
2440 <property name="expand">False</property>
2441- <property name="pack_type">GTK_PACK_END</property>
2442+ <property name="pack_type">end</property>
2443+ <property name="position">0</property>
2444 </packing>
2445 </child>
2446 </widget>
2447@@ -3226,11 +3161,11 @@
2448 <property name="height_request">500</property>
2449 <property name="title" translatable="yes">OpenERP - Search</property>
2450 <property name="modal">True</property>
2451- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
2452+ <property name="window_position">center-on-parent</property>
2453 <property name="default_width">777</property>
2454 <property name="default_height">500</property>
2455 <property name="destroy_with_parent">True</property>
2456- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
2457+ <property name="type_hint">dialog</property>
2458 <child internal-child="vbox">
2459 <widget class="GtkVBox" id="win_search_vbox">
2460 <property name="visible">True</property>
2461@@ -3241,62 +3176,78 @@
2462 <child internal-child="action_area">
2463 <widget class="GtkHButtonBox" id="dialog-action_area12">
2464 <property name="visible">True</property>
2465- <property name="layout_style">GTK_BUTTONBOX_END</property>
2466+ <property name="layout_style">end</property>
2467 <child>
2468 <widget class="GtkButton" id="newbutton">
2469- <property name="visible">True</property>
2470- <property name="can_focus">True</property>
2471- <property name="can_default">True</property>
2472 <property name="label">gtk-new</property>
2473- <property name="use_stock">True</property>
2474 <property name="response_id">-3</property>
2475+ <property name="visible">True</property>
2476+ <property name="can_focus">True</property>
2477+ <property name="can_default">True</property>
2478+ <property name="receives_default">False</property>
2479+ <property name="use_stock">True</property>
2480 </widget>
2481+ <packing>
2482+ <property name="expand">False</property>
2483+ <property name="fill">False</property>
2484+ <property name="position">0</property>
2485+ </packing>
2486 </child>
2487 <child>
2488 <widget class="GtkButton" id="button81">
2489- <property name="visible">True</property>
2490- <property name="can_focus">True</property>
2491- <property name="can_default">True</property>
2492- <property name="has_default">True</property>
2493 <property name="label">gtk-find</property>
2494+ <property name="response_id">-10</property>
2495+ <property name="visible">True</property>
2496+ <property name="can_focus">True</property>
2497+ <property name="can_default">True</property>
2498+ <property name="has_default">True</property>
2499+ <property name="receives_default">False</property>
2500 <property name="use_stock">True</property>
2501- <property name="response_id">-10</property>
2502 </widget>
2503 <packing>
2504+ <property name="expand">False</property>
2505+ <property name="fill">False</property>
2506 <property name="position">1</property>
2507 </packing>
2508 </child>
2509 <child>
2510 <widget class="GtkButton" id="cancelbutton9">
2511+ <property name="label">gtk-cancel</property>
2512+ <property name="response_id">-6</property>
2513 <property name="visible">True</property>
2514 <property name="can_focus">True</property>
2515 <property name="can_default">True</property>
2516- <property name="label">gtk-cancel</property>
2517+ <property name="receives_default">False</property>
2518 <property name="use_stock">True</property>
2519- <property name="response_id">-6</property>
2520- <accelerator key="Escape" modifiers="" signal="clicked"/>
2521+ <accelerator key="Escape" signal="clicked"/>
2522 </widget>
2523 <packing>
2524+ <property name="expand">False</property>
2525+ <property name="fill">False</property>
2526 <property name="position">2</property>
2527 </packing>
2528 </child>
2529 <child>
2530 <widget class="GtkButton" id="okbutton10">
2531+ <property name="label">gtk-ok</property>
2532+ <property name="response_id">-5</property>
2533 <property name="visible">True</property>
2534 <property name="can_focus">True</property>
2535 <property name="can_default">True</property>
2536- <property name="label">gtk-ok</property>
2537+ <property name="receives_default">False</property>
2538 <property name="use_stock">True</property>
2539- <property name="response_id">-5</property>
2540 </widget>
2541 <packing>
2542+ <property name="expand">False</property>
2543+ <property name="fill">False</property>
2544 <property name="position">3</property>
2545 </packing>
2546 </child>
2547 </widget>
2548 <packing>
2549 <property name="expand">False</property>
2550- <property name="pack_type">GTK_PACK_END</property>
2551+ <property name="pack_type">end</property>
2552+ <property name="position">0</property>
2553 </packing>
2554 </child>
2555 </widget>
2556@@ -3306,9 +3257,9 @@
2557 <property name="width_request">600</property>
2558 <property name="title" translatable="yes">OpenERP - Preferences</property>
2559 <property name="modal">True</property>
2560- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
2561+ <property name="window_position">center-on-parent</property>
2562 <property name="default_height">500</property>
2563- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
2564+ <property name="type_hint">dialog</property>
2565 <child internal-child="vbox">
2566 <widget class="GtkVBox" id="dialog-vbox18">
2567 <property name="visible">True</property>
2568@@ -3321,11 +3272,12 @@
2569 <property name="label" translatable="yes">&lt;b&gt;User preferences&lt;/b&gt;</property>
2570 <property name="use_markup">True</property>
2571 <property name="use_underline">True</property>
2572- <property name="justify">GTK_JUSTIFY_CENTER</property>
2573+ <property name="justify">center</property>
2574 </widget>
2575 <packing>
2576 <property name="expand">False</property>
2577 <property name="fill">False</property>
2578+ <property name="position">0</property>
2579 </packing>
2580 </child>
2581 <child>
2582@@ -3349,35 +3301,45 @@
2583 <child internal-child="action_area">
2584 <widget class="GtkHButtonBox" id="dialog-action_area18">
2585 <property name="visible">True</property>
2586- <property name="layout_style">GTK_BUTTONBOX_END</property>
2587+ <property name="layout_style">end</property>
2588 <child>
2589 <widget class="GtkButton" id="cancelbutton12">
2590+ <property name="label">gtk-cancel</property>
2591+ <property name="response_id">-6</property>
2592 <property name="visible">True</property>
2593 <property name="can_focus">True</property>
2594 <property name="can_default">True</property>
2595- <property name="label">gtk-cancel</property>
2596+ <property name="receives_default">False</property>
2597 <property name="use_stock">True</property>
2598- <property name="response_id">-6</property>
2599 </widget>
2600+ <packing>
2601+ <property name="expand">False</property>
2602+ <property name="fill">False</property>
2603+ <property name="position">0</property>
2604+ </packing>
2605 </child>
2606 <child>
2607 <widget class="GtkButton" id="okbutton14">
2608+ <property name="label">gtk-ok</property>
2609+ <property name="response_id">-5</property>
2610 <property name="visible">True</property>
2611 <property name="can_focus">True</property>
2612 <property name="can_default">True</property>
2613 <property name="has_default">True</property>
2614- <property name="label">gtk-ok</property>
2615+ <property name="receives_default">False</property>
2616 <property name="use_stock">True</property>
2617- <property name="response_id">-5</property>
2618 </widget>
2619 <packing>
2620+ <property name="expand">False</property>
2621+ <property name="fill">False</property>
2622 <property name="position">1</property>
2623 </packing>
2624 </child>
2625 </widget>
2626 <packing>
2627 <property name="expand">False</property>
2628- <property name="pack_type">GTK_PACK_END</property>
2629+ <property name="pack_type">end</property>
2630+ <property name="position">0</property>
2631 </packing>
2632 </child>
2633 </widget>
2634@@ -3385,9 +3347,8 @@
2635 </widget>
2636 <widget class="GtkDialog" id="win_tips">
2637 <property name="title" translatable="yes">Tip of the Day</property>
2638- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
2639- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
2640- <property name="has_separator">False</property>
2641+ <property name="window_position">center-on-parent</property>
2642+ <property name="type_hint">dialog</property>
2643 <child internal-child="vbox">
2644 <widget class="GtkVBox" id="dialog-vbox16">
2645 <property name="visible">True</property>
2646@@ -3403,6 +3364,7 @@
2647 </widget>
2648 <packing>
2649 <property name="expand">False</property>
2650+ <property name="position">0</property>
2651 </packing>
2652 </child>
2653 <child>
2654@@ -3428,20 +3390,20 @@
2655 </child>
2656 <child>
2657 <widget class="GtkCheckButton" id="tip_checkbutton">
2658+ <property name="label" translatable="yes">_Display a new tip next time?</property>
2659 <property name="visible">True</property>
2660 <property name="can_focus">True</property>
2661+ <property name="receives_default">False</property>
2662 <property name="border_width">5</property>
2663- <property name="label" translatable="yes">_Display a new tip next time?</property>
2664 <property name="use_underline">True</property>
2665 <property name="focus_on_click">False</property>
2666- <property name="response_id">0</property>
2667 <property name="active">True</property>
2668 <property name="draw_indicator">True</property>
2669 </widget>
2670 <packing>
2671 <property name="expand">False</property>
2672 <property name="fill">False</property>
2673- <property name="pack_type">GTK_PACK_END</property>
2674+ <property name="pack_type">end</property>
2675 <property name="position">2</property>
2676 </packing>
2677 </child>
2678@@ -3453,14 +3415,14 @@
2679 <child internal-child="action_area">
2680 <widget class="GtkHButtonBox" id="dialog-action_area19">
2681 <property name="visible">True</property>
2682- <property name="layout_style">GTK_BUTTONBOX_END</property>
2683+ <property name="layout_style">end</property>
2684 <child>
2685 <widget class="GtkButton" id="but_previous1">
2686 <property name="visible">True</property>
2687 <property name="can_focus">True</property>
2688 <property name="can_default">True</property>
2689- <property name="relief">GTK_RELIEF_NONE</property>
2690- <property name="response_id">0</property>
2691+ <property name="receives_default">False</property>
2692+ <property name="relief">none</property>
2693 <signal name="clicked" handler="on_but_previous_activate"/>
2694 <child>
2695 <widget class="GtkAlignment" id="alignment17">
2696@@ -3479,6 +3441,7 @@
2697 <packing>
2698 <property name="expand">False</property>
2699 <property name="fill">False</property>
2700+ <property name="position">0</property>
2701 </packing>
2702 </child>
2703 <child>
2704@@ -3498,15 +3461,20 @@
2705 </widget>
2706 </child>
2707 </widget>
2708+ <packing>
2709+ <property name="expand">False</property>
2710+ <property name="fill">False</property>
2711+ <property name="position">0</property>
2712+ </packing>
2713 </child>
2714 <child>
2715 <widget class="GtkButton" id="but_next1">
2716 <property name="visible">True</property>
2717 <property name="can_focus">True</property>
2718 <property name="can_default">True</property>
2719- <property name="relief">GTK_RELIEF_NONE</property>
2720+ <property name="receives_default">False</property>
2721+ <property name="relief">none</property>
2722 <property name="focus_on_click">False</property>
2723- <property name="response_id">0</property>
2724 <signal name="clicked" handler="on_but_next_activate"/>
2725 <child>
2726 <widget class="GtkAlignment" id="alignment18">
2727@@ -3525,6 +3493,7 @@
2728 <packing>
2729 <property name="expand">False</property>
2730 <property name="fill">False</property>
2731+ <property name="position">0</property>
2732 </packing>
2733 </child>
2734 <child>
2735@@ -3545,29 +3514,35 @@
2736 </child>
2737 </widget>
2738 <packing>
2739+ <property name="expand">False</property>
2740+ <property name="fill">False</property>
2741 <property name="position">1</property>
2742 </packing>
2743 </child>
2744 <child>
2745 <widget class="GtkButton" id="but_close1">
2746+ <property name="label">gtk-close</property>
2747+ <property name="response_id">-7</property>
2748 <property name="visible">True</property>
2749 <property name="can_focus">True</property>
2750 <property name="has_focus">True</property>
2751 <property name="can_default">True</property>
2752 <property name="has_default">True</property>
2753- <property name="label">gtk-close</property>
2754+ <property name="receives_default">False</property>
2755 <property name="use_stock">True</property>
2756- <property name="response_id">-7</property>
2757 <signal name="clicked" handler="on_but_close_activate"/>
2758 </widget>
2759 <packing>
2760+ <property name="expand">False</property>
2761+ <property name="fill">False</property>
2762 <property name="position">2</property>
2763 </packing>
2764 </child>
2765 </widget>
2766 <packing>
2767 <property name="expand">False</property>
2768- <property name="pack_type">GTK_PACK_END</property>
2769+ <property name="pack_type">end</property>
2770+ <property name="position">0</property>
2771 </packing>
2772 </child>
2773 </widget>
2774@@ -3577,10 +3552,10 @@
2775 <property name="width_request">484</property>
2776 <property name="height_request">358</property>
2777 <property name="title" translatable="yes">OpenERP - License</property>
2778- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
2779+ <property name="window_position">center-on-parent</property>
2780 <property name="default_width">500</property>
2781 <property name="default_height">500</property>
2782- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
2783+ <property name="type_hint">dialog</property>
2784 <child internal-child="vbox">
2785 <widget class="GtkVBox" id="vbox32">
2786 <property name="visible">True</property>
2787@@ -3592,13 +3567,14 @@
2788 <property name="visible">True</property>
2789 <property name="xpad">5</property>
2790 <property name="label" translatable="yes">OpenERP license</property>
2791- <property name="justify">GTK_JUSTIFY_CENTER</property>
2792+ <property name="justify">center</property>
2793 <property name="wrap">True</property>
2794 </widget>
2795 <packing>
2796 <property name="expand">False</property>
2797 <property name="fill">False</property>
2798 <property name="padding">2</property>
2799+ <property name="position">0</property>
2800 </packing>
2801 </child>
2802 <child>
2803@@ -3615,15 +3591,15 @@
2804 <widget class="GtkScrolledWindow" id="scrolledwindow30">
2805 <property name="visible">True</property>
2806 <property name="can_focus">True</property>
2807- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
2808- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
2809- <property name="window_placement">GTK_CORNER_BOTTOM_LEFT</property>
2810+ <property name="hscrollbar_policy">automatic</property>
2811+ <property name="vscrollbar_policy">automatic</property>
2812+ <property name="window_placement">bottom-left</property>
2813 <child>
2814 <widget class="GtkTextView" id="textview11">
2815 <property name="visible">True</property>
2816 <property name="can_focus">True</property>
2817 <property name="editable">False</property>
2818- <property name="wrap_mode">GTK_WRAP_WORD</property>
2819+ <property name="wrap_mode">word</property>
2820 <property name="left_margin">5</property>
2821 <property name="right_margin">5</property>
2822 <property name="indent">25</property>
2823@@ -4265,22 +4241,29 @@
2824 <child internal-child="action_area">
2825 <widget class="GtkHButtonBox" id="hbuttonbox2">
2826 <property name="visible">True</property>
2827- <property name="layout_style">GTK_BUTTONBOX_END</property>
2828+ <property name="layout_style">end</property>
2829 <child>
2830 <widget class="GtkButton" id="button73">
2831+ <property name="label">gtk-ok</property>
2832+ <property name="response_id">-5</property>
2833 <property name="visible">True</property>
2834 <property name="can_focus">True</property>
2835 <property name="can_default">True</property>
2836- <property name="label">gtk-ok</property>
2837+ <property name="receives_default">False</property>
2838 <property name="use_stock">True</property>
2839- <property name="response_id">-5</property>
2840 <signal name="pressed" handler="on_but_ok_pressed"/>
2841 </widget>
2842+ <packing>
2843+ <property name="expand">False</property>
2844+ <property name="fill">False</property>
2845+ <property name="position">0</property>
2846+ </packing>
2847 </child>
2848 </widget>
2849 <packing>
2850 <property name="expand">False</property>
2851- <property name="pack_type">GTK_PACK_END</property>
2852+ <property name="pack_type">end</property>
2853+ <property name="position">0</property>
2854 </packing>
2855 </child>
2856 </widget>
2857@@ -4292,8 +4275,8 @@
2858 <property name="title" translatable="yes">Go to resource ID</property>
2859 <property name="resizable">False</property>
2860 <property name="modal">True</property>
2861- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
2862- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
2863+ <property name="window_position">center-on-parent</property>
2864+ <property name="type_hint">dialog</property>
2865 <child internal-child="vbox">
2866 <widget class="GtkVBox" id="dialog-vbox22">
2867 <property name="visible">True</property>
2868@@ -4327,7 +4310,7 @@
2869 <widget class="GtkImage" id="image1176">
2870 <property name="visible">True</property>
2871 <property name="stock">gtk-index</property>
2872- <property name="icon_size">5</property>
2873+ <property name="icon-size">5</property>
2874 </widget>
2875 <packing>
2876 <property name="bottom_attach">2</property>
2877@@ -4356,36 +4339,46 @@
2878 <child internal-child="action_area">
2879 <widget class="GtkHButtonBox" id="dialog-action_area21">
2880 <property name="visible">True</property>
2881- <property name="layout_style">GTK_BUTTONBOX_END</property>
2882+ <property name="layout_style">end</property>
2883 <child>
2884 <widget class="GtkButton" id="cancelbutton14">
2885+ <property name="label">gtk-cancel</property>
2886+ <property name="response_id">-6</property>
2887 <property name="visible">True</property>
2888 <property name="can_focus">True</property>
2889 <property name="can_default">True</property>
2890- <property name="label">gtk-cancel</property>
2891+ <property name="receives_default">False</property>
2892 <property name="use_stock">True</property>
2893- <property name="response_id">-6</property>
2894 </widget>
2895+ <packing>
2896+ <property name="expand">False</property>
2897+ <property name="fill">False</property>
2898+ <property name="position">0</property>
2899+ </packing>
2900 </child>
2901 <child>
2902 <widget class="GtkButton" id="okbutton16">
2903+ <property name="label">gtk-ok</property>
2904+ <property name="response_id">-5</property>
2905 <property name="visible">True</property>
2906 <property name="can_focus">True</property>
2907 <property name="can_default">True</property>
2908 <property name="has_default">True</property>
2909- <property name="label">gtk-ok</property>
2910+ <property name="receives_default">False</property>
2911 <property name="use_stock">True</property>
2912- <property name="response_id">-5</property>
2913- <accelerator key="Return" modifiers="GDK_CONTROL_MASK" signal="clicked"/>
2914+ <accelerator key="Return" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
2915 </widget>
2916 <packing>
2917+ <property name="expand">False</property>
2918+ <property name="fill">False</property>
2919 <property name="position">1</property>
2920 </packing>
2921 </child>
2922 </widget>
2923 <packing>
2924 <property name="expand">False</property>
2925- <property name="pack_type">GTK_PACK_END</property>
2926+ <property name="pack_type">end</property>
2927+ <property name="position">0</property>
2928 </packing>
2929 </child>
2930 </widget>
2931@@ -4393,8 +4386,8 @@
2932 </widget>
2933 <widget class="GtkDialog" id="dia_support">
2934 <property name="title" translatable="yes">Support Request</property>
2935- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
2936- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
2937+ <property name="window_position">center-on-parent</property>
2938+ <property name="type_hint">dialog</property>
2939 <child internal-child="vbox">
2940 <widget class="GtkVBox" id="dialog-vbox20">
2941 <property name="width_request">700</property>
2942@@ -4404,8 +4397,8 @@
2943 <widget class="GtkScrolledWindow" id="scrolledwindow33">
2944 <property name="visible">True</property>
2945 <property name="can_focus">True</property>
2946- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
2947- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
2948+ <property name="hscrollbar_policy">automatic</property>
2949+ <property name="vscrollbar_policy">automatic</property>
2950 <child>
2951 <widget class="GtkViewport" id="viewport7">
2952 <property name="visible">True</property>
2953@@ -4427,6 +4420,7 @@
2954 <packing>
2955 <property name="expand">False</property>
2956 <property name="fill">False</property>
2957+ <property name="position">0</property>
2958 </packing>
2959 </child>
2960 <child>
2961@@ -4508,10 +4502,6 @@
2962 Medium
2963 Urgent
2964 Very Urgent</property>
2965- <child internal-child="entry">
2966- <widget class="GtkEntry" id="comboboxentry-entry12">
2967- </widget>
2968- </child>
2969 </widget>
2970 <packing>
2971 <property name="left_attach">3</property>
2972@@ -4549,9 +4539,9 @@
2973 <widget class="GtkScrolledWindow" id="scrolledwindow35">
2974 <property name="visible">True</property>
2975 <property name="can_focus">True</property>
2976- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
2977- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
2978- <property name="shadow_type">GTK_SHADOW_IN</property>
2979+ <property name="hscrollbar_policy">automatic</property>
2980+ <property name="vscrollbar_policy">automatic</property>
2981+ <property name="shadow_type">in</property>
2982 <child>
2983 <widget class="GtkTextView" id="explanation_textview1">
2984 <property name="visible">True</property>
2985@@ -4571,9 +4561,9 @@
2986 <widget class="GtkScrolledWindow" id="scrolledwindow34">
2987 <property name="visible">True</property>
2988 <property name="can_focus">True</property>
2989- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
2990- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
2991- <property name="shadow_type">GTK_SHADOW_IN</property>
2992+ <property name="hscrollbar_policy">automatic</property>
2993+ <property name="vscrollbar_policy">automatic</property>
2994+ <property name="shadow_type">in</property>
2995 <child>
2996 <widget class="GtkTextView" id="remark_textview">
2997 <property name="visible">True</property>
2998@@ -4702,34 +4692,44 @@
2999 <child internal-child="action_area">
3000 <widget class="GtkHButtonBox" id="dialog-action_area23">
3001 <property name="visible">True</property>
3002- <property name="layout_style">GTK_BUTTONBOX_END</property>
3003+ <property name="layout_style">end</property>
3004 <child>
3005 <widget class="GtkButton" id="cancelbutton15">
3006+ <property name="label">gtk-cancel</property>
3007+ <property name="response_id">-6</property>
3008 <property name="visible">True</property>
3009 <property name="can_focus">True</property>
3010 <property name="can_default">True</property>
3011- <property name="label">gtk-cancel</property>
3012+ <property name="receives_default">False</property>
3013 <property name="use_stock">True</property>
3014- <property name="response_id">-6</property>
3015 </widget>
3016+ <packing>
3017+ <property name="expand">False</property>
3018+ <property name="fill">False</property>
3019+ <property name="position">0</property>
3020+ </packing>
3021 </child>
3022 <child>
3023 <widget class="GtkButton" id="okbutton18">
3024+ <property name="label">gtk-ok</property>
3025+ <property name="response_id">-5</property>
3026 <property name="visible">True</property>
3027 <property name="can_focus">True</property>
3028 <property name="can_default">True</property>
3029- <property name="label">gtk-ok</property>
3030+ <property name="receives_default">False</property>
3031 <property name="use_stock">True</property>
3032- <property name="response_id">-5</property>
3033 </widget>
3034 <packing>
3035+ <property name="expand">False</property>
3036+ <property name="fill">False</property>
3037 <property name="position">1</property>
3038 </packing>
3039 </child>
3040 </widget>
3041 <packing>
3042 <property name="expand">False</property>
3043- <property name="pack_type">GTK_PACK_END</property>
3044+ <property name="pack_type">end</property>
3045+ <property name="position">0</property>
3046 </packing>
3047 </child>
3048 </widget>
3049@@ -4740,8 +4740,8 @@
3050 <property name="height_request">143</property>
3051 <property name="title" translatable="yes">OpenERP - Confirmation</property>
3052 <property name="modal">True</property>
3053- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
3054- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
3055+ <property name="window_position">center-on-parent</property>
3056+ <property name="type_hint">dialog</property>
3057 <child internal-child="vbox">
3058 <widget class="GtkVBox" id="vbox42">
3059 <property name="visible">True</property>
3060@@ -4754,11 +4754,12 @@
3061 <property name="xpad">15</property>
3062 <property name="ypad">15</property>
3063 <property name="stock">gtk-dialog-question</property>
3064- <property name="icon_size">6</property>
3065+ <property name="icon-size">6</property>
3066 </widget>
3067 <packing>
3068 <property name="expand">False</property>
3069 <property name="fill">False</property>
3070+ <property name="position">0</property>
3071 </packing>
3072 </child>
3073 <child>
3074@@ -4781,47 +4782,60 @@
3075 <child internal-child="action_area">
3076 <widget class="GtkHButtonBox" id="hbuttonbox4">
3077 <property name="visible">True</property>
3078- <property name="layout_style">GTK_BUTTONBOX_END</property>
3079+ <property name="layout_style">end</property>
3080 <child>
3081 <widget class="GtkButton" id="button82">
3082- <property name="visible">True</property>
3083- <property name="can_focus">True</property>
3084- <property name="can_default">True</property>
3085 <property name="label">gtk-yes</property>
3086- <property name="use_stock">True</property>
3087 <property name="response_id">-8</property>
3088+ <property name="visible">True</property>
3089+ <property name="can_focus">True</property>
3090+ <property name="can_default">True</property>
3091+ <property name="receives_default">False</property>
3092+ <property name="use_stock">True</property>
3093 </widget>
3094+ <packing>
3095+ <property name="expand">False</property>
3096+ <property name="fill">False</property>
3097+ <property name="position">0</property>
3098+ </packing>
3099 </child>
3100 <child>
3101 <widget class="GtkButton" id="button83">
3102- <property name="visible">True</property>
3103- <property name="can_focus">True</property>
3104- <property name="can_default">True</property>
3105 <property name="label">gtk-no</property>
3106- <property name="use_stock">True</property>
3107 <property name="response_id">-9</property>
3108+ <property name="visible">True</property>
3109+ <property name="can_focus">True</property>
3110+ <property name="can_default">True</property>
3111+ <property name="receives_default">False</property>
3112+ <property name="use_stock">True</property>
3113 </widget>
3114 <packing>
3115+ <property name="expand">False</property>
3116+ <property name="fill">False</property>
3117 <property name="position">1</property>
3118 </packing>
3119 </child>
3120 <child>
3121 <widget class="GtkButton" id="button84">
3122+ <property name="label">gtk-cancel</property>
3123+ <property name="response_id">-6</property>
3124 <property name="visible">True</property>
3125 <property name="can_focus">True</property>
3126 <property name="can_default">True</property>
3127- <property name="label">gtk-cancel</property>
3128+ <property name="receives_default">False</property>
3129 <property name="use_stock">True</property>
3130- <property name="response_id">-6</property>
3131 </widget>
3132 <packing>
3133+ <property name="expand">False</property>
3134+ <property name="fill">False</property>
3135 <property name="position">2</property>
3136 </packing>
3137 </child>
3138 </widget>
3139 <packing>
3140 <property name="expand">False</property>
3141- <property name="pack_type">GTK_PACK_END</property>
3142+ <property name="pack_type">end</property>
3143+ <property name="position">0</property>
3144 </packing>
3145 </child>
3146 </widget>
3147@@ -4829,8 +4843,8 @@
3148 </widget>
3149 <widget class="GtkDialog" id="shortcuts_dia">
3150 <property name="title" translatable="yes">Keyboard shortcuts</property>
3151- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
3152- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
3153+ <property name="window_position">center-on-parent</property>
3154+ <property name="type_hint">dialog</property>
3155 <child internal-child="vbox">
3156 <widget class="GtkVBox" id="dialog-vbox21">
3157 <property name="visible">True</property>
3158@@ -4852,7 +4866,7 @@
3159 <property name="xpad">2</property>
3160 <property name="label" translatable="yes">&lt;b&gt;Shortcuts for OpenERP&lt;/b&gt;</property>
3161 <property name="use_markup">True</property>
3162- <property name="justify">GTK_JUSTIFY_CENTER</property>
3163+ <property name="justify">center</property>
3164 </widget>
3165 <packing>
3166 <property name="right_attach">2</property>
3167@@ -4895,7 +4909,7 @@
3168 <property name="ypad">10</property>
3169 <property name="label" translatable="yes">&lt;i&gt;When editing a resource in a popup window&lt;/i&gt;</property>
3170 <property name="use_markup">True</property>
3171- <property name="justify">GTK_JUSTIFY_CENTER</property>
3172+ <property name="justify">center</property>
3173 </widget>
3174 <packing>
3175 <property name="right_attach">2</property>
3176@@ -5249,8 +5263,8 @@
3177 <property name="label" translatable="yes">Main Shortcuts</property>
3178 </widget>
3179 <packing>
3180+ <property name="tab_fill">False</property>
3181 <property name="type">tab</property>
3182- <property name="tab_fill">False</property>
3183 </packing>
3184 </child>
3185 <child>
3186@@ -5264,7 +5278,7 @@
3187 <property name="visible">True</property>
3188 <property name="xalign">0</property>
3189 <property name="label" translatable="yes">F2</property>
3190- <property name="justify">GTK_JUSTIFY_CENTER</property>
3191+ <property name="justify">center</property>
3192 </widget>
3193 <packing>
3194 <property name="top_attach">9</property>
3195@@ -5522,9 +5536,9 @@
3196 <property name="label" translatable="yes">Edition Widgets</property>
3197 </widget>
3198 <packing>
3199- <property name="type">tab</property>
3200 <property name="position">1</property>
3201 <property name="tab_fill">False</property>
3202+ <property name="type">tab</property>
3203 </packing>
3204 </child>
3205 </widget>
3206@@ -5535,22 +5549,29 @@
3207 <child internal-child="action_area">
3208 <widget class="GtkHButtonBox" id="dialog-action_area24">
3209 <property name="visible">True</property>
3210- <property name="layout_style">GTK_BUTTONBOX_END</property>
3211+ <property name="layout_style">end</property>
3212 <child>
3213 <widget class="GtkButton" id="closebutton1">
3214+ <property name="label">gtk-close</property>
3215+ <property name="response_id">-7</property>
3216 <property name="visible">True</property>
3217 <property name="can_focus">True</property>
3218 <property name="can_default">True</property>
3219- <property name="label">gtk-close</property>
3220+ <property name="receives_default">False</property>
3221 <property name="use_stock">True</property>
3222- <property name="response_id">-7</property>
3223 <signal name="clicked" handler="on_but_ok_pressed"/>
3224 </widget>
3225+ <packing>
3226+ <property name="expand">False</property>
3227+ <property name="fill">False</property>
3228+ <property name="position">0</property>
3229+ </packing>
3230 </child>
3231 </widget>
3232 <packing>
3233 <property name="expand">False</property>
3234- <property name="pack_type">GTK_PACK_END</property>
3235+ <property name="pack_type">end</property>
3236+ <property name="position">0</property>
3237 </packing>
3238 </child>
3239 </widget>
3240@@ -5559,8 +5580,8 @@
3241 <widget class="GtkDialog" id="win_import">
3242 <property name="title" translatable="yes">Import from CSV</property>
3243 <property name="modal">True</property>
3244- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
3245- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
3246+ <property name="window_position">center-on-parent</property>
3247+ <property name="type_hint">dialog</property>
3248 <child internal-child="vbox">
3249 <widget class="GtkVBox" id="dialog-vbox27">
3250 <property name="visible">True</property>
3251@@ -5576,7 +5597,7 @@
3252 <widget class="GtkFrame" id="frame14">
3253 <property name="visible">True</property>
3254 <property name="label_xalign">0</property>
3255- <property name="shadow_type">GTK_SHADOW_NONE</property>
3256+ <property name="shadow_type">none</property>
3257 <child>
3258 <widget class="GtkAlignment" id="alignment30">
3259 <property name="visible">True</property>
3260@@ -5585,8 +5606,8 @@
3261 <widget class="GtkScrolledWindow" id="scrolledwindow38">
3262 <property name="visible">True</property>
3263 <property name="can_focus">True</property>
3264- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
3265- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
3266+ <property name="hscrollbar_policy">automatic</property>
3267+ <property name="vscrollbar_policy">automatic</property>
3268 <child>
3269 <widget class="GtkViewport" id="import_vp_left">
3270 <property name="visible">True</property>
3271@@ -5610,6 +5631,9 @@
3272 </packing>
3273 </child>
3274 </widget>
3275+ <packing>
3276+ <property name="position">0</property>
3277+ </packing>
3278 </child>
3279 <child>
3280 <widget class="GtkVBox" id="vbox44">
3281@@ -5620,7 +5644,7 @@
3282 <widget class="GtkButton" id="button_add">
3283 <property name="visible">True</property>
3284 <property name="can_focus">True</property>
3285- <property name="response_id">0</property>
3286+ <property name="receives_default">False</property>
3287 <signal name="clicked" handler="on_but_select_clicked"/>
3288 <child>
3289 <widget class="GtkAlignment" id="alignment31">
3290@@ -5639,6 +5663,7 @@
3291 <packing>
3292 <property name="expand">False</property>
3293 <property name="fill">False</property>
3294+ <property name="position">0</property>
3295 </packing>
3296 </child>
3297 <child>
3298@@ -5661,13 +5686,14 @@
3299 <packing>
3300 <property name="expand">False</property>
3301 <property name="fill">False</property>
3302+ <property name="position">0</property>
3303 </packing>
3304 </child>
3305 <child>
3306 <widget class="GtkButton" id="button_remove">
3307 <property name="visible">True</property>
3308 <property name="can_focus">True</property>
3309- <property name="response_id">0</property>
3310+ <property name="receives_default">False</property>
3311 <signal name="clicked" handler="on_but_unselect_clicked"/>
3312 <child>
3313 <widget class="GtkAlignment" id="alignment32">
3314@@ -5686,6 +5712,7 @@
3315 <packing>
3316 <property name="expand">False</property>
3317 <property name="fill">False</property>
3318+ <property name="position">0</property>
3319 </packing>
3320 </child>
3321 <child>
3322@@ -5715,7 +5742,7 @@
3323 <widget class="GtkButton" id="button_remove_all">
3324 <property name="visible">True</property>
3325 <property name="can_focus">True</property>
3326- <property name="response_id">0</property>
3327+ <property name="receives_default">False</property>
3328 <signal name="clicked" handler="on_but_unselect_all_clicked"/>
3329 <child>
3330 <widget class="GtkAlignment" id="alignment34">
3331@@ -5734,6 +5761,7 @@
3332 <packing>
3333 <property name="expand">False</property>
3334 <property name="fill">False</property>
3335+ <property name="position">0</property>
3336 </packing>
3337 </child>
3338 <child>
3339@@ -5774,7 +5802,7 @@
3340 <widget class="GtkButton" id="button_autodetect">
3341 <property name="visible">True</property>
3342 <property name="can_focus">True</property>
3343- <property name="response_id">0</property>
3344+ <property name="receives_default">False</property>
3345 <signal name="clicked" handler="on_but_autodetect_clicked"/>
3346 <child>
3347 <widget class="GtkAlignment" id="alignment44">
3348@@ -5793,6 +5821,7 @@
3349 <packing>
3350 <property name="expand">False</property>
3351 <property name="fill">False</property>
3352+ <property name="position">0</property>
3353 </packing>
3354 </child>
3355 <child>
3356@@ -5828,7 +5857,7 @@
3357 <widget class="GtkFrame" id="frame15">
3358 <property name="visible">True</property>
3359 <property name="label_xalign">0</property>
3360- <property name="shadow_type">GTK_SHADOW_NONE</property>
3361+ <property name="shadow_type">none</property>
3362 <child>
3363 <widget class="GtkAlignment" id="alignment35">
3364 <property name="visible">True</property>
3365@@ -5837,7 +5866,7 @@
3366 <widget class="GtkScrolledWindow" id="scrolledwindow37">
3367 <property name="visible">True</property>
3368 <property name="can_focus">True</property>
3369- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
3370+ <property name="hscrollbar_policy">automatic</property>
3371 <child>
3372 <widget class="GtkViewport" id="import_vp_right">
3373 <property name="visible">True</property>
3374@@ -5866,12 +5895,15 @@
3375 </packing>
3376 </child>
3377 </widget>
3378+ <packing>
3379+ <property name="position">0</property>
3380+ </packing>
3381 </child>
3382 <child>
3383 <widget class="GtkFrame" id="frame18">
3384 <property name="visible">True</property>
3385 <property name="label_xalign">0</property>
3386- <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
3387+ <property name="shadow_type">etched-out</property>
3388 <child>
3389 <widget class="GtkAlignment" id="alignment43">
3390 <property name="visible">True</property>
3391@@ -5893,6 +5925,7 @@
3392 <packing>
3393 <property name="expand">False</property>
3394 <property name="fill">False</property>
3395+ <property name="position">0</property>
3396 </packing>
3397 </child>
3398 <child>
3399@@ -5908,6 +5941,7 @@
3400 <packing>
3401 <property name="expand">False</property>
3402 <property name="padding">4</property>
3403+ <property name="position">0</property>
3404 </packing>
3405 </child>
3406 <child>
3407@@ -5928,10 +5962,6 @@
3408 <property name="visible">True</property>
3409 <property name="items">UTF-8
3410 Latin1</property>
3411- <child internal-child="entry">
3412- <widget class="GtkEntry" id="comboboxentry-entry13">
3413- </widget>
3414- </child>
3415 </widget>
3416 <packing>
3417 <property name="left_attach">1</property>
3418@@ -6074,47 +6104,60 @@
3419 <child internal-child="action_area">
3420 <widget class="GtkHButtonBox" id="dialog-action_area25">
3421 <property name="visible">True</property>
3422- <property name="layout_style">GTK_BUTTONBOX_END</property>
3423+ <property name="layout_style">end</property>
3424 <child>
3425 <widget class="GtkButton" id="helpbutton1">
3426- <property name="visible">True</property>
3427- <property name="can_focus">True</property>
3428- <property name="can_default">True</property>
3429 <property name="label">gtk-help</property>
3430- <property name="use_stock">True</property>
3431 <property name="response_id">-11</property>
3432+ <property name="visible">True</property>
3433+ <property name="can_focus">True</property>
3434+ <property name="can_default">True</property>
3435+ <property name="receives_default">False</property>
3436+ <property name="use_stock">True</property>
3437 </widget>
3438+ <packing>
3439+ <property name="expand">False</property>
3440+ <property name="fill">False</property>
3441+ <property name="position">0</property>
3442+ </packing>
3443 </child>
3444 <child>
3445 <widget class="GtkButton" id="cancelbutton16">
3446+ <property name="label">gtk-cancel</property>
3447+ <property name="response_id">-6</property>
3448 <property name="visible">True</property>
3449 <property name="can_focus">True</property>
3450 <property name="can_default">True</property>
3451- <property name="label">gtk-cancel</property>
3452+ <property name="receives_default">False</property>
3453 <property name="use_stock">True</property>
3454- <property name="response_id">-6</property>
3455 </widget>
3456 <packing>
3457+ <property name="expand">False</property>
3458+ <property name="fill">False</property>
3459 <property name="position">1</property>
3460 </packing>
3461 </child>
3462 <child>
3463 <widget class="GtkButton" id="okbutton19">
3464+ <property name="label">gtk-ok</property>
3465+ <property name="response_id">-5</property>
3466 <property name="visible">True</property>
3467 <property name="can_focus">True</property>
3468 <property name="can_default">True</property>
3469- <property name="label">gtk-ok</property>
3470+ <property name="receives_default">False</property>
3471 <property name="use_stock">True</property>
3472- <property name="response_id">-5</property>
3473 </widget>
3474 <packing>
3475+ <property name="expand">False</property>
3476+ <property name="fill">False</property>
3477 <property name="position">2</property>
3478 </packing>
3479 </child>
3480 </widget>
3481 <packing>
3482 <property name="expand">False</property>
3483- <property name="pack_type">GTK_PACK_END</property>
3484+ <property name="pack_type">end</property>
3485+ <property name="position">0</property>
3486 </packing>
3487 </child>
3488 </widget>
3489@@ -6125,7 +6168,7 @@
3490 <property name="height_request">143</property>
3491 <property name="title" translatable="yes">OpenERP</property>
3492 <property name="modal">True</property>
3493- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
3494+ <property name="type_hint">dialog</property>
3495 <child internal-child="vbox">
3496 <widget class="GtkVBox" id="vbox46">
3497 <property name="visible">True</property>
3498@@ -6138,11 +6181,12 @@
3499 <property name="xpad">15</property>
3500 <property name="ypad">15</property>
3501 <property name="stock">gtk-dialog-question</property>
3502- <property name="icon_size">6</property>
3503+ <property name="icon-size">6</property>
3504 </widget>
3505 <packing>
3506 <property name="expand">False</property>
3507 <property name="fill">False</property>
3508+ <property name="position">0</property>
3509 </packing>
3510 </child>
3511 <child>
3512@@ -6157,6 +6201,7 @@
3513 <packing>
3514 <property name="expand">False</property>
3515 <property name="fill">False</property>
3516+ <property name="position">0</property>
3517 </packing>
3518 </child>
3519 <child>
3520@@ -6185,34 +6230,44 @@
3521 <child internal-child="action_area">
3522 <widget class="GtkHButtonBox" id="hbuttonbox5">
3523 <property name="visible">True</property>
3524- <property name="layout_style">GTK_BUTTONBOX_END</property>
3525+ <property name="layout_style">end</property>
3526 <child>
3527 <widget class="GtkButton" id="button87">
3528+ <property name="label">gtk-cancel</property>
3529+ <property name="response_id">-6</property>
3530 <property name="visible">True</property>
3531 <property name="can_focus">True</property>
3532 <property name="can_default">True</property>
3533- <property name="label">gtk-cancel</property>
3534+ <property name="receives_default">False</property>
3535 <property name="use_stock">True</property>
3536- <property name="response_id">-6</property>
3537 </widget>
3538+ <packing>
3539+ <property name="expand">False</property>
3540+ <property name="fill">False</property>
3541+ <property name="position">0</property>
3542+ </packing>
3543 </child>
3544 <child>
3545 <widget class="GtkButton" id="button1">
3546+ <property name="label">gtk-ok</property>
3547+ <property name="response_id">-5</property>
3548 <property name="visible">True</property>
3549 <property name="can_focus">True</property>
3550 <property name="can_default">True</property>
3551- <property name="label">gtk-ok</property>
3552+ <property name="receives_default">False</property>
3553 <property name="use_stock">True</property>
3554- <property name="response_id">-5</property>
3555 </widget>
3556 <packing>
3557+ <property name="expand">False</property>
3558+ <property name="fill">False</property>
3559 <property name="position">1</property>
3560 </packing>
3561 </child>
3562 </widget>
3563 <packing>
3564 <property name="expand">False</property>
3565- <property name="pack_type">GTK_PACK_END</property>
3566+ <property name="pack_type">end</property>
3567+ <property name="position">0</property>
3568 </packing>
3569 </child>
3570 </widget>
3571@@ -6220,8 +6275,8 @@
3572 </widget>
3573 <widget class="GtkDialog" id="win_server">
3574 <property name="title" translatable="yes">Server</property>
3575- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
3576- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
3577+ <property name="window_position">center-on-parent</property>
3578+ <property name="type_hint">dialog</property>
3579 <child internal-child="vbox">
3580 <widget class="GtkVBox" id="dialog-vbox23">
3581 <property name="visible">True</property>
3582@@ -6352,34 +6407,44 @@
3583 <child internal-child="action_area">
3584 <widget class="GtkHButtonBox" id="dialog-action_area26">
3585 <property name="visible">True</property>
3586- <property name="layout_style">GTK_BUTTONBOX_END</property>
3587+ <property name="layout_style">end</property>
3588 <child>
3589 <widget class="GtkButton" id="cancelbutton17">
3590+ <property name="label">gtk-cancel</property>
3591+ <property name="response_id">-6</property>
3592 <property name="visible">True</property>
3593 <property name="can_focus">True</property>
3594 <property name="can_default">True</property>
3595- <property name="label">gtk-cancel</property>
3596+ <property name="receives_default">False</property>
3597 <property name="use_stock">True</property>
3598- <property name="response_id">-6</property>
3599 </widget>
3600+ <packing>
3601+ <property name="expand">False</property>
3602+ <property name="fill">False</property>
3603+ <property name="position">0</property>
3604+ </packing>
3605 </child>
3606 <child>
3607 <widget class="GtkButton" id="okbutton20">
3608+ <property name="label">gtk-ok</property>
3609+ <property name="response_id">-5</property>
3610 <property name="visible">True</property>
3611 <property name="can_focus">True</property>
3612 <property name="can_default">True</property>
3613- <property name="label">gtk-ok</property>
3614+ <property name="receives_default">False</property>
3615 <property name="use_stock">True</property>
3616- <property name="response_id">-5</property>
3617 </widget>
3618 <packing>
3619+ <property name="expand">False</property>
3620+ <property name="fill">False</property>
3621 <property name="position">1</property>
3622 </packing>
3623 </child>
3624 </widget>
3625 <packing>
3626 <property name="expand">False</property>
3627- <property name="pack_type">GTK_PACK_END</property>
3628+ <property name="pack_type">end</property>
3629+ <property name="position">0</property>
3630 </packing>
3631 </child>
3632 </widget>
3633@@ -6387,8 +6452,8 @@
3634 </widget>
3635 <widget class="GtkDialog" id="win_db_select">
3636 <property name="title" translatable="yes">Choose a database...</property>
3637- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
3638- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
3639+ <property name="window_position">center-on-parent</property>
3640+ <property name="type_hint">dialog</property>
3641 <child internal-child="vbox">
3642 <widget class="GtkVBox" id="dialog-vbox24">
3643 <property name="visible">True</property>
3644@@ -6407,6 +6472,7 @@
3645 <packing>
3646 <property name="expand">False</property>
3647 <property name="fill">False</property>
3648+ <property name="position">0</property>
3649 </packing>
3650 </child>
3651 <child>
3652@@ -6434,7 +6500,7 @@
3653 <property name="xpad">3</property>
3654 <property name="ypad">3</property>
3655 <property name="label" translatable="yes">Password:</property>
3656- <property name="justify">GTK_JUSTIFY_RIGHT</property>
3657+ <property name="justify">right</property>
3658 </widget>
3659 <packing>
3660 <property name="top_attach">1</property>
3661@@ -6463,16 +6529,9 @@
3662 <widget class="GtkComboBox" id="combo_db_select">
3663 <property name="visible">True</property>
3664 </widget>
3665- </child>
3666- <child>
3667- <widget class="GtkEntry" id="entry_db_select">
3668- <property name="visible">True</property>
3669- </widget>
3670- <packing>
3671- <property name="expand">False</property>
3672- <property name="fill">False</property>
3673- <property name="position">1</property>
3674- </packing>
3675+ <packing>
3676+ <property name="position">0</property>
3677+ </packing>
3678 </child>
3679 <child>
3680 <widget class="GtkLabel" id="label_db_select">
3681@@ -6486,6 +6545,16 @@
3682 <property name="position">1</property>
3683 </packing>
3684 </child>
3685+ <child>
3686+ <widget class="GtkEntry" id="entry_db_select">
3687+ <property name="visible">True</property>
3688+ </widget>
3689+ <packing>
3690+ <property name="expand">False</property>
3691+ <property name="fill">False</property>
3692+ <property name="position">1</property>
3693+ </packing>
3694+ </child>
3695 </widget>
3696 <packing>
3697 <property name="left_attach">1</property>
3698@@ -6532,7 +6601,7 @@
3699 <widget class="GtkButton" id="but_server_select">
3700 <property name="visible">True</property>
3701 <property name="can_focus">True</property>
3702- <property name="response_id">0</property>
3703+ <property name="receives_default">False</property>
3704 <signal name="activate" handler="on_but_server_activate"/>
3705 <child>
3706 <widget class="GtkAlignment" id="alignment50">
3707@@ -6547,11 +6616,12 @@
3708 <widget class="GtkImage" id="image3411">
3709 <property name="visible">True</property>
3710 <property name="stock">gtk-network</property>
3711- <property name="icon_size">1</property>
3712+ <property name="icon-size">1</property>
3713 </widget>
3714 <packing>
3715 <property name="expand">False</property>
3716 <property name="fill">False</property>
3717+ <property name="position">0</property>
3718 </packing>
3719 </child>
3720 <child>
3721@@ -6608,34 +6678,44 @@
3722 <child internal-child="action_area">
3723 <widget class="GtkHButtonBox" id="dialog-action_area27">
3724 <property name="visible">True</property>
3725- <property name="layout_style">GTK_BUTTONBOX_END</property>
3726+ <property name="layout_style">end</property>
3727 <child>
3728 <widget class="GtkButton" id="cancelbutton18">
3729+ <property name="label">gtk-cancel</property>
3730+ <property name="response_id">-6</property>
3731 <property name="visible">True</property>
3732 <property name="can_focus">True</property>
3733 <property name="can_default">True</property>
3734- <property name="label">gtk-cancel</property>
3735+ <property name="receives_default">False</property>
3736 <property name="use_stock">True</property>
3737- <property name="response_id">-6</property>
3738 </widget>
3739+ <packing>
3740+ <property name="expand">False</property>
3741+ <property name="fill">False</property>
3742+ <property name="position">0</property>
3743+ </packing>
3744 </child>
3745 <child>
3746 <widget class="GtkButton" id="okbutton21">
3747+ <property name="label">gtk-ok</property>
3748+ <property name="response_id">-5</property>
3749 <property name="visible">True</property>
3750 <property name="can_focus">True</property>
3751 <property name="can_default">True</property>
3752- <property name="label">gtk-ok</property>
3753+ <property name="receives_default">False</property>
3754 <property name="use_stock">True</property>
3755- <property name="response_id">-5</property>
3756 </widget>
3757 <packing>
3758+ <property name="expand">False</property>
3759+ <property name="fill">False</property>
3760 <property name="position">1</property>
3761 </packing>
3762 </child>
3763 </widget>
3764 <packing>
3765 <property name="expand">False</property>
3766- <property name="pack_type">GTK_PACK_END</property>
3767+ <property name="pack_type">end</property>
3768+ <property name="position">0</property>
3769 </packing>
3770 </child>
3771 </widget>
3772@@ -6643,8 +6723,8 @@
3773 </widget>
3774 <widget class="GtkDialog" id="win_db_ent">
3775 <property name="title" translatable="yes">Restore a database</property>
3776- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
3777- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
3778+ <property name="window_position">center-on-parent</property>
3779+ <property name="type_hint">dialog</property>
3780 <child internal-child="vbox">
3781 <widget class="GtkVBox" id="dialog-vbox25">
3782 <property name="visible">True</property>
3783@@ -6661,6 +6741,7 @@
3784 <packing>
3785 <property name="expand">False</property>
3786 <property name="fill">False</property>
3787+ <property name="position">0</property>
3788 </packing>
3789 </child>
3790 <child>
3791@@ -6682,9 +6763,6 @@
3792 <property name="column_spacing">3</property>
3793 <property name="row_spacing">3</property>
3794 <child>
3795- <placeholder/>
3796- </child>
3797- <child>
3798 <widget class="GtkHSeparator" id="hseparator37">
3799 <property name="visible">True</property>
3800 </widget>
3801@@ -6745,7 +6823,7 @@
3802 <property name="xpad">3</property>
3803 <property name="ypad">3</property>
3804 <property name="label" translatable="yes">Password:</property>
3805- <property name="justify">GTK_JUSTIFY_RIGHT</property>
3806+ <property name="justify">right</property>
3807 </widget>
3808 <packing>
3809 <property name="top_attach">1</property>
3810@@ -6776,7 +6854,7 @@
3811 <widget class="GtkButton" id="but_server_change">
3812 <property name="visible">True</property>
3813 <property name="can_focus">True</property>
3814- <property name="response_id">0</property>
3815+ <property name="receives_default">False</property>
3816 <signal name="activate" handler="on_but_server_activate"/>
3817 <child>
3818 <widget class="GtkAlignment" id="alignment51">
3819@@ -6791,11 +6869,12 @@
3820 <widget class="GtkImage" id="image3412">
3821 <property name="visible">True</property>
3822 <property name="stock">gtk-network</property>
3823- <property name="icon_size">2</property>
3824+ <property name="icon-size">2</property>
3825 </widget>
3826 <packing>
3827 <property name="expand">False</property>
3828 <property name="fill">False</property>
3829+ <property name="position">0</property>
3830 </packing>
3831 </child>
3832 <child>
3833@@ -6851,6 +6930,9 @@
3834 <property name="y_options"></property>
3835 </packing>
3836 </child>
3837+ <child>
3838+ <placeholder/>
3839+ </child>
3840 </widget>
3841 <packing>
3842 <property name="expand">False</property>
3843@@ -6868,35 +6950,45 @@
3844 <child internal-child="action_area">
3845 <widget class="GtkHButtonBox" id="dialog-action_area28">
3846 <property name="visible">True</property>
3847- <property name="layout_style">GTK_BUTTONBOX_END</property>
3848+ <property name="layout_style">end</property>
3849 <child>
3850 <widget class="GtkButton" id="cancelbutton19">
3851+ <property name="label">gtk-cancel</property>
3852+ <property name="response_id">-6</property>
3853 <property name="visible">True</property>
3854 <property name="can_focus">True</property>
3855 <property name="can_default">True</property>
3856- <property name="label">gtk-cancel</property>
3857+ <property name="receives_default">False</property>
3858 <property name="use_stock">True</property>
3859- <property name="response_id">-6</property>
3860 </widget>
3861+ <packing>
3862+ <property name="expand">False</property>
3863+ <property name="fill">False</property>
3864+ <property name="position">0</property>
3865+ </packing>
3866 </child>
3867 <child>
3868 <widget class="GtkButton" id="okbutton22">
3869+ <property name="label">gtk-ok</property>
3870+ <property name="response_id">-5</property>
3871 <property name="visible">True</property>
3872 <property name="can_focus">True</property>
3873 <property name="can_default">True</property>
3874 <property name="has_default">True</property>
3875- <property name="label">gtk-ok</property>
3876+ <property name="receives_default">False</property>
3877 <property name="use_stock">True</property>
3878- <property name="response_id">-5</property>
3879 </widget>
3880 <packing>
3881+ <property name="expand">False</property>
3882+ <property name="fill">False</property>
3883 <property name="position">1</property>
3884 </packing>
3885 </child>
3886 </widget>
3887 <packing>
3888 <property name="expand">False</property>
3889- <property name="pack_type">GTK_PACK_END</property>
3890+ <property name="pack_type">end</property>
3891+ <property name="position">0</property>
3892 </packing>
3893 </child>
3894 </widget>
3895@@ -6905,10 +6997,9 @@
3896 <widget class="GtkDialog" id="win_createdb">
3897 <property name="title" translatable="yes">Create a new database</property>
3898 <property name="modal">True</property>
3899- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
3900+ <property name="window_position">center-on-parent</property>
3901 <property name="destroy_with_parent">True</property>
3902- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
3903- <property name="has_separator">False</property>
3904+ <property name="type_hint">dialog</property>
3905 <child internal-child="vbox">
3906 <widget class="GtkVBox" id="vbox52">
3907 <property name="visible">True</property>
3908@@ -6946,18 +7037,6 @@
3909 <property name="column_spacing">5</property>
3910 <property name="row_spacing">5</property>
3911 <child>
3912- <placeholder/>
3913- </child>
3914- <child>
3915- <placeholder/>
3916- </child>
3917- <child>
3918- <placeholder/>
3919- </child>
3920- <child>
3921- <placeholder/>
3922- </child>
3923- <child>
3924 <widget class="GtkHSeparator" id="hseparator33">
3925 <property name="visible">True</property>
3926 </widget>
3927@@ -7028,7 +7107,7 @@
3928 <property name="ypad">3</property>
3929 <property name="label" translatable="yes">&lt;sup&gt;&lt;b&gt;&lt;span foreground="dark green"&gt;?&lt;/span&gt;&lt;/b&gt;&lt;/sup&gt;Super Administrator Password:</property>
3930 <property name="use_markup">True</property>
3931- <property name="justify">GTK_JUSTIFY_RIGHT</property>
3932+ <property name="justify">right</property>
3933 </widget>
3934 <packing>
3935 <property name="top_attach">1</property>
3936@@ -7075,7 +7154,7 @@
3937 <widget class="GtkButton" id="but_server_new">
3938 <property name="visible">True</property>
3939 <property name="can_focus">True</property>
3940- <property name="response_id">0</property>
3941+ <property name="receives_default">False</property>
3942 <signal name="activate" handler="on_but_server_activate"/>
3943 <child>
3944 <widget class="GtkAlignment" id="alignment49">
3945@@ -7090,11 +7169,12 @@
3946 <widget class="GtkImage" id="image3410">
3947 <property name="visible">True</property>
3948 <property name="stock">gtk-network</property>
3949- <property name="icon_size">1</property>
3950+ <property name="icon-size">1</property>
3951 </widget>
3952 <packing>
3953 <property name="expand">False</property>
3954 <property name="fill">False</property>
3955+ <property name="position">0</property>
3956 </packing>
3957 </child>
3958 <child>
3959@@ -7184,7 +7264,7 @@
3960 <property name="tooltip" translatable="yes">This is the password of the 'admin' user that will be created in your new database. It has to be the same than the above field.</property>
3961 <property name="xalign">1</property>
3962 <property name="label" translatable="yes">&lt;sup&gt;&lt;b&gt;&lt;span foreground="dark green"&gt;?&lt;/span&gt;&lt;/b&gt;&lt;/sup&gt;Confirm Password:</property>
3963- <property name="use_markup">True</property>
3964+ <property name="use_markup">True</property>
3965 </widget>
3966 <packing>
3967 <property name="top_attach">8</property>
3968@@ -7197,7 +7277,7 @@
3969 <widget class="GtkCheckButton" id="check_demo">
3970 <property name="visible">True</property>
3971 <property name="can_focus">True</property>
3972- <property name="response_id">0</property>
3973+ <property name="receives_default">False</property>
3974 <property name="draw_indicator">True</property>
3975 <child>
3976 <placeholder/>
3977@@ -7291,6 +7371,18 @@
3978 <property name="y_options"></property>
3979 </packing>
3980 </child>
3981+ <child>
3982+ <placeholder/>
3983+ </child>
3984+ <child>
3985+ <placeholder/>
3986+ </child>
3987+ <child>
3988+ <placeholder/>
3989+ </child>
3990+ <child>
3991+ <placeholder/>
3992+ </child>
3993 </widget>
3994 </child>
3995 </widget>
3996@@ -7299,47 +7391,57 @@
3997 <property name="position">3</property>
3998 </packing>
3999 </child>
4000- <child>
4001- <widget class="GtkHSeparator" id="button_separator">
4002- <property name="visible">True</property>
4003- </widget>
4004- <packing>
4005- <property name="expand">False</property>
4006- <property name="position">4</property>
4007- </packing>
4008+ <child>
4009+ <widget class="GtkHSeparator" id="button_separator">
4010+ <property name="visible">True</property>
4011+ </widget>
4012+ <packing>
4013+ <property name="expand">False</property>
4014+ <property name="position">4</property>
4015+ </packing>
4016 </child>
4017 <child internal-child="action_area">
4018 <widget class="GtkHButtonBox" id="hbuttonbox7">
4019 <property name="visible">True</property>
4020- <property name="layout_style">GTK_BUTTONBOX_END</property>
4021+ <property name="layout_style">end</property>
4022 <child>
4023 <widget class="GtkButton" id="button2">
4024+ <property name="label">gtk-cancel</property>
4025+ <property name="response_id">-6</property>
4026 <property name="visible">True</property>
4027 <property name="can_focus">True</property>
4028 <property name="can_default">True</property>
4029- <property name="label">gtk-cancel</property>
4030+ <property name="receives_default">False</property>
4031 <property name="use_stock">True</property>
4032- <property name="response_id">-6</property>
4033 </widget>
4034+ <packing>
4035+ <property name="expand">False</property>
4036+ <property name="fill">False</property>
4037+ <property name="position">0</property>
4038+ </packing>
4039 </child>
4040 <child>
4041 <widget class="GtkButton" id="button_db_ok">
4042+ <property name="label">gtk-ok</property>
4043+ <property name="response_id">-5</property>
4044 <property name="visible">True</property>
4045 <property name="sensitive">False</property>
4046 <property name="can_focus">True</property>
4047 <property name="can_default">True</property>
4048- <property name="label">gtk-ok</property>
4049+ <property name="receives_default">False</property>
4050 <property name="use_stock">True</property>
4051- <property name="response_id">-5</property>
4052 </widget>
4053 <packing>
4054+ <property name="expand">False</property>
4055+ <property name="fill">False</property>
4056 <property name="position">1</property>
4057 </packing>
4058 </child>
4059 </widget>
4060 <packing>
4061 <property name="expand">False</property>
4062- <property name="pack_type">GTK_PACK_END</property>
4063+ <property name="pack_type">end</property>
4064+ <property name="position">0</property>
4065 </packing>
4066 </child>
4067 </widget>
4068@@ -7347,10 +7449,10 @@
4069 </widget>
4070 <widget class="GtkDialog" id="dia_passwd_change">
4071 <property name="title" translatable="yes">Change password</property>
4072- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
4073+ <property name="window_position">center-on-parent</property>
4074 <property name="default_width">400</property>
4075 <property name="default_height">180</property>
4076- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
4077+ <property name="type_hint">dialog</property>
4078 <child internal-child="vbox">
4079 <widget class="GtkVBox" id="dia_passwd_change_vbox">
4080 <property name="visible">True</property>
4081@@ -7369,6 +7471,7 @@
4082 <packing>
4083 <property name="expand">False</property>
4084 <property name="fill">False</property>
4085+ <property name="position">0</property>
4086 </packing>
4087 </child>
4088 <child>
4089@@ -7437,7 +7540,7 @@
4090 <widget class="GtkButton" id="but_server_change1">
4091 <property name="visible">True</property>
4092 <property name="can_focus">True</property>
4093- <property name="response_id">0</property>
4094+ <property name="receives_default">False</property>
4095 <signal name="activate" handler="on_but_server_activate"/>
4096 <child>
4097 <widget class="GtkAlignment" id="alignment53">
4098@@ -7452,11 +7555,12 @@
4099 <widget class="GtkImage" id="image3484">
4100 <property name="visible">True</property>
4101 <property name="stock">gtk-network</property>
4102- <property name="icon_size">1</property>
4103+ <property name="icon-size">1</property>
4104 </widget>
4105 <packing>
4106 <property name="expand">False</property>
4107 <property name="fill">False</property>
4108+ <property name="position">0</property>
4109 </packing>
4110 </child>
4111 <child>
4112@@ -7564,35 +7668,45 @@
4113 <child internal-child="action_area">
4114 <widget class="GtkHButtonBox" id="dialog-action_area29">
4115 <property name="visible">True</property>
4116- <property name="layout_style">GTK_BUTTONBOX_END</property>
4117+ <property name="layout_style">end</property>
4118 <child>
4119 <widget class="GtkButton" id="cancelbutton20">
4120+ <property name="label">gtk-cancel</property>
4121+ <property name="response_id">-6</property>
4122 <property name="visible">True</property>
4123 <property name="can_focus">True</property>
4124 <property name="can_default">True</property>
4125- <property name="label">gtk-cancel</property>
4126+ <property name="receives_default">False</property>
4127 <property name="use_stock">True</property>
4128- <property name="response_id">-6</property>
4129 </widget>
4130+ <packing>
4131+ <property name="expand">False</property>
4132+ <property name="fill">False</property>
4133+ <property name="position">0</property>
4134+ </packing>
4135 </child>
4136 <child>
4137 <widget class="GtkButton" id="okbutton23">
4138+ <property name="label">gtk-ok</property>
4139+ <property name="response_id">-5</property>
4140 <property name="visible">True</property>
4141 <property name="can_focus">True</property>
4142 <property name="can_default">True</property>
4143 <property name="has_default">True</property>
4144- <property name="label">gtk-ok</property>
4145+ <property name="receives_default">False</property>
4146 <property name="use_stock">True</property>
4147- <property name="response_id">-5</property>
4148 </widget>
4149 <packing>
4150+ <property name="expand">False</property>
4151+ <property name="fill">False</property>
4152 <property name="position">1</property>
4153 </packing>
4154 </child>
4155 </widget>
4156 <packing>
4157 <property name="expand">False</property>
4158- <property name="pack_type">GTK_PACK_END</property>
4159+ <property name="pack_type">end</property>
4160+ <property name="position">0</property>
4161 </packing>
4162 </child>
4163 </widget>
4164@@ -7602,8 +7716,8 @@
4165 <property name="width_request">450</property>
4166 <property name="height_request">250</property>
4167 <property name="title" translatable="yes">OpenERP Message</property>
4168- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
4169- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
4170+ <property name="window_position">center-on-parent</property>
4171+ <property name="type_hint">dialog</property>
4172 <child internal-child="vbox">
4173 <widget class="GtkVBox" id="dialog-vbox26">
4174 <property name="visible">True</property>
4175@@ -7618,6 +7732,7 @@
4176 <packing>
4177 <property name="expand">False</property>
4178 <property name="fill">False</property>
4179+ <property name="position">0</property>
4180 </packing>
4181 </child>
4182 <child>
4183@@ -7635,9 +7750,9 @@
4184 <widget class="GtkScrolledWindow" id="scrolledwindow42">
4185 <property name="visible">True</property>
4186 <property name="can_focus">True</property>
4187- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
4188- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
4189- <property name="shadow_type">GTK_SHADOW_IN</property>
4190+ <property name="hscrollbar_policy">automatic</property>
4191+ <property name="vscrollbar_policy">automatic</property>
4192+ <property name="shadow_type">in</property>
4193 <child>
4194 <widget class="GtkTextView" id="msg_tv">
4195 <property name="visible">True</property>
4196@@ -7657,21 +7772,28 @@
4197 <child internal-child="action_area">
4198 <widget class="GtkHButtonBox" id="dialog-action_area30">
4199 <property name="visible">True</property>
4200- <property name="layout_style">GTK_BUTTONBOX_END</property>
4201+ <property name="layout_style">end</property>
4202 <child>
4203 <widget class="GtkButton" id="closebutton2">
4204+ <property name="label">gtk-close</property>
4205+ <property name="response_id">-7</property>
4206 <property name="visible">True</property>
4207 <property name="can_focus">True</property>
4208 <property name="can_default">True</property>
4209- <property name="label">gtk-close</property>
4210+ <property name="receives_default">False</property>
4211 <property name="use_stock">True</property>
4212- <property name="response_id">-7</property>
4213 </widget>
4214+ <packing>
4215+ <property name="expand">False</property>
4216+ <property name="fill">False</property>
4217+ <property name="position">0</property>
4218+ </packing>
4219 </child>
4220 </widget>
4221 <packing>
4222 <property name="expand">False</property>
4223- <property name="pack_type">GTK_PACK_END</property>
4224+ <property name="pack_type">end</property>
4225+ <property name="position">0</property>
4226 </packing>
4227 </child>
4228 </widget>
4229@@ -7683,11 +7805,10 @@
4230 <property name="border_width">5</property>
4231 <property name="title" translatable="yes">Extension Manager</property>
4232 <property name="modal">True</property>
4233- <property name="window_position">GTK_WIN_POS_CENTER</property>
4234+ <property name="window_position">center</property>
4235 <property name="default_width">800</property>
4236 <property name="default_height">640</property>
4237- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
4238- <property name="has_separator">False</property>
4239+ <property name="type_hint">dialog</property>
4240 <child internal-child="vbox">
4241 <widget class="GtkVBox" id="dialog-vbox37">
4242 <property name="visible">True</property>
4243@@ -7699,8 +7820,8 @@
4244 <widget class="GtkScrolledWindow" id="scrolledwindow2">
4245 <property name="visible">True</property>
4246 <property name="can_focus">True</property>
4247- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
4248- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
4249+ <property name="hscrollbar_policy">automatic</property>
4250+ <property name="vscrollbar_policy">automatic</property>
4251 <child>
4252 <widget class="GtkTreeView" id="treeview_extension">
4253 <property name="visible">True</property>
4254@@ -7709,32 +7830,42 @@
4255 </widget>
4256 </child>
4257 </widget>
4258+ <packing>
4259+ <property name="position">0</property>
4260+ </packing>
4261 </child>
4262 <child>
4263 <widget class="GtkVButtonBox" id="vbuttonbox1">
4264 <property name="visible">True</property>
4265 <property name="spacing">5</property>
4266- <property name="layout_style">GTK_BUTTONBOX_START</property>
4267+ <property name="layout_style">start</property>
4268 <child>
4269 <widget class="GtkButton" id="button3">
4270- <property name="visible">True</property>
4271- <property name="can_focus">True</property>
4272 <property name="label">gtk-add</property>
4273+ <property name="visible">True</property>
4274+ <property name="can_focus">True</property>
4275+ <property name="receives_default">False</property>
4276 <property name="use_stock">True</property>
4277- <property name="response_id">0</property>
4278 <signal name="clicked" handler="on_button5_clicked"/>
4279 </widget>
4280+ <packing>
4281+ <property name="expand">False</property>
4282+ <property name="fill">False</property>
4283+ <property name="position">0</property>
4284+ </packing>
4285 </child>
4286 <child>
4287 <widget class="GtkButton" id="button8">
4288- <property name="visible">True</property>
4289- <property name="can_focus">True</property>
4290 <property name="label">gtk-delete</property>
4291+ <property name="visible">True</property>
4292+ <property name="can_focus">True</property>
4293+ <property name="receives_default">False</property>
4294 <property name="use_stock">True</property>
4295- <property name="response_id">0</property>
4296 <signal name="clicked" handler="on_button6_clicked"/>
4297 </widget>
4298 <packing>
4299+ <property name="expand">False</property>
4300+ <property name="fill">False</property>
4301 <property name="position">1</property>
4302 </packing>
4303 </child>
4304@@ -7753,32 +7884,42 @@
4305 <child internal-child="action_area">
4306 <widget class="GtkHButtonBox" id="dialog-action_area38">
4307 <property name="visible">True</property>
4308- <property name="layout_style">GTK_BUTTONBOX_END</property>
4309+ <property name="layout_style">end</property>
4310 <child>
4311 <widget class="GtkButton" id="button9">
4312+ <property name="label">gtk-cancel</property>
4313+ <property name="response_id">-6</property>
4314 <property name="visible">True</property>
4315 <property name="can_focus">True</property>
4316- <property name="label">gtk-cancel</property>
4317+ <property name="receives_default">False</property>
4318 <property name="use_stock">True</property>
4319- <property name="response_id">-6</property>
4320 </widget>
4321+ <packing>
4322+ <property name="expand">False</property>
4323+ <property name="fill">False</property>
4324+ <property name="position">0</property>
4325+ </packing>
4326 </child>
4327 <child>
4328 <widget class="GtkButton" id="button10">
4329+ <property name="label">gtk-ok</property>
4330+ <property name="response_id">-5</property>
4331 <property name="visible">True</property>
4332 <property name="can_focus">True</property>
4333- <property name="label">gtk-ok</property>
4334+ <property name="receives_default">False</property>
4335 <property name="use_stock">True</property>
4336- <property name="response_id">-5</property>
4337 </widget>
4338 <packing>
4339+ <property name="expand">False</property>
4340+ <property name="fill">False</property>
4341 <property name="position">1</property>
4342 </packing>
4343 </child>
4344 </widget>
4345 <packing>
4346 <property name="expand">False</property>
4347- <property name="pack_type">GTK_PACK_END</property>
4348+ <property name="pack_type">end</property>
4349+ <property name="position">0</property>
4350 </packing>
4351 </child>
4352 </widget>
4353@@ -7787,7 +7928,7 @@
4354 <widget class="GtkDialog" id="dialog_concurrency_exception">
4355 <property name="title" translatable="yes">Concurrency exception</property>
4356 <property name="default_width">87</property>
4357- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
4358+ <property name="type_hint">dialog</property>
4359 <child internal-child="vbox">
4360 <widget class="GtkVBox" id="dialog-vbox28">
4361 <property name="visible">True</property>
4362@@ -7799,8 +7940,11 @@
4363 <property name="width_request">33</property>
4364 <property name="visible">True</property>
4365 <property name="stock">gtk-dialog-info</property>
4366- <property name="icon_size">6</property>
4367+ <property name="icon-size">6</property>
4368 </widget>
4369+ <packing>
4370+ <property name="position">0</property>
4371+ </packing>
4372 </child>
4373 <child>
4374 <widget class="GtkLabel" id="label46562">
4375@@ -7834,23 +7978,30 @@
4376 <child internal-child="action_area">
4377 <widget class="GtkHButtonBox" id="dialog-action_area32">
4378 <property name="visible">True</property>
4379- <property name="layout_style">GTK_BUTTONBOX_END</property>
4380+ <property name="layout_style">end</property>
4381 <child>
4382 <widget class="GtkButton" id="button_cancel">
4383+ <property name="label">gtk-cancel</property>
4384+ <property name="response_id">-6</property>
4385 <property name="visible">True</property>
4386 <property name="can_focus">True</property>
4387 <property name="can_default">True</property>
4388- <property name="label">gtk-cancel</property>
4389+ <property name="receives_default">False</property>
4390 <property name="use_stock">True</property>
4391- <property name="response_id">-6</property>
4392 </widget>
4393+ <packing>
4394+ <property name="expand">False</property>
4395+ <property name="fill">False</property>
4396+ <property name="position">0</property>
4397+ </packing>
4398 </child>
4399 <child>
4400 <widget class="GtkButton" id="button93">
4401+ <property name="response_id">-10</property>
4402 <property name="visible">True</property>
4403 <property name="can_focus">True</property>
4404 <property name="can_default">True</property>
4405- <property name="response_id">-10</property>
4406+ <property name="receives_default">False</property>
4407 <child>
4408 <widget class="GtkAlignment" id="alignment58">
4409 <property name="visible">True</property>
4410@@ -7868,6 +8019,7 @@
4411 <packing>
4412 <property name="expand">False</property>
4413 <property name="fill">False</property>
4414+ <property name="position">0</property>
4415 </packing>
4416 </child>
4417 <child>
4418@@ -7888,15 +8040,18 @@
4419 </child>
4420 </widget>
4421 <packing>
4422+ <property name="expand">False</property>
4423+ <property name="fill">False</property>
4424 <property name="position">1</property>
4425 </packing>
4426 </child>
4427 <child>
4428 <widget class="GtkButton" id="button94">
4429+ <property name="response_id">-5</property>
4430 <property name="visible">True</property>
4431 <property name="can_focus">True</property>
4432 <property name="can_default">True</property>
4433- <property name="response_id">-5</property>
4434+ <property name="receives_default">False</property>
4435 <child>
4436 <widget class="GtkAlignment" id="alignment57">
4437 <property name="visible">True</property>
4438@@ -7914,6 +8069,7 @@
4439 <packing>
4440 <property name="expand">False</property>
4441 <property name="fill">False</property>
4442+ <property name="position">0</property>
4443 </packing>
4444 </child>
4445 <child>
4446@@ -7934,29 +8090,30 @@
4447 </child>
4448 </widget>
4449 <packing>
4450+ <property name="expand">False</property>
4451+ <property name="fill">False</property>
4452 <property name="position">2</property>
4453 </packing>
4454 </child>
4455 </widget>
4456 <packing>
4457 <property name="expand">False</property>
4458- <property name="pack_type">GTK_PACK_END</property>
4459+ <property name="pack_type">end</property>
4460+ <property name="position">0</property>
4461 </packing>
4462 </child>
4463 </widget>
4464 </child>
4465 </widget>
4466-
4467 <widget class="GtkWindow" id="win_view_diagram">
4468 <property name="visible">True</property>
4469 <property name="title" translatable="yes">window1</property>
4470 <child>
4471 <widget class="GtkVBox" id="widget_view_diagram">
4472 <property name="visible">True</property>
4473- </widget>
4474- </child>
4475+ </widget>
4476+ </child>
4477 </widget>
4478-
4479 <widget class="GtkWindow" id="win_view_calendar">
4480 <property name="visible">True</property>
4481 <property name="title" translatable="yes">window1</property>
4482@@ -7977,14 +8134,15 @@
4483 </widget>
4484 <packing>
4485 <property name="expand">False</property>
4486+ <property name="position">0</property>
4487 </packing>
4488 </child>
4489 <child>
4490 <widget class="GtkScrolledWindow" id="scrolledwindow46">
4491 <property name="visible">True</property>
4492 <property name="can_focus">True</property>
4493- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
4494- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
4495+ <property name="hscrollbar_policy">automatic</property>
4496+ <property name="vscrollbar_policy">automatic</property>
4497 <child>
4498 <widget class="GtkTreeView" id="calendar_treeview">
4499 <property name="visible">True</property>
4500@@ -8012,8 +8170,8 @@
4501 <widget class="GtkButton" id="but_back">
4502 <property name="visible">True</property>
4503 <property name="can_focus">True</property>
4504- <property name="relief">GTK_RELIEF_NONE</property>
4505- <property name="response_id">0</property>
4506+ <property name="receives_default">False</property>
4507+ <property name="relief">none</property>
4508 <signal name="clicked" handler="on_but_back_clicked"/>
4509 <child>
4510 <widget class="GtkImage" id="image4247">
4511@@ -8025,16 +8183,17 @@
4512 <packing>
4513 <property name="expand">False</property>
4514 <property name="fill">False</property>
4515+ <property name="position">0</property>
4516 </packing>
4517 </child>
4518 <child>
4519 <widget class="GtkButton" id="but_today">
4520- <property name="visible">True</property>
4521- <property name="can_focus">True</property>
4522 <property name="label" translatable="yes">Today</property>
4523- <property name="relief">GTK_RELIEF_NONE</property>
4524+ <property name="visible">True</property>
4525+ <property name="can_focus">True</property>
4526+ <property name="receives_default">False</property>
4527+ <property name="relief">none</property>
4528 <property name="use_underline">True</property>
4529- <property name="response_id">0</property>
4530 <signal name="clicked" handler="on_but_today_clicked"/>
4531 </widget>
4532 <packing>
4533@@ -8047,8 +8206,8 @@
4534 <widget class="GtkButton" id="but_forward">
4535 <property name="visible">True</property>
4536 <property name="can_focus">True</property>
4537- <property name="relief">GTK_RELIEF_NONE</property>
4538- <property name="response_id">0</property>
4539+ <property name="receives_default">False</property>
4540+ <property name="relief">none</property>
4541 <signal name="clicked" handler="on_but_forward_clicked"/>
4542 <child>
4543 <widget class="GtkImage" id="image4248">
4544@@ -8087,7 +8246,7 @@
4545 <child>
4546 <widget class="GtkToolbar" id="toolbar11">
4547 <property name="visible">True</property>
4548- <property name="toolbar_style">GTK_TOOLBAR_TEXT</property>
4549+ <property name="toolbar_style">text</property>
4550 <child>
4551 <widget class="GtkRadioToolButton" id="radio_day">
4552 <property name="visible">True</property>
4553@@ -8097,6 +8256,7 @@
4554 <signal name="clicked" handler="on_button_day_clicked"/>
4555 </widget>
4556 <packing>
4557+ <property name="expand">False</property>
4558 <property name="homogeneous">True</property>
4559 </packing>
4560 </child>
4561@@ -8109,6 +8269,7 @@
4562 <signal name="clicked" handler="on_button_week_clicked"/>
4563 </widget>
4564 <packing>
4565+ <property name="expand">False</property>
4566 <property name="homogeneous">True</property>
4567 </packing>
4568 </child>
4569@@ -8121,18 +8282,20 @@
4570 <signal name="clicked" handler="on_button_month_clicked"/>
4571 </widget>
4572 <packing>
4573+ <property name="expand">False</property>
4574 <property name="homogeneous">True</property>
4575 </packing>
4576 </child>
4577 </widget>
4578 <packing>
4579- <property name="pack_type">GTK_PACK_END</property>
4580+ <property name="pack_type">end</property>
4581 <property name="position">5</property>
4582 </packing>
4583 </child>
4584 </widget>
4585 <packing>
4586 <property name="expand">False</property>
4587+ <property name="position">0</property>
4588 </packing>
4589 </child>
4590 <child>
4591@@ -8163,19 +8326,19 @@
4592 <property name="height_request">172</property>
4593 <property name="visible">True</property>
4594 <property name="can_focus">True</property>
4595- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
4596- <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
4597+ <property name="hscrollbar_policy">never</property>
4598+ <property name="vscrollbar_policy">never</property>
4599 <child>
4600 <widget class="GtkViewport" id="widget_paned2">
4601 <property name="visible">True</property>
4602- <property name="shadow_type">GTK_SHADOW_NONE</property>
4603+ <property name="shadow_type">none</property>
4604 <child>
4605 <widget class="GtkFrame" id="frame20">
4606 <property name="width_request">225</property>
4607 <property name="visible">True</property>
4608 <property name="border_width">3</property>
4609 <property name="label_xalign">0.5</property>
4610- <property name="shadow_type">GTK_SHADOW_IN</property>
4611+ <property name="shadow_type">in</property>
4612 <child>
4613 <widget class="GtkAlignment" id="alignment56">
4614 <property name="visible">True</property>
4615@@ -8201,6 +8364,9 @@
4616 <property name="xpad">10</property>
4617 <property name="label">label46559</property>
4618 </widget>
4619+ <packing>
4620+ <property name="position">0</property>
4621+ </packing>
4622 </child>
4623 <child>
4624 <widget class="GtkEventBox" id="eventbox21">
4625@@ -8270,17 +8436,17 @@
4626 <property name="visible">True</property>
4627 <property name="spacing">5</property>
4628 <child>
4629- <widget class="GtkComboBox" id="combo_fields">
4630- <property name="visible">True</property>
4631- <property name="can_focus">True</property>
4632- <property name="tooltip" translatable="yes">Fields on which Search criteria to be applied</property>
4633- <property name="items" translatable="yes"></property>
4634- </widget>
4635- <packing>
4636- <property name="expand">False</property>
4637- <property name="fill">False</property>
4638- <property name="position">1</property>
4639- </packing>
4640+ <widget class="GtkComboBox" id="combo_fields">
4641+ <property name="visible">True</property>
4642+ <property name="can_focus">True</property>
4643+ <property name="tooltip" translatable="yes">Fields on which Search criteria to be applied</property>
4644+ <property name="items" translatable="yes"></property>
4645+ </widget>
4646+ <packing>
4647+ <property name="expand">False</property>
4648+ <property name="fill">False</property>
4649+ <property name="position">1</property>
4650+ </packing>
4651 </child>
4652 <child>
4653 <widget class="GtkComboBox" id="combo_operator">
4654@@ -8298,7 +8464,6 @@
4655 <child>
4656 <widget class="GtkEntry" id="right_compare">
4657 <property name="visible">True</property>
4658- <property name="editable">True</property>
4659 <property name="can_focus">True</property>
4660 <property name="activates_default">True</property>
4661 <property name="width_chars">21</property>
4662@@ -8327,6 +8492,7 @@
4663 <widget class="GtkButton" id="remove_custom">
4664 <property name="visible">True</property>
4665 <property name="can_focus">True</property>
4666+ <property name="receives_default">False</property>
4667 <property name="tooltip" translatable="yes">Remove Filter</property>
4668 <signal name="button_press_event" handler="on_remove_custom"/>
4669 <child>
4670@@ -8349,8 +8515,8 @@
4671 <property name="title" translatable="yes">Filter Entry</property>
4672 <property name="resizable">False</property>
4673 <property name="modal">True</property>
4674- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
4675- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
4676+ <property name="window_position">center-on-parent</property>
4677+ <property name="type_hint">dialog</property>
4678 <child internal-child="vbox">
4679 <widget class="GtkVBox" id="dialog-vbox39">
4680 <property name="visible">True</property>
4681@@ -8360,13 +8526,12 @@
4682 <property name="n_rows">2</property>
4683 <property name="n_columns">2</property>
4684 <child>
4685- <widget class="GtkEntry" id="action_name">
4686- <property name="visible">True</property>
4687- <property name="editable">True</property>
4688- <property name="can_focus">True</property>
4689- <property name="activates_default">True</property>
4690- <property name="width_chars">6</property>
4691- </widget>
4692+ <widget class="GtkEntry" id="action_name">
4693+ <property name="visible">True</property>
4694+ <property name="can_focus">True</property>
4695+ <property name="activates_default">True</property>
4696+ <property name="width_chars">6</property>
4697+ </widget>
4698 <packing>
4699 <property name="left_attach">1</property>
4700 <property name="right_attach">2</property>
4701@@ -8380,7 +8545,7 @@
4702 <widget class="GtkImage" id="image1177">
4703 <property name="visible">True</property>
4704 <property name="stock">gtk-index</property>
4705- <property name="icon_size">5</property>
4706+ <property name="icon-size">5</property>
4707 </widget>
4708 <packing>
4709 <property name="bottom_attach">2</property>
4710@@ -8409,40 +8574,49 @@
4711 <child internal-child="action_area">
4712 <widget class="GtkHButtonBox" id="dialog-action_area22">
4713 <property name="visible">True</property>
4714- <property name="layout_style">GTK_BUTTONBOX_END</property>
4715+ <property name="layout_style">end</property>
4716 <child>
4717 <widget class="GtkButton" id="cancelbutton21">
4718+ <property name="label">gtk-cancel</property>
4719+ <property name="response_id">-6</property>
4720 <property name="visible">True</property>
4721 <property name="can_focus">True</property>
4722 <property name="can_default">True</property>
4723- <property name="label">gtk-cancel</property>
4724+ <property name="receives_default">False</property>
4725 <property name="use_stock">True</property>
4726- <property name="response_id">-6</property>
4727 </widget>
4728+ <packing>
4729+ <property name="expand">False</property>
4730+ <property name="fill">False</property>
4731+ <property name="position">0</property>
4732+ </packing>
4733 </child>
4734 <child>
4735 <widget class="GtkButton" id="okbutton24">
4736+ <property name="label">gtk-ok</property>
4737+ <property name="response_id">-5</property>
4738 <property name="visible">True</property>
4739 <property name="can_focus">True</property>
4740 <property name="can_default">True</property>
4741 <property name="has_default">True</property>
4742- <property name="label">gtk-ok</property>
4743+ <property name="receives_default">False</property>
4744 <property name="use_stock">True</property>
4745- <property name="response_id">-5</property>
4746- <accelerator key="Return" modifiers="GDK_CONTROL_MASK" signal="clicked"/>
4747+ <accelerator key="Return" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
4748 </widget>
4749 <packing>
4750+ <property name="expand">False</property>
4751+ <property name="fill">False</property>
4752 <property name="position">1</property>
4753 </packing>
4754 </child>
4755 </widget>
4756 <packing>
4757 <property name="expand">False</property>
4758- <property name="pack_type">GTK_PACK_END</property>
4759+ <property name="pack_type">end</property>
4760+ <property name="position">0</property>
4761 </packing>
4762 </child>
4763 </widget>
4764 </child>
4765 </widget>
4766 </glade-interface>
4767-