From 28d131b543b638589c243abb6b1c247c8c653321 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Thu, 23 Feb 2006 13:24:40 +0100 Subject: * Move the mime type handling of sources.lists to gnome-software-properties * Renamed mime type to text/x-apt-sources-list * Remove all depricated add-software-channel code * Add a schemas file for update-manager * Use dh_gconf * Software Properties: - Move the channel buttons to the bottom of the notebook to get more vertical space for the channels - Set a global window icon for SoftwareProperties and its children - Add drag and drop support for sources.list on the treeview_sources - Allow to enable and disable channels - Do not use so much space for rendering the sources lista - Use the comment instead of the URI in the channel list if we don't find a nice name - Show the type only on source channels - "binary" is too technial - Add some small sanity checks to aptsources - Use single quotes in the predefind distru names * Dialog add: - merge the custom and the default add dialog - sanity checks for the custom apt line, that do not allow to add a wrong one * Update Manager: - add an option to hide the reload reminder --- data/SoftwareProperties.glade | 26 +- data/SoftwareProperties.gladep | 8 - data/SoftwarePropertiesDialogs.glade | 606 +++++++++++++++++++++------- data/UpdateManager.glade | 65 ++- data/gnome-software-properties.desktop.in | 3 +- data/gnome-software-properties.gladep | 8 - data/mime/add-software-channel.applications | 9 - data/mime/add-software-channel.desktop | 11 - data/mime/add-software-channel.desktop.in | 11 - data/mime/apt.xml | 2 +- data/update-manager.gladep | 8 - data/update-manager.schemas.in | 52 +++ 12 files changed, 595 insertions(+), 214 deletions(-) delete mode 100644 data/SoftwareProperties.gladep delete mode 100644 data/gnome-software-properties.gladep delete mode 100644 data/mime/add-software-channel.applications delete mode 100644 data/mime/add-software-channel.desktop delete mode 100644 data/mime/add-software-channel.desktop.in delete mode 100644 data/update-manager.gladep create mode 100644 data/update-manager.schemas.in (limited to 'data') diff --git a/data/SoftwareProperties.glade b/data/SoftwareProperties.glade index 89a56f11..27f53404 100644 --- a/data/SoftwareProperties.glade +++ b/data/SoftwareProperties.glade @@ -68,7 +68,7 @@ 0 - + True False 6 @@ -104,9 +104,9 @@ - + True - GTK_BUTTONBOX_START + False 6 @@ -120,6 +120,11 @@ True + + 0 + False + False + @@ -133,6 +138,11 @@ True + + 0 + False + False + @@ -146,6 +156,11 @@ True + + 0 + False + False + @@ -221,6 +236,11 @@ + + 0 + False + False + diff --git a/data/SoftwareProperties.gladep b/data/SoftwareProperties.gladep deleted file mode 100644 index 183077ba..00000000 --- a/data/SoftwareProperties.gladep +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - FALSE - diff --git a/data/SoftwarePropertiesDialogs.glade b/data/SoftwarePropertiesDialogs.glade index a9e13d5e..c98cc636 100644 --- a/data/SoftwarePropertiesDialogs.glade +++ b/data/SoftwarePropertiesDialogs.glade @@ -5,7 +5,7 @@ 6 - Add repository... + Add Channel GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True @@ -18,33 +18,19 @@ GDK_GRAVITY_NORTH_WEST True False - True + False True False - 6 + 12 True GTK_BUTTONBOX_END - - - True - True - True - _Custom - True - GTK_RELIEF_NORMAL - True - -6 - - - - True @@ -59,13 +45,13 @@ - + True True True True True - gtk-ok + gtk-add True GTK_RELIEF_NORMAL True @@ -82,42 +68,156 @@ - + + 6 True False 12 - + True - <b>Repository</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + False + 6 - - - True - False - True - + + + True + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + True + <b>Official Ubuntu 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 + 6 + + + + True + False + True + + + + 0 + True + True + + + + + + True + + + 0 + False + False + + + + + + True + False + 6 + + + + + + + + + + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + 0 @@ -127,46 +227,145 @@ - - 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 + @@ -182,10 +381,6 @@ True - - - - @@ -374,60 +569,7 @@ 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 - + @@ -463,7 +605,7 @@ The APT line contains the type, location and content of a repository, for exampl GDK_GRAVITY_NORTH_WEST True False - True + False @@ -1913,4 +2055,192 @@ 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 + + + + + + diff --git a/data/UpdateManager.glade b/data/UpdateManager.glade index 400a4f75..c94edff6 100644 --- a/data/UpdateManager.glade +++ b/data/UpdateManager.glade @@ -1388,25 +1388,58 @@ Need to get the changes from the central server - + True - True - <b><big>You need to manually reload the latest information about updates</big></b> + False + 12 + + + + True + True + <b><big>You need to manually reload the latest information about updates</big></b> Your system does not check for updates automatically. You can configure this behavior in "System" -> "Administration" -> "Software Properties". - False - True - GTK_JUSTIFY_LEFT - True - True - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + False + True + GTK_JUSTIFY_LEFT + True + True + 0 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + _Hide this information in the future + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + False + + 0 diff --git a/data/gnome-software-properties.desktop.in b/data/gnome-software-properties.desktop.in index c626869a..bf570533 100644 --- a/data/gnome-software-properties.desktop.in +++ b/data/gnome-software-properties.desktop.in @@ -1,12 +1,13 @@ [Desktop Entry] _Name=Software Properties _GenericName=Software Properties -_Comment=Edit software sources and settings +_Comment=Configure software channels and internet updates Exec=gksu /usr/bin/gnome-software-properties Icon=update-manager.png Terminal=false MultipleArgs=false Type=Application Encoding=UTF-8 +MimeType=text/x-apt-sources-list Categories=Application;System;Settings; X-KDE-SubstituteUID=true diff --git a/data/gnome-software-properties.gladep b/data/gnome-software-properties.gladep deleted file mode 100644 index 183077ba..00000000 --- a/data/gnome-software-properties.gladep +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - FALSE - diff --git a/data/mime/add-software-channel.applications b/data/mime/add-software-channel.applications deleted file mode 100644 index 2b38d9b7..00000000 --- a/data/mime/add-software-channel.applications +++ /dev/null @@ -1,9 +0,0 @@ - -add-software-channel - command=add-software-channel - name=Add Software Channel - can_open_multiple_files=false - expects_uris=false - requires_terminal=false - mime_types=text/x-apt-sources - diff --git a/data/mime/add-software-channel.desktop b/data/mime/add-software-channel.desktop deleted file mode 100644 index fa61fe81..00000000 --- a/data/mime/add-software-channel.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Add Software Channel -GenericName=Add Software Channel -Exec=/usr/bin/add-software-channel -Icon=update-manager.png -Terminal=false -Hide=true -Type=Application -Encoding=UTF-8 -Categories=Application;System; -MimeType=text/x-apt-sources; diff --git a/data/mime/add-software-channel.desktop.in b/data/mime/add-software-channel.desktop.in deleted file mode 100644 index bc8b1f7a..00000000 --- a/data/mime/add-software-channel.desktop.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=Add Software Channel -_GenericName=Add Software Channel -Exec=/usr/bin/add-software-channel -Icon=update-manager.png -Terminal=false -Visible=false -Type=Application -Encoding=UTF-8 -Categories=Application;System;Settings; -MimeType=text/x-apt-sources diff --git a/data/mime/apt.xml b/data/mime/apt.xml index 33592bdd..d7332632 100644 --- a/data/mime/apt.xml +++ b/data/mime/apt.xml @@ -1,6 +1,6 @@ - + Software Channel List diff --git a/data/update-manager.gladep b/data/update-manager.gladep deleted file mode 100644 index 183077ba..00000000 --- a/data/update-manager.gladep +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - FALSE - diff --git a/data/update-manager.schemas.in b/data/update-manager.schemas.in new file mode 100644 index 00000000..06308871 --- /dev/null +++ b/data/update-manager.schemas.in @@ -0,0 +1,52 @@ + + + + + /schemas/apps/update-manager/remind_reload + /apps/update-manager/remind_reload + update-manager + bool + True + + + Remind to reload the channel list + + If automatic checking for updates is disabeld, you have + to reload the channel list manually. This option allows + to hide the reminder shown in this case. + + + + + /schemas/apps/update-manager/show_details + /apps/update-manager/show_details + update-manager + bool + False + + + Show details of an update + + Stores the state of the expander that contains the + list of changs and the description + + + + + /schemas/apps/update-manager/window_size + /apps/update-manager/window_size + update-manager + pair + int + int + + + The window size + + Stores the size of the update-manager dialog + + + + + + -- cgit v1.2.3