Merge lp:vigedit into lp:~tristil/vigedit/main-method

[Lauri Niskanen]

[Lauri Niskanen (ape3000)]

This branch has great commits and I can't see any problems in it. Please merge it to the trunk.

[lp:vigedit]

69. By Stephen Moore <iambob@iambob-laptop> on 2010-02-03

made it so that if there is already a count underway, 0 won't go to the start of the line and actually add to the count

70. By Stephen Moore <iambob@iambob-laptop> on 2010-02-03

fixed capture mode

71. By Stephen Moore <iambob@iambob-laptop> on 2010-02-03

fixed ex mode

72. By Stephen Moore <iambob@iambob-laptop> on 2010-02-04

made deleting the first line of the document remove the line as well

73. By Stephen Moore <iambob@iambob-laptop> on 2010-02-04

more fixes to deleting on first line

74. By Stephen <iambob@iambob-desktop> on 2010-02-05

rewrote install.py to take some arguements specifying where to install plugins and what plugins to install

=== modified file 'AUTHORS' (properties changed: -x to +x)
=== modified file 'ChangeLog' (properties changed: -x to +x)
=== modified file 'TODO' (properties changed: -x to +x)
=== modified file 'data/autotab.gedit-plugin' (properties changed: -x to +x)
=== modified file 'data/vigedit.gedit-plugin' (properties changed: -x to +x)
=== modified file 'docs/chart.png' (properties changed: -x to +x)
=== modified file 'docs/chart.svg' (properties changed: -x to +x)
=== modified file 'docs/documentation.odt' (properties changed: -x to +x)
=== modified file 'docs/documentation.pdf' (properties changed: -x to +x)
=== modified file 'gpl.txt' (properties changed: -x to +x)
=== modified file 'install.py' (properties changed: -x to +x)
--- install.py	2009-07-10 19:55:25 +0000
+++ install.py	2010-02-05 03:26:13 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 import os
+<<<<<<< TREE
 from distutils.file_util import *
 from distutils.dir_util import *
 
@@ -29,3 +30,163 @@
 # Considering integration with other plugins
 # install_plugin("classbrowser")
 
