Reporting bug and adjusting keyboard layouts

diff --git a/src/libraries/qtpie.py b/src/libraries/qtpie.py
index 9602242..b6c3bda 100755 (executable)
--- a/src/libraries/qtpie.py
+++ b/src/libraries/qtpie.py
@@ -489,6 +489,7 @@ class QPieButton(QtGui.QWidget):
        DELAY = 250
 
        def __init__(self, buttonSlice, parent = None):
+               # @bug Artifacts on Maemo 5 due to window 3D effects, find way to disable them for just these?
                QtGui.QWidget.__init__(self, parent)
                self._cachedCenterPosition = self.rect().center()
 

diff --git a/src/plugins/computer.py b/src/plugins/computer.py
index 69876bb..5edd77e 100644 (file)
--- a/src/plugins/computer.py
+++ b/src/plugins/computer.py
@@ -29,19 +29,11 @@ _MAP = {
                        "showAllSlices": False,
                },
                (1, 0): {
-                       "CENTER": {"action": "[&]", "type": "text", "text": "and", },
+                       "CENTER": {"action": "0o", "type": "text", "text": "0o", },
+                       "SOUTH": {"action": "[oct]", "type": "text", "text": "oct", },
                        "showAllSlices": True,
                },
                (1, 1): {
-                       "CENTER": {"action": "[|]", "type": "text", "text": "or", },
-                       "NORTH": {"action": "[~]", "type": "text", "text": "not", },
-                       "showAllSlices": True,
-               },
-               (1, 2): {
-                       "CENTER": {"action": "[^]", "type": "text", "text": "xor", },
-                       "showAllSlices": True,
-               },
-               (2, 0): {
                        "CENTER": {"action": "0x", "type": "text", "text": "0x", },
                        "SOUTH": {"action": "[hex]", "type": "text", "text": "hex", },
                        "NORTH_WEST": {"action": "a", "type": "text", "text": "A", },
@@ -52,13 +44,23 @@ _MAP = {
                        "SOUTH_EAST": {"action": "f", "type": "text", "text": "F", },
                        "showAllSlices": True,
                },
+               (1, 2): {
+                       "CENTER": {"action": "0b", "type": "text", "text": "0b", },
+                       "NORTH": {"action": "1", "type": "text", "text": "1", },
+                       "SOUTH": {"action": "0", "type": "text", "text": "0", },
+                       "showAllSlices": True,
+               },
+               (2, 0): {
+                       "CENTER": {"action": "[&]", "type": "text", "text": "and", },
+                       "showAllSlices": True,
+               },
                (2, 1): {
-                       "CENTER": {"action": "0o", "type": "text", "text": "0o", },
-                       "SOUTH": {"action": "[oct]", "type": "text", "text": "oct", },
+                       "CENTER": {"action": "[|]", "type": "text", "text": "or", },
+                       "NORTH": {"action": "[~]", "type": "text", "text": "not", },
                        "showAllSlices": True,
                },
                (2, 2): {
-                       "CENTER": {"action": "0b", "type": "text", "text": "0b", },
+                       "CENTER": {"action": "[^]", "type": "text", "text": "xor", },
                        "showAllSlices": True,
                },
        },

diff --git a/src/plugins/trig.py b/src/plugins/trig.py
index 7c351a1..c1cd3d7 100644 (file)
--- a/src/plugins/trig.py
+++ b/src/plugins/trig.py
@@ -48,17 +48,17 @@ _MAP = {
                },
                (2, 0): {
                        "CENTER": {"action": "[sin]", "type": "text", "text": "sin", },
-                       "SOUTH": {"action": "[asin]", "type": "text", "text": "asin", },
+                       "NORTH": {"action": "[asin]", "type": "text", "text": "asin", },
                        "showAllSlices": False,
                },
                (2, 1): {
                        "CENTER": {"action": "[cos]", "type": "text", "text": "cos", },
-                       "SOUTH": {"action": "[acos]", "type": "text", "text": "acos", },
+                       "NORTH": {"action": "[acos]", "type": "text", "text": "acos", },
                        "showAllSlices": False,
                },
                (2, 2): {
                        "CENTER": {"action": "[tan]", "type": "text", "text": "tan", },
-                       "SOUTH": {"action": "[atan]", "type": "text", "text": "atan", },
+                       "NORTH": {"action": "[atan]", "type": "text", "text": "atan", },
                        "showAllSlices": False,
                },
        },