[Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py view/buoy/a...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/08/13 08:33:07

Modified files:
        org/fenfire/bin: fenpdf10.py 
        org/fenfire/view/buoy: actions.py 

Log message:
        ctrl+drag fix

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/actions.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.30 
fenfire/org/fenfire/bin/fenpdf10.py:1.31
--- fenfire/org/fenfire/bin/fenpdf10.py:1.30    Wed Aug 13 02:57:25 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Wed Aug 13 08:33:07 2003
@@ -253,6 +253,9 @@
 mainMouse.setListener(1, vob.VobMouseEvent.SHIFT_MASK,
                       'Selecting area of main view.',
                       actions.SelectArea(context))
+mainMouse.setListener(1, vob.VobMouseEvent.CONTROL_MASK,
+                      'Move the note.',
+                      actions.NodeMover(context))
 mainMouse.setListener(1, 0, 'Browse to clicked point in the main view',
                       actions.BrowseClick(context))
 
Index: fenfire/org/fenfire/view/buoy/actions.py
diff -u fenfire/org/fenfire/view/buoy/actions.py:1.11 
fenfire/org/fenfire/view/buoy/actions.py:1.12
--- fenfire/org/fenfire/view/buoy/actions.py:1.11       Wed Aug 13 08:04:31 2003
+++ fenfire/org/fenfire/view/buoy/actions.py    Wed Aug 13 08:33:07 2003
@@ -20,7 +20,7 @@
 # 
 # 
 
-
+from __future__ import nested_scopes
 from org import fenfire as ff
 from org.fenfire.vocab import CANVAS2D, RDF
 import org.nongnu.libvob as vob
@@ -103,7 +103,12 @@
 
 ####### Actions to control nodes on main node plane
         
-class NodeMover(AbstractAction, vob.mouse.RelativeAdapter):
+class NodeMover(AbstractAction, vob.mouse.RelativeAdapter,
+                vob.mouse.MousePressListener):
+    def pressed(self, x,y):
+        self.super()
+        self.set(self.main.getNodeOnPlane(self.oldVS, x,y))
+        return self
     def set(self, node):
         self.super()
         s = self.context.states
@@ -119,6 +124,7 @@
         oy = ff.util.RDFUtil.getFloat(g, self.node, CANVAS2D.y)
         self.pp.moveNote(self.node, ox+x/f.zoom, oy+y/f.zoom )
         self.main.chgFast(self.oldVS, -1)
+
 
 class LinkClick(AbstractAction, vob.mouse.MouseClickListener):
     def clicked(self, x,y):