+=======
+import sys
+import shutil
+from distutils.dir_util import copy_tree
+class Complaint(Exception): pass
+
+class Installer(object):
+    def __init__(self, base=None, plugins=None):
+        
+        self.availablePlugins = ['ViGedit', 'autotab']
+        
+        try:
+            if not base:
+                self.base = os.sep.join([os.environ['HOME'], '.gnome2', 'gedit'])
+            else:
+                self.flag_base(base)
+            
+            if not plugins:
+                self.plugins = [p for p in self.availablePlugins]
+            else:
+                self.flag_plugins(plugins)
+                
+        except Complaint, c:
+            self.error(c)
+        
+        self.flags = (
+            (['--help', '-h'], "Show help", self.flag_help, False),
+            (['--base', '-b'], "Specify folder that holds plugins folder (default : %s)" % base, self.flag_base, True),
+            (
+                ['--plugins', '-p'], 
+                "Comma seperated list of desired plugins to install (available : %s)" % ','.join(self.availablePlugins),    
+                self.flag_plugins, 
+                True
+            ),
+        )
+        
+        self.register = {}
+        for flags, _, func, needsArg in self.flags:
+            for flag in flags:
+                self.register[flag] = (func, needsArg)
+    
+    def error(self, error):
+        print "\nERROR : %s\n" % error
+        exit()
+        
+    def copy(self, plugin, src, dest):
+        if os.path.exists(src):
+            if os.path.isdir(src):
+                print "Copying directory %s to %s" % (src, dest)
+                pluginFolder = os.sep.join([dest, plugin])
+                if not os.path.exists(pluginFolder):
+                    os.mkdir(pluginFolder)
+                    
+                copy_tree(src, pluginFolder)
+            else:
+                print "Copying file %s to %s" % (src, dest)
+                shutil.copy(src, dest)
+                
+        else:
+            raise Complaint("%s doesn't exist" % src)
+            
+    ########################
+    ###   FLAGS
+    ########################
+    
+    def flag_help(self, arg=None):
+        print "Usage : python install.py [options]"
+        print "-----------------------------------"
+        lines = []
+        for flags, message, _, _ in self.flags:
+            lines.append((', '.join(flags), message))
+        
+        l1 = max(len(flags) for flags, _ in lines)
+        s = "%%-%ds : %%s" % l1
+        for flags, message in lines:
+            print s % (flags, message)
+        
+        exit()
+    
+    def flag_base(self, arg):
+        self.base = arg
+    
+    def flag_plugins(self, arg):
+        plugins = [p.lstrip().rstrip().lower() for p in arg.split(',')]
+        
+        if not plugins:
+            raise Complaint("You need to install atleast one plugin")
+        
+        available = dict([(p.lower(), p) for p in self.availablePlugins])
+        matched = []
+        
+        #ensuring correct case
+        for plugin in plugins:
+            if plugin in available.keys():
+                matched.append(available[plugin])
+            else:
+                raise Complaint("%s is not an available plugin" % plugin)
+        
+        self.plugins = matched
+                
+    ########################
+    ###   INSTALLER
+    ########################
+    
+    def install(self):
+        pluginDir = os.sep.join([self.base, 'plugins'])
+        if not os.path.exists(pluginDir):
+            os.makedirs(pluginDir)
+            
+        for plugin in self.plugins:
+            # copy gedit-plugin file
+            geditPluginFile = os.sep.join(['data', '%s.gedit-plugin' % plugin.lower()])
+            self.copy(plugin, geditPluginFile, pluginDir)
+            
+            initFile = os.sep.join(['src', plugin, '__init__.py'])
+            singleFile = os.sep.join(['src', plugin, '%s.py' % plugin])
+            
+            if not os.path.exists(initFile):
+                # installing a single file
+                self.copy(plugin, singleFile, pluginDir)
+            
+            else:
+                #installing directory
+                self.copy(plugin, os.sep.join(['src', plugin]), pluginDir)
+                
+    ########################
+    ###   MAIN
+    ########################
+        
+    def main(self):
+        args = sys.argv[1:]
+        index = 0
+        try:
+            while index < len(args):
+                flag = args[index]
+                if flag.startswith('-'):
+                    if flag in self.register:
+                        func, needsArg = self.register[flag]
+                        if needsArg:
+                            index += 1
+                            if index >= len(args):
+                                raise Complaint("%s flag needs a following arguement" % flag)
+                            func(args[index])
+                        else:
+                            func()
+                    else:
+                        raise Complaint("%s is an unkown flag" % flag)
+                else:
+                    raise Complaint("All arguements must be preceded by a flag. Try --help or -h")
+                
+                index += 1
+                
+            self.install()
+            
+        except Complaint, c:
+            self.error(c)
+        
+if __name__ == '__main__':
+    Installer().main()
+>>>>>>> MERGE-SOURCE

=== modified file 'src/ViGedit/__init__.py' (properties changed: -x to +x)
=== modified file 'src/ViGedit/actions/__init__.py' (properties changed: -x to +x)
=== modified file 'src/ViGedit/actions/blocks.py' (properties changed: -x to +x)
=== modified file 'src/ViGedit/actions/ex.py' (properties changed: -x to +x)
--- src/ViGedit/actions/ex.py	2009-07-01 03:43:42 +0000
+++ src/ViGedit/actions/ex.py	2010-02-05 03:26:13 +0000
@@ -123,6 +123,16 @@
     terminal = act.others.getTerminal(act)
     terminal._vte.feed_child(terminalCommand + "\n")
 
+@regexDec("printall")
+def ex_PrintAll(act, command, result):
+    location = "%s/Desktop" % os.environ['HOME']
+    act.others.printall(act, location)
+    
+@regexDec("printall (.+)")
+def ex_PrintAllLoc(act, command, result):
+    location = result.group(1)
+    act.others.printall(act, location)
+
 @regexDec(r's/(?P<search>(?:\\.|(?!/)[^\\])+)(/(?P<replace>(?:\\.|(?!/)[^\\])+)(/(?P<options>.+))?)?')
 def ex_Search(act, command, result):
     search = result.groupdict()['search']

