From 880b57ed3239de18b942945aead95d18844c715e Mon Sep 17 00:00:00 2001 From: "glatzor@ubuntu.com" <> Date: Fri, 21 Jul 2006 15:40:39 +0200 Subject: * move the cdroms of the current distro to its own treeview * add a popcon tab to the ui - only a fake currently * improve wording: replace free by OpenSource as suggested by Corey (still a lot to do) --- data/SoftwareProperties.glade | 375 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 302 insertions(+), 73 deletions(-) (limited to 'data') 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 @@ 6 - 620 - 400 Software Sources GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER @@ -72,17 +70,26 @@ 18 - + True False 6 - - + + True + False + 6 - - + + + + + + 0 + True + True + @@ -99,7 +106,7 @@ True - + <b>Downloadable software</b> False True GTK_JUSTIFY_LEFT @@ -127,14 +134,14 @@ - + True 0 0.5 GTK_SHADOW_NONE - + True 0.5 0.5 @@ -146,26 +153,59 @@ 0 - + True False 6 - - True - CD-ROM/DVD - True - GTK_RELIEF_NORMAL - True - False - False - 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 False - False + True @@ -187,43 +227,89 @@ False + + + + + + + + True + <b>Download options</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 - False - 12 + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT - + + 109 True True - Download software from the Internet: - True - GTK_RELIEF_NORMAL - True - False - False - True + False + True + False + True + False + False + False - - 0 - False - False - - - - - - True - False - True - - - 0 - True - True - @@ -238,9 +324,9 @@ - + True - <b>Options</b> + <b>CDROM/DVD</b> False True GTK_JUSTIFY_LEFT @@ -262,7 +348,7 @@ 0 - False + True True @@ -274,7 +360,7 @@ - + True False @@ -345,7 +431,7 @@ - + True <b>Internet Updates</b> False @@ -627,9 +713,9 @@ - + True - + Internet Updates False False GTK_JUSTIFY_LEFT @@ -793,7 +879,7 @@ True - Additional Software + Third Party False False GTK_JUSTIFY_LEFT @@ -857,15 +943,77 @@ 6 - + True - Restore the default keys of your distribution + Import the public key from a trusted software provider True - Restore _Defaults - 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 @@ -875,14 +1023,15 @@ - + True + Restore the default keys of your distribution True - gtk-remove - True + Restore _Defaults + True GTK_RELIEF_NORMAL True - + 0 @@ -893,21 +1042,19 @@ - + True - Import the public key from a trusted software provider True - _Import Key File - True + gtk-remove + True GTK_RELIEF_NORMAL True - + 0 False False - GTK_PACK_END @@ -946,6 +1093,88 @@ tab + + + + 12 + True + False + 6 + + + + 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 to Ubuntu + 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 -- cgit v1.2.3