Changeset 700

Timestamp:

01/16/14 10:03:31 (10 years ago)

Author:

jts21

Message:

Make help text easier to understand (add "click"/"drag" at start of line instead of just prepending "d" to drag actions)

File:

• trunk/src/org/expeditee/gui/Help.java (modified) (4 diffs)

trunk/src/org/expeditee/gui/Help.java

@@ -41 +41 @@
         // separator between command and description
         private static final String separatorString = ": ";
-        // flag for dragging
-        private static final String dragString = "d";
-        
-        private static final String commandPadding = "       ";
+        
+        private static final String commandPadding = "      ";
         private static final String padding = "                    ";
         
-        private static final String command(int mod, int button, boolean drag) {
-                String cmd = (drag ? dragString : "") + modifiers[mod] + buttons[button] + separatorString;
+        private static final String command(int mod, int button) {
+                String cmd = modifiers[mod] + buttons[button] + separatorString;
                 return commandPadding.substring(cmd.length()) + cmd;
-        }
-        
-        private static final String command(int mod, int button) {
-                return command(mod, button, false);
         }
         
@@ -106 +100 @@
                         return "Copy item";
                 }
-        }
-        
-        private static final String left_middle(Context context, int mod, int other) {
-                return null;
         }
         
@@ -223 +213 @@
                 String r =  right(context, mod, other);
                 String lr = left_right(context, mod, other);
-                String lm = left_middle(context, mod, other);
                 String mr = middle_right(context, mod, other);
                 String dl = drag_left(context, mod, other);
@@ -229 +218 @@
                 String dr = drag_right(context, mod, other);
                 
+                if(l != null || m != null || r != null || lr != null) status += " Click:";
                 if(l != null)  status += command(mod, left) + l + padding.substring(l.length());
                 if(m != null)  status += command(mod, middle) + m + padding.substring(m.length());
                 if(r != null)  status += command(mod, right) + r + padding.substring(r.length());
-                if(lm != null) status += command(mod, left | middle) + lm + padding.substring(lm.length());
                 if(lr != null) status += command(mod, left | right) + lr + padding.substring(lr.length());
                 if(mr != null) status += command(mod, middle | right) + mr + padding.substring(mr.length());
-                if(dl != null || dm != null || dr != null || iw != null) status += "\n";
-                if(dl != null) status += command(mod, left, true) + dl + padding.substring(dl.length());
-                if(dm != null) status += command(mod, middle, true) + dm + padding.substring(dm.length());
-                if(dr != null) status += command(mod, right, true) + dr + padding.substring(dr.length());
+                if(dl != null || dm != null || dr != null || iw != null) status += "\n Drag: ";
+                if(dl != null) status += command(mod, left) + dl + padding.substring(dl.length());
+                if(dm != null) status += command(mod, middle) + dm + padding.substring(dm.length());
+                if(dr != null) status += command(mod, right) + dr + padding.substring(dr.length());
                 if(iw != null) status += commandPadding + "Widget: " + iw.getClass().getSimpleName();