Swapping keyboards

git-svn-id: file:///svnroot/ejpi/trunk@42 df6cc7de-23d0-4ae0-bb86-c17aa67b2a9d

diff --git a/src/ejpi.glade b/src/ejpi.glade
index 3d9c496..e9cbaba 100644 (file)
--- a/src/ejpi.glade
+++ b/src/ejpi.glade
@@ -216,22 +216,9 @@
               <widget class="GtkVBox" id="functionLayout">
                 <property name="visible">True</property>
                 <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <widget class="GtkHSeparator" id="hseparator1">
-                    <property name="visible">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
                   <widget class="GtkNotebook" id="pluginKeyboards">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="tab_pos">bottom</property>
                     <property name="scrollable">True</property>
                     <child>
                       <placeholder/>
@@ -248,9 +235,21 @@
                     </child>
                   </widget>
                   <packing>
-                    <property name="position">2</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
+                <child>
+                  <widget class="GtkHSeparator" id="hseparator1">
+                    <property name="visible">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
               </widget>
               <packing>
                 <property name="position">1</property>

diff --git a/src/ejpi_glade.py b/src/ejpi_glade.py
index b167cdc..afb2175 100755 (executable)
--- a/src/ejpi_glade.py
+++ b/src/ejpi_glade.py
@@ -203,7 +203,6 @@ class Calculator(object):
                self.__builtinPlugin = self.__keyboardPlugins.keyboards["Builtin"].construct_keyboard()
                self.__builtinKeyboard = self.__builtinPlugin.setup(self.__history, self.__sliceStyle, self.__handler)
                self._widgetTree.get_widget("functionLayout").pack_start(self.__builtinKeyboard)
-               self._widgetTree.get_widget("functionLayout").reorder_child(self.__builtinKeyboard, 0)
                self.enable_plugin(self.__keyboardPlugins.lookup_plugin("Trigonometry"))
                self.enable_plugin(self.__keyboardPlugins.lookup_plugin("Computer"))
                self.enable_plugin(self.__keyboardPlugins.lookup_plugin("Alphabet"))

diff --git a/src/plugins/builtins.map b/src/plugins/builtins.map
index 45af6d6..6bbb840 100644 (file)
--- a/src/plugins/builtins.map
+++ b/src/plugins/builtins.map
@@ -23,6 +23,10 @@
                },
                (1, 1): {
                        "CENTER": {"action": "5", "type": "text", "text": "5", },
+                       "EAST": {"action": "[+]", "type": "text", "text": "+", },
+                       "WEST": {"action": "[-]", "type": "text", "text": "-", },
+                       "NORTH": {"action": "[*]", "type": "text", "text": "*", },
+                       "SOUTH": {"action": "[/]", "type": "text", "text": "/", },
                        "showAllSlices": True,
                },
                (1, 2): {
@@ -52,10 +56,6 @@
                },
                (3, 1): {
                        "CENTER": {"action": "0", "type": "text", "text": "0", },
-                       "EAST": {"action": "[+]", "type": "text", "text": "+", },
-                       "WEST": {"action": "[-]", "type": "text", "text": "-", },
-                       "NORTH": {"action": "[*]", "type": "text", "text": "*", },
-                       "SOUTH": {"action": "[/]", "type": "text", "text": "/", },
                        "showAllSlices": True,
                },
                (3, 2): {

diff --git a/src/plugins/computer.map b/src/plugins/computer.map
index 521708d..6f99e98 100644 (file)
--- a/src/plugins/computer.map
+++ b/src/plugins/computer.map
@@ -3,24 +3,16 @@
        "dimensions": (3, 3),
        "keys": {
                (0, 0): {
-                       "CENTER": {"action": "0x", "type": "text", "text": "0x", },
-                       "NORTH": {"action": "[hex]", "type": "text", "text": "hex", },
-                       "NORTH_WEST": {"action": "a", "type": "text", "text": "A", },
-                       "WEST": {"action": "b", "type": "text", "text": "B", },
-                       "SOUTH_WEST": {"action": "c", "type": "text", "text": "C", },
-                       "NORTH_EAST": {"action": "d", "type": "text", "text": "D", },
-                       "EAST": {"action": "e", "type": "text", "text": "E", },
-                       "SOUTH_EAST": {"action": "f", "type": "text", "text": "F", },
-                       "showAllSlices": True,
+                       "CENTER": {"action": "[//]", "type": "text", "text": "//", },
+                       "showAllSlices": False,
                },
                (0, 1): {
-                       "CENTER": {"action": "0o", "type": "text", "text": "0o", },
-                       "NORTH": {"action": "[oct]", "type": "text", "text": "oct", },
+                       "CENTER": {"action": "[dec]", "type": "text", "text": "dec", },
                        "showAllSlices": True,
                },
                (0, 2): {
-                       "CENTER": {"action": "0b", "type": "text", "text": "0b", },
-                       "showAllSlices": True,
+                       "CENTER": {"action": "[%]", "type": "text", "text": "%", },
+                       "showAllSlices": False,
                },
                (1, 0): {
                        "CENTER": {"action": "[&]", "type": "text", "text": "and", },
@@ -28,7 +20,7 @@
                },
                (1, 1): {
                        "CENTER": {"action": "[|]", "type": "text", "text": "or", },
-                       "SOUTH": {"action": "[~]", "type": "text", "text": "not", },
+                       "NORTH": {"action": "[~]", "type": "text", "text": "not", },
                        "showAllSlices": True,
                },
                (1, 2): {
@@ -36,16 +28,24 @@
                        "showAllSlices": True,
                },
                (2, 0): {
-                       "CENTER": {"action": "[//]", "type": "text", "text": "//", },
-                       "NORTH": {"action": "[%]", "type": "text", "text": "%", },
-                       "showAllSlices": False,
+                       "CENTER": {"action": "0x", "type": "text", "text": "0x", },
+                       "NORTH": {"action": "[hex]", "type": "text", "text": "hex", },
+                       "NORTH_WEST": {"action": "a", "type": "text", "text": "A", },
+                       "WEST": {"action": "b", "type": "text", "text": "B", },
+                       "SOUTH_WEST": {"action": "c", "type": "text", "text": "C", },
+                       "NORTH_EAST": {"action": "d", "type": "text", "text": "D", },
+                       "EAST": {"action": "e", "type": "text", "text": "E", },
+                       "SOUTH_EAST": {"action": "f", "type": "text", "text": "F", },
+                       "showAllSlices": True,
                },
                (2, 1): {
-                       "CENTER": {"action": "[dec]", "type": "text", "text": "dec", },
+                       "CENTER": {"action": "0o", "type": "text", "text": "0o", },
+                       "SOUTH": {"action": "[oct]", "type": "text", "text": "oct", },
                        "showAllSlices": True,
                },
                (2, 2): {
-                       "showAllSlices": False,
+                       "CENTER": {"action": "0b", "type": "text", "text": "0b", },
+                       "showAllSlices": True,
                },
        },
 }

