Fixing the map, adding some shortcut keys

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

diff --git a/src/constants.py b/src/constants.py
index 4db4472..5739551 100644 (file)
--- a/src/constants.py
+++ b/src/constants.py
@@ -3,7 +3,7 @@ import os
 __pretty_app_name__ = "e**(j pi) + 1 = 0"
 __app_name__ = "ejpi"
 __version__ = "0.9.7"
-__build__ = 0
+__build__ = 1
 _data_path_ = os.path.join(os.path.expanduser("~"), ".ejpi")
 __app_magic__ = 0xdeadbeef
 _user_logpath_ = "%s/ejpi.log" % _data_path_

diff --git a/src/ejpi_glade.py b/src/ejpi_glade.py
index 805bf4f..876374c 100755 (executable)
--- a/src/ejpi_glade.py
+++ b/src/ejpi_glade.py
@@ -373,6 +373,12 @@ class Calculator(object):
                                logLines = f.xreadlines()
                                log = "".join(logLines)
                                self._clipboard.set_text(str(log))
+               elif event.keyval == gtk.keysyms.BackSpace and event.get_state() & gtk.gdk.CONTROL_MASK:
+                       self.__historyStore.unpush()
+               elif event.keyval == gtk.keysyms.BackSpace:
+                       self.__userEntry.pop()
+               elif event.keyval in RETURN_TYPES:
+                       self.__history.push_entry()
 
        @gtk_toolbox.log_exception(_moduleLogger)
        def _on_push(self, *args):

diff --git a/src/plugins/computer.map b/src/plugins/computer.map
index 6f99e98..a1193d3 100644 (file)
--- a/src/plugins/computer.map
+++ b/src/plugins/computer.map
@@ -29,7 +29,7 @@
                },
                (2, 0): {
                        "CENTER": {"action": "0x", "type": "text", "text": "0x", },
-                       "NORTH": {"action": "[hex]", "type": "text", "text": "hex", },
+                       "SOUTH": {"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", },

diff --git a/support/builddeb.py b/support/builddeb.py
index 08ffd82..30ce108 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -26,7 +26,9 @@ __build__ = constants.__build__
 __changelog__ = """
 0.9.7
 * Added shortcut to copy result
+* Shortcuts: Backspace - as expected, Ctrl+Backspace - unpops, Enter - pops
 * BugFix: Attempt two at bigger X button
+* Bugfix: Inconsistent location of pie items on the computer section
 * Added support for creating .deb generic linux package files
 
 0.9.6