Changeset 712

Timestamp:

01/16/14 16:22:06 (10 years ago)

Author:

jts21

Message:

More changes to help text, now L/M/R/LM/MR are always aligned to the same X value, and fix a couple of help messages

File:

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

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

@@ -44 +44 @@
         private static final String commandPadding = "      ";
         private static final String padding = "                    ";
+        private static final String emptyPadding = commandPadding + padding;
         
         private static final String command(int mod, int button) {
@@ -71 +72 @@
                 return "Draw line/arrow";
                 case line:
+                        if(FreeItems.isDrawingPolyLine()) return "Spot-weld polyline";
                         if((mod & shift) != 0) return "Extend shape";
                 case dot:
@@ -94 +96 @@
                         return "Draw rectangle";
                 case line:
+                        if(FreeItems.isDrawingPolyLine()) return "Spot-weld & continue";
                         if((mod & shift) != 0) return "Add line";
+                        break;
+                case dot:
+                        if((mod & shift) == 0)return "Extend line";
+                        break;
+                }
+                if((other & cursor) != 0) return "Stamp copy";
+                if((mod & shift) != 0) return "Draw rectangle";
+                if(context == Context.polygon) return "Copy enclosed items";
+                return "Copy item";
+        }
+        
+        private static final String left_right(Context context, int mod, int other) {
+                switch(context) {
+                case widget: return null;
                 default:
-                        if((other & cursor) != 0) return "Stamp copy";
-                        if((mod & shift) != 0) return "Draw rectangle";
-                        if(context == Context.polygon) return "Copy enclosed items";
-                        return "Copy item";
-                }
-        }
-        
-        private static final String left_right(Context context, int mod, int other) {
-                switch(context) {
-                case widget: return null;
-                default:
-                        if((other & cursor) == 0 && (context != Context.polygon)) return "Extract attributes";
+                        if((other & cursor) == 0) return "Extract attributes";
+                        return null;
+                case polygon:
                 case background:
                         return "Auto format";
@@ -219 +227 @@
                 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(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) 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 += "\n Widget:  " + iw.getClass().getSimpleName();
+                if(l != null || m != null || r != null || lr != null || mr != null) status += " Click:";
+                status += (l != null ? command(mod, left) + l + padding.substring(l.length()) : emptyPadding);
+                status += (m != null ? command(mod, middle) + m + padding.substring(m.length()) : emptyPadding);
+                status += (r != null ? command(mod, right) + r + padding.substring(r.length()) : emptyPadding);
+                status += (lr != null ? command(mod, left | right) + lr + padding.substring(lr.length()) : emptyPadding);
+                status += (mr != null ? command(mod, middle | right) + mr + padding.substring(mr.length()) : emptyPadding);
+                if(iw != null) {
+                        status += "\n Widget:  " + iw.getClass().getSimpleName();
+                } else {
+                        if(dl != null || dm != null || dr != null) status += "\n Drag: ";
+                status += (dl != null ? command(mod, left) + dl + padding.substring(dl.length()) : emptyPadding);
+                status += (dm != null ? command(mod, middle) + dm + padding.substring(dm.length()) : emptyPadding);
+                status += (dr != null ? command(mod, right) + dr + padding.substring(dr.length()) : emptyPadding);
+                }