Changeset 678

Timestamp:

01/10/14 14:51:04 (10 years ago)

Author:

jts21

Message:

Add help for click+drag commands, and make the status go onto 2 lines if necessary

Location:

trunk/src/org/expeditee/gui

Files:

• Help.java (modified) (6 diffs)
• MessageBay.java (modified) (2 diffs)

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

@@ -17 +17 @@
         
         // modifiers
-        public static final int none = 0, control = 1, shift = 2, drag = 4;
+        public static final int none = 0, control = 1, shift = 2, drag = 4; // TODO: add mod for click+hold ???
         private static final String[] modifiers = { "", "^", "+", "^+", "d", "d^", "d+", "d^+" };
         
@@ -82 +82 @@
         }
         
+        private static final void fill(String[] array, int indexBit, String value, boolean invert) {
+                for(int i = 0; i < array.length; i++) {
+                        
+                }
+        }
+        
         private static final void fill(String[][] array, int[] indices, String value, boolean invert) {
                 if(invert) {
@@ -119 +125 @@
                 fill(statusText[background][left], "Go back");
                 fill(statusText[background][left], new int[] { control, control | shift, shift }, "Go forward", false);
+                fill(statusText[background][left], new int[] { drag, control | drag, shift | drag, control | shift | drag }, null, false); // no action for dragging unless shift down
                 fill(statusText[background][left], new int[] { control | shift | drag, shift | drag }, new int[] { panning, panning | action }, "Drag to pan", false, false);
                 fill(statusText[background][middle], "Create arrow");
+                fill(statusText[background][middle], new int[] { drag, control | drag, shift | drag, control | shift | drag }, null, false); // no action for dragging
                 fill(statusText[background][right], "Create rectangle");
-                fill(statusText[background][left | middle], "");
+                fill(statusText[background][right], new int[] { drag, control | drag, shift | drag, control | shift | drag }, null, false); // no action for dragging
+                fill(statusText[background][left | middle], null);
                 fill(statusText[background][left | right], "Auto format");
                 fill(statusText[background][middle | right], "Undo");
@@ -128 +137 @@
         fill(statusText[item][left], "Follow link");
         fill(statusText[item][left], new int[] { control, control | shift }, new int[] { action, panning | action }, "Run action", true, false);
+        fill(statusText[item][left], new int[] { drag, control | drag, shift | drag, control | shift | drag }, null, false); // no action for dragging
         fill(statusText[item][middle], "Pickup");
+        fill(statusText[item][middle], new int[] { drag, control | drag, shift | drag, control | shift | drag }, null, false); // no action for dragging
         fill(statusText[item][right], "Copy");
-        fill(statusText[item][left | middle], "");
+        fill(statusText[item][right], new int[] { drag, control | drag, shift | drag, control | shift | drag }, null, false); // no action for dragging
+        fill(statusText[item][left | middle], null); // no action for left + middle
                 fill(statusText[item][left | right], "Extract attributes");
                 fill(statusText[item][middle | right], "Delete");
@@ -136 +148 @@
         
         private static final String commandPadding = "     ";
-        private static final String padding = "                         ";
+        private static final String padding = "                  ";
         
         private static final String command(int mod, int button) {
@@ -148 +160 @@
                 int mod = (FrameMouseActions.isControlDown() ? control : 0) | (FrameMouseActions.isShiftDown() ? shift : 0);
                 int other = (ExperimentalFeatures.MousePan.get() ? panning : 0) | (current != null ? current.hasAction() ? action : 0 : 0);
-                String l = command(mod, left) + statusText[context][left][mod][other];
-                String m = command(mod, middle) + statusText[context][middle][mod][other];
-                String r = command(mod, right) + statusText[context][right][mod][other];
-                // String lm = command(mod, left | middle) + helpText[context][left | middle][mod][other];
-                String lr = command(mod, left | right) + statusText[context][left | right][mod][other];
-                String mr = command(mod, middle | right) + statusText[context][middle | right][mod][other];
-                MessageBay.setStatus(l + padding.substring(l.length()) +
-                                             m + padding.substring(m.length()) +
-                                             r + padding.substring(r.length()) +
-                                             // lm + padding.substring(lm.length()) +
-                                             lr + padding.substring(lr.length()) +
-                                             mr + padding.substring(mr.length()));
+                String status = "";
+                
+                String l = statusText[context][left][mod][other];
+                String m = statusText[context][middle][mod][other];
+                String r = statusText[context][right][mod][other];
+                String lr = statusText[context][left | right][mod][other];
+                String lm = statusText[context][left | middle][mod][other];
+                String mr = statusText[context][middle | right][mod][other];
+                String dl = statusText[context][left][mod | drag][other];
+                String dm = statusText[context][middle][mod | drag][other];
+                String dr = statusText[context][right][mod | drag][other];
+                
+                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) status += "\n";
+                if(dl != null) status += command(mod | drag, left) + dl + padding.substring(dl.length());
+                if(dm != null) status += command(mod | drag, left) + dm + padding.substring(dm.length());
+                if(dr != null) status += command(mod | drag, left) + dr + padding.substring(dr.length());
+                
+                MessageBay.setStatus(status);
         }
 

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

@@ -25 +25 @@
 
 
-        public static final int MESSAGE_BUFFER_HEIGHT = 100;
+        public static final int MESSAGE_BUFFER_HEIGHT = 105;
 
         private static final int MESSAGE_LINK_Y_OFFSET = 100;
@@ -453 +453 @@
                 if (_status == null) {
                         _status = new Text(status);
-                        _status.setPosition(0, 90);
+                        _status.setPosition(0, 85);
                         _status.setOffset(0, FrameGraphics.getMaxFrameSize().height);
                         _status.setLink(null); // maybe link to a help frame?