From dd9ae515904cb90cfa73297344a4bdcc6a066240 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@byu.net>
Date: Mon, 8 Aug 2011 17:32:59 -0500
Subject: [PATCH] Reducing the main icons included and putting in the button
 icons

---
 Makefile |    3 +++
 setup.py |   11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index be213a2..a4ad0f8 100644
--- a/Makefile
+++ b/Makefile
@@ -95,6 +95,7 @@ setup.fremantle.py: setup.py src/constants.py
 		-D DESKTOP_FILE_PATH=/usr/share/applications/hildon \
 		-D INPUT_DESKTOP_FILE=data/$(VARIANT)/$(PROJECT_NAME).desktop \
 		-D ICON_CATEGORY=hildon \
+		-D ICON_SIZES=26,32,48 \
 		-o $@ $<
 	chmod +x $@
 
@@ -103,6 +104,7 @@ setup.harmattan.py: setup.py src/constants.py
 		-D DESKTOP_FILE_PATH=/usr/share/applications \
 		-D INPUT_DESKTOP_FILE=data/$(VARIANT)/$(PROJECT_NAME).desktop \
 		-D ICON_CATEGORY=hildon \
+		-D ICON_SIZES=32,80 \
 		-o $@ $<
 	chmod +x $@
 
@@ -111,6 +113,7 @@ setup.ubuntu.py: setup.py src/constants.py
 		-D DESKTOP_FILE_PATH=/usr/share/applications \
 		-D INPUT_DESKTOP_FILE=data/$(VARIANT)/$(PROJECT_NAME).desktop \
 		-D ICON_CATEGORY=apps \
+		-D ICON_SIZES=32,48 \
 		-o $@ $<
 	chmod +x $@
 
diff --git a/setup.py b/setup.py
index 803cb05..dd33f2e 100755
--- a/setup.py
+++ b/setup.py
@@ -25,6 +25,7 @@ from distutils.core import setup
 #	cog.outl('DESKTOP_FILE_PATH="%s"' % DESKTOP_FILE_PATH)
 #	cog.outl('INPUT_DESKTOP_FILE="%s"' % INPUT_DESKTOP_FILE)
 #	cog.outl('ICON_CATEGORY="%s"' % ICON_CATEGORY)
+#	cog.outl('ICON_SIZES=[%s]' % ICON_SIZES)
 #]]]
 APP_NAME="ejpi"
 PRETTY_APP_NAME="e**(j pi) + 1 = 0"
@@ -33,6 +34,7 @@ BUILD=0
 DESKTOP_FILE_PATH="/usr/share/applications"
 INPUT_DESKTOP_FILE="data/harmattan/ejpi.desktop"
 ICON_CATEGORY="hildon"
+ICON_SIZES=[32,80]
 #[[[end]]]
 
 CHANGES = """Switching from py2deb.py to sdist_maemo
@@ -82,7 +84,7 @@ setup(
 	],
 	packages=list(find_packages(APP_NAME, includeRoot=True)),
 	package_data={
-		"ejpi.plugins": ["*.ini"],
+		"ejpi.plugins": ["*.ini", "images/*.png"],
 	},
 	data_files=[
 		(DESKTOP_FILE_PATH, [INPUT_DESKTOP_FILE]),
@@ -91,6 +93,13 @@ setup(
 		("/usr/share/icons/hicolor/48x48/%s" % ICON_CATEGORY, ["data/icons/48/%s.png" % APP_NAME]),
 		("/usr/share/icons/hicolor/80x80/%s" % ICON_CATEGORY, ["data/icons/80/%s.png" % APP_NAME]),
 		("/usr/share/icons/hicolor/scalable/%s" % ICON_CATEGORY, ["data/%s.svg" % APP_NAME]),
+	] +
+	[
+		(
+			"/usr/share/icons/hicolor/%sx%s/%s" % (size, size, ICON_CATEGORY),
+			["data/icons/%s/%s.png" % (size, APP_NAME)]
+		)
+		for size in ICON_SIZES
 	],
 	requires=[
 		"PySide",
-- 
1.7.9.5