diff options
| -rw-r--r-- | SoftwareProperties/SoftwareProperties.py | 40 | ||||
| -rw-r--r-- | data/SoftwareProperties.glade | 2 | ||||
| -rw-r--r-- | data/UpdateManager.glade | 4 | ||||
| -rw-r--r-- | debian/changelog | 1 |
4 files changed, 25 insertions, 22 deletions
diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index e6700ca3..b1d557d4 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -138,7 +138,7 @@ class SoftwareProperties(SimpleGladeApp): self.combobox_delete_interval.set_active(key) break - if delete_days >= 1 and CONF_MAP["autoclean"] != 0: + if delete_days >= 1 and apt_pkg.Config.FindI(CONF_MAP["autoclean"]) != 0: self.checkbutton_auto_delete.set_active(True) self.combobox_delete_interval.set_sensitive(True) else: @@ -146,7 +146,7 @@ class SoftwareProperties(SimpleGladeApp): self.combobox_delete_interval.set_sensitive(False) # Autodownload - if CONF_MAP["autodownload"] == 1: + if apt_pkg.Config.FindI(CONF_MAP["autodownload"]) == 1: self.checkbutton_auto_download.set_active(True) else: self.checkbutton_auto_download.set_active(False) @@ -205,15 +205,14 @@ class SoftwareProperties(SimpleGladeApp): def on_combobox_update_interval_changed(self, widget): i = self.combobox_update_interval.get_active() - if not i in self.combobox_interval_mapping.keys(): - return - value = self.combobox_interval_mapping[i] - # Only write the key if it has changed - if not value == apt_pkg.Config.FindI(CONF_MAP["autoupdate"]): - apt_pkg.Config.Set(CONF_MAP["autoupdate"], str(value)) - self.write_config() - - def on_opt_autoupdate_toggled(self, widget): + if i != -1: + value = self.combobox_interval_mapping[i] + # Only write the key if it has changed + if not value == apt_pkg.Config.FindI(CONF_MAP["autoupdate"]): + apt_pkg.Config.Set(CONF_MAP["autoupdate"], str(value)) + self.write_config() + + def on_opt_autoupdate_toggled(self, widget): if self.checkbutton_auto_update.get_active(): self.combobox_update_interval.set_sensitive(True) # if no frequency was specified use daily @@ -231,31 +230,34 @@ class SoftwareProperties(SimpleGladeApp): def on_opt_autodownload_toggled(self, widget): if self.checkbutton_auto_download.get_active(): + self.checkbutton_auto_download.set_active(True) apt_pkg.Config.Set(CONF_MAP["autodownload"], str(1)) else: + self.checkbutton_auto_download.set_active(False) apt_pkg.Config.Set(CONF_MAP["autodownload"], str(0)) # FIXME: Write config options, apt_pkg should be able to do this. self.write_config() def on_combobox_delete_interval_changed(self, widget): i = self.combobox_delete_interval.get_active() - value = self.combobox_delete_interval_mapping[i] - # Only write the key if it has changed - if not value == apt_pkg.Config.FindI(CONF_MAP["max_age"]): - apt_pkg.Config.Set(CONF_MAP["max_age"], str(value)) - self.write_config() + if i != -1: + value = self.combobox_delete_interval_mapping[i] + # Only write the key if it has changed + if not value == apt_pkg.Config.FindI(CONF_MAP["max_age"]): + apt_pkg.Config.Set(CONF_MAP["max_age"], str(value)) + self.write_config() - def opt_autodelete_toggled(self, widget): + def on_opt_autodelete_toggled(self, widget): if self.checkbutton_auto_delete.get_active(): self.combobox_delete_interval.set_sensitive(True) - # if no frequency was specified use daily + # if no frequency was specified use the first default value i = self.combobox_delete_interval.get_active() if i == -1: i = 0 self.combobox_delete_interval.set_active(i) value_maxage = self.combobox_delete_interval_mapping[i] value_clean = 1 - apt_pkg.Config.Set(CONF_MAP["max_age"], str(value_clean)) + apt_pkg.Config.Set(CONF_MAP["max_age"], str(value_maxage)) else: self.combobox_delete_interval.set_sensitive(False) value_clean = 0 diff --git a/data/SoftwareProperties.glade b/data/SoftwareProperties.glade index 3d0e788f..7fc37c30 100644 --- a/data/SoftwareProperties.glade +++ b/data/SoftwareProperties.glade @@ -336,7 +336,7 @@ <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="opt_autoupdate_toggled" last_modification_time="Mon, 04 Jul 2005 23:22:04 GMT"/> + <signal name="toggled" handler="on_opt_autoupdate_toggled" last_modification_time="Tue, 07 Feb 2006 12:36:16 GMT"/> </widget> <packing> <property name="padding">0</property> diff --git a/data/UpdateManager.glade b/data/UpdateManager.glade index c39b94b0..dfd54dc3 100644 --- a/data/UpdateManager.glade +++ b/data/UpdateManager.glade @@ -91,7 +91,7 @@ <child> <widget class="GtkLabel" id="label26"> <property name="visible">True</property> - <property name="label" translatable="yes">Software updates can fix possible security holes, fix possible errors, so called "bugs", or provide new features to you.</property> + <property name="label" translatable="yes">Software updates can correct errors, eliminate security vulnerabilities, and provide new features to you.</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -1477,7 +1477,7 @@ Your system does not check for updates automatically. You can configure this beh <property name="visible">True</property> <property name="label" translatable="yes"><big><b>Checking for available updates</b></big> -Software updates can fix possible security holes, fix possible errors, so called "bugs", or provide new features to you.</property> +Software updates can correct errors, eliminate security vulnerabilities, and provide new features to you.</property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> diff --git a/debian/changelog b/debian/changelog index 2577238e..bcf7bdea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ update-manager (0.42.2ubuntu2) dapper; urgency=low - re-added the internet update options * data/gnome-software-properties.desktop: - use gksu instead of gksudo (#30057) + * wording fixes (#30296) -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 7 Feb 2006 13:13:09 +0100 |