[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp...
From: |
Tuomas J. Lukka |
Subject: |
[ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp... |
Date: |
Fri, 22 Aug 2003 07:22:58 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Branch:
Changes by: Tuomas J. Lukka <address@hidden> 03/08/22 07:22:58
Modified files:
org/fenfire/bin: fenpdf10.py
org/fenfire/fenpdf: fenpdf.py fenpdfcontext.py
org/fenfire/fenpdf/appearance: views.py
Log message:
patch-40
Move buttons rendering code
patch-41
Move mousemenu
patch-42
Move rendering
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.67&tr2=1.68&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/fenpdf.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/fenpdfcontext.py.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/appearance/views.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.67
fenfire/org/fenfire/bin/fenpdf10.py:1.68
--- fenfire/org/fenfire/bin/fenpdf10.py:1.67 Fri Aug 22 05:06:56 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Fri Aug 22 07:22:58 2003
@@ -207,6 +207,9 @@
context = Context(w, fen, ppActions, FILE)
+context.mousemenu = ff.fenpdf.events.mousemenu.MouseMenu(context.states)
+fenPDF.events.mousemenu = context.mousemenu
+
fenPDF.events.mouse = ff.fenpdf.events.mouse.MouseMapper(context)
fenPDF.events.key = ff.fenpdf.events.key.KeyHandler(context.states)
@@ -252,8 +255,6 @@
def scene(self, vs):
self.context.states.vs = vs
scene = views.scene(vs)
- fenPDF.events.buttons.render(vs, 0)
- self.context.renderContext(vs)
return scene
def mouse(self, ev):
Index: fenfire/org/fenfire/fenpdf/appearance/views.py
diff -u fenfire/org/fenfire/fenpdf/appearance/views.py:1.6
fenfire/org/fenfire/fenpdf/appearance/views.py:1.7
--- fenfire/org/fenfire/fenpdf/appearance/views.py:1.6 Fri Aug 22 05:06:57 2003
+++ fenfire/org/fenfire/fenpdf/appearance/views.py Fri Aug 22 07:22:58 2003
@@ -126,7 +126,12 @@
BuoyManager may decide
"""
- return self.buoyManager.scene(vs)
+ replacingScene = self.buoyManager.scene(vs)
+ if replacingScene == None:
+ self.fenPDF.events.buttons.render(vs, 0)
+ self.fenPDF.events.mousemenu.render(vs)
+
+ return replacingScene
def getConnectors(self):
return self.connectors
Index: fenfire/org/fenfire/fenpdf/fenpdf.py
diff -u fenfire/org/fenfire/fenpdf/fenpdf.py:1.6
fenfire/org/fenfire/fenpdf/fenpdf.py:1.7
--- fenfire/org/fenfire/fenpdf/fenpdf.py:1.6 Fri Aug 22 05:06:57 2003
+++ fenfire/org/fenfire/fenpdf/fenpdf.py Fri Aug 22 07:22:58 2003
@@ -20,14 +20,20 @@
events -- an object with no methods, just fields:
mouse -- an object like org.fenfire.fenpdf.events.mouse.MouseMapper
+ key --
+ mousemenu --
actions -- an object with no methods, just fields:
mouse -- an object like org.fenfire.fenpdf.actions.mouse.MouseActions
+ key --
structure -- an object with no methods, just fields:
structLink -- a StructLink object
+ alphContent
+ canvas2d
+ treeTime
window -- the GraphicsAPI.window object
Index: fenfire/org/fenfire/fenpdf/fenpdfcontext.py
diff -u fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.23
fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.24
--- fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.23 Fri Aug 22 05:06:57 2003
+++ fenfire/org/fenfire/fenpdf/fenpdfcontext.py Fri Aug 22 07:22:58 2003
@@ -102,162 +102,6 @@
def clean(self):
pass
-
-class MouseMenu:
- class Action:
- def __init__(self, states):
- self.states = states
- def run(self):
- pass
-
- class LinkL(Action):
- def run(self):
- obj = self.states.objectOnPlane
- 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.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)
- p('link',link)
- p('Detaching
linkid',link[1],'otheranchor',link[2],'othernode',link[0])
- linkId = link[1]
- if isinstance(linkId,
- ff.view.buoy.TransclusionConnector.LinkId):
- # Transclusion link: delete the node
- self.states.ppActions.deleteNote(
- Nodes.toString(linkId.node))
- else:
- pp = self.states.ppActions
- a,b = link[1].first, link[1].second
- pp.detachNotes(a, 1, b)
- pp.detachNotes(a, -1, b)
-
- class KillPlane(Action):
- def run(self):
- main = self.states.buoymanager.getLastMain()
- if isinstance(main, ff.view.buoy.MainNode2D):
- self.states.ppActions.deletePaper(main.getPlane())
- p('YOU ARE KILLING THE P(L)ANE!')
- # put a new paper int there
-
self.states.buoymanager.replaceManager(self.states.buoymanager.lastIndex,
-
ff.view.buoy.MainNode2D(ff.swamp.Nodes.get(self.states.ppActions.newPaper()),
-
self.states.view2d.irregu, ff.view.buoy.AbstractMainNode2D.SimpleFocus(0,0),1,
-
self.states.mainMouse))
- elif isinstance(main, ff.view.buoy.FisheyeMainNode2D):
- p('foo fish eye')
- else:
- p('plaah, unknow main view2d')
-
- class GoHome(Action):
- def run(self):
- pass
- #self.s.buoymanager.singles[1].mainNode =
ff.view.buoy.MainNode2D(planeHome, irregu, ctrl)
-
- class DeleteNode(Action):
- def run(self):
- obj = self.states.objectOnPlane
- self.states.ppActions.deleteNote(obj)
-
- class Transclude(Action):
- def run(self):
- pdfMainNode = self.states.selection.getMainNode()
- area = self.states.selection.getXYWH()
- obj = pdfMainNode.getView2D().getSelectedObject(
- pdfMainNode.getPlane(), *area)
- print "Transclude selected: ",pdfMainNode.getPlane(), area, obj
- if obj == None:
- p("Null??")
- return
- canvasMainNode = self.states.buoymanager.getLastMain()
- plane = Nodes.toString(canvasMainNode.getPlane())
- # Check (this method is only in PPActionsImpl XXX)
- if not self.states.ppActions.isPaper(plane):
- p("NOT A CANVAS!")
- # XXX Use oldvs to get location where mouse was clicked
- focus = canvasMainNode.getFocus()
- node = Nodes.get(self.states.ppActions.newNote(plane,
- focus.getPanX(), focus.getPanY(), ""))
- self.states.fen.txt.set(node, obj)
-
-
-
- def __init__(self, states):
- self.states = states
- self.style = vob.GraphicsAPI.getInstance().getTextStyle('sans', 0, 12)
- self.link = 0
- self.makeMainList()
- self.isHide = 1
- self.hideList()
-
- def makeMainList(self):
- self.selectListVob = vob.vobs.SelectListVob(self.style)
- if self.states.selection.hasSelection():
- self.selectListVob.add('Transclude selection (PDF to canvas only)',
- self.Transclude(self.states))
- if self.link:
- self.selectListVob.add('Link node to left',
self.LinkL(self.states))
- self.selectListVob.add('Link node to rigth',
self.LinkR(self.states))
- self.selectListVob.add('Go to home', 'home')
- self.selectListVob.add('Destroy this canvas',
self.KillPlane(self.states))
- if self.link:
- self.selectListVob.add('Delete this node',
self.DeleteNode(self.states))
-
- def makeBuoyList(self):
- self.selectListVob = vob.vobs.SelectListVob(self.style)
- self.selectListVob.add('Unlink buoy', self.UnlinkBuoy(self.states))
- self.selectListVob.add('Go to home', 'home')
-
- def render(self, vs):
- cs = vs.orthoBoxCS(0, 'MOUSE_MENU',-100, self.x, self.y-self.h/2,
- 1,1, self.w, self.h)
- vs.put(self.selectListVob, cs)
-
- def showList(self, x, y, who):
- if who == 'buoymenu':
- self.makeBuoyList()
- elif who == 'mainmenu':
- self.makeMainList()
- else:
- p('no mouse menu list!')
- self.hideList()
- return
-
- self.w, self.h = self.selectListVob.width, self.selectListVob.height
- self.x, self.y = x, y
- self.isHide = 0
-
- def hideList(self):
- if hasattr(self.states, 'lastEvent'):
- self.x, self.y = self.states.lastEvent.getX(),
self.states.lastEvent.getY()
- else: self.x, self.y = 0,0
- self.w, self.h = .0, .0
- self.isHide = 1
-
- def mouse(self, ev, vs):
- if self.isHide: return 0
-
- cs = vs.matcher.getCS(0, 'MOUSE_MENU')
- p('cs:', cs)
- key = vs.getKeyAt(cs, ev.getX(), ev.getY(), None)
- if key != None:
- p('context menu hit!')
- self.selectListVob.colorize(key, java.awt.Color.red)
- key = key.object
- if isinstance(key, self.Action):
- self.states.oldVS = vs
- key.run()
- self.states.oldVS = None
- else: p('mouse menu key is: ', key)
- self.hideList()
- return 1
- return 0
-
class Context(ff.view.lava.ContextNodeView.Context,
ff.view.buoy.AbstractMainNode2D.Context,
@@ -266,7 +110,6 @@
global w
w = win
self.states = ContextStates(fen, pp)
- self.mousemenu = MouseMenu(self.states)
self.filename = filename
@@ -295,8 +138,6 @@
vs.put(vob.vobs.LineVob(0,0,0,1, java.awt.Color.darkGray), cursorCS)
- def renderContext(self, vs):
- self.mousemenu.render(vs)
def doMouse(self, ev, oldVS):
""" Return true if context has eaten the event ;)"""
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/20
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/21
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/22
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/22
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Matti Katila, 2003/08/22
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/22
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/22
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp...,
Tuomas J. Lukka <=
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/22
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/23
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/24
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/24
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/24
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/25
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/26