[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf...
From: |
Matti Katila |
Subject: |
[Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf... |
Date: |
Tue, 12 Aug 2003 05:27:33 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Branch:
Changes by: Matti Katila <address@hidden> 03/08/12 05:27:33
Modified files:
org/fenfire/bin: fenpdf10.py
org/fenfire/demo: fenpdfcontext.py
org/fenfire/view/buoy: actions.py
Log message:
fix dragging
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/fenpdfcontext.py.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/actions.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.23
fenfire/org/fenfire/bin/fenpdf10.py:1.24
--- fenfire/org/fenfire/bin/fenpdf10.py:1.23 Tue Aug 12 04:54:24 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Tue Aug 12 05:27:31 2003
@@ -406,7 +406,7 @@
elif key == "-":
self.split -= .03
elif key == "Home":
- self.mgr.singles[1].mainNode = ff.view.buoy.MainNode2D(planeHome,
irregu, ctrl)
+ self.context.states.buoymanager.singles[1].mainNode =
ff.view.buoy.MainNode2D(planeHome, irregu, ctrl)
elif key == "Ctrl-Q":
p("going to save");
@@ -449,11 +449,12 @@
w.setCursor('default')
self.context = context
- self.context.setMngr(self.buoyManager)
+ self.context.setBuoyManager(self.buoyManager)
def scene(self, vs):
self.vs = vs
- self.buoyManager.scene(vs)
+ scene = self.buoyManager.scene(vs)
+ if scene != None: return scene
self.context.renderContext(vs, 0)
def mouse(self, ev):
Index: fenfire/org/fenfire/demo/fenpdfcontext.py
diff -u fenfire/org/fenfire/demo/fenpdfcontext.py:1.26
fenfire/org/fenfire/demo/fenpdfcontext.py:1.27
--- fenfire/org/fenfire/demo/fenpdfcontext.py:1.26 Tue Aug 12 04:54:24 2003
+++ fenfire/org/fenfire/demo/fenpdfcontext.py Tue Aug 12 05:27:33 2003
@@ -31,7 +31,7 @@
return
fen = self.states.fen
- pp = self.states.pp
+ pp = self.states.ppActions
cur = self.states.cursor
acc = cur.getAccursed()
offs = cur.getCursorOffset()
@@ -113,7 +113,7 @@
def __init__(self, fen, pp, spanImageFactory, nodeview):
self.clean()
self.cursor = ff.view.lava.Cursor(fen)
- self.pp = pp
+ self.ppActions = pp
self.fen = fen
self.spanImageFactory = spanImageFactory
self.nodeview = nodeview
@@ -175,19 +175,19 @@
class LinkL(Action):
def run(self):
obj = self.states.objectOnPlane
- pp = self.states.pp
+ pp = self.states.ppActions
pp.assocNotes(obj, -1, self.states.cursor.getAccursed())
class LinkR(Action):
def run(self):
obj = self.states.objectOnPlane
- pp = self.states.pp
+ pp = self.states.ppActions
pp.assocNotes(obj, 1, self.states.cursor.getAccursed())
class UnlinkBuoy(Action):
def run(self):
link = self.states.buoymanager.buoyHit.link
#(otherNode, linkId, otherAnchor, into)
if dbg:
p('linkid',link[1],'otheranchor',link[2],'othernode',link[0])
- pp = self.states.pp
+ pp = self.states.ppActions
a,b = link[1].first, link[1].second
pp.detachNotes(a, 1, b)
pp.detachNotes(a, -1, b)
@@ -196,7 +196,7 @@
def run(self):
main = self.states.buoymanager.getLastMain()
if isinstance(main, ff.view.buoy.MainNode2D):
- self.states.pp.deletePaper(main.getPlane())
+ self.states.ppActions.deletePaper(main.getPlane())
elif isinstance(main, ff.view.buoy.FisheyeMainNode2D):
p('foo fish eye')
@@ -373,7 +373,7 @@
self.states.mainMouse))
return 1
elif key == 'NEW_PAPER':
- paper = self.states.pp.newPaper();
+ paper = self.states.ppActions.newPaper();
buoymanager.replaceManager(0,
ff.view.buoy.MainNode2D(ff.swamp.Nodes.get(paper),
views.irregu,
ff.view.buoy.AbstractMainNode2D.SimpleFocus(0,0),1,
Index: fenfire/org/fenfire/view/buoy/actions.py
diff -u fenfire/org/fenfire/view/buoy/actions.py:1.8
fenfire/org/fenfire/view/buoy/actions.py:1.9
--- fenfire/org/fenfire/view/buoy/actions.py:1.8 Mon Aug 11 08:07:31 2003
+++ fenfire/org/fenfire/view/buoy/actions.py Tue Aug 12 05:27:33 2003
@@ -34,8 +34,8 @@
def __init__(self, context):
self.context = context
def super(self):
- self.main = self.context.states.mgr.getLastMain()
- self.oldVS = self.context.states.mgr.getVs()
+ self.main = self.context.states.buoymanager.getLastMain()
+ self.oldVS = self.context.states.buoymanager.getVs()
######## Actions to control pan of main nodes etc.
@@ -183,8 +183,8 @@
class BuoyMouseMenu(AbstractAction, vob.mouse.MouseClickListener):
def clicked(self, x, y):
self.super()
- mgr = self.context.states.mgr
- p('hit',mgr.buoyHit)
+ buoymanager = self.context.states.buoymanager
+ p('hit',buoymanager.buoyHit)
self.context.mousemenu.showList(x,y, 'buoymenu')
self.context.states.fastChg = 0
vob.AbstractUpdateManager.setNoAnimation()
@@ -192,9 +192,9 @@
class BuoyFollowClick(AbstractAction, vob.mouse.MouseClickListener):
def clicked(self, x,y):
self.super()
- mgr = self.context.states.mgr
- p('hit',mgr.buoyHit, mgr.buoyHit.single)
- mgr.buoyHit.single.followLink(mgr.buoyHit.link)
+ buoymanager = self.context.states.buoymanager
+ p('hit',buoymanager.buoyHit, buoymanager.buoyHit.single)
+ buoymanager.buoyHit.single.followLink(buoymanager.buoyHit.link)
self.context.states.fastChg = 0
- [Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf..., Matti Katila, 2003/08/07
- [Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf..., Matti Katila, 2003/08/08
- [Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf..., Matti Katila, 2003/08/08
- [Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf..., Matti Katila, 2003/08/11
- [Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf..., Matti Katila, 2003/08/12
- [Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf..., Matti Katila, 2003/08/12
- [Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf..., Matti Katila, 2003/08/12
- [Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf...,
Matti Katila <=
- [Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf..., Matti Katila, 2003/08/12
- [Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf..., Matti Katila, 2003/08/12