[ff-cvs] fenfire/org/fenfire/fenpdf BUGS fenpdfcontext.py

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/15 05:40:53

Modified files:
        org/fenfire/fenpdf: BUGS fenpdfcontext.py 

Log message:
        Transclusion unlinking

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/BUGS.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/fenpdfcontext.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/fenpdf/BUGS
diff -u fenfire/org/fenfire/fenpdf/BUGS:1.5 fenfire/org/fenfire/fenpdf/BUGS:1.6
--- fenfire/org/fenfire/fenpdf/BUGS:1.5 Fri Aug 15 03:46:07 2003
+++ fenfire/org/fenfire/fenpdf/BUGS     Fri Aug 15 05:40:53 2003
@@ -3,13 +3,6 @@
 
 FATAL:
 
-- unlink buoy doesn't work for transclusions!
-    [ architecture-wise we should separate the bindings
-      and actions as modularly as possible to help 
-      people build different things out of the parts.
-      Multiplexing actions by buoy type is one important thing.
-      ]
-
 - sometimes "not a canvas view"
     [ architecture-wise: what the hell is AbstractMainNode2D
       doing, checking members' derived types?
@@ -38,6 +31,12 @@
 
 - can't start fullscreen
 
-FIXED, BUT SYMPTOM OF DEEPER ARCHITECTURAL PROBLEM:
 
+ALREADY FIXED, BUT SYMPTOM OF DEEPER ARCHITECTURAL PROBLEM:
 
+- unlink buoy doesn't work for transclusions!
+    [ architecture-wise we should separate the bindings
+      and actions as modularly as possible to help 
+      people build different things out of the parts.
+      Multiplexing actions by buoy type is one important thing.
+      ]
Index: fenfire/org/fenfire/fenpdf/fenpdfcontext.py
diff -u fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.7 
fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.8
--- fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.7     Fri Aug 15 03:46:07 2003
+++ fenfire/org/fenfire/fenpdf/fenpdfcontext.py Fri Aug 15 05:40:53 2003
@@ -171,12 +171,19 @@
         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])
-            p('link',link)
-            pp = self.states.ppActions
-            a,b = link[1].first, link[1].second
-            pp.detachNotes(a, 1, b)
-            pp.detachNotes(a, -1, b)
+           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):