Changeset 2302 in josm for trunk

Timestamp:

2009-10-24T07:40:15+02:00 (15 years ago)

Author:

Gubaer

Message:

applied #3760: patch by smsm1: Preset menu tooltips just get in the way

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• preferences/ToolbarPreferences.java (modified) (2 diffs)
• tagging/TaggingPreset.java (modified) (2 diffs)
• tagging/TaggingPresetMenu.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -51 +51 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -493 +494 @@
             if (s.equals("|"))
                 control.addSeparator();
-            else
-                control.add(getAction(s));
+            else {
+                Action a = getAction(s);
+                JButton b = control.add(a);
+                String tt = (String) a.getValue(TaggingPreset.OPTIONAL_TOOLTIP_TEXT);
+                if (tt != null) {
+                    b.setToolTipText(tt);
+                }
+            }
         }
         control.setVisible(control.getComponentCount() != 0);

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -71 +71 @@
     public String name_context;
     public String locale_name;
+    public final static String OPTIONAL_TOOLTIP_TEXT = "Optional tooltip text";
 
     public static abstract class Item {
@@ -518 +519 @@
         putValue(Action.NAME, getName());
         putValue("toolbar", "tagging_" + getRawName());
-        putValue(SHORT_DESCRIPTION, (group != null ?
-                tr("Use preset ''{0}'' of group ''{1}''", getLocaleName(), group.getName()) :
-                    tr("Use preset ''{0}''", getLocaleName())));
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java

@@ -21 +21 @@
     public void setDisplayName() {
         putValue(Action.NAME, getName());
-        putValue(SHORT_DESCRIPTION, (group != null ?
-                tr("Preset group ''{0}'' of group ''{1}''", getLocaleName(), group.getName()) :
-                    tr("Preset group ''{0}''", getLocaleName())));
+        /** Tooltips should be shown for the toolbar buttons, but not in the menu. */
+        putValue(OPTIONAL_TOOLTIP_TEXT, (group != null ?
+                tr("Preset group {1} / {0}", getLocaleName(), group.getName()) :
+                    tr("Preset group {0}", getLocaleName())));
         putValue("toolbar", "tagginggroup_" + getRawName());
     }