From f5acaf7e44c59fd542e7dc40549a519a08a39a8a Mon Sep 17 00:00:00 2001 From: "glatzor@ubuntu.com" <> Date: Fri, 21 Jul 2006 23:13:48 +0200 Subject: * moved all glade and channels files into subdirectories of data * do not install obsolete files to update-manager/channels --- data/glade/SoftwareProperties.glade | 1183 +++++++++++++++++++++++++++++++++++ 1 file changed, 1183 insertions(+) create mode 100644 data/glade/SoftwareProperties.glade (limited to 'data/glade/SoftwareProperties.glade') diff --git a/data/glade/SoftwareProperties.glade b/data/glade/SoftwareProperties.glade new file mode 100644 index 00000000..08ffd743 --- /dev/null +++ b/data/glade/SoftwareProperties.glade @@ -0,0 +1,1183 @@ + + + + + + + 6 + Software Sources + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + + + + + True + False + 0 + + + + 6 + True + True + True + True + GTK_POS_TOP + False + False + + + + 12 + True + False + 18 + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 6 + 0 + 12 + 0 + + + + True + False + 18 + + + + True + False + 6 + + + + True + False + 6 + + + + True + False + 6 + + + + + + + 0 + True + True + + + + + + True + True + Source code + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + 0 + True + True + + + + + + True + False + 12 + + + + True + Download from: + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + False + True + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + + + + True + <b>Downloadable software</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + True + + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 6 + 0 + 12 + 0 + + + + True + False + 6 + + + + 75 + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + 109 + True + True + False + True + False + True + False + False + False + + + + + 0 + True + True + + + + + + + + + + True + <b>CDROM/DVD</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + True + True + + + + + False + True + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + + + + + 12 + True + False + 18 + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 6 + 0 + 12 + 0 + + + + True + False + 6 + + + + + + + + + + + + + + + + + + + + True + <b>Internet updates</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + True + + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 6 + 0 + 12 + 0 + + + + True + False + 6 + + + + True + False + 6 + + + + True + True + _Check for updates automatically: + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + True + + + + + + True + + False + True + + + + 0 + True + True + + + + + 0 + False + False + + + + + + True + False + 0 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + False + 6 + + + + True + True + _Download updates automatically, but do not install them + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + False + + + + + + True + Only security updates from the official Ubuntu servers will be installed automatically + True + _Install security updates without confirmation + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + False + + + + + 0 + True + True + + + + + 0 + False + False + + + + + + False + 6 + + + + True + True + D_elete downloaded software files: + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + True + + + + + + True + + False + True + + + + 0 + True + True + + + + + 0 + False + True + + + + + + + + + + True + <b>Automatic updates</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + True + + + + + False + True + + + + + + True + Internet Updates + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + + + + + 12 + True + False + 6 + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + True + False + True + False + False + False + + + + + + + 0 + True + True + + + + + + True + False + 18 + + + + True + False + 6 + + + + True + True + True + gtk-add + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + True + + + + + + True + True + True + gtk-edit + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + True + + + + + + True + True + True + gtk-remove + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + True + + + + + 0 + True + True + + + + + + True + gtk-revert-to-saved + True + GTK_RELIEF_NORMAL + True + + + 0 + False + False + + + + + 0 + False + True + + + + + False + True + + + + + + True + Third Party + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + + + + + 12 + True + False + 6 + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + True + False + True + False + False + False + + + + + 0 + True + True + + + + + + True + False + 6 + + + + True + Import the public key from a trusted software provider + True + GTK_RELIEF_NORMAL + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _Import Key File + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + True + Restore the default keys of your distribution + True + Restore _Defaults + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + GTK_PACK_END + + + + + + True + True + gtk-remove + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + + + 0 + False + True + + + + + False + True + + + + + + True + Authentication + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + + + + + 12 + True + False + 12 + + + + True + <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> + False + True + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + Submit statistical information + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + False + + + + + False + True + + + + + + True + Statistics + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + + + + 0 + True + True + + + + + + 6 + True + GTK_BUTTONBOX_EDGE + 0 + + + + True + True + True + gtk-help + True + GTK_RELIEF_NORMAL + True + + + + + + + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + True + + + + + + 0 + False + True + + + + + + + -- cgit v1.2.3 From 54d5696fa964d3cc7a79a1ba0ed4083d9701de1e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 27 Jul 2006 17:20:33 +0200 Subject: * data/glade/SoftwareProperties.glade: - changed the text for Popcon participation * SoftwareProperties/SoftwareProperties.py: - support popcon pariticipation --- SoftwareProperties/SoftwareProperties.py | 22 ++++++++++++++++++++++ data/glade/SoftwareProperties.glade | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) (limited to 'data/glade/SoftwareProperties.glade') diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index f7a40821..07170fa6 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -440,6 +440,27 @@ class SoftwareProperties(SimpleGladeApp): source.file) self.modified_sourceslist() + def on_checkbutton_popcon_toggled(self, widget): + """ The user clicked on the popcon paritipcation button """ + popcon = "/etc/popularity-contest.conf" + if widget.get_active(): + new_value = "yes" + else: + new_value = "no" + if os.path.exists(popcon): + # read it + lines = open(popcon).read().split("\n") + for line in lines: + try: + (key,value) = line.split("=") + if key == "PARTICIPATE": + lines[lines.index(line)] = 'PARTICIPATE=\"%s"' % new_value + except ValueError: + continue + # write it + open(popcon,"w").write("\n".join(lines)) + + def open_file(self, file): """Show an confirmation for adding the channels of the specified file""" dialog = dialog_add_sources_list.AddSourcesList(self.window_main, @@ -1003,3 +1024,4 @@ class GtkCdromProgress(apt.progress.CdromProgress, SimpleGladeApp): return True return False + diff --git a/data/glade/SoftwareProperties.glade b/data/glade/SoftwareProperties.glade index 08ffd743..98bf65bc 100644 --- a/data/glade/SoftwareProperties.glade +++ b/data/glade/SoftwareProperties.glade @@ -1057,7 +1057,7 @@ True - <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. + <i>To improve the user experience of Ubuntu please take part in the popularity contest. If you do so the list of installed software and how often it was used will be collected and sent anonymously to the Ubuntu project on a weekly basis. The results are used to improve the support for popular applications and to rank applications in the search results.</i> False -- cgit v1.2.3 From 18ebb5a4446010824b05b92820689e795498cd87 Mon Sep 17 00:00:00 2001 From: "glatzor@ubuntu.com" <> Date: Fri, 28 Jul 2006 00:22:49 +0200 Subject: * add a revert and add cdrom button --- SoftwareProperties/SoftwareProperties.py | 21 +++-- data/glade/SoftwareProperties.glade | 135 ++++++++++++++++++++++++++----- 2 files changed, 131 insertions(+), 25 deletions(-) (limited to 'data/glade/SoftwareProperties.glade') diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index 768e942a..35793151 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -118,6 +118,7 @@ class SoftwareProperties(SimpleGladeApp): self.init_sourceslist() self.reload_sourceslist() + self.backup_sourceslist() self.window_main.show() @@ -572,6 +573,15 @@ class SoftwareProperties(SimpleGladeApp): self.sourceslist = aptsources.SourcesList() + def backup_sourceslist(self): + """ + Duplicate the list of sources + """ + self.sourceslist_backup = [] + for source in self.sourceslist.list: + source_bkp = aptsources.SourceEntry(line=source.line,file=source.file) + self.sourceslist_backup.append(source_bkp) + def on_channel_activate(self, treeview, path, column): """Open the edit dialog if a channel was double clicked""" self.on_edit_clicked(treeview) @@ -607,10 +617,11 @@ class SoftwareProperties(SimpleGladeApp): def on_button_revert_clicked(self, button): """Restore the source list from the startup of the dialog""" - self.sourceslist.restoreBackup(".save") - self.sourceslist.clearBackup(".save") - self.sourceslist.backup(".save") - self.sourceslist.refresh() + self.sourceslist.list = [] + for source in self.sourceslist_backup: + source_reset = aptsources.SourceEntry(line=source.line,file=source.file) + self.sourceslist.list.append(source_reset) + self.save_sourceslist() self.reload_sourceslist() self.button_revert.set_sensitive(False) self.modified = False @@ -619,7 +630,7 @@ class SoftwareProperties(SimpleGladeApp): """The sources list was changed and now needs to be saved and reloaded""" self.massive_debug_output() self.modified = True - #self.button_revert.set_sensitive(True) + self.button_revert.set_sensitive(True) self.save_sourceslist() self.reload_sourceslist() diff --git a/data/glade/SoftwareProperties.glade b/data/glade/SoftwareProperties.glade index 98bf65bc..d262980d 100644 --- a/data/glade/SoftwareProperties.glade +++ b/data/glade/SoftwareProperties.glade @@ -737,7 +737,7 @@ True - False + True 6 @@ -758,6 +758,85 @@ + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Add Cdrom + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + True @@ -794,25 +873,10 @@ - - 0 - True - True - - - - - - True - gtk-revert-to-saved - True - GTK_RELIEF_NORMAL - True - 0 False - False + True @@ -1138,11 +1202,11 @@ The results are used to improve the support for popular applications and to rank - + 6 True - GTK_BUTTONBOX_EDGE - 0 + False + 6 @@ -1155,6 +1219,11 @@ The results are used to improve the support for popular applications and to rank True + + 0 + False + False + @@ -1168,6 +1237,32 @@ The results are used to improve the support for popular applications and to rank True + + 0 + False + False + GTK_PACK_END + + + + + + True + False + True + True + gtk-revert-to-saved + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + GTK_PACK_END + -- cgit v1.2.3