Software Properties

Merge lp:~ilidrissi.amine/software-properties/updates-redesign into lp:software-properties

  1. updates-redesign
  2. Merge into main
Proposed by Mohamed Amine Ilidrissi
Status: Superseded
Proposed branch: lp:~ilidrissi.amine/software-properties/updates-redesign
Merge into: lp:software-properties
Diff against target: 2890 lines (+1059/-1715)
3 files modified
data/glade/main.glade (+979/-1645)
softwareproperties/SoftwareProperties.py (+9/-9)
softwareproperties/gtk/SoftwarePropertiesGtk.py (+71/-61)
To merge this branch: bzr merge lp:~ilidrissi.amine/software-properties/updates-redesign
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+29123@code.launchpad.net

This proposal has been superseded by a proposal from 2010-07-25.

Description of the change

This branch revamps the 'Updates' tab to include some more options. Design was taken from https://wiki.ubuntu.com/SoftwareUpdateHandling#Update settings

To post a comment you must log in.
lp:~ilidrissi.amine/software-properties/updates-redesign updated
611. By Mohamed Amine Ilidrissi

updated debian/changelog

612. By Mohamed Amine Ilidrissi

merge with trunk and fix the kde frontend.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/glade/main.glade'
2--- data/glade/main.glade 2009-08-28 17:57:47 +0000
3+++ data/glade/main.glade 2010-07-02 21:05:40 +0000
4@@ -1,1647 +1,981 @@
5-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
6-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
7-
8+<?xml version="1.0"?>
9 <glade-interface>
10-
11-<widget class="GtkWindow" id="window_main">
12- <property name="border_width">6</property>
13- <property name="title" translatable="yes">Software Sources</property>
14- <property name="type">GTK_WINDOW_TOPLEVEL</property>
15- <property name="window_position">GTK_WIN_POS_CENTER</property>
16- <property name="modal">False</property>
17- <property name="resizable">True</property>
18- <property name="destroy_with_parent">False</property>
19- <property name="decorated">True</property>
20- <property name="skip_taskbar_hint">False</property>
21- <property name="skip_pager_hint">False</property>
22- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
23- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
24- <property name="focus_on_map">True</property>
25- <property name="urgency_hint">False</property>
26- <signal name="delete_event" handler="on_delete_event" last_modification_time="Mon, 04 Jul 2005 21:19:11 GMT"/>
27-
28- <child>
29- <widget class="GtkVBox" id="vbox1">
30- <property name="visible">True</property>
31- <property name="homogeneous">False</property>
32- <property name="spacing">0</property>
33-
34- <child>
35- <widget class="GtkNotebook" id="notebook_main">
36- <property name="border_width">6</property>
37- <property name="visible">True</property>
38- <property name="can_focus">True</property>
39- <property name="show_tabs">True</property>
40- <property name="show_border">True</property>
41- <property name="tab_pos">GTK_POS_TOP</property>
42- <property name="scrollable">False</property>
43- <property name="enable_popup">False</property>
44-
45- <child>
46- <widget class="GtkVBox" id="vbox5">
47- <property name="border_width">12</property>
48- <property name="visible">True</property>
49- <property name="homogeneous">False</property>
50- <property name="spacing">18</property>
51-
52- <child>
53- <widget class="GtkFrame" id="frame4">
54- <property name="visible">True</property>
55- <property name="label_xalign">0</property>
56- <property name="label_yalign">0.5</property>
57- <property name="shadow_type">GTK_SHADOW_NONE</property>
58-
59- <child>
60- <widget class="GtkAlignment" id="alignment5">
61- <property name="visible">True</property>
62- <property name="xalign">0.5</property>
63- <property name="yalign">0.5</property>
64- <property name="xscale">1</property>
65- <property name="yscale">1</property>
66- <property name="top_padding">6</property>
67- <property name="bottom_padding">0</property>
68- <property name="left_padding">12</property>
69- <property name="right_padding">0</property>
70-
71- <child>
72- <widget class="GtkVBox" id="vbox10">
73- <property name="visible">True</property>
74- <property name="homogeneous">False</property>
75- <property name="spacing">18</property>
76-
77- <child>
78- <widget class="GtkVBox" id="vbox13">
79- <property name="visible">True</property>
80- <property name="homogeneous">False</property>
81- <property name="spacing">6</property>
82-
83- <child>
84- <widget class="GtkVBox" id="vbox21">
85- <property name="visible">True</property>
86- <property name="homogeneous">False</property>
87- <property name="spacing">6</property>
88-
89- <child>
90- <widget class="GtkVBox" id="vbox_dist_comps">
91- <property name="visible">True</property>
92- <property name="homogeneous">False</property>
93- <property name="spacing">6</property>
94-
95- <child>
96- <placeholder/>
97- </child>
98- </widget>
99- <packing>
100- <property name="padding">0</property>
101- <property name="expand">True</property>
102- <property name="fill">True</property>
103- </packing>
104- </child>
105-
106- <child>
107- <widget class="GtkCheckButton" id="checkbutton_source_code">
108- <property name="visible">True</property>
109- <property name="can_focus">True</property>
110- <property name="label" translatable="yes">Source code</property>
111- <property name="use_underline">True</property>
112- <property name="relief">GTK_RELIEF_NORMAL</property>
113- <property name="focus_on_click">True</property>
114- <property name="active">False</property>
115- <property name="inconsistent">False</property>
116- <property name="draw_indicator">True</property>
117- </widget>
118- <packing>
119- <property name="padding">0</property>
120- <property name="expand">False</property>
121- <property name="fill">False</property>
122- </packing>
123- </child>
124- </widget>
125- <packing>
126- <property name="padding">0</property>
127- <property name="expand">True</property>
128- <property name="fill">True</property>
129- </packing>
130- </child>
131-
132- <child>
133- <widget class="GtkHBox" id="hbox6">
134- <property name="visible">True</property>
135- <property name="homogeneous">False</property>
136- <property name="spacing">12</property>
137-
138- <child>
139- <widget class="GtkLabel" id="label15">
140- <property name="visible">True</property>
141- <property name="label" translatable="yes">Download from:</property>
142- <property name="use_underline">False</property>
143- <property name="use_markup">False</property>
144- <property name="justify">GTK_JUSTIFY_LEFT</property>
145- <property name="wrap">False</property>
146- <property name="selectable">False</property>
147- <property name="xalign">0.5</property>
148- <property name="yalign">0.5</property>
149- <property name="xpad">0</property>
150- <property name="ypad">0</property>
151- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
152- <property name="width_chars">-1</property>
153- <property name="single_line_mode">False</property>
154- <property name="angle">0</property>
155- </widget>
156- <packing>
157- <property name="padding">0</property>
158- <property name="expand">False</property>
159- <property name="fill">False</property>
160- </packing>
161- </child>
162-
163- <child>
164- <widget class="GtkComboBox" id="combobox_server">
165- <property name="visible">True</property>
166- <property name="add_tearoffs">False</property>
167- <property name="focus_on_click">True</property>
168- </widget>
169- <packing>
170- <property name="padding">0</property>
171- <property name="expand">True</property>
172- <property name="fill">True</property>
173- </packing>
174- </child>
175- </widget>
176- <packing>
177- <property name="padding">0</property>
178- <property name="expand">True</property>
179- <property name="fill">True</property>
180- </packing>
181- </child>
182- </widget>
183- <packing>
184- <property name="padding">0</property>
185- <property name="expand">True</property>
186- <property name="fill">True</property>
187- </packing>
188- </child>
189- </widget>
190- </child>
191- </widget>
192- </child>
193-
194- <child>
195- <widget class="GtkLabel" id="label_dist_name">
196- <property name="visible">True</property>
197- <property name="label" translatable="yes">&lt;b&gt;Downloadable from the Internet&lt;/b&gt;</property>
198- <property name="use_underline">False</property>
199- <property name="use_markup">True</property>
200- <property name="justify">GTK_JUSTIFY_LEFT</property>
201- <property name="wrap">False</property>
202- <property name="selectable">False</property>
203- <property name="xalign">0.5</property>
204- <property name="yalign">0.5</property>
205- <property name="xpad">0</property>
206- <property name="ypad">0</property>
207- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
208- <property name="width_chars">-1</property>
209- <property name="single_line_mode">False</property>
210- <property name="angle">0</property>
211- </widget>
212- <packing>
213- <property name="type">label_item</property>
214- </packing>
215- </child>
216- </widget>
217- <packing>
218- <property name="padding">0</property>
219- <property name="expand">False</property>
220- <property name="fill">True</property>
221- </packing>
222- </child>
223-
224- <child>
225- <widget class="GtkFrame" id="frame7">
226- <property name="visible">True</property>
227- <property name="label_xalign">0</property>
228- <property name="label_yalign">0.5</property>
229- <property name="shadow_type">GTK_SHADOW_NONE</property>
230-
231- <child>
232- <widget class="GtkAlignment" id="alignment8">
233- <property name="visible">True</property>
234- <property name="xalign">0.5</property>
235- <property name="yalign">0.5</property>
236- <property name="xscale">1</property>
237- <property name="yscale">1</property>
238- <property name="top_padding">6</property>
239- <property name="bottom_padding">0</property>
240- <property name="left_padding">12</property>
241- <property name="right_padding">0</property>
242-
243- <child>
244- <widget class="GtkVBox" id="vbox11">
245- <property name="visible">True</property>
246- <property name="homogeneous">False</property>
247- <property name="spacing">6</property>
248-
249- <child>
250- <widget class="GtkVBox" id="vbox22">
251- <property name="visible">True</property>
252- <property name="homogeneous">False</property>
253- <property name="spacing">0</property>
254-
255- <child>
256- <widget class="GtkScrolledWindow" id="scrolledwindow_no_cd">
257- <property name="visible">True</property>
258- <property name="can_focus">True</property>
259- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
260- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
261- <property name="shadow_type">GTK_SHADOW_IN</property>
262- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
263-
264- <child>
265- <widget class="GtkTextView" id="textview_no_cd">
266- <property name="visible">True</property>
267- <property name="sensitive">False</property>
268- <property name="can_focus">True</property>
269- <property name="editable">False</property>
270- <property name="overwrite">False</property>
271- <property name="accepts_tab">True</property>
272- <property name="justification">GTK_JUSTIFY_LEFT</property>
273- <property name="wrap_mode">GTK_WRAP_WORD</property>
274- <property name="cursor_visible">False</property>
275- <property name="pixels_above_lines">6</property>
276- <property name="pixels_below_lines">0</property>
277- <property name="pixels_inside_wrap">0</property>
278- <property name="left_margin">6</property>
279- <property name="right_margin">6</property>
280- <property name="indent">0</property>
281- <property name="text" translatable="yes">To install from a CD-ROM or DVD, insert the medium into the drive.</property>
282- </widget>
283- </child>
284- </widget>
285- <packing>
286- <property name="padding">0</property>
287- <property name="expand">True</property>
288- <property name="fill">True</property>
289- </packing>
290- </child>
291-
292- <child>
293- <widget class="GtkScrolledWindow" id="scrolledwindow_cd">
294- <property name="height_request">75</property>
295- <property name="visible">True</property>
296- <property name="can_focus">True</property>
297- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
298- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
299- <property name="shadow_type">GTK_SHADOW_IN</property>
300- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
301-
302- <child>
303- <widget class="GtkTreeView" id="treeview_cdroms">
304- <property name="height_request">109</property>
305- <property name="visible">True</property>
306- <property name="can_focus">True</property>
307- <property name="headers_visible">False</property>
308- <property name="rules_hint">True</property>
309- <property name="reorderable">False</property>
310- <property name="enable_search">True</property>
311- <property name="fixed_height_mode">False</property>
312- <property name="hover_selection">False</property>
313- <property name="hover_expand">False</property>
314- </widget>
315- </child>
316- </widget>
317- <packing>
318- <property name="padding">0</property>
319- <property name="expand">True</property>
320- <property name="fill">True</property>
321- </packing>
322- </child>
323- </widget>
324- <packing>
325- <property name="padding">0</property>
326- <property name="expand">True</property>
327- <property name="fill">True</property>
328- </packing>
329- </child>
330- </widget>
331- </child>
332- </widget>
333- </child>
334-
335- <child>
336- <widget class="GtkLabel" id="label14">
337- <property name="visible">True</property>
338- <property name="label" translatable="yes">&lt;b&gt;Installable from CD-ROM/DVD&lt;/b&gt;</property>
339- <property name="use_underline">False</property>
340- <property name="use_markup">True</property>
341- <property name="justify">GTK_JUSTIFY_LEFT</property>
342- <property name="wrap">False</property>
343- <property name="selectable">False</property>
344- <property name="xalign">0.5</property>
345- <property name="yalign">0.5</property>
346- <property name="xpad">0</property>
347- <property name="ypad">0</property>
348- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
349- <property name="width_chars">-1</property>
350- <property name="single_line_mode">False</property>
351- <property name="angle">0</property>
352- </widget>
353- <packing>
354- <property name="type">label_item</property>
355- </packing>
356- </child>
357- </widget>
358- <packing>
359- <property name="padding">0</property>
360- <property name="expand">True</property>
361- <property name="fill">True</property>
362- </packing>
363- </child>
364- </widget>
365- <packing>
366- <property name="tab_expand">False</property>
367- <property name="tab_fill">True</property>
368- </packing>
369- </child>
370-
371- <child>
372- <widget class="GtkLabel" id="label_dist_name">
373- <property name="visible">True</property>
374- <property name="label" translatable="yes"></property>
375- <property name="use_underline">False</property>
376- <property name="use_markup">False</property>
377- <property name="justify">GTK_JUSTIFY_LEFT</property>
378- <property name="wrap">False</property>
379- <property name="selectable">False</property>
380- <property name="xalign">0.5</property>
381- <property name="yalign">0.5</property>
382- <property name="xpad">0</property>
383- <property name="ypad">0</property>
384- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
385- <property name="width_chars">-1</property>
386- <property name="single_line_mode">False</property>
387- <property name="angle">0</property>
388- </widget>
389- <packing>
390- <property name="type">tab</property>
391- </packing>
392- </child>
393-
394- <child>
395- <widget class="GtkVBox" id="vbox2">
396- <property name="border_width">12</property>
397- <property name="visible">True</property>
398- <property name="homogeneous">False</property>
399- <property name="spacing">6</property>
400-
401- <child>
402- <widget class="GtkScrolledWindow" id="scrolledwindow1">
403- <property name="visible">True</property>
404- <property name="can_focus">True</property>
405- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
406- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
407- <property name="shadow_type">GTK_SHADOW_IN</property>
408- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
409-
410- <child>
411- <widget class="GtkTreeView" id="treeview_sources">
412- <property name="visible">True</property>
413- <property name="can_focus">True</property>
414- <property name="headers_visible">False</property>
415- <property name="rules_hint">True</property>
416- <property name="reorderable">False</property>
417- <property name="enable_search">True</property>
418- <property name="fixed_height_mode">False</property>
419- <property name="hover_selection">False</property>
420- <property name="hover_expand">False</property>
421- <signal name="row_activated" handler="on_channel_activated" last_modification_time="Fri, 24 Mar 2006 12:56:00 GMT"/>
422- <signal name="cursor_changed" handler="on_treeview_sources_cursor_changed" last_modification_time="Fri, 24 Mar 2006 13:00:27 GMT"/>
423- </widget>
424- </child>
425- </widget>
426- <packing>
427- <property name="padding">0</property>
428- <property name="expand">True</property>
429- <property name="fill">True</property>
430- </packing>
431- </child>
432-
433- <child>
434- <widget class="GtkHBox" id="hbox8">
435- <property name="visible">True</property>
436- <property name="homogeneous">False</property>
437- <property name="spacing">18</property>
438-
439- <child>
440- <widget class="GtkHBox" id="hbox9">
441- <property name="visible">True</property>
442- <property name="homogeneous">True</property>
443- <property name="spacing">6</property>
444-
445- <child>
446- <widget class="GtkButton" id="button_add">
447- <property name="visible">True</property>
448- <property name="can_default">True</property>
449- <property name="can_focus">True</property>
450- <property name="relief">GTK_RELIEF_NORMAL</property>
451- <property name="focus_on_click">True</property>
452- <signal name="clicked" handler="on_add_clicked" last_modification_time="Tue, 05 Jul 2005 01:31:37 GMT"/>
453-
454- <child>
455- <widget class="GtkAlignment" id="alignment12">
456- <property name="visible">True</property>
457- <property name="xalign">0.5</property>
458- <property name="yalign">0.5</property>
459- <property name="xscale">0</property>
460- <property name="yscale">0</property>
461- <property name="top_padding">0</property>
462- <property name="bottom_padding">0</property>
463- <property name="left_padding">0</property>
464- <property name="right_padding">0</property>
465-
466- <child>
467- <widget class="GtkHBox" id="hbox13">
468- <property name="visible">True</property>
469- <property name="homogeneous">False</property>
470- <property name="spacing">2</property>
471-
472- <child>
473- <widget class="GtkImage" id="image3">
474- <property name="visible">True</property>
475- <property name="stock">gtk-add</property>
476- <property name="icon_size">4</property>
477- <property name="xalign">0.5</property>
478- <property name="yalign">0.5</property>
479- <property name="xpad">0</property>
480- <property name="ypad">0</property>
481- </widget>
482- <packing>
483- <property name="padding">0</property>
484- <property name="expand">False</property>
485- <property name="fill">False</property>
486- </packing>
487- </child>
488-
489- <child>
490- <widget class="GtkLabel" id="label22">
491- <property name="visible">True</property>
492- <property name="label" translatable="yes">Add...</property>
493- <property name="use_underline">True</property>
494- <property name="use_markup">False</property>
495- <property name="justify">GTK_JUSTIFY_LEFT</property>
496- <property name="wrap">False</property>
497- <property name="selectable">False</property>
498- <property name="xalign">0.5</property>
499- <property name="yalign">0.5</property>
500- <property name="xpad">0</property>
501- <property name="ypad">0</property>
502- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
503- <property name="width_chars">-1</property>
504- <property name="single_line_mode">False</property>
505- <property name="angle">0</property>
506- </widget>
507- <packing>
508- <property name="padding">0</property>
509- <property name="expand">False</property>
510- <property name="fill">False</property>
511- </packing>
512- </child>
513- </widget>
514- </child>
515- </widget>
516- </child>
517- </widget>
518- <packing>
519- <property name="padding">0</property>
520- <property name="expand">False</property>
521- <property name="fill">True</property>
522- </packing>
523- </child>
524-
525- <child>
526- <widget class="GtkButton" id="button_edit">
527- <property name="visible">True</property>
528- <property name="can_default">True</property>
529- <property name="can_focus">True</property>
530- <property name="relief">GTK_RELIEF_NORMAL</property>
531- <property name="focus_on_click">True</property>
532- <signal name="clicked" handler="on_edit_clicked" last_modification_time="Tue, 05 Jul 2005 02:18:34 GMT"/>
533-
534- <child>
535- <widget class="GtkAlignment" id="alignment13">
536- <property name="visible">True</property>
537- <property name="xalign">0.5</property>
538- <property name="yalign">0.5</property>
539- <property name="xscale">0</property>
540- <property name="yscale">0</property>
541- <property name="top_padding">0</property>
542- <property name="bottom_padding">0</property>
543- <property name="left_padding">0</property>
544- <property name="right_padding">0</property>
545-
546- <child>
547- <widget class="GtkHBox" id="hbox14">
548- <property name="visible">True</property>
549- <property name="homogeneous">False</property>
550- <property name="spacing">2</property>
551-
552- <child>
553- <widget class="GtkImage" id="image4">
554- <property name="visible">True</property>
555- <property name="stock">gtk-edit</property>
556- <property name="icon_size">4</property>
557- <property name="xalign">0.5</property>
558- <property name="yalign">0.5</property>
559- <property name="xpad">0</property>
560- <property name="ypad">0</property>
561- </widget>
562- <packing>
563- <property name="padding">0</property>
564- <property name="expand">False</property>
565- <property name="fill">False</property>
566- </packing>
567- </child>
568-
569- <child>
570- <widget class="GtkLabel" id="label23">
571- <property name="visible">True</property>
572- <property name="label" translatable="yes">Edit...</property>
573- <property name="use_underline">True</property>
574- <property name="use_markup">False</property>
575- <property name="justify">GTK_JUSTIFY_LEFT</property>
576- <property name="wrap">False</property>
577- <property name="selectable">False</property>
578- <property name="xalign">0.5</property>
579- <property name="yalign">0.5</property>
580- <property name="xpad">0</property>
581- <property name="ypad">0</property>
582- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
583- <property name="width_chars">-1</property>
584- <property name="single_line_mode">False</property>
585- <property name="angle">0</property>
586- </widget>
587- <packing>
588- <property name="padding">0</property>
589- <property name="expand">False</property>
590- <property name="fill">False</property>
591- </packing>
592- </child>
593- </widget>
594- </child>
595- </widget>
596- </child>
597- </widget>
598- <packing>
599- <property name="padding">0</property>
600- <property name="expand">False</property>
601- <property name="fill">True</property>
602- </packing>
603- </child>
604-
605- <child>
606- <widget class="GtkButton" id="button_remove">
607- <property name="visible">True</property>
608- <property name="can_default">True</property>
609- <property name="can_focus">True</property>
610- <property name="label">gtk-remove</property>
611- <property name="use_stock">True</property>
612- <property name="relief">GTK_RELIEF_NORMAL</property>
613- <property name="focus_on_click">True</property>
614- <signal name="clicked" handler="on_remove_clicked" last_modification_time="Tue, 05 Jul 2005 02:21:36 GMT"/>
615- </widget>
616- <packing>
617- <property name="padding">0</property>
618- <property name="expand">False</property>
619- <property name="fill">True</property>
620- </packing>
621- </child>
622- </widget>
623- <packing>
624- <property name="padding">0</property>
625- <property name="expand">False</property>
626- <property name="fill">True</property>
627- </packing>
628- </child>
629-
630- <child>
631- <widget class="GtkButton" id="button_add_cdrom">
632- <property name="visible">True</property>
633- <property name="can_focus">True</property>
634- <property name="relief">GTK_RELIEF_NORMAL</property>
635- <property name="focus_on_click">True</property>
636- <signal name="clicked" handler="on_button_add_cdrom_clicked" last_modification_time="Thu, 27 Jul 2006 22:19:37 GMT"/>
637-
638- <child>
639- <widget class="GtkAlignment" id="alignment14">
640- <property name="visible">True</property>
641- <property name="xalign">0.5</property>
642- <property name="yalign">0.5</property>
643- <property name="xscale">0</property>
644- <property name="yscale">0</property>
645- <property name="top_padding">0</property>
646- <property name="bottom_padding">0</property>
647- <property name="left_padding">0</property>
648- <property name="right_padding">0</property>
649-
650- <child>
651- <widget class="GtkHBox" id="hbox15">
652- <property name="visible">True</property>
653- <property name="homogeneous">False</property>
654- <property name="spacing">2</property>
655-
656- <child>
657- <widget class="GtkImage" id="image5">
658- <property name="visible">True</property>
659- <property name="stock">gtk-cdrom</property>
660- <property name="icon_size">4</property>
661- <property name="xalign">0.5</property>
662- <property name="yalign">0.5</property>
663- <property name="xpad">0</property>
664- <property name="ypad">0</property>
665- </widget>
666- <packing>
667- <property name="padding">0</property>
668- <property name="expand">False</property>
669- <property name="fill">False</property>
670- </packing>
671- </child>
672-
673- <child>
674- <widget class="GtkLabel" id="label24">
675- <property name="visible">True</property>
676- <property name="label" translatable="yes">Add CD-ROM...</property>
677- <property name="use_underline">True</property>
678- <property name="use_markup">False</property>
679- <property name="justify">GTK_JUSTIFY_LEFT</property>
680- <property name="wrap">False</property>
681- <property name="selectable">False</property>
682- <property name="xalign">0.5</property>
683- <property name="yalign">0.5</property>
684- <property name="xpad">0</property>
685- <property name="ypad">0</property>
686- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
687- <property name="width_chars">-1</property>
688- <property name="single_line_mode">False</property>
689- <property name="angle">0</property>
690- </widget>
691- <packing>
692- <property name="padding">0</property>
693- <property name="expand">False</property>
694- <property name="fill">False</property>
695- </packing>
696- </child>
697- </widget>
698- </child>
699- </widget>
700- </child>
701- </widget>
702- <packing>
703- <property name="padding">0</property>
704- <property name="expand">False</property>
705- <property name="fill">False</property>
706- <property name="pack_type">GTK_PACK_END</property>
707- </packing>
708- </child>
709- </widget>
710- <packing>
711- <property name="padding">0</property>
712- <property name="expand">False</property>
713- <property name="fill">True</property>
714- </packing>
715- </child>
716- </widget>
717- <packing>
718- <property name="tab_expand">False</property>
719- <property name="tab_fill">True</property>
720- </packing>
721- </child>
722-
723- <child>
724- <widget class="GtkLabel" id="label1">
725- <property name="visible">True</property>
726- <property name="label" translatable="yes">Other Software</property>
727- <property name="use_underline">False</property>
728- <property name="use_markup">False</property>
729- <property name="justify">GTK_JUSTIFY_LEFT</property>
730- <property name="wrap">False</property>
731- <property name="selectable">False</property>
732- <property name="xalign">0.5</property>
733- <property name="yalign">0.5</property>
734- <property name="xpad">0</property>
735- <property name="ypad">0</property>
736- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
737- <property name="width_chars">-1</property>
738- <property name="single_line_mode">False</property>
739- <property name="angle">0</property>
740- </widget>
741- <packing>
742- <property name="type">tab</property>
743- </packing>
744- </child>
745-
746- <child>
747- <widget class="GtkVBox" id="vbox8">
748- <property name="border_width">12</property>
749- <property name="visible">True</property>
750- <property name="homogeneous">False</property>
751- <property name="spacing">18</property>
752-
753- <child>
754- <widget class="GtkFrame" id="frame_children">
755- <property name="visible">True</property>
756- <property name="label_xalign">0</property>
757- <property name="label_yalign">0.5</property>
758- <property name="shadow_type">GTK_SHADOW_NONE</property>
759-
760- <child>
761- <widget class="GtkAlignment" id="alignment7">
762- <property name="visible">True</property>
763- <property name="xalign">0.5</property>
764- <property name="yalign">0.5</property>
765- <property name="xscale">1</property>
766- <property name="yscale">1</property>
767- <property name="top_padding">6</property>
768- <property name="bottom_padding">0</property>
769- <property name="left_padding">12</property>
770- <property name="right_padding">0</property>
771-
772- <child>
773- <widget class="GtkVBox" id="vbox_updates">
774- <property name="visible">True</property>
775- <property name="homogeneous">False</property>
776- <property name="spacing">6</property>
777-
778- <child>
779- <placeholder/>
780- </child>
781-
782- <child>
783- <placeholder/>
784- </child>
785-
786- <child>
787- <placeholder/>
788- </child>
789- </widget>
790- </child>
791- </widget>
792- </child>
793-
794- <child>
795- <widget class="GtkLabel" id="label_updates">
796- <property name="visible">True</property>
797- <property name="label" translatable="yes"></property>
798- <property name="use_underline">False</property>
799- <property name="use_markup">True</property>
800- <property name="justify">GTK_JUSTIFY_LEFT</property>
801- <property name="wrap">False</property>
802- <property name="selectable">False</property>
803- <property name="xalign">0.5</property>
804- <property name="yalign">0.5</property>
805- <property name="xpad">0</property>
806- <property name="ypad">0</property>
807- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
808- <property name="width_chars">-1</property>
809- <property name="single_line_mode">False</property>
810- <property name="angle">0</property>
811- </widget>
812- <packing>
813- <property name="type">label_item</property>
814- </packing>
815- </child>
816- </widget>
817- <packing>
818- <property name="padding">0</property>
819- <property name="expand">False</property>
820- <property name="fill">True</property>
821- </packing>
822- </child>
823-
824- <child>
825- <widget class="GtkFrame" id="frame2">
826- <property name="visible">True</property>
827- <property name="label_xalign">0</property>
828- <property name="label_yalign">0.5</property>
829- <property name="shadow_type">GTK_SHADOW_NONE</property>
830-
831- <child>
832- <widget class="GtkAlignment" id="alignment2">
833- <property name="visible">True</property>
834- <property name="xalign">0.5</property>
835- <property name="yalign">0.5</property>
836- <property name="xscale">1</property>
837- <property name="yscale">1</property>
838- <property name="top_padding">6</property>
839- <property name="bottom_padding">0</property>
840- <property name="left_padding">12</property>
841- <property name="right_padding">0</property>
842-
843- <child>
844- <widget class="GtkVBox" id="vbox3">
845- <property name="visible">True</property>
846- <property name="homogeneous">False</property>
847- <property name="spacing">6</property>
848-
849- <child>
850- <widget class="GtkHBox" id="hbox2">
851- <property name="visible">True</property>
852- <property name="homogeneous">False</property>
853- <property name="spacing">6</property>
854-
855- <child>
856- <widget class="GtkCheckButton" id="checkbutton_auto_update">
857- <property name="visible">True</property>
858- <property name="can_focus">True</property>
859- <property name="label" translatable="yes">Chec_k for updates:</property>
860- <property name="use_underline">True</property>
861- <property name="relief">GTK_RELIEF_NORMAL</property>
862- <property name="focus_on_click">True</property>
863- <property name="active">False</property>
864- <property name="inconsistent">False</property>
865- <property name="draw_indicator">True</property>
866- </widget>
867- <packing>
868- <property name="padding">0</property>
869- <property name="expand">False</property>
870- <property name="fill">True</property>
871- </packing>
872- </child>
873-
874- <child>
875- <widget class="GtkComboBox" id="combobox_update_interval">
876- <property name="visible">True</property>
877- <property name="items" translatable="yes"></property>
878- <property name="add_tearoffs">False</property>
879- <property name="focus_on_click">True</property>
880- </widget>
881- <packing>
882- <property name="padding">0</property>
883- <property name="expand">True</property>
884- <property name="fill">True</property>
885- </packing>
886- </child>
887- </widget>
888- <packing>
889- <property name="padding">0</property>
890- <property name="expand">False</property>
891- <property name="fill">False</property>
892- </packing>
893- </child>
894-
895- <child>
896- <widget class="GtkHBox" id="hbox7">
897- <property name="visible">True</property>
898- <property name="homogeneous">False</property>
899- <property name="spacing">0</property>
900-
901- <child>
902- <widget class="GtkLabel" id="label13">
903- <property name="visible">True</property>
904- <property name="label" translatable="yes"> </property>
905- <property name="use_underline">False</property>
906- <property name="use_markup">False</property>
907- <property name="justify">GTK_JUSTIFY_LEFT</property>
908- <property name="wrap">False</property>
909- <property name="selectable">False</property>
910- <property name="xalign">0.5</property>
911- <property name="yalign">0.5</property>
912- <property name="xpad">0</property>
913- <property name="ypad">0</property>
914- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
915- <property name="width_chars">-1</property>
916- <property name="single_line_mode">False</property>
917- <property name="angle">0</property>
918- </widget>
919- <packing>
920- <property name="padding">0</property>
921- <property name="expand">False</property>
922- <property name="fill">False</property>
923- </packing>
924- </child>
925-
926- <child>
927- <widget class="GtkVBox" id="vbox_auto_updates">
928- <property name="visible">True</property>
929- <property name="sensitive">False</property>
930- <property name="homogeneous">False</property>
931- <property name="spacing">6</property>
932-
933- <child>
934- <widget class="GtkRadioButton" id="radiobutton_updates_inst_sec">
935- <property name="visible">True</property>
936- <property name="can_focus">True</property>
937- <property name="label" translatable="yes">Install _security updates without confirmation</property>
938- <property name="use_underline">True</property>
939- <property name="relief">GTK_RELIEF_NORMAL</property>
940- <property name="focus_on_click">True</property>
941- <property name="active">False</property>
942- <property name="inconsistent">False</property>
943- <property name="draw_indicator">True</property>
944- </widget>
945- <packing>
946- <property name="padding">0</property>
947- <property name="expand">False</property>
948- <property name="fill">False</property>
949- </packing>
950- </child>
951-
952- <child>
953- <widget class="GtkRadioButton" id="radiobutton_updates_download">
954- <property name="visible">True</property>
955- <property name="can_focus">True</property>
956- <property name="label" translatable="yes">_Download all updates in the background</property>
957- <property name="use_underline">True</property>
958- <property name="relief">GTK_RELIEF_NORMAL</property>
959- <property name="focus_on_click">True</property>
960- <property name="active">False</property>
961- <property name="inconsistent">False</property>
962- <property name="draw_indicator">True</property>
963- <property name="group">radiobutton_updates_inst_sec</property>
964- </widget>
965- <packing>
966- <property name="padding">0</property>
967- <property name="expand">False</property>
968- <property name="fill">False</property>
969- </packing>
970- </child>
971-
972- <child>
973- <widget class="GtkRadioButton" id="radiobutton_updates_notify">
974- <property name="visible">True</property>
975- <property name="can_focus">True</property>
976- <property name="label" translatable="yes">Only _notify about available updates</property>
977- <property name="use_underline">True</property>
978- <property name="relief">GTK_RELIEF_NORMAL</property>
979- <property name="focus_on_click">True</property>
980- <property name="active">False</property>
981- <property name="inconsistent">False</property>
982- <property name="draw_indicator">True</property>
983- <property name="group">radiobutton_updates_inst_sec</property>
984- </widget>
985- <packing>
986- <property name="padding">0</property>
987- <property name="expand">False</property>
988- <property name="fill">False</property>
989- </packing>
990- </child>
991- </widget>
992- <packing>
993- <property name="padding">0</property>
994- <property name="expand">True</property>
995- <property name="fill">True</property>
996- </packing>
997- </child>
998- </widget>
999- <packing>
1000- <property name="padding">0</property>
1001- <property name="expand">False</property>
1002- <property name="fill">False</property>
1003- </packing>
1004- </child>
1005- </widget>
1006- </child>
1007- </widget>
1008- </child>
1009-
1010- <child>
1011- <widget class="GtkLabel" id="label4">
1012- <property name="visible">True</property>
1013- <property name="label" translatable="yes">&lt;b&gt;Automatic updates&lt;/b&gt;</property>
1014- <property name="use_underline">False</property>
1015- <property name="use_markup">True</property>
1016- <property name="justify">GTK_JUSTIFY_LEFT</property>
1017- <property name="wrap">False</property>
1018- <property name="selectable">False</property>
1019- <property name="xalign">0.5</property>
1020- <property name="yalign">0.5</property>
1021- <property name="xpad">0</property>
1022- <property name="ypad">0</property>
1023- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1024- <property name="width_chars">-1</property>
1025- <property name="single_line_mode">False</property>
1026- <property name="angle">0</property>
1027- </widget>
1028- <packing>
1029- <property name="type">label_item</property>
1030- </packing>
1031- </child>
1032- </widget>
1033- <packing>
1034- <property name="padding">0</property>
1035- <property name="expand">False</property>
1036- <property name="fill">True</property>
1037- </packing>
1038- </child>
1039-
1040- <child>
1041- <widget class="GtkFrame" id="frame8">
1042- <property name="visible">True</property>
1043- <property name="label_xalign">0</property>
1044- <property name="label_yalign">0.5</property>
1045- <property name="shadow_type">GTK_SHADOW_NONE</property>
1046-
1047- <child>
1048- <widget class="GtkAlignment" id="alignment15">
1049- <property name="visible">True</property>
1050- <property name="xalign">0.5</property>
1051- <property name="yalign">0.5</property>
1052- <property name="xscale">1</property>
1053- <property name="yscale">1</property>
1054- <property name="top_padding">0</property>
1055- <property name="bottom_padding">0</property>
1056- <property name="left_padding">12</property>
1057- <property name="right_padding">0</property>
1058-
1059- <child>
1060- <widget class="GtkVBox" id="vbox24">
1061- <property name="visible">True</property>
1062- <property name="homogeneous">False</property>
1063- <property name="spacing">0</property>
1064-
1065- <child>
1066- <widget class="GtkHBox" id="hbox18">
1067- <property name="visible">True</property>
1068- <property name="homogeneous">False</property>
1069- <property name="spacing">6</property>
1070-
1071- <child>
1072- <widget class="GtkLabel" id="label29">
1073- <property name="visible">True</property>
1074- <property name="label" translatable="yes">Show new distribution releases: </property>
1075- <property name="use_underline">False</property>
1076- <property name="use_markup">False</property>
1077- <property name="justify">GTK_JUSTIFY_LEFT</property>
1078- <property name="wrap">False</property>
1079- <property name="selectable">False</property>
1080- <property name="xalign">0.5</property>
1081- <property name="yalign">0.5</property>
1082- <property name="xpad">0</property>
1083- <property name="ypad">0</property>
1084- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1085- <property name="width_chars">-1</property>
1086- <property name="single_line_mode">False</property>
1087- <property name="angle">0</property>
1088- </widget>
1089- <packing>
1090- <property name="padding">0</property>
1091- <property name="expand">False</property>
1092- <property name="fill">False</property>
1093- </packing>
1094- </child>
1095-
1096- <child>
1097- <widget class="GtkComboBox" id="combobox_release_upgrades">
1098- <property name="visible">True</property>
1099- <property name="items" translatable="yes">Never
1100-Normal releases
1101-Long term support releases only</property>
1102- <property name="add_tearoffs">False</property>
1103- <property name="focus_on_click">True</property>
1104- </widget>
1105- <packing>
1106- <property name="padding">0</property>
1107- <property name="expand">True</property>
1108- <property name="fill">True</property>
1109- </packing>
1110- </child>
1111- </widget>
1112- <packing>
1113- <property name="padding">0</property>
1114- <property name="expand">False</property>
1115- <property name="fill">True</property>
1116- </packing>
1117- </child>
1118- </widget>
1119- </child>
1120- </widget>
1121- </child>
1122-
1123- <child>
1124- <widget class="GtkLabel" id="label28">
1125- <property name="visible">True</property>
1126- <property name="label" translatable="yes">&lt;b&gt;Release upgrade&lt;/b&gt;</property>
1127- <property name="use_underline">False</property>
1128- <property name="use_markup">True</property>
1129- <property name="justify">GTK_JUSTIFY_LEFT</property>
1130- <property name="wrap">False</property>
1131- <property name="selectable">False</property>
1132- <property name="xalign">0.5</property>
1133- <property name="yalign">0.5</property>
1134- <property name="xpad">0</property>
1135- <property name="ypad">0</property>
1136- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1137- <property name="width_chars">-1</property>
1138- <property name="single_line_mode">False</property>
1139- <property name="angle">0</property>
1140- </widget>
1141- <packing>
1142- <property name="type">label_item</property>
1143- </packing>
1144- </child>
1145- </widget>
1146- <packing>
1147- <property name="padding">0</property>
1148- <property name="expand">True</property>
1149- <property name="fill">True</property>
1150- </packing>
1151- </child>
1152- </widget>
1153- <packing>
1154- <property name="tab_expand">False</property>
1155- <property name="tab_fill">True</property>
1156- </packing>
1157- </child>
1158-
1159- <child>
1160- <widget class="GtkLabel" id="label_updates12">
1161- <property name="visible">True</property>
1162- <property name="label" translatable="yes">Updates</property>
1163- <property name="use_underline">False</property>
1164- <property name="use_markup">False</property>
1165- <property name="justify">GTK_JUSTIFY_LEFT</property>
1166- <property name="wrap">False</property>
1167- <property name="selectable">False</property>
1168- <property name="xalign">0.5</property>
1169- <property name="yalign">0.5</property>
1170- <property name="xpad">0</property>
1171- <property name="ypad">0</property>
1172- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1173- <property name="width_chars">-1</property>
1174- <property name="single_line_mode">False</property>
1175- <property name="angle">0</property>
1176- </widget>
1177- <packing>
1178- <property name="type">tab</property>
1179- </packing>
1180- </child>
1181-
1182- <child>
1183- <widget class="GtkVBox" id="vbox23">
1184- <property name="border_width">12</property>
1185- <property name="visible">True</property>
1186- <property name="homogeneous">False</property>
1187- <property name="spacing">6</property>
1188-
1189- <child>
1190- <widget class="GtkLabel" id="label27">
1191- <property name="visible">True</property>
1192- <property name="label" translatable="yes">&lt;b&gt;Trusted software providers&lt;/b&gt;</property>
1193- <property name="use_underline">False</property>
1194- <property name="use_markup">True</property>
1195- <property name="justify">GTK_JUSTIFY_LEFT</property>
1196- <property name="wrap">False</property>
1197- <property name="selectable">False</property>
1198- <property name="xalign">0</property>
1199- <property name="yalign">0.5</property>
1200- <property name="xpad">0</property>
1201- <property name="ypad">0</property>
1202- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1203- <property name="width_chars">-1</property>
1204- <property name="single_line_mode">False</property>
1205- <property name="angle">0</property>
1206- </widget>
1207- <packing>
1208- <property name="padding">0</property>
1209- <property name="expand">False</property>
1210- <property name="fill">False</property>
1211- </packing>
1212- </child>
1213-
1214- <child>
1215- <widget class="GtkHBox" id="hbox17">
1216- <property name="visible">True</property>
1217- <property name="homogeneous">False</property>
1218- <property name="spacing">0</property>
1219-
1220- <child>
1221- <widget class="GtkLabel" id="label26">
1222- <property name="visible">True</property>
1223- <property name="label" translatable="yes"> </property>
1224- <property name="use_underline">False</property>
1225- <property name="use_markup">False</property>
1226- <property name="justify">GTK_JUSTIFY_LEFT</property>
1227- <property name="wrap">False</property>
1228- <property name="selectable">False</property>
1229- <property name="xalign">0.5</property>
1230- <property name="yalign">0.5</property>
1231- <property name="xpad">0</property>
1232- <property name="ypad">0</property>
1233- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1234- <property name="width_chars">-1</property>
1235- <property name="single_line_mode">False</property>
1236- <property name="angle">0</property>
1237- </widget>
1238- <packing>
1239- <property name="padding">0</property>
1240- <property name="expand">False</property>
1241- <property name="fill">False</property>
1242- </packing>
1243- </child>
1244-
1245- <child>
1246- <widget class="GtkVBox" id="vbox4">
1247- <property name="visible">True</property>
1248- <property name="homogeneous">False</property>
1249- <property name="spacing">6</property>
1250-
1251- <child>
1252- <widget class="GtkScrolledWindow" id="scrolledwindow2">
1253- <property name="visible">True</property>
1254- <property name="can_focus">True</property>
1255- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1256- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1257- <property name="shadow_type">GTK_SHADOW_IN</property>
1258- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
1259-
1260- <child>
1261- <widget class="GtkTreeView" id="treeview_auth">
1262- <property name="visible">True</property>
1263- <property name="tooltip" translatable="yes">Keys are used to authenticate the correct source of software and so protect your computer from malicious software</property>
1264- <property name="can_focus">True</property>
1265- <property name="headers_visible">False</property>
1266- <property name="rules_hint">True</property>
1267- <property name="reorderable">False</property>
1268- <property name="enable_search">True</property>
1269- <property name="fixed_height_mode">False</property>
1270- <property name="hover_selection">False</property>
1271- <property name="hover_expand">False</property>
1272- </widget>
1273- </child>
1274- </widget>
1275- <packing>
1276- <property name="padding">0</property>
1277- <property name="expand">True</property>
1278- <property name="fill">True</property>
1279- </packing>
1280- </child>
1281-
1282- <child>
1283- <widget class="GtkHBox" id="hbox3">
1284- <property name="visible">True</property>
1285- <property name="homogeneous">False</property>
1286- <property name="spacing">6</property>
1287-
1288- <child>
1289- <widget class="GtkButton" id="button_auth_add">
1290- <property name="visible">True</property>
1291- <property name="tooltip" translatable="yes">Import the public key from a trusted software provider</property>
1292- <property name="can_focus">True</property>
1293- <property name="relief">GTK_RELIEF_NORMAL</property>
1294- <property name="focus_on_click">True</property>
1295- <signal name="clicked" handler="add_key_clicked" last_modification_time="Tue, 05 Jul 2005 04:09:24 GMT"/>
1296-
1297- <child>
1298- <widget class="GtkAlignment" id="alignment10">
1299- <property name="visible">True</property>
1300- <property name="xalign">0.5</property>
1301- <property name="yalign">0.5</property>
1302- <property name="xscale">0</property>
1303- <property name="yscale">0</property>
1304- <property name="top_padding">0</property>
1305- <property name="bottom_padding">0</property>
1306- <property name="left_padding">0</property>
1307- <property name="right_padding">0</property>
1308-
1309- <child>
1310- <widget class="GtkHBox" id="hbox10">
1311- <property name="visible">True</property>
1312- <property name="homogeneous">False</property>
1313- <property name="spacing">2</property>
1314-
1315- <child>
1316- <widget class="GtkImage" id="image1">
1317- <property name="visible">True</property>
1318- <property name="stock">gtk-add</property>
1319- <property name="icon_size">4</property>
1320- <property name="xalign">0.5</property>
1321- <property name="yalign">0.5</property>
1322- <property name="xpad">0</property>
1323- <property name="ypad">0</property>
1324- </widget>
1325- <packing>
1326- <property name="padding">0</property>
1327- <property name="expand">False</property>
1328- <property name="fill">False</property>
1329- </packing>
1330- </child>
1331-
1332- <child>
1333- <widget class="GtkLabel" id="label18">
1334- <property name="visible">True</property>
1335- <property name="label" translatable="yes">_Import Key File...</property>
1336- <property name="use_underline">True</property>
1337- <property name="use_markup">False</property>
1338- <property name="justify">GTK_JUSTIFY_LEFT</property>
1339- <property name="wrap">False</property>
1340- <property name="selectable">False</property>
1341- <property name="xalign">0.5</property>
1342- <property name="yalign">0.5</property>
1343- <property name="xpad">0</property>
1344- <property name="ypad">0</property>
1345- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1346- <property name="width_chars">-1</property>
1347- <property name="single_line_mode">False</property>
1348- <property name="angle">0</property>
1349- </widget>
1350- <packing>
1351- <property name="padding">0</property>
1352- <property name="expand">False</property>
1353- <property name="fill">False</property>
1354- </packing>
1355- </child>
1356- </widget>
1357- </child>
1358- </widget>
1359- </child>
1360- </widget>
1361- <packing>
1362- <property name="padding">0</property>
1363- <property name="expand">False</property>
1364- <property name="fill">False</property>
1365- </packing>
1366- </child>
1367-
1368- <child>
1369- <widget class="GtkButton" id="button_auth_restor">
1370- <property name="visible">True</property>
1371- <property name="tooltip" translatable="yes">Restore the default keys of your distribution</property>
1372- <property name="can_focus">True</property>
1373- <property name="label" translatable="yes">Restore _Defaults</property>
1374- <property name="use_underline">True</property>
1375- <property name="relief">GTK_RELIEF_NORMAL</property>
1376- <property name="focus_on_click">True</property>
1377- <signal name="clicked" handler="on_restore_clicked" last_modification_time="Tue, 05 Jul 2005 04:24:19 GMT"/>
1378- </widget>
1379- <packing>
1380- <property name="padding">0</property>
1381- <property name="expand">False</property>
1382- <property name="fill">False</property>
1383- <property name="pack_type">GTK_PACK_END</property>
1384- </packing>
1385- </child>
1386-
1387- <child>
1388- <widget class="GtkButton" id="button_auth_remove">
1389- <property name="visible">True</property>
1390- <property name="can_focus">True</property>
1391- <property name="label">gtk-remove</property>
1392- <property name="use_stock">True</property>
1393- <property name="relief">GTK_RELIEF_NORMAL</property>
1394- <property name="focus_on_click">True</property>
1395- <signal name="clicked" handler="remove_key_clicked" last_modification_time="Tue, 05 Jul 2005 04:19:25 GMT"/>
1396- </widget>
1397- <packing>
1398- <property name="padding">0</property>
1399- <property name="expand">False</property>
1400- <property name="fill">False</property>
1401- </packing>
1402- </child>
1403- </widget>
1404- <packing>
1405- <property name="padding">0</property>
1406- <property name="expand">False</property>
1407- <property name="fill">True</property>
1408- </packing>
1409- </child>
1410- </widget>
1411- <packing>
1412- <property name="padding">0</property>
1413- <property name="expand">True</property>
1414- <property name="fill">True</property>
1415- </packing>
1416- </child>
1417- </widget>
1418- <packing>
1419- <property name="padding">0</property>
1420- <property name="expand">True</property>
1421- <property name="fill">True</property>
1422- </packing>
1423- </child>
1424- </widget>
1425- <packing>
1426- <property name="tab_expand">False</property>
1427- <property name="tab_fill">True</property>
1428- </packing>
1429- </child>
1430-
1431- <child>
1432- <widget class="GtkLabel" id="label2">
1433- <property name="visible">True</property>
1434- <property name="label" translatable="yes">Authentication</property>
1435- <property name="use_underline">False</property>
1436- <property name="use_markup">False</property>
1437- <property name="justify">GTK_JUSTIFY_LEFT</property>
1438- <property name="wrap">False</property>
1439- <property name="selectable">False</property>
1440- <property name="xalign">0.5</property>
1441- <property name="yalign">0.5</property>
1442- <property name="xpad">0</property>
1443- <property name="ypad">0</property>
1444- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1445- <property name="width_chars">-1</property>
1446- <property name="single_line_mode">False</property>
1447- <property name="angle">0</property>
1448- </widget>
1449- <packing>
1450- <property name="type">tab</property>
1451- </packing>
1452- </child>
1453-
1454- <child>
1455- <widget class="GtkVBox" id="vbox_popcon">
1456- <property name="border_width">12</property>
1457- <property name="homogeneous">False</property>
1458- <property name="spacing">6</property>
1459-
1460- <child>
1461- <widget class="GtkCheckButton" id="checkbutton_popcon">
1462- <property name="visible">True</property>
1463- <property name="can_focus">True</property>
1464- <property name="label" translatable="yes">Submit statistical information</property>
1465- <property name="use_underline">True</property>
1466- <property name="relief">GTK_RELIEF_NORMAL</property>
1467- <property name="focus_on_click">True</property>
1468- <property name="active">False</property>
1469- <property name="inconsistent">False</property>
1470- <property name="draw_indicator">True</property>
1471- <signal name="toggled" handler="on_checkbutton_popcon_toggled" last_modification_time="Fri, 21 Jul 2006 17:13:17 GMT"/>
1472- </widget>
1473- <packing>
1474- <property name="padding">0</property>
1475- <property name="expand">False</property>
1476- <property name="fill">False</property>
1477- </packing>
1478- </child>
1479-
1480- <child>
1481- <widget class="GtkHBox" id="hbox16">
1482- <property name="visible">True</property>
1483- <property name="homogeneous">False</property>
1484- <property name="spacing">0</property>
1485-
1486- <child>
1487- <widget class="GtkLabel" id="label25">
1488- <property name="visible">True</property>
1489- <property name="label" translatable="yes"> </property>
1490- <property name="use_underline">False</property>
1491- <property name="use_markup">False</property>
1492- <property name="justify">GTK_JUSTIFY_LEFT</property>
1493- <property name="wrap">False</property>
1494- <property name="selectable">False</property>
1495- <property name="xalign">0.5</property>
1496- <property name="yalign">0.5</property>
1497- <property name="xpad">0</property>
1498- <property name="ypad">0</property>
1499- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1500- <property name="width_chars">-1</property>
1501- <property name="single_line_mode">False</property>
1502- <property name="angle">0</property>
1503- </widget>
1504- <packing>
1505- <property name="padding">0</property>
1506- <property name="expand">False</property>
1507- <property name="fill">False</property>
1508- </packing>
1509- </child>
1510-
1511- <child>
1512- <widget class="GtkLabel" id="label_popcon_desc">
1513- <property name="visible">True</property>
1514- <property name="label" translatable="yes"></property>
1515- <property name="use_underline">False</property>
1516- <property name="use_markup">True</property>
1517- <property name="justify">GTK_JUSTIFY_LEFT</property>
1518- <property name="wrap">True</property>
1519- <property name="selectable">False</property>
1520- <property name="xalign">0</property>
1521- <property name="yalign">0.5</property>
1522- <property name="xpad">0</property>
1523- <property name="ypad">0</property>
1524- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1525- <property name="width_chars">-1</property>
1526- <property name="single_line_mode">False</property>
1527- <property name="angle">0</property>
1528- </widget>
1529- <packing>
1530- <property name="padding">0</property>
1531- <property name="expand">False</property>
1532- <property name="fill">False</property>
1533- </packing>
1534- </child>
1535- </widget>
1536- <packing>
1537- <property name="padding">0</property>
1538- <property name="expand">False</property>
1539- <property name="fill">False</property>
1540- </packing>
1541- </child>
1542- </widget>
1543- <packing>
1544- <property name="tab_expand">False</property>
1545- <property name="tab_fill">True</property>
1546- </packing>
1547- </child>
1548-
1549- <child>
1550- <widget class="GtkLabel" id="label19">
1551- <property name="visible">True</property>
1552- <property name="label" translatable="yes">Statistics</property>
1553- <property name="use_underline">False</property>
1554- <property name="use_markup">False</property>
1555- <property name="justify">GTK_JUSTIFY_LEFT</property>
1556- <property name="wrap">False</property>
1557- <property name="selectable">False</property>
1558- <property name="xalign">0.5</property>
1559- <property name="yalign">0.5</property>
1560- <property name="xpad">0</property>
1561- <property name="ypad">0</property>
1562- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1563- <property name="width_chars">-1</property>
1564- <property name="single_line_mode">False</property>
1565- <property name="angle">0</property>
1566- </widget>
1567- <packing>
1568- <property name="type">tab</property>
1569- </packing>
1570- </child>
1571- </widget>
1572- <packing>
1573- <property name="padding">0</property>
1574- <property name="expand">True</property>
1575- <property name="fill">True</property>
1576- </packing>
1577- </child>
1578-
1579- <child>
1580- <widget class="GtkHBox" id="hbox11">
1581- <property name="border_width">6</property>
1582- <property name="visible">True</property>
1583- <property name="homogeneous">False</property>
1584- <property name="spacing">6</property>
1585-
1586- <child>
1587- <widget class="GtkButton" id="button_help">
1588- <property name="can_default">True</property>
1589- <property name="can_focus">True</property>
1590- <property name="label">gtk-help</property>
1591- <property name="use_stock">True</property>
1592- <property name="relief">GTK_RELIEF_NORMAL</property>
1593- <property name="focus_on_click">True</property>
1594- <signal name="clicked" handler="on_help_button" last_modification_time="Mon, 04 Jul 2005 21:19:04 GMT"/>
1595- </widget>
1596- <packing>
1597- <property name="padding">0</property>
1598- <property name="expand">False</property>
1599- <property name="fill">False</property>
1600- </packing>
1601- </child>
1602-
1603- <child>
1604- <widget class="GtkButton" id="button_close">
1605- <property name="visible">True</property>
1606- <property name="can_default">True</property>
1607- <property name="can_focus">True</property>
1608- <property name="label">gtk-close</property>
1609- <property name="use_stock">True</property>
1610- <property name="relief">GTK_RELIEF_NORMAL</property>
1611- <property name="focus_on_click">True</property>
1612- <signal name="clicked" handler="on_close_button" last_modification_time="Mon, 04 Jul 2005 21:18:56 GMT"/>
1613- </widget>
1614- <packing>
1615- <property name="padding">0</property>
1616- <property name="expand">False</property>
1617- <property name="fill">False</property>
1618- <property name="pack_type">GTK_PACK_END</property>
1619- </packing>
1620- </child>
1621-
1622- <child>
1623- <widget class="GtkButton" id="button_revert">
1624- <property name="visible">True</property>
1625- <property name="sensitive">False</property>
1626- <property name="can_default">True</property>
1627- <property name="can_focus">True</property>
1628- <property name="label">gtk-revert-to-saved</property>
1629- <property name="use_stock">True</property>
1630- <property name="relief">GTK_RELIEF_NORMAL</property>
1631- <property name="focus_on_click">True</property>
1632- <signal name="clicked" handler="on_button_revert_clicked" last_modification_time="Thu, 27 Jul 2006 21:47:47 GMT"/>
1633- </widget>
1634- <packing>
1635- <property name="padding">0</property>
1636- <property name="expand">False</property>
1637- <property name="fill">False</property>
1638- <property name="pack_type">GTK_PACK_END</property>
1639- </packing>
1640- </child>
1641- </widget>
1642- <packing>
1643- <property name="padding">0</property>
1644- <property name="expand">False</property>
1645- <property name="fill">True</property>
1646- </packing>
1647- </child>
1648- </widget>
1649- </child>
1650-</widget>
1651-
1652+ <!-- interface-requires gtk+ 2.6 -->
1653+ <!-- interface-naming-policy toplevel-contextual -->
1654+ <widget class="GtkWindow" id="window_main">
1655+ <property name="border_width">6</property>
1656+ <property name="title" translatable="yes">Software Sources</property>
1657+ <property name="window_position">center</property>
1658+ <signal name="delete_event" handler="on_delete_event"/>
1659+ <child>
1660+ <widget class="GtkVBox" id="vbox1">
1661+ <property name="visible">True</property>
1662+ <child>
1663+ <widget class="GtkNotebook" id="notebook_main">
1664+ <property name="visible">True</property>
1665+ <property name="can_focus">True</property>
1666+ <property name="border_width">6</property>
1667+ <child>
1668+ <widget class="GtkVBox" id="vbox5">
1669+ <property name="visible">True</property>
1670+ <property name="border_width">12</property>
1671+ <property name="spacing">18</property>
1672+ <child>
1673+ <widget class="GtkFrame" id="frame4">
1674+ <property name="visible">True</property>
1675+ <property name="label_xalign">0</property>
1676+ <property name="shadow_type">none</property>
1677+ <child>
1678+ <widget class="GtkAlignment" id="alignment5">
1679+ <property name="visible">True</property>
1680+ <property name="top_padding">6</property>
1681+ <property name="left_padding">12</property>
1682+ <child>
1683+ <widget class="GtkVBox" id="vbox10">
1684+ <property name="visible">True</property>
1685+ <property name="spacing">18</property>
1686+ <child>
1687+ <widget class="GtkVBox" id="vbox13">
1688+ <property name="visible">True</property>
1689+ <property name="spacing">6</property>
1690+ <child>
1691+ <widget class="GtkVBox" id="vbox21">
1692+ <property name="visible">True</property>
1693+ <property name="spacing">6</property>
1694+ <child>
1695+ <widget class="GtkVBox" id="vbox_dist_comps">
1696+ <property name="visible">True</property>
1697+ <property name="spacing">6</property>
1698+ <child>
1699+ <placeholder/>
1700+ </child>
1701+ </widget>
1702+ <packing>
1703+ <property name="position">0</property>
1704+ </packing>
1705+ </child>
1706+ <child>
1707+ <widget class="GtkCheckButton" id="checkbutton_source_code">
1708+ <property name="label" translatable="yes">Source code</property>
1709+ <property name="visible">True</property>
1710+ <property name="can_focus">True</property>
1711+ <property name="receives_default">False</property>
1712+ <property name="use_underline">True</property>
1713+ <property name="draw_indicator">True</property>
1714+ </widget>
1715+ <packing>
1716+ <property name="expand">False</property>
1717+ <property name="fill">False</property>
1718+ <property name="position">1</property>
1719+ </packing>
1720+ </child>
1721+ </widget>
1722+ <packing>
1723+ <property name="position">0</property>
1724+ </packing>
1725+ </child>
1726+ <child>
1727+ <widget class="GtkHBox" id="hbox6">
1728+ <property name="visible">True</property>
1729+ <property name="spacing">12</property>
1730+ <child>
1731+ <widget class="GtkLabel" id="label15">
1732+ <property name="visible">True</property>
1733+ <property name="label" translatable="yes">Download from:</property>
1734+ </widget>
1735+ <packing>
1736+ <property name="expand">False</property>
1737+ <property name="fill">False</property>
1738+ <property name="position">0</property>
1739+ </packing>
1740+ </child>
1741+ <child>
1742+ <widget class="GtkComboBox" id="combobox_server">
1743+ <property name="visible">True</property>
1744+ </widget>
1745+ <packing>
1746+ <property name="position">1</property>
1747+ </packing>
1748+ </child>
1749+ </widget>
1750+ <packing>
1751+ <property name="position">1</property>
1752+ </packing>
1753+ </child>
1754+ </widget>
1755+ <packing>
1756+ <property name="position">0</property>
1757+ </packing>
1758+ </child>
1759+ </widget>
1760+ </child>
1761+ </widget>
1762+ </child>
1763+ <child>
1764+ <widget class="GtkLabel" id="label_title1">
1765+ <property name="visible">True</property>
1766+ <property name="label" translatable="yes">&lt;b&gt;Downloadable from the Internet&lt;/b&gt;</property>
1767+ <property name="use_markup">True</property>
1768+ </widget>
1769+ <packing>
1770+ <property name="type">label_item</property>
1771+ </packing>
1772+ </child>
1773+ </widget>
1774+ <packing>
1775+ <property name="expand">False</property>
1776+ <property name="position">0</property>
1777+ </packing>
1778+ </child>
1779+ <child>
1780+ <widget class="GtkFrame" id="frame7">
1781+ <property name="visible">True</property>
1782+ <property name="label_xalign">0</property>
1783+ <property name="shadow_type">none</property>
1784+ <child>
1785+ <widget class="GtkAlignment" id="alignment8">
1786+ <property name="visible">True</property>
1787+ <property name="top_padding">6</property>
1788+ <property name="left_padding">12</property>
1789+ <child>
1790+ <widget class="GtkVBox" id="vbox11">
1791+ <property name="visible">True</property>
1792+ <property name="spacing">6</property>
1793+ <child>
1794+ <widget class="GtkVBox" id="vbox22">
1795+ <property name="visible">True</property>
1796+ <child>
1797+ <widget class="GtkScrolledWindow" id="scrolledwindow_no_cd">
1798+ <property name="visible">True</property>
1799+ <property name="can_focus">True</property>
1800+ <property name="hscrollbar_policy">automatic</property>
1801+ <property name="vscrollbar_policy">automatic</property>
1802+ <property name="shadow_type">in</property>
1803+ <child>
1804+ <widget class="GtkTextView" id="textview_no_cd">
1805+ <property name="visible">True</property>
1806+ <property name="sensitive">False</property>
1807+ <property name="can_focus">True</property>
1808+ <property name="pixels_above_lines">6</property>
1809+ <property name="editable">False</property>
1810+ <property name="wrap_mode">word</property>
1811+ <property name="left_margin">6</property>
1812+ <property name="right_margin">6</property>
1813+ <property name="cursor_visible">False</property>
1814+ <property name="text" translatable="yes">To install from a CD-ROM or DVD, insert the medium into the drive.</property>
1815+ </widget>
1816+ </child>
1817+ </widget>
1818+ <packing>
1819+ <property name="position">0</property>
1820+ </packing>
1821+ </child>
1822+ <child>
1823+ <widget class="GtkScrolledWindow" id="scrolledwindow_cd">
1824+ <property name="height_request">75</property>
1825+ <property name="visible">True</property>
1826+ <property name="can_focus">True</property>
1827+ <property name="hscrollbar_policy">automatic</property>
1828+ <property name="vscrollbar_policy">automatic</property>
1829+ <property name="shadow_type">in</property>
1830+ <child>
1831+ <widget class="GtkTreeView" id="treeview_cdroms">
1832+ <property name="height_request">109</property>
1833+ <property name="visible">True</property>
1834+ <property name="can_focus">True</property>
1835+ <property name="headers_visible">False</property>
1836+ <property name="rules_hint">True</property>
1837+ </widget>
1838+ </child>
1839+ </widget>
1840+ <packing>
1841+ <property name="position">1</property>
1842+ </packing>
1843+ </child>
1844+ </widget>
1845+ <packing>
1846+ <property name="position">0</property>
1847+ </packing>
1848+ </child>
1849+ </widget>
1850+ </child>
1851+ </widget>
1852+ </child>
1853+ <child>
1854+ <widget class="GtkLabel" id="label14">
1855+ <property name="visible">True</property>
1856+ <property name="label" translatable="yes">&lt;b&gt;Installable from CD-ROM/DVD&lt;/b&gt;</property>
1857+ <property name="use_markup">True</property>
1858+ </widget>
1859+ <packing>
1860+ <property name="type">label_item</property>
1861+ </packing>
1862+ </child>
1863+ </widget>
1864+ <packing>
1865+ <property name="position">1</property>
1866+ </packing>
1867+ </child>
1868+ </widget>
1869+ </child>
1870+ <child>
1871+ <widget class="GtkLabel" id="label_dist_name">
1872+ <property name="visible">True</property>
1873+ </widget>
1874+ <packing>
1875+ <property name="tab_fill">False</property>
1876+ <property name="type">tab</property>
1877+ </packing>
1878+ </child>
1879+ <child>
1880+ <widget class="GtkVBox" id="vbox2">
1881+ <property name="visible">True</property>
1882+ <property name="border_width">12</property>
1883+ <property name="spacing">6</property>
1884+ <child>
1885+ <widget class="GtkScrolledWindow" id="scrolledwindow1">
1886+ <property name="visible">True</property>
1887+ <property name="can_focus">True</property>
1888+ <property name="hscrollbar_policy">automatic</property>
1889+ <property name="vscrollbar_policy">automatic</property>
1890+ <property name="shadow_type">in</property>
1891+ <child>
1892+ <widget class="GtkTreeView" id="treeview_sources">
1893+ <property name="visible">True</property>
1894+ <property name="can_focus">True</property>
1895+ <property name="headers_visible">False</property>
1896+ <property name="rules_hint">True</property>
1897+ <signal name="cursor_changed" handler="on_treeview_sources_cursor_changed"/>
1898+ <signal name="row_activated" handler="on_channel_activated"/>
1899+ </widget>
1900+ </child>
1901+ </widget>
1902+ <packing>
1903+ <property name="position">0</property>
1904+ </packing>
1905+ </child>
1906+ <child>
1907+ <widget class="GtkHBox" id="hbox8">
1908+ <property name="visible">True</property>
1909+ <property name="spacing">18</property>
1910+ <child>
1911+ <widget class="GtkHBox" id="hbox9">
1912+ <property name="visible">True</property>
1913+ <property name="spacing">6</property>
1914+ <property name="homogeneous">True</property>
1915+ <child>
1916+ <widget class="GtkButton" id="button_add">
1917+ <property name="visible">True</property>
1918+ <property name="can_focus">True</property>
1919+ <property name="can_default">True</property>
1920+ <property name="receives_default">False</property>
1921+ <signal name="clicked" handler="on_add_clicked"/>
1922+ <child>
1923+ <widget class="GtkAlignment" id="alignment12">
1924+ <property name="visible">True</property>
1925+ <property name="xscale">0</property>
1926+ <property name="yscale">0</property>
1927+ <child>
1928+ <widget class="GtkHBox" id="hbox13">
1929+ <property name="visible">True</property>
1930+ <property name="spacing">2</property>
1931+ <child>
1932+ <widget class="GtkImage" id="image3">
1933+ <property name="visible">True</property>
1934+ <property name="stock">gtk-add</property>
1935+ </widget>
1936+ <packing>
1937+ <property name="expand">False</property>
1938+ <property name="fill">False</property>
1939+ <property name="position">0</property>
1940+ </packing>
1941+ </child>
1942+ <child>
1943+ <widget class="GtkLabel" id="label22">
1944+ <property name="visible">True</property>
1945+ <property name="label" translatable="yes">Add...</property>
1946+ <property name="use_underline">True</property>
1947+ </widget>
1948+ <packing>
1949+ <property name="expand">False</property>
1950+ <property name="fill">False</property>
1951+ <property name="position">1</property>
1952+ </packing>
1953+ </child>
1954+ </widget>
1955+ </child>
1956+ </widget>
1957+ </child>
1958+ </widget>
1959+ <packing>
1960+ <property name="expand">False</property>
1961+ <property name="position">0</property>
1962+ </packing>
1963+ </child>
1964+ <child>
1965+ <widget class="GtkButton" id="button_edit">
1966+ <property name="visible">True</property>
1967+ <property name="can_focus">True</property>
1968+ <property name="can_default">True</property>
1969+ <property name="receives_default">False</property>
1970+ <signal name="clicked" handler="on_edit_clicked"/>
1971+ <child>
1972+ <widget class="GtkAlignment" id="alignment13">
1973+ <property name="visible">True</property>
1974+ <property name="xscale">0</property>
1975+ <property name="yscale">0</property>
1976+ <child>
1977+ <widget class="GtkHBox" id="hbox14">
1978+ <property name="visible">True</property>
1979+ <property name="spacing">2</property>
1980+ <child>
1981+ <widget class="GtkImage" id="image4">
1982+ <property name="visible">True</property>
1983+ <property name="stock">gtk-edit</property>
1984+ </widget>
1985+ <packing>
1986+ <property name="expand">False</property>
1987+ <property name="fill">False</property>
1988+ <property name="position">0</property>
1989+ </packing>
1990+ </child>
1991+ <child>
1992+ <widget class="GtkLabel" id="label23">
1993+ <property name="visible">True</property>
1994+ <property name="label" translatable="yes">Edit...</property>
1995+ <property name="use_underline">True</property>
1996+ </widget>
1997+ <packing>
1998+ <property name="expand">False</property>
1999+ <property name="fill">False</property>
2000+ <property name="position">1</property>
2001+ </packing>
2002+ </child>
2003+ </widget>
2004+ </child>
2005+ </widget>
2006+ </child>
2007+ </widget>
2008+ <packing>
2009+ <property name="expand">False</property>
2010+ <property name="position">1</property>
2011+ </packing>
2012+ </child>
2013+ <child>
2014+ <widget class="GtkButton" id="button_remove">
2015+ <property name="label">gtk-remove</property>
2016+ <property name="visible">True</property>
2017+ <property name="can_focus">True</property>
2018+ <property name="can_default">True</property>
2019+ <property name="receives_default">False</property>
2020+ <property name="use_stock">True</property>
2021+ <signal name="clicked" handler="on_remove_clicked"/>
2022+ </widget>
2023+ <packing>
2024+ <property name="expand">False</property>
2025+ <property name="position">2</property>
2026+ </packing>
2027+ </child>
2028+ </widget>
2029+ <packing>
2030+ <property name="expand">False</property>
2031+ <property name="position">0</property>
2032+ </packing>
2033+ </child>
2034+ <child>
2035+ <widget class="GtkButton" id="button_add_cdrom">
2036+ <property name="visible">True</property>
2037+ <property name="can_focus">True</property>
2038+ <property name="receives_default">False</property>
2039+ <signal name="clicked" handler="on_button_add_cdrom_clicked"/>
2040+ <child>
2041+ <widget class="GtkAlignment" id="alignment14">
2042+ <property name="visible">True</property>
2043+ <property name="xscale">0</property>
2044+ <property name="yscale">0</property>
2045+ <child>
2046+ <widget class="GtkHBox" id="hbox15">
2047+ <property name="visible">True</property>
2048+ <property name="spacing">2</property>
2049+ <child>
2050+ <widget class="GtkImage" id="image5">
2051+ <property name="visible">True</property>
2052+ <property name="stock">gtk-cdrom</property>
2053+ </widget>
2054+ <packing>
2055+ <property name="expand">False</property>
2056+ <property name="fill">False</property>
2057+ <property name="position">0</property>
2058+ </packing>
2059+ </child>
2060+ <child>
2061+ <widget class="GtkLabel" id="label24">
2062+ <property name="visible">True</property>
2063+ <property name="label" translatable="yes">Add CD-ROM...</property>
2064+ <property name="use_underline">True</property>
2065+ </widget>
2066+ <packing>
2067+ <property name="expand">False</property>
2068+ <property name="fill">False</property>
2069+ <property name="position">1</property>
2070+ </packing>
2071+ </child>
2072+ </widget>
2073+ </child>
2074+ </widget>
2075+ </child>
2076+ </widget>
2077+ <packing>
2078+ <property name="expand">False</property>
2079+ <property name="fill">False</property>
2080+ <property name="pack_type">end</property>
2081+ <property name="position">1</property>
2082+ </packing>
2083+ </child>
2084+ </widget>
2085+ <packing>
2086+ <property name="expand">False</property>
2087+ <property name="position">1</property>
2088+ </packing>
2089+ </child>
2090+ </widget>
2091+ <packing>
2092+ <property name="position">1</property>
2093+ </packing>
2094+ </child>
2095+ <child>
2096+ <widget class="GtkLabel" id="label1">
2097+ <property name="visible">True</property>
2098+ <property name="label" translatable="yes">Other Software</property>
2099+ </widget>
2100+ <packing>
2101+ <property name="position">1</property>
2102+ <property name="tab_fill">False</property>
2103+ <property name="type">tab</property>
2104+ </packing>
2105+ </child>
2106+ <child>
2107+ <widget class="GtkVBox" id="vbox8">
2108+ <property name="visible">True</property>
2109+ <property name="border_width">12</property>
2110+ <property name="spacing">18</property>
2111+ <child>
2112+ <widget class="GtkFrame" id="frame_children">
2113+ <property name="visible">True</property>
2114+ <property name="label_xalign">0</property>
2115+ <property name="shadow_type">none</property>
2116+ <child>
2117+ <widget class="GtkAlignment" id="alignment7">
2118+ <property name="visible">True</property>
2119+ <property name="top_padding">6</property>
2120+ <property name="left_padding">12</property>
2121+ <child>
2122+ <widget class="GtkVBox" id="vbox_updates">
2123+ <property name="visible">True</property>
2124+ <property name="spacing">6</property>
2125+ <child>
2126+ <placeholder/>
2127+ </child>
2128+ <child>
2129+ <placeholder/>
2130+ </child>
2131+ <child>
2132+ <placeholder/>
2133+ </child>
2134+ </widget>
2135+ </child>
2136+ </widget>
2137+ </child>
2138+ <child>
2139+ <widget class="GtkLabel" id="label_updates">
2140+ <property name="visible">True</property>
2141+ <property name="label" translatable="yes">Install updates from:</property>
2142+ <property name="use_markup">True</property>
2143+ </widget>
2144+ <packing>
2145+ <property name="type">label_item</property>
2146+ </packing>
2147+ </child>
2148+ </widget>
2149+ <packing>
2150+ <property name="expand">False</property>
2151+ <property name="position">0</property>
2152+ </packing>
2153+ </child>
2154+ <child>
2155+ <widget class="GtkAlignment" id="alignment1">
2156+ <property name="visible">True</property>
2157+ <property name="left_padding">12</property>
2158+ <child>
2159+ <widget class="GtkTable" id="table1">
2160+ <property name="visible">True</property>
2161+ <property name="n_rows">3</property>
2162+ <property name="n_columns">2</property>
2163+ <property name="column_spacing">12</property>
2164+ <child>
2165+ <widget class="GtkComboBox" id="combobox_update_interval">
2166+ <property name="visible">True</property>
2167+ <property name="items" translatable="yes"></property>
2168+ </widget>
2169+ <packing>
2170+ <property name="left_attach">1</property>
2171+ <property name="right_attach">2</property>
2172+ <property name="x_options">GTK_FILL</property>
2173+ <property name="y_options">GTK_FILL</property>
2174+ </packing>
2175+ </child>
2176+ <child>
2177+ <widget class="GtkLabel" id="label4">
2178+ <property name="visible">True</property>
2179+ <property name="label" translatable="yes">When there are security updates:</property>
2180+ </widget>
2181+ <packing>
2182+ <property name="top_attach">1</property>
2183+ <property name="bottom_attach">2</property>
2184+ <property name="x_options">GTK_EXPAND</property>
2185+ <property name="y_options">GTK_EXPAND</property>
2186+ </packing>
2187+ </child>
2188+ <child>
2189+ <widget class="GtkComboBox" id="combobox_security_updates">
2190+ <property name="visible">True</property>
2191+ <property name="button_sensitivity">on</property>
2192+ <property name="items" translatable="yes">Display immediately
2193+Download automatically
2194+Download and install automatically</property>
2195+ </widget>
2196+ <packing>
2197+ <property name="left_attach">1</property>
2198+ <property name="right_attach">2</property>
2199+ <property name="top_attach">1</property>
2200+ <property name="bottom_attach">2</property>
2201+ <property name="x_options">GTK_FILL</property>
2202+ <property name="y_options">GTK_FILL</property>
2203+ </packing>
2204+ </child>
2205+ <child>
2206+ <widget class="GtkLabel" id="label5">
2207+ <property name="visible">True</property>
2208+ <property name="label" translatable="yes">When there are other updates:</property>
2209+ </widget>
2210+ <packing>
2211+ <property name="top_attach">2</property>
2212+ <property name="bottom_attach">3</property>
2213+ <property name="x_options">GTK_EXPAND</property>
2214+ <property name="y_options">GTK_EXPAND</property>
2215+ </packing>
2216+ </child>
2217+ <child>
2218+ <widget class="GtkComboBox" id="combobox_other_updates">
2219+ <property name="visible">True</property>
2220+ <property name="button_sensitivity">on</property>
2221+ <property name="items" translatable="yes">Display immediately
2222+Display weekly
2223+Display every two weeks</property>
2224+ </widget>
2225+ <packing>
2226+ <property name="left_attach">1</property>
2227+ <property name="right_attach">2</property>
2228+ <property name="top_attach">2</property>
2229+ <property name="bottom_attach">3</property>
2230+ <property name="x_options">GTK_FILL</property>
2231+ <property name="y_options">GTK_FILL</property>
2232+ </packing>
2233+ </child>
2234+ <child>
2235+ <widget class="GtkLabel" id="label3">
2236+ <property name="visible">True</property>
2237+ <property name="label" translatable="yes">Automatically check for updates:</property>
2238+ </widget>
2239+ <packing>
2240+ <property name="x_options">GTK_EXPAND</property>
2241+ <property name="y_options">GTK_EXPAND</property>
2242+ </packing>
2243+ </child>
2244+ </widget>
2245+ </child>
2246+ </widget>
2247+ <packing>
2248+ <property name="expand">False</property>
2249+ <property name="fill">False</property>
2250+ <property name="position">1</property>
2251+ </packing>
2252+ </child>
2253+ <child>
2254+ <widget class="GtkAlignment" id="alignment15">
2255+ <property name="visible">True</property>
2256+ <property name="left_padding">12</property>
2257+ <child>
2258+ <widget class="GtkVBox" id="vbox24">
2259+ <property name="visible">True</property>
2260+ <child>
2261+ <widget class="GtkHBox" id="hbox18">
2262+ <property name="visible">True</property>
2263+ <property name="spacing">6</property>
2264+ <child>
2265+ <widget class="GtkLabel" id="label29">
2266+ <property name="visible">True</property>
2267+ <property name="label" translatable="yes">Notify me of a new Ubuntu version:</property>
2268+ </widget>
2269+ <packing>
2270+ <property name="expand">False</property>
2271+ <property name="fill">False</property>
2272+ <property name="position">0</property>
2273+ </packing>
2274+ </child>
2275+ <child>
2276+ <widget class="GtkComboBox" id="combobox_release_upgrades">
2277+ <property name="visible">True</property>
2278+ <property name="items" translatable="yes">For any new version
2279+For long-term support versions
2280+Never</property>
2281+ </widget>
2282+ <packing>
2283+ <property name="position">1</property>
2284+ </packing>
2285+ </child>
2286+ </widget>
2287+ <packing>
2288+ <property name="expand">False</property>
2289+ <property name="position">0</property>
2290+ </packing>
2291+ </child>
2292+ </widget>
2293+ </child>
2294+ </widget>
2295+ <packing>
2296+ <property name="expand">False</property>
2297+ <property name="position">2</property>
2298+ </packing>
2299+ </child>
2300+ </widget>
2301+ <packing>
2302+ <property name="position">2</property>
2303+ </packing>
2304+ </child>
2305+ <child>
2306+ <widget class="GtkLabel" id="label_updates12">
2307+ <property name="visible">True</property>
2308+ <property name="label" translatable="yes">Updates</property>
2309+ </widget>
2310+ <packing>
2311+ <property name="position">2</property>
2312+ <property name="tab_fill">False</property>
2313+ <property name="type">tab</property>
2314+ </packing>
2315+ </child>
2316+ <child>
2317+ <widget class="GtkVBox" id="vbox23">
2318+ <property name="visible">True</property>
2319+ <property name="border_width">12</property>
2320+ <property name="spacing">6</property>
2321+ <child>
2322+ <widget class="GtkLabel" id="label27">
2323+ <property name="visible">True</property>
2324+ <property name="xalign">0</property>
2325+ <property name="label" translatable="yes">&lt;b&gt;Trusted software providers&lt;/b&gt;</property>
2326+ <property name="use_markup">True</property>
2327+ </widget>
2328+ <packing>
2329+ <property name="expand">False</property>
2330+ <property name="fill">False</property>
2331+ <property name="position">0</property>
2332+ </packing>
2333+ </child>
2334+ <child>
2335+ <widget class="GtkHBox" id="hbox17">
2336+ <property name="visible">True</property>
2337+ <child>
2338+ <widget class="GtkLabel" id="label26">
2339+ <property name="visible">True</property>
2340+ <property name="label" translatable="yes"> </property>
2341+ </widget>
2342+ <packing>
2343+ <property name="expand">False</property>
2344+ <property name="fill">False</property>
2345+ <property name="position">0</property>
2346+ </packing>
2347+ </child>
2348+ <child>
2349+ <widget class="GtkVBox" id="vbox4">
2350+ <property name="visible">True</property>
2351+ <property name="spacing">6</property>
2352+ <child>
2353+ <widget class="GtkScrolledWindow" id="scrolledwindow2">
2354+ <property name="visible">True</property>
2355+ <property name="can_focus">True</property>
2356+ <property name="hscrollbar_policy">automatic</property>
2357+ <property name="vscrollbar_policy">automatic</property>
2358+ <property name="shadow_type">in</property>
2359+ <child>
2360+ <widget class="GtkTreeView" id="treeview_auth">
2361+ <property name="visible">True</property>
2362+ <property name="can_focus">True</property>
2363+ <property name="tooltip" translatable="yes">Keys are used to authenticate the correct source of software and so protect your computer from malicious software</property>
2364+ <property name="headers_visible">False</property>
2365+ <property name="rules_hint">True</property>
2366+ </widget>
2367+ </child>
2368+ </widget>
2369+ <packing>
2370+ <property name="position">0</property>
2371+ </packing>
2372+ </child>
2373+ <child>
2374+ <widget class="GtkHBox" id="hbox3">
2375+ <property name="visible">True</property>
2376+ <property name="spacing">6</property>
2377+ <child>
2378+ <widget class="GtkButton" id="button_auth_add">
2379+ <property name="visible">True</property>
2380+ <property name="can_focus">True</property>
2381+ <property name="receives_default">False</property>
2382+ <property name="tooltip" translatable="yes">Import the public key from a trusted software provider</property>
2383+ <signal name="clicked" handler="add_key_clicked"/>
2384+ <child>
2385+ <widget class="GtkAlignment" id="alignment10">
2386+ <property name="visible">True</property>
2387+ <property name="xscale">0</property>
2388+ <property name="yscale">0</property>
2389+ <child>
2390+ <widget class="GtkHBox" id="hbox10">
2391+ <property name="visible">True</property>
2392+ <property name="spacing">2</property>
2393+ <child>
2394+ <widget class="GtkImage" id="image1">
2395+ <property name="visible">True</property>
2396+ <property name="stock">gtk-add</property>
2397+ </widget>
2398+ <packing>
2399+ <property name="expand">False</property>
2400+ <property name="fill">False</property>
2401+ <property name="position">0</property>
2402+ </packing>
2403+ </child>
2404+ <child>
2405+ <widget class="GtkLabel" id="label18">
2406+ <property name="visible">True</property>
2407+ <property name="label" translatable="yes">_Import Key File...</property>
2408+ <property name="use_underline">True</property>
2409+ </widget>
2410+ <packing>
2411+ <property name="expand">False</property>
2412+ <property name="fill">False</property>
2413+ <property name="position">1</property>
2414+ </packing>
2415+ </child>
2416+ </widget>
2417+ </child>
2418+ </widget>
2419+ </child>
2420+ </widget>
2421+ <packing>
2422+ <property name="expand">False</property>
2423+ <property name="fill">False</property>
2424+ <property name="position">0</property>
2425+ </packing>
2426+ </child>
2427+ <child>
2428+ <widget class="GtkButton" id="button_auth_remove">
2429+ <property name="label">gtk-remove</property>
2430+ <property name="visible">True</property>
2431+ <property name="can_focus">True</property>
2432+ <property name="receives_default">False</property>
2433+ <property name="use_stock">True</property>
2434+ <signal name="clicked" handler="remove_key_clicked"/>
2435+ </widget>
2436+ <packing>
2437+ <property name="expand">False</property>
2438+ <property name="fill">False</property>
2439+ <property name="position">2</property>
2440+ </packing>
2441+ </child>
2442+ <child>
2443+ <widget class="GtkButton" id="button_auth_restor">
2444+ <property name="label" translatable="yes">Restore _Defaults</property>
2445+ <property name="visible">True</property>
2446+ <property name="can_focus">True</property>
2447+ <property name="receives_default">False</property>
2448+ <property name="tooltip" translatable="yes">Restore the default keys of your distribution</property>
2449+ <property name="use_underline">True</property>
2450+ <signal name="clicked" handler="on_restore_clicked"/>
2451+ </widget>
2452+ <packing>
2453+ <property name="expand">False</property>
2454+ <property name="fill">False</property>
2455+ <property name="pack_type">end</property>
2456+ <property name="position">1</property>
2457+ </packing>
2458+ </child>
2459+ </widget>
2460+ <packing>
2461+ <property name="expand">False</property>
2462+ <property name="position">1</property>
2463+ </packing>
2464+ </child>
2465+ </widget>
2466+ <packing>
2467+ <property name="position">1</property>
2468+ </packing>
2469+ </child>
2470+ </widget>
2471+ <packing>
2472+ <property name="position">1</property>
2473+ </packing>
2474+ </child>
2475+ </widget>
2476+ <packing>
2477+ <property name="position">3</property>
2478+ </packing>
2479+ </child>
2480+ <child>
2481+ <widget class="GtkLabel" id="label2">
2482+ <property name="visible">True</property>
2483+ <property name="label" translatable="yes">Authentication</property>
2484+ </widget>
2485+ <packing>
2486+ <property name="position">3</property>
2487+ <property name="tab_fill">False</property>
2488+ <property name="type">tab</property>
2489+ </packing>
2490+ </child>
2491+ <child>
2492+ <widget class="GtkVBox" id="vbox_popcon">
2493+ <property name="border_width">12</property>
2494+ <property name="spacing">6</property>
2495+ <child>
2496+ <widget class="GtkCheckButton" id="checkbutton_popcon">
2497+ <property name="label" translatable="yes">Submit statistical information</property>
2498+ <property name="visible">True</property>
2499+ <property name="can_focus">True</property>
2500+ <property name="receives_default">False</property>
2501+ <property name="use_underline">True</property>
2502+ <property name="draw_indicator">True</property>
2503+ <signal name="toggled" handler="on_checkbutton_popcon_toggled"/>
2504+ </widget>
2505+ <packing>
2506+ <property name="expand">False</property>
2507+ <property name="fill">False</property>
2508+ <property name="position">0</property>
2509+ </packing>
2510+ </child>
2511+ <child>
2512+ <widget class="GtkHBox" id="hbox16">
2513+ <property name="visible">True</property>
2514+ <child>
2515+ <widget class="GtkLabel" id="label25">
2516+ <property name="visible">True</property>
2517+ <property name="label" translatable="yes"> </property>
2518+ </widget>
2519+ <packing>
2520+ <property name="expand">False</property>
2521+ <property name="fill">False</property>
2522+ <property name="position">0</property>
2523+ </packing>
2524+ </child>
2525+ <child>
2526+ <widget class="GtkLabel" id="label_popcon_desc">
2527+ <property name="visible">True</property>
2528+ <property name="xalign">0</property>
2529+ <property name="use_markup">True</property>
2530+ <property name="wrap">True</property>
2531+ </widget>
2532+ <packing>
2533+ <property name="expand">False</property>
2534+ <property name="fill">False</property>
2535+ <property name="position">1</property>
2536+ </packing>
2537+ </child>
2538+ </widget>
2539+ <packing>
2540+ <property name="expand">False</property>
2541+ <property name="fill">False</property>
2542+ <property name="position">1</property>
2543+ </packing>
2544+ </child>
2545+ </widget>
2546+ <packing>
2547+ <property name="position">4</property>
2548+ </packing>
2549+ </child>
2550+ <child>
2551+ <widget class="GtkLabel" id="label19">
2552+ <property name="visible">True</property>
2553+ <property name="label" translatable="yes">Statistics</property>
2554+ </widget>
2555+ <packing>
2556+ <property name="position">4</property>
2557+ <property name="tab_fill">False</property>
2558+ <property name="type">tab</property>
2559+ </packing>
2560+ </child>
2561+ </widget>
2562+ <packing>
2563+ <property name="position">0</property>
2564+ </packing>
2565+ </child>
2566+ <child>
2567+ <widget class="GtkHBox" id="hbox11">
2568+ <property name="visible">True</property>
2569+ <property name="border_width">6</property>
2570+ <property name="spacing">6</property>
2571+ <child>
2572+ <widget class="GtkButton" id="button_help">
2573+ <property name="label">gtk-help</property>
2574+ <property name="can_focus">True</property>
2575+ <property name="can_default">True</property>
2576+ <property name="receives_default">False</property>
2577+ <property name="use_stock">True</property>
2578+ <signal name="clicked" handler="on_help_button"/>
2579+ </widget>
2580+ <packing>
2581+ <property name="expand">False</property>
2582+ <property name="fill">False</property>
2583+ <property name="position">0</property>
2584+ </packing>
2585+ </child>
2586+ <child>
2587+ <widget class="GtkButton" id="button_revert">
2588+ <property name="label">gtk-revert-to-saved</property>
2589+ <property name="visible">True</property>
2590+ <property name="sensitive">False</property>
2591+ <property name="can_focus">True</property>
2592+ <property name="can_default">True</property>
2593+ <property name="receives_default">False</property>
2594+ <property name="use_stock">True</property>
2595+ <signal name="clicked" handler="on_button_revert_clicked"/>
2596+ </widget>
2597+ <packing>
2598+ <property name="expand">False</property>
2599+ <property name="fill">False</property>
2600+ <property name="pack_type">end</property>
2601+ <property name="position">2</property>
2602+ </packing>
2603+ </child>
2604+ <child>
2605+ <widget class="GtkButton" id="button_close">
2606+ <property name="label">gtk-close</property>
2607+ <property name="visible">True</property>
2608+ <property name="can_focus">True</property>
2609+ <property name="can_default">True</property>
2610+ <property name="receives_default">False</property>
2611+ <property name="use_stock">True</property>
2612+ <signal name="clicked" handler="on_close_button"/>
2613+ </widget>
2614+ <packing>
2615+ <property name="expand">False</property>
2616+ <property name="fill">False</property>
2617+ <property name="pack_type">end</property>
2618+ <property name="position">1</property>
2619+ </packing>
2620+ </child>
2621+ </widget>
2622+ <packing>
2623+ <property name="expand">False</property>
2624+ <property name="position">1</property>
2625+ </packing>
2626+ </child>
2627+ </widget>
2628+ </child>
2629+ </widget>
2630 </glade-interface>
2631
2632=== modified file 'softwareproperties/SoftwareProperties.py'
2633--- softwareproperties/SoftwareProperties.py 2010-03-26 13:18:23 +0000
2634+++ softwareproperties/SoftwareProperties.py 2010-07-02 21:05:40 +0000
2635@@ -59,14 +59,14 @@
2636 RELEASE_UPGRADES_CONF = "/etc/update-manager/release-upgrades"
2637 #RELEASE_UPGRADES_CONF = "/tmp/release-upgrades"
2638 (
2639- RELEASE_UPGRADES_NEVER,
2640 RELEASE_UPGRADES_NORMAL,
2641- RELEASE_UPGRADES_LTS
2642+ RELEASE_UPGRADES_LTS,
2643+ RELEASE_UPGRADES_NEVER
2644 ) = range(3)
2645 release_upgrades_policy_map = {
2646- RELEASE_UPGRADES_NEVER : 'never',
2647 RELEASE_UPGRADES_NORMAL : 'normal',
2648 RELEASE_UPGRADES_LTS : 'lts',
2649+ RELEASE_UPGRADES_NEVER : 'never',
2650 }
2651
2652 def __init__(self, datadir=None, options=None):
2653@@ -178,9 +178,9 @@
2654 def get_release_upgrades_policy(self):
2655 """
2656 return the release upgrade policy:
2657- RELASE_UPGRADE_NEVER
2658- RELASE_UPGRADE_NORMAL
2659- RELASE_UPGRADE_LTS
2660+ RELEASE_UPGRADES_NORMAL,
2661+ RELEASE_UPGRADES_LTS,
2662+ RELEASE_UPGRADES_NEVER
2663 """
2664 # default (if no option is set) is NORMAL
2665 if not os.path.exists(self.RELEASE_UPGRADES_CONF):
2666@@ -197,9 +197,9 @@
2667 def set_release_upgrades_policy(self, i):
2668 """
2669 set the release upgrade policy:
2670- RELASE_UPGRADE_NEVER
2671- RELASE_UPGRADE_NORMAL
2672- RELASE_UPGRADE_LTS
2673+ RELEASE_UPGRADES_NORMAL,
2674+ RELEASE_UPGRADES_LTS,
2675+ RELEASE_UPGRADES_NEVER
2676 """
2677 # we are note using ConfigParser.write() as it removes comments
2678 if not os.path.exists(self.RELEASE_UPGRADES_CONF):
2679
2680=== modified file 'softwareproperties/gtk/SoftwarePropertiesGtk.py'
2681--- softwareproperties/gtk/SoftwarePropertiesGtk.py 2010-01-12 18:03:48 +0000
2682+++ softwareproperties/gtk/SoftwarePropertiesGtk.py 2010-07-02 21:05:40 +0000
2683@@ -33,6 +33,7 @@
2684 import gtk
2685 import gtk.glade
2686 import gobject
2687+import gconf
2688
2689 from SimpleGladeApp import SimpleGladeApp
2690 from aptsources.sourceslist import SourceEntry
2691@@ -112,6 +113,9 @@
2692 if options and options.open_tab:
2693 self.notebook_main.set_current_page(int(options.open_tab))
2694
2695+ self.client = gconf.client_get_default()
2696+ self.initial_auto_launch = self.client.get_int("/apps/update-notifier/regular_auto_launch_interval") # For reverting
2697+
2698 # Show what we have early
2699 self.window_main.show()
2700
2701@@ -173,7 +177,8 @@
2702 self.combobox_interval_mapping = { 0 : 1,
2703 1 : 2,
2704 2 : 7,
2705- 3 : 14 }
2706+ 3 : 14,
2707+ 4 : 0 }
2708 self.combobox_update_interval.set_active(0)
2709
2710 #update_days = apt_pkg.Config.FindI(softwareproperties.CONF_MAP["autoupdate"])
2711@@ -182,6 +187,7 @@
2712 self.combobox_update_interval.append_text(_("Every two days"))
2713 self.combobox_update_interval.append_text(_("Weekly"))
2714 self.combobox_update_interval.append_text(_("Every two weeks"))
2715+ self.combobox_update_interval.append_text(_("Never"))
2716
2717 model_check_interval = gtk.ListStore(gobject.TYPE_STRING,
2718 gobject.TYPE_INT)
2719@@ -199,68 +205,53 @@
2720 self.combobox_update_interval.set_active(key)
2721 break
2722
2723- if update_days >= 1:
2724- self.checkbutton_auto_update.set_active(True)
2725- self.combobox_update_interval.set_sensitive(True)
2726- self.vbox_auto_updates.set_sensitive(True)
2727- else:
2728- self.checkbutton_auto_update.set_active(False)
2729- self.combobox_update_interval.set_sensitive(False)
2730- self.vbox_auto_updates.set_sensitive(False)
2731-
2732- self.handlers.append(
2733- (self.checkbutton_auto_update,
2734- self.checkbutton_auto_update.connect("toggled",
2735- self.on_auto_update_toggled)))
2736 self.handlers.append(
2737 (self.combobox_update_interval,
2738 self.combobox_update_interval.connect("changed",
2739 self.on_combobox_update_interval_changed)))
2740- self.handlers.append(
2741- (self.radiobutton_updates_download,
2742- self.radiobutton_updates_download.connect("toggled",
2743- self.set_update_automation_level,
2744- softwareproperties.UPDATE_DOWNLOAD)))
2745- self.handlers.append(
2746- (self.radiobutton_updates_inst_sec,
2747- self.radiobutton_updates_inst_sec.connect("toggled",
2748- self.set_update_automation_level,
2749- softwareproperties.UPDATE_INST_SEC)))
2750- self.handlers.append(
2751- (self.radiobutton_updates_notify,
2752- self.radiobutton_updates_notify.connect("toggled",
2753- self.set_update_automation_level,
2754- softwareproperties.UPDATE_NOTIFY)))
2755+
2756+ self.handlers.append(
2757+ (self.combobox_security_updates,
2758+ self.combobox_security_updates.connect("changed",
2759+ self.set_sec_update_automation_level)))
2760+
2761+ self.handlers.append(
2762+ (self.combobox_security_updates,
2763+ self.combobox_other_updates.connect("changed",
2764+ self.set_other_update_automation_level)))
2765
2766+
2767 def show_auto_update_level(self):
2768 """Represent the level of update automation in the user interface"""
2769- level = self.get_update_automation_level()
2770- self.block_handlers()
2771- if level == None:
2772- self.radiobutton_updates_inst_sec.set_inconsistent(True)
2773- self.radiobutton_updates_download.set_inconsistent(True)
2774- self.radiobutton_updates_notify.set_inconsistent(True)
2775+
2776+ """ Security Updates """
2777+ level_sec = self.get_update_automation_level()
2778+ if level_sec == None:
2779+ self.combobox_security_updates.set_sensitive(False)
2780 else:
2781- self.radiobutton_updates_inst_sec.set_inconsistent(False)
2782- self.radiobutton_updates_download.set_inconsistent(False)
2783- self.radiobutton_updates_notify.set_inconsistent(False)
2784- if level == softwareproperties.UPDATE_MANUAL or \
2785- level == softwareproperties.UPDATE_NOTIFY:
2786- self.radiobutton_updates_notify.set_active(True)
2787- elif level == softwareproperties.UPDATE_DOWNLOAD:
2788- self.radiobutton_updates_download.set_active(True)
2789- elif level == softwareproperties.UPDATE_INST_SEC:
2790- self.radiobutton_updates_inst_sec.set_active(True)
2791- # Unblock the toggle handlers
2792- self.unblock_handlers()
2793+ self.combobox_security_updates.set_sensitive(True)
2794+
2795+ if level_sec == softwareproperties.UPDATE_MANUAL or \
2796+ level_sec == softwareproperties.UPDATE_NOTIFY:
2797+ self.combobox_security_updates.set_active(0) # Display immediately
2798+ elif level_sec == softwareproperties.UPDATE_DOWNLOAD:
2799+ self.combobox_security_updates.set_active(1) # Download automatically
2800+ elif level_sec == softwareproperties.UPDATE_INST_SEC:
2801+ self.combobox_security_updates.set_active(2) # Download and install automatically
2802+
2803+ """ Other Updates """
2804+ level_other = self.client.get_int("/apps/update-notifier/regular_auto_launch_interval")
2805+ if level_other == 0:
2806+ self.combobox_other_updates.set_active(0) # Display immediately
2807+ elif level_other == 7:
2808+ self.combobox_other_updates.set_active(1) # Display weekly
2809+ elif level_other == 14:
2810+ self.combobox_other_updates.set_active(2) # Display every two weeks
2811
2812 def init_distro(self):
2813 """Setup the user interface elements to represent the distro"""
2814
2815 # TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
2816- self.label_updates.set_label("<b>%s</b>" % (_("%s updates") %\
2817- self.distro.id))
2818- # TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
2819 self.label_dist_name.set_label(_("%s Software") % self.distro.id)
2820
2821
2822@@ -415,13 +406,31 @@
2823 for source in self.sourceslist_visible:
2824 self.print_source_entry(source)
2825
2826- def set_update_automation_level(self, widget, state):
2827- '''Call the backend to set the update automation level to the given
2828- value'''
2829- if widget.get_active() == True:
2830- self.vbox_auto_updates.foreach(lambda b: b.set_inconsistent(False))
2831- SoftwareProperties.set_update_automation_level(self, state)
2832- self.set_modified_config()
2833+ def set_sec_update_automation_level(self, widget):
2834+ """Call the backend to set the security update automation level to the given
2835+ value"""
2836+ index = widget.get_active()
2837+ state = -1
2838+ if index == 0: # Display immediately
2839+ state = UPDATE_NOTIFY
2840+ elif index == 1: # Download automatically
2841+ state = UPDATE_DOWNLOAD
2842+ elif index == 2: # Download and install automatically
2843+ state = UPDATE_INST_SEC
2844+ SoftwareProperties.set_update_automation_level(self, state)
2845+
2846+ def set_other_update_automation_level(self, widget):
2847+ """Set the other update automation level to the given value via gconf"""
2848+ index = widget.get_active()
2849+ days = 7
2850+ if index == 0: # Display immediately
2851+ days = 0
2852+ elif index == 1: # Display weekly
2853+ days = 7
2854+ elif index == 2: # Display every two weeks
2855+ days = 14
2856+ self.client.set_int("/apps/update-notifier/regular_auto_launch_interval", days)
2857+
2858
2859 def is_row_separator(self, model, iter, column=0):
2860 ''' Check if a given row is a separator '''
2861@@ -667,6 +676,7 @@
2862 def on_button_revert_clicked(self, button):
2863 """Restore the source list from the startup of the dialog"""
2864 SoftwareProperties.revert(self)
2865+ self.client.set_int("/apps/update-notifier/regular_auto_launch_interval", self.initial_auto_launch)
2866 self.set_modified_sourceslist()
2867 self.show_auto_update_level()
2868 self.button_revert.set_sensitive(False)
2869@@ -729,9 +739,9 @@
2870 value = self.combobox_interval_mapping[i]
2871 self.set_update_interval(value)
2872
2873- def on_auto_update_toggled(self, widget):
2874- """Enable or disable automatic updates and modify the user interface
2875- accordingly"""
2876+ """def on_auto_update_toggled(self, widget):
2877+ Enable or disable automatic updates and modify the user interface
2878+ accordingly
2879 if self.checkbutton_auto_update.get_active():
2880 self.combobox_update_interval.set_sensitive(True)
2881 self.vbox_auto_updates.set_sensitive(True)
2882@@ -748,7 +758,7 @@
2883 self.vbox_auto_updates.set_sensitive(False)
2884 SoftwareProperties.set_update_automation_level(self, None)
2885 value = 0
2886- self.set_update_interval(str(value))
2887+ self.set_update_interval(str(value))"""
2888
2889 def on_add_clicked(self, widget):
2890 """Show a dialog that allows to enter the apt line of a to be used repo"""

Subscribers

People subscribed via source and target branches

to status/vote changes: