From: Ed Page <eopage@byu.net>
Date: Thu, 13 Jan 2011 02:30:37 +0000 (-0600)
Subject: Updating the trig keyboard to have numbers
X-Git-Url: http://vcs.maemo.org/git/?p=ejpi;a=commitdiff_plain;h=201ed96ad9f8c79d0900b9c1123f4b6fe0a8ae6b

Updating the trig keyboard to have numbers
---

diff --git a/src/plugins/builtins.py b/src/plugins/builtins.py
index 2a33714..ba0826e 100644
--- a/src/plugins/builtins.py
+++ b/src/plugins/builtins.py
@@ -48,13 +48,13 @@ _MAP = {
 		},
 		(2, 0): {
 			"CENTER": {"action": "1", "type": "text", "text": "1", },
+			"NORTH": {"action": ".", "type": "text", "text": ".", },
 			"EAST": {"action": "0", "type": "text", "text": "0", },
 			"showAllSlices": True,
 		},
 		(2, 1): {
 			"CENTER": {"action": "2", "type": "text", "text": "2", },
 			"EAST": {"action": "[abs]", "type": "text", "text": "abs", },
-			"NORTH": {"action": ".", "type": "text", "text": ".", },
 			"WEST": {"action": "[+-]", "type": "text", "text": "+/-", },
 			"showAllSlices": True,
 		},
diff --git a/src/plugins/trig.py b/src/plugins/trig.py
index 65d5863..5c33a52 100644
--- a/src/plugins/trig.py
+++ b/src/plugins/trig.py
@@ -17,48 +17,60 @@ _MAP = {
 	"name": _NAME,
 	"keys": {
 		(0, 0): {
-			"CENTER": {"action": "[sinh]", "type": "text", "text": "sinh", },
-			"SOUTH": {"action": "[asinh]", "type": "text", "text": "asinh", },
+			"CENTER": {"action": "7", "type": "text", "text": "7", },
+			"SOUTH": {"action": "[sinh]", "type": "text", "text": "sinh", },
+			"SOUTH_EAST": {"action": "[cosh]", "type": "text", "text": "cosh", },
+			"EAST": {"action": "[tanh]", "type": "text", "text": "tanh", },
 			"showAllSlices": False,
 		},
 		(0, 1): {
-			"CENTER": {"action": "[cosh]", "type": "text", "text": "cosh", },
-			"SOUTH": {"action": "[acosh]", "type": "text", "text": "acosh", },
+			"CENTER": {"action": "8", "type": "text", "text": "8", },
 			"showAllSlices": False,
 		},
 		(0, 2): {
-			"CENTER": {"action": "[tanh]", "type": "text", "text": "tanh", },
-			"SOUTH": {"action": "[atanh]", "type": "text", "text": "atanh", },
-			"showAllSlices": False,
+			"CENTER": {"action": "9", "type": "text", "text": "9", },
+			"SOUTH": {"action": "[asinh]", "type": "text", "text": "asinh", },
+			"SOUTH_WEST": {"action": "[acosh]", "type": "text", "text": "acosh", },
+			"WEST": {"action": "[atanh]", "type": "text", "text": "atanh", },
+			"showAllSlices": True,
 		},
 		(1, 0): {
-			"CENTER": {"action": "[exp]", "type": "text", "text": "e ** x", },
-			"NORTH": {"action": "[log]", "type": "text", "text": "ln", },
+			"CENTER": {"action": "4", "type": "text", "text": "4", },
 			"showAllSlices": True,
 		},
 		(1, 1): {
-			"CENTER": {"action": "pi", "type": "text", "text": "pi", },
-			"NORTH": {"action": "e", "type": "text", "text": "e", },
+			"CENTER": {"action": "5", "type": "text", "text": "5", },
+			"NORTH": {"action": "[exp]", "type": "text", "text": "e ** x", },
+			"SOUTH": {"action": "[log]", "type": "text", "text": "ln", },
+			"WEST": {"action": "e", "type": "text", "text": "e", },
+			"EAST": {"action": "j", "type": "text", "text": "j", },
 			"showAllSlices": True,
 		},
 		(1, 2): {
-			"CENTER": {"action": "[rad]", "type": "text", "text": "-> rad", },
-			"NORTH": {"action": "[deg]", "type": "text", "text": "-> deg", },
+			"CENTER": {"action": "6", "type": "text", "text": "6", },
+			"WEST": {"action": "pi", "type": "text", "text": "pi", },
+			"NORTH": {"action": "[rad]", "type": "text", "text": "-> rad", },
+			"SOUTH": {"action": "[deg]", "type": "text", "text": "-> deg", },
 			"showAllSlices": True,
 		},
 		(2, 0): {
-			"CENTER": {"action": "[sin]", "type": "text", "text": "sin", },
-			"NORTH": {"action": "[asin]", "type": "text", "text": "asin", },
-			"showAllSlices": False,
+			"CENTER": {"action": "1", "type": "text", "text": "1", },
+			"NORTH": {"action": ".", "type": "text", "text": ".", },
+			"EAST": {"action": "0", "type": "text", "text": "0", },
+			"showAllSlices": True,
 		},
 		(2, 1): {
-			"CENTER": {"action": "[cos]", "type": "text", "text": "cos", },
-			"NORTH": {"action": "[acos]", "type": "text", "text": "acos", },
-			"showAllSlices": False,
+			"CENTER": {"action": "2", "type": "text", "text": "2", },
+			"WEST": {"action": "[sin]", "type": "text", "text": "sin", },
+			"NORTH": {"action": "[cos]", "type": "text", "text": "cos", },
+			"EAST": {"action": "[tan]", "type": "text", "text": "tan", },
+			"showAllSlices": True,
 		},
 		(2, 2): {
-			"CENTER": {"action": "[tan]", "type": "text", "text": "tan", },
-			"NORTH": {"action": "[atan]", "type": "text", "text": "atan", },
+			"CENTER": {"action": "3", "type": "text", "text": "3", },
+			"NORTH": {"action": "[asin]", "type": "text", "text": "asin", },
+			"NORTH_WEST": {"action": "[acos]", "type": "text", "text": "acos", },
+			"WEST": {"action": "[atan]", "type": "text", "text": "atan", },
 			"showAllSlices": False,
 		},
 	},