Changeset 7694 in josm for trunk

Timestamp:

2014-11-02T11:38:51+01:00 (10 years ago)

Author:

stoecker

Message:

image size fixes

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/HelpAction.java (modified) (1 diff)
• gui/IconToggleButton.java (modified) (1 diff)
• gui/MainMenu.java (modified) (1 diff)
• gui/io/RecentlyOpenedFilesMenu.java (modified) (1 diff)
• gui/mappaint/MapPaintMenu.java (modified) (1 diff)
• tools/ImageProvider.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/HelpAction.java

@@ -27 +27 @@
      */
     public HelpAction() {
-        super(tr("Help"), ImageProvider.get("help"));
+        super(tr("Help"));
+        new ImageProvider("help").getResource().getImageIcon(this);
         putValue("toolbar", "help");
         setEnabled(!Main.isOffline(OnlineResource.JOSM_WEBSITE));

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

@@ -158 +158 @@
     @Override
     public Icon getIcon() {
-        return (Icon) getSafeActionValue(Action.SMALL_ICON);
+        Object o = getSafeActionValue(Action.LARGE_ICON_KEY);
+        if (o == null)
+            o = getSafeActionValue(Action.SMALL_ICON);
+        return (Icon) o;
     }
 

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

@@ -604 +604 @@
         add(fileMenu, saveAs);
         sessionMenu.setToolTipText(tr("Save and load the current session (list of layers, etc.)"));
-        sessionMenu.setIcon(ImageProvider.get("session"));
+        sessionMenu.setIcon(new ImageProvider("session").setSize(ImageProvider.ImageSizes.MENU).get());
         sessionSaveAs = new SessionSaveAsAction();
         sessionLoad = new SessionLoadAction();

trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java

@@ -30 +30 @@
         super(tr("Open Recent"));
         setToolTipText(tr("List of recently opened files"));
-        setIcon(ImageProvider.get("openrecent.png"));
+        setIcon(new ImageProvider("openrecent").setSize(ImageProvider.ImageSizes.MENU).get());
         putClientProperty("help", ht("/Action/OpenRecent"));
 

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java

@@ -85 +85 @@
     public MapPaintMenu() {
         super(tr("Map Paint Styles"));
-        setIcon(ImageProvider.get("dialogs", "mapstyle"));
+        setIcon(new ImageProvider("dialogs", "mapstyle").setSize(ImageProvider.ImageSizes.MENU).get());
         MapPaintStyles.addMapPaintSylesUpdateListener(this);
         putClientProperty("help", ht("/Dialog/MapPaint"));

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -119 +119 @@
         /* MAP icon */
         MAP,
-        /* MAP icon maximum size*/
+        /* MAP icon maximum size */
         MAPMAX,
+        /* MENU icon size */
+        MENU,
     }
 
@@ -254 +256 @@
         case MAP: sizeval = Main.pref.getInteger("iconsize.mapmax", 16); break;
         case LARGEICON: sizeval = Main.pref.getInteger("iconsize.largeicon", 24); break;
+        case MENU: /* MENU is SMALLICON - only provided in case of future changes */ 
         case SMALLICON: sizeval = Main.pref.getInteger("iconsize.smallicon", 16); break;
         default: sizeval = Main.pref.getInteger("iconsize.default", 24); break;
@@ -949 +952 @@
      * @return an icon that represent the overlay of the two given icons. The second icon is layed
      * on the first relative to the given position.
-     */
+     * FIXME: This function does not fit into the ImageProvider concept as public function!
+     * Overlay should be handled like all the other functions only settings arguments and
+     * overlay must be transparent in the background.
+     * Also scaling is not cared about with current implementation.
+     */
+    @Deprecated
     public static ImageIcon overlay(Icon ground, Icon overlay, OverlayPosition pos) {
         int w = ground.getIconWidth();