[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gzz/modules/pp PPMouseEvents.java PPView2.j...
From: |
Matti Katila |
Subject: |
[Gzz-commits] gzz/gzz/modules/pp PPMouseEvents.java PPView2.j... |
Date: |
Fri, 10 Jan 2003 13:21:46 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Matti Katila <address@hidden> 03/01/10 13:21:46
Modified files:
gzz/modules/pp : PPMouseEvents.java PPView2.java
Added files:
gzz/modules/pp : Button.java
Log message:
clean
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/Button.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPMouseEvents.java.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
Patches:
Index: gzz/gzz/modules/pp/PPMouseEvents.java
diff -u gzz/gzz/modules/pp/PPMouseEvents.java:1.20
gzz/gzz/modules/pp/PPMouseEvents.java:1.21
--- gzz/gzz/modules/pp/PPMouseEvents.java:1.20 Thu Jan 9 07:15:31 2003
+++ gzz/gzz/modules/pp/PPMouseEvents.java Fri Jan 10 13:21:45 2003
@@ -28,7 +28,7 @@
*/
public class PPMouseEvents {
-public static final String rcsid = "$Id: PPMouseEvents.java,v 1.20 2003/01/09
12:15:31 mudyc Exp $";
+public static final String rcsid = "$Id: PPMouseEvents.java,v 1.21 2003/01/10
18:21:45 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println(s); }
@@ -206,7 +206,7 @@
Object[] obs) {
context.setAccursed((Cell)obs[0]);
ppv.addInterp("link"+obs[1].toString(), obs[2]);
- ppv.addInterp("link", obs[5]);
+ ppv.addInterp("link", obs[3]);
AbstractUpdateManager.chg();
}
}
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.54
gzz/gzz/modules/pp/PPView2.java:1.55
--- gzz/gzz/modules/pp/PPView2.java:1.54 Fri Jan 10 12:14:57 2003
+++ gzz/gzz/modules/pp/PPView2.java Fri Jan 10 13:21:45 2003
@@ -36,7 +36,7 @@
import java.util.*;
public class PPView2 implements View {
-public static final String rcsid = "$Id: PPView2.java,v 1.54 2003/01/10
17:14:57 mudyc Exp $";
+public static final String rcsid = "$Id: PPView2.java,v 1.55 2003/01/10
18:21:45 mudyc Exp $";
public static boolean dbg = true;
private static void pa(String s) { System.err.println(s); }
@@ -482,75 +482,10 @@
float scale = style.getScaleByHeight(40);
-
-
- // put the "New paper" -text
- TextVob new_paper_button = new TextVob(style, "Uusi paperi");
- float width = new_paper_button.getWidth(scale);
- int new_paper_button_frame =
- vs.orthoBoxCS(0, "new_paper_button_frame", 0, 0,0, 1,1,
- width, new_paper_button.getHeight(scale) +
- new_paper_button.getDepth(scale));
- int new_paper_button_cs =
- vs.scaleCS(new_paper_button_frame, "new_paper_button_cs",
- new_paper_button.getHeight(scale) +
- new_paper_button.getDepth(scale),
- new_paper_button.getHeight(scale) +
- new_paper_button.getDepth(scale));
- vs.activate(new_paper_button_frame);
- vs.map.put(new_paper_button, new_paper_button_cs);
- ev_handler.onClick(new_paper_button_frame, "Add new paper");
-
-
- // testing
- int barY = -1;
- if (test_Y) {
- barY = vs.translateCS(0, "Y", 1000, 100, 0);
- pa("***foobar*** "+barY);
- test_Y = false;
- }
- if (OLD_Y > 0 && barY >0)
-
((DefaultVobMatcher)vs.matcher).keymapSingleCoordsys(new_paper_button_cs,
OLD_Y);
- OLD_Y = barY;
-
-
- // put the "Add photo" -text
- TextVob add_photo_button = new TextVob(style, "Liita kuva");
- width = add_photo_button.getWidth(scale);
- int add_photo_button_frame =
- vs.orthoBoxCS(0, "add_photo_button_frame", 0, 300,0, 1,1,
- width, add_photo_button.getHeight(scale) +
- add_photo_button.getDepth(scale));
- int add_photo_button_cs =
- vs.scaleCS(add_photo_button_frame, "add_photo_button_cs",
- add_photo_button.getHeight(scale) +
- add_photo_button.getDepth(scale),
- add_photo_button.getHeight(scale) +
- add_photo_button.getDepth(scale));
- vs.activate(add_photo_button_frame);
- vs.map.put(add_photo_button, add_photo_button_cs);
- ev_handler.onClick(add_photo_button_frame, "Add photo to paper");
-
-
- // put the "Delete paper" -text
- TextVob delete_paper_button = new TextVob(style, "Tuhoa paperi");
- width = delete_paper_button.getWidth(scale);
- int delete_paper_button_frame =
- vs.orthoBoxCS(0, "delete_paper_button_frame", 0, 600,0, 1,1,
- width, delete_paper_button.getHeight(scale) +
- delete_paper_button.getDepth(scale));
- int delete_paper_button_cs =
- vs.scaleCS(delete_paper_button_frame, "delete_paper_button_cs",
- delete_paper_button.getHeight(scale) +
- delete_paper_button.getDepth(scale),
- delete_paper_button.getHeight(scale) +
- delete_paper_button.getDepth(scale));
- vs.activate(delete_paper_button_frame);
- vs.map.put(delete_paper_button, delete_paper_button_cs);
- ev_handler.onClick(delete_paper_button_frame, "Delete paper");
-
-
-
+ Button butt = new Button(vs, ev_handler, style);
+ butt.add("Add new paper", "Uusi paperi", 0,0);
+ butt.add("Add photo to paper", "Liita kuva", 200,0);
+ butt.add("Delete paper", "Tuhoa paperi", 400,0);
// count papers
Cell p = main_vc.getAccursed().h(d.contains).h(d.d1).s(d.d1);