[Gzz-commits] fenfire ./up.sh org/fenfire/demo/buoyoing.py or...

[Matti Katila]

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

Modified files:
        .              : up.sh 
        org/fenfire/demo: buoyoing.py fenpdfcontext.py 
        org/fenfire/view/buoy: actions.py 

Log message:
        puuh, fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/up.sh.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.105&tr2=1.106&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/fenpdfcontext.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/actions.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.105 
fenfire/org/fenfire/demo/buoyoing.py:1.106
--- fenfire/org/fenfire/demo/buoyoing.py:1.105  Wed Aug  6 12:02:30 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Wed Aug  6 12:25:20 2003
@@ -198,6 +198,8 @@
                       SelectArea(context))
 mainMouse.setListener(1, 0, 'Browse to clicked point in the main view',
                       BrowseClick(context))
+mainMouse.setListener(3, 0, 'Select a node by click or unselect.',
+                      IfSelectNodeOnPlane(context))
 
 
 
Index: fenfire/org/fenfire/demo/fenpdfcontext.py
diff -u fenfire/org/fenfire/demo/fenpdfcontext.py:1.14 
fenfire/org/fenfire/demo/fenpdfcontext.py:1.15
--- fenfire/org/fenfire/demo/fenpdfcontext.py:1.14      Wed Aug  6 12:02:31 2003
+++ fenfire/org/fenfire/demo/fenpdfcontext.py   Wed Aug  6 12:25:20 2003
@@ -133,6 +133,10 @@
                 return (a[0]-a[2]) != 0 and (a[1]-a[3]) != 0
         self.selection = Selection()
 
+        # kludge to keep flag how BuoyViewMainNode.mouse() should return.
+        # see AbstractMainNode2D.mouse()
+        self.fastChg = 0
+
     def chgCtrl(self):
         self.ctrl = not self.ctrl
         if self.ctrl:
Index: fenfire/org/fenfire/view/buoy/actions.py
diff -u fenfire/org/fenfire/view/buoy/actions.py:1.2 
fenfire/org/fenfire/view/buoy/actions.py:1.3
--- fenfire/org/fenfire/view/buoy/actions.py:1.2        Wed Aug  6 11:55:54 2003
+++ fenfire/org/fenfire/view/buoy/actions.py    Wed Aug  6 12:25:20 2003
@@ -29,10 +29,6 @@
 def p(*s):
     print 'actions.py::', s
 
-class AbstractContextController(ff.util.ControlBinding.AbstractController):
-    def __init__(self, context):
-        self.context = context
-
 class AbstractAction:
     def __init__(self, context):
         self.context = context
@@ -83,13 +79,14 @@
         self.context.states.fastChg = 1
 
 class IfSelectNodeOnPlane(AbstractAction, vob.mouse.MouseClickListener):
-    def click(self, x, y):
-
-        self.context.states.cursor.setAccursed(None)
+    def clicked(self, x, y):
+        self.super()
+        obj = self.main.getNodeOnPlane(self.oldVS, x,y)
+        self.context.states.cursor.setAccursed(obj)
         self.context.states.fastChg = 0
 
-#
-class ShowMouseMenu(AbstractContextController):
+# XXX
+class ShowMouseMenu(AbstractAction):
     def isChangeable(self): return 0
     def controlPoint(self, x, y, scale):
         self.context.mousemenu.showList(x,y)
Index: fenfire/up.sh
diff -u fenfire/up.sh:1.8 fenfire/up.sh:1.9
--- fenfire/up.sh:1.8   Mon Apr 28 07:17:16 2003
+++ fenfire/up.sh       Wed Aug  6 12:25:20 2003
@@ -30,7 +30,7 @@
 ; do
   if [ -d "../$dir" ]; then
       echo $dir
-      (cd ../$dir && cvs -qz3 update -dP &)
+      (cd ../$dir && cvs -qz3 up -dP &)
       sleep 1
   fi
 done