usb-creator

Merge lp:~seb128/usb-creator/gtkbuilder into lp:usb-creator

  1. gtkbuilder
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Merged
Merged at revision: not available
Proposed branch: lp:~seb128/usb-creator/gtkbuilder
Merge into: lp:usb-creator
Diff against target: None lines
To merge this branch: bzr merge lp:~seb128/usb-creator/gtkbuilder
Reviewer Review Type Date Requested Status
usb-creator hackers Pending
Review via email: mp+9205@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

use gtkbuilder rather than libglade

lp:~seb128/usb-creator/gtkbuilder updated
127. By seb128 <seb128@seb128-laptop>

use the workaround to not highlight a label by default again it's useful
default on bottom right button

128. By seb128 <seb128@seb128-laptop>

use launchpad bug

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-07-23 15:05:25 +0000
3+++ debian/changelog 2009-07-23 16:24:48 +0000
4@@ -1,3 +1,9 @@
5+usb-creator (0.2.2) karmic; urgency=low
6+
7+ * Use gtkbuilder rather than libglade
8+
9+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 23 Jul 2009 18:23:46 +0200
10+
11 usb-creator (0.2.1) karmic; urgency=low
12
13 * Better i18n support. Thanks Loïc Minier and Juanje Ojeda Croissier!
14
15=== modified file 'debian/control'
16--- debian/control 2009-06-26 22:06:31 +0000
17+++ debian/control 2009-07-23 16:24:48 +0000
18@@ -33,7 +33,7 @@
19
20 Package: usb-creator-gtk
21 Architecture: all
22-Depends: ${misc:Depends}, ${python:Depends}, usb-creator-common (= ${source:Version}), gksu, python-gtk2, python-glade2, python-dbus, python-gnome2
23+Depends: ${misc:Depends}, ${python:Depends}, usb-creator-common (= ${source:Version}), gksu, python-gtk2 (>= 2.12), python-dbus, python-gnome2
24 XB-Python-Version: ${python:Versions}
25 Description: Ubuntu USB desktop image creator for GTK
26 This is a simple utility designed to make bootable USB desktop images from
27
28=== modified file 'debian/usb-creator-gtk.install'
29--- debian/usb-creator-gtk.install 2009-06-30 15:29:15 +0000
30+++ debian/usb-creator-gtk.install 2009-07-23 16:24:48 +0000
31@@ -2,5 +2,5 @@
32 usr/lib/python*/*/usbcreator/gtk_frontend.py
33 #usr/lib/python*/*/usbcreator/wrap_label.py
34 usr/share/applications/usb-creator-gtk.desktop
35-usr/share/usb-creator/usbcreator.glade
36+usr/share/usb-creator/usbcreator-gtk.ui
37 usr/share/pixmaps/usb-creator-gtk.png
38
39=== added file 'gui/usbcreator-gtk.ui'
40--- gui/usbcreator-gtk.ui 1970-01-01 00:00:00 +0000
41+++ gui/usbcreator-gtk.ui 2009-07-23 16:24:48 +0000
42@@ -0,0 +1,774 @@
43+<?xml version="1.0"?>
44+<interface>
45+ <!-- interface-requires gtk+ 2.12 -->
46+ <!-- interface-naming-policy toplevel-contextual -->
47+ <object class="GtkAdjustment" id="adjustment1">
48+ <property name="upper">100</property>
49+ <property name="step_increment">1</property>
50+ <property name="page_increment">10</property>
51+ <property name="page_size">10</property>
52+ </object>
53+ <object class="GtkWindow" id="window">
54+ <property name="title" translatable="yes">Make USB Startup Disk</property>
55+ <property name="window_position">center</property>
56+ <signal name="delete_event" handler="quit"/>
57+ <child>
58+ <object class="GtkAlignment" id="alignment1">
59+ <property name="visible">True</property>
60+ <child>
61+ <object class="GtkVBox" id="main_vbox">
62+ <property name="visible">True</property>
63+ <property name="border_width">12</property>
64+ <property name="spacing">18</property>
65+ <child>
66+ <object class="GtkHBox" id="hbox3">
67+ <property name="visible">True</property>
68+ <child>
69+ <object class="GtkLabel" id="label1">
70+ <property name="visible">True</property>
71+ <property name="label" translatable="yes">To try or install Ubuntu from a USB disk, it needs to be set up as a startup disk.</property>
72+ <property name="wrap">True</property>
73+ <property name="selectable">True</property>
74+ </object>
75+ <packing>
76+ <property name="expand">False</property>
77+ <property name="position">0</property>
78+ </packing>
79+ </child>
80+ </object>
81+ <packing>
82+ <property name="expand">False</property>
83+ <property name="position">0</property>
84+ </packing>
85+ </child>
86+ <child>
87+ <object class="GtkVBox" id="source_vbox">
88+ <property name="visible">True</property>
89+ <property name="spacing">6</property>
90+ <child>
91+ <object class="GtkHBox" id="hbox4">
92+ <property name="visible">True</property>
93+ <child>
94+ <object class="GtkLabel" id="label2">
95+ <property name="visible">True</property>
96+ <property name="label" translatable="yes">Source disc image (.iso) or CD:</property>
97+ <property name="selectable">True</property>
98+ </object>
99+ <packing>
100+ <property name="expand">False</property>
101+ <property name="position">0</property>
102+ </packing>
103+ </child>
104+ </object>
105+ <packing>
106+ <property name="expand">False</property>
107+ <property name="position">0</property>
108+ </packing>
109+ </child>
110+ <child>
111+ <object class="GtkScrolledWindow" id="scrolledwindow1">
112+ <property name="visible">True</property>
113+ <property name="can_focus">True</property>
114+ <property name="hscrollbar_policy">never</property>
115+ <property name="vscrollbar_policy">automatic</property>
116+ <property name="shadow_type">in</property>
117+ <child>
118+ <object class="GtkTreeView" id="source_treeview">
119+ <property name="height_request">50</property>
120+ <property name="visible">True</property>
121+ <property name="can_focus">True</property>
122+ <property name="headers_clickable">False</property>
123+ <property name="rubber_banding">True</property>
124+ </object>
125+ </child>
126+ </object>
127+ <packing>
128+ <property name="position">1</property>
129+ </packing>
130+ </child>
131+ <child>
132+ <object class="GtkHBox" id="hbox1">
133+ <property name="visible">True</property>
134+ <child>
135+ <object class="GtkLabel" id="source_status">
136+ <property name="visible">True</property>
137+ </object>
138+ <packing>
139+ <property name="expand">False</property>
140+ <property name="fill">False</property>
141+ <property name="position">1</property>
142+ </packing>
143+ </child>
144+ <child>
145+ <object class="GtkButton" id="add_source_button">
146+ <property name="label" translatable="yes">Other...</property>
147+ <property name="visible">True</property>
148+ <property name="can_focus">True</property>
149+ <property name="receives_default">True</property>
150+ <signal name="clicked" handler="add_file_source_dialog"/>
151+ </object>
152+ <packing>
153+ <property name="expand">False</property>
154+ <property name="fill">False</property>
155+ <property name="pack_type">end</property>
156+ <property name="position">1</property>
157+ </packing>
158+ </child>
159+ </object>
160+ <packing>
161+ <property name="expand">False</property>
162+ <property name="fill">False</property>
163+ <property name="pack_type">end</property>
164+ <property name="position">2</property>
165+ </packing>
166+ </child>
167+ </object>
168+ <packing>
169+ <property name="position">1</property>
170+ </packing>
171+ </child>
172+ <child>
173+ <object class="GtkVBox" id="target_vbox">
174+ <property name="visible">True</property>
175+ <property name="spacing">6</property>
176+ <child>
177+ <object class="GtkHBox" id="hbox5">
178+ <property name="visible">True</property>
179+ <child>
180+ <object class="GtkLabel" id="label3">
181+ <property name="visible">True</property>
182+ <property name="label" translatable="yes">USB disk to use:</property>
183+ <property name="wrap">True</property>
184+ </object>
185+ <packing>
186+ <property name="expand">False</property>
187+ <property name="position">0</property>
188+ </packing>
189+ </child>
190+ </object>
191+ <packing>
192+ <property name="expand">False</property>
193+ <property name="position">0</property>
194+ </packing>
195+ </child>
196+ <child>
197+ <object class="GtkScrolledWindow" id="scrolledwindow2">
198+ <property name="visible">True</property>
199+ <property name="can_focus">True</property>
200+ <property name="hscrollbar_policy">never</property>
201+ <property name="vscrollbar_policy">automatic</property>
202+ <property name="shadow_type">in</property>
203+ <child>
204+ <object class="GtkTreeView" id="dest_treeview">
205+ <property name="height_request">50</property>
206+ <property name="visible">True</property>
207+ <property name="can_focus">True</property>
208+ <property name="headers_clickable">False</property>
209+ </object>
210+ </child>
211+ </object>
212+ <packing>
213+ <property name="position">1</property>
214+ </packing>
215+ </child>
216+ <child>
217+ <object class="GtkHBox" id="hbox7">
218+ <property name="visible">True</property>
219+ <property name="spacing">6</property>
220+ <child>
221+ <object class="GtkHBox" id="hbox8">
222+ <property name="visible">True</property>
223+ <child>
224+ <object class="GtkLabel" id="dest_status">
225+ <property name="visible">True</property>
226+ </object>
227+ <packing>
228+ <property name="expand">False</property>
229+ <property name="fill">False</property>
230+ <property name="position">0</property>
231+ </packing>
232+ </child>
233+ </object>
234+ <packing>
235+ <property name="position">0</property>
236+ </packing>
237+ </child>
238+ <child>
239+ <object class="GtkButton" id="open_dest">
240+ <property name="label">gtk-open</property>
241+ <property name="can_focus">True</property>
242+ <property name="receives_default">True</property>
243+ <property name="use_stock">True</property>
244+ <signal name="clicked" handler="open_dest_folder"/>
245+ </object>
246+ <packing>
247+ <property name="expand">False</property>
248+ <property name="fill">False</property>
249+ <property name="position">1</property>
250+ </packing>
251+ </child>
252+ <child>
253+ <object class="GtkButton" id="format_dest">
254+ <property name="label" translatable="yes">Format</property>
255+ <property name="visible">True</property>
256+ <property name="can_focus">True</property>
257+ <property name="receives_default">True</property>
258+ <signal name="clicked" handler="format_dest_clicked"/>
259+ </object>
260+ <packing>
261+ <property name="expand">False</property>
262+ <property name="fill">False</property>
263+ <property name="position">2</property>
264+ </packing>
265+ </child>
266+ </object>
267+ <packing>
268+ <property name="expand">False</property>
269+ <property name="position">2</property>
270+ </packing>
271+ </child>
272+ </object>
273+ <packing>
274+ <property name="position">2</property>
275+ </packing>
276+ </child>
277+ <child>
278+ <object class="GtkVBox" id="persist_vbox">
279+ <property name="visible">True</property>
280+ <property name="spacing">6</property>
281+ <child>
282+ <object class="GtkHBox" id="hbox6">
283+ <property name="visible">True</property>
284+ <child>
285+ <object class="GtkLabel" id="label4">
286+ <property name="visible">True</property>
287+ <property name="label" translatable="yes">When starting up from this disk, documents and settings will be:</property>
288+ <property name="wrap">True</property>
289+ </object>
290+ <packing>
291+ <property name="expand">False</property>
292+ <property name="position">0</property>
293+ </packing>
294+ </child>
295+ </object>
296+ <packing>
297+ <property name="expand">False</property>
298+ <property name="position">0</property>
299+ </packing>
300+ </child>
301+ <child>
302+ <object class="GtkAlignment" id="alignment2">
303+ <property name="visible">True</property>
304+ <property name="left_padding">6</property>
305+ <child>
306+ <object class="GtkVBox" id="vbox2">
307+ <property name="visible">True</property>
308+ <property name="spacing">12</property>
309+ <child>
310+ <object class="GtkVBox" id="persist_enabled_vbox">
311+ <property name="visible">True</property>
312+ <property name="spacing">3</property>
313+ <child>
314+ <object class="GtkRadioButton" id="persist_enabled">
315+ <property name="label" translatable="yes">Stored in reserved extra space</property>
316+ <property name="visible">True</property>
317+ <property name="can_focus">True</property>
318+ <property name="receives_default">False</property>
319+ <property name="active">True</property>
320+ <property name="draw_indicator">True</property>
321+ </object>
322+ <packing>
323+ <property name="expand">False</property>
324+ <property name="position">0</property>
325+ </packing>
326+ </child>
327+ <child>
328+ <object class="GtkAlignment" id="alignment3">
329+ <property name="visible">True</property>
330+ <property name="left_padding">23</property>
331+ <child>
332+ <object class="GtkHBox" id="hbox2">
333+ <property name="visible">True</property>
334+ <property name="spacing">6</property>
335+ <child>
336+ <object class="GtkLabel" id="label5">
337+ <property name="visible">True</property>
338+ <property name="label" translatable="yes">How much:</property>
339+ </object>
340+ <packing>
341+ <property name="expand">False</property>
342+ <property name="position">1</property>
343+ </packing>
344+ </child>
345+ <child>
346+ <object class="GtkHScale" id="persist_value">
347+ <property name="visible">True</property>
348+ <property name="can_focus">True</property>
349+ <property name="adjustment">adjustment1</property>
350+ <property name="restrict_to_fill_level">False</property>
351+ <property name="digits">0</property>
352+ <property name="value_pos">right</property>
353+ </object>
354+ <packing>
355+ <property name="pack_type">end</property>
356+ <property name="position">1</property>
357+ </packing>
358+ </child>
359+ </object>
360+ </child>
361+ </object>
362+ <packing>
363+ <property name="position">1</property>
364+ </packing>
365+ </child>
366+ </object>
367+ <packing>
368+ <property name="position">0</property>
369+ </packing>
370+ </child>
371+ <child>
372+ <object class="GtkRadioButton" id="persist_disabled">
373+ <property name="label" translatable="yes">Discarded on shutdown, unless you save them elsewhere</property>
374+ <property name="visible">True</property>
375+ <property name="can_focus">True</property>
376+ <property name="receives_default">False</property>
377+ <property name="active">True</property>
378+ <property name="draw_indicator">True</property>
379+ <property name="group">persist_enabled</property>
380+ </object>
381+ <packing>
382+ <property name="expand">False</property>
383+ <property name="pack_type">end</property>
384+ <property name="position">1</property>
385+ </packing>
386+ </child>
387+ </object>
388+ </child>
389+ </object>
390+ <packing>
391+ <property name="expand">False</property>
392+ <property name="fill">False</property>
393+ <property name="position">1</property>
394+ </packing>
395+ </child>
396+ </object>
397+ <packing>
398+ <property name="expand">False</property>
399+ <property name="fill">False</property>
400+ <property name="position">3</property>
401+ </packing>
402+ </child>
403+ <child>
404+ <object class="GtkHButtonBox" id="hbuttonbox1">
405+ <property name="visible">True</property>
406+ <property name="layout_style">end</property>
407+ <child>
408+ <object class="GtkButton" id="button_quit">
409+ <property name="label">gtk-quit</property>
410+ <property name="visible">True</property>
411+ <property name="can_focus">True</property>
412+ <property name="receives_default">True</property>
413+ <property name="border_width">4</property>
414+ <property name="use_stock">True</property>
415+ <signal name="clicked" handler="quit"/>
416+ </object>
417+ <packing>
418+ <property name="expand">False</property>
419+ <property name="fill">False</property>
420+ <property name="position">0</property>
421+ </packing>
422+ </child>
423+ <child>
424+ <object class="GtkButton" id="button_install">
425+ <property name="label" translatable="yes">Make Startup Disk</property>
426+ <property name="visible">True</property>
427+ <property name="can_focus">True</property>
428+ <property name="receives_default">True</property>
429+ <property name="border_width">4</property>
430+ <signal name="clicked" handler="install"/>
431+ </object>
432+ <packing>
433+ <property name="expand">False</property>
434+ <property name="fill">False</property>
435+ <property name="position">1</property>
436+ </packing>
437+ </child>
438+ </object>
439+ <packing>
440+ <property name="expand">False</property>
441+ <property name="position">4</property>
442+ </packing>
443+ </child>
444+ </object>
445+ </child>
446+ </object>
447+ </child>
448+ </object>
449+ <object class="GtkWindow" id="install_window">
450+ <property name="border_width">12</property>
451+ <property name="title">Installing</property>
452+ <property name="resizable">False</property>
453+ <property name="modal">True</property>
454+ <property name="window_position">center-always</property>
455+ <property name="deletable">False</property>
456+ <child>
457+ <object class="GtkVBox" id="vbox35">
458+ <property name="visible">True</property>
459+ <property name="spacing">6</property>
460+ <child>
461+ <object class="GtkLabel" id="progress_title">
462+ <property name="visible">True</property>
463+ <property name="can_focus">True</property>
464+ <property name="xalign">0</property>
465+ <property name="use_markup">True</property>
466+ <property name="selectable">True</property>
467+ <property name="ellipsize">end</property>
468+ </object>
469+ <packing>
470+ <property name="expand">False</property>
471+ <property name="padding">6</property>
472+ <property name="position">0</property>
473+ </packing>
474+ </child>
475+ <child>
476+ <object class="GtkProgressBar" id="progress_bar">
477+ <property name="width_request">400</property>
478+ <property name="visible">True</property>
479+ <property name="pulse_step">0.10000000149011612</property>
480+ </object>
481+ <packing>
482+ <property name="expand">False</property>
483+ <property name="fill">False</property>
484+ <property name="position">1</property>
485+ </packing>
486+ </child>
487+ <child>
488+ <object class="GtkHBox" id="hbox37">
489+ <property name="visible">True</property>
490+ <property name="spacing">6</property>
491+ <child>
492+ <object class="GtkLabel" id="progress_info">
493+ <property name="visible">True</property>
494+ <property name="can_focus">True</property>
495+ <property name="xalign">0</property>
496+ <property name="ypad">6</property>
497+ <property name="use_markup">True</property>
498+ <property name="selectable">True</property>
499+ <property name="ellipsize">end</property>
500+ </object>
501+ <packing>
502+ <property name="position">0</property>
503+ </packing>
504+ </child>
505+ <child>
506+ <object class="GtkButton" id="progress_cancel_button">
507+ <property name="label">gtk-cancel</property>
508+ <property name="visible">True</property>
509+ <property name="can_focus">True</property>
510+ <property name="receives_default">False</property>
511+ <property name="use_stock">True</property>
512+ </object>
513+ <packing>
514+ <property name="expand">False</property>
515+ <property name="fill">False</property>
516+ <property name="pack_type">end</property>
517+ <property name="position">1</property>
518+ </packing>
519+ </child>
520+ </object>
521+ <packing>
522+ <property name="expand">False</property>
523+ <property name="position">2</property>
524+ </packing>
525+ </child>
526+ </object>
527+ </child>
528+ </object>
529+ <object class="GtkDialog" id="warning_dialog">
530+ <property name="can_focus">True</property>
531+ <property name="title" translatable="yes">Quit the installation?</property>
532+ <property name="resizable">False</property>
533+ <property name="modal">True</property>
534+ <property name="window_position">center</property>
535+ <property name="icon_name">gtk-dialog-warning</property>
536+ <property name="type_hint">dialog</property>
537+ <property name="gravity">center</property>
538+ <child internal-child="vbox">
539+ <object class="GtkVBox" id="dialog-vbox10">
540+ <property name="visible">True</property>
541+ <child>
542+ <object class="GtkHBox" id="hbox27">
543+ <property name="visible">True</property>
544+ <child>
545+ <object class="GtkImage" id="image3">
546+ <property name="visible">True</property>
547+ <property name="ypad">2</property>
548+ <property name="icon_name">gtk-dialog-warning</property>
549+ <property name="icon-size">6</property>
550+ </object>
551+ <packing>
552+ <property name="padding">5</property>
553+ <property name="position">0</property>
554+ </packing>
555+ </child>
556+ <child>
557+ <object class="GtkFrame" id="frame5">
558+ <property name="visible">True</property>
559+ <property name="border_width">10</property>
560+ <property name="label_xalign">0</property>
561+ <property name="shadow_type">none</property>
562+ <child>
563+ <object class="GtkAlignment" id="alignment8">
564+ <property name="visible">True</property>
565+ <property name="left_padding">12</property>
566+ <child>
567+ <object class="GtkLabel" id="warning_dialog_label">
568+ <property name="visible">True</property>
569+ <property name="can_focus">True</property>
570+ <property name="label" translatable="yes">Do you really want to quit the installation now?</property>
571+ <property name="wrap">True</property>
572+ <property name="selectable">True</property>
573+ </object>
574+ </child>
575+ </object>
576+ </child>
577+ </object>
578+ <packing>
579+ <property name="position">1</property>
580+ </packing>
581+ </child>
582+ </object>
583+ <packing>
584+ <property name="position">2</property>
585+ </packing>
586+ </child>
587+ <child internal-child="action_area">
588+ <object class="GtkHButtonBox" id="dialog-action_area10">
589+ <property name="visible">True</property>
590+ <property name="layout_style">end</property>
591+ <child>
592+ <object class="GtkButton" id="cancelbutton">
593+ <property name="label">gtk-cancel</property>
594+ <property name="visible">True</property>
595+ <property name="can_focus">True</property>
596+ <property name="can_default">True</property>
597+ <property name="receives_default">False</property>
598+ <property name="use_stock">True</property>
599+ </object>
600+ <packing>
601+ <property name="expand">False</property>
602+ <property name="fill">False</property>
603+ <property name="position">0</property>
604+ </packing>
605+ </child>
606+ <child>
607+ <object class="GtkButton" id="exitbutton">
608+ <property name="label">gtk-quit</property>
609+ <property name="visible">True</property>
610+ <property name="can_focus">True</property>
611+ <property name="can_default">True</property>
612+ <property name="receives_default">False</property>
613+ <property name="use_stock">True</property>
614+ </object>
615+ <packing>
616+ <property name="expand">False</property>
617+ <property name="fill">False</property>
618+ <property name="position">1</property>
619+ </packing>
620+ </child>
621+ </object>
622+ <packing>
623+ <property name="expand">False</property>
624+ <property name="pack_type">end</property>
625+ <property name="position">0</property>
626+ </packing>
627+ </child>
628+ </object>
629+ </child>
630+ <action-widgets>
631+ <action-widget response="-6">cancelbutton</action-widget>
632+ <action-widget response="-7">exitbutton</action-widget>
633+ </action-widgets>
634+ </object>
635+ <object class="GtkDialog" id="finished_dialog">
636+ <property name="can_focus">True</property>
637+ <property name="title" translatable="yes">Installation Complete</property>
638+ <property name="resizable">False</property>
639+ <property name="modal">True</property>
640+ <property name="window_position">center</property>
641+ <property name="icon_name">gtk-dialog-info</property>
642+ <property name="type_hint">dialog</property>
643+ <property name="gravity">center</property>
644+ <child internal-child="vbox">
645+ <object class="GtkVBox" id="dialog-vbox3">
646+ <property name="visible">True</property>
647+ <child>
648+ <object class="GtkHBox" id="hbox9">
649+ <property name="visible">True</property>
650+ <child>
651+ <object class="GtkImage" id="image1">
652+ <property name="visible">True</property>
653+ <property name="ypad">2</property>
654+ <property name="icon_name">gtk-dialog-info</property>
655+ <property name="icon-size">6</property>
656+ </object>
657+ <packing>
658+ <property name="padding">5</property>
659+ <property name="position">0</property>
660+ </packing>
661+ </child>
662+ <child>
663+ <object class="GtkFrame" id="frame1">
664+ <property name="visible">True</property>
665+ <property name="border_width">10</property>
666+ <property name="label_xalign">0</property>
667+ <property name="shadow_type">none</property>
668+ <child>
669+ <object class="GtkAlignment" id="alignment3">
670+ <property name="visible">True</property>
671+ <property name="left_padding">12</property>
672+ <child>
673+ <object class="GtkLabel" id="finished_dialog_label">
674+ <property name="visible">True</property>
675+ <property name="can_focus">True</property>
676+ <property name="label" translatable="yes">Installation is complete. You may now run Ubuntu on other computers by booting them with this USB thumb drive inserted.</property>
677+ <property name="wrap">True</property>
678+ <property name="selectable">True</property>
679+ </object>
680+ </child>
681+ </object>
682+ </child>
683+ </object>
684+ <packing>
685+ <property name="position">1</property>
686+ </packing>
687+ </child>
688+ </object>
689+ <packing>
690+ <property name="position">2</property>
691+ </packing>
692+ </child>
693+ <child internal-child="action_area">
694+ <object class="GtkHButtonBox" id="dialog-action_area3">
695+ <property name="visible">True</property>
696+ <property name="layout_style">end</property>
697+ <child>
698+ <object class="GtkButton" id="exitbutton1">
699+ <property name="label">gtk-quit</property>
700+ <property name="visible">True</property>
701+ <property name="can_focus">True</property>
702+ <property name="can_default">True</property>
703+ <property name="receives_default">False</property>
704+ <property name="use_stock">True</property>
705+ </object>
706+ <packing>
707+ <property name="expand">False</property>
708+ <property name="fill">False</property>
709+ <property name="position">0</property>
710+ </packing>
711+ </child>
712+ </object>
713+ <packing>
714+ <property name="expand">False</property>
715+ <property name="pack_type">end</property>
716+ <property name="position">0</property>
717+ </packing>
718+ </child>
719+ </object>
720+ </child>
721+ <action-widgets>
722+ <action-widget response="-7">exitbutton1</action-widget>
723+ </action-widgets>
724+ </object>
725+ <object class="GtkDialog" id="failed_dialog">
726+ <property name="can_focus">True</property>
727+ <property name="title" translatable="yes">Installation Failed</property>
728+ <property name="resizable">False</property>
729+ <property name="modal">True</property>
730+ <property name="window_position">center</property>
731+ <property name="icon_name">gtk-dialog-error</property>
732+ <property name="type_hint">dialog</property>
733+ <property name="gravity">center</property>
734+ <child internal-child="vbox">
735+ <object class="GtkVBox" id="dialog-vbox5">
736+ <property name="visible">True</property>
737+ <child>
738+ <object class="GtkHBox" id="hbox10">
739+ <property name="visible">True</property>
740+ <child>
741+ <object class="GtkImage" id="image2">
742+ <property name="visible">True</property>
743+ <property name="ypad">2</property>
744+ <property name="icon_name">gtk-dialog-error</property>
745+ <property name="icon-size">6</property>
746+ </object>
747+ <packing>
748+ <property name="padding">5</property>
749+ <property name="position">0</property>
750+ </packing>
751+ </child>
752+ <child>
753+ <object class="GtkFrame" id="frame2">
754+ <property name="visible">True</property>
755+ <property name="border_width">10</property>
756+ <property name="label_xalign">0</property>
757+ <property name="shadow_type">none</property>
758+ <child>
759+ <object class="GtkAlignment" id="alignment4">
760+ <property name="visible">True</property>
761+ <property name="left_padding">12</property>
762+ <child>
763+ <object class="GtkLabel" id="failed_dialog_label">
764+ <property name="visible">True</property>
765+ <property name="can_focus">True</property>
766+ <property name="label" translatable="yes">The installation failed. Please see ~/.usb-creator.log for more details.
767+</property>
768+ <property name="wrap">True</property>
769+ <property name="selectable">True</property>
770+ </object>
771+ </child>
772+ </object>
773+ </child>
774+ </object>
775+ <packing>
776+ <property name="position">1</property>
777+ </packing>
778+ </child>
779+ </object>
780+ <packing>
781+ <property name="position">2</property>
782+ </packing>
783+ </child>
784+ <child internal-child="action_area">
785+ <object class="GtkHButtonBox" id="dialog-action_area5">
786+ <property name="visible">True</property>
787+ <property name="layout_style">end</property>
788+ <child>
789+ <object class="GtkButton" id="exitbutton2">
790+ <property name="label">gtk-quit</property>
791+ <property name="visible">True</property>
792+ <property name="can_focus">True</property>
793+ <property name="can_default">True</property>
794+ <property name="receives_default">False</property>
795+ <property name="use_stock">True</property>
796+ </object>
797+ <packing>
798+ <property name="expand">False</property>
799+ <property name="fill">False</property>
800+ <property name="position">0</property>
801+ </packing>
802+ </child>
803+ </object>
804+ <packing>
805+ <property name="expand">False</property>
806+ <property name="pack_type">end</property>
807+ <property name="position">0</property>
808+ </packing>
809+ </child>
810+ </object>
811+ </child>
812+ <action-widgets>
813+ <action-widget response="-7">exitbutton2</action-widget>
814+ </action-widgets>
815+ </object>
816+</interface>
817
818=== removed file 'gui/usbcreator.glade'
819--- gui/usbcreator.glade 2009-07-10 16:30:01 +0000
820+++ gui/usbcreator.glade 1970-01-01 00:00:00 +0000
821@@ -1,713 +0,0 @@
822-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
823-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
824-<!--Generated with glade3 3.4.5 on Sat Oct 25 08:45:29 2008 -->
825-<glade-interface>
826- <widget class="GtkWindow" id="window">
827- <property name="title" translatable="yes">Make USB Startup Disk</property>
828- <property name="window_position">GTK_WIN_POS_CENTER</property>
829- <signal name="delete_event" handler="quit"/>
830- <child>
831- <widget class="GtkAlignment" id="alignment1">
832- <property name="visible">True</property>
833- <child>
834- <widget class="GtkVBox" id="main_vbox">
835- <property name="visible">True</property>
836- <property name="border_width">12</property>
837- <property name="spacing">18</property>
838- <child>
839- <widget class="GtkHBox" id="hbox3">
840- <property name="visible">True</property>
841- <child>
842- <widget class="GtkLabel" id="label1">
843- <property name="visible">True</property>
844- <property name="label" translatable="yes">To try or install Ubuntu from a USB disk, it needs to be set up as a startup disk.</property>
845- <property name="wrap">True</property>
846- <property name="selectable">True</property>
847- </widget>
848- <packing>
849- <property name="expand">False</property>
850- </packing>
851- </child>
852- </widget>
853- <packing>
854- <property name="expand">False</property>
855- </packing>
856- </child>
857- <child>
858- <widget class="GtkVBox" id="source_vbox">
859- <property name="visible">True</property>
860- <property name="spacing">6</property>
861- <child>
862- <widget class="GtkHBox" id="hbox4">
863- <property name="visible">True</property>
864- <child>
865- <widget class="GtkLabel" id="label2">
866- <property name="visible">True</property>
867- <property name="label" translatable="yes">Source disc image (.iso) or CD:</property>
868- <property name="selectable">True</property>
869- </widget>
870- <packing>
871- <property name="expand">False</property>
872- </packing>
873- </child>
874- </widget>
875- <packing>
876- <property name="expand">False</property>
877- </packing>
878- </child>
879- <child>
880- <widget class="GtkScrolledWindow" id="scrolledwindow1">
881- <property name="visible">True</property>
882- <property name="can_focus">True</property>
883- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
884- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
885- <property name="shadow_type">GTK_SHADOW_IN</property>
886- <child>
887- <widget class="GtkTreeView" id="source_treeview">
888- <property name="height_request">50</property>
889- <property name="visible">True</property>
890- <property name="can_focus">True</property>
891- <property name="headers_clickable">False</property>
892- <property name="rubber_banding">True</property>
893- </widget>
894- </child>
895- </widget>
896- <packing>
897- <property name="position">1</property>
898- </packing>
899- </child>
900- <child>
901- <widget class="GtkHBox" id="hbox1">
902- <property name="visible">True</property>
903- <child>
904- <widget class="GtkLabel" id="source_status">
905- <property name="visible">True</property>
906- </widget>
907- <packing>
908- <property name="expand">False</property>
909- <property name="fill">False</property>
910- <property name="position">1</property>
911- </packing>
912- </child>
913- <child>
914- <widget class="GtkButton" id="add_source_button">
915- <property name="visible">True</property>
916- <property name="can_focus">True</property>
917- <property name="receives_default">True</property>
918- <property name="label" translatable="yes">Other...</property>
919- <property name="response_id">0</property>
920- <signal name="clicked" handler="add_file_source_dialog"/>
921- </widget>
922- <packing>
923- <property name="expand">False</property>
924- <property name="fill">False</property>
925- <property name="pack_type">GTK_PACK_END</property>
926- </packing>
927- </child>
928- </widget>
929- <packing>
930- <property name="expand">False</property>
931- <property name="fill">False</property>
932- <property name="pack_type">GTK_PACK_END</property>
933- <property name="position">2</property>
934- </packing>
935- </child>
936- </widget>
937- <packing>
938- <property name="position">1</property>
939- </packing>
940- </child>
941- <child>
942- <widget class="GtkVBox" id="target_vbox">
943- <property name="visible">True</property>
944- <property name="spacing">6</property>
945- <child>
946- <widget class="GtkHBox" id="hbox5">
947- <property name="visible">True</property>
948- <child>
949- <widget class="GtkLabel" id="label3">
950- <property name="visible">True</property>
951- <property name="label" translatable="yes">USB disk to use:</property>
952- <property name="wrap">True</property>
953- </widget>
954- <packing>
955- <property name="expand">False</property>
956- </packing>
957- </child>
958- </widget>
959- <packing>
960- <property name="expand">False</property>
961- </packing>
962- </child>
963- <child>
964- <widget class="GtkScrolledWindow" id="scrolledwindow2">
965- <property name="visible">True</property>
966- <property name="can_focus">True</property>
967- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
968- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
969- <property name="shadow_type">GTK_SHADOW_IN</property>
970- <child>
971- <widget class="GtkTreeView" id="dest_treeview">
972- <property name="height_request">50</property>
973- <property name="visible">True</property>
974- <property name="can_focus">True</property>
975- <property name="headers_clickable">False</property>
976- </widget>
977- </child>
978- </widget>
979- <packing>
980- <property name="position">1</property>
981- </packing>
982- </child>
983- <child>
984- <widget class="GtkHBox" id="hbox7">
985- <property name="visible">True</property>
986- <property name="spacing">6</property>
987- <child>
988- <widget class="GtkHBox" id="hbox8">
989- <property name="visible">True</property>
990- <child>
991- <widget class="GtkLabel" id="dest_status">
992- <property name="visible">True</property>
993- </widget>
994- <packing>
995- <property name="expand">False</property>
996- <property name="fill">False</property>
997- </packing>
998- </child>
999- </widget>
1000- </child>
1001- <child>
1002- <widget class="GtkButton" id="open_dest">
1003- <property name="can_focus">True</property>
1004- <property name="receives_default">True</property>
1005- <property name="label">gtk-open</property>
1006- <property name="use_stock">True</property>
1007- <property name="response_id">0</property>
1008- <signal name="clicked" handler="open_dest_folder"/>
1009- </widget>
1010- <packing>
1011- <property name="expand">False</property>
1012- <property name="fill">False</property>
1013- <property name="position">1</property>
1014- </packing>
1015- </child>
1016- <child>
1017- <widget class="GtkButton" id="format_dest">
1018- <property name="visible">True</property>
1019- <property name="can_focus">True</property>
1020- <property name="receives_default">True</property>
1021- <property name="label" translatable="yes">Format</property>
1022- <property name="response_id">0</property>
1023- <signal name="clicked" handler="format_dest_clicked"/>
1024- </widget>
1025- <packing>
1026- <property name="expand">False</property>
1027- <property name="fill">False</property>
1028- <property name="position">2</property>
1029- </packing>
1030- </child>
1031- </widget>
1032- <packing>
1033- <property name="expand">False</property>
1034- <property name="position">2</property>
1035- </packing>
1036- </child>
1037- </widget>
1038- <packing>
1039- <property name="position">2</property>
1040- </packing>
1041- </child>
1042- <child>
1043- <widget class="GtkVBox" id="persist_vbox">
1044- <property name="visible">True</property>
1045- <property name="spacing">6</property>
1046- <child>
1047- <widget class="GtkHBox" id="hbox6">
1048- <property name="visible">True</property>
1049- <child>
1050- <widget class="GtkLabel" id="label4">
1051- <property name="visible">True</property>
1052- <property name="label" translatable="yes">When starting up from this disk, documents and settings will be:</property>
1053- <property name="wrap">True</property>
1054- </widget>
1055- <packing>
1056- <property name="expand">False</property>
1057- </packing>
1058- </child>
1059- </widget>
1060- <packing>
1061- <property name="expand">False</property>
1062- </packing>
1063- </child>
1064- <child>
1065- <widget class="GtkAlignment" id="alignment2">
1066- <property name="visible">True</property>
1067- <property name="left_padding">6</property>
1068- <child>
1069- <widget class="GtkVBox" id="vbox2">
1070- <property name="visible">True</property>
1071- <property name="spacing">12</property>
1072- <child>
1073- <widget class="GtkVBox" id="persist_enabled_vbox">
1074- <property name="visible">True</property>
1075- <property name="spacing">3</property>
1076- <child>
1077- <widget class="GtkRadioButton" id="persist_enabled">
1078- <property name="visible">True</property>
1079- <property name="can_focus">True</property>
1080- <property name="label" translatable="yes">Stored in reserved extra space</property>
1081- <property name="response_id">0</property>
1082- <property name="active">True</property>
1083- <property name="draw_indicator">True</property>
1084- </widget>
1085- <packing>
1086- <property name="expand">False</property>
1087- </packing>
1088- </child>
1089- <child>
1090- <widget class="GtkAlignment" id="alignment2">
1091- <property name="visible">True</property>
1092- <property name="left_padding">23</property>
1093- <child>
1094- <widget class="GtkHBox" id="hbox2">
1095- <property name="visible">True</property>
1096- <property name="spacing">6</property>
1097- <child>
1098- <widget class="GtkLabel" id="label5">
1099- <property name="visible">True</property>
1100- <property name="label" translatable="yes">How much:</property>
1101- </widget>
1102- <packing>
1103- <property name="expand">False</property>
1104- <property name="position">1</property>
1105- </packing>
1106- </child>
1107- <child>
1108- <widget class="GtkHScale" id="persist_value">
1109- <property name="visible">True</property>
1110- <property name="can_focus">True</property>
1111- <property name="adjustment">0 0 100 1 10 10</property>
1112- <property name="restrict_to_fill_level">False</property>
1113- <property name="digits">0</property>
1114- <property name="value_pos">GTK_POS_RIGHT</property>
1115- </widget>
1116- <packing>
1117- <property name="pack_type">GTK_PACK_END</property>
1118- <property name="position">1</property>
1119- </packing>
1120- </child>
1121- </widget>
1122- </child>
1123- </widget>
1124- <packing>
1125- <property name="position">1</property>
1126- </packing>
1127- </child>
1128- </widget>
1129- </child>
1130- <child>
1131- <widget class="GtkRadioButton" id="persist_disabled">
1132- <property name="visible">True</property>
1133- <property name="can_focus">True</property>
1134- <property name="label" translatable="yes">Discarded on shutdown, unless you save them elsewhere</property>
1135- <property name="response_id">0</property>
1136- <property name="active">True</property>
1137- <property name="draw_indicator">True</property>
1138- <property name="group">persist_enabled</property>
1139- </widget>
1140- <packing>
1141- <property name="expand">False</property>
1142- <property name="pack_type">GTK_PACK_END</property>
1143- <property name="position">1</property>
1144- </packing>
1145- </child>
1146- </widget>
1147- </child>
1148- </widget>
1149- <packing>
1150- <property name="expand">False</property>
1151- <property name="fill">False</property>
1152- <property name="position">1</property>
1153- </packing>
1154- </child>
1155- </widget>
1156- <packing>
1157- <property name="expand">False</property>
1158- <property name="fill">False</property>
1159- <property name="position">3</property>
1160- </packing>
1161- </child>
1162- <child>
1163- <widget class="GtkHButtonBox" id="hbuttonbox1">
1164- <property name="visible">True</property>
1165- <property name="layout_style">GTK_BUTTONBOX_END</property>
1166- <child>
1167- <widget class="GtkButton" id="button_quit">
1168- <property name="visible">True</property>
1169- <property name="can_focus">True</property>
1170- <property name="receives_default">True</property>
1171- <property name="border_width">4</property>
1172- <property name="label">gtk-quit</property>
1173- <property name="use_stock">True</property>
1174- <property name="response_id">0</property>
1175- <signal name="clicked" handler="quit"/>
1176- </widget>
1177- </child>
1178- <child>
1179- <widget class="GtkButton" id="button_install">
1180- <property name="visible">True</property>
1181- <property name="can_focus">True</property>
1182- <property name="receives_default">True</property>
1183- <property name="border_width">4</property>
1184- <property name="label" translatable="yes">Make Startup Disk</property>
1185- <property name="response_id">0</property>
1186- <signal name="clicked" handler="install"/>
1187- </widget>
1188- <packing>
1189- <property name="expand">False</property>
1190- <property name="position">1</property>
1191- </packing>
1192- </child>
1193- </widget>
1194- <packing>
1195- <property name="expand">False</property>
1196- <property name="position">4</property>
1197- </packing>
1198- </child>
1199- </widget>
1200- </child>
1201- </widget>
1202- </child>
1203- </widget>
1204- <widget class="GtkWindow" id="install_window">
1205- <property name="border_width">12</property>
1206- <property name="title" translatable="yes">Installing</property>
1207- <property name="resizable">False</property>
1208- <property name="modal">True</property>
1209- <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
1210- <property name="deletable">False</property>
1211- <child>
1212- <widget class="GtkVBox" id="vbox35">
1213- <property name="visible">True</property>
1214- <property name="spacing">6</property>
1215- <child>
1216- <widget class="GtkLabel" id="progress_title">
1217- <property name="visible">True</property>
1218- <property name="can_focus">True</property>
1219- <property name="xalign">0</property>
1220- <property name="use_markup">True</property>
1221- <property name="selectable">True</property>
1222- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
1223- </widget>
1224- <packing>
1225- <property name="expand">False</property>
1226- <property name="padding">6</property>
1227- </packing>
1228- </child>
1229- <child>
1230- <widget class="GtkProgressBar" id="progress_bar">
1231- <property name="width_request">400</property>
1232- <property name="visible">True</property>
1233- <property name="pulse_step">0.10000000149011612</property>
1234- </widget>
1235- <packing>
1236- <property name="expand">False</property>
1237- <property name="fill">False</property>
1238- <property name="position">1</property>
1239- </packing>
1240- </child>
1241- <child>
1242- <widget class="GtkHBox" id="hbox37">
1243- <property name="visible">True</property>
1244- <property name="spacing">6</property>
1245- <child>
1246- <widget class="GtkLabel" id="progress_info">
1247- <property name="visible">True</property>
1248- <property name="can_focus">True</property>
1249- <property name="xalign">0</property>
1250- <property name="ypad">6</property>
1251- <property name="use_markup">True</property>
1252- <property name="selectable">True</property>
1253- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
1254- </widget>
1255- </child>
1256- <child>
1257- <widget class="GtkButton" id="progress_cancel_button">
1258- <property name="visible">True</property>
1259- <property name="can_focus">True</property>
1260- <property name="label">gtk-cancel</property>
1261- <property name="use_stock">True</property>
1262- <property name="response_id">0</property>
1263- </widget>
1264- <packing>
1265- <property name="expand">False</property>
1266- <property name="fill">False</property>
1267- <property name="pack_type">GTK_PACK_END</property>
1268- <property name="position">1</property>
1269- </packing>
1270- </child>
1271- </widget>
1272- <packing>
1273- <property name="expand">False</property>
1274- <property name="position">2</property>
1275- </packing>
1276- </child>
1277- </widget>
1278- </child>
1279- </widget>
1280- <widget class="GtkDialog" id="warning_dialog">
1281- <property name="can_focus">True</property>
1282- <property name="title" translatable="yes">Quit the installation?</property>
1283- <property name="resizable">False</property>
1284- <property name="modal">True</property>
1285- <property name="window_position">GTK_WIN_POS_CENTER</property>
1286- <property name="icon_name">gtk-dialog-warning</property>
1287- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
1288- <property name="gravity">GDK_GRAVITY_CENTER</property>
1289- <child internal-child="vbox">
1290- <widget class="GtkVBox" id="dialog-vbox10">
1291- <property name="visible">True</property>
1292- <child>
1293- <widget class="GtkHBox" id="hbox27">
1294- <property name="visible">True</property>
1295- <child>
1296- <widget class="GtkImage" id="image3">
1297- <property name="visible">True</property>
1298- <property name="ypad">2</property>
1299- <property name="icon_size">6</property>
1300- <property name="icon_name">gtk-dialog-warning</property>
1301- </widget>
1302- <packing>
1303- <property name="padding">5</property>
1304- </packing>
1305- </child>
1306- <child>
1307- <widget class="GtkFrame" id="frame5">
1308- <property name="visible">True</property>
1309- <property name="border_width">10</property>
1310- <property name="label_xalign">0</property>
1311- <property name="shadow_type">GTK_SHADOW_NONE</property>
1312- <child>
1313- <widget class="GtkAlignment" id="alignment8">
1314- <property name="visible">True</property>
1315- <property name="left_padding">12</property>
1316- <child>
1317- <widget class="GtkLabel" id="warning_dialog_label">
1318- <property name="visible">True</property>
1319- <property name="can_focus">True</property>
1320- <property name="label" translatable="yes">Do you really want to quit the installation now?</property>
1321- <property name="wrap">True</property>
1322- <property name="selectable">True</property>
1323- </widget>
1324- </child>
1325- </widget>
1326- </child>
1327- </widget>
1328- <packing>
1329- <property name="position">1</property>
1330- </packing>
1331- </child>
1332- </widget>
1333- <packing>
1334- <property name="position">2</property>
1335- </packing>
1336- </child>
1337- <child internal-child="action_area">
1338- <widget class="GtkHButtonBox" id="dialog-action_area10">
1339- <property name="visible">True</property>
1340- <property name="layout_style">GTK_BUTTONBOX_END</property>
1341- <child>
1342- <widget class="GtkButton" id="cancelbutton">
1343- <property name="visible">True</property>
1344- <property name="can_focus">True</property>
1345- <property name="can_default">True</property>
1346- <property name="label">gtk-cancel</property>
1347- <property name="use_stock">True</property>
1348- <property name="response_id">-6</property>
1349- </widget>
1350- </child>
1351- <child>
1352- <widget class="GtkButton" id="exitbutton">
1353- <property name="visible">True</property>
1354- <property name="can_focus">True</property>
1355- <property name="can_default">True</property>
1356- <property name="label">gtk-quit</property>
1357- <property name="use_stock">True</property>
1358- <property name="response_id">-7</property>
1359- </widget>
1360- <packing>
1361- <property name="position">1</property>
1362- </packing>
1363- </child>
1364- </widget>
1365- <packing>
1366- <property name="expand">False</property>
1367- <property name="pack_type">GTK_PACK_END</property>
1368- </packing>
1369- </child>
1370- </widget>
1371- </child>
1372- </widget>
1373- <widget class="GtkDialog" id="finished_dialog">
1374- <property name="can_focus">True</property>
1375- <property name="title" translatable="yes">Installation Complete</property>
1376- <property name="resizable">False</property>
1377- <property name="modal">True</property>
1378- <property name="window_position">GTK_WIN_POS_CENTER</property>
1379- <property name="icon_name">gtk-dialog-info</property>
1380- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
1381- <property name="gravity">GDK_GRAVITY_CENTER</property>
1382- <child internal-child="vbox">
1383- <widget class="GtkVBox" id="dialog-vbox3">
1384- <property name="visible">True</property>
1385- <child>
1386- <widget class="GtkHBox" id="hbox9">
1387- <property name="visible">True</property>
1388- <child>
1389- <widget class="GtkImage" id="image1">
1390- <property name="visible">True</property>
1391- <property name="ypad">2</property>
1392- <property name="icon_size">6</property>
1393- <property name="icon_name">gtk-dialog-info</property>
1394- </widget>
1395- <packing>
1396- <property name="padding">5</property>
1397- </packing>
1398- </child>
1399- <child>
1400- <widget class="GtkFrame" id="frame1">
1401- <property name="visible">True</property>
1402- <property name="border_width">10</property>
1403- <property name="label_xalign">0</property>
1404- <property name="shadow_type">GTK_SHADOW_NONE</property>
1405- <child>
1406- <widget class="GtkAlignment" id="alignment3">
1407- <property name="visible">True</property>
1408- <property name="left_padding">12</property>
1409- <child>
1410- <widget class="GtkLabel" id="finished_dialog_label">
1411- <property name="visible">True</property>
1412- <property name="can_focus">True</property>
1413- <property name="label" translatable="yes">Installation is complete. You may now run Ubuntu on other computers by booting them with this USB thumb drive inserted.</property>
1414- <property name="wrap">True</property>
1415- <property name="selectable">True</property>
1416- </widget>
1417- </child>
1418- </widget>
1419- </child>
1420- </widget>
1421- <packing>
1422- <property name="position">1</property>
1423- </packing>
1424- </child>
1425- </widget>
1426- <packing>
1427- <property name="position">2</property>
1428- </packing>
1429- </child>
1430- <child internal-child="action_area">
1431- <widget class="GtkHButtonBox" id="dialog-action_area3">
1432- <property name="visible">True</property>
1433- <property name="layout_style">GTK_BUTTONBOX_END</property>
1434- <child>
1435- <widget class="GtkButton" id="exitbutton1">
1436- <property name="visible">True</property>
1437- <property name="can_focus">True</property>
1438- <property name="can_default">True</property>
1439- <property name="label">gtk-quit</property>
1440- <property name="use_stock">True</property>
1441- <property name="response_id">-7</property>
1442- </widget>
1443- </child>
1444- </widget>
1445- <packing>
1446- <property name="expand">False</property>
1447- <property name="pack_type">GTK_PACK_END</property>
1448- </packing>
1449- </child>
1450- </widget>
1451- </child>
1452- </widget>
1453- <widget class="GtkDialog" id="failed_dialog">
1454- <property name="can_focus">True</property>
1455- <property name="title" translatable="yes">Installation Failed</property>
1456- <property name="resizable">False</property>
1457- <property name="modal">True</property>
1458- <property name="window_position">GTK_WIN_POS_CENTER</property>
1459- <property name="icon_name">gtk-dialog-error</property>
1460- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
1461- <property name="gravity">GDK_GRAVITY_CENTER</property>
1462- <child internal-child="vbox">
1463- <widget class="GtkVBox" id="dialog-vbox5">
1464- <property name="visible">True</property>
1465- <child>
1466- <widget class="GtkHBox" id="hbox10">
1467- <property name="visible">True</property>
1468- <child>
1469- <widget class="GtkImage" id="image2">
1470- <property name="visible">True</property>
1471- <property name="ypad">2</property>
1472- <property name="icon_size">6</property>
1473- <property name="icon_name">gtk-dialog-error</property>
1474- </widget>
1475- <packing>
1476- <property name="padding">5</property>
1477- </packing>
1478- </child>
1479- <child>
1480- <widget class="GtkFrame" id="frame2">
1481- <property name="visible">True</property>
1482- <property name="border_width">10</property>
1483- <property name="label_xalign">0</property>
1484- <property name="shadow_type">GTK_SHADOW_NONE</property>
1485- <child>
1486- <widget class="GtkAlignment" id="alignment4">
1487- <property name="visible">True</property>
1488- <property name="left_padding">12</property>
1489- <child>
1490- <widget class="GtkLabel" id="failed_dialog_label">
1491- <property name="visible">True</property>
1492- <property name="can_focus">True</property>
1493- <property name="label" translatable="yes">The installation failed. Please see ~/.usb-creator.log for more details.
1494-</property>
1495- <property name="wrap">True</property>
1496- <property name="selectable">True</property>
1497- </widget>
1498- </child>
1499- </widget>
1500- </child>
1501- </widget>
1502- <packing>
1503- <property name="position">1</property>
1504- </packing>
1505- </child>
1506- </widget>
1507- <packing>
1508- <property name="position">2</property>
1509- </packing>
1510- </child>
1511- <child internal-child="action_area">
1512- <widget class="GtkHButtonBox" id="dialog-action_area5">
1513- <property name="visible">True</property>
1514- <property name="layout_style">GTK_BUTTONBOX_END</property>
1515- <child>
1516- <widget class="GtkButton" id="exitbutton2">
1517- <property name="visible">True</property>
1518- <property name="can_focus">True</property>
1519- <property name="can_default">True</property>
1520- <property name="label">gtk-quit</property>
1521- <property name="use_stock">True</property>
1522- <property name="response_id">-7</property>
1523- </widget>
1524- </child>
1525- </widget>
1526- <packing>
1527- <property name="expand">False</property>
1528- <property name="pack_type">GTK_PACK_END</property>
1529- </packing>
1530- </child>
1531- </widget>
1532- </child>
1533- </widget>
1534-</glade-interface>
1535
1536=== modified file 'po/POTFILES.in'
1537--- po/POTFILES.in 2009-06-26 22:06:31 +0000
1538+++ po/POTFILES.in 2009-07-23 16:24:48 +0000
1539@@ -8,6 +8,6 @@
1540 ./usbcreator/kde_about.py
1541 ./usbcreator/kde_frontend.py
1542 ./gui/usbcreator.ui
1543-./gui/usbcreator.glade
1544+./gui/usbcreator-gtk.ui
1545 ./desktop/usb-creator-gtk.desktop.in
1546 ./desktop/usb-creator-kde.desktop.in
1547
1548=== modified file 'setup.py'
1549--- setup.py 2009-06-26 22:06:31 +0000
1550+++ setup.py 2009-07-23 16:24:48 +0000
1551@@ -9,7 +9,7 @@
1552 author_email='evand@ubuntu.com',
1553 packages=['usbcreator'],
1554 scripts=['bin/usb-creator-gtk','bin/usb-creator-kde'],
1555- data_files=[('share/usb-creator', ['gui/usbcreator.glade', 'scripts/install.py']),
1556+ data_files=[('share/usb-creator', ['gui/usbcreator-gtk.ui', 'scripts/install.py']),
1557 ('share/pixmaps', ['desktop/usb-creator-gtk.png', 'desktop/usb-creator-kde.png']),
1558 ('share/kde4/apps/usb-creator-kde', ['gui/usbcreator.ui'])],
1559 cmdclass = { "build" : build_extra.build_extra,
1560
1561=== modified file 'usbcreator/gtk_frontend.py'
1562--- usbcreator/gtk_frontend.py 2009-06-26 22:06:31 +0000
1563+++ usbcreator/gtk_frontend.py 2009-07-23 16:24:48 +0000
1564@@ -21,7 +21,7 @@
1565 import locale
1566 import pygtk
1567 import gobject
1568-import gtk.glade
1569+import gtk
1570 import gnomevfs
1571 import logging
1572
1573@@ -45,32 +45,25 @@
1574 def __init__(self, img=None, persistent=True):
1575
1576 locale.setlocale(locale.LC_ALL, '')
1577- for module in gtk.glade, gettext:
1578- module.bindtextdomain('usbcreator', LOCALEDIR)
1579- module.textdomain('usbcreator')
1580+ gettext.bindtextdomain('usbcreator', LOCALEDIR)
1581+ gettext.textdomain('usbcreator')
1582
1583 import __builtin__
1584 __builtin__._ = gettext.gettext
1585
1586 self.all_widgets = set()
1587
1588- self.glade = gtk.glade.XML('/usr/share/usb-creator/usbcreator.glade')
1589- for widget in self.glade.get_widget_prefix(""):
1590- # Taken from ubiquity:
1591- # We generally want labels to be selectable so that people can
1592- # easily report problems in them
1593- # (https://launchpad.net/bugs/41618), but GTK+ likes to put
1594- # selectable labels in the focus chain, and I can't seem to turn
1595- # this off in glade and have it stick. Accordingly, make sure
1596- # labels are unfocusable here.
1597- if isinstance(widget, gtk.Label):
1598- widget.set_property('can-focus', False)
1599- self.all_widgets.add(widget)
1600- setattr(self, widget.get_name(), widget)
1601+ self.builder = gtk.Builder()
1602+ self.builder.set_translation_domain('usbcreator')
1603+ self.builder.add_from_file('/usr/share/usb-creator/usbcreator-gtk.ui')
1604
1605+ for widget in self.builder.get_objects():
1606+ if issubclass(type(widget), gtk.Widget):
1607+ self.all_widgets.add(widget)
1608+ setattr(self, gtk.Widget.get_name(widget), widget)
1609
1610 gtk.window_set_default_icon_from_file('/usr/share/pixmaps/usb-creator-gtk.png')
1611- self.glade.signal_autoconnect(self)
1612+ self.builder.connect_signals (self, None)
1613 self.cancelbutton.connect('clicked', lambda x: self.warning_dialog.hide())
1614 self.exitbutton.connect('clicked', lambda x: self.abort())
1615 self.progress_cancel_button.connect('clicked', lambda x: self.warning_dialog.show())

Subscribers

People subscribed via source and target branches