Checkbox

Merge lp://qastaging/~eeejay/checkbox/gtkbuilder into lp://qastaging/checkbox

  1. gtkbuilder
  2. Merge into trunk
Proposed by Eitan Isaacson
Status: Merged
Merge reported by: Marc Tardif
Merged at revision: not available
Proposed branch: lp://qastaging/~eeejay/checkbox/gtkbuilder
Merge into: lp://qastaging/checkbox
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~eeejay/checkbox/gtkbuilder
Reviewer Review Type Date Requested Status
Martin Pitt (community) Needs Fixing
Marc Tardif (community) Needs Information
Review via email: mp+7391@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Eitan Isaacson (eeejay) wrote :

Migrated to gtkbuilder and added a catalog file for glade-3 support of HyperTextView. To edit in glade-3 the following command is required:

GLADE_CATALOG_PATH=./gtk glade-3 gtk/checkbox-gtk.ui

Revision history for this message
Marc Tardif (cr3) wrote :

This needs to be tested on the currently supported releases of Ubuntu. Considering Dapper will be EOL on July 1st and Gutsy very soon, I would just make sure to at least test on Hardy.

Revision history for this message
Marc Tardif (cr3) :
review: Needs Information
lp://qastaging/~eeejay/checkbox/gtkbuilder updated
548. By Eitan Isaacson

merge from trunk

Revision history for this message
Martin Pitt (pitti) wrote :

Any chance that this can get merged soon? glade has been obsoleted for a long time, and this is also blocking migration to gobject-introspection.

