diff options
| -rw-r--r-- | SoftwareProperties/SoftwareProperties.py | 118 | ||||
| -rw-r--r-- | channels/Ubuntu.info.in | 18 | ||||
| -rw-r--r-- | data/SoftwareProperties.glade | 375 |
3 files changed, 378 insertions, 133 deletions
diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index f9fb2c43..ec02edb3 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -124,8 +124,6 @@ class Distribution: self.source_code_sources = [] # location of the sources - self.cdrom_available = False - self.use_internet = False self.main_server = "" self.nearest_server = "" self.used_servers = [] @@ -199,11 +197,8 @@ class Distribution: # other used servers for medium in self.used_media: - if medium.startswith("cdrom:"): - self.cdrom_available = True - else: + if not medium.startswith("cdrom:"): # seems to be a network source - self.use_internet = True self.used_servers.append(medium) def add_source(self, sources_list, type=None, @@ -383,15 +378,16 @@ class SoftwareProperties(SimpleGladeApp): if self.file != None: self.open_file(file) + def distro_to_widgets(self): """ Represent the distro information in the user interface """ # TRANS: %s stands for the distribution name e.g. Debian or Ubuntu - self.label_updates.set_label(_("%s Updates") % self.distribution.id) + self.label_updates.set_label("<b>%s</b>" % (_("%s Updates") %\ + self.distribution.id)) # TRANS: %s stands for the distribution name e.g. Debian or Ubuntu - self.label_dist_software.set_label(_("%s Software") % self.distribution.id) - self.label_dist_name.set_label("<b>%s</b>" % self.distribution.description) + self.label_dist_name.set_label("%s" % self.distribution.description) # Setup the checkbuttons for the components for checkbutton in self.vbox_dist_comps.get_children(): @@ -437,21 +433,8 @@ class SoftwareProperties(SimpleGladeApp): else: self.vbox_updates.set_sensitive(True) - # setup the location - # FIXME: how to handle uncommented cdroms? - if self.distribution.cdrom_available == True: - self.checkbutton_cdrom.set_active(True) - else: - self.checkbutton_cdrom.set_active(False) - # Intiate the combobox which allows do specify a server for all # distro related sources - if self.distribution.use_internet == True: - self.checkbutton_internet.set_active(True) - self.combobox_server.set_property("sensitive", True) - else: - self.checkbutton_internet.set_active(False) - self.combobox_server.set_property("sensitive", False) self.combobox_server.handler_block(self.handler_server_changed) server_store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING) self.combobox_server.set_model(server_store) @@ -503,11 +486,13 @@ class SoftwareProperties(SimpleGladeApp): templates[source.template] = set(source.comps) # add fake http sources for the cdrom, since the sources # for the cdrom are only available in the internet + pdb.set_trace() for source in self.distribution.cdrom_sources: + # FIXME: produces a key error if templates.has_key(self.distribution.source_template): templates[self.distribution.source_template] += set(source.comps) else: - templates[self.distribution.source_template] += set(source.comps) + templates[self.distribution.source_template] = set(source.comps) for source in self.distribution.source_code_sources: if not templates.has_key(source.template) or \ (templates.has_key(source.template) and \ @@ -517,6 +502,11 @@ class SoftwareProperties(SimpleGladeApp): break self.checkbutton_source_code.handler_unblock(self.handler_source_code_changed) + if len(self.cdrom_store) == 0: + self.treeview_cdroms.set_sensitive(False) + else: + self.treeview_cdroms.set_sensitive(True) + def on_combobox_server_changed(self, combobox): """ Replace the servers used by the main and update sources with @@ -533,7 +523,7 @@ class SoftwareProperties(SimpleGladeApp): # FIXME: ugly if not "security.ubuntu.com" in source.uri: source.uri = uri_selected - self.massive_debug_output() + self.modified_sourceslist() def on_component_toggled(self, checkbutton, comp): """ @@ -562,7 +552,7 @@ class SoftwareProperties(SimpleGladeApp): source.comps.remove(comp) if len(source.comps) < 1: self.sourceslist.remove(source) - self.massive_debug_output() + self.modified_sourceslist() def massive_debug_output(self): """ @@ -587,7 +577,7 @@ class SoftwareProperties(SimpleGladeApp): self.distribution.add_source(self.sourceslist, uri=template.base_uri, dist=template.name) - self.massive_debug_output() + self.modified_sourceslist() def on_checkbutton_source_code_toggled(self, checkbutton): """ @@ -619,7 +609,7 @@ class SoftwareProperties(SimpleGladeApp): "Added by software-properties", self.sourceslist.list.index(source)+1, source.file) - self.massive_debug_output() + self.modified_sourceslist() def open_file(self, file): """Show an confirmation for adding the channels of the specified file""" @@ -654,6 +644,12 @@ class SoftwareProperties(SimpleGladeApp): # STORE_SOURCE - the source entry object # STORE_SEPARATOR - if the entry is a separator # STORE_VISIBLE - if the entry is shown or hidden + self.cdrom_store = gtk.ListStore(gobject.TYPE_BOOLEAN, + gobject.TYPE_STRING, + gobject.TYPE_PYOBJECT, + gobject.TYPE_BOOLEAN, + gobject.TYPE_BOOLEAN) + self.treeview_cdroms.set_model(self.cdrom_store) self.source_store = gtk.ListStore(gobject.TYPE_BOOLEAN, gobject.TYPE_STRING, gobject.TYPE_PYOBJECT, @@ -662,7 +658,6 @@ class SoftwareProperties(SimpleGladeApp): self.treeview_sources.set_model(self.source_store) self.treeview_sources.set_row_separator_func(self.is_separator, STORE_SEPARATOR) - #self.treeview_sources.set_rules_hint(False) cell_desc = gtk.CellRendererText() cell_desc.set_property("xpad", 2) @@ -674,7 +669,24 @@ class SoftwareProperties(SimpleGladeApp): cell_toggle = gtk.CellRendererToggle() cell_toggle.set_property("xpad", 2) cell_toggle.set_property("ypad", 2) - cell_toggle.connect('toggled', self.on_channel_toggled) + cell_toggle.connect('toggled', self.on_channel_toggled, self.cdrom_store) + col_active = gtk.TreeViewColumn(_("Active"), cell_toggle, + active=COLUMN_ACTIVE) + + self.treeview_cdroms.append_column(col_active) + self.treeview_cdroms.append_column(col_desc) + + cell_desc = gtk.CellRendererText() + cell_desc.set_property("xpad", 2) + cell_desc.set_property("ypad", 2) + col_desc = gtk.TreeViewColumn(_("Software Channel"), cell_desc, + markup=COLUMN_DESC) + col_desc.set_max_width(1000) + + cell_toggle = gtk.CellRendererToggle() + cell_toggle.set_property("xpad", 2) + cell_toggle.set_property("ypad", 2) + cell_toggle.connect('toggled', self.on_channel_toggled, self.source_store) col_active = gtk.TreeViewColumn(_("Active"), cell_toggle, active=COLUMN_ACTIVE) @@ -698,11 +710,12 @@ class SoftwareProperties(SimpleGladeApp): self.button_edit.set_sensitive(False) self.button_remove.set_sensitive(False) - def on_channel_toggled(self, cell_toggle, path): + def on_channel_toggled(self, cell_toggle, path, store): """Enable or disable the selected channel""" - iter = self.source_store.get_iter((int(path),)) - source_entry = self.source_store.get_value(iter, STORE_SOURCE) + iter = store.get_iter((int(path),)) + source_entry = store.get_value(iter, STORE_SOURCE) source_entry.disabled = not source_entry.disabled + store.set_value(iter, STORE_ACTIVE, not source_entry.disabled) self.modified_sourceslist() def init_keyslist(self): @@ -726,10 +739,10 @@ class SoftwareProperties(SimpleGladeApp): def modified_sourceslist(self): """The sources list was changed and now needs to be saved and reloaded""" - self.button_revert.set_sensitive(True) - self.sourceslist.check_for_endangered_dists() - self.save_sourceslist() - self.reload_sourceslist() + self.massive_debug_output() + #self.button_revert.set_sensitive(True) + #self.save_sourceslist() + #self.reload_sourceslist() self.modified = True def render_source(self, source): @@ -790,24 +803,27 @@ class SoftwareProperties(SimpleGladeApp): def reload_sourceslist(self): (path_x, path_y) = self.treeview_sources.get_cursor() self.source_store.clear() + self.cdrom_store.clear() self.sourceslist.refresh() self.sourceslist_visible=[] self.distribution.get_sources(self.sourceslist) # Only show sources that are no binary or source code repos for # the current distribution, but show cdrom based repos for source in self.sourceslist.list: - if not source.invalid and\ - ((source not in self.distribution.main_sources and\ - source not in self.distribution.child_sources and\ - source not in self.distribution.disabled_sources) or\ - source in self.distribution.cdrom_sources) and\ - source not in self.distribution.source_code_sources: - self.sourceslist_visible.append(source) + if not source.invalid and\ + (source not in self.distribution.main_sources and\ + source not in self.distribution.child_sources and\ + source not in self.distribution.disabled_sources) and\ + source not in self.distribution.source_code_sources: + self.sourceslist_visible.append(source) + elif not source.invalid and source in self.distribution.cdrom_sources: + contents = self.render_source(source) + self.cdrom_store.append([not source.disabled, contents, + source, False, True]) # Sort the sources list self.sourceslist_visible.sort(key=self.get_comparable) - dist_first = False for source in self.sourceslist_visible: contents = self.render_source(source) @@ -1086,13 +1102,13 @@ class SoftwareProperties(SimpleGladeApp): self.reload_sourceslist() self.modified = True - def on_channel_toggled(self, cell_toggle, path): - """Enable or disable the selected channel""" - iter = self.source_store.get_iter((int(path),)) - source_entry = self.source_store.get_value(iter, LIST_ENTRY_OBJ) - source_entry.disabled = not source_entry.disabled - self.reload_sourceslist() - self.modified = True + # def on_channel_toggled(self, cell_toggle, path, store): + # """Enable or disable the selected channel""" + # iter = store.get_iter((int(path),)) + # source_entry = store.get_value(iter, LIST_ENTRY_OBJ) + # source_entry.disabled = not source_entry.disabled + # self.reload_sourceslist() + # self.modified = True # FIXME: move this into a different file class GtkCdromProgress(apt.progress.CdromProgress, SimpleGladeApp): diff --git a/channels/Ubuntu.info.in b/channels/Ubuntu.info.in index f92d8b8b..e01a9221 100644 --- a/channels/Ubuntu.info.in +++ b/channels/Ubuntu.info.in @@ -4,19 +4,19 @@ Suite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu/ -_Description: Ubuntu 6.04 'Dapper Drake' +_Description: Ubuntu 6.06 'Dapper Drake' Component: main Enabled: 1 _CompDescription: Officially supported -_CompDescriptionLong: Free software that is officially supported by Canonical Ltd. (main) +_CompDescriptionLong: OpenSource software that is officially supported by Canonical Ltd. (main) Component: universe Enabled: 0 _CompDescription: Community maintained (universe) -_CompDescriptionLong: Free software that is maintained by the community (universe) +_CompDescriptionLong: OpenSource software that is maintained by the community (universe) Component: restricted Enabled: 1 _CompDescription: Non-free drivers -_CompDescriptionLong: Non-free drivers for devices (restricted) +_CompDescriptionLong: Proprietary drivers for devices (restricted) Component: multiverse Enabled: 0 _CompDescription: Restricted software (Multiverse) @@ -24,8 +24,8 @@ _CompDescriptionLong: Software that is restricted by copyright or legal issues ( Suite: dapper MatchName: .* -BaseURI: cdrom:\[Ubuntu.*6.04 -_Description: Cdrom with Ubuntu 6.04 'Dapper Drake' +BaseURI: cdrom:\[Ubuntu.*6.06 +_Description: Cdrom with Ubuntu 6.06 'Dapper Drake' Available: False Component: main Enabled: 1 @@ -39,21 +39,21 @@ ParentSuite: dapper RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com -_Description: Ubuntu 6.04 Security Updates +_Description: Important security updates Suite: dapper-updates ParentSuite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu/ -_Description: Ubuntu 6.04 Updates +_Description: Recommended updates Suite: dapper-backports ParentSuite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu/ -_Description: Ubuntu 6.04 Backports +_Description: Backported updates Suite: dapper-backports RepositoryType: deb diff --git a/data/SoftwareProperties.glade b/data/SoftwareProperties.glade index 5aa5ee5c..b0ab7144 100644 --- a/data/SoftwareProperties.glade +++ b/data/SoftwareProperties.glade @@ -5,8 +5,6 @@ <widget class="GtkWindow" id="window_main"> <property name="border_width">6</property> - <property name="width_request">620</property> - <property name="height_request">400</property> <property name="title" translatable="yes">Software Sources</property> <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_CENTER</property> @@ -72,17 +70,26 @@ <property name="spacing">18</property> <child> - <widget class="GtkVBox" id="vbox_dist_comps"> + <widget class="GtkVBox" id="vbox13"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">6</property> <child> - <placeholder/> - </child> + <widget class="GtkVBox" id="vbox_dist_comps"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> - <child> - <placeholder/> + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> </child> </widget> <packing> @@ -99,7 +106,7 @@ <child> <widget class="GtkLabel" id="label_dist_name"> <property name="visible">True</property> - <property name="label" translatable="yes"></property> + <property name="label" translatable="yes"><b>Downloadable software</b></property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -127,14 +134,14 @@ </child> <child> - <widget class="GtkFrame" id="frame5"> + <widget class="GtkFrame" id="frame8"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="label_yalign">0.5</property> <property name="shadow_type">GTK_SHADOW_NONE</property> <child> - <widget class="GtkAlignment" id="alignment6"> + <widget class="GtkAlignment" id="alignment9"> <property name="visible">True</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> @@ -146,26 +153,59 @@ <property name="right_padding">0</property> <child> - <widget class="GtkVBox" id="vbox6"> + <widget class="GtkVBox" id="vbox17"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="checkbutton_cdrom"> - <property name="can_focus">True</property> - <property name="label" translatable="yes">CD-ROM/DVD</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> + <widget class="GtkHBox" id="hbox6"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkLabel" id="label15"> + <property name="visible">True</property> + <property name="label" translatable="yes">Download from:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="combobox_server"> + <property name="visible">True</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> </packing> </child> @@ -187,43 +227,89 @@ <property name="fill">False</property> </packing> </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label17"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Download options</b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkFrame" id="frame7"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + + <child> + <widget class="GtkAlignment" id="alignment8"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">1</property> + <property name="yscale">1</property> + <property name="top_padding">6</property> + <property name="bottom_padding">0</property> + <property name="left_padding">12</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkVBox" id="vbox11"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> <child> - <widget class="GtkHBox" id="hbox6"> + <widget class="GtkScrolledWindow" id="scrolledwindow3"> + <property name="height_request">75</property> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> <child> - <widget class="GtkCheckButton" id="checkbutton_internet"> + <widget class="GtkTreeView" id="treeview_cdroms"> + <property name="height_request">109</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Download software from the Internet:</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> + <property name="headers_visible">False</property> + <property name="rules_hint">True</property> + <property name="reorderable">False</property> + <property name="enable_search">True</property> + <property name="fixed_height_mode">False</property> + <property name="hover_selection">False</property> + <property name="hover_expand">False</property> </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkComboBox" id="combobox_server"> - <property name="visible">True</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> </child> </widget> <packing> @@ -238,9 +324,9 @@ </child> <child> - <widget class="GtkLabel" id="label11"> + <widget class="GtkLabel" id="label14"> <property name="visible">True</property> - <property name="label" translatable="yes"><b>Options</b></property> + <property name="label" translatable="yes"><b>CDROM/DVD</b></property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -262,7 +348,7 @@ </widget> <packing> <property name="padding">0</property> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> </packing> </child> @@ -274,7 +360,7 @@ </child> <child> - <widget class="GtkLabel" id="label_dist_software"> + <widget class="GtkLabel" id="label_dist_name"> <property name="visible">True</property> <property name="label" translatable="yes"></property> <property name="use_underline">False</property> @@ -345,7 +431,7 @@ </child> <child> - <widget class="GtkLabel" id="label12"> + <widget class="GtkLabel" id="label_updates"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Internet Updates</b></property> <property name="use_underline">False</property> @@ -627,9 +713,9 @@ </child> <child> - <widget class="GtkLabel" id="label_updates"> + <widget class="GtkLabel" id="label_updates12"> <property name="visible">True</property> - <property name="label" translatable="yes"></property> + <property name="label" translatable="yes">Internet Updates</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -793,7 +879,7 @@ <child> <widget class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="label" translatable="yes">Additional Software</property> + <property name="label" translatable="yes">Third Party</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -857,15 +943,77 @@ <property name="spacing">6</property> <child> - <widget class="GtkButton" id="button_auth_restor"> + <widget class="GtkButton" id="button_auth_add"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Restore the default keys of your distribution</property> + <property name="tooltip" translatable="yes">Import the public key from a trusted software provider</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Restore _Defaults</property> - <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_restore_clicked" last_modification_time="Tue, 05 Jul 2005 04:24:19 GMT"/> + <signal name="clicked" handler="add_key_clicked" last_modification_time="Tue, 05 Jul 2005 04:09:24 GMT"/> + + <child> + <widget class="GtkAlignment" id="alignment10"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkHBox" id="hbox10"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">2</property> + + <child> + <widget class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-add</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label18"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Import Key File</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> </widget> <packing> <property name="padding">0</property> @@ -875,14 +1023,15 @@ </child> <child> - <widget class="GtkButton" id="button_auth_remove"> + <widget class="GtkButton" id="button_auth_restor"> <property name="visible">True</property> + <property name="tooltip" translatable="yes">Restore the default keys of your distribution</property> <property name="can_focus">True</property> - <property name="label">gtk-remove</property> - <property name="use_stock">True</property> + <property name="label" translatable="yes">Restore _Defaults</property> + <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <signal name="clicked" handler="remove_key_clicked" last_modification_time="Tue, 05 Jul 2005 04:19:25 GMT"/> + <signal name="clicked" handler="on_restore_clicked" last_modification_time="Tue, 05 Jul 2005 04:24:19 GMT"/> </widget> <packing> <property name="padding">0</property> @@ -893,21 +1042,19 @@ </child> <child> - <widget class="GtkButton" id="button_auth_add"> + <widget class="GtkButton" id="button_auth_remove"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Import the public key from a trusted software provider</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Import Key File</property> - <property name="use_underline">True</property> + <property name="label">gtk-remove</property> + <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <signal name="clicked" handler="add_key_clicked" last_modification_time="Tue, 05 Jul 2005 04:09:24 GMT"/> + <signal name="clicked" handler="remove_key_clicked" last_modification_time="Tue, 05 Jul 2005 04:19:25 GMT"/> </widget> <packing> <property name="padding">0</property> <property name="expand">False</property> <property name="fill">False</property> - <property name="pack_type">GTK_PACK_END</property> </packing> </child> </widget> @@ -946,6 +1093,88 @@ <property name="type">tab</property> </packing> </child> + + <child> + <widget class="GtkVBox" id="vbox18"> + <property name="border_width">12</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkLabel" id="label20"> + <property name="visible">True</property> + <property name="label" translatable="yes"><i>Please take part in the popularity contest, to improve the user experience of Ubuntu. Therefor the following data will be collected and sent to the Ubuntu project anonymously on a weekly basis: the list of installed software and how often it was used. + +The results are used to improve the support for popular applications and to rank applications in the search results.</i></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="checkbutton_popcon"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Submit statistical information to Ubuntu</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label19"> + <property name="visible">True</property> + <property name="label" translatable="yes">Statistics</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> |