From 730361dc8fc29ee9d5046e5185361658283bccd8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 27 Feb 2006 19:53:38 +0100 Subject: * revert the SoftwareProperty changes for now until the new stuff is ready --- data/SoftwareProperties.glade | 272 +++++++--------- data/SoftwarePropertiesDialogs.glade | 615 ++++++++--------------------------- 2 files changed, 250 insertions(+), 637 deletions(-) (limited to 'data') diff --git a/data/SoftwareProperties.glade b/data/SoftwareProperties.glade index 5e5c2b7a..89a56f11 100644 --- a/data/SoftwareProperties.glade +++ b/data/SoftwareProperties.glade @@ -5,6 +5,7 @@ 6 + 580 400 True Software Preferences @@ -67,7 +68,7 @@ 0 - + True False 6 @@ -92,8 +93,6 @@ False False False - - @@ -105,175 +104,123 @@ - + True - False - 12 + GTK_BUTTONBOX_START + 6 - + True - False - 6 + True + True + gtk-add + True + GTK_RELIEF_NORMAL + True + + + - - - True - True - True - gtk-add - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - + + + True + True + True + gtk-remove + True + GTK_RELIEF_NORMAL + True + + + + + + + True + True + True + gtk-edit + True + GTK_RELIEF_NORMAL + True + + + + + + + True + True + True + GTK_RELIEF_NORMAL + True + - + True - True - True - GTK_RELIEF_NORMAL - True - + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 - + True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 + False + 2 - + 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 - - + 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 - False - False - - - - - - True - False - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - True - False - True - True - gtk-edit - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - 0 - True - True - - - - - - True - True - gtk-revert-to-saved - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - @@ -424,7 +371,7 @@ True True - _Download updates in the background, but do not install them + _Download updates in the backgound, but do not install them True GTK_RELIEF_NORMAL True @@ -641,42 +588,43 @@ 0 False False - GTK_PACK_END - + 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 - + True + Import the public key from a trusted software provider True - gtk-remove - True + _Import Key File + True GTK_RELIEF_NORMAL True - + 0 False False + GTK_PACK_END diff --git a/data/SoftwarePropertiesDialogs.glade b/data/SoftwarePropertiesDialogs.glade index ed350003..a9e13d5e 100644 --- a/data/SoftwarePropertiesDialogs.glade +++ b/data/SoftwarePropertiesDialogs.glade @@ -5,7 +5,7 @@ 6 - Add Channel + Add repository... GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True @@ -18,19 +18,33 @@ GDK_GRAVITY_NORTH_WEST True False - False + True True False - 12 + 6 True GTK_BUTTONBOX_END + + + True + True + True + _Custom + True + GTK_RELIEF_NORMAL + True + -6 + + + + True @@ -45,13 +59,13 @@ - + True True True True True - gtk-add + gtk-ok True GTK_RELIEF_NORMAL True @@ -68,161 +82,42 @@ - - 6 + True False 12 - + True - False - 6 - - - - True - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - - True - - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - - - 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 - False - True - - - - 0 - True - True - - - - - - True - - - 0 - False - False - - - - - - True - False - 0 - - - - True - False - 6 + <b>Repository</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - + + + True + False + True + 0 @@ -232,145 +127,46 @@ - + + True + <b>Components</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True False 6 - - True - True - GTK_RELIEF_NORMAL - True - False - False - True - radiobutton_official - - - - - True - <b>Custom channel</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - - - 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 - 10 - - - - True - APT line: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + + - - - True - The APT line contains the type, location and components of a channel, for example 'deb http://ftp.debian.org sarge main' - True - True - True - 0 - - True - * - True - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - + + @@ -386,6 +182,10 @@ True + + + + @@ -574,7 +374,60 @@ The APT line contains the type, location and content of a repository, for exampl - + + True + False + 10 + + + + True + APT line: + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + True + True + 0 + + True + * + True + + + 0 + True + True + + + + + 0 + False + True + @@ -596,7 +449,7 @@ The APT line contains the type, location and content of a repository, for exampl 6 - Edit Channel + Edit Repository... GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True @@ -610,7 +463,7 @@ The APT line contains the type, location and content of a repository, for exampl GDK_GRAVITY_NORTH_WEST True False - False + True @@ -1950,7 +1803,7 @@ You can add and remove authentication keys in this dialog. A key makes it possib - 6 + 12 Scanning CD-ROM GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE @@ -2060,192 +1913,4 @@ You can add and remove authentication keys in this dialog. A key makes it possib - - 6 - - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - False - - - - True - False - 12 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - GTK_RELIEF_NORMAL - True - -5 - - - - True - gtk-add - 4 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - -7 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 6 - True - False - 12 - - - - True - gtk-dialog-question - 6 - 0 - 0 - 0 - 0 - - - 0 - False - True - - - - - - True - False - 12 - - - - True - - False - False - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 200 - 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 - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - -- cgit v1.2.3