It doesn't apply well any more, though.

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'checkbox_gtk/gtk_interface.py'
2--- checkbox_gtk/gtk_interface.py 2009-06-10 22:47:03 +0000
3+++ checkbox_gtk/gtk_interface.py 2009-06-12 17:00:39 +0000
4@@ -17,7 +17,7 @@
5 # along with Checkbox. If not, see <http://www.gnu.org/licenses/>.
6 #
7 import re
8-import gtk, gtk.glade
9+import gtk
10 import posixpath
11
12 from gettext import gettext as _
13@@ -54,10 +54,11 @@
14
15 # Load UI
16 gtk.window_set_default_icon_name("checkbox")
17- gtk.glade.textdomain(self.gettext_domain)
18- self.widgets = gtk.glade.XML(posixpath.join(data_path,
19- "checkbox-gtk.glade"))
20- self.widgets.signal_autoconnect(self)
21+ self.widgets = gtk.Builder()
22+ self.widgets.set_translation_domain(self.gettext_domain)
23+ self.widgets.add_from_file(
24+ posixpath.join(data_path, "checkbox-gtk.ui"))
25+ self.widgets.connect_signals(self)
26
27 # Set background color for head
28 eventbox_head = self._get_widget("eventbox_head")
29@@ -78,7 +79,7 @@
30 self._handler_id = None
31
32 def _get_widget(self, name):
33- return self.widgets.get_widget(name)
34+ return self.widgets.get_object(name)
35
36 def _get_radio_button(self, map):
37 for radio_button, value in map.items():
38
39=== modified file 'debian/control'
40--- debian/control 2009-03-25 03:19:48 +0000
41+++ debian/control 2009-06-12 17:00:39 +0000
42@@ -39,7 +39,7 @@
43 Architecture: all
44 Replaces: hwtest-gtk (<< 0.1-0ubuntu12)
45 Provides: hwtest-gtk
46-Depends: checkbox, gksu, python-gtk2, python-glade2
47+Depends: checkbox, gksu, python-gtk2
48 Conflicts: hwtest-gtk (<< 0.1-0ubuntu12)
49 XB-Python-Version: ${python:Versions}
50 Description: Checkbox GTK Interface
51
52=== renamed file 'gtk/checkbox-gtk.glade' => 'gtk/checkbox-gtk.ui'
53--- gtk/checkbox-gtk.glade 2009-06-10 22:47:03 +0000
54+++ gtk/checkbox-gtk.ui 2009-06-12 19:04:09 +0000
55@@ -1,693 +1,435 @@
56-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
57-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
58-
59-<glade-interface>
60-
61-<widget class="GtkDialog" id="dialog_main">
62- <property name="width_request">450</property>
63- <property name="height_request">400</property>
64- <property name="visible">True</property>
65- <property name="title" translatable="yes">System Testing</property>
66- <property name="type">GTK_WINDOW_TOPLEVEL</property>
67- <property name="window_position">GTK_WIN_POS_NONE</property>
68- <property name="modal">False</property>
69- <property name="default_width">450</property>
70- <property name="default_height">400</property>
71- <property name="resizable">True</property>
72- <property name="destroy_with_parent">False</property>
73- <property name="icon_name">checkbox</property>
74- <property name="decorated">True</property>
75- <property name="skip_taskbar_hint">False</property>
76- <property name="skip_pager_hint">False</property>
77- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
78- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
79- <property name="focus_on_map">True</property>
80- <property name="urgency_hint">False</property>
81-
82- <child internal-child="vbox">
83- <widget class="GtkVBox" id="dialog-vbox">
84- <property name="visible">True</property>
85- <property name="homogeneous">False</property>
86- <property name="spacing">0</property>
87-
88- <child internal-child="action_area">
89- <widget class="GtkHButtonBox" id="dialog-action_area">
90- <property name="visible">True</property>
91- <property name="layout_style">GTK_BUTTONBOX_END</property>
92-
93- <child>
94- <widget class="GtkButton" id="button_previous">
95- <property name="visible">True</property>
96- <property name="can_default">True</property>
97- <property name="can_focus">True</property>
98- <property name="label" translatable="yes">_Previous</property>
99- <property name="use_underline">True</property>
100- <property name="relief">GTK_RELIEF_NORMAL</property>
101- <property name="focus_on_click">True</property>
102- <property name="response_id">-1</property>
103- </widget>
104- </child>
105-
106- <child>
107- <widget class="GtkButton" id="button_next">
108- <property name="visible">True</property>
109- <property name="can_default">True</property>
110- <property name="can_focus">True</property>
111- <property name="label" translatable="yes">Ne_xt</property>
112- <property name="use_underline">True</property>
113- <property name="relief">GTK_RELIEF_NORMAL</property>
114- <property name="focus_on_click">True</property>
115- <property name="response_id">1</property>
116- </widget>
117- </child>
118- </widget>
119- <packing>
120- <property name="padding">0</property>
121- <property name="expand">False</property>
122- <property name="fill">True</property>
123- <property name="pack_type">GTK_PACK_END</property>
124- </packing>
125- </child>
126-
127- <child>
128- <widget class="GtkEventBox" id="eventbox_head">
129- <property name="visible">True</property>
130- <property name="events">GDK_EXPOSURE_MASK</property>
131- <property name="visible_window">True</property>
132- <property name="above_child">False</property>
133-
134- <child>
135- <widget class="GtkImage" id="image_head">
136- <property name="visible">True</property>
137- <property name="pixbuf">checkbox-gtk-head.png</property>
138- <property name="xalign">0.5</property>
139- <property name="yalign">0</property>
140- <property name="xpad">0</property>
141- <property name="ypad">0</property>
142- </widget>
143- </child>
144- </widget>
145- <packing>
146- <property name="padding">0</property>
147- <property name="expand">False</property>
148- <property name="fill">True</property>
149- </packing>
150- </child>
151-
152- <child>
153- <widget class="GtkNotebook" id="notebook_main">
154- <property name="visible">True</property>
155- <property name="show_tabs">False</property>
156- <property name="show_border">False</property>
157- <property name="tab_pos">GTK_POS_TOP</property>
158- <property name="scrollable">False</property>
159- <property name="enable_popup">False</property>
160-
161- <child>
162- <widget class="GtkVBox" id="vbox_text">
163- <property name="visible">True</property>
164- <property name="homogeneous">False</property>
165- <property name="spacing">0</property>
166-
167- <child>
168- <widget class="GtkScrolledWindow" id="scrolledwindow_text">
169- <property name="visible">True</property>
170- <property name="can_focus">True</property>
171- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
172- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
173- <property name="shadow_type">GTK_SHADOW_NONE</property>
174- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
175-
176- <child>
177- <widget class="HyperTextView" id="hyper_text_view_text">
178- <property name="visible">True</property>
179- <property name="can_focus">True</property>
180- <property name="editable">False</property>
181- <property name="overwrite">False</property>
182- <property name="accepts_tab">True</property>
183- <property name="justification">GTK_JUSTIFY_LEFT</property>
184- <property name="wrap_mode">GTK_WRAP_WORD</property>
185- <property name="cursor_visible">False</property>
186- <property name="pixels_above_lines">0</property>
187- <property name="pixels_below_lines">0</property>
188- <property name="pixels_inside_wrap">0</property>
189- <property name="left_margin">10</property>
190- <property name="right_margin">10</property>
191- <property name="indent">0</property>
192- <property name="text" translatable="yes"></property>
193- </widget>
194- </child>
195- </widget>
196- <packing>
197- <property name="padding">0</property>
198- <property name="expand">True</property>
199- <property name="fill">True</property>
200- </packing>
201- </child>
202- </widget>
203- <packing>
204- <property name="tab_expand">False</property>
205- <property name="tab_fill">True</property>
206- </packing>
207- </child>
208-
209- <child>
210- <widget class="GtkLabel" id="label_tab_text">
211- <property name="visible">True</property>
212- <property name="label">_Text</property>
213- <property name="use_underline">False</property>
214- <property name="use_markup">False</property>
215- <property name="justify">GTK_JUSTIFY_LEFT</property>
216- <property name="wrap">False</property>
217- <property name="selectable">False</property>
218- <property name="xalign">0.5</property>
219- <property name="yalign">0.5</property>
220- <property name="xpad">0</property>
221- <property name="ypad">0</property>
222- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
223- <property name="width_chars">-1</property>
224- <property name="single_line_mode">False</property>
225- <property name="angle">0</property>
226- </widget>
227- <packing>
228- <property name="type">tab</property>
229- </packing>
230- </child>
231-
232- <child>
233- <widget class="GtkVBox" id="vbox_options">
234- <property name="visible">True</property>
235- <property name="homogeneous">False</property>
236- <property name="spacing">0</property>
237-
238- <child>
239- <widget class="GtkScrolledWindow" id="scrolledwindow_options">
240- <property name="visible">True</property>
241- <property name="can_focus">True</property>
242- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
243- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
244- <property name="shadow_type">GTK_SHADOW_NONE</property>
245- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
246-
247- <child>
248- <widget class="HyperTextView" id="hyper_text_view_options">
249- <property name="visible">True</property>
250- <property name="can_focus">True</property>
251- <property name="editable">False</property>
252- <property name="overwrite">False</property>
253- <property name="accepts_tab">True</property>
254- <property name="justification">GTK_JUSTIFY_LEFT</property>
255- <property name="wrap_mode">GTK_WRAP_WORD</property>
256- <property name="cursor_visible">False</property>
257- <property name="pixels_above_lines">0</property>
258- <property name="pixels_below_lines">0</property>
259- <property name="pixels_inside_wrap">0</property>
260- <property name="left_margin">10</property>
261- <property name="right_margin">10</property>
262- <property name="indent">0</property>
263- <property name="text" translatable="yes"></property>
264- </widget>
265- </child>
266- </widget>
267- <packing>
268- <property name="padding">0</property>
269- <property name="expand">True</property>
270- <property name="fill">True</property>
271- </packing>
272- </child>
273- </widget>
274- <packing>
275- <property name="tab_expand">False</property>
276- <property name="tab_fill">True</property>
277- </packing>
278- </child>
279-
280- <child>
281- <widget class="GtkLabel" id="label_tab_options">
282- <property name="visible">True</property>
283- <property name="label">_Category</property>
284- <property name="use_underline">False</property>
285- <property name="use_markup">False</property>
286- <property name="justify">GTK_JUSTIFY_LEFT</property>
287- <property name="wrap">False</property>
288- <property name="selectable">False</property>
289- <property name="xalign">0.5</property>
290- <property name="yalign">0.5</property>
291- <property name="xpad">0</property>
292- <property name="ypad">0</property>
293- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
294- <property name="width_chars">-1</property>
295- <property name="single_line_mode">False</property>
296- <property name="angle">0</property>
297- </widget>
298- <packing>
299- <property name="type">tab</property>
300- </packing>
301- </child>
302-
303- <child>
304- <widget class="GtkVBox" id="vbox_test">
305- <property name="visible">True</property>
306- <property name="homogeneous">False</property>
307- <property name="spacing">0</property>
308-
309- <child>
310- <widget class="GtkScrolledWindow" id="scrolledwindow_test">
311- <property name="visible">True</property>
312- <property name="can_focus">True</property>
313- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
314- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
315- <property name="shadow_type">GTK_SHADOW_NONE</property>
316- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
317-
318- <child>
319- <widget class="HyperTextView" id="hyper_text_view_test">
320- <property name="visible">True</property>
321- <property name="can_focus">True</property>
322- <property name="editable">False</property>
323- <property name="overwrite">False</property>
324- <property name="accepts_tab">True</property>
325- <property name="justification">GTK_JUSTIFY_LEFT</property>
326- <property name="wrap_mode">GTK_WRAP_WORD</property>
327- <property name="cursor_visible">False</property>
328- <property name="pixels_above_lines">0</property>
329- <property name="pixels_below_lines">0</property>
330- <property name="pixels_inside_wrap">0</property>
331- <property name="left_margin">10</property>
332- <property name="right_margin">10</property>
333- <property name="indent">0</property>
334- <property name="text" translatable="yes"></property>
335- </widget>
336- </child>
337- </widget>
338- <packing>
339- <property name="padding">0</property>
340- <property name="expand">True</property>
341- <property name="fill">True</property>
342- </packing>
343- </child>
344-
345- <child>
346- <widget class="GtkHButtonBox" id="hbuttonbox_test">
347- <property name="visible">True</property>
348- <property name="layout_style">GTK_BUTTONBOX_END</property>
349- <property name="spacing">0</property>
350-
351- <child>
352- <widget class="GtkButton" id="button_test">
353- <property name="can_default">True</property>
354- <property name="can_focus">True</property>
355- <property name="label" translatable="yes">_Test</property>
356- <property name="use_underline">True</property>
357- <property name="relief">GTK_RELIEF_NORMAL</property>
358- <property name="focus_on_click">True</property>
359- </widget>
360- </child>
361- </widget>
362- <packing>
363- <property name="padding">0</property>
364- <property name="expand">False</property>
365- <property name="fill">True</property>
366- </packing>
367- </child>
368-
369- <child>
370- <widget class="GtkHBox" id="hbox_result">
371- <property name="visible">True</property>
372- <property name="homogeneous">False</property>
373- <property name="spacing">0</property>
374-
375- <child>
376- <widget class="GtkVBox" id="vbox_status">
377- <property name="visible">True</property>
378- <property name="homogeneous">False</property>
379- <property name="spacing">0</property>
380-
381- <child>
382- <widget class="GtkLabel" id="label_status">
383- <property name="visible">True</property>
384- <property name="label"></property>
385- <property name="use_underline">False</property>
386- <property name="use_markup">False</property>
387- <property name="justify">GTK_JUSTIFY_LEFT</property>
388- <property name="wrap">False</property>
389- <property name="selectable">False</property>
390- <property name="xalign">0.5</property>
391- <property name="yalign">0.5</property>
392- <property name="xpad">0</property>
393- <property name="ypad">0</property>
394- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
395- <property name="width_chars">-1</property>
396- <property name="single_line_mode">False</property>
397- <property name="angle">0</property>
398- </widget>
399- <packing>
400- <property name="padding">0</property>
401- <property name="expand">False</property>
402- <property name="fill">False</property>
403- </packing>
404- </child>
405-
406- <child>
407- <widget class="GtkRadioButton" id="radio_button_pass">
408- <property name="visible">True</property>
409- <property name="can_focus">True</property>
410- <property name="label" translatable="yes">_Yes</property>
411- <property name="use_underline">True</property>
412- <property name="relief">GTK_RELIEF_NORMAL</property>
413- <property name="focus_on_click">True</property>
414- <property name="active">False</property>
415- <property name="inconsistent">False</property>
416- <property name="draw_indicator">True</property>
417- </widget>
418- <packing>
419- <property name="padding">0</property>
420- <property name="expand">False</property>
421- <property name="fill">False</property>
422- </packing>
423- </child>
424-
425- <child>
426- <widget class="GtkRadioButton" id="radio_button_fail">
427- <property name="visible">True</property>
428- <property name="can_focus">True</property>
429- <property name="label" translatable="yes">_No</property>
430- <property name="use_underline">True</property>
431- <property name="relief">GTK_RELIEF_NORMAL</property>
432- <property name="focus_on_click">True</property>
433- <property name="active">False</property>
434- <property name="inconsistent">False</property>
435- <property name="draw_indicator">True</property>
436- <property name="group">radio_button_pass</property>
437- </widget>
438- <packing>
439- <property name="padding">0</property>
440- <property name="expand">False</property>
441- <property name="fill">False</property>
442- </packing>
443- </child>
444-
445- <child>
446- <widget class="GtkRadioButton" id="radio_button_skip">
447- <property name="visible">True</property>
448- <property name="can_focus">True</property>
449- <property name="label" translatable="yes">_Skip this test</property>
450- <property name="use_underline">True</property>
451- <property name="relief">GTK_RELIEF_NORMAL</property>
452- <property name="focus_on_click">True</property>
453- <property name="active">True</property>
454- <property name="inconsistent">False</property>
455- <property name="draw_indicator">True</property>
456- <property name="group">radio_button_pass</property>
457- </widget>
458- <packing>
459- <property name="padding">0</property>
460- <property name="expand">False</property>
461- <property name="fill">False</property>
462- </packing>
463- </child>
464- </widget>
465- <packing>
466- <property name="padding">0</property>
467- <property name="expand">True</property>
468- <property name="fill">True</property>
469- </packing>
470- </child>
471-
472- <child>
473- <widget class="GtkVBox" id="vbox_comment">
474- <property name="visible">True</property>
475- <property name="homogeneous">False</property>
476- <property name="spacing">0</property>
477-
478- <child>
479- <widget class="GtkLabel" id="label_comment">
480- <property name="visible">True</property>
481- <property name="label" translatable="yes">Further information:</property>
482- <property name="use_underline">False</property>
483- <property name="use_markup">False</property>
484- <property name="justify">GTK_JUSTIFY_LEFT</property>
485- <property name="wrap">False</property>
486- <property name="selectable">False</property>
487- <property name="xalign">0</property>
488- <property name="yalign">0</property>
489- <property name="xpad">0</property>
490- <property name="ypad">0</property>
491- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
492- <property name="width_chars">-1</property>
493- <property name="single_line_mode">False</property>
494- <property name="angle">0</property>
495- </widget>
496- <packing>
497- <property name="padding">0</property>
498- <property name="expand">False</property>
499- <property name="fill">False</property>
500- </packing>
501- </child>
502-
503- <child>
504- <widget class="GtkScrolledWindow" id="scrolledwindow_comment">
505- <property name="width_request">240</property>
506- <property name="visible">True</property>
507- <property name="can_focus">True</property>
508- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
509- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
510- <property name="shadow_type">GTK_SHADOW_NONE</property>
511- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
512-
513- <child>
514- <widget class="GtkTextView" id="text_view_comment">
515- <property name="visible">True</property>
516- <property name="can_focus">True</property>
517- <property name="editable">True</property>
518- <property name="overwrite">False</property>
519- <property name="accepts_tab">True</property>
520- <property name="justification">GTK_JUSTIFY_LEFT</property>
521- <property name="wrap_mode">GTK_WRAP_WORD</property>
522- <property name="cursor_visible">True</property>
523- <property name="pixels_above_lines">0</property>
524- <property name="pixels_below_lines">0</property>
525- <property name="pixels_inside_wrap">0</property>
526- <property name="left_margin">0</property>
527- <property name="right_margin">0</property>
528- <property name="indent">0</property>
529- <property name="text"></property>
530- </widget>
531- </child>
532- </widget>
533- <packing>
534- <property name="padding">0</property>
535- <property name="expand">True</property>
536- <property name="fill">True</property>
537- </packing>
538- </child>
539- </widget>
540- <packing>
541- <property name="padding">0</property>
542- <property name="expand">True</property>
543- <property name="fill">True</property>
544- </packing>
545- </child>
546- </widget>
547- <packing>
548- <property name="padding">0</property>
549- <property name="expand">False</property>
550- <property name="fill">True</property>
551- </packing>
552- </child>
553- </widget>
554- <packing>
555- <property name="tab_expand">False</property>
556- <property name="tab_fill">True</property>
557- </packing>
558- </child>
559-
560- <child>
561- <widget class="GtkLabel" id="label_tab_test">
562- <property name="visible">True</property>
563- <property name="label">_Test</property>
564- <property name="use_underline">False</property>
565- <property name="use_markup">False</property>
566- <property name="justify">GTK_JUSTIFY_LEFT</property>
567- <property name="wrap">False</property>
568- <property name="selectable">False</property>
569- <property name="xalign">0.5</property>
570- <property name="yalign">0.5</property>
571- <property name="xpad">0</property>
572- <property name="ypad">0</property>
573- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
574- <property name="width_chars">-1</property>
575- <property name="single_line_mode">False</property>
576- <property name="angle">0</property>
577- </widget>
578- <packing>
579- <property name="type">tab</property>
580- </packing>
581- </child>
582-
583- <child>
584- <widget class="GtkVBox" id="vbox_entry">
585- <property name="visible">True</property>
586- <property name="homogeneous">False</property>
587- <property name="spacing">0</property>
588-
589- <child>
590- <widget class="GtkScrolledWindow" id="scrolledwindow_entry">
591- <property name="visible">True</property>
592- <property name="can_focus">True</property>
593- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
594- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
595- <property name="shadow_type">GTK_SHADOW_NONE</property>
596- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
597-
598- <child>
599- <widget class="HyperTextView" id="hyper_text_view_entry">
600- <property name="visible">True</property>
601- <property name="can_focus">True</property>
602- <property name="editable">False</property>
603- <property name="overwrite">False</property>
604- <property name="accepts_tab">True</property>
605- <property name="justification">GTK_JUSTIFY_LEFT</property>
606- <property name="wrap_mode">GTK_WRAP_WORD</property>
607- <property name="cursor_visible">False</property>
608- <property name="pixels_above_lines">0</property>
609- <property name="pixels_below_lines">0</property>
610- <property name="pixels_inside_wrap">0</property>
611- <property name="left_margin">10</property>
612- <property name="right_margin">10</property>
613- <property name="indent">0</property>
614- <property name="text" translatable="yes"></property>
615- </widget>
616- </child>
617- </widget>
618- <packing>
619- <property name="padding">0</property>
620- <property name="expand">True</property>
621- <property name="fill">True</property>
622- </packing>
623- </child>
624-
625- <child>
626- <widget class="GtkEntry" id="entry">
627- <property name="visible">True</property>
628- <property name="can_focus">True</property>
629- <property name="editable">True</property>
630- <property name="visibility">True</property>
631- <property name="max_length">0</property>
632- <property name="text"></property>
633- <property name="has_frame">True</property>
634- <property name="invisible_char">●</property>
635- <property name="activates_default">False</property>
636- </widget>
637- <packing>
638- <property name="padding">0</property>
639- <property name="expand">False</property>
640- <property name="fill">False</property>
641- </packing>
642- </child>
643- </widget>
644- <packing>
645- <property name="tab_expand">False</property>
646- <property name="tab_fill">True</property>
647- </packing>
648- </child>
649-
650- <child>
651- <widget class="GtkLabel" id="label_tab_entry">
652- <property name="visible">True</property>
653- <property name="label">_Entry</property>
654- <property name="use_underline">False</property>
655- <property name="use_markup">False</property>
656- <property name="justify">GTK_JUSTIFY_LEFT</property>
657- <property name="wrap">False</property>
658- <property name="selectable">False</property>
659- <property name="xalign">0.5</property>
660- <property name="yalign">0.5</property>
661- <property name="xpad">0</property>
662- <property name="ypad">0</property>
663- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
664- <property name="width_chars">-1</property>
665- <property name="single_line_mode">False</property>
666- <property name="angle">0</property>
667- </widget>
668- <packing>
669- <property name="type">tab</property>
670- </packing>
671- </child>
672- </widget>
673- <packing>
674- <property name="padding">0</property>
675- <property name="expand">True</property>
676- <property name="fill">True</property>
677- </packing>
678- </child>
679- </widget>
680- </child>
681-</widget>
682-
683-<widget class="GtkWindow" id="window_wait">
684- <property name="border_width">6</property>
685- <property name="title" translatable="yes"></property>
686- <property name="type">GTK_WINDOW_TOPLEVEL</property>
687- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
688- <property name="modal">True</property>
689- <property name="resizable">False</property>
690- <property name="destroy_with_parent">False</property>
691- <property name="decorated">True</property>
692- <property name="skip_taskbar_hint">True</property>
693- <property name="skip_pager_hint">True</property>
694- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
695- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
696- <property name="focus_on_map">True</property>
697- <property name="urgency_hint">False</property>
698-
699- <child>
700- <widget class="GtkVBox" id="vbox_wait">
701- <property name="visible">True</property>
702- <property name="homogeneous">False</property>
703- <property name="spacing">12</property>
704-
705- <child>
706- <widget class="GtkLabel" id="label_wait">
707- <property name="visible">True</property>
708- <property name="label" translatable="yes"></property>
709- <property name="use_underline">False</property>
710- <property name="use_markup">False</property>
711- <property name="justify">GTK_JUSTIFY_LEFT</property>
712- <property name="wrap">False</property>
713- <property name="selectable">False</property>
714- <property name="xalign">0.5</property>
715- <property name="yalign">0.5</property>
716- <property name="xpad">0</property>
717- <property name="ypad">0</property>
718- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
719- <property name="width_chars">-1</property>
720- <property name="single_line_mode">False</property>
721- <property name="angle">0</property>
722- </widget>
723- <packing>
724- <property name="padding">0</property>
725- <property name="expand">False</property>
726- <property name="fill">False</property>
727- </packing>
728- </child>
729-
730- <child>
731- <widget class="GtkProgressBar" id="progressbar_wait">
732- <property name="visible">True</property>
733- <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
734- <property name="fraction">0</property>
735- <property name="pulse_step">0.10000000149</property>
736- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
737- </widget>
738- <packing>
739- <property name="padding">0</property>
740- <property name="expand">False</property>
741- <property name="fill">False</property>
742- </packing>
743- </child>
744- </widget>
745- </child>
746-</widget>
747-
748-</glade-interface>
749+<?xml version="1.0"?>
750+<interface>
751+ <requires lib="gtk+" version="2.16"/>
752+ <!-- interface-requires hyper_text_view 1.0 -->
753+ <!-- interface-naming-policy toplevel-contextual -->
754+ <object class="GtkDialog" id="dialog_main">
755+ <property name="width_request">450</property>
756+ <property name="height_request">400</property>
757+ <property name="visible">True</property>
758+ <property name="title" translatable="yes">System Testing</property>
759+ <property name="default_width">450</property>
760+ <property name="default_height">400</property>
761+ <property name="icon_name">checkbox</property>
762+ <property name="type_hint">dialog</property>
763+ <child internal-child="vbox">
764+ <object class="GtkVBox" id="dialog-vbox">
765+ <property name="visible">True</property>
766+ <child>
767+ <object class="GtkEventBox" id="eventbox_head">
768+ <property name="visible">True</property>
769+ <property name="events">GDK_EXPOSURE_MASK</property>
770+ <child>
771+ <object class="GtkImage" id="image_head">
772+ <property name="visible">True</property>
773+ <property name="yalign">0</property>
774+ <property name="pixbuf">checkbox-gtk-head.png</property>
775+ </object>
776+ </child>
777+ </object>
778+ <packing>
779+ <property name="expand">False</property>
780+ <property name="position">2</property>
781+ </packing>
782+ </child>
783+ <child>
784+ <object class="GtkNotebook" id="notebook_main">
785+ <property name="visible">True</property>
786+ <property name="show_tabs">False</property>
787+ <property name="show_border">False</property>
788+ <child>
789+ <object class="GtkVBox" id="vbox_text">
790+ <property name="visible">True</property>
791+ <child>
792+ <object class="GtkScrolledWindow" id="scrolledwindow_text">
793+ <property name="visible">True</property>
794+ <property name="can_focus">True</property>
795+ <property name="hscrollbar_policy">never</property>
796+ <property name="vscrollbar_policy">automatic</property>
797+ <child>
798+ <object class="HyperTextView" id="hyper_text_view_text">
799+ <property name="visible">True</property>
800+ <property name="can_focus">True</property>
801+ <property name="editable">False</property>
802+ <property name="wrap_mode">word</property>
803+ <property name="left_margin">10</property>
804+ <property name="right_margin">10</property>
805+ <property name="cursor_visible">False</property>
806+ </object>
807+ </child>
808+ </object>
809+ <packing>
810+ <property name="position">0</property>
811+ </packing>
812+ </child>
813+ </object>
814+ </child>
815+ <child type="tab">
816+ <object class="GtkLabel" id="label_tab_text">
817+ <property name="visible">True</property>
818+ <property name="label">_Text</property>
819+ </object>
820+ <packing>
821+ <property name="tab_fill">False</property>
822+ </packing>
823+ </child>
824+ <child>
825+ <object class="GtkVBox" id="vbox_options">
826+ <property name="visible">True</property>
827+ <child>
828+ <object class="GtkScrolledWindow" id="scrolledwindow_options">
829+ <property name="visible">True</property>
830+ <property name="can_focus">True</property>
831+ <property name="hscrollbar_policy">never</property>
832+ <property name="vscrollbar_policy">automatic</property>
833+ <child>
834+ <object class="HyperTextView" id="hyper_text_view_options">
835+ <property name="visible">True</property>
836+ <property name="can_focus">True</property>
837+ <property name="editable">False</property>
838+ <property name="wrap_mode">word</property>
839+ <property name="left_margin">10</property>
840+ <property name="right_margin">10</property>
841+ <property name="cursor_visible">False</property>
842+ </object>
843+ </child>
844+ </object>
845+ <packing>
846+ <property name="position">0</property>
847+ </packing>
848+ </child>
849+ </object>
850+ <packing>
851+ <property name="position">1</property>
852+ </packing>
853+ </child>
854+ <child type="tab">
855+ <object class="GtkLabel" id="label_tab_options">
856+ <property name="visible">True</property>
857+ <property name="label">_Category</property>
858+ </object>
859+ <packing>
860+ <property name="position">1</property>
861+ <property name="tab_fill">False</property>
862+ </packing>
863+ </child>
864+ <child>
865+ <object class="GtkVBox" id="vbox_test">
866+ <property name="visible">True</property>
867+ <child>
868+ <object class="GtkScrolledWindow" id="scrolledwindow_test">
869+ <property name="visible">True</property>
870+ <property name="can_focus">True</property>
871+ <property name="hscrollbar_policy">never</property>
872+ <property name="vscrollbar_policy">automatic</property>
873+ <child>
874+ <object class="HyperTextView" id="hyper_text_view_test">
875+ <property name="visible">True</property>
876+ <property name="can_focus">True</property>
877+ <property name="editable">False</property>
878+ <property name="wrap_mode">word</property>
879+ <property name="left_margin">10</property>
880+ <property name="right_margin">10</property>
881+ <property name="cursor_visible">False</property>
882+ </object>
883+ </child>
884+ </object>
885+ <packing>
886+ <property name="position">0</property>
887+ </packing>
888+ </child>
889+ <child>
890+ <object class="GtkHButtonBox" id="hbuttonbox_test">
891+ <property name="visible">True</property>
892+ <property name="layout_style">end</property>
893+ <child>
894+ <object class="GtkButton" id="button_test">
895+ <property name="label" translatable="yes">_Test</property>
896+ <property name="can_focus">True</property>
897+ <property name="can_default">True</property>
898+ <property name="receives_default">False</property>
899+ <property name="use_underline">True</property>
900+ </object>
901+ <packing>
902+ <property name="expand">False</property>
903+ <property name="fill">False</property>
904+ <property name="position">0</property>
905+ </packing>
906+ </child>
907+ </object>
908+ <packing>
909+ <property name="expand">False</property>
910+ <property name="position">1</property>
911+ </packing>
912+ </child>
913+ <child>
914+ <object class="GtkHBox" id="hbox_result">
915+ <property name="visible">True</property>
916+ <child>
917+ <object class="GtkVBox" id="vbox_status">
918+ <property name="visible">True</property>
919+ <child>
920+ <object class="GtkLabel" id="label_status">
921+ <property name="visible">True</property>
922+ </object>
923+ <packing>
924+ <property name="expand">False</property>
925+ <property name="fill">False</property>
926+ <property name="position">0</property>
927+ </packing>
928+ </child>
929+ <child>
930+ <object class="GtkRadioButton" id="radio_button_pass">
931+ <property name="label" translatable="yes">_Yes</property>
932+ <property name="visible">True</property>
933+ <property name="can_focus">True</property>
934+ <property name="receives_default">False</property>
935+ <property name="use_underline">True</property>
936+ <property name="draw_indicator">True</property>
937+ </object>
938+ <packing>
939+ <property name="expand">False</property>
940+ <property name="fill">False</property>
941+ <property name="position">1</property>
942+ </packing>
943+ </child>
944+ <child>
945+ <object class="GtkRadioButton" id="radio_button_fail">
946+ <property name="label" translatable="yes">_No</property>
947+ <property name="visible">True</property>
948+ <property name="can_focus">True</property>
949+ <property name="receives_default">False</property>
950+ <property name="use_underline">True</property>
951+ <property name="draw_indicator">True</property>
952+ <property name="group">radio_button_pass</property>
953+ </object>
954+ <packing>
955+ <property name="expand">False</property>
956+ <property name="fill">False</property>
957+ <property name="position">2</property>
958+ </packing>
959+ </child>
960+ <child>
961+ <object class="GtkRadioButton" id="radio_button_skip">
962+ <property name="label" translatable="yes">_Skip this test</property>
963+ <property name="visible">True</property>
964+ <property name="can_focus">True</property>
965+ <property name="receives_default">False</property>
966+ <property name="use_underline">True</property>
967+ <property name="active">True</property>
968+ <property name="draw_indicator">True</property>
969+ <property name="group">radio_button_pass</property>
970+ </object>
971+ <packing>
972+ <property name="expand">False</property>
973+ <property name="fill">False</property>
974+ <property name="position">3</property>
975+ </packing>
976+ </child>
977+ </object>
978+ <packing>
979+ <property name="position">0</property>
980+ </packing>
981+ </child>
982+ <child>
983+ <object class="GtkVBox" id="vbox_comment">
984+ <property name="visible">True</property>
985+ <child>
986+ <object class="GtkLabel" id="label_comment">
987+ <property name="visible">True</property>
988+ <property name="xalign">0</property>
989+ <property name="yalign">0</property>
990+ <property name="label" translatable="yes">Further information:</property>
991+ </object>
992+ <packing>
993+ <property name="expand">False</property>
994+ <property name="fill">False</property>
995+ <property name="position">0</property>
996+ </packing>
997+ </child>
998+ <child>
999+ <object class="GtkScrolledWindow" id="scrolledwindow_comment">
1000+ <property name="width_request">240</property>
1001+ <property name="visible">True</property>
1002+ <property name="can_focus">True</property>
1003+ <property name="hscrollbar_policy">never</property>
1004+ <child>
1005+ <object class="GtkTextView" id="text_view_comment">
1006+ <property name="visible">True</property>
1007+ <property name="can_focus">True</property>
1008+ <property name="wrap_mode">word</property>
1009+ </object>
1010+ </child>
1011+ </object>
1012+ <packing>
1013+ <property name="position">1</property>
1014+ </packing>
1015+ </child>
1016+ </object>
1017+ <packing>
1018+ <property name="position">1</property>
1019+ </packing>
1020+ </child>
1021+ </object>
1022+ <packing>
1023+ <property name="expand">False</property>
1024+ <property name="position">2</property>
1025+ </packing>
1026+ </child>
1027+ </object>
1028+ <packing>
1029+ <property name="position">2</property>
1030+ </packing>
1031+ </child>
1032+ <child type="tab">
1033+ <object class="GtkLabel" id="label_tab_test">
1034+ <property name="visible">True</property>
1035+ <property name="label">_Test</property>
1036+ </object>
1037+ <packing>
1038+ <property name="position">2</property>
1039+ <property name="tab_fill">False</property>
1040+ </packing>
1041+ </child>
1042+ <child>
1043+ <object class="GtkVBox" id="vbox_entry">
1044+ <property name="visible">True</property>
1045+ <child>
1046+ <object class="GtkScrolledWindow" id="scrolledwindow_entry">
1047+ <property name="visible">True</property>
1048+ <property name="can_focus">True</property>
1049+ <property name="hscrollbar_policy">never</property>
1050+ <property name="vscrollbar_policy">automatic</property>
1051+ <child>
1052+ <object class="HyperTextView" id="hyper_text_view_entry">
1053+ <property name="visible">True</property>
1054+ <property name="can_focus">True</property>
1055+ <property name="editable">False</property>
1056+ <property name="wrap_mode">word</property>
1057+ <property name="left_margin">10</property>
1058+ <property name="right_margin">10</property>
1059+ <property name="cursor_visible">False</property>
1060+ </object>
1061+ </child>
1062+ </object>
1063+ <packing>
1064+ <property name="position">0</property>
1065+ </packing>
1066+ </child>
1067+ <child>
1068+ <object class="GtkEntry" id="entry">
1069+ <property name="visible">True</property>
1070+ <property name="can_focus">True</property>
1071+ <property name="invisible_char">&#x25CF;</property>
1072+ </object>
1073+ <packing>
1074+ <property name="expand">False</property>
1075+ <property name="fill">False</property>
1076+ <property name="position">1</property>
1077+ </packing>
1078+ </child>
1079+ </object>
1080+ <packing>
1081+ <property name="position">3</property>
1082+ </packing>
1083+ </child>
1084+ <child type="tab">
1085+ <object class="GtkLabel" id="label_tab_entry">
1086+ <property name="visible">True</property>
1087+ <property name="label">_Entry</property>
1088+ </object>
1089+ <packing>
1090+ <property name="position">3</property>
1091+ <property name="tab_fill">False</property>
1092+ </packing>
1093+ </child>
1094+ </object>
1095+ <packing>
1096+ <property name="position">3</property>
1097+ </packing>
1098+ </child>
1099+ <child internal-child="action_area">
1100+ <object class="GtkHButtonBox" id="dialog-action_area">
1101+ <property name="visible">True</property>
1102+ <property name="layout_style">end</property>
1103+ <child>
1104+ <object class="GtkButton" id="button_previous">
1105+ <property name="label" translatable="yes">_Previous</property>
1106+ <property name="visible">True</property>
1107+ <property name="can_focus">True</property>
1108+ <property name="can_default">True</property>
1109+ <property name="receives_default">False</property>
1110+ <property name="use_underline">True</property>
1111+ </object>
1112+ <packing>
1113+ <property name="expand">False</property>
1114+ <property name="fill">False</property>
1115+ <property name="position">0</property>
1116+ </packing>
1117+ </child>
1118+ <child>
1119+ <object class="GtkButton" id="button_next">
1120+ <property name="label" translatable="yes">Ne_xt</property>
1121+ <property name="visible">True</property>
1122+ <property name="can_focus">True</property>
1123+ <property name="can_default">True</property>
1124+ <property name="receives_default">False</property>
1125+ <property name="use_underline">True</property>
1126+ </object>
1127+ <packing>
1128+ <property name="expand">False</property>
1129+ <property name="fill">False</property>
1130+ <property name="position">1</property>
1131+ </packing>
1132+ </child>
1133+ </object>
1134+ <packing>
1135+ <property name="expand">False</property>
1136+ <property name="pack_type">end</property>
1137+ <property name="position">0</property>
1138+ </packing>
1139+ </child>
1140+ </object>
1141+ </child>
1142+ <action-widgets>
1143+ <action-widget response="-1">button_previous</action-widget>
1144+ <action-widget response="1">button_next</action-widget>
1145+ </action-widgets>
1146+ </object>
1147+ <object class="GtkWindow" id="window_wait">
1148+ <property name="border_width">6</property>
1149+ <property name="resizable">False</property>
1150+ <property name="modal">True</property>
1151+ <property name="window_position">center-on-parent</property>
1152+ <property name="type_hint">dialog</property>
1153+ <property name="skip_taskbar_hint">True</property>
1154+ <property name="skip_pager_hint">True</property>
1155+ <child>
1156+ <object class="GtkVBox" id="vbox_wait">
1157+ <property name="visible">True</property>
1158+ <property name="spacing">12</property>
1159+ <child>
1160+ <object class="GtkLabel" id="label_wait">
1161+ <property name="visible">True</property>
1162+ </object>
1163+ <packing>
1164+ <property name="expand">False</property>
1165+ <property name="fill">False</property>
1166+ <property name="position">0</property>
1167+ </packing>
1168+ </child>
1169+ <child>
1170+ <object class="GtkProgressBar" id="progressbar_wait">
1171+ <property name="visible">True</property>
1172+ <property name="pulse_step">0.10000000149</property>
1173+ </object>
1174+ <packing>
1175+ <property name="expand">False</property>
1176+ <property name="fill">False</property>
1177+ <property name="position">1</property>
1178+ </packing>
1179+ </child>
1180+ </object>
1181+ </child>
1182+ </object>
1183+</interface>
1184
1185=== added file 'gtk/hyper_text_view.xml'
1186--- gtk/hyper_text_view.xml 1970-01-01 00:00:00 +0000
1187+++ gtk/hyper_text_view.xml 2009-06-12 19:04:09 +0000
1188@@ -0,0 +1,11 @@
1189+<glade-catalog name="hyper_text_view" domain="glade-3"
1190+ depends="gtk+" version="1.0">
1191+ <glade-widget-classes>
1192+ <glade-widget-class title="Hyper Text View" name="HyperTextView"
1193+ generic-name="HyperTextView" parent="GtkTextView"
1194+ icon-name="widget-gtk-textview"/>
1195+ </glade-widget-classes>
1196+ <glade-widget-group name="CheckboxWidgets" title="Checkbox Widgets">
1197+ <glade-widget-class-ref name="HyperTextView"/>
1198+ </glade-widget-group>
1199+</glade-catalog>
1200
1201=== modified file 'po/POTFILES.in'
1202--- po/POTFILES.in 2009-05-15 22:28:26 +0000
1203+++ po/POTFILES.in 2009-06-12 17:00:39 +0000
1204@@ -1,6 +1,6 @@
1205 [encoding: UTF-8]
1206 backend/com.ubuntu.checkbox.policy.in
1207-gtk/checkbox-gtk.glade
1208+[type: gettext/glade] gtk/checkbox-gtk.ui
1209 gtk/checkbox-gtk.desktop.in
1210 [type: gettext/rfc822deb] suites/manual.txt.in
1211 checkbox/application.py
1212
1213=== modified file 'setup.py'
1214--- setup.py 2009-05-12 20:37:57 +0000
1215+++ setup.py 2009-06-12 17:00:39 +0000
1216@@ -134,7 +134,7 @@
1217 ("share/checkbox/registries/", ["registries/*.py"]),
1218 ("share/checkbox/report/", ["report/*"]),
1219 ("share/checkbox/scripts/", ["scripts/*"]),
1220- ("share/checkbox/gtk/", ["gtk/checkbox-gtk.glade", "gtk/*.png"]),
1221+ ("share/checkbox/gtk/", ["gtk/checkbox-gtk.ui", "gtk/*.png"]),
1222 ("share/dbus-1/system-services", ["backend/*.service"])],
1223 scripts = ["bin/checkbox-backend", "bin/checkbox-cli", "bin/checkbox-gtk"],
1224 packages = ["checkbox", "checkbox.contrib", "checkbox.lib", "checkbox.reports",

Subscribers

People subscribed via source and target branches