Changeset 6130 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2013-08-10T12:06:25+02:00 (13 years ago)

Author:

bastiK

Message:

see #6963 - converted popups to notifications for all actions in the Tools menu (TODO: Simplify Way)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainMenu.java (modified) (3 diffs)
• Notification.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -175 +175 @@
     public final JosmAction combineWay = new CombineWayAction();
     public final JosmAction reverseWay = new ReverseWayAction();
+    public final JosmAction simplifyWay = new SimplifyWayAction();
     public final JosmAction alignInCircle = new AlignInCircleAction();
     public final JosmAction alignInLine = new AlignInLineAction();
@@ -181 +182 @@
     public final JosmAction orthoUndo = new Undo();  // action is not shown in the menu. Only triggered by shortcut
     public final JosmAction mirror = new MirrorAction();
+    public final JosmAction followLine = new FollowLineAction();
     public final AddNodeAction addnode = new AddNodeAction();
     public final MoveNodeAction movenode = new MoveNodeAction();
@@ -187 +189 @@
     public final JosmAction joinNodeWay = new JoinNodeWayAction();
     public final JosmAction unglueNodes = new UnGlueAction();
-    public final JosmAction simplifyWay = new SimplifyWayAction();
     public final JosmAction joinAreas = new JoinAreasAction();
     public final JosmAction createMultipolygon = new CreateMultipolygonAction();
-    public final JosmAction followLine = new FollowLineAction();
 
     /* Audio menu */

trunk/src/org/openstreetmap/josm/gui/Notification.java

@@ -7 +7 @@
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
+
+import org.openstreetmap.josm.Main;
 
 /**
@@ -28 +30 @@
 
     public final static int DEFAULT_CONTENT_WIDTH = 350;
+
+    // some standard duration values (in milliseconds)
+
+    /**
+     * Very short and very easy to grasp message (3 s).
+     * E.g. "Please select at least one node".
+     */
+    public final static int TIME_SHORT = Main.pref.getInteger("notification-time-short-ms", 3000);
+    /**
+     * Short message of one or two lines (5 s).
+     */
+    public final static int TIME_DEFAULT = Main.pref.getInteger("notification-time-default-ms", 5000);
+    /**
+     * Somewhat longer message (10 s).
+     */
+    public final static int TIME_LONG = Main.pref.getInteger("notification-time-long-ms", 10000);
+    /**
+     * Long text.
+     * (Make sure is still sensible to show as a notification)
+     */
+    public final static int TIME_VERY_LONG = Main.pref.getInteger("notification-time-very_long-ms", 20000);
 
     private Icon icon;