From 81a4d6546c1d84d291465b6f8368048ae4f25536 Mon Sep 17 00:00:00 2001
From: epage <eopage@byu.net>
Date: Sun, 24 May 2009 03:12:58 +0000
Subject: [PATCH] Minor improvements and icons added

git-svn-id: file:///svnroot/ejpi/trunk@40 df6cc7de-23d0-4ae0-bb86-c17aa67b2a9d
---
 Makefile            |    2 ++
 src/ejpi_glade.py   |    5 +++--
 support/builddeb.py |   13 ++++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 2b6e127..0423046 100644
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,8 @@ build: $(OBJ)
 	$(foreach file, $(SOURCE), cp $(file) $(BUILD_PATH)/$(subst /,-,$(file)) ; )
 	$(foreach file, $(OBJ), cp $(file) $(BUILD_PATH)/$(subst /,-,$(file)) ; )
 	cp support/$(PROJECT_NAME).desktop $(BUILD_PATH)
+	cp support/icons/26.png $(BUILD_PATH)/26x26-$(PROJECT_NAME).png
+	cp support/icons/64.png $(BUILD_PATH)/64x64-$(PROJECT_NAME).png
 	cp support/builddeb.py $(BUILD_PATH)
 
 lint: $(OBJ)
diff --git a/src/ejpi_glade.py b/src/ejpi_glade.py
index afbf7ef..b167cdc 100755
--- a/src/ejpi_glade.py
+++ b/src/ejpi_glade.py
@@ -99,7 +99,7 @@ class Calculator(object):
 
 	__pretty_app_name__ = "e**(j pi) + 1 = 0"
 	__app_name__ = "ejpi"
-	__version__ = "0.9.3"
+	__version__ = "0.9.4"
 	__app_magic__ = 0xdeadbeef
 
 	_glade_files = [
@@ -161,8 +161,9 @@ class Calculator(object):
 		self._isFullScreen = False
 		if hildon is not None:
 			self._app = hildon.Program()
+			oldWindow = self._window
 			self.__window = hildon.Window()
-			self._widgetTree.get_widget("mainLayout").reparent(self.__window)
+			oldWindow.get_child().reparent(self.__window)
 			self._app.add_window(self.__window)
 			hildon.hildon_helper_set_thumb_scrollbar(self._widgetTree.get_widget('scrollingHistory'), True)
 
diff --git a/support/builddeb.py b/support/builddeb.py
index ec08df7..7aa50bf 100755
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -7,9 +7,13 @@ __appname__ = "ejpi"
 __description__ = "A Touch Screen Optimized RPN Calculator using Pie Menus"
 __author__ = "Ed Page"
 __email__ = "eopage@byu.net"
-__version__ = "0.9.3"
-__build__ = 1
+__version__ = "0.9.4"
+__build__ = 0
 __changelog__ = '''
+0.9.4
+ * Added icons
+ * Minor improvements
+
 0.9.3 - ""
  * Added +/-, !, sq, and sqrt functions
  * Improved Documentation
@@ -90,9 +94,8 @@ if __name__ == "__main__":
 			for (oldName, newName) in files
 		)
 	p["/usr/share/applications/hildon"] = ["ejpi.desktop"]
-	# p["/usr/share/icons/hicolor/26x26/hildon"] = ["26x26-ejpi.png|ejpi.png"]
-	# p["/usr/share/icons/hicolor/64x64/hildon"] = ["64x64-ejpi.png|ejpi.png"]
-	# p["/usr/share/icons/hicolor/scalable/hildon"] = ["scale-ejpi.png|ejpi.png"]
+	p["/usr/share/icons/hicolor/26x26/hildon"] = ["26x26-ejpi.png|ejpi.png"]
+	p["/usr/share/icons/hicolor/64x64/hildon"] = ["64x64-ejpi.png|ejpi.png"]
 
 	print p
 	print p.generate(
-- 
1.7.9.5