[Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/08/08 08:45:06

Modified files:
        org/fenfire/bin: fenpdf10.py 
        org/fenfire/demo: fenpdfcontext.py 

Log message:
        more work towards mousemenu

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/fenpdfcontext.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.5 
fenfire/org/fenfire/bin/fenpdf10.py:1.6
--- fenfire/org/fenfire/bin/fenpdf10.py:1.5     Fri Aug  8 07:45:58 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Fri Aug  8 08:45:06 2003
@@ -163,6 +163,7 @@
     noteA1 = Nodes.get(ppAct.newNote(paperA, -30,-30, 'This is a test!'))
     noteA2 = Nodes.get(ppAct.newNote(paperA, -60,-70, 'This is a test2!'))
     noteA3 = Nodes.get(ppAct.newNote(paperA, 100, 100, ''))
+    noteA4 = Nodes.get(ppAct.newNote(paperA, -60,70, 'This is a very long test 
which is used to see if '))
 
     ppAct.assocNotes(noteA1, 1, noteA2);
 
@@ -403,16 +404,19 @@
             p('mainMouse released? - there\'s a bug in here!')
             mousePrint(self.lastEvent, 'lastEvent')
 
+            # release event must go to mainMouse MouseMultiplexer to work 
correctly!
+            # mainMouse.deliverEvent(ev)
+            # flush implemented...
+            mainMouse.flush()
+            
+            self.context.clean()
+            w.setCursor('default')
+
             # workaround..
             if self.lastEvent.getType() == ev.MOUSE_PRESSED:
                 p('workaround for a bug')
                 return 1
 
-            # release event must go to mainMouse MouseMultiplexer to work 
correctly!
-            mainMouse.deliverEvent(ev)
-            
-            self.context.states.clean()
-            w.setCursor('default')
             # There is a bug in AbstractUpdateManager code(?) and that's why 
now is must to return.
             #return 1
             return 0
@@ -422,20 +426,11 @@
         if ev.getType() != ev.MOUSE_CLICKED:
             return 0
 
-        planes = []
-        for single in self.mgr.singles:
-            planes.append(single.getMainNode())
-        newPlanes = self.context.doMouse(ev, oldvs, planes, self.nv)
-        if newPlanes == 1: return 1
-        
-        if newPlanes != None and planes != newPlanes:
-            p('going to change the singles with new ones')
-            for i in range(0, len(newPlanes)):
-                self.mgr.singles[i] = vob.buoy.buoymanager.SingleFocusManager(
-                    newPlanes[i],
-                    self.mgr.connectors)
-                vob.AbstractUpdateManager.chg()
+        if self.context.doMouse(ev, oldvs):
+            mainMouse.flush()
+            vob.AbstractUpdateManager.chg()
             return 1
+        
         return 0
 
 
Index: fenfire/org/fenfire/demo/fenpdfcontext.py
diff -u fenfire/org/fenfire/demo/fenpdfcontext.py:1.17 
fenfire/org/fenfire/demo/fenpdfcontext.py:1.18
--- fenfire/org/fenfire/demo/fenpdfcontext.py:1.17      Fri Aug  8 07:45:58 2003
+++ fenfire/org/fenfire/demo/fenpdfcontext.py   Fri Aug  8 08:45:06 2003
@@ -271,8 +271,13 @@
        b.add("[Save]", "SAVE");
        b.add("[Load]", "LOAD");
 
-    def doMouse(self, ev, oldVS, mainNodes, contextNodeView):
-        if self.mousemenu.mouse(ev, oldVS): return 1
-        pass
+    def doMouse(self, ev, oldVS):
+        if self.mousemenu.mouse(ev, oldVS):
+            return 1
+        return 0
 
     
+    def clean(self):
+        self.mousemenu.hideList()
+        self.states.clean()
+