Changeset 681

Timestamp:

01/10/14 17:18:08 (10 years ago)

Author:

jts21

Message:

Add correct status messages for cases where there are items on the cursor

Location:

trunk/src/org/expeditee/gui

Files:

• FrameMouseActions.java (modified) (3 diffs)
• Help.java (modified) (6 diffs)

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

@@ -870 +870 @@
 
                 }
+                Help.updateStatus();
         }
 
@@ -1182 +1183 @@
                 }
                 SessionStats.MovedItems(FreeItems.getInstance());
+                
+                Help.updateStatus();
         }
 
@@ -1587 +1590 @@
                 getInstance().refreshHighlights();
                 SessionStats.CopiedItems(copies);
+                Help.updateStatus();
                 updateCursor();
                 FrameGraphics.Repaint();

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

@@ -4 +4 @@
 
 import org.expeditee.items.Item;
+import org.expeditee.items.Line;
 import org.expeditee.settings.experimental.ExperimentalFeatures;
 
@@ -17 +18 @@
         
         // modifiers
-        public static final int none = 0, control = 1, shift = 2, drag = 4, hold = 8;
+        public static final int none = 0, control = 1, shift = 2, drag = 4;
         private static final String[] modifiers = { "", "^", "+", "^+", "d", "d^", "d+", "d^+" };
         
         // other
-        public static final int panning = 1, action = 2;
+        public static final int panning = 1, action = 2, line = 4, cursor = 8;
         
         // separator between command and description
@@ -105 +106 @@
         
         // help text
-        private static final String[/* contexts */][/* buttons */][/* modifiers */][/* other */] statusText = new String[2][8][8][4];
+        private static final String[/* contexts */][/* buttons */][/* modifiers */][/* other */] statusText = new String[2][8][8][16];
         static {
                 fill(statusText[background][left], "Go back");
@@ -111 +112 @@
                 fill(statusText[background][left], drag, null); // no action for dragging unless shift down
                 fill(statusText[background][left], shift | drag, panning, "Drag to pan");
+                fill(statusText[background][left], drag, cursor, null);
+                
                 fill(statusText[background][middle], "Create arrow");
+                fill(statusText[background][middle], 0, cursor, "Place item(s)", true, false, true, false);
                 fill(statusText[background][middle], drag, null); // no action for dragging
+                
                 fill(statusText[background][right], "Create rectangle");
+                fill(statusText[background][right], 0, cursor, "Stamp item(s)", true, false, true, false);
                 fill(statusText[background][right], drag, null); // no action for dragging
+                
                 fill(statusText[background][left | middle], null); // no action for left + middle
+                
                 fill(statusText[background][left | right], "Auto format");
+                
                 fill(statusText[background][middle | right], "Undo");
+                fill(statusText[background][middle | right], 0, cursor, "Delete", true, false, true, false);
         
+                
         fill(statusText[item][left], "Follow link");
         fill(statusText[item][left], control, action, "Run action", true, false, false, false);
         fill(statusText[item][left], drag, null); // no action for dragging
+        
         fill(statusText[item][middle], "Pickup");
+        fill(statusText[item][middle], shift, "Create arrow");
+        fill(statusText[item][middle], 0, cursor, "Place item(s)", true, false, true, false);
         fill(statusText[item][middle], drag, null); // no action for dragging
+        
         fill(statusText[item][right], "Copy");
-        fill(statusText[item][right], drag, null); // no action for dragging
+        fill(statusText[item][right], shift, "Create rectangle");
+        fill(statusText[item][right], 0, cursor, "Stamp item(s)", true, false, true, false);
+        fill(statusText[item][right], drag, null); // no action for dragging unless currentItem is a line
+        fill(statusText[item][right], drag, line, "Extrude shape");
+        
         fill(statusText[item][left | middle], null); // no action for left + middle
+        
                 fill(statusText[item][left | right], "Extract attributes");
+                fill(statusText[item][left | right], 0, cursor, null, true, false, true, false);
+                
                 fill(statusText[item][middle | right], "Delete");
         }
@@ -141 +163 @@
         public static void updateStatus() {
                 Item current = FrameUtils.getCurrentItem();
-                int context = current != null ? item : 0;
+                int context = current != null || FrameUtils.getCurrentItems() != null ? item : background;
                 int mod = (FrameMouseActions.isControlDown() ? control : 0) | (FrameMouseActions.isShiftDown() ? shift : 0);
-                int other = (ExperimentalFeatures.MousePan.get() ? panning : 0) | (current != null ? current.hasAction() ? action : 0 : 0);
+                int other = (ExperimentalFeatures.MousePan.get() ? panning : 0) | (current != null && current.hasAction() ? action : 0) | (current instanceof Line ? line : 0) | (FreeItems.itemsAttachedToCursor() ? cursor : 0);
                 String status = "";
                 
@@ -164 +186 @@
                 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());
+                if(dm != null) status += command(mod | drag, middle) + dm + padding.substring(dm.length());
+                if(dr != null) status += command(mod | drag, right) + dr + padding.substring(dr.length());
                 
                 MessageBay.setStatus(status);