Changeset 684

Timestamp:

01/13/14 10:38:41 (10 years ago)

Author:

jts21

Message:

Add help text for Text items

File:

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

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

@@ -1 +1 @@
 package org.expeditee.gui;
-
-import java.util.Arrays;
 
 import org.expeditee.items.Item;
 import org.expeditee.items.Line;
+import org.expeditee.items.Text;
 import org.expeditee.settings.experimental.ExperimentalFeatures;
 
@@ -46 +45 @@
                 if((mod & (control | shift)) != 0) return "Go forward";
                 return "Go back";
-                case line:
-                case item:
+                default:
                         if((other & action) != 0 && (mod & control) == 0) return "Run action";
                         return "Follow link";
                 }
-                return null;
         }
         
@@ -61 +58 @@
                 case line:
                         if((mod & shift) != 0) return "Extend shape";
-                case item:
+                case text:
+                        if((other & cursor) != 0 && FrameUtils.getCurrentItem() instanceof Text) return "Merge text";
+                default:
                         if((other & cursor) != 0) return "Place item(s)";
                 if((mod & shift) != 0) return "Create arrow";
                         return "Pickup";
                 }
-                return null;
         }
         
@@ -76 +74 @@
                 case line:
                         if((mod & shift) != 0) return "Add line";
-                case item:
+                default:
                         if((other & cursor) != 0) return "Stamp item(s)";
                         if((mod & shift) != 0) return "Create rectangle";
                         return "Copy";
                 }
-                return null;
         }
         
@@ -90 +87 @@
         private static final String left_right(int context, int mod, int other) {
                 switch(context) {
-                case line:
-                case item:
+                default:
                         if((other & cursor) == 0) return "Extract attributes";
                 case background:
                         return "Auto format";
                 }
-                return null;
         }
         
         private static final String middle_right(int context, int mod, int other) {
                 switch(context) {
+                case text:
+                        if((other & cursor) != 0 && FrameUtils.getCurrentItem() instanceof Text) return "Swap text";
                 case background:
                         if((other & cursor) == 0) return "Undo";
-                case line:
-                case item:
+                default:
                         return "Delete";
                 }
-                return null;
         }
         
@@ -114 +109 @@
                 case background:
                 if((mod & shift) != 0 && (other & cursor) == 0) return "Drag to pan";
+                case text:
+                        if((other & cursor) == 0) return "Select region";
                 }
                 return null;
@@ -119 +116 @@
         
         private static final String drag_middle(int context, int mod, int other) {
+                switch(context) {
+                case text:
+                        if((other & cursor) == 0) return "Cut region";
+                }
                 return null;
         }
@@ -126 +127 @@
                 case line:
                         return "Extrude shape";
+                case text:
+                        if((other & cursor) == 0) return "Copy region";
                 }
                 return null;
@@ -137 +140 @@
                         if(current instanceof Line) {
                                 context = line;
+                        } else if(current instanceof Text) {
+                                context = text;
                         } else {
                                 context = item;