[Gzz-commits] fenfire ./README-loom ./TODO-loom org/fenfire/l...

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Benja Fallenstein <address@hidden>      03/03/08 20:18:02

Modified files:
        .              : README-loom TODO-loom 
        org/fenfire/loom: Loom.java 

Log message:
        Better mouse handling:
        - The focus now becomes the rotation when clicking on
        a resource (making it the focus).
        - Right clicking on a node selects it, no matter
        whether it is a resource or a literal.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/README-loom.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/TODO-loom.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/Loom.java.diff?tr1=1.18&tr2=1.19&r1=text&r2=text

Patches:
Index: fenfire/README-loom
diff -u fenfire/README-loom:1.1 fenfire/README-loom:1.2
--- fenfire/README-loom:1.1     Sat Mar  8 17:54:20 2003
+++ fenfire/README-loom Sat Mar  8 20:18:02 2003
@@ -64,13 +64,24 @@
 To quit the browser, close the window or hit ``Ctrl-Q``.
 
 
-The wheel view
---------------
+Moving around
+-------------
 
 You can choose between the connected nodes using
 the Up/Down cursor keys and move to a connected node
 using the Left/Right keys. You cannot move onto literals
 (shown as rectangles).
+
+With the mouse, left clicking on a resource will
+move on it and left clicking on a literal will
+select it (so that it's directly right of the focus).
+Right clicking on either a literal or a resource
+will select it (this is useful when you have
+a large number of connected nodes and need to scroll).
+
+
+The wheel view
+--------------
 
 There are two views, the 'simple' and the 'wheel' view,
 which you can switch between using the PgUp/PgDown keys.
Index: fenfire/TODO-loom
diff -u fenfire/TODO-loom:1.25 fenfire/TODO-loom:1.26
--- fenfire/TODO-loom:1.25      Sat Mar  8 19:57:58 2003
+++ fenfire/TODO-loom   Sat Mar  8 20:18:02 2003
@@ -12,12 +12,8 @@
 
 
 0.1: Working RDF browser
-    - make mouse work better-- figure out how
-      - currently clicking on literal rotates to it,
-        clicking on node makes it focus
-
+    - truncate literals at end instead of beginning
     - views proportional to window size
-    - clip instead of truncate text
     - in the Wheel views, have a maximum angle, so that
       if only three nodes are shown, the angles still
       aren't greater than 45 degs or so
@@ -31,6 +27,7 @@
 
     - JAR target; java -jar loom.jar should start the client
 
+    + clip instead of truncate text
     + Copy URI / copy literal text to clipboard
     + WebStart deployment of Loom?
     + in Wheel view, have a minimum angle, so that nodes
Index: fenfire/org/fenfire/loom/Loom.java
diff -u fenfire/org/fenfire/loom/Loom.java:1.18 
fenfire/org/fenfire/loom/Loom.java:1.19
--- fenfire/org/fenfire/loom/Loom.java:1.18     Sat Mar  8 19:57:59 2003
+++ fenfire/org/fenfire/loom/Loom.java  Sat Mar  8 20:18:02 2003
@@ -242,13 +242,14 @@
                    if(cs < 0) return;
                    Object key = vs.matcher.getKey(cs);
                    NodeView.Nodespec spec = (NodeView.Nodespec)key;
-                   if(spec.node instanceof Resource) {
+                   if(m.getButton() == m.BUTTON3 ||
+                      spec.node instanceof Literal) {
+                       cursor.set(cursor.focus, spec.dir, spec.node);
+                       AbstractUpdateManager.chg();
+                   } else {
                        lastFocus = new NodeView.Nodespec(cursor.focus);
                        lastRotation = spec;
-                       cursor.set((Resource)spec.node);
-                       AbstractUpdateManager.chg();
-                   } else if(spec.node instanceof Literal) {
-                       cursor.set(cursor.focus, 1, spec.node);
+                       cursor.set((Resource)spec.node, -spec.dir, 
cursor.focus);
                        AbstractUpdateManager.chg();
                    }
                }