diff --git a/src/plugins/trig.map b/src/plugins/trig.map
index 3b9c91a..a524a88 100644 (file)
--- a/src/plugins/trig.map
+++ b/src/plugins/trig.map
@@ -3,48 +3,48 @@
        "dimensions": (3, 3),
        "keys": {
                (0, 0): {
-                       "CENTER": {"action": "[sin]", "type": "text", "text": "sin", },
-                       "NORTH": {"action": "[asin]", "type": "text", "text": "asin", },
+                       "CENTER": {"action": "[sinh]", "type": "text", "text": "sinh", },
+                       "SOUTH": {"action": "[asinh]", "type": "text", "text": "asinh", },
                        "showAllSlices": False,
                },
                (0, 1): {
-                       "CENTER": {"action": "[cos]", "type": "text", "text": "cos", },
-                       "NORTH": {"action": "[acos]", "type": "text", "text": "acos", },
+                       "CENTER": {"action": "[cosh]", "type": "text", "text": "cosh", },
+                       "SOUTH": {"action": "[acosh]", "type": "text", "text": "acosh", },
                        "showAllSlices": False,
                },
                (0, 2): {
-                       "CENTER": {"action": "[tan]", "type": "text", "text": "tan", },
-                       "NORTH": {"action": "[atan]", "type": "text", "text": "atan", },
+                       "CENTER": {"action": "[tanh]", "type": "text", "text": "tanh", },
+                       "SOUTH": {"action": "[atanh]", "type": "text", "text": "atanh", },
                        "showAllSlices": False,
                },
                (1, 0): {
                        "CENTER": {"action": "[exp]", "type": "text", "text": "exp", },
-                       "SOUTH": {"action": "[log]", "type": "text", "text": "log", },
+                       "NORTH": {"action": "[log]", "type": "text", "text": "log", },
                        "showAllSlices": True,
                },
                (1, 1): {
                        "CENTER": {"action": "pi", "type": "text", "text": "pi", },
-                       "SOUTH": {"action": "e", "type": "text", "text": "e", },
+                       "NORTH": {"action": "e", "type": "text", "text": "e", },
                        "showAllSlices": True,
                },
                (1, 2): {
                        "CENTER": {"action": "[rad]", "type": "text", "text": "rad", },
-                       "SOUTH": {"action": "[deg]", "type": "text", "text": "deg", },
+                       "NORTH": {"action": "[deg]", "type": "text", "text": "deg", },
                        "showAllSlices": True,
                },
                (2, 0): {
-                       "CENTER": {"action": "[sinh]", "type": "text", "text": "sinh", },
-                       "NORTH": {"action": "[asinh]", "type": "text", "text": "asinh", },
+                       "CENTER": {"action": "[sin]", "type": "text", "text": "sin", },
+                       "SOUTH": {"action": "[asin]", "type": "text", "text": "asin", },
                        "showAllSlices": False,
                },
                (2, 1): {
-                       "CENTER": {"action": "[cosh]", "type": "text", "text": "cosh", },
-                       "NORTH": {"action": "[acosh]", "type": "text", "text": "acosh", },
+                       "CENTER": {"action": "[cos]", "type": "text", "text": "cos", },
+                       "SOUTH": {"action": "[acos]", "type": "text", "text": "acos", },
                        "showAllSlices": False,
                },
                (2, 2): {
-                       "CENTER": {"action": "[tanh]", "type": "text", "text": "tanh", },
-                       "NORTH": {"action": "[atanh]", "type": "text", "text": "atanh", },
+                       "CENTER": {"action": "[tan]", "type": "text", "text": "tan", },
+                       "SOUTH": {"action": "[atan]", "type": "text", "text": "atan", },
                        "showAllSlices": False,
                },
        },

diff --git a/support/builddeb.py b/support/builddeb.py
index 7aa50bf..63b16e0 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -13,6 +13,7 @@ __changelog__ = '''
 0.9.4
  * Added icons
  * Minor improvements
+ * Swapping the keyboard positions, seem more friendly to my thumb location this way
 
 0.9.3 - ""
  * Added +/-, !, sq, and sqrt functions