Merge lp:~blackdaemon/enso/quasimodekey-doubletap-cmd into lp:~communityenso/enso/community-enso

[blackdaemon]

New feature that allows to have specific Enso command pre-inserted when double-tapping the quasimode-key.

[Drarok (webmaster-drarok)]

I've merged this into my local copy and tried it out, works great for the 'open' command, good idea! :)

review: Approve

[lp:~blackdaemon/enso/quasimodekey-doubletap-cmd]

144. By blackdaemon on 2010-06-25

Fixes full redraw of suggestions list after pre-typing the command.

145. By blackdaemon on 2010-06-25

Fixed the config value comment.
Set reasonable default to "open" command.

Unmerged revisions

145. By blackdaemon on 2010-06-25

Fixed the config value comment.
Set reasonable default to "open" command.

144. By blackdaemon on 2010-06-25

Fixes full redraw of suggestions list after pre-typing the command.

143. By blackdaemon on 2010-06-25

Added quasimode-key double-tap command

=== modified file 'enso/config.py' (properties changed: -x to +x)
--- enso/config.py	2008-04-27 11:12:38 +0000
+++ enso/config.py	2010-06-25 17:41:34 +0000
@@ -26,6 +26,11 @@
 # auto-completion mechanism engages.
 QUASIMODE_MIN_AUTOCOMPLETE_CHARS = 2
 
+# Quasimode-key double-tap delay (seconds)
+QUASIMODE_DOUBLETAP_DELAY = 0.5
+# Command to pre-type on quasimode-key double-tap
+QUASIMODE_DOUBLETAP_COMMAND = "open"
+
 # The message displayed when the user types some text that is not a command.
 BAD_COMMAND_MSG = "<p><command>%s</command> is not a command.</p>"\
                   "%s"

=== modified file 'enso/quasimode/__init__.py'
--- enso/quasimode/__init__.py	2008-04-27 11:12:38 +0000
+++ enso/quasimode/__init__.py	2010-06-25 17:41:34 +0000
@@ -48,6 +48,7 @@
 # Imports
 # ----------------------------------------------------------------------------
 
+import time
 import weakref
 import logging
 import traceback
@@ -155,6 +156,8 @@
 
         self.__eventMgr.setModality( self.__isModal )
 
+        self.__lastQuasimodeStarted = None
+
 
     def setQuasimodeKeyByName( self, function_name, key_name ):
         # Sets the quasimode to use the given key (key_name must be a
@@ -271,17 +274,29 @@
 
         assert self._inQuasimode == False
 
-        if self.__quasimodeWindow == None:
-            logging.info( "Created a new quasimode window!" )
+        if (config.QUASIMODE_DOUBLETAP_DELAY > 0
+            and config.QUASIMODE_DOUBLETAP_COMMAND is not None):
+            if self.__lastQuasimodeStarted is not None:
+                elapsed = time.time() - self.__lastQuasimodeStarted
+                if elapsed < config.QUASIMODE_DOUBLETAP_DELAY:
+                    self.__suggestionList.setUserText(
+                        "%s " % config.QUASIMODE_DOUBLETAP_COMMAND)
+                    self.__nextRedrawIsFull = True
+
+        self.__lastQuasimodeStarted = time.time()
+
+        if self.__quasimodeWindow is None:
+            logging.debug( "Created a new quasimode window!" )
             self.__quasimodeWindow = TheQuasimodeWindow()
 
         self.__eventMgr.triggerEvent( "startQuasimode" )
-        
-        self.__eventMgr.registerResponder( self.__onTick, "timer" )
+
 
         self._inQuasimode = True
         self.__needsRedraw = True
 
+        self.__eventMgr.registerResponder( self.__onTick, "timer" )
+
         # Postcondition
         assert self._inQuasimode == True