Changeset 13842 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2018-05-26T17:11:30+02:00 (7 years ago)

Author:

Don-vip

Message:

see #16319 - scale properly all icons using ButtonSpec

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AbstractInfoAction.java (modified) (2 diffs)
• MergeNodesAction.java (modified) (1 diff)
• RestartAction.java (modified) (3 diffs)
• SimplifyWayAction.java (modified) (1 diff)
• downloadtasks/DownloadTaskList.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java ¶

@@ -75 +75 @@
                 new ButtonSpec(
                         tr("Continue"),
-                        ImageProvider.get("ok"),
+                        new ImageProvider("ok"),
                         trn("Click to continue and to open {0} browser", "Click to continue and to open {0} browsers",
                                 numBrowsers, numBrowsers),
@@ -82 +82 @@
                 new ButtonSpec(
                         tr("Cancel"),
-                        ImageProvider.get("cancel"),
+                        new ImageProvider("cancel"),
                         tr("Click to abort launching external browsers"),
                         null // no specific help topic

trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java ¶

@@ -222 +222 @@
                             new ButtonSpec(
                                     tr("Abort Merging"),
-                                    ImageProvider.get("cancel"),
+                                    new ImageProvider("cancel"),
                                     tr("Click to abort merging nodes"),
                                     null /* no special help topic */

trunk/src/org/openstreetmap/josm/actions/RestartAction.java ¶

@@ -22 +22 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -205 +206 @@
         return new ButtonSpec(
                 tr("Restart"),
-                ImageProvider.get("restart"),
+                new ImageProvider("restart").setSize(ImageSizes.LARGEICON).get(),
                 tr("Restart the application."),
                 ht("/Action/Restart"),
@@ -219 +220 @@
         return new ButtonSpec(
                 tr("Cancel"),
-                ImageProvider.get("cancel"),
+                new ImageProvider("cancel"),
                 tr("Click to restart later."),
                 null /* no specific help context */

trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java ¶

@@ -72 +72 @@
                 new ButtonSpec(
                         tr("Yes"),
-                        ImageProvider.get("ok"),
+                        new ImageProvider("ok"),
                         tr("Simplify all selected ways"),
-                        null
-                        ),
-                        new ButtonSpec(
-                                tr("Cancel"),
-                                ImageProvider.get("cancel"),
-                                tr("Cancel operation"),
-                                null
-                                )
+                        null),
+                new ButtonSpec(
+                        tr("Cancel"),
+                        new ImageProvider("cancel"),
+                        tr("Cancel operation"),
+                        null)
         };
         return 0 == HelpAwareOptionPane.showOptionDialog(
                 Main.parent,
-                tr(
-                        "The selection contains {0} ways. Are you sure you want to simplify them all?",
-                        numWays
-                        ),
-                        tr("Simplify ways?"),
-                        JOptionPane.WARNING_MESSAGE,
-                        null, // no special icon
-                        options,
-                        options[0],
-                        ht("/Action/SimplifyWay#ConfirmSimplifyAll")
+                tr("The selection contains {0} ways. Are you sure you want to simplify them all?", numWays),
+                tr("Simplify ways?"),
+                JOptionPane.WARNING_MESSAGE,
+                null, // no special icon
+                options,
+                options[0],
+                ht("/Action/SimplifyWay#ConfirmSimplifyAll")
                 );
     }

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java ¶

@@ -164 +164 @@
                 new ButtonSpec(
                         tr("Check on the server"),
-                        ImageProvider.get("ok"),
+                        new ImageProvider("ok"),
                         tr("Click to check whether objects in your local dataset are deleted on the server"),
-                        null  /* no specific help topic */
-                        ),
-                        new ButtonSpec(
-                                tr("Ignore"),
-                                ImageProvider.get("cancel"),
-                                tr("Click to abort and to resume editing"),
-                                null /* no specific help topic */
-                                ),
+                        null /* no specific help topic */),
+                new ButtonSpec(
+                        tr("Ignore"),
+                        new ImageProvider("cancel"),
+                        tr("Click to abort and to resume editing"),
+                        null /* no specific help topic */),
         };