← Back to branch summary

~gcrosswhite/leo-editor/ran-setup-through-2to3

« back to all changes in this revision

Viewing changes to leo/core/leoEditCommands.py

  • Committer: Edward K. Ream
  • Date: 2011-06-06 20:16:21 UTC
  • Revision ID: edreamleo@gmail.com-20110606201621-prug8gz4wt1mrzom
Eliminate stroke arg to k.masterKeyHander: a good simplification for macros.

Show diffs side-by-side

added added

removed removed

Lines of Context:
leo/core/leoEditCommands.py
6904
6904
            # New in Leo 4.6: macro entries are leoKeyEvents.
6905
6905
            if event:
6906
6906
                g.trace(event.stroke)
6907
 
                k.masterKeyHandler(event,stroke=event.stroke)
 
6907
                k.masterKeyHandler(event) ## ,stroke=event.stroke)
6908
6908
    #@+node:ekr.20050920084036.196: *3* loadFile & helper
6909
6909
    def loadFile (self,event):
6910
6910
 
6940
6940
            aList = d.get(name)
6941
6941
            macro = []
6942
6942
            for stroke in aList:
6943
 
                # Create a dummy event with just enough attribute
6944
 
                # to keep k.masterKeyHandler happy
6945
6943
                event = g.app.gui.create_key_event(c,None,stroke,w)
6946
6944
                macro.append(event)
6947
6945
            self.addToDoAltX(name,macro)
6948
6946
                # sets self.namedMacros[name]=macro
6949
 
 
6950
 
 
6951
6947
    #@+node:ekr.20050920084036.198: *3* nameLastKbdMacro
6952
6948
    def nameLastKbdMacro (self,event):
6953
6949
 
7023
7019
 
7024
7020
        if not self.recordingMacro:
7025
7021
            self.recordingMacro = True
7026
 
                # A flag for k.masterCommandHandler & k.masterKeyHandler.
7027
7022
            k.setLabelBlue('Recording macro. ctrl-g to end...',protect=True)
7028
7023
        else:
7029
7024
            g.trace(event)
8500
8495
        elif stroke.startswith('Ctrl+') or stroke.startswith('Alt+'):
8501
8496
            # End the search and execute the command.
8502
8497
            self.endSearch()
8503
 
            k.masterKeyHandler(event,stroke=stroke)
 
8498
            k.masterKeyHandler(event) ## ,stroke=stroke)
8504
8499
        else:
8505
8500
            if trace: g.trace('event',event)
8506
8501
            k.updateLabel(event)