From 7c0fdd7a719a1127a838a33bc9415fa4800c453b Mon Sep 17 00:00:00 2001 From: "glatzor@ubuntu.com" <> Date: Thu, 29 Jun 2006 01:20:02 +0200 Subject: * self.file got lost during merging * import UI changes from UDS Paris * fix Ubuntu channel template --- SoftwareProperties/SoftwareProperties.py | 2 + channels/Ubuntu.info.in | 1 + data/SoftwareProperties.glade | 985 +++++++++++++++++++------------ 3 files changed, 608 insertions(+), 380 deletions(-) diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index e0d5f524..a5c9ba61 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -83,6 +83,8 @@ class SoftwareProperties(SimpleGladeApp): None, domain="update-manager") self.modified = False + self.file = file + #self.gnome_program = gnome.init("Software Properties", "0.41") #self.gconfclient = gconf.client_get_default() diff --git a/channels/Ubuntu.info.in b/channels/Ubuntu.info.in index 4bda6077..eb88ceb9 100644 --- a/channels/Ubuntu.info.in +++ b/channels/Ubuntu.info.in @@ -56,6 +56,7 @@ RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu/ _Description: Ubuntu 5.10 'Breezy Badger' +Component: main Enabled: 1 _CompDescription: Officially supported Component: restricted diff --git a/data/SoftwareProperties.glade b/data/SoftwareProperties.glade index 085a3a57..cbc87183 100644 --- a/data/SoftwareProperties.glade +++ b/data/SoftwareProperties.glade @@ -7,7 +7,7 @@ 6 620 400 - Software Preferences + Software Sources GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER False @@ -40,21 +40,88 @@ False - + 12 True False - 12 + 18 + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 6 + 0 + 12 + 0 + + + + True + False + 6 + + + + + + + + + + + + + + + + True + + 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 @@ -66,167 +133,72 @@ 0 - + 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 - - - - + CD-ROM/DVD + True + GTK_RELIEF_NORMAL + True + False + False + True 0 - True - True + False + False - + True - GTK_BUTTONBOX_START - 6 - - - - True - True - True - gtk-add - True - GTK_RELIEF_NORMAL - True - - - - - - - True - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - True - - - + False + 12 - + True - True True - gtk-edit - True + Internet: + True GTK_RELIEF_NORMAL True - + False + False + True + + 0 + False + False + - + True - True - True - GTK_RELIEF_NORMAL + False True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-cdrom - 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 + True + True + 0 False - True + False @@ -235,9 +207,9 @@ - + True - <b>Channels</b> + <b>Location</b> False True GTK_JUSTIFY_LEFT @@ -259,7 +231,7 @@ 0 - True + False True @@ -271,9 +243,9 @@ - + True - Installation Media + False False GTK_JUSTIFY_LEFT @@ -294,191 +266,326 @@ - + 12 True - 0 - 0.5 - GTK_SHADOW_NONE + False + 18 - + True - 0.5 - 0.5 - 1 - 1 - 6 - 0 - 12 - 0 + 0 + 0.5 + GTK_SHADOW_NONE - + True - False - 6 + 0.5 + 0.5 + 1 + 1 + 6 + 0 + 12 + 0 - + 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 - True - _Download updates in the background, 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 - - + + + 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 - True - D_elete downloaded software files: - True - GTK_RELIEF_NORMAL - True - False - False - 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 - True + False - + True - - 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 - True + False True - - 0 - False - True - - - - - - True - <b>Internet updates</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + + 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 + + - label_item + 0 + False + True @@ -489,9 +596,9 @@ - + True - Internet Updates + False False GTK_JUSTIFY_LEFT @@ -512,121 +619,102 @@ - + 12 True - 0 - 0.5 - GTK_SHADOW_NONE + 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 - 0.5 - 0.5 - 1 - 1 - 6 - 0 - 12 - 0 + False + 18 - + True False 6 - + True + True True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - False - True - False - True - False - False - False - - + gtk-add + True + GTK_RELIEF_NORMAL + True + 0 - True + False True - + True - False - 6 - - - - True - Restore the default keys of your distribution - True - Restore _Defaults - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - GTK_PACK_END - - + True + True + gtk-edit + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + True + + - - - True - Import the public key from a trusted software provider - True - _Import Key File - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - GTK_PACK_END - - + + + True + True + True + gtk-remove + True + GTK_RELIEF_NORMAL + True + 0 @@ -635,30 +723,167 @@ + + 0 + True + True + + + + + + True + True + gtk-revert-to-saved + True + GTK_RELIEF_NORMAL + True + + + 0 + False + False + + + + + 0 + False + True + + + + + False + True + + + + + + True + Additional Software + 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 - <b>Keys</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + False + 6 + + + + True + Restore the default keys of your distribution + True + Restore _Defaults + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + + + + True + True + gtk-remove + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + GTK_PACK_END + + + + + + True + Import the public key from a trusted software provider + True + _Import Key File + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + GTK_PACK_END + + - label_item + 0 + False + True -- cgit v1.2.3