[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 06:18:47

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

Log message:
        Saving from button

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/fenpdfcontext.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/Button.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.37 
fenfire/org/fenfire/bin/fenpdf10.py:1.38
--- fenfire/org/fenfire/bin/fenpdf10.py:1.37    Thu Aug 14 06:13:09 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Thu Aug 14 06:18:47 2003
@@ -175,7 +175,7 @@
 ff.view.buoy.NodeType2DFull.effigy = 0
 
 
-context = Context(w, fen, ppActions, nodeview, spanImageFactory)
+context = Context(w, fen, ppActions, nodeview, spanImageFactory, FILE)
 nodeview.setContext(context)
 textnodeview.setContext(context)
 
@@ -367,9 +367,8 @@
             self.context.states.buoymanager.singles[1].mainNode = 
ff.view.buoy.MainNode2D(planeHome, irregu, ctrl)
         elif key == "Ctrl-Q":
             p("going to save");
+           self.context.save()
 
-            m = ff.swamp.Graphs.toModel(fen.graph);
-            m.write(java.io.FileWriter(FILE));
 
             java.lang.System.exit(43)
         elif key == "Ctrl-R":
Index: fenfire/org/fenfire/fenpdf/fenpdfcontext.py
diff -u fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.2 
fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.3
--- fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.2     Thu Aug 14 04:00:17 2003
+++ fenfire/org/fenfire/fenpdf/fenpdfcontext.py Thu Aug 14 06:18:47 2003
@@ -297,12 +297,13 @@
 class Context(ff.view.lava.ContextNodeView.Context,
               ff.view.buoy.AbstractMainNode2D.Context,
               ff.view.lava.TextHandler.Context):
-    def __init__(self, win, fen, pp, nv, spanImageFactory):
+    def __init__(self, win, fen, pp, nv, spanImageFactory, filename):
         global w
         w = win
         self.states = ContextStates(fen, pp, spanImageFactory, nv)
         self.keys = KeyHandler(self.states)
         self.mousemenu = MouseMenu(self.states)
+       self.filename = filename
         
         
     def setBuoyManager(self, manager):
@@ -366,7 +367,6 @@
         b.add("[Import PS/PDF]", "IMPORT");
         b.add("[New paper]",     "NEW_PAPER");
        b.add("[Save]", "SAVE");
-       b.add("[Load]", "LOAD");
 
     def doMouse(self, ev, oldVS):
         """ Return true if context has eaten the event ;)"""
@@ -408,10 +408,17 @@
                                         views.irregu, 
ff.view.buoy.AbstractMainNode2D.SimpleFocus(0,0),1,
                                         self.states.mainMouse))
             return 1
+       elif key == "SAVE":
+           self.save()
         else:
             p('key', key)
             return 0
     
+    def save(self):
+       print "SAVING..."
+       model = ff.swamp.Graphs.toModel(self.states.fen.graph);
+       model.write(java.io.FileWriter(self.filename));
+       print "DONE"
     
     def clean(self):
         self.mousemenu.hideList()
Index: fenfire/org/fenfire/view/lava/Button.java
diff -u fenfire/org/fenfire/view/lava/Button.java:1.2 
fenfire/org/fenfire/view/lava/Button.java:1.3
--- fenfire/org/fenfire/view/lava/Button.java:1.2       Wed May 21 14:07:58 2003
+++ fenfire/org/fenfire/view/lava/Button.java   Thu Aug 14 06:18:47 2003
@@ -45,7 +45,7 @@
     public Button(VobScene v, int into, 
                   float x, float y, float offset) {
        vs = v;
-       scale = style.getScaleByHeight(40);
+       scale = style.getScaleByHeight(25);
         this.into = into;
         this.x=x; this.y=y;
         this.offset = offset;