Mercurial Mercurial > hg > stx-goodies-smallsense / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorJan Vrany <jan.vrany@fit.cvut.cz>
Sun, 28 May 2017 21:14:55 +0100
changeset 1030 386add9173e9
parent 1029 dc9cbbf214d8 (current diff)
parent 1027 13a835555b48 (diff)
child 1053 75f684c8517a
child 1054 be59a463c886
Merge
--- a/SmallSense__EditService.st	Sun May 28 21:14:31 2017 +0100
+++ b/SmallSense__EditService.st	Sun May 28 21:14:55 2017 +0100
@@ -53,20 +53,15 @@
 !EditService class methodsFor:'initialization'!
 
 initialize
-    "
-     | map |
-     map := Screen current keyboardMap.
-     map bindValue:#CodeCompletion to: #'Ctrl '.
-     map bindValue:#CodeCompletion to: #'Ctrlspace'.
-    "
-
     Smalltalk addStartBlock:[
         Screen current notNil ifTrue:[
             | map |
+            
             map := Screen current keyboardMap.
-            (map keyAtValue:#CodeCompletion) isNil ifTrue:[
-                map bindValue:#CodeCompletion to: #'Ctrl '.
-                map bindValue:#CodeCompletion to: #'Ctrlspace'.
+            (map bindingForLogical:#CodeCompletion) isNil ifTrue:[
+                (map hasMappingFor: #'Ctrl ') ifFalse:[
+                    map bindValue:#CodeCompletion to: #'Ctrl '.
+                ].
             ].
        ]
     ]
--- a/extensions.st	Sun May 28 21:14:31 2017 +0100
+++ b/extensions.st	Sun May 28 21:14:55 2017 +0100
@@ -64,7 +64,7 @@
      shortcut key defined, process the shortcut and return true - otherwise false."
 
     UserPreferences current smallSenseEnabled ifTrue:[   
-        (aKeyPressEvent key == #OpenNavigator or:[aKeyPressEvent rawKey == #CtrlT and:[(aKeyPressEvent targetView keyboardMap hasBindingFor: #OpenNavigator) not]]) ifTrue:[ 
+        (aKeyPressEvent key == #OpenNavigator or:[aKeyPressEvent rawKey == #CtrlT and:[(aKeyPressEvent targetView keyboardMap hasMappingFor:#OpenNavigator) not]]) ifTrue:[ 
             SmallSense::Navigator open.                                                                      
             ^ true
         ].    
@@ -610,7 +610,7 @@
      shortcut key defined, process the shortcut and return true - otherwise false."
 
     UserPreferences current smallSenseEnabled ifTrue:[   
-        (aKeyPressEvent key == #OpenNavigator or:[aKeyPressEvent rawKey == #CtrlT and:[(aKeyPressEvent targetView keyboardMap hasBindingFor: #OpenNavigator) not]]) ifTrue:[ 
+        (aKeyPressEvent key == #OpenNavigator or:[aKeyPressEvent rawKey == #CtrlT and:[(aKeyPressEvent targetView keyboardMap hasMappingFor:#OpenNavigator) not]]) ifTrue:[ 
             SmallSense::Navigator open.
             ^ true
         ].    
@@ -686,7 +686,7 @@
 processShortcut: aKeyPressEvent
     UserPreferences current smallSenseEnabled ifTrue:[
         aKeyPressEvent isKeyPressEvent ifTrue:[
-            (aKeyPressEvent key == #OpenNavigator or:[aKeyPressEvent rawKey == #CtrlT and:[(aKeyPressEvent targetView keyboardMap hasBindingFor: #OpenNavigator) not]]) ifTrue:[ 
+            (aKeyPressEvent key == #OpenNavigator or:[aKeyPressEvent rawKey == #CtrlT and:[(aKeyPressEvent targetView keyboardMap hasMappingFor:#OpenNavigator) not]]) ifTrue:[ 
                 self searchMenuOpenNavigatorOnDeclarations.
                 ^ true
             ].
@@ -1339,7 +1339,7 @@
      shortcut key defined, process the shortcut and return true - otherwise false."
 
     UserPreferences current smallSenseNewDialogsEnabled ifTrue:[   
-       (aKeyPressEvent key == #OpenNavigator or:[aKeyPressEvent rawKey == #CtrlT and:[(aKeyPressEvent targetView keyboardMap hasBindingFor: #OpenNavigator) not]]) ifTrue:[ 
+       (aKeyPressEvent key == #OpenNavigator or:[aKeyPressEvent rawKey == #CtrlT and:[(aKeyPressEvent targetView keyboardMap hasMappingFor:#OpenNavigator) not]]) ifTrue:[ 
             SmallSense::Navigator open.
             ^ true
         ].
hg/stx-goodies-smallsense