[Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/14 08:13:03

Modified files:
        org/fenfire/bin: fenpdf10.py 
        org/fenfire/fenpdf: fenpdfcontext.py 
        org/fenfire/util/lava: view.py 

Log message:
        Lots of twids

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/fenpdfcontext.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/lava/view.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.41 
fenfire/org/fenfire/bin/fenpdf10.py:1.42
--- fenfire/org/fenfire/bin/fenpdf10.py:1.41    Thu Aug 14 07:42:17 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Thu Aug 14 08:13:03 2003
@@ -273,8 +273,9 @@
 # Transclusion
 tconnector = ff.view.buoy.TransclusionConnector(fen, nodeview)
 pagescroll2d = ff.view.PageScrollView2D(spanImageFactory)
-context.states.view2d.pageview = pagescroll2d
+context.states.view2d.pageview_without_surrounding = pagescroll2d
 pagescroll2d = ff.view.AreaSelectingView2D(pagescroll2d)
+context.states.view2d.pageview = pagescroll2d
 
 tconnector.normalNodeNodeType = ff.view.buoy.NodeType2D(irregu,
                        ff.view.buoy.MainNode2D.MainNode2DFactory(1, mainMouse))
Index: fenfire/org/fenfire/fenpdf/fenpdfcontext.py
diff -u fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.3 
fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.4
--- fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.3     Thu Aug 14 06:18:47 2003
+++ fenfire/org/fenfire/fenpdf/fenpdfcontext.py Thu Aug 14 08:13:03 2003
@@ -59,7 +59,7 @@
             self.states.spanImageFactory.paperMaker = self.makerTypes[0]
             self.makerTypes.append(self.makerTypes.pop(0))
             self.states.nodeview.reinit(fen.graph, 100)
-            self.states.view2d.pageview.flush()
+            self.states.view2d.pageview_without_surrounding.flush()
 
         if stroke == 'Ctrl-A':
             p('Make an annotate.')
@@ -318,12 +318,9 @@
 
     # call back from AbstractMainNode2D
     def mainNodeToBeRender(self, vs, into, main):
-        v = main.getView2D()
-        while v != None:
-            if isinstance(v, ff.view.AreaSelectingView2D):
-                self.selection = v
-                break
-            v = v.getChildView2D()
+       self.selection = ff.util.lava.view.getView(main, 
ff.view.AreaSelectingView2D)
+
+       
 
         #self.super.mainNodeToBeRender(vs, into, main)
 
Index: fenfire/org/fenfire/util/lava/view.py
diff -u fenfire/org/fenfire/util/lava/view.py:1.1 
fenfire/org/fenfire/util/lava/view.py:1.2
--- fenfire/org/fenfire/util/lava/view.py:1.1   Sat Jul 19 05:04:36 2003
+++ fenfire/org/fenfire/util/lava/view.py       Thu Aug 14 08:13:03 2003
@@ -5,4 +5,4 @@
         if isinstance(v, view):
             return v
         v = v.getChildView2D()
-    raise view, '- not found'
+    raise (str((view, main, main.getView2D())), '- not found')