PreventARES

Merge lp:~davide-vescovini/preventares/quickly_trunk into lp:preventares

  1. quickly_trunk
  2. Merge into main
Proposed by dav80
Status: Needs review
Proposed branch: lp:~davide-vescovini/preventares/quickly_trunk
Merge into: lp:preventares
Diff against target: 4279 lines (+943/-365)
14 files modified
.quickly (+1/-1)
bin/preventares (+16/-0)
data/ui/AboutPreventaresDialog.ui (+1/-1)
data/ui/ComputoWindow.ui (+665/-163)
debian/changelog (+26/-2)
debian/control (+1/-1)
debian/rules (+6/-0)
po/preventares.pot (+140/-140)
preventares/ComputoWindow.py (+27/-18)
preventares/import_elettro_mdb.py (+3/-3)
preventares/preventa_lib.py (+32/-17)
preventares/preventa_print.py (+23/-17)
preventares/preventaresconfig.py (+1/-1)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~davide-vescovini/preventares/quickly_trunk
Reviewer Review Type Date Requested Status
dav80 Approve
Review via email: mp+79753@code.launchpad.net
To post a comment you must log in.
Revision history for this message
dav80 (davide-vescovini) :
review: Approve
Reply
lp:~davide-vescovini/preventares/quickly_trunk updated
14. By dav80

bugfix

15. By dav80

Esecuzione commit prima del rilascio

16. By dav80

quickly released: 12.04.1

Unmerged revisions

16. By dav80

quickly released: 12.04.1

15. By dav80

Esecuzione commit prima del rilascio

14. By dav80

bugfix

13. By dav80

quickly released: 11.10

12. By dav80

