From 02352fee746a3e17be326d7a68b1b8b4970f6203 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Tue, 18 Apr 2006 22:23:08 +0200 Subject: * rename gnome-software-properties to software-properties (there is no dependency on gnome anymore) * remove deprecated code --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 0ed64179..16cb524c 100755 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ setup(name='update-manager', 'UpdateManager.Common' ], scripts=[ - 'gnome-software-properties', + 'software-properties', 'update-manager' ], data_files=[ @@ -56,7 +56,7 @@ setup(name='update-manager', ), ('share/applications', ["data/update-manager.desktop", - "data/gnome-software-properties.desktop"] + "data/software-properties.desktop"] ), ('share/gconf/schemas', glob.glob("build/*.schemas") -- cgit v1.2.3 From 02ce954fc3e84712a4c4e886079366081d0e19e1 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Tue, 18 Apr 2006 22:38:08 +0200 Subject: * use the tango system-software-update icon for update-manager * use the old update-manager icon for software-properties only * do not specify the file type of the icon in the desktop file * install the icons to the hicolor theme * remove the deprecated update-manager-logo - it will be replaced by the svg version of update-manager --- data/icons/16x16/apps/update-manager.png | Bin 0 -> 964 bytes data/icons/22x22/apps/update-manager.png | Bin 0 -> 1464 bytes data/icons/24x24/apps/update-manager.png | Bin 0 -> 1475 bytes data/icons/48x48/apps/software-properties.png | Bin 0 -> 4009 bytes data/icons/scalable/apps/update-manager.svg | 1519 +++++++++++++++++++++++++ data/software-properties.desktop.in | 2 +- data/update-manager-logo.png | Bin 8497 -> 0 bytes data/update-manager.desktop.in | 2 +- data/update-manager.png | Bin 4009 -> 0 bytes setup.py | 8 +- 10 files changed, 1524 insertions(+), 7 deletions(-) create mode 100644 data/icons/16x16/apps/update-manager.png create mode 100644 data/icons/22x22/apps/update-manager.png create mode 100644 data/icons/24x24/apps/update-manager.png create mode 100644 data/icons/48x48/apps/software-properties.png create mode 100644 data/icons/scalable/apps/update-manager.svg delete mode 100644 data/update-manager-logo.png delete mode 100644 data/update-manager.png (limited to 'setup.py') diff --git a/data/icons/16x16/apps/update-manager.png b/data/icons/16x16/apps/update-manager.png new file mode 100644 index 00000000..58f19c68 Binary files /dev/null and b/data/icons/16x16/apps/update-manager.png differ diff --git a/data/icons/22x22/apps/update-manager.png b/data/icons/22x22/apps/update-manager.png new file mode 100644 index 00000000..5f7a362b Binary files /dev/null and b/data/icons/22x22/apps/update-manager.png differ diff --git a/data/icons/24x24/apps/update-manager.png b/data/icons/24x24/apps/update-manager.png new file mode 100644 index 00000000..b49ea26f Binary files /dev/null and b/data/icons/24x24/apps/update-manager.png differ diff --git a/data/icons/48x48/apps/software-properties.png b/data/icons/48x48/apps/software-properties.png new file mode 100644 index 00000000..739be699 Binary files /dev/null and b/data/icons/48x48/apps/software-properties.png differ diff --git a/data/icons/scalable/apps/update-manager.svg b/data/icons/scalable/apps/update-manager.svg new file mode 100644 index 00000000..834464ab --- /dev/null +++ b/data/icons/scalable/apps/update-manager.svg @@ -0,0 +1,1519 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Software Update + + + Jakub Steiner + + + + + + + + + http://jimmac.musichall.cz + + + network update + software + synchronize + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/software-properties.desktop.in b/data/software-properties.desktop.in index 851ae047..c125b4f7 100644 --- a/data/software-properties.desktop.in +++ b/data/software-properties.desktop.in @@ -3,7 +3,7 @@ _Name=Software Properties _GenericName=Software Properties _Comment=Configure software channels and internet updates Exec=gksu /usr/bin/software-properties -Icon=update-manager +Icon=software-properties Terminal=false X-MultipleArgs=false Type=Application diff --git a/data/update-manager-logo.png b/data/update-manager-logo.png deleted file mode 100644 index 77c2c51c..00000000 Binary files a/data/update-manager-logo.png and /dev/null differ diff --git a/data/update-manager.desktop.in b/data/update-manager.desktop.in index 0116c78b..84e1e608 100644 --- a/data/update-manager.desktop.in +++ b/data/update-manager.desktop.in @@ -3,7 +3,7 @@ _Name=Update Manager _GenericName=Update Manager _Comment=Show and install available updates Exec=gksu /usr/bin/update-manager -Icon=update-manager.png +Icon=update-manager Terminal=false Type=Application Encoding=UTF-8 diff --git a/data/update-manager.png b/data/update-manager.png deleted file mode 100644 index 739be699..00000000 Binary files a/data/update-manager.png and /dev/null differ diff --git a/setup.py b/setup.py index 16cb524c..8d8ccf9f 100755 --- a/setup.py +++ b/setup.py @@ -47,9 +47,7 @@ setup(name='update-manager', ], data_files=[ ('share/update-manager/glade', - glob.glob("data/*.glade")+ - ["data/update-manager-logo.png", - "data/update-manager.png"] + glob.glob("data/*.glade") ), ('share/update-manager/channels', glob.glob("channels/*") @@ -61,8 +59,8 @@ setup(name='update-manager', ('share/gconf/schemas', glob.glob("build/*.schemas") ), - ('share/pixmaps', - ["data/update-manager.png"] + ('share/icons/hicolor', + ["data/icons/*"] ), ] + I18NFILES + HELPFILES, ) -- cgit v1.2.3 From c3318622c7eba97f709f665578c7e9b23b784b16 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Tue, 18 Apr 2006 23:38:22 +0200 Subject: * include the icons into the build system * fix the po creation for the changed file names --- po/POTFILES.in | 4 ++-- setup.py | 18 ++++++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) (limited to 'setup.py') diff --git a/po/POTFILES.in b/po/POTFILES.in index ed7c079a..c74e2d16 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -17,8 +17,8 @@ data/SoftwareProperties.glade data/SoftwarePropertiesDialogs.glade data/update-manager.desktop.in data/update-manager.schemas.in -data/gnome-software-properties.desktop.in +data/software-properties.desktop.in [type: gettext/rfc822deb] channels/Ubuntu.info.in [type: gettext/rfc822deb] channels/Debian.info.in [type: python] update-manager -[type: python] gnome-software-properties +[type: python] software-properties diff --git a/setup.py b/setup.py index 8d8ccf9f..798fea0e 100755 --- a/setup.py +++ b/setup.py @@ -23,6 +23,19 @@ for filepath in glob.glob("po/mo/*/LC_MESSAGES/*.mo"): targetpath = os.path.dirname(os.path.join("share/locale",lang)) I18NFILES.append((targetpath, [filepath])) +ICONS = [] +for size in glob.glob("data/icons/*"): + for category in glob.glob("%s/*" % size): + icons = [] + for icon in glob.glob("%s/*" % category): + icons.append(icon) + ICONS.append(("share/icons/hicolor/%s/%s" % \ + (os.path.basename(size), \ + os.path.basename(category)), \ + icons)) +print ICONS + + os.system("intltool-merge -d po data/update-manager.schemas.in"\ " build/update-manager.schemas") @@ -59,10 +72,7 @@ setup(name='update-manager', ('share/gconf/schemas', glob.glob("build/*.schemas") ), - ('share/icons/hicolor', - ["data/icons/*"] - ), - ] + I18NFILES + HELPFILES, + ] + I18NFILES + HELPFILES + ICONS, ) -- cgit v1.2.3