From: Ed Page <eopage@byu.net>
Date: Sat, 13 Aug 2011 16:42:00 +0000 (-0500)
Subject: Before I switched from the red square icon to the green curved icon.  Making another... 
X-Git-Url: http://vcs.maemo.org/git/?p=ejpi;a=commitdiff_plain;h=2b553fcdebafb8beaae113d469aa3d5a639b0149

Before I switched from the red square icon to the green curved icon.  Making another attempt by actually using an 80x80 icon (others claimed theirs was scaled)
---

diff --git a/Makefile b/Makefile
index 0d217b3..49b8d9e 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ SOURCE_PATH=$(PACKAGE_NAME)
 SOURCE=$(shell find $(SOURCE_PATH) -iname "*.py")
 
 PROGRAM=ejpi-calc
-ICON_SIZES=26 32 48 64
+ICON_SIZES=26 32 48 64 80
 ICONS=$(foreach size, $(ICON_SIZES), data/icons/$(size)/$(PROJECT_NAME).png)
 PACKAGE_VARIANTS=fremantle harmattan ubuntu
 DESKTOP_FILES=$(foreach variant, $(PACKAGE_VARIANTS), data/$(variant)/$(PROJECT_NAME).desktop)
@@ -120,7 +120,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=apps \
-		-D ICON_SIZES=32,64 \
+		-D ICON_SIZES=64,80 \
 		-o $@ $<
 	chmod +x $@
 
diff --git a/data/template.desktop b/data/template.desktop
index ecfe3b2..39f7468 100644
--- a/data/template.desktop
+++ b/data/template.desktop
@@ -13,7 +13,7 @@ Comment=RPN Calculator
 #		raise RuntimeError("Unsupported desktop file flavor %r" % PROGRAM)
 #
 #	if VARIANT == "harmattan":
-#		cog.outl("Icon=/usr/share/icons/apps/64x64/%s.png" % ICON_NAME)
+#		cog.outl("Icon=/usr/share/icons/apps/80x80/%s.png" % ICON_NAME)
 #	else:
 #		cog.outl("Icon=%s" % ICON_NAME)
 #]]]
diff --git a/setup.py b/setup.py
index 3fa6d75..8387afc 100755
--- a/setup.py
+++ b/setup.py
@@ -89,6 +89,7 @@ setup(
 	},
 	data_files=[
 		(DESKTOP_FILE_PATH, [INPUT_DESKTOP_FILE]),
+		("/usr/share/icons/hicolor/scalable/apps", ["data/%s.svg" % APP_NAME]),
 	] +
 	[
 		(