=== modified file 'src/ViGedit/actions/fileOperations.py' (properties changed: -x to +x)
=== modified file 'src/ViGedit/actions/insert.py' (properties changed: -x to +x)
=== modified file 'src/ViGedit/actions/lines.py' (properties changed: -x to +x)
--- src/ViGedit/actions/lines.py	2009-06-30 02:54:14 +0000
+++ src/ViGedit/actions/lines.py	2010-02-05 03:26:13 +0000
@@ -16,6 +16,10 @@
         select_OneLine(act)
         
 def select_OneLine(act):
+    
+    if act.mode == act.modes.visual:
+        act.bindings.mode = act.modes.command
+        
     act.pos.move_LineBegin(act)   
     
     cursor = act.pos.getIter(act)
@@ -27,6 +31,10 @@
     act.pos.moveInsert(act, cursor, True)
         
 def select_ManyLines(act, number):
+
+    if act.mode == act.modes.visual:
+        act.bindings.mode = act.modes.command
+        
     if type(number) in (list, tuple):
         try:
             number = int("".join(number))
@@ -35,8 +43,12 @@
     
     act.pos.move_LineBegin(act)
     cursor = act.pos.getIter(act)
+    l1 = cursor.get_line()
     cursor.forward_lines(number)
-    
+    l2 = cursor.get_line()
+    if abs(l1 - l2) == number:
+        cursor.backward_char()
+        
     act.pos.moveInsert(act, cursor, True)
         
 def getLinesTillEnd(act):

=== modified file 'src/ViGedit/actions/others.py' (properties changed: -x to +x)
--- src/ViGedit/actions/others.py	2009-06-30 02:54:14 +0000
+++ src/ViGedit/actions/others.py	2010-02-05 03:26:13 +0000
@@ -1,8 +1,6 @@
+from gtk import PrintOperation, PageSetup
+import gtksourceview2
 import gobject
-
-def nextSearchItem(act):
-    if act.vibase.doc.get_can_search_again():
-        act.menus["searchNext"].activate()
        
 def search(act):
     act.vibase.view.emit("start_interactive_search")
@@ -22,4 +20,38 @@
     if len(notebook.get_children()) != 0: 
         terminal = notebook.get_children()[1]
         return terminal
-    return None   
+    return None  
+
+def redoLastOperation(act):
+    act.vibase.lastOperation(act)
+
+def draw_page(operation, context, page_nr, compositor):
+    compositor.draw_page(context, page_nr)
+    
+def begin_print(operation, context, compositor):
+    n_pages = 1
+    while not compositor.paginate(context):
+        pass
+    
+    n_pages = compositor.get_n_pages()
+    operation.set_n_pages(n_pages)
+    
+def printall(act, location):
+    views = [view for view in act.vigtk.window.get_views()]
+
+    count = 1
+    for view in views:
+            
+        po = PrintOperation()
+        setup = PageSetup()
+        po.set_default_page_setup(setup)
+        
+        po.set_export_filename("%s/%d.pdf" % (location, count))
+        count += 1
+        
+        pc = gtksourceview2.print_compositor_new_from_view(view)
+        
+        po.connect("begin_print", begin_print, pc)
+        po.connect("draw_page", draw_page, pc)
+    
+        res = po.run(act.gtk.PRINT_OPERATION_ACTION_EXPORT)

=== modified file 'src/ViGedit/actions/text.py' (properties changed: -x to +x)
--- src/ViGedit/actions/text.py	2009-07-08 05:08:29 +0000
+++ src/ViGedit/actions/text.py	2010-02-05 03:26:13 +0000
@@ -4,23 +4,31 @@
 ###
 ########################
 
-def delete_PrevChar(act):
-	oldMode = act.bindings.mode
-	act.bindings.mode = act.modes.visual
-	act.pos.move_Backward(act, True)
-	cut_Selection(act)
-	act.bindings.mode = oldMode
-    #act.vibase.doc.backspace(act.pos.getIter(act), False, True)  
+def delete_PrevChar(act, withBackSpace=False):
+	if withBackSpace:
+		act.vibase.doc.backspace(act.pos.getIter(act), False, True) 
+	else:
+		oldMode = act.bindings.mode
+		act.bindings.mode = act.modes.visual
+		act.pos.move_Backward(act, True)
+		cut_Selection(act)
+		act.bindings.mode = oldMode
     
-def delete_Char(act):
+def delete_Char(act,  withBackSpace=False):
     act.pos.move_Forward(act)
-    delete_PrevChar(act)
+    delete_PrevChar(act, withBackSpace)
 
 def delete_WholeLines(act):
     number = act.vibase.numLines
     act.lines.select_Lines(act, number)
     cut_Selection(act)
-    act.text.delete_Char(act)
+    cursor = act.pos.getIter(act)
+    line = cursor.get_line()
+    if line > 0:
+        delete_PrevChar(act, withBackSpace=True)
+        act.pos.move_Forward(act)
+    else:
+        delete_Char(act, withBackSpace=True)
         
 def delete_ToLineEnd(act):
     act.lines.select_ToLineEnd(act)

=== modified file 'src/ViGedit/actions/trace.py' (properties changed: -x to +x)
--- src/ViGedit/actions/trace.py	2009-06-30 02:54:14 +0000
+++ src/ViGedit/actions/trace.py	2010-02-05 03:26:13 +0000
@@ -35,8 +35,8 @@
 
 def intro(mode=None, message=None, *args):
     if message:
-        info(1, message, *args, color=MAGNETA)
+        info(1, message, *args, **{'color' : MAGNETA})
     else:
-        info(1, "Introducing %s mode", mode.mode, color=MAGNETA)
+        info(1, "Introducing %s mode", mode.mode, **{'color' : MAGNETA})
         
     

=== modified file 'src/ViGedit/bindings/__init__.py' (properties changed: -x to +x)
--- src/ViGedit/bindings/__init__.py	2009-06-30 02:54:14 +0000
+++ src/ViGedit/bindings/__init__.py	2010-02-05 03:26:13 +0000
@@ -31,7 +31,7 @@
     
     def register(self, mode, function, keycode, control=False, meta=False,
                     final=False, repeat=False, after=None, pos=False, 
-                    ignoreStack=False, stack = ""):
+                    ignoreStack=False, stack = "", recordAction = True):
         
         keycombo = keycode, control, meta, stack
         try:
@@ -53,6 +53,7 @@
                 'PreservePos'   : pos,
                 'IgnoreStack'   : ignoreStack,
                 'StackMatch'    : stack,
+                'RecordAction'  : recordAction,
             }
         
 

=== modified file 'src/ViGedit/bindings/base.py' (properties changed: -x to +x)
--- src/ViGedit/bindings/base.py	2009-06-30 02:54:14 +0000
+++ src/ViGedit/bindings/base.py	2010-02-05 03:26:13 +0000
@@ -38,6 +38,10 @@
         """Called when no binding has been found and so the mode is left to handle the event"""
         return True
     
+    def ignore(self, vibase, event):
+        """Returns True if this event should be ignored"""
+        return False
+    
     def nop(self, act):
         pass
 

=== modified file 'src/ViGedit/bindings/block.py' (properties changed: -x to +x)
=== modified file 'src/ViGedit/bindings/capture.py' (properties changed: -x to +x)
--- src/ViGedit/bindings/capture.py	2009-06-30 02:54:14 +0000
+++ src/ViGedit/bindings/capture.py	2010-02-05 03:26:13 +0000
@@ -5,7 +5,8 @@
     def __init__(self, act, options=None):
         self.captureNum = 0
         self.capturedEvents = []
-        self.startMode = act.modes.command
+        self.start = None
+        self.capture = None
             
 class Mode(VIG_ModeBase):
 
@@ -16,7 +17,8 @@
     """
     
     def setup(self, act):
-        self.reg(self.captureNextEvents,      act.gtk.keysyms.a, final=True, after=act.modes.command)
+        self.reg(self.captureNextEvents,      act.gtk.keysyms.a, final=True)
+        self.reg(self.setCaptureMode,         act.gtk.keysyms.d, final=True, after=act.modes.command)
         self.reg(self.setStartMode,           act.gtk.keysyms.s, final=True, after=act.modes.command)
         self.reg(self.clearCapturedEvents,    act.gtk.keysyms.c, final=True, after=act.modes.command)
         self.reg(self.emitCapturedEvents,     act.gtk.keysyms.e, final=True)
@@ -50,12 +52,15 @@
         act.vibase.setExtraStatus(num, self.extraStatus)
         options.captureNum = num
         
+        act.bindings.mode = act.modes.command
+        if options.capture:
+            options.captureNum += 1
+            act.keyboard.emitEvent(act, options.capture)
+        
         def capture(act, event):
             options = act.vibase.captureOptions
+                
             if options.captureNum > 0:
-                if not options.startMode and len(options.capturedEvents) == 0:
-                    options.startMode = act.bindings.mode
-                
                 capturedEvent = act.keyboard.makeEvent(act, event.keyval, event.state)
                 options.capturedEvents.append(capturedEvent)
                 options.captureNum -= 1
@@ -66,14 +71,28 @@
     ###   GET START MODE
     ########################
     
+    def setFutureMode(self, act, when, message):
+        act.bindings.mode = act.modes.command
+        act.vibase.setExtraStatus(1, lambda act : " (%s)" % message)
+        
+        def getEvent(act, event, when):
+            if type(when) is str:
+                when = (when, )
+            
+            for w in when:
+                setattr(act.vibase.captureOptions, w, act.keyboard.makeEvent(act, event.keyval, event.state))
+            
+        act.vibase.setRule(1, lambda a, e : getEvent(a, e, when))
+    
     def setStartMode(self, act):
-        act.bindings.mode = act.modes.command
-        act.vibase.setExtraStatus(1, lambda : "(next key determines start mode when emmitting captured keys)")
-        
-        def getStartEvent(act, event):
-            act.vibase.captureOptions['start'] = act.keyboard.makeEvent(act, event.keyval, event.state)
+        when = "start"
+        if not act.vibase.captureOptions.capture:
+            when = [when, 'capture']
             
-        act.vibase.setRule(1, getStartEvent)    
+        self.setFutureMode(act, when, "next key determines start mode when emitting captured keys")
+    
+    def setCaptureMode(self, act):
+        self.setFutureMode(act, 'capture', "Next key determines mode for capturing keys")
     
     ########################
     ###   EMIT
@@ -81,7 +100,10 @@
     
     def emitCapturedEvents(self, act):
         options = act.vibase.captureOptions
-        act.bindings.mode = options.startMode
+        act.bindings.mode = act.modes.command
+        if options.start:
+            act.keyboard.emitEvent(act, options.start)
+            
         message = "captured keys : ["
         for event in options.capturedEvents:
             act.keyboard.emitEvent(act, event)
@@ -96,5 +118,7 @@
     def clearCapturedEvents(self, act):
         options = act.vibase.captureOptions
         options.capturedEvents = []
-        optionscaptureNum = 0
+        options.captureNum = 0
+        options.start = None
+        options.capture = None
         

=== modified file 'src/ViGedit/bindings/change.py' (properties changed: -x to +x)
=== modified file 'src/ViGedit/bindings/command.py' (properties changed: -x to +x)
--- src/ViGedit/bindings/command.py	2009-07-08 05:08:29 +0000
+++ src/ViGedit/bindings/command.py	2010-02-05 03:26:13 +0000
@@ -22,25 +22,27 @@
         self.reg(act.text.paste_ClipboardAbove, act.gtk.keysyms.P, after=act.modes.command,   pos=True, **self.fr)
         self.reg(act.text.paste_ClipboardBelow, act.gtk.keysyms.p, after=act.modes.command,   pos=True, **self.fr)
 
-        self.reg(act.others.redo,               act.gtk.keysyms.r, True,                **self.fr)
-        self.reg(act.others.undo,               act.gtk.keysyms.u,                      **self.fr)
-        self.reg(act.text.delete_Char,          act.gtk.keysyms.x,                      **self.fr)
-        self.reg(act.others.nextSearchItem,     act.gtk.keysyms.n,                      **self.fr)
-        self.reg(act.text.delete_PrevChar,      act.gtk.keysyms.X,                      **self.fr)
-        self.reg(act.text.delete_Char,          act.gtk.keysyms.Delete,                 **self.fr)
-        self.reg(act.text.switchChar,			act.gtk.keysyms.S,						**self.fr)
+        self.reg(act.others.redoLastOperation,  act.gtk.keysyms.period, recordAction=False, **self.fr)
+        self.reg(act.others.redo,               act.gtk.keysyms.r, True,recordAction=False, **self.fr)
+        self.reg(act.others.undo,               act.gtk.keysyms.u, recordAction=False,      **self.fr)
+        self.reg(act.text.delete_Char,          act.gtk.keysyms.x,                          **self.fr)
+        self.reg(act.getMenu('searchNext'),     act.gtk.keysyms.n,                          **self.fr)
+        self.reg(act.getMenu('searchPrev'),     act.gtk.keysyms.N,                          **self.fr)
+        self.reg(act.text.delete_PrevChar,      act.gtk.keysyms.X,                          **self.fr)
+        self.reg(act.text.delete_Char,          act.gtk.keysyms.Delete,                     **self.fr)
+        self.reg(act.text.switchChar,           act.gtk.keysyms.S,                          **self.fr)
 
-        self.reg(act.pos.move_Forward,          act.gtk.keysyms.l,             **self.fr)
-        self.reg(act.pos.move_Backward,         act.gtk.keysyms.h,             **self.fr)
-        self.reg(act.pos.move_Down,             act.gtk.keysyms.j,             **self.fr)
-        self.reg(act.pos.move_Up,               act.gtk.keysyms.k,             **self.fr)
-        self.reg(act.pos.move_WordForward,      act.gtk.keysyms.w,             **self.fr)
-        self.reg(act.pos.move_WordBackward,     act.gtk.keysyms.b,             **self.fr)
-        self.reg(act.pos.move_BufferEnd,        act.gtk.keysyms.G,             **self.fr)        
-        self.reg(act.pos.move_LineBegin,        act.gtk.keysyms._0,            **self.fr)
-        self.reg(act.pos.move_LineEnd,          act.gtk.keysyms.dollar,        **self.fr)
-        self.reg(act.pos.move_LineBegin,        act.gtk.keysyms.asciicircum,   **self.fr)
-        self.reg(act.pos.toEmptyLine,           act.gtk.keysyms.E,             **self.fr)
+        self.reg(act.pos.move_Forward,          act.gtk.keysyms.l,                          **self.fr)
+        self.reg(act.pos.move_Backward,         act.gtk.keysyms.h,                          **self.fr)
+        self.reg(act.pos.move_Down,             act.gtk.keysyms.j,                          **self.fr)
+        self.reg(act.pos.move_Up,               act.gtk.keysyms.k,                          **self.fr)
+        self.reg(act.pos.move_WordForward,      act.gtk.keysyms.w,                          **self.fr)
+        self.reg(act.pos.move_WordBackward,     act.gtk.keysyms.b,                          **self.fr)
+        self.reg(act.pos.move_BufferEnd,        act.gtk.keysyms.G,                          **self.fr)
+        self.reg(act.pos.move_LineBegin,        act.gtk.keysyms._0,                         **self.fr)
+        self.reg(act.pos.move_LineEnd,          act.gtk.keysyms.dollar,                     **self.fr)
+        self.reg(act.pos.move_LineBegin,        act.gtk.keysyms.asciicircum,                **self.fr)
+        self.reg(act.pos.toEmptyLine,           act.gtk.keysyms.E,                          **self.fr)
 
         self.reg(act.pos.move_LineEnd,          act.gtk.keysyms.A, after=act.modes.insert,  **self.fr)
         self.reg(act.pos.move_LineBegin,        act.gtk.keysyms.I, after=act.modes.insert,  **self.fr)
@@ -63,5 +65,12 @@
         (so you can still use ordinary shortcuts in command mode"""
         return not act.keyboard.isModifierPressed(act, event)
     
+    def ignore(self, vibase, event):
+        if event.keyval == ord('0'):
+            if int(''.join(vibase.number)) > 0:
+                return True
+        
+        return False 
+    
     
     

=== modified file 'src/ViGedit/bindings/delete.py' (properties changed: -x to +x)
=== modified file 'src/ViGedit/bindings/ex.py' (properties changed: -x to +x)
=== modified file 'src/ViGedit/bindings/g.py' (properties changed: -x to +x)
=== modified file 'src/ViGedit/bindings/indent.py' (properties changed: -x to +x)
=== modified file 'src/ViGedit/bindings/insert.py' (properties changed: -x to +x)
=== modified file 'src/ViGedit/bindings/replace.py' (properties changed: -x to +x)
=== modified file 'src/ViGedit/bindings/selection.py' (properties changed: -x to +x)
=== modified file 'src/ViGedit/bindings/t.py' (properties changed: -x to +x)
=== modified file 'src/ViGedit/bindings/visual.py' (properties changed: -x to +x)
--- src/ViGedit/bindings/visual.py	2009-06-30 02:54:14 +0000
+++ src/ViGedit/bindings/visual.py	2010-02-05 03:26:13 +0000
@@ -27,7 +27,9 @@
         
         self.reg(act.others.undo,                 act.gtk.keysyms.u,           **self.fr)
         self.reg(act.others.search,               act.gtk.keysyms.slash,       final=True)
-               
+
+        self.reg(act.lines.select_OneLine,        act.gtk.keysyms.V,           after=act.modes.visual, final=True)
+        
         self.reg(act.pos.move_LineEnd,            act.gtk.keysyms.A,           after=act.modes.insert, **self.fr)
         self.reg(act.pos.move_LineBegin,          act.gtk.keysyms.I,           after=act.modes.insert, **self.fr)
         self.reg(act.insert.open_LineBelow,       act.gtk.keysyms.o,           after=act.modes.visual, **self.fr)

=== modified file 'src/ViGedit/bindings/yank.py' (properties changed: -x to +x)
=== modified file 'src/ViGedit/cursor.py' (properties changed: -x to +x)
=== modified file 'src/ViGedit/keyboard.py' (properties changed: -x to +x)
=== modified file 'src/ViGedit/options.py' (properties changed: -x to +x)
=== modified file 'src/ViGedit/static.py' (properties changed: -x to +x)
--- src/ViGedit/static.py	2009-06-30 02:54:14 +0000
+++ src/ViGedit/static.py	2010-02-05 03:26:13 +0000
@@ -27,7 +27,7 @@
 ###   MODES
 ###
 ########################
-              
+
 class VIG_Modes(object):
     """Holds info on all the modes"""
     

=== modified file 'src/ViGedit/vi.py' (properties changed: -x to +x)
--- src/ViGedit/vi.py	2009-06-30 02:54:14 +0000
+++ src/ViGedit/vi.py	2010-02-05 03:26:13 +0000
@@ -54,6 +54,7 @@
         self.returnToMode = None
         self.extraMessage  = None  
         self.select = False
+        self.lastOperation = None
         
         self.viewEvents = [
             self.view.connect("key-press-event", self.onKeyPress),
@@ -137,7 +138,7 @@
             if callable(rule):
                 rule(self.act, event)
             if life == 0:
-                self.rules.remove(1, rule)
+                self.rules.remove((1, rule))
         
         # Always return to command mode when Escape is pressed.
         if (event.keyval == gtk.keysyms.Escape):
@@ -215,11 +216,12 @@
         control, meta = self.keyboard.modifiers(self.act, event)
         self.act.trace.info(1, "\t%s %s %s %s", currentMode, event.keyval, control, meta)
         
-        #determine if there is a binding, and put it into bindingInfo
-        
+        bindingInfo = None
         doPropogate = currentMode != static.modes.insert
         keycombo = [currentMode, event.keyval, control, meta, "".join(self.stack)]
-        bindingInfo = self.vigtk.registry[(_ for _ in keycombo)]
+        #determine if there is a binding, and put it into bindingInfo
+        if not self.bindings.vigm[currentMode].ignore(self, event):
+            bindingInfo = self.vigtk.registry[(_ for _ in keycombo)]
         
         #if no binding, remove stack from keycombo and try again
         if not bindingInfo:
@@ -253,36 +255,52 @@
             isRepeatable    = bindingInfo["Repeatable"]
             afterMode       = bindingInfo["AfterMode"]
             preservePos     = bindingInfo["PreservePos"]
+            recordAction    = bindingInfo["RecordAction"]
             pos = None
             
             if callable(function):
-                args = [self.act]
-                
-                if preservePos:
-                    pos = self.cursor.getIter(self.act)
-                    
-                self.act.trace.info(2, "\tfunction is callable")
-                if isRepeatable:
-                    self.act.trace.info(2, "\tfunction is repeatable")
-                    [function(*args) for _ in range(int("".join(self.number or ["1"])) or 1)]
-                    
-                    self.act.trace.info(2, "\tresetting numbers")
-                    self.number = ['0']
-                    self.numLines = 0
-                    self.stack = []
-                    
-                else:   
-                    function(*args)
-                    self.numLines = int("".join(self.number or ["1"]))
-                    self.number = []
-                    
-                    if isFinal:
-                        self.act.trace.info(2, "\tfunction is final")
+                def operation(act, preservePos, isRepeatable, isFinal, number, numLines, stack):
+                    args = [act]
+                    self.stack = stack
+                    self.numLines = numLines
+                    
+                    if preservePos:
+                        pos = self.cursor.getIter(self.act)
+                        
+                    act.trace.info(2, "\tfunction is callable")
+                    if isRepeatable:
+                        act.trace.info(2, "\tfunction is repeatable")
+                        [function(*args) for _ in range(int("".join(number or ["1"])) or 1)]
+                        
+                        act.trace.info(2, "\tresetting numbers")
+                        self.number = ['0']
                         self.numLines = 0
                         self.stack = []
-                
-                if preservePos:
-                    self.cursor.moveInsert(self.act, pos) 
+                        
+                    else:   
+                        function(*args)
+                        self.numLines = int("".join(self.number or ["1"]))
+                        self.number = []
+                        
+                        if isFinal:
+                            self.act.trace.info(2, "\tfunction is final")
+                            self.numLines = 0
+                            self.stack = []
+                    
+                    if preservePos:
+                        self.cursor.moveInsert(self.act, pos)
+                
+                number = list(self.number)
+                numLines = self.numLines
+                
+                op = lambda act : operation(act, preservePos, isRepeatable, isFinal, number, numLines, self.stack)
+                
+                if recordAction:
+                    #store lastOperation so keybindings can call it again if need be (i.e. . option in command mode)
+                    self.lastOperation = op
+                
+                #call that operation
+                op(self.act)
                     
             else:
                 self.act.trace.info(2, "\tfunction is not callable")

=== modified file 'src/ViGedit/vigtk.py' (properties changed: -x to +x)
--- src/ViGedit/vigtk.py	2009-06-30 02:54:14 +0000
+++ src/ViGedit/vigtk.py	2010-02-05 03:26:13 +0000
@@ -61,6 +61,7 @@
         self.menu_save         = self.ui_manager.get_action("/MenuBar/FileMenu/FileSaveMenu")
         self.menu_saveAs       = self.ui_manager.get_action("/MenuBar/FileMenu/FileSaveAsMenu")
         self.menu_searchNext   = self.ui_manager.get_action("/MenuBar/SearchMenu/SearchFindNextMenu")
+        self.menu_searchPrev   = self.ui_manager.get_action("/MenuBar/SearchMenu/SearchFindPreviousMenu")
         self.menu_quit         = self.ui_manager.get_action("/MenuBar/FileMenu/FileQuitMenu")
         self.menu_fileClose    = self.ui_manager.get_action("/MenuBar/FileMenu/FileCloseMenu")
         self.menu_indentRight  = self.ui_manager.get_action("/MenuBar/EditMenu/EditOps_5/Indent")

=== modified file 'src/autotab/ChangeLog (Case Conflict 1)' (properties changed: -x to +x)
=== modified file 'src/autotab/README' (properties changed: -x to +x)
=== modified file 'src/autotab/autotab.py' (properties changed: -x to +x)