commit before release

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.quickly'
2--- .quickly 2011-06-11 00:01:54 +0000
3+++ .quickly 2012-04-12 22:42:17 +0000
4@@ -1,5 +1,5 @@
5 project = preventares
6-version = 11.04
7+version = 11.10
8 template = ubuntu-application
9 ppa = dav80-repository
10 lp_id = preventares
11
12=== modified file 'bin/preventares'
13--- bin/preventares 2011-10-06 21:04:30 +0000
14+++ bin/preventares 2012-04-12 22:42:17 +0000
15@@ -173,6 +173,22 @@
16 # legge i file di configurazione (o li crea se non esistono)
17 self.computo_settings = self.get_settings(UI_DEFAULT_SETTINGS, SECTION_UI)
18 self.preventa_settings = self.get_settings(PREVENTA_LIB_DEFAULT_SETTINGS, SECTION_LIB)
19+ # verifica se esiste il file l'archivio e lo crea se non esiste
20+ if not os.path.isfile(self.computo_settings['main_archive_filename']):
21+ from preventares.preventa_lib import Preventivo
22+ new_archivio = Preventivo(self.computo_settings['main_archive_filename'])
23+ new_archivio.save_database()
24+ new_archivio.connection_shutdown()
25+ else:
26+ pass #logging.debug("Archive {0} existant".format(self.computo_settings['main_archive_filename']))
27+ # verifica se esiste il file metel e lo crea se non esiste
28+ if not os.path.isfile(self.computo_settings['metel_archive_filename']):
29+ from preventares.metel_lib import MetelClass
30+ new_metel = MetelClass(self.computo_settings['metel_archive_filename'])
31+ new_metel.save_database()
32+ new_metel.connection_shutdown()
33+ else:
34+ pass #logging.debug("Metel archive {0} existant".format(self.computo_settings['metel_archive_filename']))
35 # registra le nuove icone stock
36 icon_info = [
37 # icone base
38
39=== modified file 'data/ui/AboutPreventaresDialog.ui'
40--- data/ui/AboutPreventaresDialog.ui 2011-10-06 21:04:30 +0000
41+++ data/ui/AboutPreventaresDialog.ui 2012-04-12 22:42:17 +0000
42@@ -8,7 +8,7 @@
43 <property name="icon">../media/icon.png</property>
44 <property name="type_hint">normal</property>
45 <property name="program_name">PreventARES</property>
46- <property name="version">11.09.2</property>
47+ <property name="version">12.04.1</property>
48 <property name="copyright">Copyright (C) 2011 &lt;Davide Vescovini&gt; &lt;davide.vescovini@gmail.com&gt;</property>
49 <property name="comments" translatable="yes">Software per la realizzazione di Computi Metrici e Preventivi</property>
50 <property name="website">https://launchpad.net/preventares</property>
51
52=== modified file 'data/ui/ComputoWindow.ui'
53--- data/ui/ComputoWindow.ui 2011-10-06 21:04:30 +0000
54+++ data/ui/ComputoWindow.ui 2012-04-12 22:42:17 +0000
55@@ -1,18 +1,18 @@
56-<?xml version="1.0"?>
57+<?xml version="1.0" encoding="UTF-8"?>
58 <interface>
59 <requires lib="gtk+" version="2.16"/>
60 <!-- interface-requires computo_window 1.0 -->
61 <!-- interface-naming-policy project-wide -->
62 <!-- interface-local-resource-path ../media -->
63 <object class="GtkAdjustment" id="adjustment1">
64+ <property name="upper">100</property>
65 <property name="value">1</property>
66- <property name="upper">100</property>
67 <property name="step_increment">0.10000000000000001</property>
68 <property name="page_increment">10</property>
69 </object>
70 <object class="GtkAdjustment" id="adjustment2">
71+ <property name="upper">10</property>
72 <property name="value">1</property>
73- <property name="upper">10</property>
74 <property name="step_increment">0.10000000000000001</property>
75 <property name="page_increment">10</property>
76 </object>
77@@ -31,142 +31,136 @@
78 <property name="step_increment">0.10000000000000001</property>
79 <property name="page_increment">10</property>
80 </object>
81- <object class="GtkListStore" id="liststore2">
82- <columns>
83- <!-- column-name id -->
84- <column type="gchararray"/>
85- <!-- column-name tariffa -->
86- <column type="gchararray"/>
87- <!-- column-name codice -->
88- <column type="gchararray"/>
89- <!-- column-name descrizione -->
90- <column type="gchararray"/>
91- <!-- column-name um -->
92- <column type="gchararray"/>
93- <!-- column-name quantita -->
94- <column type="gchararray"/>
95- <!-- column-name prezzo_unitario -->
96- <column type="gchararray"/>
97- <!-- column-name sconto -->
98- <column type="gchararray"/>
99- <!-- column-name accessori -->
100- <column type="gchararray"/>
101- <!-- column-name prezzo_totale -->
102- <column type="gchararray"/>
103- <!-- column-name note -->
104- <column type="gchararray"/>
105- </columns>
106- </object>
107- <object class="GtkListStore" id="liststore_um">
108- <columns>
109- <!-- column-name gchararray1 -->
110- <column type="gchararray"/>
111- </columns>
112- </object>
113 <object class="ComputoWindow" id="computo_window">
114+ <property name="can_focus">False</property>
115 <property name="title" translatable="yes">Computo</property>
116 <property name="icon">../media/icon.png</property>
117- <signal name="destroy" handler="on_destroy"/>
118+ <signal name="destroy" handler="on_destroy" swapped="no"/>
119 <child>
120 <object class="GtkVBox" id="vbox1">
121 <property name="visible">True</property>
122+ <property name="can_focus">False</property>
123 <child>
124 <object class="GtkMenuBar" id="menubar1">
125 <property name="visible">True</property>
126+ <property name="can_focus">False</property>
127 <child>
128 <object class="GtkMenuItem" id="menuitem1">
129 <property name="visible">True</property>
130+ <property name="can_focus">False</property>
131+ <property name="use_action_appearance">False</property>
132 <property name="label" translatable="yes">_File</property>
133 <property name="use_underline">True</property>
134 <child type="submenu">
135 <object class="GtkMenu" id="menu1">
136 <property name="visible">True</property>
137+ <property name="can_focus">False</property>
138 <child>
139 <object class="GtkImageMenuItem" id="imagemenuitem1">
140 <property name="label">gtk-new</property>
141 <property name="visible">True</property>
142+ <property name="can_focus">False</property>
143+ <property name="use_action_appearance">False</property>
144 <property name="use_underline">True</property>
145 <property name="use_stock">True</property>
146 <accelerator key="n" signal="activate" modifiers="GDK_CONTROL_MASK"/>
147- <signal name="activate" handler="nuovo_computo"/>
148+ <signal name="activate" handler="nuovo_computo" swapped="no"/>
149 </object>
150 </child>
151 <child>
152 <object class="GtkImageMenuItem" id="imagemenuitem2">
153 <property name="label">gtk-open</property>
154 <property name="visible">True</property>
155+ <property name="can_focus">False</property>
156+ <property name="use_action_appearance">False</property>
157 <property name="use_underline">True</property>
158 <property name="use_stock">True</property>
159 <accelerator key="o" signal="activate" modifiers="GDK_CONTROL_MASK"/>
160- <signal name="activate" handler="apri_computo"/>
161+ <signal name="activate" handler="apri_computo" swapped="no"/>
162 </object>
163 </child>
164 <child>
165 <object class="GtkImageMenuItem" id="imagemenuitem3">
166 <property name="label">gtk-save</property>
167 <property name="visible">True</property>
168+ <property name="can_focus">False</property>
169+ <property name="use_action_appearance">False</property>
170 <property name="use_underline">True</property>
171 <property name="use_stock">True</property>
172 <accelerator key="s" signal="activate" modifiers="GDK_CONTROL_MASK"/>
173- <signal name="activate" handler="salva_modifiche_computo"/>
174+ <signal name="activate" handler="salva_modifiche_computo" swapped="no"/>
175 </object>
176 </child>
177 <child>
178 <object class="GtkImageMenuItem" id="imagemenuitem16">
179 <property name="label">gtk-save-as</property>
180 <property name="visible">True</property>
181+ <property name="can_focus">False</property>
182+ <property name="use_action_appearance">False</property>
183 <property name="use_underline">True</property>
184 <property name="use_stock">True</property>
185- <signal name="activate" handler="save_as"/>
186+ <signal name="activate" handler="save_as" swapped="no"/>
187 </object>
188 </child>
189 <child>
190 <object class="GtkImageMenuItem" id="imagemenuitem15">
191 <property name="label">gtk-print</property>
192 <property name="visible">True</property>
193+ <property name="can_focus">False</property>
194+ <property name="use_action_appearance">False</property>
195 <property name="use_underline">True</property>
196 <property name="use_stock">True</property>
197- <signal name="activate" handler="printing"/>
198+ <signal name="activate" handler="printing" swapped="no"/>
199 </object>
200 </child>
201 <child>
202 <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
203 <property name="visible">True</property>
204+ <property name="can_focus">False</property>
205 </object>
206 </child>
207 <child>
208 <object class="GtkMenuItem" id="menuitem11">
209 <property name="visible">True</property>
210+ <property name="can_focus">False</property>
211+ <property name="use_action_appearance">False</property>
212 <property name="label" translatable="yes">Esporta</property>
213 <property name="use_underline">True</property>
214 <child type="submenu">
215 <object class="GtkMenu" id="menu5">
216 <property name="visible">True</property>
217+ <property name="can_focus">False</property>
218 <child>
219 <object class="GtkMenuItem" id="menuitem12">
220 <property name="visible">True</property>
221+ <property name="can_focus">False</property>
222 <property name="tooltip_text" translatable="yes">Esporta il computo in formato testo con DUMP delle istruzioni SQL</property>
223+ <property name="use_action_appearance">False</property>
224 <property name="label" translatable="yes">Esporta file DUMP</property>
225 <property name="use_underline">True</property>
226- <signal name="activate" handler="export_to_dumpfile"/>
227+ <signal name="activate" handler="export_to_dumpfile" swapped="no"/>
228 </object>
229 </child>
230 <child>
231 <object class="GtkMenuItem" id="menuitem13">
232 <property name="visible">True</property>
233+ <property name="can_focus">False</property>
234 <property name="tooltip_text" translatable="yes">Esporta il computo in file di testo .csv (comma separed value)</property>
235+ <property name="use_action_appearance">False</property>
236 <property name="label" translatable="yes">Esporta file CSV</property>
237 <property name="use_underline">True</property>
238- <signal name="activate" handler="export_to_csv_file"/>
239+ <signal name="activate" handler="export_to_csv_file" swapped="no"/>
240 </object>
241 </child>
242 <child>
243 <object class="GtkMenuItem" id="menuitem19">
244 <property name="visible">True</property>
245+ <property name="can_focus">False</property>
246 <property name="tooltip_text" translatable="yes">Esporta in file di testo PWE per importabile da Primus</property>
247+ <property name="use_action_appearance">False</property>
248 <property name="label" translatable="yes">Esporta file PWE (Primus)</property>
249 <property name="use_underline">True</property>
250- <signal name="activate" handler="export_to_pwe_file"/>
251+ <signal name="activate" handler="export_to_pwe_file" swapped="no"/>
252 </object>
253 </child>
254 </object>
255@@ -176,38 +170,48 @@
256 <child>
257 <object class="GtkSeparatorMenuItem" id="separatormenuitem4">
258 <property name="visible">True</property>
259+ <property name="can_focus">False</property>
260 </object>
261 </child>
262 <child>
263 <object class="GtkMenuItem" id="menuitem14">
264 <property name="visible">True</property>
265+ <property name="can_focus">False</property>
266+ <property name="use_action_appearance">False</property>
267 <property name="label" translatable="yes">Importa</property>
268 <property name="use_underline">True</property>
269 <child type="submenu">
270 <object class="GtkMenu" id="menu6">
271 <property name="visible">True</property>
272+ <property name="can_focus">False</property>
273 <child>
274 <object class="GtkMenuItem" id="menuitem15">
275 <property name="visible">True</property>
276+ <property name="can_focus">False</property>
277+ <property name="use_action_appearance">False</property>
278 <property name="label" translatable="yes">Importa da file DUMP</property>
279 <property name="use_underline">True</property>
280- <signal name="activate" handler="import_from_file_dump"/>
281+ <signal name="activate" handler="import_from_file_dump" swapped="no"/>
282 </object>
283 </child>
284 <child>
285 <object class="GtkMenuItem" id="menuitem16">
286 <property name="visible">True</property>
287+ <property name="can_focus">False</property>
288+ <property name="use_action_appearance">False</property>
289 <property name="label" translatable="yes">Importa file PWE (Primus)</property>
290 <property name="use_underline">True</property>
291- <signal name="activate" handler="import_from_pwe"/>
292+ <signal name="activate" handler="import_from_pwe" swapped="no"/>
293 </object>
294 </child>
295 <child>
296 <object class="GtkMenuItem" id="menuitem24">
297 <property name="visible">True</property>
298+ <property name="can_focus">False</property>
299+ <property name="use_action_appearance">False</property>
300 <property name="label" translatable="yes">Importa file SIX</property>
301 <property name="use_underline">True</property>
302- <signal name="activate" handler="import_from_six"/>
303+ <signal name="activate" handler="import_from_six" swapped="no"/>
304 </object>
305 </child>
306 </object>
307@@ -217,16 +221,19 @@
308 <child>
309 <object class="GtkSeparatorMenuItem" id="separatormenuitem5">
310 <property name="visible">True</property>
311+ <property name="can_focus">False</property>
312 </object>
313 </child>
314 <child>
315 <object class="GtkImageMenuItem" id="imagemenuitem5">
316 <property name="label">gtk-quit</property>
317 <property name="visible">True</property>
318+ <property name="can_focus">False</property>
319+ <property name="use_action_appearance">False</property>
320 <property name="use_underline">True</property>
321 <property name="use_stock">True</property>
322 <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
323- <signal name="activate" handler="quit"/>
324+ <signal name="activate" handler="quit" swapped="no"/>
325 </object>
326 </child>
327 </object>
328@@ -236,86 +243,105 @@
329 <child>
330 <object class="GtkMenuItem" id="menuitem2">
331 <property name="visible">True</property>
332+ <property name="can_focus">False</property>
333+ <property name="use_action_appearance">False</property>
334 <property name="label" translatable="yes">_Edit</property>
335 <property name="use_underline">True</property>
336 <child type="submenu">
337 <object class="GtkMenu" id="menu2">
338 <property name="visible">True</property>
339+ <property name="can_focus">False</property>
340 <child>
341 <object class="GtkImageMenuItem" id="imagemenuitem6">
342 <property name="label">gtk-cut</property>
343 <property name="visible">True</property>
344+ <property name="can_focus">False</property>
345+ <property name="use_action_appearance">False</property>
346 <property name="use_underline">True</property>
347 <property name="use_stock">True</property>
348 <accelerator key="x" signal="activate" modifiers="GDK_CONTROL_MASK"/>
349- <signal name="activate" handler="menu_taglia"/>
350+ <signal name="activate" handler="menu_taglia" swapped="no"/>
351 </object>
352 </child>
353 <child>
354 <object class="GtkImageMenuItem" id="imagemenuitem7">
355 <property name="label">gtk-copy</property>
356 <property name="visible">True</property>
357+ <property name="can_focus">False</property>
358+ <property name="use_action_appearance">False</property>
359 <property name="use_underline">True</property>
360 <property name="use_stock">True</property>
361 <accelerator key="c" signal="activate" modifiers="GDK_CONTROL_MASK"/>
362- <signal name="activate" handler="menu_copia"/>
363+ <signal name="activate" handler="menu_copia" swapped="no"/>
364 </object>
365 </child>
366 <child>
367 <object class="GtkImageMenuItem" id="imagemenuitem8">
368 <property name="label">gtk-paste</property>
369 <property name="visible">True</property>
370+ <property name="can_focus">False</property>
371+ <property name="use_action_appearance">False</property>
372 <property name="use_underline">True</property>
373 <property name="use_stock">True</property>
374 <accelerator key="v" signal="activate" modifiers="GDK_CONTROL_MASK"/>
375- <signal name="activate" handler="menu_incolla"/>
376+ <signal name="activate" handler="menu_incolla" swapped="no"/>
377 </object>
378 </child>
379 <child>
380 <object class="GtkImageMenuItem" id="imagemenuitem9">
381 <property name="label">gtk-delete</property>
382 <property name="visible">True</property>
383+ <property name="can_focus">False</property>
384+ <property name="use_action_appearance">False</property>
385 <property name="use_underline">True</property>
386 <property name="use_stock">True</property>
387 <accelerator key="Delete" signal="activate"/>
388- <signal name="activate" handler="menu_cancella"/>
389+ <signal name="activate" handler="menu_cancella" swapped="no"/>
390 </object>
391 </child>
392 <child>
393 <object class="GtkSeparatorMenuItem" id="separatormenuitem2">
394 <property name="visible">True</property>
395+ <property name="can_focus">False</property>
396 </object>
397 </child>
398 <child>
399 <object class="GtkImageMenuItem" id="imagemenuitem13">
400 <property name="label">gtk-select-all</property>
401 <property name="visible">True</property>
402+ <property name="can_focus">False</property>
403+ <property name="use_action_appearance">False</property>
404 <property name="use_underline">True</property>
405 <property name="use_stock">True</property>
406- <signal name="activate" handler="menu_seleziona_tutto"/>
407+ <signal name="activate" handler="menu_seleziona_tutto" swapped="no"/>
408 </object>
409 </child>
410 <child>
411 <object class="GtkMenuItem" id="imagemenuitem14">
412 <property name="visible">True</property>
413+ <property name="can_focus">False</property>
414 <property name="tooltip_text" translatable="yes">Deseleziona tutto</property>
415+ <property name="use_action_appearance">False</property>
416 <property name="label" translatable="yes">Deseleziona tutto</property>
417 <property name="use_underline">True</property>
418- <signal name="activate" handler="menu_deseleziona_tutto"/>
419+ <signal name="activate" handler="menu_deseleziona_tutto" swapped="no"/>
420 </object>
421 </child>
422 <child>
423 <object class="GtkSeparatorMenuItem" id="separatormenuitem8">
424 <property name="visible">True</property>
425+ <property name="can_focus">False</property>
426 </object>
427 </child>
428 <child>
429 <object class="GtkImageMenuItem" id="imagemenuitem11">
430 <property name="label">gtk-preferences</property>
431 <property name="visible">True</property>
432+ <property name="can_focus">False</property>
433+ <property name="use_action_appearance">False</property>
434 <property name="use_underline">True</property>
435 <property name="use_stock">True</property>
436- <signal name="activate" handler="preferences"/>
437+ <signal name="activate" handler="preferences" swapped="no"/>
438 </object>
439 </child>
440 </object>
441@@ -325,122 +351,152 @@
442 <child>
443 <object class="GtkMenuItem" id="menuitem5">
444 <property name="visible">True</property>
445+ <property name="can_focus">False</property>
446+ <property name="use_action_appearance">False</property>
447 <property name="label" translatable="yes">_Computo</property>
448 <property name="use_underline">True</property>
449 <child type="submenu">
450 <object class="GtkMenu" id="menu3">
451 <property name="visible">True</property>
452+ <property name="can_focus">False</property>
453 <child>
454 <object class="GtkMenuItem" id="menuitem6">
455 <property name="visible">True</property>
456+ <property name="can_focus">False</property>
457+ <property name="use_action_appearance">False</property>
458 <property name="label" translatable="yes">Copia Articolo</property>
459 <property name="use_underline">True</property>
460- <signal name="activate" handler="copia_articolo_computo"/>
461+ <signal name="activate" handler="copia_articolo_computo" swapped="no"/>
462 </object>
463 </child>
464 <child>
465 <object class="GtkMenuItem" id="menuitem7">
466 <property name="visible">True</property>
467+ <property name="can_focus">False</property>
468+ <property name="use_action_appearance">False</property>
469 <property name="label" translatable="yes">Incolla Articolo</property>
470 <property name="use_underline">True</property>
471- <signal name="activate" handler="incolla_articolo_computo"/>
472+ <signal name="activate" handler="incolla_articolo_computo" swapped="no"/>
473 </object>
474 </child>
475 <child>
476 <object class="GtkMenuItem" id="menuitem8">
477 <property name="visible">True</property>
478+ <property name="can_focus">False</property>
479+ <property name="use_action_appearance">False</property>
480 <property name="label" translatable="yes">Cancella Articolo</property>
481 <property name="use_underline">True</property>
482- <signal name="activate" handler="cancella_articolo_computo"/>
483+ <signal name="activate" handler="cancella_articolo_computo" swapped="no"/>
484 </object>
485 </child>
486 <child>
487 <object class="GtkSeparatorMenuItem" id="separatormenuitem9">
488 <property name="visible">True</property>
489+ <property name="can_focus">False</property>
490 </object>
491 </child>
492 <child>
493 <object class="GtkMenuItem" id="menuitem9">
494 <property name="visible">True</property>
495+ <property name="can_focus">False</property>
496+ <property name="use_action_appearance">False</property>
497 <property name="label" translatable="yes">Inserisci Articolo</property>
498 <property name="use_underline">True</property>
499- <signal name="activate" handler="nuovo_articolo_computo"/>
500+ <signal name="activate" handler="nuovo_articolo_computo" swapped="no"/>
501 </object>
502 </child>
503 <child>
504 <object class="GtkMenuItem" id="menuitem10">
505 <property name="visible">True</property>
506+ <property name="can_focus">False</property>
507+ <property name="use_action_appearance">False</property>
508 <property name="label" translatable="yes">Duplica Articolo</property>
509 <property name="use_underline">True</property>
510- <signal name="activate" handler="duplica_articolo_computo"/>
511+ <signal name="activate" handler="duplica_articolo_computo" swapped="no"/>
512 </object>
513 </child>
514 <child>
515 <object class="GtkSeparatorMenuItem" id="separatormenuitem3">
516 <property name="visible">True</property>
517+ <property name="can_focus">False</property>
518 </object>
519 </child>
520 <child>
521 <object class="GtkMenuItem" id="menuitem18">
522 <property name="visible">True</property>
523+ <property name="can_focus">False</property>
524+ <property name="use_action_appearance">False</property>
525 <property name="label" translatable="yes">Modifica Blocco Articoli</property>
526 <property name="use_underline">True</property>
527- <signal name="activate" handler="modifica_blocco_articoli"/>
528+ <signal name="activate" handler="modifica_blocco_articoli" swapped="no"/>
529 </object>
530 </child>
531 <child>
532 <object class="GtkSeparatorMenuItem" id="separatormenuitem7">
533 <property name="visible">True</property>
534+ <property name="can_focus">False</property>
535 </object>
536 </child>
537 <child>
538 <object class="GtkMenuItem" id="menuitem23">
539 <property name="visible">True</property>
540+ <property name="can_focus">False</property>
541+ <property name="use_action_appearance">False</property>
542 <property name="label" translatable="yes">Modifica Tabella Manodopera</property>
543 <property name="use_underline">True</property>
544- <signal name="activate" handler="modifica_tab_manodopera"/>
545+ <signal name="activate" handler="modifica_tab_manodopera" swapped="no"/>
546 </object>
547 </child>
548 <child>
549 <object class="GtkSeparatorMenuItem" id="separatormenuitem10">
550 <property name="visible">True</property>
551+ <property name="can_focus">False</property>
552 </object>
553 </child>
554 <child>
555 <object class="GtkMenuItem" id="menuitem17">
556 <property name="visible">True</property>
557+ <property name="can_focus">False</property>
558+ <property name="use_action_appearance">False</property>
559 <property name="label" translatable="yes">Apri Listini METEL</property>
560 <property name="use_underline">True</property>
561- <signal name="activate" handler="carica_listini_metel"/>
562+ <signal name="activate" handler="carica_listini_metel" swapped="no"/>
563 </object>
564 </child>
565 <child>
566 <object class="GtkSeparatorMenuItem" id="separatormenuitem6">
567 <property name="visible">True</property>
568+ <property name="can_focus">False</property>
569 </object>
570 </child>
571 <child>
572 <object class="GtkMenuItem" id="menuitem20">
573 <property name="visible">True</property>
574+ <property name="can_focus">False</property>
575+ <property name="use_action_appearance">False</property>
576 <property name="label" translatable="yes">Ricalcolo Generale</property>
577 <property name="use_underline">True</property>
578- <signal name="activate" handler="ricalcolo_generale"/>
579+ <signal name="activate" handler="ricalcolo_generale" swapped="no"/>
580 </object>
581 </child>
582 <child>
583 <object class="GtkMenuItem" id="menuitem21">
584 <property name="visible">True</property>
585+ <property name="can_focus">False</property>
586+ <property name="use_action_appearance">False</property>
587 <property name="label" translatable="yes">Ricalcola Costo Totale</property>
588 <property name="use_underline">True</property>
589- <signal name="activate" handler="ricalcolo_totale_preventivo"/>
590+ <signal name="activate" handler="ricalcolo_totale_preventivo" swapped="no"/>
591 </object>
592 </child>
593 <child>
594 <object class="GtkMenuItem" id="menuitem22">
595 <property name="visible">True</property>
596+ <property name="can_focus">False</property>
597+ <property name="use_action_appearance">False</property>
598 <property name="label" translatable="yes">Aggiorna Articoli Listino da Archivio</property>
599 <property name="use_underline">True</property>
600- <signal name="activate" handler="aggiorna_articoli_listino_da_archivio"/>
601+ <signal name="activate" handler="aggiorna_articoli_listino_da_archivio" swapped="no"/>
602 </object>
603 </child>
604 </object>
605@@ -450,45 +506,56 @@
606 <child>
607 <object class="GtkMenuItem" id="menuitem3">
608 <property name="visible">True</property>
609+ <property name="can_focus">False</property>
610+ <property name="use_action_appearance">False</property>
611 <property name="label" translatable="yes">_View</property>
612 <property name="use_underline">True</property>
613 <child type="submenu">
614 <object class="GtkMenu" id="menu4">
615 <property name="visible">True</property>
616+ <property name="can_focus">False</property>
617 <child>
618 <object class="GtkImageMenuItem" id="imagemenuitem4">
619 <property name="label">gtk-fullscreen</property>
620 <property name="visible">True</property>
621+ <property name="can_focus">False</property>
622+ <property name="use_action_appearance">False</property>
623 <property name="use_underline">True</property>
624 <property name="use_stock">True</property>
625- <signal name="activate" handler="Fullscreen"/>
626+ <signal name="activate" handler="Fullscreen" swapped="no"/>
627 </object>
628 </child>
629 <child>
630 <object class="GtkImageMenuItem" id="imagemenuitem12">
631 <property name="label">gtk-leave-fullscreen</property>
632 <property name="visible">True</property>
633+ <property name="can_focus">False</property>
634+ <property name="use_action_appearance">False</property>
635 <property name="use_underline">True</property>
636 <property name="use_stock">True</property>
637- <signal name="activate" handler="Unfullscreen"/>
638+ <signal name="activate" handler="Unfullscreen" swapped="no"/>
639 </object>
640 </child>
641 <child>
642 <object class="GtkImageMenuItem" id="imagemenuitem17">
643 <property name="label">gtk-refresh</property>
644 <property name="visible">True</property>
645+ <property name="can_focus">False</property>
646+ <property name="use_action_appearance">False</property>
647 <property name="use_underline">True</property>
648 <property name="use_stock">True</property>
649- <signal name="activate" handler="Update"/>
650+ <signal name="activate" handler="Update" swapped="no"/>
651 </object>
652 </child>
653 <child>
654 <object class="GtkMenuItem" id="menuitem25">
655 <property name="visible">True</property>
656+ <property name="can_focus">False</property>
657 <property name="tooltip_text" translatable="yes">Apre un report con le incidenze della manodopera e della sicurezza relative al computo aperto.</property>
658+ <property name="use_action_appearance">False</property>
659 <property name="label" translatable="yes">Report Incidenze</property>
660 <property name="use_underline">True</property>
661- <signal name="activate" handler="View_report"/>
662+ <signal name="activate" handler="View_report" swapped="no"/>
663 </object>
664 </child>
665 </object>
666@@ -498,18 +565,23 @@
667 <child>
668 <object class="GtkMenuItem" id="menuitem4">
669 <property name="visible">True</property>
670+ <property name="can_focus">False</property>
671+ <property name="use_action_appearance">False</property>
672 <property name="label" translatable="yes">_Help</property>
673 <property name="use_underline">True</property>
674 <child type="submenu">
675 <object class="GtkMenu" id="helpMenu">
676 <property name="visible">True</property>
677+ <property name="can_focus">False</property>
678 <child>
679 <object class="GtkImageMenuItem" id="imagemenuitem10">
680 <property name="label">gtk-about</property>
681 <property name="visible">True</property>
682+ <property name="can_focus">False</property>
683+ <property name="use_action_appearance">False</property>
684 <property name="use_underline">True</property>
685 <property name="use_stock">True</property>
686- <signal name="activate" handler="about"/>
687+ <signal name="activate" handler="about" swapped="no"/>
688 </object>
689 </child>
690 </object>
691@@ -519,23 +591,27 @@
692 </object>
693 <packing>
694 <property name="expand">False</property>
695+ <property name="fill">True</property>
696 <property name="position">0</property>
697 </packing>
698 </child>
699 <child>
700 <object class="GtkHBox" id="hbox1">
701 <property name="visible">True</property>
702+ <property name="can_focus">False</property>
703 <child>
704 <object class="GtkButton" id="button1">
705 <property name="visible">True</property>
706 <property name="can_focus">True</property>
707 <property name="receives_default">True</property>
708 <property name="tooltip_text" translatable="yes">Apri un Preventivo</property>
709+ <property name="use_action_appearance">False</property>
710 <property name="relief">none</property>
711- <signal name="clicked" handler="apri_computo"/>
712+ <signal name="clicked" handler="apri_computo" swapped="no"/>
713 <child>
714 <object class="GtkImage" id="image1">
715 <property name="visible">True</property>
716+ <property name="can_focus">False</property>
717 <property name="stock">gtk-open</property>
718 <property name="icon-size">3</property>
719 </object>
720@@ -554,11 +630,13 @@
721 <property name="can_focus">True</property>
722 <property name="receives_default">True</property>
723 <property name="tooltip_text" translatable="yes">Salva modifiche al Preventivo</property>
724+ <property name="use_action_appearance">False</property>
725 <property name="relief">none</property>
726- <signal name="clicked" handler="salva_modifiche_computo"/>
727+ <signal name="clicked" handler="salva_modifiche_computo" swapped="no"/>
728 <child>
729 <object class="GtkImage" id="image2">
730 <property name="visible">True</property>
731+ <property name="can_focus">False</property>
732 <property name="stock">gtk-save</property>
733 <property name="icon-size">3</property>
734 </object>
735@@ -577,11 +655,13 @@
736 <property name="can_focus">True</property>
737 <property name="receives_default">True</property>
738 <property name="tooltip_text" translatable="yes">Annulla tutte le modifiche effetuate dall'ultimo salvataggio</property>
739+ <property name="use_action_appearance">False</property>
740 <property name="relief">none</property>
741- <signal name="clicked" handler="annulla_modifiche_computo"/>
742+ <signal name="clicked" handler="annulla_modifiche_computo" swapped="no"/>
743 <child>
744 <object class="GtkImage" id="image3">
745 <property name="visible">True</property>
746+ <property name="can_focus">False</property>
747 <property name="stock">gtk-undo</property>
748 <property name="icon-size">3</property>
749 </object>
750@@ -600,11 +680,13 @@
751 <property name="can_focus">True</property>
752 <property name="receives_default">True</property>
753 <property name="tooltip_text" translatable="yes">Stampa Preventivo</property>
754+ <property name="use_action_appearance">False</property>
755 <property name="relief">none</property>
756- <signal name="clicked" handler="printing"/>
757+ <signal name="clicked" handler="printing" swapped="no"/>
758 <child>
759 <object class="GtkImage" id="image8">
760 <property name="visible">True</property>
761+ <property name="can_focus">False</property>
762 <property name="tooltip_text" translatable="yes">Stampa Preventivo</property>
763 <property name="stock">gtk-print</property>
764 <property name="icon-size">3</property>
765@@ -621,40 +703,30 @@
766 <child>
767 <object class="GtkHBox" id="hbox4">
768 <property name="visible">True</property>
769+ <property name="can_focus">False</property>
770 <child>
771 <placeholder/>
772 </child>
773 </object>
774 <packing>
775+ <property name="expand">True</property>
776+ <property name="fill">True</property>
777 <property name="position">4</property>
778 </packing>
779 </child>
780 <child>
781- <placeholder/>
782- </child>
783- <child>
784- <object class="GtkComboBox" id="combobox1">
785- <property name="visible">True</property>
786- </object>
787- <packing>
788- <property name="expand">False</property>
789- <property name="fill">False</property>
790- <property name="pack_type">end</property>
791- <property name="position">6</property>
792- </packing>
793- </child>
794- <child>
795 <object class="GtkEntry" id="entry6">
796 <property name="visible">True</property>
797 <property name="can_focus">True</property>
798- <property name="invisible_char">&#x25CF;</property>
799+ <property name="invisible_char">●</property>
800 <property name="primary_icon_stock">gtk-find</property>
801 <property name="secondary_icon_stock">gtk-clear</property>
802 <property name="primary_icon_activatable">True</property>
803+ <property name="secondary_icon_activatable">False</property>
804 <property name="primary_icon_sensitive">True</property>
805 <property name="secondary_icon_sensitive">True</property>
806- <signal name="activate" handler="ricerca_preventivo"/>
807- <signal name="icon_press" handler="ricerca_preventivo"/>
808+ <signal name="activate" handler="ricerca_preventivo" swapped="no"/>
809+ <signal name="icon-press" handler="ricerca_preventivo" swapped="no"/>
810 </object>
811 <packing>
812 <property name="expand">False</property>
813@@ -663,6 +735,21 @@
814 <property name="position">5</property>
815 </packing>
816 </child>
817+ <child>
818+ <object class="GtkComboBox" id="combobox1">
819+ <property name="visible">True</property>
820+ <property name="can_focus">False</property>
821+ </object>
822+ <packing>
823+ <property name="expand">False</property>
824+ <property name="fill">False</property>
825+ <property name="pack_type">end</property>
826+ <property name="position">6</property>
827+ </packing>
828+ </child>
829+ <child>
830+ <placeholder/>
831+ </child>
832 </object>
833 <packing>
834 <property name="expand">False</property>
835@@ -674,6 +761,7 @@
836 <child>
837 <object class="GtkHSeparator" id="hseparator1">
838 <property name="visible">True</property>
839+ <property name="can_focus">False</property>
840 </object>
841 <packing>
842 <property name="expand">False</property>
843@@ -686,21 +774,25 @@
844 <object class="GtkNotebook" id="notebook1">
845 <property name="visible">True</property>
846 <property name="can_focus">True</property>
847- <signal name="switch_page" handler="notebook_page_changed"/>
848+ <signal name="switch-page" handler="notebook_page_changed" swapped="no"/>
849 <child>
850 <object class="GtkHBox" id="hbox16">
851 <property name="visible">True</property>
852+ <property name="can_focus">False</property>
853 <property name="spacing">10</property>
854 <child>
855 <object class="GtkVBox" id="vbox10">
856 <property name="visible">True</property>
857+ <property name="can_focus">False</property>
858 <child>
859 <object class="GtkFrame" id="frame2">
860 <property name="visible">True</property>
861+ <property name="can_focus">False</property>
862 <property name="label_xalign">0</property>
863 <child>
864 <object class="GtkAlignment" id="alignment2">
865 <property name="visible">True</property>
866+ <property name="can_focus">False</property>
867 <property name="xalign">0</property>
868 <property name="yalign">0</property>
869 <property name="top_padding">10</property>
870@@ -710,10 +802,12 @@
871 <child>
872 <object class="GtkVBox" id="vbox13">
873 <property name="visible">True</property>
874+ <property name="can_focus">False</property>
875 <property name="spacing">5</property>
876 <child>
877 <object class="GtkTable" id="table1">
878 <property name="visible">True</property>
879+ <property name="can_focus">False</property>
880 <property name="n_rows">6</property>
881 <property name="n_columns">2</property>
882 <property name="column_spacing">10</property>
883@@ -721,6 +815,7 @@
884 <child>
885 <object class="GtkLabel" id="label34">
886 <property name="visible">True</property>
887+ <property name="can_focus">False</property>
888 <property name="xalign">0</property>
889 <property name="yalign">0</property>
890 <property name="label" translatable="yes">Oggetto:</property>
891@@ -732,6 +827,7 @@
892 <child>
893 <object class="GtkLabel" id="label35">
894 <property name="visible">True</property>
895+ <property name="can_focus">False</property>
896 <property name="xalign">0</property>
897 <property name="yalign">0</property>
898 <property name="label" translatable="yes">Cliente:</property>
899@@ -758,6 +854,7 @@
900 <child>
901 <object class="GtkLabel" id="label36">
902 <property name="visible">True</property>
903+ <property name="can_focus">False</property>
904 <property name="xalign">0</property>
905 <property name="yalign">0</property>
906 <property name="label" translatable="yes">Indirizzo:</property>
907@@ -784,6 +881,7 @@
908 <child>
909 <object class="GtkLabel" id="label37">
910 <property name="visible">True</property>
911+ <property name="can_focus">False</property>
912 <property name="xalign">0</property>
913 <property name="yalign">0</property>
914 <property name="label" translatable="yes">Comune:</property>
915@@ -810,6 +908,7 @@
916 <child>
917 <object class="GtkLabel" id="label38">
918 <property name="visible">True</property>
919+ <property name="can_focus">False</property>
920 <property name="xalign">0</property>
921 <property name="yalign">0</property>
922 <property name="label" translatable="yes">Provincia:</property>
923@@ -860,6 +959,7 @@
924 <child>
925 <object class="GtkLabel" id="label51">
926 <property name="visible">True</property>
927+ <property name="can_focus">False</property>
928 <property name="xalign">0</property>
929 <property name="yalign">0</property>
930 <property name="label" translatable="yes">Redattore:</property>
931@@ -872,12 +972,15 @@
932 </child>
933 </object>
934 <packing>
935+ <property name="expand">True</property>
936+ <property name="fill">True</property>
937 <property name="position">0</property>
938 </packing>
939 </child>
940 <child>
941 <object class="GtkHButtonBox" id="hbuttonbox3">
942 <property name="visible">True</property>
943+ <property name="can_focus">False</property>
944 <property name="spacing">5</property>
945 <property name="layout_style">end</property>
946 <child>
947@@ -886,8 +989,9 @@
948 <property name="visible">True</property>
949 <property name="can_focus">True</property>
950 <property name="receives_default">True</property>
951+ <property name="use_action_appearance">False</property>
952 <property name="use_stock">True</property>
953- <signal name="clicked" handler="Aggiorna_maschera_dati_generali"/>
954+ <signal name="clicked" handler="Aggiorna_maschera_dati_generali" swapped="no"/>
955 </object>
956 <packing>
957 <property name="expand">False</property>
958@@ -901,8 +1005,9 @@
959 <property name="visible">True</property>
960 <property name="can_focus">True</property>
961 <property name="receives_default">True</property>
962+ <property name="use_action_appearance">False</property>
963 <property name="use_stock">True</property>
964- <signal name="clicked" handler="Modifica_dati_generali_anagrafica"/>
965+ <signal name="clicked" handler="Modifica_dati_generali_anagrafica" swapped="no"/>
966 </object>
967 <packing>
968 <property name="expand">False</property>
969@@ -913,6 +1018,7 @@
970 </object>
971 <packing>
972 <property name="expand">False</property>
973+ <property name="fill">True</property>
974 <property name="pack_type">end</property>
975 <property name="position">1</property>
976 </packing>
977@@ -924,12 +1030,15 @@
978 <child type="label">
979 <object class="GtkLabel" id="label33">
980 <property name="visible">True</property>
981+ <property name="can_focus">False</property>
982 <property name="label" translatable="yes">&lt;b&gt;Dati Anagrafici del Lavoro&lt;/b&gt;</property>
983 <property name="use_markup">True</property>
984 </object>
985 </child>
986 </object>
987 <packing>
988+ <property name="expand">True</property>
989+ <property name="fill">True</property>
990 <property name="padding">10</property>
991 <property name="position">0</property>
992 </packing>
993@@ -937,10 +1046,12 @@
994 <child>
995 <object class="GtkFrame" id="frame3">
996 <property name="visible">True</property>
997+ <property name="can_focus">False</property>
998 <property name="label_xalign">0</property>
999 <child>
1000 <object class="GtkAlignment" id="alignment3">
1001 <property name="visible">True</property>
1002+ <property name="can_focus">False</property>
1003 <property name="xalign">0</property>
1004 <property name="yalign">0</property>
1005 <property name="xscale">0</property>
1006@@ -952,6 +1063,7 @@
1007 <child>
1008 <object class="GtkTable" id="table2">
1009 <property name="visible">True</property>
1010+ <property name="can_focus">False</property>
1011 <property name="n_rows">4</property>
1012 <property name="n_columns">3</property>
1013 <property name="column_spacing">5</property>
1014@@ -959,6 +1071,7 @@
1015 <child>
1016 <object class="GtkLabel" id="label40">
1017 <property name="visible">True</property>
1018+ <property name="can_focus">False</property>
1019 <property name="xalign">0</property>
1020 <property name="label" translatable="yes">Ricarico d'impresa:</property>
1021 </object>
1022@@ -966,6 +1079,7 @@
1023 <child>
1024 <object class="GtkLabel" id="label42">
1025 <property name="visible">True</property>
1026+ <property name="can_focus">False</property>
1027 <property name="xalign">0</property>
1028 <property name="label" translatable="yes">Tipo di Valuta:</property>
1029 </object>
1030@@ -979,7 +1093,9 @@
1031 <property name="visible">True</property>
1032 <property name="can_focus">True</property>
1033 <property name="tooltip_text" translatable="yes">Inserire il ricarico generale dell'imprese (Ricarico+Spese Generali)</property>
1034- <property name="invisible_char">&#x2022;</property>
1035+ <property name="invisible_char">•</property>
1036+ <property name="primary_icon_activatable">False</property>
1037+ <property name="secondary_icon_activatable">False</property>
1038 <property name="primary_icon_sensitive">True</property>
1039 <property name="secondary_icon_sensitive">True</property>
1040 <property name="adjustment">adjustment1</property>
1041@@ -997,8 +1113,9 @@
1042 <property name="visible">True</property>
1043 <property name="can_focus">True</property>
1044 <property name="receives_default">True</property>
1045+ <property name="use_action_appearance">False</property>
1046 <property name="use_stock">True</property>
1047- <signal name="clicked" handler="Modifica_dati_generali_ricarico"/>
1048+ <signal name="clicked" handler="Modifica_dati_generali_ricarico" swapped="no"/>
1049 </object>
1050 <packing>
1051 <property name="left_attach">2</property>
1052@@ -1009,8 +1126,10 @@
1053 <object class="GtkEntry" id="entry9">
1054 <property name="visible">True</property>
1055 <property name="can_focus">True</property>
1056- <property name="tooltip_text" translatable="yes">Inserire il prezzo orario della manodopera gi&#xE0; ricaricata</property>
1057- <property name="invisible_char">&#x2022;</property>
1058+ <property name="tooltip_text" translatable="yes">Inserire il prezzo orario della manodopera già ricaricata</property>
1059+ <property name="invisible_char">•</property>
1060+ <property name="primary_icon_activatable">False</property>
1061+ <property name="secondary_icon_activatable">False</property>
1062 <property name="primary_icon_sensitive">True</property>
1063 <property name="secondary_icon_sensitive">True</property>
1064 </object>
1065@@ -1027,7 +1146,9 @@
1066 <property name="visible">True</property>
1067 <property name="can_focus">True</property>
1068 <property name="tooltip_text" translatable="yes">Inserire il nome della valuta utilizzata</property>
1069- <property name="invisible_char">&#x2022;</property>
1070+ <property name="invisible_char">•</property>
1071+ <property name="primary_icon_activatable">False</property>
1072+ <property name="secondary_icon_activatable">False</property>
1073 <property name="primary_icon_sensitive">True</property>
1074 <property name="secondary_icon_sensitive">True</property>
1075 </object>
1076@@ -1044,7 +1165,9 @@
1077 <property name="visible">True</property>
1078 <property name="can_focus">True</property>
1079 <property name="tooltip_text" translatable="yes">Inserire gli oneri di sicurezza di default in percentuale (la sicurezza viene aggiunta al prezzo dell'articolo)</property>
1080- <property name="invisible_char">&#x2022;</property>
1081+ <property name="invisible_char">•</property>
1082+ <property name="primary_icon_activatable">False</property>
1083+ <property name="secondary_icon_activatable">False</property>
1084 <property name="primary_icon_sensitive">True</property>
1085 <property name="secondary_icon_sensitive">True</property>
1086 <property name="adjustment">adjustment5</property>
1087@@ -1065,8 +1188,9 @@
1088 <property name="visible">True</property>
1089 <property name="can_focus">True</property>
1090 <property name="receives_default">True</property>
1091+ <property name="use_action_appearance">False</property>
1092 <property name="use_stock">True</property>
1093- <signal name="clicked" handler="Modifica_dati_generali_manodopera"/>
1094+ <signal name="clicked" handler="Modifica_dati_generali_manodopera" swapped="no"/>
1095 </object>
1096 <packing>
1097 <property name="left_attach">2</property>
1098@@ -1081,8 +1205,9 @@
1099 <property name="visible">True</property>
1100 <property name="can_focus">True</property>
1101 <property name="receives_default">True</property>
1102+ <property name="use_action_appearance">False</property>
1103 <property name="use_stock">True</property>
1104- <signal name="clicked" handler="Modifica_dati_generali_valuta"/>
1105+ <signal name="clicked" handler="Modifica_dati_generali_valuta" swapped="no"/>
1106 </object>
1107 <packing>
1108 <property name="left_attach">2</property>
1109@@ -1097,8 +1222,9 @@
1110 <property name="visible">True</property>
1111 <property name="can_focus">True</property>
1112 <property name="receives_default">True</property>
1113+ <property name="use_action_appearance">False</property>
1114 <property name="use_stock">True</property>
1115- <signal name="clicked" handler="Modifica_dati_generali_sicurezza"/>
1116+ <signal name="clicked" handler="Modifica_dati_generali_sicurezza" swapped="no"/>
1117 </object>
1118 <packing>
1119 <property name="left_attach">2</property>
1120@@ -1110,6 +1236,7 @@
1121 <child>
1122 <object class="GtkLabel" id="label41">
1123 <property name="visible">True</property>
1124+ <property name="can_focus">False</property>
1125 <property name="xalign">0</property>
1126 <property name="label" translatable="yes">Manodopera (all'ora):</property>
1127 <property name="wrap">True</property>
1128@@ -1122,6 +1249,7 @@
1129 <child>
1130 <object class="GtkLabel" id="label43">
1131 <property name="visible">True</property>
1132+ <property name="can_focus">False</property>
1133 <property name="xalign">0</property>
1134 <property name="label" translatable="yes">Oneri di Sicurezza (%):</property>
1135 </object>
1136@@ -1137,27 +1265,34 @@
1137 <child type="label">
1138 <object class="GtkLabel" id="label39">
1139 <property name="visible">True</property>
1140+ <property name="can_focus">False</property>
1141 <property name="label" translatable="yes">&lt;b&gt;Dati generali Preventivo&lt;/b&gt;</property>
1142 <property name="use_markup">True</property>
1143 </object>
1144 </child>
1145 </object>
1146 <packing>
1147+ <property name="expand">True</property>
1148+ <property name="fill">True</property>
1149 <property name="padding">10</property>
1150 <property name="position">1</property>
1151 </packing>
1152 </child>
1153 </object>
1154 <packing>
1155+ <property name="expand">True</property>
1156+ <property name="fill">True</property>
1157 <property name="position">0</property>
1158 </packing>
1159 </child>
1160 <child>
1161 <object class="GtkVSeparator" id="vseparator1">
1162 <property name="visible">True</property>
1163+ <property name="can_focus">False</property>
1164 </object>
1165 <packing>
1166 <property name="expand">False</property>
1167+ <property name="fill">True</property>
1168 <property name="padding">10</property>
1169 <property name="position">1</property>
1170 </packing>
1171@@ -1165,17 +1300,20 @@
1172 <child>
1173 <object class="GtkVBox" id="vbox5">
1174 <property name="visible">True</property>
1175+ <property name="can_focus">False</property>
1176 <child>
1177 <object class="GtkExpander" id="expander2">
1178 <property name="visible">True</property>
1179 <property name="can_focus">True</property>
1180- <signal name="activate" handler="Shrink_categorie_expander"/>
1181+ <signal name="activate" handler="Shrink_categorie_expander" swapped="no"/>
1182 <child>
1183 <object class="GtkVBox" id="vbox12">
1184 <property name="visible">True</property>
1185+ <property name="can_focus">False</property>
1186 <child>
1187 <object class="GtkLabel" id="label27">
1188 <property name="visible">True</property>
1189+ <property name="can_focus">False</property>
1190 <property name="label" translatable="yes">&lt;i&gt;SuperCapitoli&lt;/i&gt;</property>
1191 <property name="use_markup">True</property>
1192 </object>
1193@@ -1194,18 +1332,22 @@
1194 <property name="vscrollbar_policy">automatic</property>
1195 <child>
1196 <object class="GtkTreeView" id="treeview8">
1197+ <property name="height_request">100</property>
1198 <property name="visible">True</property>
1199 <property name="can_focus">True</property>
1200 </object>
1201 </child>
1202 </object>
1203 <packing>
1204+ <property name="expand">True</property>
1205+ <property name="fill">True</property>
1206 <property name="position">1</property>
1207 </packing>
1208 </child>
1209 <child>
1210 <object class="GtkHButtonBox" id="hbuttonbox9">
1211 <property name="visible">True</property>
1212+ <property name="can_focus">False</property>
1213 <property name="spacing">5</property>
1214 <property name="layout_style">center</property>
1215 <child>
1216@@ -1213,10 +1355,12 @@
1217 <property name="visible">True</property>
1218 <property name="can_focus">True</property>
1219 <property name="receives_default">True</property>
1220- <signal name="clicked" handler="pulsante_aggiungi_Supercapitolo"/>
1221+ <property name="use_action_appearance">False</property>
1222+ <signal name="clicked" handler="pulsante_aggiungi_Supercapitolo" swapped="no"/>
1223 <child>
1224 <object class="GtkImage" id="image25">
1225 <property name="visible">True</property>
1226+ <property name="can_focus">False</property>
1227 <property name="stock">gtk-add</property>
1228 </object>
1229 </child>
1230@@ -1232,10 +1376,12 @@
1231 <property name="visible">True</property>
1232 <property name="can_focus">True</property>
1233 <property name="receives_default">True</property>
1234- <signal name="clicked" handler="pulsante_rimuovi_Supercapitolo"/>
1235+ <property name="use_action_appearance">False</property>
1236+ <signal name="clicked" handler="pulsante_rimuovi_Supercapitolo" swapped="no"/>
1237 <child>
1238 <object class="GtkImage" id="image26">
1239 <property name="visible">True</property>
1240+ <property name="can_focus">False</property>
1241 <property name="stock">gtk-remove</property>
1242 </object>
1243 </child>
1244@@ -1248,6 +1394,8 @@
1245 </child>
1246 </object>
1247 <packing>
1248+ <property name="expand">True</property>
1249+ <property name="fill">True</property>
1250 <property name="padding">5</property>
1251 <property name="position">2</property>
1252 </packing>
1253@@ -1255,6 +1403,7 @@
1254 <child>
1255 <object class="GtkLabel" id="label28">
1256 <property name="visible">True</property>
1257+ <property name="can_focus">False</property>
1258 <property name="label" translatable="yes">&lt;i&gt;Capitoli&lt;/i&gt;</property>
1259 <property name="use_markup">True</property>
1260 </object>
1261@@ -1273,18 +1422,22 @@
1262 <property name="vscrollbar_policy">automatic</property>
1263 <child>
1264 <object class="GtkTreeView" id="treeview9">
1265+ <property name="height_request">100</property>
1266 <property name="visible">True</property>
1267 <property name="can_focus">True</property>
1268 </object>
1269 </child>
1270 </object>
1271 <packing>
1272+ <property name="expand">True</property>
1273+ <property name="fill">True</property>
1274 <property name="position">4</property>
1275 </packing>
1276 </child>
1277 <child>
1278 <object class="GtkHButtonBox" id="hbuttonbox8">
1279 <property name="visible">True</property>
1280+ <property name="can_focus">False</property>
1281 <property name="spacing">5</property>
1282 <property name="layout_style">center</property>
1283 <child>
1284@@ -1292,10 +1445,12 @@
1285 <property name="visible">True</property>
1286 <property name="can_focus">True</property>
1287 <property name="receives_default">True</property>
1288- <signal name="clicked" handler="pulsante_aggiungi_Capitolo"/>
1289+ <property name="use_action_appearance">False</property>
1290+ <signal name="clicked" handler="pulsante_aggiungi_Capitolo" swapped="no"/>
1291 <child>
1292 <object class="GtkImage" id="image23">
1293 <property name="visible">True</property>
1294+ <property name="can_focus">False</property>
1295 <property name="stock">gtk-add</property>
1296 </object>
1297 </child>
1298@@ -1311,10 +1466,12 @@
1299 <property name="visible">True</property>
1300 <property name="can_focus">True</property>
1301 <property name="receives_default">True</property>
1302- <signal name="clicked" handler="pulsante_rimuovi_Capitolo"/>
1303+ <property name="use_action_appearance">False</property>
1304+ <signal name="clicked" handler="pulsante_rimuovi_Capitolo" swapped="no"/>
1305 <child>
1306 <object class="GtkImage" id="image24">
1307 <property name="visible">True</property>
1308+ <property name="can_focus">False</property>
1309 <property name="stock">gtk-remove</property>
1310 </object>
1311 </child>
1312@@ -1327,6 +1484,8 @@
1313 </child>
1314 </object>
1315 <packing>
1316+ <property name="expand">True</property>
1317+ <property name="fill">True</property>
1318 <property name="padding">5</property>
1319 <property name="position">5</property>
1320 </packing>
1321@@ -1334,6 +1493,7 @@
1322 <child>
1323 <object class="GtkLabel" id="label29">
1324 <property name="visible">True</property>
1325+ <property name="can_focus">False</property>
1326 <property name="label" translatable="yes">&lt;i&gt;SubCapitoli&lt;/i&gt;</property>
1327 <property name="use_markup">True</property>
1328 </object>
1329@@ -1352,18 +1512,22 @@
1330 <property name="vscrollbar_policy">automatic</property>
1331 <child>
1332 <object class="GtkTreeView" id="treeview10">
1333+ <property name="height_request">100</property>
1334 <property name="visible">True</property>
1335 <property name="can_focus">True</property>
1336 </object>
1337 </child>
1338 </object>
1339 <packing>
1340+ <property name="expand">True</property>
1341+ <property name="fill">True</property>
1342 <property name="position">7</property>
1343 </packing>
1344 </child>
1345 <child>
1346 <object class="GtkHButtonBox" id="hbuttonbox7">
1347 <property name="visible">True</property>
1348+ <property name="can_focus">False</property>
1349 <property name="spacing">5</property>
1350 <property name="layout_style">center</property>
1351 <child>
1352@@ -1371,10 +1535,12 @@
1353 <property name="visible">True</property>
1354 <property name="can_focus">True</property>
1355 <property name="receives_default">True</property>
1356- <signal name="clicked" handler="pulsante_aggiungi_Subcapitolo"/>
1357+ <property name="use_action_appearance">False</property>
1358+ <signal name="clicked" handler="pulsante_aggiungi_Subcapitolo" swapped="no"/>
1359 <child>
1360 <object class="GtkImage" id="image21">
1361 <property name="visible">True</property>
1362+ <property name="can_focus">False</property>
1363 <property name="stock">gtk-add</property>
1364 </object>
1365 </child>
1366@@ -1390,10 +1556,12 @@
1367 <property name="visible">True</property>
1368 <property name="can_focus">True</property>
1369 <property name="receives_default">True</property>
1370- <signal name="clicked" handler="pulsante_rimuovi_Subcapitolo"/>
1371+ <property name="use_action_appearance">False</property>
1372+ <signal name="clicked" handler="pulsante_rimuovi_Subcapitolo" swapped="no"/>
1373 <child>
1374 <object class="GtkImage" id="image22">
1375 <property name="visible">True</property>
1376+ <property name="can_focus">False</property>
1377 <property name="stock">gtk-remove</property>
1378 </object>
1379 </child>
1380@@ -1406,6 +1574,8 @@
1381 </child>
1382 </object>
1383 <packing>
1384+ <property name="expand">True</property>
1385+ <property name="fill">True</property>
1386 <property name="padding">5</property>
1387 <property name="position">8</property>
1388 </packing>
1389@@ -1415,6 +1585,7 @@
1390 <child type="label">
1391 <object class="GtkLabel" id="label25">
1392 <property name="visible">True</property>
1393+ <property name="can_focus">False</property>
1394 <property name="label" translatable="yes">&lt;b&gt;Capitoli di Epu&lt;/b&gt;</property>
1395 <property name="use_markup">True</property>
1396 </object>
1397@@ -1422,15 +1593,18 @@
1398 </object>
1399 <packing>
1400 <property name="expand">False</property>
1401+ <property name="fill">True</property>
1402 <property name="position">0</property>
1403 </packing>
1404 </child>
1405 <child>
1406 <object class="GtkHSeparator" id="hseparator4">
1407 <property name="visible">True</property>
1408+ <property name="can_focus">False</property>
1409 </object>
1410 <packing>
1411 <property name="expand">False</property>
1412+ <property name="fill">True</property>
1413 <property name="padding">10</property>
1414 <property name="position">1</property>
1415 </packing>
1416@@ -1439,17 +1613,21 @@
1417 <object class="GtkExpander" id="expander3">
1418 <property name="visible">True</property>
1419 <property name="can_focus">True</property>
1420- <signal name="activate" handler="Shrink_capitoli_expander"/>
1421+ <signal name="activate" handler="Shrink_capitoli_expander" swapped="no"/>
1422 <child>
1423 <object class="GtkVBox" id="vbox11">
1424 <property name="visible">True</property>
1425+ <property name="can_focus">False</property>
1426 <child>
1427 <object class="GtkLabel" id="label30">
1428 <property name="visible">True</property>
1429+ <property name="can_focus">False</property>
1430 <property name="label" translatable="yes">&lt;i&gt;SuperCategorie&lt;/i&gt;</property>
1431 <property name="use_markup">True</property>
1432 </object>
1433 <packing>
1434+ <property name="expand">True</property>
1435+ <property name="fill">True</property>
1436 <property name="position">0</property>
1437 </packing>
1438 </child>
1439@@ -1461,18 +1639,22 @@
1440 <property name="vscrollbar_policy">automatic</property>
1441 <child>
1442 <object class="GtkTreeView" id="treeview11">
1443+ <property name="height_request">100</property>
1444 <property name="visible">True</property>
1445 <property name="can_focus">True</property>
1446 </object>
1447 </child>
1448 </object>
1449 <packing>
1450+ <property name="expand">True</property>
1451+ <property name="fill">True</property>
1452 <property name="position">1</property>
1453 </packing>
1454 </child>
1455 <child>
1456 <object class="GtkHButtonBox" id="hbuttonbox6">
1457 <property name="visible">True</property>
1458+ <property name="can_focus">False</property>
1459 <property name="spacing">5</property>
1460 <property name="layout_style">center</property>
1461 <child>
1462@@ -1480,10 +1662,12 @@
1463 <property name="visible">True</property>
1464 <property name="can_focus">True</property>
1465 <property name="receives_default">True</property>
1466- <signal name="clicked" handler="pulsante_aggiungi_Supercategoria"/>
1467+ <property name="use_action_appearance">False</property>
1468+ <signal name="clicked" handler="pulsante_aggiungi_Supercategoria" swapped="no"/>
1469 <child>
1470 <object class="GtkImage" id="image15">
1471 <property name="visible">True</property>
1472+ <property name="can_focus">False</property>
1473 <property name="stock">gtk-add</property>
1474 </object>
1475 </child>
1476@@ -1499,10 +1683,12 @@
1477 <property name="visible">True</property>
1478 <property name="can_focus">True</property>
1479 <property name="receives_default">True</property>
1480- <signal name="clicked" handler="pulsante_rimuovi_Supercategoria"/>
1481+ <property name="use_action_appearance">False</property>
1482+ <signal name="clicked" handler="pulsante_rimuovi_Supercategoria" swapped="no"/>
1483 <child>
1484 <object class="GtkImage" id="image18">
1485 <property name="visible">True</property>
1486+ <property name="can_focus">False</property>
1487 <property name="stock">gtk-remove</property>
1488 </object>
1489 </child>
1490@@ -1515,6 +1701,8 @@
1491 </child>
1492 </object>
1493 <packing>
1494+ <property name="expand">True</property>
1495+ <property name="fill">True</property>
1496 <property name="padding">5</property>
1497 <property name="position">2</property>
1498 </packing>
1499@@ -1522,10 +1710,13 @@
1500 <child>
1501 <object class="GtkLabel" id="label31">
1502 <property name="visible">True</property>
1503+ <property name="can_focus">False</property>
1504 <property name="label" translatable="yes">&lt;i&gt;Categorie&lt;/i&gt;</property>
1505 <property name="use_markup">True</property>
1506 </object>
1507 <packing>
1508+ <property name="expand">True</property>
1509+ <property name="fill">True</property>
1510 <property name="position">3</property>
1511 </packing>
1512 </child>
1513@@ -1537,18 +1728,22 @@
1514 <property name="vscrollbar_policy">automatic</property>
1515 <child>
1516 <object class="GtkTreeView" id="treeview12">
1517+ <property name="height_request">100</property>
1518 <property name="visible">True</property>
1519 <property name="can_focus">True</property>
1520 </object>
1521 </child>
1522 </object>
1523 <packing>
1524+ <property name="expand">True</property>
1525+ <property name="fill">True</property>
1526 <property name="position">4</property>
1527 </packing>
1528 </child>
1529 <child>
1530 <object class="GtkHButtonBox" id="hbuttonbox5">
1531 <property name="visible">True</property>
1532+ <property name="can_focus">False</property>
1533 <property name="spacing">5</property>
1534 <property name="layout_style">center</property>
1535 <child>
1536@@ -1556,10 +1751,12 @@
1537 <property name="visible">True</property>
1538 <property name="can_focus">True</property>
1539 <property name="receives_default">True</property>
1540- <signal name="clicked" handler="pulsante_aggiungi_Categoria"/>
1541+ <property name="use_action_appearance">False</property>
1542+ <signal name="clicked" handler="pulsante_aggiungi_Categoria" swapped="no"/>
1543 <child>
1544 <object class="GtkImage" id="image16">
1545 <property name="visible">True</property>
1546+ <property name="can_focus">False</property>
1547 <property name="stock">gtk-add</property>
1548 </object>
1549 </child>
1550@@ -1575,10 +1772,12 @@
1551 <property name="visible">True</property>
1552 <property name="can_focus">True</property>
1553 <property name="receives_default">True</property>
1554- <signal name="clicked" handler="pulsante_rimuovi_Categoria"/>
1555+ <property name="use_action_appearance">False</property>
1556+ <signal name="clicked" handler="pulsante_rimuovi_Categoria" swapped="no"/>
1557 <child>
1558 <object class="GtkImage" id="image19">
1559 <property name="visible">True</property>
1560+ <property name="can_focus">False</property>
1561 <property name="stock">gtk-remove</property>
1562 </object>
1563 </child>
1564@@ -1591,6 +1790,8 @@
1565 </child>
1566 </object>
1567 <packing>
1568+ <property name="expand">True</property>
1569+ <property name="fill">True</property>
1570 <property name="padding">5</property>
1571 <property name="position">5</property>
1572 </packing>
1573@@ -1598,10 +1799,13 @@
1574 <child>
1575 <object class="GtkLabel" id="label32">
1576 <property name="visible">True</property>
1577+ <property name="can_focus">False</property>
1578 <property name="label" translatable="yes">&lt;i&gt;SubCategorie&lt;/i&gt;</property>
1579 <property name="use_markup">True</property>
1580 </object>
1581 <packing>
1582+ <property name="expand">True</property>
1583+ <property name="fill">True</property>
1584 <property name="padding">5</property>
1585 <property name="position">6</property>
1586 </packing>
1587@@ -1614,18 +1818,22 @@
1588 <property name="vscrollbar_policy">automatic</property>
1589 <child>
1590 <object class="GtkTreeView" id="treeview13">
1591+ <property name="height_request">100</property>
1592 <property name="visible">True</property>
1593 <property name="can_focus">True</property>
1594 </object>
1595 </child>
1596 </object>
1597 <packing>
1598+ <property name="expand">True</property>
1599+ <property name="fill">True</property>
1600 <property name="position">7</property>
1601 </packing>
1602 </child>
1603 <child>
1604 <object class="GtkHButtonBox" id="hbuttonbox4">
1605 <property name="visible">True</property>
1606+ <property name="can_focus">False</property>
1607 <property name="spacing">5</property>
1608 <property name="layout_style">center</property>
1609 <child>
1610@@ -1633,10 +1841,12 @@
1611 <property name="visible">True</property>
1612 <property name="can_focus">True</property>
1613 <property name="receives_default">True</property>
1614- <signal name="clicked" handler="pulsante_aggiungi_Subcategoria"/>
1615+ <property name="use_action_appearance">False</property>
1616+ <signal name="clicked" handler="pulsante_aggiungi_Subcategoria" swapped="no"/>
1617 <child>
1618 <object class="GtkImage" id="image17">
1619 <property name="visible">True</property>
1620+ <property name="can_focus">False</property>
1621 <property name="stock">gtk-add</property>
1622 </object>
1623 </child>
1624@@ -1652,10 +1862,12 @@
1625 <property name="visible">True</property>
1626 <property name="can_focus">True</property>
1627 <property name="receives_default">True</property>
1628- <signal name="clicked" handler="pulsante_rimuovi_Subcategoria"/>
1629+ <property name="use_action_appearance">False</property>
1630+ <signal name="clicked" handler="pulsante_rimuovi_Subcategoria" swapped="no"/>
1631 <child>
1632 <object class="GtkImage" id="image20">
1633 <property name="visible">True</property>
1634+ <property name="can_focus">False</property>
1635 <property name="stock">gtk-remove</property>
1636 </object>
1637 </child>
1638@@ -1668,6 +1880,8 @@
1639 </child>
1640 </object>
1641 <packing>
1642+ <property name="expand">True</property>
1643+ <property name="fill">True</property>
1644 <property name="padding">5</property>
1645 <property name="position">8</property>
1646 </packing>
1647@@ -1677,6 +1891,7 @@
1648 <child type="label">
1649 <object class="GtkLabel" id="label26">
1650 <property name="visible">True</property>
1651+ <property name="can_focus">False</property>
1652 <property name="label" translatable="yes">&lt;b&gt;Categorie di Computo&lt;/b&gt;</property>
1653 <property name="use_markup">True</property>
1654 </object>
1655@@ -1684,11 +1899,14 @@
1656 </object>
1657 <packing>
1658 <property name="expand">False</property>
1659+ <property name="fill">True</property>
1660 <property name="position">2</property>
1661 </packing>
1662 </child>
1663 </object>
1664 <packing>
1665+ <property name="expand">True</property>
1666+ <property name="fill">True</property>
1667 <property name="position">2</property>
1668 </packing>
1669 </child>
1670@@ -1697,21 +1915,28 @@
1671 <child type="tab">
1672 <object class="GtkHBox" id="hbox6">
1673 <property name="visible">True</property>
1674+ <property name="can_focus">False</property>
1675 <child>
1676 <object class="GtkImage" id="image9">
1677 <property name="visible">True</property>
1678+ <property name="can_focus">False</property>
1679 <property name="stock">gtk-missing-image</property>
1680 </object>
1681 <packing>
1682+ <property name="expand">True</property>
1683+ <property name="fill">True</property>
1684 <property name="position">0</property>
1685 </packing>
1686 </child>
1687 <child>
1688 <object class="GtkLabel" id="label24">
1689 <property name="visible">True</property>
1690+ <property name="can_focus">False</property>
1691 <property name="label" translatable="yes">Dati Generali</property>
1692 </object>
1693 <packing>
1694+ <property name="expand">True</property>
1695+ <property name="fill">True</property>
1696 <property name="position">1</property>
1697 </packing>
1698 </child>
1699@@ -1727,6 +1952,7 @@
1700 <child>
1701 <object class="GtkVBox" id="vbox2">
1702 <property name="visible">True</property>
1703+ <property name="can_focus">False</property>
1704 <child>
1705 <object class="GtkVPaned" id="vpaned1">
1706 <property name="visible">True</property>
1707@@ -1734,6 +1960,7 @@
1708 <child>
1709 <object class="GtkVBox" id="vbox8">
1710 <property name="visible">True</property>
1711+ <property name="can_focus">False</property>
1712 <child>
1713 <object class="GtkExpander" id="expander5">
1714 <property name="visible">True</property>
1715@@ -1741,12 +1968,15 @@
1716 <child>
1717 <object class="GtkVBox" id="vbox21">
1718 <property name="visible">True</property>
1719+ <property name="can_focus">False</property>
1720 <child>
1721 <object class="GtkHBox" id="hbox7">
1722 <property name="visible">True</property>
1723+ <property name="can_focus">False</property>
1724 <child>
1725 <object class="GtkComboBox" id="combobox5">
1726 <property name="visible">True</property>
1727+ <property name="can_focus">False</property>
1728 </object>
1729 <packing>
1730 <property name="expand">False</property>
1731@@ -1758,16 +1988,19 @@
1732 <object class="GtkEntry" id="entry16">
1733 <property name="visible">True</property>
1734 <property name="can_focus">True</property>
1735- <property name="invisible_char">&#x2022;</property>
1736+ <property name="invisible_char">•</property>
1737 <property name="primary_icon_stock">gtk-find</property>
1738 <property name="secondary_icon_stock">gtk-clear</property>
1739 <property name="primary_icon_activatable">True</property>
1740+ <property name="secondary_icon_activatable">False</property>
1741 <property name="primary_icon_sensitive">True</property>
1742 <property name="secondary_icon_sensitive">True</property>
1743- <signal name="activate" handler="cerca_articolo_epu"/>
1744- <signal name="icon_press" handler="cerca_articolo_epu"/>
1745+ <signal name="activate" handler="cerca_articolo_epu" swapped="no"/>
1746+ <signal name="icon-press" handler="cerca_articolo_epu" swapped="no"/>
1747 </object>
1748 <packing>
1749+ <property name="expand">True</property>
1750+ <property name="fill">True</property>
1751 <property name="position">1</property>
1752 </packing>
1753 </child>
1754@@ -1789,33 +2022,40 @@
1755 <property name="visible">True</property>
1756 <property name="can_focus">True</property>
1757 <property name="enable_tree_lines">True</property>
1758- <signal name="button_press_event" handler="on_treeview_epu_button_press_event"/>
1759- <signal name="cursor_changed" handler="row_selected_epu"/>
1760+ <signal name="button-press-event" handler="on_treeview_epu_button_press_event" swapped="no"/>
1761+ <signal name="cursor-changed" handler="row_selected_epu" swapped="no"/>
1762 </object>
1763 </child>
1764 </object>
1765 <packing>
1766+ <property name="expand">True</property>
1767+ <property name="fill">True</property>
1768 <property name="position">1</property>
1769 </packing>
1770 </child>
1771 <child>
1772 <object class="GtkHBox" id="hbox10">
1773 <property name="visible">True</property>
1774+ <property name="can_focus">False</property>
1775 <property name="spacing">1</property>
1776 <child>
1777 <object class="GtkButton" id="button7">
1778 <property name="visible">True</property>
1779 <property name="can_focus">True</property>
1780 <property name="receives_default">True</property>
1781- <signal name="clicked" handler="espandi_treeview_epu"/>
1782+ <property name="use_action_appearance">False</property>
1783+ <signal name="clicked" handler="espandi_treeview_epu" swapped="no"/>
1784 <child>
1785 <object class="GtkImage" id="image13">
1786 <property name="visible">True</property>
1787+ <property name="can_focus">False</property>
1788 <property name="stock">gtk-add</property>
1789 </object>
1790 </child>
1791 </object>
1792 <packing>
1793+ <property name="expand">True</property>
1794+ <property name="fill">True</property>
1795 <property name="position">0</property>
1796 </packing>
1797 </child>
1798@@ -1824,15 +2064,19 @@
1799 <property name="visible">True</property>
1800 <property name="can_focus">True</property>
1801 <property name="receives_default">True</property>
1802- <signal name="clicked" handler="collassa_treeview_epu"/>
1803+ <property name="use_action_appearance">False</property>
1804+ <signal name="clicked" handler="collassa_treeview_epu" swapped="no"/>
1805 <child>
1806 <object class="GtkImage" id="image14">
1807 <property name="visible">True</property>
1808+ <property name="can_focus">False</property>
1809 <property name="stock">gtk-remove</property>
1810 </object>
1811 </child>
1812 </object>
1813 <packing>
1814+ <property name="expand">True</property>
1815+ <property name="fill">True</property>
1816 <property name="position">1</property>
1817 </packing>
1818 </child>
1819@@ -1849,12 +2093,15 @@
1820 <child type="label">
1821 <object class="GtkLabel" id="label52">
1822 <property name="visible">True</property>
1823+ <property name="can_focus">False</property>
1824 <property name="label" translatable="yes">&lt;b&gt;Archivio Articoli&lt;/b&gt;</property>
1825 <property name="use_markup">True</property>
1826 </object>
1827 </child>
1828 </object>
1829 <packing>
1830+ <property name="expand">True</property>
1831+ <property name="fill">True</property>
1832 <property name="position">0</property>
1833 </packing>
1834 </child>
1835@@ -1867,9 +2114,11 @@
1836 <child>
1837 <object class="GtkVBox" id="vbox7">
1838 <property name="visible">True</property>
1839+ <property name="can_focus">False</property>
1840 <child>
1841 <object class="GtkComboBox" id="combobox12">
1842 <property name="visible">True</property>
1843+ <property name="can_focus">False</property>
1844 </object>
1845 <packing>
1846 <property name="expand">False</property>
1847@@ -1887,33 +2136,40 @@
1848 <object class="GtkTreeView" id="treeview2">
1849 <property name="visible">True</property>
1850 <property name="can_focus">True</property>
1851- <signal name="button_press_event" handler="on_treeview_categorie_button_press_event"/>
1852- <signal name="cursor_changed" handler="row_selected_categorie"/>
1853+ <signal name="button-press-event" handler="on_treeview_categorie_button_press_event" swapped="no"/>
1854+ <signal name="cursor-changed" handler="row_selected_categorie" swapped="no"/>
1855 </object>
1856 </child>
1857 </object>
1858 <packing>
1859+ <property name="expand">True</property>
1860+ <property name="fill">True</property>
1861 <property name="position">1</property>
1862 </packing>
1863 </child>
1864 <child>
1865 <object class="GtkHBox" id="hbox9">
1866 <property name="visible">True</property>
1867+ <property name="can_focus">False</property>
1868 <property name="spacing">1</property>
1869 <child>
1870 <object class="GtkButton" id="button5">
1871 <property name="visible">True</property>
1872 <property name="can_focus">True</property>
1873 <property name="receives_default">True</property>
1874- <signal name="clicked" handler="espandi_treeview_categorie"/>
1875+ <property name="use_action_appearance">False</property>
1876+ <signal name="clicked" handler="espandi_treeview_categorie" swapped="no"/>
1877 <child>
1878 <object class="GtkImage" id="image11">
1879 <property name="visible">True</property>
1880+ <property name="can_focus">False</property>
1881 <property name="stock">gtk-add</property>
1882 </object>
1883 </child>
1884 </object>
1885 <packing>
1886+ <property name="expand">True</property>
1887+ <property name="fill">True</property>
1888 <property name="position">0</property>
1889 </packing>
1890 </child>
1891@@ -1922,15 +2178,19 @@
1892 <property name="visible">True</property>
1893 <property name="can_focus">True</property>
1894 <property name="receives_default">True</property>
1895- <signal name="clicked" handler="collassa_treeview_categorie"/>
1896+ <property name="use_action_appearance">False</property>
1897+ <signal name="clicked" handler="collassa_treeview_categorie" swapped="no"/>
1898 <child>
1899 <object class="GtkImage" id="image12">
1900 <property name="visible">True</property>
1901+ <property name="can_focus">False</property>
1902 <property name="stock">gtk-remove</property>
1903 </object>
1904 </child>
1905 </object>
1906 <packing>
1907+ <property name="expand">True</property>
1908+ <property name="fill">True</property>
1909 <property name="position">1</property>
1910 </packing>
1911 </child>
1912@@ -1950,18 +2210,24 @@
1913 </child>
1914 </object>
1915 <packing>
1916+ <property name="expand">True</property>
1917+ <property name="fill">True</property>
1918 <property name="position">0</property>
1919 </packing>
1920 </child>
1921 <child>
1922 <object class="GtkHBox" id="hbox5">
1923 <property name="visible">True</property>
1924+ <property name="can_focus">False</property>
1925 <child>
1926 <object class="GtkLabel" id="label3">
1927 <property name="visible">True</property>
1928+ <property name="can_focus">False</property>
1929 <property name="label" translatable="yes">Tariffa:</property>
1930 </object>
1931 <packing>
1932+ <property name="expand">True</property>
1933+ <property name="fill">True</property>
1934 <property name="position">0</property>
1935 </packing>
1936 </child>
1937@@ -1970,11 +2236,15 @@
1938 <property name="visible">True</property>
1939 <property name="can_focus">True</property>
1940 <property name="editable">False</property>
1941- <property name="invisible_char">&#x25CF;</property>
1942+ <property name="invisible_char">●</property>
1943+ <property name="primary_icon_activatable">False</property>
1944+ <property name="secondary_icon_activatable">False</property>
1945 <property name="primary_icon_sensitive">True</property>
1946 <property name="secondary_icon_sensitive">True</property>
1947 </object>
1948 <packing>
1949+ <property name="expand">True</property>
1950+ <property name="fill">True</property>
1951 <property name="position">1</property>
1952 </packing>
1953 </child>
1954@@ -1994,9 +2264,11 @@
1955 <child>
1956 <object class="GtkVBox" id="vbox3">
1957 <property name="visible">True</property>
1958+ <property name="can_focus">False</property>
1959 <child>
1960 <object class="GtkVBox" id="vbox4">
1961 <property name="visible">True</property>
1962+ <property name="can_focus">False</property>
1963 <child>
1964 <object class="GtkExpander" id="expander1">
1965 <property name="visible">True</property>
1966@@ -2004,22 +2276,27 @@
1967 <child>
1968 <object class="GtkVBox" id="vbox14">
1969 <property name="visible">True</property>
1970+ <property name="can_focus">False</property>
1971 <property name="spacing">10</property>
1972 <child>
1973 <object class="GtkAlignment" id="alignment5">
1974 <property name="visible">True</property>
1975+ <property name="can_focus">False</property>
1976 <property name="xalign">0</property>
1977 <property name="xscale">0</property>
1978 <child>
1979 <object class="GtkHBox" id="hbox2">
1980 <property name="visible">True</property>
1981+ <property name="can_focus">False</property>
1982 <child>
1983 <object class="GtkFrame" id="frame6">
1984 <property name="visible">True</property>
1985+ <property name="can_focus">False</property>
1986 <property name="label_xalign">0</property>
1987 <child>
1988 <object class="GtkAlignment" id="alignment7">
1989 <property name="visible">True</property>
1990+ <property name="can_focus">False</property>
1991 <property name="xscale">0</property>
1992 <property name="yscale">0</property>
1993 <property name="top_padding">5</property>
1994@@ -2029,11 +2306,13 @@
1995 <child>
1996 <object class="GtkTable" id="table4">
1997 <property name="visible">True</property>
1998+ <property name="can_focus">False</property>
1999 <property name="n_rows">4</property>
2000 <property name="n_columns">2</property>
2001 <child>
2002 <object class="GtkLabel" id="label11">
2003 <property name="visible">True</property>
2004+ <property name="can_focus">False</property>
2005 <property name="xalign">0</property>
2006 <property name="label" translatable="yes">Tariffa:</property>
2007 </object>
2008@@ -2043,12 +2322,14 @@
2009 <property name="visible">True</property>
2010 <property name="can_focus">True</property>
2011 <property name="max_length">15</property>
2012- <property name="invisible_char">&#x2022;</property>
2013+ <property name="invisible_char">•</property>
2014 <property name="primary_icon_stock">gtk-edit</property>
2015+ <property name="primary_icon_activatable">False</property>
2016+ <property name="secondary_icon_activatable">False</property>
2017 <property name="primary_icon_sensitive">True</property>
2018 <property name="secondary_icon_sensitive">True</property>
2019- <signal name="activate" handler="modifica_articolo_epu"/>
2020- <signal name="insert_at_cursor" handler="Attiva_pulsante_aggiornamento"/>
2021+ <signal name="activate" handler="modifica_articolo_epu" swapped="no"/>
2022+ <signal name="insert-at-cursor" handler="Attiva_pulsante_aggiornamento" swapped="no"/>
2023 </object>
2024 <packing>
2025 <property name="left_attach">1</property>
2026@@ -2058,6 +2339,7 @@
2027 <child>
2028 <object class="GtkLabel" id="label12">
2029 <property name="visible">True</property>
2030+ <property name="can_focus">False</property>
2031 <property name="xalign">0</property>
2032 <property name="label" translatable="yes">U.M.:</property>
2033 </object>
2034@@ -2070,8 +2352,18 @@
2035 <object class="GtkComboBoxEntry" id="comboboxentry_um">
2036 <property name="width_request">100</property>
2037 <property name="visible">True</property>
2038+ <property name="can_focus">False</property>
2039 <property name="model">liststore_um</property>
2040 <property name="text_column">0</property>
2041+ <child internal-child="entry">
2042+ <object class="GtkEntry" id="comboboxentry-entry2">
2043+ <property name="can_focus">False</property>
2044+ <property name="primary_icon_activatable">False</property>
2045+ <property name="secondary_icon_activatable">False</property>
2046+ <property name="primary_icon_sensitive">True</property>
2047+ <property name="secondary_icon_sensitive">True</property>
2048+ </object>
2049+ </child>
2050 </object>
2051 <packing>
2052 <property name="left_attach">1</property>
2053@@ -2084,11 +2376,13 @@
2054 <object class="GtkEntry" id="entry7">
2055 <property name="visible">True</property>
2056 <property name="can_focus">True</property>
2057- <property name="invisible_char">&#x2022;</property>
2058+ <property name="invisible_char">•</property>
2059 <property name="primary_icon_stock">gtk-edit</property>
2060+ <property name="primary_icon_activatable">True</property>
2061+ <property name="secondary_icon_activatable">False</property>
2062 <property name="primary_icon_sensitive">True</property>
2063 <property name="secondary_icon_sensitive">True</property>
2064- <signal name="activate" handler="modifica_articolo_computo"/>
2065+ <signal name="activate" handler="modifica_articolo_computo" swapped="no"/>
2066 </object>
2067 <packing>
2068 <property name="left_attach">1</property>
2069@@ -2100,8 +2394,9 @@
2070 <child>
2071 <object class="GtkLabel" id="label13">
2072 <property name="visible">True</property>
2073+ <property name="can_focus">False</property>
2074 <property name="xalign">0</property>
2075- <property name="label" translatable="yes">Quantit&#xE0;:</property>
2076+ <property name="label" translatable="yes">Quantità:</property>
2077 </object>
2078 <packing>
2079 <property name="top_attach">2</property>
2080@@ -2114,9 +2409,11 @@
2081 <property name="can_focus">True</property>
2082 <property name="editable">False</property>
2083 <property name="max_length">15</property>
2084- <property name="invisible_char">&#x2022;</property>
2085+ <property name="invisible_char">•</property>
2086 <property name="shadow_type">out</property>
2087 <property name="primary_icon_stock">gtk-stop</property>
2088+ <property name="primary_icon_activatable">True</property>
2089+ <property name="secondary_icon_activatable">False</property>
2090 <property name="primary_icon_sensitive">True</property>
2091 <property name="secondary_icon_sensitive">True</property>
2092 </object>
2093@@ -2130,6 +2427,7 @@
2094 <child>
2095 <object class="GtkLabel" id="label18">
2096 <property name="visible">True</property>
2097+ <property name="can_focus">False</property>
2098 <property name="xalign">0</property>
2099 <property name="label" translatable="yes">Prezzo Unitario:</property>
2100 </object>
2101@@ -2145,12 +2443,15 @@
2102 <child type="label">
2103 <object class="GtkLabel" id="label6">
2104 <property name="visible">True</property>
2105+ <property name="can_focus">False</property>
2106 <property name="label" translatable="yes">&lt;b&gt;Dati articolo&lt;/b&gt;</property>
2107 <property name="use_markup">True</property>
2108 </object>
2109 </child>
2110 </object>
2111 <packing>
2112+ <property name="expand">True</property>
2113+ <property name="fill">True</property>
2114 <property name="padding">2</property>
2115 <property name="position">0</property>
2116 </packing>
2117@@ -2158,10 +2459,12 @@
2118 <child>
2119 <object class="GtkFrame" id="frame4">
2120 <property name="visible">True</property>
2121+ <property name="can_focus">False</property>
2122 <property name="label_xalign">0</property>
2123 <child>
2124 <object class="GtkAlignment" id="alignment6">
2125 <property name="visible">True</property>
2126+ <property name="can_focus">False</property>
2127 <property name="xscale">0</property>
2128 <property name="top_padding">5</property>
2129 <property name="bottom_padding">5</property>
2130@@ -2170,37 +2473,50 @@
2131 <child>
2132 <object class="GtkVBox" id="vbox15">
2133 <property name="visible">True</property>
2134+ <property name="can_focus">False</property>
2135 <child>
2136 <object class="GtkLabel" id="label5">
2137 <property name="visible">True</property>
2138+ <property name="can_focus">False</property>
2139 <property name="label" translatable="yes">&lt;i&gt;Capitoli:&lt;/i&gt;</property>
2140 <property name="use_markup">True</property>
2141 </object>
2142 <packing>
2143+ <property name="expand">True</property>
2144+ <property name="fill">True</property>
2145 <property name="position">0</property>
2146 </packing>
2147 </child>
2148 <child>
2149 <object class="GtkComboBox" id="combobox6">
2150 <property name="visible">True</property>
2151+ <property name="can_focus">False</property>
2152 </object>
2153 <packing>
2154+ <property name="expand">True</property>
2155+ <property name="fill">True</property>
2156 <property name="position">1</property>
2157 </packing>
2158 </child>
2159 <child>
2160 <object class="GtkComboBox" id="combobox7">
2161 <property name="visible">True</property>
2162+ <property name="can_focus">False</property>
2163 </object>
2164 <packing>
2165+ <property name="expand">True</property>
2166+ <property name="fill">True</property>
2167 <property name="position">2</property>
2168 </packing>
2169 </child>
2170 <child>
2171 <object class="GtkComboBox" id="combobox8">
2172 <property name="visible">True</property>
2173+ <property name="can_focus">False</property>
2174 </object>
2175 <packing>
2176+ <property name="expand">True</property>
2177+ <property name="fill">True</property>
2178 <property name="position">3</property>
2179 </packing>
2180 </child>
2181@@ -2211,12 +2527,15 @@
2182 <child type="label">
2183 <object class="GtkLabel" id="label44">
2184 <property name="visible">True</property>
2185+ <property name="can_focus">False</property>
2186 <property name="label" translatable="yes">&lt;b&gt;Capitoli di Elenco Prezzi&lt;/b&gt;</property>
2187 <property name="use_markup">True</property>
2188 </object>
2189 </child>
2190 </object>
2191 <packing>
2192+ <property name="expand">True</property>
2193+ <property name="fill">True</property>
2194 <property name="padding">2</property>
2195 <property name="position">1</property>
2196 </packing>
2197@@ -2224,10 +2543,12 @@
2198 <child>
2199 <object class="GtkFrame" id="frame5">
2200 <property name="visible">True</property>
2201+ <property name="can_focus">False</property>
2202 <property name="label_xalign">0</property>
2203 <child>
2204 <object class="GtkAlignment" id="alignment9">
2205 <property name="visible">True</property>
2206+ <property name="can_focus">False</property>
2207 <property name="xscale">0</property>
2208 <property name="top_padding">5</property>
2209 <property name="bottom_padding">5</property>
2210@@ -2236,37 +2557,50 @@
2211 <child>
2212 <object class="GtkVBox" id="vbox16">
2213 <property name="visible">True</property>
2214+ <property name="can_focus">False</property>
2215 <child>
2216 <object class="GtkLabel" id="label8">
2217 <property name="visible">True</property>
2218+ <property name="can_focus">False</property>
2219 <property name="label" translatable="yes">&lt;i&gt;Categorie:&lt;/i&gt;</property>
2220 <property name="use_markup">True</property>
2221 </object>
2222 <packing>
2223+ <property name="expand">True</property>
2224+ <property name="fill">True</property>
2225 <property name="position">0</property>
2226 </packing>
2227 </child>
2228 <child>
2229 <object class="GtkComboBox" id="combobox9">
2230 <property name="visible">True</property>
2231+ <property name="can_focus">False</property>
2232 </object>
2233 <packing>
2234+ <property name="expand">True</property>
2235+ <property name="fill">True</property>
2236 <property name="position">1</property>
2237 </packing>
2238 </child>
2239 <child>
2240 <object class="GtkComboBox" id="combobox10">
2241 <property name="visible">True</property>
2242+ <property name="can_focus">False</property>
2243 </object>
2244 <packing>
2245+ <property name="expand">True</property>
2246+ <property name="fill">True</property>
2247 <property name="position">2</property>
2248 </packing>
2249 </child>
2250 <child>
2251 <object class="GtkComboBox" id="combobox11">
2252 <property name="visible">True</property>
2253+ <property name="can_focus">False</property>
2254 </object>
2255 <packing>
2256+ <property name="expand">True</property>
2257+ <property name="fill">True</property>
2258 <property name="position">3</property>
2259 </packing>
2260 </child>
2261@@ -2277,12 +2611,15 @@
2262 <child type="label">
2263 <object class="GtkLabel" id="label45">
2264 <property name="visible">True</property>
2265+ <property name="can_focus">False</property>
2266 <property name="label" translatable="yes">&lt;b&gt;Categorie di computo&lt;/b&gt;</property>
2267 <property name="use_markup">True</property>
2268 </object>
2269 </child>
2270 </object>
2271 <packing>
2272+ <property name="expand">True</property>
2273+ <property name="fill">True</property>
2274 <property name="padding">2</property>
2275 <property name="position">2</property>
2276 </packing>
2277@@ -2290,19 +2627,23 @@
2278 <child>
2279 <object class="GtkFrame" id="frame9">
2280 <property name="visible">True</property>
2281+ <property name="can_focus">False</property>
2282 <property name="label_xalign">0</property>
2283 <child>
2284 <object class="GtkAlignment" id="alignment4">
2285 <property name="visible">True</property>
2286+ <property name="can_focus">False</property>
2287 <property name="left_padding">12</property>
2288 <child>
2289 <object class="GtkTable" id="table5">
2290 <property name="visible">True</property>
2291+ <property name="can_focus">False</property>
2292 <property name="n_rows">4</property>
2293 <property name="n_columns">2</property>
2294 <child>
2295 <object class="GtkLabel" id="label47">
2296 <property name="visible">True</property>
2297+ <property name="can_focus">False</property>
2298 <property name="label" translatable="yes">&lt;i&gt;1:&lt;/i&gt;</property>
2299 <property name="use_markup">True</property>
2300 </object>
2301@@ -2310,6 +2651,7 @@
2302 <child>
2303 <object class="GtkLabel" id="label48">
2304 <property name="visible">True</property>
2305+ <property name="can_focus">False</property>
2306 <property name="label" translatable="yes">&lt;i&gt;2:&lt;/i&gt;</property>
2307 <property name="use_markup">True</property>
2308 </object>
2309@@ -2321,6 +2663,7 @@
2310 <child>
2311 <object class="GtkLabel" id="label49">
2312 <property name="visible">True</property>
2313+ <property name="can_focus">False</property>
2314 <property name="label" translatable="yes">&lt;i&gt;3:&lt;/i&gt;</property>
2315 <property name="use_markup">True</property>
2316 </object>
2317@@ -2332,6 +2675,7 @@
2318 <child>
2319 <object class="GtkLabel" id="label50">
2320 <property name="visible">True</property>
2321+ <property name="can_focus">False</property>
2322 <property name="label" translatable="yes">&lt;i&gt;4:&lt;/i&gt;</property>
2323 <property name="use_markup">True</property>
2324 </object>
2325@@ -2344,7 +2688,9 @@
2326 <object class="GtkEntry" id="entry11">
2327 <property name="visible">True</property>
2328 <property name="can_focus">True</property>
2329- <property name="invisible_char">&#x2022;</property>
2330+ <property name="invisible_char">•</property>
2331+ <property name="primary_icon_activatable">False</property>
2332+ <property name="secondary_icon_activatable">False</property>
2333 <property name="primary_icon_sensitive">True</property>
2334 <property name="secondary_icon_sensitive">True</property>
2335 </object>
2336@@ -2358,7 +2704,9 @@
2337 <object class="GtkEntry" id="entry12">
2338 <property name="visible">True</property>
2339 <property name="can_focus">True</property>
2340- <property name="invisible_char">&#x2022;</property>
2341+ <property name="invisible_char">•</property>
2342+ <property name="primary_icon_activatable">False</property>
2343+ <property name="secondary_icon_activatable">False</property>
2344 <property name="primary_icon_sensitive">True</property>
2345 <property name="secondary_icon_sensitive">True</property>
2346 </object>
2347@@ -2374,7 +2722,9 @@
2348 <object class="GtkEntry" id="entry13">
2349 <property name="visible">True</property>
2350 <property name="can_focus">True</property>
2351- <property name="invisible_char">&#x2022;</property>
2352+ <property name="invisible_char">•</property>
2353+ <property name="primary_icon_activatable">False</property>
2354+ <property name="secondary_icon_activatable">False</property>
2355 <property name="primary_icon_sensitive">True</property>
2356 <property name="secondary_icon_sensitive">True</property>
2357 </object>
2358@@ -2390,7 +2740,9 @@
2359 <object class="GtkEntry" id="entry14">
2360 <property name="visible">True</property>
2361 <property name="can_focus">True</property>
2362- <property name="invisible_char">&#x2022;</property>
2363+ <property name="invisible_char">•</property>
2364+ <property name="primary_icon_activatable">False</property>
2365+ <property name="secondary_icon_activatable">False</property>
2366 <property name="primary_icon_sensitive">True</property>
2367 <property name="secondary_icon_sensitive">True</property>
2368 </object>
2369@@ -2409,12 +2761,15 @@
2370 <child type="label">
2371 <object class="GtkLabel" id="label46">
2372 <property name="visible">True</property>
2373+ <property name="can_focus">False</property>
2374 <property name="label" translatable="yes">&lt;b&gt;Fasce di costi:&lt;/b&gt;</property>
2375 <property name="use_markup">True</property>
2376 </object>
2377 </child>
2378 </object>
2379 <packing>
2380+ <property name="expand">True</property>
2381+ <property name="fill">True</property>
2382 <property name="padding">2</property>
2383 <property name="position">3</property>
2384 </packing>
2385@@ -2424,23 +2779,28 @@
2386 </object>
2387 <packing>
2388 <property name="expand">False</property>
2389+ <property name="fill">True</property>
2390 <property name="position">0</property>
2391 </packing>
2392 </child>
2393 <child>
2394 <object class="GtkHBox" id="hbox3">
2395 <property name="visible">True</property>
2396+ <property name="can_focus">False</property>
2397 <child>
2398 <object class="GtkAlignment" id="alignment8">
2399 <property name="visible">True</property>
2400+ <property name="can_focus">False</property>
2401 <property name="xalign">0</property>
2402 <child>
2403 <object class="GtkFrame" id="frame7">
2404 <property name="visible">True</property>
2405+ <property name="can_focus">False</property>
2406 <property name="label_xalign">0</property>
2407 <child>
2408 <object class="GtkAlignment" id="alignment10">
2409 <property name="visible">True</property>
2410+ <property name="can_focus">False</property>
2411 <property name="top_padding">5</property>
2412 <property name="bottom_padding">5</property>
2413 <property name="left_padding">12</property>
2414@@ -2448,6 +2808,7 @@
2415 <child>
2416 <object class="GtkTable" id="table3">
2417 <property name="visible">True</property>
2418+ <property name="can_focus">False</property>
2419 <property name="n_rows">4</property>
2420 <property name="n_columns">2</property>
2421 <child>
2422@@ -2455,11 +2816,13 @@
2423 <property name="visible">True</property>
2424 <property name="can_focus">True</property>
2425 <property name="max_length">15</property>
2426- <property name="invisible_char">&#x2022;</property>
2427+ <property name="invisible_char">•</property>
2428 <property name="primary_icon_stock">gtk-edit</property>
2429+ <property name="primary_icon_activatable">True</property>
2430+ <property name="secondary_icon_activatable">False</property>
2431 <property name="primary_icon_sensitive">True</property>
2432 <property name="secondary_icon_sensitive">True</property>
2433- <signal name="activate" handler="modifica_articolo_epu"/>
2434+ <signal name="activate" handler="modifica_articolo_epu" swapped="no"/>
2435 </object>
2436 <packing>
2437 <property name="left_attach">1</property>
2438@@ -2469,6 +2832,7 @@
2439 <child>
2440 <object class="GtkLabel" id="label16">
2441 <property name="visible">True</property>
2442+ <property name="can_focus">False</property>
2443 <property name="xalign">0</property>
2444 <property name="label" translatable="yes">Costo materiali:</property>
2445 </object>
2446@@ -2477,7 +2841,9 @@
2447 <object class="GtkSpinButton" id="spinbutton2">
2448 <property name="visible">True</property>
2449 <property name="can_focus">True</property>
2450- <property name="invisible_char">&#x2022;</property>
2451+ <property name="invisible_char">•</property>
2452+ <property name="primary_icon_activatable">False</property>
2453+ <property name="secondary_icon_activatable">False</property>
2454 <property name="primary_icon_sensitive">True</property>
2455 <property name="secondary_icon_sensitive">True</property>
2456 <property name="adjustment">adjustment2</property>
2457@@ -2495,6 +2861,7 @@
2458 <child>
2459 <object class="GtkLabel" id="label14">
2460 <property name="visible">True</property>
2461+ <property name="can_focus">False</property>
2462 <property name="xalign">0</property>
2463 <property name="label" translatable="yes">Ricarico:</property>
2464 </object>
2465@@ -2506,6 +2873,7 @@
2466 <child>
2467 <object class="GtkLabel" id="label15">
2468 <property name="visible">True</property>
2469+ <property name="can_focus">False</property>
2470 <property name="xalign">0</property>
2471 <property name="label" translatable="yes">Tempo (min):</property>
2472 </object>
2473@@ -2518,7 +2886,9 @@
2474 <object class="GtkSpinButton" id="spinbutton3">
2475 <property name="visible">True</property>
2476 <property name="can_focus">True</property>
2477- <property name="invisible_char">&#x2022;</property>
2478+ <property name="invisible_char">•</property>
2479+ <property name="primary_icon_activatable">False</property>
2480+ <property name="secondary_icon_activatable">False</property>
2481 <property name="primary_icon_sensitive">True</property>
2482 <property name="secondary_icon_sensitive">True</property>
2483 <property name="adjustment">adjustment3</property>
2484@@ -2534,6 +2904,7 @@
2485 <child>
2486 <object class="GtkLabel" id="label17">
2487 <property name="visible">True</property>
2488+ <property name="can_focus">False</property>
2489 <property name="xalign">0</property>
2490 <property name="label" translatable="yes">Sicurezza (%):</property>
2491 </object>
2492@@ -2546,7 +2917,9 @@
2493 <object class="GtkSpinButton" id="spinbutton4">
2494 <property name="visible">True</property>
2495 <property name="can_focus">True</property>
2496- <property name="invisible_char">&#x2022;</property>
2497+ <property name="invisible_char">•</property>
2498+ <property name="primary_icon_activatable">False</property>
2499+ <property name="secondary_icon_activatable">False</property>
2500 <property name="primary_icon_sensitive">True</property>
2501 <property name="secondary_icon_sensitive">True</property>
2502 <property name="adjustment">adjustment4</property>
2503@@ -2567,6 +2940,7 @@
2504 <child type="label">
2505 <object class="GtkLabel" id="label7">
2506 <property name="visible">True</property>
2507+ <property name="can_focus">False</property>
2508 <property name="label" translatable="yes">&lt;b&gt;Elementi di analisi&lt;/b&gt;</property>
2509 <property name="use_markup">True</property>
2510 </object>
2511@@ -2584,10 +2958,12 @@
2512 <child>
2513 <object class="GtkFrame" id="frame8">
2514 <property name="visible">True</property>
2515+ <property name="can_focus">False</property>
2516 <property name="label_xalign">0</property>
2517 <child>
2518 <object class="GtkAlignment" id="alignment11">
2519 <property name="visible">True</property>
2520+ <property name="can_focus">False</property>
2521 <property name="top_padding">5</property>
2522 <property name="bottom_padding">5</property>
2523 <property name="left_padding">12</property>
2524@@ -2595,14 +2971,18 @@
2525 <child>
2526 <object class="GtkVBox" id="vbox18">
2527 <property name="visible">True</property>
2528+ <property name="can_focus">False</property>
2529 <child>
2530 <object class="GtkLabel" id="label19">
2531 <property name="visible">True</property>
2532+ <property name="can_focus">False</property>
2533 <property name="xalign">0</property>
2534 <property name="label" translatable="yes">&lt;i&gt;Descrizione codice:&lt;/i&gt;</property>
2535 <property name="use_markup">True</property>
2536 </object>
2537 <packing>
2538+ <property name="expand">True</property>
2539+ <property name="fill">True</property>
2540 <property name="position">0</property>
2541 </packing>
2542 </child>
2543@@ -2610,22 +2990,29 @@
2544 <object class="GtkEntry" id="entry4">
2545 <property name="visible">True</property>
2546 <property name="can_focus">True</property>
2547- <property name="invisible_char">&#x2022;</property>
2548+ <property name="invisible_char">•</property>
2549+ <property name="primary_icon_activatable">False</property>
2550+ <property name="secondary_icon_activatable">False</property>
2551 <property name="primary_icon_sensitive">True</property>
2552 <property name="secondary_icon_sensitive">True</property>
2553- <signal name="activate" handler="modifica_articolo_epu"/>
2554+ <signal name="activate" handler="modifica_articolo_epu" swapped="no"/>
2555 </object>
2556 <packing>
2557+ <property name="expand">True</property>
2558+ <property name="fill">True</property>
2559 <property name="position">1</property>
2560 </packing>
2561 </child>
2562 <child>
2563 <object class="GtkLabel" id="label20">
2564 <property name="visible">True</property>
2565+ <property name="can_focus">False</property>
2566 <property name="xalign">0</property>
2567 <property name="label" translatable="yes">Descrizione voce:</property>
2568 </object>
2569 <packing>
2570+ <property name="expand">True</property>
2571+ <property name="fill">True</property>
2572 <property name="position">2</property>
2573 </packing>
2574 </child>
2575@@ -2633,12 +3020,16 @@
2576 <object class="GtkEntry" id="entry5">
2577 <property name="visible">True</property>
2578 <property name="can_focus">True</property>
2579- <property name="invisible_char">&#x2022;</property>
2580+ <property name="invisible_char">•</property>
2581+ <property name="primary_icon_activatable">False</property>
2582+ <property name="secondary_icon_activatable">False</property>
2583 <property name="primary_icon_sensitive">True</property>
2584 <property name="secondary_icon_sensitive">True</property>
2585- <signal name="activate" handler="modifica_articolo_epu"/>
2586+ <signal name="activate" handler="modifica_articolo_epu" swapped="no"/>
2587 </object>
2588 <packing>
2589+ <property name="expand">True</property>
2590+ <property name="fill">True</property>
2591 <property name="position">3</property>
2592 </packing>
2593 </child>
2594@@ -2649,6 +3040,7 @@
2595 <child type="label">
2596 <object class="GtkLabel" id="label9">
2597 <property name="visible">True</property>
2598+ <property name="can_focus">False</property>
2599 <property name="label" translatable="yes">&lt;b&gt;Descrizioni Articolo&lt;/b&gt;</property>
2600 <property name="use_markup">True</property>
2601 </object>
2602@@ -2664,10 +3056,12 @@
2603 <child>
2604 <object class="GtkFrame" id="frame1">
2605 <property name="visible">True</property>
2606+ <property name="can_focus">False</property>
2607 <property name="label_xalign">0</property>
2608 <child>
2609 <object class="GtkAlignment" id="alignment1">
2610 <property name="visible">True</property>
2611+ <property name="can_focus">False</property>
2612 <property name="bottom_padding">5</property>
2613 <property name="left_padding">5</property>
2614 <property name="right_padding">5</property>
2615@@ -2692,24 +3086,30 @@
2616 <child type="label">
2617 <object class="GtkLabel" id="label21">
2618 <property name="visible">True</property>
2619+ <property name="can_focus">False</property>
2620 <property name="label" translatable="yes">&lt;b&gt;Descrizione Estesa:&lt;/b&gt;</property>
2621 <property name="use_markup">True</property>
2622 </object>
2623 </child>
2624 </object>
2625 <packing>
2626+ <property name="expand">True</property>
2627+ <property name="fill">True</property>
2628 <property name="padding">2</property>
2629 <property name="position">2</property>
2630 </packing>
2631 </child>
2632 </object>
2633 <packing>
2634+ <property name="expand">True</property>
2635+ <property name="fill">True</property>
2636 <property name="position">1</property>
2637 </packing>
2638 </child>
2639 <child>
2640 <object class="GtkHButtonBox" id="hbuttonbox1">
2641 <property name="visible">True</property>
2642+ <property name="can_focus">False</property>
2643 <property name="spacing">5</property>
2644 <property name="layout_style">end</property>
2645 <child>
2646@@ -2718,8 +3118,9 @@
2647 <property name="visible">True</property>
2648 <property name="can_focus">True</property>
2649 <property name="receives_default">True</property>
2650+ <property name="use_action_appearance">False</property>
2651 <property name="use_stock">True</property>
2652- <signal name="clicked" handler="pulsante_aggiorna_articolo"/>
2653+ <signal name="clicked" handler="pulsante_aggiorna_articolo" swapped="no"/>
2654 </object>
2655 <packing>
2656 <property name="expand">False</property>
2657@@ -2729,6 +3130,8 @@
2658 </child>
2659 </object>
2660 <packing>
2661+ <property name="expand">True</property>
2662+ <property name="fill">True</property>
2663 <property name="position">2</property>
2664 </packing>
2665 </child>
2666@@ -2737,6 +3140,7 @@
2667 <child type="label">
2668 <object class="GtkLabel" id="label4">
2669 <property name="visible">True</property>
2670+ <property name="can_focus">False</property>
2671 <property name="label" translatable="yes">&lt;b&gt;Modifica Articolo&lt;/b&gt;</property>
2672 <property name="use_markup">True</property>
2673 </object>
2674@@ -2758,9 +3162,11 @@
2675 <child>
2676 <object class="GtkHSeparator" id="hseparator2">
2677 <property name="visible">True</property>
2678+ <property name="can_focus">False</property>
2679 </object>
2680 <packing>
2681 <property name="expand">False</property>
2682+ <property name="fill">True</property>
2683 <property name="padding">5</property>
2684 <property name="position">1</property>
2685 </packing>
2686@@ -2769,6 +3175,8 @@
2687 <object class="GtkVPaned" id="vpaned2">
2688 <property name="visible">True</property>
2689 <property name="can_focus">True</property>
2690+ <property name="position">150</property>
2691+ <property name="position_set">True</property>
2692 <child>
2693 <object class="GtkScrolledWindow" id="scrolledwindow3">
2694 <property name="visible">True</property>
2695@@ -2783,8 +3191,8 @@
2696 <property name="search_column">0</property>
2697 <property name="rubber_banding">True</property>
2698 <property name="enable_grid_lines">both</property>
2699- <signal name="button_press_event" handler="on_treeview_computo_button_press_event"/>
2700- <signal name="cursor_changed" handler="row_selected_computo"/>
2701+ <signal name="button-press-event" handler="on_treeview_computo_button_press_event" swapped="no"/>
2702+ <signal name="cursor-changed" handler="row_selected_computo" swapped="no"/>
2703 </object>
2704 </child>
2705 </object>
2706@@ -2809,8 +3217,8 @@
2707 <property name="can_focus">True</property>
2708 <property name="model">liststore2</property>
2709 <property name="search_column">0</property>
2710- <signal name="button_press_event" handler="on_treeview_listino_button_press_event"/>
2711- <signal name="cursor_changed" handler="row_selected_listino"/>
2712+ <signal name="button-press-event" handler="on_treeview_listino_button_press_event" swapped="no"/>
2713+ <signal name="cursor-changed" handler="row_selected_listino" swapped="no"/>
2714 </object>
2715 </child>
2716 </object>
2717@@ -2818,6 +3226,7 @@
2718 <child type="label">
2719 <object class="GtkLabel" id="label10">
2720 <property name="visible">True</property>
2721+ <property name="can_focus">False</property>
2722 <property name="label" translatable="yes">&lt;b&gt;Elementi di Listino&lt;/b&gt;</property>
2723 <property name="use_markup">True</property>
2724 </object>
2725@@ -2830,6 +3239,8 @@
2726 </child>
2727 </object>
2728 <packing>
2729+ <property name="expand">True</property>
2730+ <property name="fill">True</property>
2731 <property name="position">60</property>
2732 </packing>
2733 </child>
2734@@ -2847,21 +3258,28 @@
2735 <child type="tab">
2736 <object class="GtkHBox" id="hbox12">
2737 <property name="visible">True</property>
2738+ <property name="can_focus">False</property>
2739 <child>
2740 <object class="GtkImage" id="image6">
2741 <property name="visible">True</property>
2742+ <property name="can_focus">False</property>
2743 <property name="stock">gtk-missing-image</property>
2744 </object>
2745 <packing>
2746+ <property name="expand">True</property>
2747+ <property name="fill">True</property>
2748 <property name="position">0</property>
2749 </packing>
2750 </child>
2751 <child>
2752 <object class="GtkLabel" id="label1">
2753 <property name="visible">True</property>
2754+ <property name="can_focus">False</property>
2755 <property name="label" translatable="yes">Computo</property>
2756 </object>
2757 <packing>
2758+ <property name="expand">True</property>
2759+ <property name="fill">True</property>
2760 <property name="position">1</property>
2761 </packing>
2762 </child>
2763@@ -2882,6 +3300,7 @@
2764 <child>
2765 <object class="GtkVBox" id="vbox20">
2766 <property name="visible">True</property>
2767+ <property name="can_focus">False</property>
2768 <child>
2769 <placeholder/>
2770 </child>
2771@@ -2894,6 +3313,7 @@
2772 <child>
2773 <object class="GtkVBox" id="vbox9">
2774 <property name="visible">True</property>
2775+ <property name="can_focus">False</property>
2776 <property name="spacing">5</property>
2777 <child>
2778 <object class="GtkScrolledWindow" id="scrolledwindow5">
2779@@ -2905,12 +3325,14 @@
2780 <object class="GtkTreeView" id="treeview5">
2781 <property name="visible">True</property>
2782 <property name="can_focus">True</property>
2783- <signal name="button_press_event" handler="on_treeview_capitoli_button_press_event"/>
2784- <signal name="cursor_changed" handler="row_selected_capitoli"/>
2785+ <signal name="button-press-event" handler="on_treeview_capitoli_button_press_event" swapped="no"/>
2786+ <signal name="cursor-changed" handler="row_selected_capitoli" swapped="no"/>
2787 </object>
2788 </child>
2789 </object>
2790 <packing>
2791+ <property name="expand">True</property>
2792+ <property name="fill">True</property>
2793 <property name="padding">5</property>
2794 <property name="position">0</property>
2795 </packing>
2796@@ -2918,20 +3340,25 @@
2797 <child>
2798 <object class="GtkHBox" id="hbox11">
2799 <property name="visible">True</property>
2800+ <property name="can_focus">False</property>
2801 <child>
2802 <object class="GtkButton" id="button9">
2803 <property name="visible">True</property>
2804 <property name="can_focus">True</property>
2805 <property name="receives_default">True</property>
2806- <signal name="clicked" handler="espandi_treeview_capitoli"/>
2807+ <property name="use_action_appearance">False</property>
2808+ <signal name="clicked" handler="espandi_treeview_capitoli" swapped="no"/>
2809 <child>
2810 <object class="GtkImage" id="image4">
2811 <property name="visible">True</property>
2812+ <property name="can_focus">False</property>
2813 <property name="stock">gtk-add</property>
2814 </object>
2815 </child>
2816 </object>
2817 <packing>
2818+ <property name="expand">True</property>
2819+ <property name="fill">True</property>
2820 <property name="position">0</property>
2821 </packing>
2822 </child>
2823@@ -2940,15 +3367,19 @@
2824 <property name="visible">True</property>
2825 <property name="can_focus">True</property>
2826 <property name="receives_default">True</property>
2827- <signal name="clicked" handler="collassa_treeview_capitoli"/>
2828+ <property name="use_action_appearance">False</property>
2829+ <signal name="clicked" handler="collassa_treeview_capitoli" swapped="no"/>
2830 <child>
2831 <object class="GtkImage" id="image5">
2832 <property name="visible">True</property>
2833+ <property name="can_focus">False</property>
2834 <property name="stock">gtk-remove</property>
2835 </object>
2836 </child>
2837 </object>
2838 <packing>
2839+ <property name="expand">True</property>
2840+ <property name="fill">True</property>
2841 <property name="position">1</property>
2842 </packing>
2843 </child>
2844@@ -2962,12 +3393,15 @@
2845 <child>
2846 <object class="GtkVBox" id="vbox6">
2847 <property name="visible">True</property>
2848+ <property name="can_focus">False</property>
2849 <child>
2850 <object class="GtkHBox" id="hbox15">
2851 <property name="visible">True</property>
2852+ <property name="can_focus">False</property>
2853 <child>
2854 <object class="GtkLabel" id="label22">
2855 <property name="visible">True</property>
2856+ <property name="can_focus">False</property>
2857 <property name="label" translatable="yes">Tariffa:</property>
2858 </object>
2859 <packing>
2860@@ -2982,7 +3416,9 @@
2861 <property name="visible">True</property>
2862 <property name="can_focus">True</property>
2863 <property name="editable">False</property>
2864- <property name="invisible_char">&#x2022;</property>
2865+ <property name="invisible_char">•</property>
2866+ <property name="primary_icon_activatable">False</property>
2867+ <property name="secondary_icon_activatable">False</property>
2868 <property name="primary_icon_sensitive">True</property>
2869 <property name="secondary_icon_sensitive">True</property>
2870 </object>
2871@@ -3003,6 +3439,7 @@
2872 <child>
2873 <object class="GtkComboBox" id="combobox2">
2874 <property name="visible">True</property>
2875+ <property name="can_focus">False</property>
2876 </object>
2877 <packing>
2878 <property name="expand">False</property>
2879@@ -3013,6 +3450,7 @@
2880 <child>
2881 <object class="GtkComboBox" id="combobox3">
2882 <property name="visible">True</property>
2883+ <property name="can_focus">False</property>
2884 </object>
2885 <packing>
2886 <property name="expand">False</property>
2887@@ -3023,6 +3461,7 @@
2888 <child>
2889 <object class="GtkComboBox" id="combobox4">
2890 <property name="visible">True</property>
2891+ <property name="can_focus">False</property>
2892 </object>
2893 <packing>
2894 <property name="expand">False</property>
2895@@ -3033,30 +3472,39 @@
2896 <child>
2897 <object class="GtkHButtonBox" id="hbuttonbox2">
2898 <property name="visible">True</property>
2899+ <property name="can_focus">False</property>
2900 <child>
2901 <object class="GtkButton" id="button13">
2902 <property name="visible">True</property>
2903 <property name="can_focus">True</property>
2904 <property name="receives_default">True</property>
2905- <signal name="clicked" handler="modifica_capitoli_lavorazioni"/>
2906+ <property name="use_action_appearance">False</property>
2907+ <signal name="clicked" handler="modifica_capitoli_lavorazioni" swapped="no"/>
2908 <child>
2909 <object class="GtkHBox" id="hbox14">
2910 <property name="visible">True</property>
2911+ <property name="can_focus">False</property>
2912 <child>
2913 <object class="GtkImage" id="image10">
2914 <property name="visible">True</property>
2915+ <property name="can_focus">False</property>
2916 <property name="stock">gtk-edit</property>
2917 </object>
2918 <packing>
2919+ <property name="expand">True</property>
2920+ <property name="fill">True</property>
2921 <property name="position">0</property>
2922 </packing>
2923 </child>
2924 <child>
2925 <object class="GtkLabel" id="label23">
2926 <property name="visible">True</property>
2927+ <property name="can_focus">False</property>
2928 <property name="label" translatable="yes">Modifica Capitoli</property>
2929 </object>
2930 <packing>
2931+ <property name="expand">True</property>
2932+ <property name="fill">True</property>
2933 <property name="position">1</property>
2934 </packing>
2935 </child>
2936@@ -3071,6 +3519,8 @@
2937 </child>
2938 </object>
2939 <packing>
2940+ <property name="expand">True</property>
2941+ <property name="fill">True</property>
2942 <property name="padding">5</property>
2943 <property name="position">4</property>
2944 </packing>
2945@@ -3099,10 +3549,12 @@
2946 <child>
2947 <object class="GtkVBox" id="vbox17">
2948 <property name="visible">True</property>
2949+ <property name="can_focus">False</property>
2950 <property name="spacing">5</property>
2951 <child>
2952 <object class="GtkVBox" id="vbox19">
2953 <property name="visible">True</property>
2954+ <property name="can_focus">False</property>
2955 <child>
2956 <placeholder/>
2957 </child>
2958@@ -3117,6 +3569,8 @@
2959 <object class="GtkVPaned" id="vpaned3">
2960 <property name="visible">True</property>
2961 <property name="can_focus">True</property>
2962+ <property name="position">150</property>
2963+ <property name="position_set">True</property>
2964 <child>
2965 <object class="GtkScrolledWindow" id="scrolledwindow6">
2966 <property name="visible">True</property>
2967@@ -3127,8 +3581,8 @@
2968 <object class="GtkTreeView" id="treeview6">
2969 <property name="visible">True</property>
2970 <property name="can_focus">True</property>
2971- <signal name="button_press_event" handler="on_treeview_lavorazioni_button_press_event"/>
2972- <signal name="cursor_changed" handler="row_selected_lista_lavorazioni"/>
2973+ <signal name="button-press-event" handler="on_treeview_lavorazioni_button_press_event" swapped="no"/>
2974+ <signal name="cursor-changed" handler="row_selected_lista_lavorazioni" swapped="no"/>
2975 </object>
2976 </child>
2977 </object>
2978@@ -3155,6 +3609,7 @@
2979 <child type="label">
2980 <object class="GtkLabel" id="label53">
2981 <property name="visible">True</property>
2982+ <property name="can_focus">False</property>
2983 <property name="label" translatable="yes">&lt;b&gt;Elementi di Listino&lt;/b&gt;</property>
2984 <property name="use_markup">True</property>
2985 </object>
2986@@ -3167,6 +3622,8 @@
2987 </child>
2988 </object>
2989 <packing>
2990+ <property name="expand">True</property>
2991+ <property name="fill">True</property>
2992 <property name="position">1</property>
2993 </packing>
2994 </child>
2995@@ -3184,21 +3641,28 @@
2996 <child type="tab">
2997 <object class="GtkHBox" id="hbox13">
2998 <property name="visible">True</property>
2999+ <property name="can_focus">False</property>
3000 <child>
3001 <object class="GtkImage" id="image7">
3002 <property name="visible">True</property>
3003+ <property name="can_focus">False</property>
3004 <property name="stock">gtk-missing-image</property>
3005 </object>
3006 <packing>
3007+ <property name="expand">True</property>
3008+ <property name="fill">True</property>
3009 <property name="position">0</property>
3010 </packing>
3011 </child>
3012 <child>
3013 <object class="GtkLabel" id="label2">
3014 <property name="visible">True</property>
3015+ <property name="can_focus">False</property>
3016 <property name="label" translatable="yes">Elenco Prezzi</property>
3017 </object>
3018 <packing>
3019+ <property name="expand">True</property>
3020+ <property name="fill">True</property>
3021 <property name="position">1</property>
3022 </packing>
3023 </child>
3024@@ -3210,31 +3674,69 @@
3025 </child>
3026 </object>
3027 <packing>
3028+ <property name="expand">True</property>
3029+ <property name="fill">True</property>
3030 <property name="position">3</property>
3031 </packing>
3032 </child>
3033 <child>
3034 <object class="GtkStatusbar" id="statusbar1">
3035 <property name="visible">True</property>
3036+ <property name="can_focus">False</property>
3037 <property name="spacing">2</property>
3038 <child>
3039 <object class="GtkProgressBar" id="progressbar1">
3040 <property name="visible">True</property>
3041+ <property name="can_focus">False</property>
3042 </object>
3043 <packing>
3044 <property name="expand">False</property>
3045+ <property name="fill">True</property>
3046 <property name="position">1</property>
3047 </packing>
3048 </child>
3049 </object>
3050 <packing>
3051 <property name="expand">False</property>
3052+ <property name="fill">True</property>
3053 <property name="position">4</property>
3054 </packing>
3055 </child>
3056 </object>
3057 </child>
3058 </object>
3059+ <object class="GtkListStore" id="liststore2">
3060+ <columns>
3061+ <!-- column-name id -->
3062+ <column type="gchararray"/>
3063+ <!-- column-name tariffa -->
3064+ <column type="gchararray"/>
3065+ <!-- column-name codice -->
3066+ <column type="gchararray"/>
3067+ <!-- column-name descrizione -->
3068+ <column type="gchararray"/>
3069+ <!-- column-name um -->
3070+ <column type="gchararray"/>
3071+ <!-- column-name quantita -->
3072+ <column type="gchararray"/>
3073+ <!-- column-name prezzo_unitario -->
3074+ <column type="gchararray"/>
3075+ <!-- column-name sconto -->
3076+ <column type="gchararray"/>
3077+ <!-- column-name accessori -->
3078+ <column type="gchararray"/>
3079+ <!-- column-name prezzo_totale -->
3080+ <column type="gchararray"/>
3081+ <!-- column-name note -->
3082+ <column type="gchararray"/>
3083+ </columns>
3084+ </object>
3085+ <object class="GtkListStore" id="liststore_um">
3086+ <columns>
3087+ <!-- column-name gchararray1 -->
3088+ <column type="gchararray"/>
3089+ </columns>
3090+ </object>
3091 <object class="GtkTextBuffer" id="textbuffer_cliente"/>
3092 <object class="GtkTextBuffer" id="textbuffer_comune"/>
3093 <object class="GtkTextBuffer" id="textbuffer_desc_cod"/>
3094
3095=== modified file 'debian/changelog' (properties changed: +x to -x)
3096--- debian/changelog 2011-10-06 21:04:30 +0000
3097+++ debian/changelog 2012-04-12 22:42:17 +0000
3098@@ -1,5 +1,29 @@
3099-preventares (11.06-public3) natty; urgency=low
3100+preventares (12.04.1) oneiric; urgency=low
3101+
3102+ * bugfix
3103+
3104+ -- dav80 <davide.vescovini@gmail.com> Fri, 13 Apr 2012 00:39:45 +0200
3105+
3106+preventares (11.10ubuntu1) oneiric; urgency=low
3107+
3108+ *
3109+
3110+ -- Davide Vescovini <davide@odus.vescovini> Fri, 13 Apr 2012 00:35:01 +0200
3111+
3112+preventares (11.10) natty; urgency=low
3113+
3114+ * bugfix
3115+ * improvement - now is possible to edit the unit price
3116+ * minor bug fixed
3117+ * release 11.06
3118+ * Creating ubuntu package
3119+ * many bugfix!
3120+ * bug fix
3121+
3122+ -- dav80 <davide.vescovini@gmail.com> Thu, 13 Oct 2011 01:45:15 +0200
3123+
3124+preventares (11.09) natty; urgency=low
3125
3126 * Initial release.
3127
3128- -- Davide Vescovini <davide@odus.vescovini> Thu, 06 Oct 2011 23:03:21 +0200
3129+ -- Davide Vescovini <davide@odus.vescovini> Thu, 06 Oct 2011 23:08:25 +0200
3130
3131=== modified file 'debian/compat' (properties changed: +x to -x)
3132=== modified file 'debian/control'
3133--- debian/control 2011-10-06 21:04:30 +0000
3134+++ debian/control 2012-04-12 22:42:17 +0000
3135@@ -18,7 +18,7 @@
3136 python-pysqlite2,
3137 python-cairo,
3138 python-apport,
3139- python-gobject,
3140+ python-gobject-2,
3141 python-launchpad-integration,
3142 python-gtk2
3143 Description: Computo Metrico e Preventivazione
3144
3145=== modified file 'debian/copyright' (properties changed: +x to -x)
3146=== modified file 'debian/rules'
3147--- debian/rules 2011-06-22 19:19:55 +0000
3148+++ debian/rules 2012-04-12 22:42:17 +0000
3149@@ -6,3 +6,9 @@
3150 include /usr/share/cdbs/1/class/python-distutils.mk
3151 # langpack.mk is relevant on Ubuntu only, not Debian; it does not matter if it's missing
3152 -include /usr/share/cdbs/1/rules/langpack.mk
3153+
3154+common-binary-post-install-arch::
3155+ -dh_icons -a
3156+
3157+common-binary-post-install-indep::
3158+ -dh_icons -i
3159
3160=== modified file 'po/preventares.pot'
3161--- po/preventares.pot 2011-10-06 21:04:30 +0000
3162+++ po/preventares.pot 2012-04-12 22:42:17 +0000
3163@@ -8,7 +8,7 @@
3164 msgstr ""
3165 "Project-Id-Version: PACKAGE VERSION\n"
3166 "Report-Msgid-Bugs-To: \n"
3167-"POT-Creation-Date: 2011-10-06 23:03+0200\n"
3168+"POT-Creation-Date: 2012-04-13 00:35+0200\n"
3169 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
3170 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
3171 "Language-Team: LANGUAGE <LL@li.org>\n"
3172@@ -29,8 +29,8 @@
3173 msgid "Compilare tutti i campi obbligatori {0}"
3174 msgstr ""
3175
3176-#: ../preventares/AddmetelDialog.py:146 ../preventares/ComputoWindow.py:4265
3177-#: ../bin/preventares.py:544 ../preventares/ManodoperaDialog.py:214
3178+#: ../preventares/AddmetelDialog.py:146 ../preventares/ComputoWindow.py:4274
3179+#: ../bin/preventares.py:560 ../preventares/ManodoperaDialog.py:214
3180 #: ../preventares/metel.py:719 ../preventares/ModifyDialog.py:389
3181 msgid "Premere un pulsante per continuare"
3182 msgstr ""
3183@@ -140,439 +140,439 @@
3184 msgid "Cartella di Lavoro"
3185 msgstr ""
3186
3187-#: ../preventares/ComputoWindow.py:243 ../preventares/ComputoWindow.py:2058
3188+#: ../preventares/ComputoWindow.py:243 ../preventares/ComputoWindow.py:2062
3189 #, python-format
3190 msgid "Computo: %s"
3191 msgstr ""
3192
3193-#: ../preventares/ComputoWindow.py:518 ../preventares/ComputoWindow.py:596
3194-#: ../preventares/ComputoWindow.py:687
3195+#: ../preventares/ComputoWindow.py:522 ../preventares/ComputoWindow.py:600
3196+#: ../preventares/ComputoWindow.py:691
3197 msgid "No."
3198 msgstr ""
3199
3200-#: ../preventares/ComputoWindow.py:519 ../preventares/ComputoWindow.py:597
3201-#: ../preventares/ComputoWindow.py:631 ../preventares/ComputoWindow.py:642
3202+#: ../preventares/ComputoWindow.py:523 ../preventares/ComputoWindow.py:601
3203+#: ../preventares/ComputoWindow.py:635 ../preventares/ComputoWindow.py:646
3204 msgid "Tariffa"
3205 msgstr ""
3206
3207-#: ../preventares/ComputoWindow.py:520 ../preventares/ComputoWindow.py:643
3208+#: ../preventares/ComputoWindow.py:524 ../preventares/ComputoWindow.py:647
3209 msgid "Descrizione Codice"
3210 msgstr ""
3211
3212-#: ../preventares/ComputoWindow.py:521 ../preventares/ComputoWindow.py:644
3213+#: ../preventares/ComputoWindow.py:525 ../preventares/ComputoWindow.py:648
3214 msgid "Descrizione Voce"
3215 msgstr ""
3216
3217-#: ../preventares/ComputoWindow.py:522 ../preventares/ComputoWindow.py:600
3218+#: ../preventares/ComputoWindow.py:526 ../preventares/ComputoWindow.py:604
3219 #: ../preventares/metel.py:131
3220 msgid "u.m."
3221 msgstr ""
3222
3223-#: ../preventares/ComputoWindow.py:523 ../preventares/ComputoWindow.py:601
3224-#: ../preventares/preventa_print.py:1451 ../preventares/preventa_lib.py:3014
3225+#: ../preventares/ComputoWindow.py:527 ../preventares/ComputoWindow.py:605
3226+#: ../preventares/preventa_print.py:1455 ../preventares/preventa_lib.py:3014
3227 #: ../preventares/preventa_lib.py:3059 ../preventares/preventa_lib.py:3108
3228 msgid "Quantita"
3229 msgstr ""
3230
3231-#: ../preventares/ComputoWindow.py:524
3232+#: ../preventares/ComputoWindow.py:528
3233 msgid "Materiali"
3234 msgstr ""
3235
3236-#: ../preventares/ComputoWindow.py:525
3237+#: ../preventares/ComputoWindow.py:529
3238 msgid "Ric."
3239 msgstr ""
3240
3241-#: ../preventares/ComputoWindow.py:526
3242+#: ../preventares/ComputoWindow.py:530
3243 msgid "Tempo"
3244 msgstr ""
3245
3246-#: ../preventares/ComputoWindow.py:527 ../preventares/ComputoWindow.py:4294
3247+#: ../preventares/ComputoWindow.py:531 ../preventares/ComputoWindow.py:4303
3248 #: ../data/ui/ModifyDialog.ui.h:28 ../preventares/preventa_lib.py:77
3249 msgid "Sicurezza"
3250 msgstr ""
3251
3252-#: ../preventares/ComputoWindow.py:528 ../preventares/ComputoWindow.py:602
3253+#: ../preventares/ComputoWindow.py:532 ../preventares/ComputoWindow.py:606
3254 msgid "Prezzo Unitario"
3255 msgstr ""
3256
3257-#: ../preventares/ComputoWindow.py:529 ../preventares/ComputoWindow.py:605
3258+#: ../preventares/ComputoWindow.py:533 ../preventares/ComputoWindow.py:609
3259 msgid "Prezzo Totale"
3260 msgstr ""
3261
3262-#: ../preventares/ComputoWindow.py:530
3263+#: ../preventares/ComputoWindow.py:534
3264 msgid "Note di misurazione"
3265 msgstr ""
3266
3267-#: ../preventares/ComputoWindow.py:531
3268+#: ../preventares/ComputoWindow.py:535
3269 msgid "Tipologia Appalto"
3270 msgstr ""
3271
3272-#: ../preventares/ComputoWindow.py:532
3273+#: ../preventares/ComputoWindow.py:536
3274 msgid "Categoria Lavorazioni"
3275 msgstr ""
3276
3277-#: ../preventares/ComputoWindow.py:533
3278+#: ../preventares/ComputoWindow.py:537
3279 msgid "Data inserimento"
3280 msgstr ""
3281
3282-#: ../preventares/ComputoWindow.py:598 ../preventares/metel.py:128
3283+#: ../preventares/ComputoWindow.py:602 ../preventares/metel.py:128
3284 msgid "Codice"
3285 msgstr ""
3286
3287-#: ../preventares/ComputoWindow.py:599 ../preventares/metel.py:129
3288-#: ../preventares/preventa_print.py:1450 ../preventares/preventa_lib.py:3013
3289+#: ../preventares/ComputoWindow.py:603 ../preventares/metel.py:129
3290+#: ../preventares/preventa_print.py:1454 ../preventares/preventa_lib.py:3013
3291 #: ../preventares/preventa_lib.py:3058 ../preventares/preventa_lib.py:3107
3292 msgid "Descrizione"
3293 msgstr ""
3294
3295-#: ../preventares/ComputoWindow.py:603
3296+#: ../preventares/ComputoWindow.py:607
3297 msgid "Sconto"
3298 msgstr ""
3299
3300-#: ../preventares/ComputoWindow.py:604
3301+#: ../preventares/ComputoWindow.py:608
3302 msgid "Accessori"
3303 msgstr ""
3304
3305-#: ../preventares/ComputoWindow.py:631
3306+#: ../preventares/ComputoWindow.py:635
3307 msgid "Descrizione codice"
3308 msgstr ""
3309
3310-#: ../preventares/ComputoWindow.py:631
3311+#: ../preventares/ComputoWindow.py:635
3312 msgid "Descrizione voce"
3313 msgstr ""
3314
3315-#: ../preventares/ComputoWindow.py:688
3316+#: ../preventares/ComputoWindow.py:692
3317 msgid "Nome Categoria"
3318 msgstr ""
3319
3320 #. ###############################################################################
3321 #. ########## STRINGHE ESPORTAZIONI ##############################################
3322 #. ###############################################################################
3323-#: ../preventares/ComputoWindow.py:689 ../preventares/preventa_lib.py:74
3324+#: ../preventares/ComputoWindow.py:693 ../preventares/preventa_lib.py:74
3325 msgid "Totale Parziale"
3326 msgstr ""
3327
3328-#: ../preventares/ComputoWindow.py:1081 ../preventares/ComputoWindow.py:1694
3329+#: ../preventares/ComputoWindow.py:1085 ../preventares/ComputoWindow.py:1698
3330 msgid "Computo già aperto. Impossibile da aprire"
3331 msgstr ""
3332
3333-#: ../preventares/ComputoWindow.py:1509
3334+#: ../preventares/ComputoWindow.py:1513
3335 msgid "Nessun archivio articoli disponibile"
3336 msgstr ""
3337
3338 #. messaggio di default per la progressbar
3339 #. aggiorna la barra d'avanzamento
3340-#: ../preventares/ComputoWindow.py:1532 ../preventares/ComputoWindow.py:1584
3341+#: ../preventares/ComputoWindow.py:1536 ../preventares/ComputoWindow.py:1588
3342 msgid "Caricamento articoli archivio {0:.0%}"
3343 msgstr ""
3344
3345-#: ../preventares/ComputoWindow.py:1690
3346+#: ../preventares/ComputoWindow.py:1694
3347 msgid "Apri un computo esistente"
3348 msgstr ""
3349
3350-#: ../preventares/ComputoWindow.py:1709 ../preventares/ComputoWindow.py:1739
3351-#: ../preventares/ComputoWindow.py:2866
3352+#: ../preventares/ComputoWindow.py:1713 ../preventares/ComputoWindow.py:1743
3353+#: ../preventares/ComputoWindow.py:2870
3354 msgid "Impossibile aprire un nuovo computo, file inesistente"
3355 msgstr ""
3356
3357 #. Attiva una finestra per la scelta del nuovo file
3358-#: ../preventares/ComputoWindow.py:1716 ../preventares/ComputoWindow.py:2017
3359+#: ../preventares/ComputoWindow.py:1720 ../preventares/ComputoWindow.py:2021
3360 msgid "Salva un nuovo preventivo"
3361 msgstr ""
3362
3363-#: ../preventares/ComputoWindow.py:1720 ../preventares/ComputoWindow.py:2022
3364+#: ../preventares/ComputoWindow.py:1724 ../preventares/ComputoWindow.py:2026
3365 msgid "Computo già aperto. Impossibile sovrascrivere"
3366 msgstr ""
3367
3368-#: ../preventares/ComputoWindow.py:1799
3369+#: ../preventares/ComputoWindow.py:1803
3370 msgid "Vuoi salvare le modifiche prima di uscire?"
3371 msgstr ""
3372
3373 #. Attiva una finestra per la scelta del file
3374-#: ../preventares/ComputoWindow.py:1847
3375+#: ../preventares/ComputoWindow.py:1851
3376 msgid "File di testo da esportare"
3377 msgstr ""
3378
3379-#: ../preventares/ComputoWindow.py:1856
3380+#: ../preventares/ComputoWindow.py:1860
3381 #, python-format
3382 msgid "File %s esportato."
3383 msgstr ""
3384
3385-#: ../preventares/ComputoWindow.py:1859
3386+#: ../preventares/ComputoWindow.py:1863
3387 msgid "File non selezionato. Impossibile esportare il database."
3388 msgstr ""
3389
3390 #. Attiva una finestra per la scelta del file
3391-#: ../preventares/ComputoWindow.py:1891
3392+#: ../preventares/ComputoWindow.py:1895
3393 msgid "File CSV da esportare"
3394 msgstr ""
3395
3396-#: ../preventares/ComputoWindow.py:1906
3397+#: ../preventares/ComputoWindow.py:1910
3398 #, python-format
3399 msgid "File %s esportato in formato CSV."
3400 msgstr ""
3401
3402-#: ../preventares/ComputoWindow.py:1909
3403+#: ../preventares/ComputoWindow.py:1913
3404 msgid "File non selezionato. Impossibile esportare il computo in CSV."
3405 msgstr ""
3406
3407 #. creo una lista di nomi delle opzioni x facilitare l'internazionalizzazione
3408-#: ../preventares/ComputoWindow.py:1919
3409+#: ../preventares/ComputoWindow.py:1923
3410 msgid "Esporta Elementi di Listino"
3411 msgstr ""
3412
3413 #. apro la finestra di dialogo delle opzioni
3414-#: ../preventares/ComputoWindow.py:1923
3415+#: ../preventares/ComputoWindow.py:1927
3416 msgid "Opzioni esportazione formato PWE"
3417 msgstr ""
3418
3419 #. Attiva una finestra per la scelta del file
3420-#: ../preventares/ComputoWindow.py:1926
3421+#: ../preventares/ComputoWindow.py:1930
3422 msgid "File PWE da esportare"
3423 msgstr ""
3424
3425-#: ../preventares/ComputoWindow.py:1938
3426+#: ../preventares/ComputoWindow.py:1942
3427 #, python-format
3428 msgid "File %s esportato in formato PWE."
3429 msgstr ""
3430
3431-#: ../preventares/ComputoWindow.py:1941
3432+#: ../preventares/ComputoWindow.py:1945
3433 msgid "File non selezionato. Impossibile esportare il computo in formato PWE."
3434 msgstr ""
3435
3436 #. Attiva una finestra per la scelta del file
3437-#: ../preventares/ComputoWindow.py:1947
3438+#: ../preventares/ComputoWindow.py:1951
3439 msgid "File DUMP da importare"
3440 msgstr ""
3441
3442-#: ../preventares/ComputoWindow.py:1956
3443+#: ../preventares/ComputoWindow.py:1960
3444 msgid "File database importato correttamente."
3445 msgstr ""
3446
3447-#: ../preventares/ComputoWindow.py:1959 ../preventares/ComputoWindow.py:1985
3448-#: ../preventares/ComputoWindow.py:2006
3449+#: ../preventares/ComputoWindow.py:1963 ../preventares/ComputoWindow.py:1989
3450+#: ../preventares/ComputoWindow.py:2010
3451 msgid "File non esistente. Impossibile eseguire l'importazione."
3452 msgstr ""
3453
3454 #. Attiva una finestra per la scelta del file
3455-#: ../preventares/ComputoWindow.py:1965
3456+#: ../preventares/ComputoWindow.py:1969
3457 msgid "File PWE da importare"
3458 msgstr ""
3459
3460 #. crea la progressbar
3461-#: ../preventares/ComputoWindow.py:1971
3462+#: ../preventares/ComputoWindow.py:1975
3463 msgid "Importazione PWE. Attendere."
3464 msgstr ""
3465
3466 #. Attiva una finestra per la scelta del file
3467-#: ../preventares/ComputoWindow.py:1991
3468+#: ../preventares/ComputoWindow.py:1995
3469 msgid "File XML da importare"
3470 msgstr ""
3471
3472-#: ../preventares/ComputoWindow.py:2046
3473+#: ../preventares/ComputoWindow.py:2050
3474 #, python-format
3475 msgid "Errore istruzione SQL non importata: %s"
3476 msgstr ""
3477
3478-#: ../preventares/ComputoWindow.py:2063
3479+#: ../preventares/ComputoWindow.py:2067
3480 msgid "Impossibile salvare un nuovo computo, file inesistente"
3481 msgstr ""
3482
3483-#: ../preventares/ComputoWindow.py:2070
3484+#: ../preventares/ComputoWindow.py:2074
3485 msgid "Vuoi annullare tutte le modifiche effettuate finora?"
3486 msgstr ""
3487
3488-#: ../preventares/ComputoWindow.py:2154
3489+#: ../preventares/ComputoWindow.py:2158
3490 msgid "Questa opzione modificherà tutti gli articoli di listino del computo"
3491 msgstr ""
3492
3493-#: ../preventares/ComputoWindow.py:2156 ../preventares/ComputoWindow.py:2437
3494+#: ../preventares/ComputoWindow.py:2160 ../preventares/ComputoWindow.py:2441
3495 msgid "Impossibile aprire il database listino, file inesistente"
3496 msgstr ""
3497
3498-#: ../preventares/ComputoWindow.py:2372
3499+#: ../preventares/ComputoWindow.py:2376
3500 #, python-format
3501 msgid "Vuoi cancellare l'articolo N.%d?"
3502 msgstr ""
3503
3504-#: ../preventares/ComputoWindow.py:2375
3505+#: ../preventares/ComputoWindow.py:2379
3506 msgid "Vuoi cancellare tutti gli articoli selezionati?"
3507 msgstr ""
3508
3509-#: ../preventares/ComputoWindow.py:2378 ../preventares/ComputoWindow.py:3869
3510+#: ../preventares/ComputoWindow.py:2382 ../preventares/ComputoWindow.py:3878
3511 msgid "Nessun articolo selezionato da cancellare"
3512 msgstr ""
3513
3514-#: ../preventares/ComputoWindow.py:2412 ../preventares/ComputoWindow.py:2805
3515-#: ../preventares/ComputoWindow.py:3829
3516+#: ../preventares/ComputoWindow.py:2416 ../preventares/ComputoWindow.py:2809
3517+#: ../preventares/ComputoWindow.py:3838
3518 msgid ""
3519 "Nessun articolo copiato, copia o seleziona uno o più articoli che vuoi "
3520 "incollare"
3521 msgstr ""
3522
3523-#: ../preventares/ComputoWindow.py:2428
3524+#: ../preventares/ComputoWindow.py:2432
3525 msgid "Nessun articolo selezionato. Impossibile duplicare l'articolo"
3526 msgstr ""
3527
3528-#: ../preventares/ComputoWindow.py:2469
3529+#: ../preventares/ComputoWindow.py:2473
3530 msgid "Nessun articolo selezionato da modificare."
3531 msgstr ""
3532
3533-#: ../preventares/ComputoWindow.py:2481
3534+#: ../preventares/ComputoWindow.py:2485
3535 msgid "Applicare le opzioni selezionate a tutti gli articoli della selezione?"
3536 msgstr ""
3537
3538 #. avviare una progressbar
3539-#: ../preventares/ComputoWindow.py:2483
3540+#: ../preventares/ComputoWindow.py:2487
3541 msgid "Operazione"
3542 msgstr ""
3543
3544-#: ../preventares/ComputoWindow.py:2652
3545+#: ../preventares/ComputoWindow.py:2656
3546 msgid "Impossibile creare categorie, seleziona prima un ramo delle categorie"
3547 msgstr ""
3548
3549-#: ../preventares/ComputoWindow.py:2685
3550+#: ../preventares/ComputoWindow.py:2689
3551 msgid "Impossibile eliminare una categoria, nessuna categoria è selezionata"
3552 msgstr ""
3553
3554-#: ../preventares/ComputoWindow.py:2863
3555+#: ../preventares/ComputoWindow.py:2867
3556 msgid "Computo già aperto. Impossibile aprirlo"
3557 msgstr ""
3558
3559-#: ../preventares/ComputoWindow.py:3001
3560+#: ../preventares/ComputoWindow.py:3005
3561 msgid ""
3562 "Impossibile creare un nuovo capitolo, seleziona prima un ramo dei capitoli"
3563 msgstr ""
3564
3565-#: ../preventares/ComputoWindow.py:3036
3566+#: ../preventares/ComputoWindow.py:3040
3567 msgid "Impossibile eliminare il capitolo, nessuna capitolo è selezionata"
3568 msgstr ""
3569
3570-#: ../preventares/ComputoWindow.py:3271
3571+#: ../preventares/ComputoWindow.py:3275
3572 #, python-format
3573 msgid "Spostare l'articolo selezionato nella posizione n.%s"
3574 msgstr ""
3575
3576-#: ../preventares/ComputoWindow.py:3280
3577+#: ../preventares/ComputoWindow.py:3284
3578 msgid "Nessun articolo selezionato"
3579 msgstr ""
3580
3581-#: ../preventares/ComputoWindow.py:3306 ../preventares/ComputoWindow.py:3999
3582+#: ../preventares/ComputoWindow.py:3310 ../preventares/ComputoWindow.py:4008
3583 #, python-format
3584 msgid "Vuoi inserire un nuovo articolo con descrizione: '%s'"
3585 msgstr ""
3586
3587-#: ../preventares/ComputoWindow.py:3560
3588+#: ../preventares/ComputoWindow.py:3569
3589 msgid ""
3590 "Nessun articolo di computo selezionato. Seleziona un articolo di computo in "
3591 "cui inserire il nuovo articolo di listino"
3592 msgstr ""
3593
3594-#: ../preventares/ComputoWindow.py:3563
3595+#: ../preventares/ComputoWindow.py:3572
3596 msgid ""
3597 "Nessun articolo di elenco prezzi selezionato. Seleziona un articolo in cui "
3598 "inserire l'articolo di listino"
3599 msgstr ""
3600
3601-#: ../preventares/ComputoWindow.py:3568 ../preventares/ComputoWindow.py:3609
3602+#: ../preventares/ComputoWindow.py:3577 ../preventares/ComputoWindow.py:3618
3603 msgid ""
3604 "Nessun articolo selezionato. Seleziona un articolo prima di inserire un "
3605 "articolo di listino"
3606 msgstr ""
3607
3608-#: ../preventares/ComputoWindow.py:3580
3609+#: ../preventares/ComputoWindow.py:3589
3610 #, python-format
3611 msgid "Vuoi cancellare l'articolo di listino N.%d"
3612 msgstr ""
3613
3614-#: ../preventares/ComputoWindow.py:3583
3615+#: ../preventares/ComputoWindow.py:3592
3616 msgid "Vuoi cancellare gli articoli di listino selezionati?"
3617 msgstr ""
3618
3619-#: ../preventares/ComputoWindow.py:3586
3620+#: ../preventares/ComputoWindow.py:3595
3621 msgid "Nessun articolo di listino selezionato"
3622 msgstr ""
3623
3624-#: ../preventares/ComputoWindow.py:3601
3625+#: ../preventares/ComputoWindow.py:3610
3626 msgid ""
3627 "Nessun articolo di computo selezionato. Seleziona un articolo in cui "
3628 "incollare il nuovo articolo di listino"
3629 msgstr ""
3630
3631-#: ../preventares/ComputoWindow.py:3604
3632+#: ../preventares/ComputoWindow.py:3613
3633 msgid ""
3634 "Nessun articolo di elenco prezzi selezionato. Seleziona un articolo in cui "
3635 "incollare l'articolo di listino"
3636 msgstr ""
3637
3638-#: ../preventares/ComputoWindow.py:3623
3639+#: ../preventares/ComputoWindow.py:3632
3640 msgid "Nessun articolo di listino copiato, copia o seleziona un articolo"
3641 msgstr ""
3642
3643-#: ../preventares/ComputoWindow.py:3627
3644+#: ../preventares/ComputoWindow.py:3636
3645 #, python-format
3646 msgid ""
3647 "Una voce di listino è già esistente per l'articolo %s, e non è stato aggiunto"
3648 msgstr ""
3649
3650-#: ../preventares/ComputoWindow.py:3642
3651+#: ../preventares/ComputoWindow.py:3651
3652 msgid ""
3653 "Nessun articolo selezionato. Seleziona un articolo prima di effettuare il "
3654 "ricalcolo"
3655 msgstr ""
3656
3657-#: ../preventares/ComputoWindow.py:3856
3658+#: ../preventares/ComputoWindow.py:3865
3659 msgid ""
3660 "Nessun articolo copiato. Copia o seleziona uno o più articoli che vuoi "
3661 "incollare"
3662 msgstr ""
3663
3664-#: ../preventares/ComputoWindow.py:3863
3665+#: ../preventares/ComputoWindow.py:3872
3666 #, python-format
3667 msgid ""
3668 "Vuoi cancellare dall'elenco prezzi e dal computo l'articolo con tariffa '%s'?"
3669 msgstr ""
3670
3671-#: ../preventares/ComputoWindow.py:3866
3672+#: ../preventares/ComputoWindow.py:3875
3673 msgid ""
3674 "Vuoi cancellare dall'elenco prezzi e dal computo tutti gli articoli "
3675 "selezionati?"
3676 msgstr ""
3677
3678-#: ../preventares/ComputoWindow.py:4110
3679+#: ../preventares/ComputoWindow.py:4119
3680 msgid "Vuoi modificare il ricarico generale di tutti gli articoli esistenti?"
3681 msgstr ""
3682
3683-#: ../preventares/ComputoWindow.py:4115
3684+#: ../preventares/ComputoWindow.py:4124
3685 msgid ""
3686 "Vuoi modificare il valore della manodopera di tutti gli articoli esistenti?"
3687 msgstr ""
3688
3689-#: ../preventares/ComputoWindow.py:4122
3690+#: ../preventares/ComputoWindow.py:4131
3691 msgid ""
3692 "Vuoi modificare l'incidenza della sicurezza per tutti gli articoli esistenti?"
3693 msgstr ""
3694
3695-#: ../preventares/ComputoWindow.py:4128
3696+#: ../preventares/ComputoWindow.py:4137
3697 #, python-format
3698 msgid "Vuoi modificare la valuta corrente con la nuova valuta '%s'?"
3699 msgstr ""
3700
3701-#: ../preventares/ComputoWindow.py:4216
3702+#: ../preventares/ComputoWindow.py:4225
3703 #, python-format
3704 msgid "Nessun/a %s selezionata da rimuovere"
3705 msgstr ""
3706
3707-#: ../preventares/ComputoWindow.py:4220
3708+#: ../preventares/ComputoWindow.py:4229
3709 #, python-format
3710 msgid "Vuoi cancellare il/la %s '%d'?"
3711 msgstr ""
3712
3713-#: ../preventares/ComputoWindow.py:4293 ../preventares/preventa_lib.py:76
3714+#: ../preventares/ComputoWindow.py:4302 ../preventares/preventa_lib.py:76
3715 msgid "Manodopera"
3716 msgstr ""
3717
3718-#: ../preventares/ComputoWindow.py:4409 ../preventares/metel.py:746
3719+#: ../preventares/ComputoWindow.py:4418 ../preventares/metel.py:746
3720 msgid "Barra di avanzamento"
3721 msgstr ""
3722
3723@@ -808,73 +808,73 @@
3724 msgid "PCE"
3725 msgstr ""
3726
3727-#: ../bin/preventares.py:312
3728+#: ../bin/preventares.py:328
3729 msgid "Valore '{0}' del parametro '{1}' di configurazione non riconosciuto"
3730 msgstr ""
3731
3732 #. parsing del file
3733-#: ../bin/preventares.py:327
3734+#: ../bin/preventares.py:343
3735 msgid "Parsing del file di configurazione, sezione '{0}'"
3736 msgstr ""
3737
3738-#: ../bin/preventares.py:349
3739+#: ../bin/preventares.py:365
3740 msgid "Scrittura del file di configurazione '{0}', sezione '{1}'"
3741 msgstr ""
3742
3743-#: ../bin/preventares.py:590
3744+#: ../bin/preventares.py:606
3745 msgid "Dump .mdb price list"
3746 msgstr ""
3747
3748-#: ../bin/preventares.py:593
3749+#: ../bin/preventares.py:609
3750 msgid "Import Prevwin .mdb archive into PreventARES archive"
3751 msgstr ""
3752
3753-#: ../bin/preventares.py:596
3754+#: ../bin/preventares.py:612
3755 msgid "Import Prevwin .mdb price list into PreventARES archive"
3756 msgstr ""
3757
3758-#: ../bin/preventares.py:599
3759+#: ../bin/preventares.py:615
3760 msgid ""
3761 "Convert 'ANALIST software Tariffario' price list (.mdb) into PreventARES "
3762 "archive"
3763 msgstr ""
3764
3765-#: ../bin/preventares.py:602
3766+#: ../bin/preventares.py:618
3767 msgid "Show the tables content for PreventARES database"
3768 msgstr ""
3769
3770-#: ../bin/preventares.py:605
3771+#: ../bin/preventares.py:621
3772 msgid ""
3773 "Minimal shell for Preventa_lib. Use ':memory:' to open in memory database"
3774 msgstr ""
3775
3776-#: ../bin/preventares.py:608
3777+#: ../bin/preventares.py:624
3778 msgid "Show debug messages"
3779 msgstr ""
3780
3781-#: ../bin/preventares.py:611
3782+#: ../bin/preventares.py:627
3783 msgid "Export database to txt file"
3784 msgstr ""
3785
3786-#: ../bin/preventares.py:614
3787+#: ../bin/preventares.py:630
3788 msgid "Convert XML (SIX format) price list into PreventARES archive"
3789 msgstr ""
3790
3791-#: ../bin/preventares.py:617
3792+#: ../bin/preventares.py:633
3793 msgid "write debug messages to LOGFILE"
3794 msgstr ""
3795
3796-#: ../bin/preventares.py:620
3797+#: ../bin/preventares.py:636
3798 msgid "override the standard OUTPUT filename and set it to OUTPUT FILENAME"
3799 msgstr ""
3800
3801-#: ../bin/preventares.py:623
3802+#: ../bin/preventares.py:639
3803 msgid "Convert Finpolo price list into standard METEL file"
3804 msgstr ""
3805
3806-#: ../bin/preventares.py:665 ../bin/preventares.py:673
3807-#: ../bin/preventares.py:694 ../bin/preventares.py:707
3808-#: ../bin/preventares.py:715
3809+#: ../bin/preventares.py:681 ../bin/preventares.py:689
3810+#: ../bin/preventares.py:710 ../bin/preventares.py:723
3811+#: ../bin/preventares.py:731
3812 #, python-format
3813 msgid "Errore: Il file '%s' è inesistente."
3814 msgstr ""
3815@@ -1120,7 +1120,7 @@
3816 msgstr ""
3817
3818 #: ../data/ui/ComputoWindow.ui.h:60
3819-msgid "Inserire il prezzo orario della manodopera gi&#xE0; ricaricata"
3820+msgid "Inserire il prezzo orario della manodopera già ricaricata"
3821 msgstr ""
3822
3823 #: ../data/ui/ComputoWindow.ui.h:61
3824@@ -1165,7 +1165,7 @@
3825 msgstr ""
3826
3827 #: ../data/ui/ComputoWindow.ui.h:72
3828-msgid "Quantit&#xE0;:"
3829+msgid "Quantità:"
3830 msgstr ""
3831
3832 #: ../data/ui/ComputoWindow.ui.h:73
3833@@ -1628,85 +1628,85 @@
3834 msgstr ""
3835
3836 #. intestazione delle colonne
3837-#: ../preventares/preventa_print.py:997 ../preventares/preventa_print.py:1172
3838+#: ../preventares/preventa_print.py:999 ../preventares/preventa_print.py:1176
3839 msgid "<b>Cod.</b>"
3840 msgstr ""
3841
3842-#: ../preventares/preventa_print.py:998
3843+#: ../preventares/preventa_print.py:1000
3844 msgid "<b>Capitolo/Categoria</b>"
3845 msgstr ""
3846
3847-#: ../preventares/preventa_print.py:999
3848+#: ../preventares/preventa_print.py:1001
3849 msgid "<b>Totale</b>"
3850 msgstr ""
3851
3852-#: ../preventares/preventa_print.py:1000 ../preventares/preventa_print.py:1178
3853+#: ../preventares/preventa_print.py:1002 ../preventares/preventa_print.py:1182
3854 msgid "<b>Inc.%</b>"
3855 msgstr ""
3856
3857-#: ../preventares/preventa_print.py:1173
3858+#: ../preventares/preventa_print.py:1177
3859 msgid "<b>Categoria</b>"
3860 msgstr ""
3861
3862-#: ../preventares/preventa_print.py:1174
3863+#: ../preventares/preventa_print.py:1178
3864 #, python-format
3865 msgid "<b>%s</b>"
3866 msgstr ""
3867
3868-#: ../preventares/preventa_print.py:1176
3869+#: ../preventares/preventa_print.py:1180
3870 msgid "<b>Totale Costo</b>"
3871 msgstr ""
3872
3873 #. messaggio di errore
3874-#: ../preventares/preventa_print.py:1438
3875+#: ../preventares/preventa_print.py:1442
3876 msgid "Errore impostazioni di esportazione in CSV errate"
3877 msgstr ""
3878
3879 #. scrive sul file i dati estratti e processati
3880-#: ../preventares/preventa_print.py:1450 ../preventares/preventa_lib.py:3013
3881+#: ../preventares/preventa_print.py:1454 ../preventares/preventa_lib.py:3013
3882 #: ../preventares/preventa_lib.py:3058 ../preventares/preventa_lib.py:3107
3883 msgid ""
3884 "No.\n"
3885 "Tariffa"
3886 msgstr ""
3887
3888-#: ../preventares/preventa_print.py:1450 ../preventares/preventa_lib.py:3013
3889+#: ../preventares/preventa_print.py:1454 ../preventares/preventa_lib.py:3013
3890 #: ../preventares/preventa_lib.py:3058 ../preventares/preventa_lib.py:3107
3891 msgid "UM"
3892 msgstr ""
3893
3894-#: ../preventares/preventa_print.py:1451 ../preventares/preventa_lib.py:3014
3895+#: ../preventares/preventa_print.py:1455 ../preventares/preventa_lib.py:3014
3896 #: ../preventares/preventa_lib.py:3059 ../preventares/preventa_lib.py:3108
3897 msgid "P.Unitario"
3898 msgstr ""
3899
3900-#: ../preventares/preventa_print.py:1451 ../preventares/preventa_lib.py:3014
3901+#: ../preventares/preventa_print.py:1455 ../preventares/preventa_lib.py:3014
3902 #: ../preventares/preventa_lib.py:3059 ../preventares/preventa_lib.py:3108
3903 msgid "P.Totale"
3904 msgstr ""
3905
3906 #. scrive sul file il report finale
3907-#: ../preventares/preventa_print.py:1454 ../preventares/preventa_lib.py:3062
3908+#: ../preventares/preventa_print.py:1458 ../preventares/preventa_lib.py:3062
3909 #: ../preventares/preventa_lib.py:3111
3910 msgid "Cat."
3911 msgstr ""
3912
3913-#: ../preventares/preventa_print.py:1454 ../preventares/preventa_lib.py:3062
3914+#: ../preventares/preventa_print.py:1458 ../preventares/preventa_lib.py:3062
3915 #: ../preventares/preventa_lib.py:3111
3916 msgid "Categoria\n"
3917 msgstr ""
3918
3919-#: ../preventares/preventa_print.py:1454 ../preventares/preventa_lib.py:3062
3920+#: ../preventares/preventa_print.py:1458 ../preventares/preventa_lib.py:3062
3921 #: ../preventares/preventa_lib.py:3111
3922 msgid "Totale"
3923 msgstr ""
3924
3925-#: ../preventares/preventa_print.py:1455 ../preventares/preventa_lib.py:3063
3926+#: ../preventares/preventa_print.py:1459 ../preventares/preventa_lib.py:3063
3927 #: ../preventares/preventa_lib.py:3112
3928 msgid "Incidenza"
3929 msgstr ""
3930
3931-#: ../preventares/preventa_print.py:1457
3932+#: ../preventares/preventa_print.py:1461
3933 msgid "Esportazione formato CSV tipo stampa {0}, file: {1}"
3934 msgstr ""
3935
3936
3937=== modified file 'preventares/ComputoWindow.py'
3938--- preventares/ComputoWindow.py 2011-10-06 21:04:30 +0000
3939+++ preventares/ComputoWindow.py 2012-04-12 22:42:17 +0000
3940@@ -269,7 +269,8 @@
3941 # imposto la casella tariffa con colore di sfondo grigio chiaro
3942 self.tariffa.modify_base(gtk.STATE_NORMAL, colour_gray)
3943 self.tariffa.connect("changed", self.Attiva_pulsante_aggiornamento)
3944- self.tariffa.connect("icon-press", self.callback_activate_entry)
3945+ self.tariffa.connect("icon-press", self.callback_icon_press_entry)
3946+ self.tariffa.connect("activate", self.callback_activate_entry)
3947 self.descrizione_codice = builder.get_object("entry4")
3948 self.descrizione_codice.connect("changed", self.Attiva_pulsante_aggiornamento)
3949 self.descrizione_voce = builder.get_object("entry5")
3950@@ -281,7 +282,8 @@
3951 # imposto la casella quantita con colore di sfondo grigio chiaro
3952 self.quantita = builder.get_object("entry7")
3953 self.quantita.connect("changed", self.Attiva_pulsante_aggiornamento)
3954- self.quantita.connect("icon-press", self.callback_activate_entry)
3955+ self.quantita.connect("icon-press", self.callback_icon_press_entry)
3956+ self.quantita.connect("activate", self.callback_activate_entry)
3957 self.quantita.modify_base(gtk.STATE_NORMAL, colour_gray)
3958 self.liststore_um = builder.get_object("liststore_um")
3959 self.liststore_um.elenco_um = ["n.","cad.", "corpo", "m", "mq", "mc", "kg"]
3960@@ -294,12 +296,14 @@
3961 # imposto il costo_materiali con colore di sfondo grigio chiaro
3962 self.costo_materiali = builder.get_object("entry2")
3963 self.costo_materiali.connect("changed", self.Attiva_pulsante_aggiornamento)
3964- self.costo_materiali.connect("icon-press", self.callback_activate_entry)
3965+ self.costo_materiali.connect("icon-press", self.callback_icon_press_entry)
3966+ self.costo_materiali.connect("activate", self.callback_activate_entry)
3967 self.costo_materiali.modify_base(gtk.STATE_NORMAL, colour_gray)
3968 # imposto il prezzo unitario con colore di sfondo rosso
3969 self.prezzo_unitario = builder.get_object("entry3")
3970 self.prezzo_unitario.connect("changed", self.Attiva_pulsante_aggiornamento)
3971- self.prezzo_unitario.connect("icon-press", self.callback_activate_entry)
3972+ self.prezzo_unitario.connect("icon-press", self.callback_icon_press_entry)
3973+ self.prezzo_unitario.connect("activate", self.callback_activate_entry)
3974 self.prezzo_unitario.modify_base(gtk.STATE_NORMAL, colour_light_red)
3975 self.sicurezza = builder.get_object("spinbutton4")
3976 self.sicurezza.connect("changed", self.Attiva_pulsante_aggiornamento)
3977@@ -3336,15 +3340,17 @@
3978 # ricarico
3979 articolo.ricarico = self.ricarico.get_value()
3980 # sicurezza (percentuale)
3981- articolo.sicurezza = self.sicurezza.get_value()
3982+ articolo.sicurezza = self.sicurezza.get_value()
3983+ # modifica il tempo di installazione e costo_materiali o il prezzo unitario
3984 if not self.prezzo_unitario.get_editable():
3985 # tempo di installazione
3986 articolo.tempo_inst = self.tempo_inst.get_value_as_int()
3987 # costo materiali
3988 articolo.costo_materiali = self.__verifica_dato_immesso(self, self.costo_materiali)
3989- # prezzo unitario
3990- if self.prezzo_unitario.get_editable():
3991+ elif self.prezzo_unitario.get_editable():
3992+ # prezzo unitario
3993 prezzo_unitario = self.__verifica_dato_immesso(self, self.prezzo_unitario)
3994+ # ricalcola del costo e tempo dell'articolo in base al totale
3995 articolo.set_unit_price(prezzo_unitario)
3996 # unita misura
3997 articolo.unita_misura = self.unita_misura.child.get_text()
3998@@ -3372,8 +3378,6 @@
3999 articolo.costo_mat4 = self.__verifica_dato_immesso(self, self.costo_mat_4)
4000 # utilizza la funzione di aggiornamento del database Epu
4001 result = self.preventivo.update_articolo_epu (tariffa, articolo)
4002- # aggiorna l'interfaccia grafica (solo le 3 treeview)
4003- self.Aggiorna_finestra_dialogo(self)
4004 return True
4005
4006 def modifica_articolo_computo (self, widget, data=None):
4007@@ -3392,8 +3396,6 @@
4008 self.articolo_computo.subcategoria = sub
4009 # utilizza la funzione di aggiornamento del database Computo
4010 result = self.preventivo.update_articolo_computo (self.prymary_key, self.articolo_computo)
4011- # aggiorna l'interfaccia grafica
4012- self.Aggiorna_finestra_dialogo(self)
4013 return True
4014
4015 def pulsante_aggiorna_articolo (self, widget, data=None):
4016@@ -3401,7 +3403,10 @@
4017 if self.notebook.get_current_page() == 1:
4018 self.modifica_articolo_computo(self)
4019 self.modifica_articolo_epu(self)
4020-
4021+ # aggiorna l'interfaccia grafica (solo le 3 treeview)
4022+ self.Aggiorna_maschera_articolo(self)
4023+ self.Aggiorna_finestra_dialogo(self)
4024+
4025 def Attiva_pulsante_aggiornamento(self, widget, *args):
4026 """Callback dei widget della aggiorna articolo - tab 'Computo',
4027 alla digitazione di dati (segnale "focus") il widget attiva il pulsante
4028@@ -3428,10 +3433,10 @@
4029 self.costo_materiali.set_property('primary-icon-stock', gtk.STOCK_EDIT)
4030 self.tempo_inst.set_sensitive(True)
4031
4032- def callback_activate_entry(self, widget, icon_pos, event, data=None):
4033- """"""
4034+ def callback_icon_press_entry(self, widget, icon_pos, event, data=None):
4035+ """callback utilizzata quando si preme l'ICONA di una gtk.Entry"""
4036 colour_light_red = gtk.gdk.Color("#FF9999") # light red
4037- colour_gray = gtk.gdk.Color("#e5e5e5")
4038+ colour_gray = gtk.gdk.Color("#e5e5e5") # gray colour
4039 if icon_pos.real == 0 and not widget.get_property('editable'):
4040 widget.set_property('editable', True)
4041 widget.modify_base(gtk.STATE_NORMAL, colour_gray)
4042@@ -3444,7 +3449,7 @@
4043 self.tempo_inst.set_sensitive(True)
4044 else:
4045 return
4046- # rende non editabili i pulsanti
4047+ # rende non editabili i pulsanti 'opposti'
4048 wid.set_property('editable', False)
4049 wid.modify_base(gtk.STATE_NORMAL, colour_light_red)
4050 wid.set_property('primary-icon-stock', gtk.STOCK_STOP)
4051@@ -3460,11 +3465,15 @@
4052 self.tempo_inst.set_sensitive(False)
4053 else:
4054 return
4055- # rende editabili i pulsanti
4056+ # rende editabili i pulsanti 'opposti'
4057 wid.set_property('editable', True)
4058 wid.modify_base(gtk.STATE_NORMAL, colour_gray)
4059 wid.set_property('primary-icon-stock', gtk.STOCK_EDIT)
4060- #self.tempo_inst.set_sensitive(widget.get_property('editable'))
4061+
4062+ def callback_activate_entry(self, widget, data=None):
4063+ """callback utilizzata quando si preme ENTER in una gtk.Entry"""
4064+ pass
4065+
4066 ################################################################################
4067 ########## TREEVIEW - LISTINO ##################################################
4068 ################################################################################
4069
4070=== modified file 'preventares/import_elettro_mdb.py'
4071--- preventares/import_elettro_mdb.py 2011-10-06 21:04:30 +0000
4072+++ preventares/import_elettro_mdb.py 2012-04-12 22:42:17 +0000
4073@@ -118,7 +118,7 @@
4074 # BLA
4075 ###############################################
4076 print "Lettura del file csv %s" % FILE_BLA_BLA
4077- # CODICE,COST_MAT_,TEMP,QUANTITA,RIC,M_D_,PREZZO,QUAN1,DESC_VOCE,cod_str,ID,VOCE
4078+ # CODICE,VOCE,COST_MAT_,TEMP,QUANTITA,RIC,M_D_,PREZZO,QUAN1,DESC_VOCE,cod_str,ID
4079 # legge il file csv e crea un oggetto iterabile
4080 fbla = csv.reader(open(FILE_BLA_BLA, 'rb'))
4081 # per ogni articolo del file csv crea un articolo della lib preventa
4082@@ -126,8 +126,8 @@
4083 lista_articoli = list()
4084 for line in fbla:
4085 n += 1
4086- (CODICE,COST_MAT_,TEMP,QUANTITA,RIC,M_D_,PREZZO,QUAN1,DESC_VOCE,
4087- cod_str,ID,VOCE) = line
4088+ (CODICE,VOCE,COST_MAT_,TEMP,QUANTITA,RIC,M_D_,PREZZO,QUAN1,DESC_VOCE,
4089+ cod_str,ID) = line
4090 # cra l'articolo da inserire in lista
4091 articolo = preventa_lib.ArticoloComputo(database,
4092 1, 1, 0,
4093
4094=== modified file 'preventares/preventa_lib.py'
4095--- preventares/preventa_lib.py 2011-10-06 21:04:30 +0000
4096+++ preventares/preventa_lib.py 2012-04-12 22:42:17 +0000
4097@@ -1758,7 +1758,7 @@
4098 else:
4099 quant = """1 = 1"""
4100 # verifica problemi di SQL injection per il campo di ricerca
4101- if search_key is not None:
4102+ if search_key is not None and search_key is str:
4103 search_key = search_key.replace("'", " ").replace("=", ' ')
4104 if column is None and search_key is None:
4105 self.c.execute("""SELECT * FROM Computo WHERE {0} AND {1} AND {2} AND {3} AND {4} ORDER BY id;""".format(
4106@@ -1869,7 +1869,7 @@
4107 capitolo, subcapitolo,
4108 contract_type, is_chapter=True)
4109 # verifica problemi di SQL injection per il campo di ricerca
4110- if search_key is not None:
4111+ if search_key is not None and search_key is str:
4112 search_key = search_key.replace("'", " ").replace("=", " ")
4113 if column is None and search_key is None:
4114 self.c.execute("""SELECT Tariffa, Descrizione_codice, Descrizione_voce, Descrizione_estesa,
4115@@ -3943,27 +3943,42 @@
4116 if type(value) != float:
4117 raise PreventiviError("'value' deve essere 'float' invece di {0} ".format(type(value)))
4118 return False
4119- # se il costo materiali è pari a 0 fissa il costo pari al nuovo valore
4120- if self.costo_materiali == 0: cm = value
4121- else: cm = None
4122 # ricavo il costo della manodopera
4123 costo_mo_ora = self.dati_generali_list()[1]
4124- # calcolo la differenza tra i due prezzi per poi ridurre il tempo di installazione
4125- diff = self.prezzo_unitario - value
4126- # calcolo il nuovo tempo di installazione
4127- try:
4128- self.tempo_inst = (value - ((self.costo_materiali * self.ricarico) * (1+(self.sicurezza/100))))/(costo_mo_ora/60)
4129- except ZeroDivisionError:
4130- self.tempo_inst = 0
4131- # se il tempo di installazione è negativo riduco il costo dei materiali
4132- if self.tempo_inst < 0:
4133- self.tempo_inst = 0
4134+ # definisco le procedure di calcolo del tempo e della manodopara
4135+ def calcolo_tempo(value):
4136+ # calcolo il nuovo tempo di installazione
4137+ try:
4138+ #self.tempo_inst = (value - ((self.costo_materiali * self.ricarico) * (1+(self.sicurezza/100))))/(costo_mo_ora/60)
4139+ self.tempo_inst = ((value / (1+(self.sicurezza/100))) - (self.costo_materiali * self.ricarico)) * (60/costo_mo_ora)
4140+ except ZeroDivisionError:
4141+ self.tempo_inst = 0
4142+ finally:
4143+ if self.tempo_inst < 0: self.tempo_inst = 0
4144+ # ricalcolo il nuovo prezzo unitario
4145+ self.prezzo_unitario = self.__calcola_prezzo_unitario ()
4146+ # procedure di calcolo dei costi materiali
4147+ def calcolo_mat(value):
4148 try:
4149 self.costo_materiali = (value/(1+(self.sicurezza/100)))/ self.ricarico
4150 except ZeroDivisionError:
4151 self.costo_materiali = value
4152- # ricalcolo il nuovo prezzo unitario
4153- self.prezzo_unitario = self.__calcola_prezzo_unitario ()
4154+ finally:
4155+ # ricalcolo il nuovo prezzo unitario
4156+ self.prezzo_unitario = self.__calcola_prezzo_unitario ()
4157+ # se il costo orario della manodopera è <= 0 varia il costo dei materiali
4158+ # se il costo orario della manodopera è > 0 cambia il valore del tempo
4159+ # di installazione a meno che questo non sia già negativo e ripete il ciclo
4160+ while self.prezzo_unitario != value:
4161+ if costo_mo_ora <= 0:
4162+ calcolo_mat(value)
4163+ elif costo_mo_ora > 0 and self.tempo_inst > 0:
4164+ calcolo_tempo(value)
4165+ elif costo_mo_ora > 0 and self.tempo_inst <= 0:
4166+ self.tempo_inst = 0
4167+ calcolo_mat(value)
4168+ else: break
4169+ #FIXME esiste ancora la possibilità di loop?
4170 # infine calcola il prezzo totale
4171 self.prezzo_totale = self.__calcola_prezzo_totale()
4172 return True
4173
4174=== modified file 'preventares/preventa_print.py'
4175--- preventares/preventa_print.py 2011-10-06 21:04:30 +0000
4176+++ preventares/preventa_print.py 2012-04-12 22:42:17 +0000
4177@@ -961,12 +961,14 @@
4178 cairo_context.show_layout(layout_articolo[1])
4179 # stampa prezzo
4180 x = x0+(0.769*BORDER_x) #430
4181- cairo_context.move_to(x, y)
4182- cairo_context.show_layout(layout_articolo[2])
4183+ if settings["computo_print_price"]:
4184+ cairo_context.move_to(x, y)
4185+ cairo_context.show_layout(layout_articolo[2])
4186 # stampa incidenza
4187 x = x0+(0.894*BORDER_x) #500
4188- cairo_context.move_to(x, y)
4189- cairo_context.show_layout(layout_articolo[3])
4190+ if settings["computo_print_price"]:
4191+ cairo_context.move_to(x, y)
4192+ cairo_context.show_layout(layout_articolo[3])
4193 # aumenta la variabile y
4194 pixel_x1, pixel_y1 = layout_articolo[0].get_pixel_size()
4195 pixel_x2, pixel_y2 = layout_articolo[1].get_pixel_size()
4196@@ -1129,12 +1131,14 @@
4197 cairo_context.show_layout(layout_articolo[2])
4198 # stampa prezzo
4199 x = x0+(0.769*BORDER_x) #430
4200- cairo_context.move_to(x, y)
4201- cairo_context.show_layout(layout_articolo[3])
4202+ if settings["computo_print_price"]:
4203+ cairo_context.move_to(x, y)
4204+ cairo_context.show_layout(layout_articolo[3])
4205 # stampa incidenza
4206 x = x0+(0.894*BORDER_x) #500
4207- cairo_context.move_to(x, y)
4208- cairo_context.show_layout(layout_articolo[4])
4209+ if settings["computo_print_price"]:
4210+ cairo_context.move_to(x, y)
4211+ cairo_context.show_layout(layout_articolo[4])
4212 # aumenta la variabile y
4213 pixel_x1, pixel_y1 = layout_articolo[0].get_pixel_size()
4214 pixel_x2, pixel_y2 = layout_articolo[1].get_pixel_size()
4215@@ -1516,16 +1520,17 @@
4216 print_only_if_not_0 = settings["print_only_if_quantity_not_0"],
4217 print_without_chapter = settings["print_without_chapter"],
4218 print_analisi= settings["print_analisi"])
4219- # report finale per computo
4220+ # stampa report finale per computo suddiviso per categorie
4221 if settings["print_report_by_chapter"]:
4222 lista_report.extend(preventivo.print_report_categorie(
4223 lista_supercategorie=sup_cat, lista_categorie=cat,
4224 lista_subcategorie=sub_cat,
4225 print_only_if_not_0 = settings["print_only_if_quantity_not_0"]))
4226- lista_report.extend(preventivo.print_report_computo (lista_supercategorie=sup_cat,
4227- lista_categorie=cat, lista_subcategorie=sub_cat,
4228- print_only_if_not_0 = settings["print_only_if_quantity_not_0"],
4229- print_only_grand_total = settings["print_only_grand_total"]))
4230+ # stampa report finale per computo strutturato o solo totale generale
4231+ lista_report.extend(preventivo.print_report_computo (lista_supercategorie=sup_cat,
4232+ lista_categorie=cat, lista_subcategorie=sub_cat,
4233+ print_only_if_not_0 = settings["print_only_if_quantity_not_0"],
4234+ print_only_grand_total = settings["print_only_grand_total"]))
4235 elif tipo_stampa == "epu":
4236 lista_articoli_stampare = preventivo.print_epu (
4237 lista_supercapitoli=sup_cap, lista_capitoli=cap, lista_subcapitoli=sub_cap,
4238@@ -1549,10 +1554,11 @@
4239 lista_report.extend(preventivo.print_report_capitoli (
4240 lista_supercapitoli=sup_cap, lista_capitoli=cap, lista_subcapitoli=sub_cap,
4241 print_only_if_not_0 = settings["print_only_if_quantity_not_0"]))
4242- lista_report.extend(preventivo.print_report_lavorazioni(
4243- lista_supercapitoli=sup_cap, lista_capitoli=cap, lista_subcapitoli=sub_cap,
4244- print_only_if_not_0 = settings["print_only_if_quantity_not_0"],
4245- print_only_grand_total = settings["print_only_grand_total"]))
4246+ # stampa report finale per computo strutturato o solo totale generale
4247+ lista_report.extend(preventivo.print_report_lavorazioni(
4248+ lista_supercapitoli=sup_cap, lista_capitoli=cap, lista_subcapitoli=sub_cap,
4249+ print_only_if_not_0 = settings["print_only_if_quantity_not_0"],
4250+ print_only_grand_total = settings["print_only_grand_total"]))
4251 elif tipo_stampa == "analisi":
4252 lista_articoli_stampare = preventivo.print_computo (lista_supercategorie=sup_cat,
4253 lista_categorie=cat, lista_subcategorie=sub_cat,
4254
4255=== modified file 'preventares/preventaresconfig.py'
4256--- preventares/preventaresconfig.py 2011-06-11 00:01:54 +0000
4257+++ preventares/preventaresconfig.py 2012-04-12 22:42:17 +0000
4258@@ -36,7 +36,7 @@
4259
4260 # Impostazioni file configurazione e archivi principali e metel
4261 __user_directory__ = '~'
4262-__preventares_config_directory__ = '~/Preventa/'
4263+__preventares_config_directory__ = '~/.preventares/'
4264 __preventares_archive_directory__ = 'archive'
4265 __preventares_archive_filename__ = 'archive.db'
4266 __preventares_metel_filename__ = 'metel.db'
4267
4268=== modified file 'setup.py'
4269--- setup.py 2011-10-06 21:04:30 +0000
4270+++ setup.py 2012-04-12 22:42:17 +0000
4271@@ -88,7 +88,7 @@
4272
4273 DistUtilsExtra.auto.setup(
4274 name='preventares',
4275- version='11.09-public1',
4276+ version='12.04.1',
4277 license='GPL-3',
4278 author='Davide Vescovini',
4279 author_email='davide.vescovini@gmail.com',

Subscribers

People subscribed via source and target branches

to all changes: