[Gzz-commits] gzz ./Gzz.py lava/gzz/potion/potions/ViewContai...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      03/01/06 08:04:15

Modified files:
        .              : Gzz.py 
        lava/gzz/potion/potions: ViewContainedText.java 
Added files:
        lava/gzz/potion/potions: AndFilterFn.java OrFilterFn.java 
Removed files:
        lava/gzz/modules/email: AndFilterFn.java OrFilterFn.java 

Log message:
        More bindings; move two classes where they belong

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Gzz.py.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/potion/potions/AndFilterFn.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/potion/potions/OrFilterFn.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/potion/potions/ViewContainedText.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/Gzz.py
diff -u gzz/Gzz.py:1.64 gzz/Gzz.py:1.65
--- gzz/Gzz.py:1.64     Mon Jan  6 06:57:29 2003
+++ gzz/Gzz.py  Mon Jan  6 08:04:14 2003
@@ -129,7 +129,15 @@
                                           PrefixOrRight, PrefixOrLeft, 
EventKey, \
                                           InsertChar, TextCursorLeft, \
                                           TextCursorRight, SwitchToTextMode, \
-                                          SwitchToNormalMode
+                                          SwitchToNormalMode, MarkHalfRank, \
+                                           ExtEdit, ViewContainedText, 
AndFilterFn, \
+                                           OrFilterFn
+
+            from gzz.modules.email import AllEmailsThat, SubjectFilterFn, 
FromFilterFn, \
+                                          ToFilterFn, OlderFilterFn, 
NewerFilterFn
+
+            def fn(fn):
+                return call(fn, gzz.potion.FunctionCall)
 
            def const(i):
                from gzz.potion.potions import ConstantExpression
@@ -153,6 +161,7 @@
                 'T': action([Clone,[PrefixOrLeft], None]),
                'm': action([ToggleMark, [ThisWindow]], 1),
                'M': action([ToggleMark, [ThisWindow]], 0),
+                'Alt-M': action([MarkHalfRank, [PrefixOrThis], None]),
                'q': action(call([Quit])),
                'Q': action(call([Quit])),
                'x': action(call([ChangeDim, const(0), const(1)])),
@@ -168,7 +177,20 @@
                 'o': action(call([GoToOriginal, [ThisWindow]]), 1),
                 'O': action(call([GoToOriginal, [ThisWindow]]), 0),
                'Tab': action(call([SwitchToTextMode])),
-               'Tabulator': action(([SwitchToTextMode])),
+               'Tabulator': action(call([SwitchToTextMode])),
+                'Ctrl-E': action(call([ExtEdit, [PrefixOrThis]]), 1),
+                'Ctrl-Shift-E': action(call([ExtEdit, [PrefixOrThis]]), 0),
+                'Ctrl-V': action(call([ViewContainedText, [PrefixOrThis]]), 1),
+                'Ctrl-Shift-V': action(call([ViewContainedText, 
[PrefixOrThis]]), 0),
+
+                'Ctrl-A': fn([AllEmailsThat, None]),
+                'Ctrl-F': fn([FromFilterFn, None]),
+                'Ctrl-T': fn([ToFilterFn, None]),
+                'Ctrl-O': fn([OlderFilterFn, None]),
+                'Ctrl-Alt-O': fn([NewerFilterFn, None]),
+                'Alt-S': fn([SubjectFilterFn, None]),
+                '&': fn([AndFilterFn, None, None]),
+                '|': fn([OrFilterFn, None, None]),
            }
 
            text_bindings = {
@@ -177,7 +199,7 @@
                'Left': action(call([TextCursorLeft])),
                'Right': action(call([TextCursorRight])),
                'Tab': action(call([SwitchToNormalMode])),
-               'Tabulator': action(([SwitchToNormalMode])),
+               'Tabulator': action(call([SwitchToNormalMode])),
            }
 
            bindings = map(bindings)
Index: gzz/lava/gzz/potion/potions/ViewContainedText.java
diff -u gzz/lava/gzz/potion/potions/ViewContainedText.java:1.1 
gzz/lava/gzz/potion/potions/ViewContainedText.java:1.2
--- gzz/lava/gzz/potion/potions/ViewContainedText.java:1.1      Sun Jan  5 
13:03:46 2003
+++ gzz/lava/gzz/potion/potions/ViewContainedText.java  Mon Jan  6 08:04:15 2003
@@ -16,7 +16,10 @@
        public void execute(List[] params, Map context) {
            for(Iterator i=params[0].iterator(); i.hasNext();) {
                Cell c = (Cell)i.next();
-               String s =  Containment.getContainedText(c);
+               String s =  
+                   "Attention! The text below CANNOT be edited!\n" +
+                   "All changes WILL BE LOST!\n\n" +
+                   Containment.getContainedText(c);
                DefaultBinder.execExternalEditor(s);
            }