Changeset 17060 in josm for trunk

Timestamp:

2020-09-25T16:40:59+02:00 (4 years ago)

Author:

Klumbumbus

Message:

Add button icons in preferences

Location:

trunk/src/org/openstreetmap/josm/gui/preferences

Files:

• display/ColorPreference.java (modified) (5 diffs)
• imagery/ImageryPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

@@ -60 +60 @@
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.I18n;
 
@@ -264 +265 @@
         setColors(Preferences.main().getAllNamedColors());
 
-        colorEdit = new JButton(tr("Choose"));
+        colorEdit = new JButton(tr("Choose"), ImageProvider.get("colorchooser", ImageProvider.ImageSizes.SMALLICON));
         colorEdit.addActionListener(e -> {
             int sel = colors.getSelectedRow();
@@ -278 +279 @@
             }
         });
-        defaultSet = new JButton(tr("Reset to default"));
+        defaultSet = new JButton(tr("Reset to default"), ImageProvider.get("undo", ImageProvider.ImageSizes.SMALLICON));
         defaultSet.addActionListener(e -> {
             int sel = colors.getSelectedRow();
@@ -287 +288 @@
             }
         });
-        JButton defaultAll = new JButton(tr("Set all to default"));
+        JButton defaultAll = new JButton(tr("Set all to default"), ImageProvider.get("undo", ImageProvider.ImageSizes.SMALLICON));
         defaultAll.addActionListener(e -> {
             List<ColorEntry> data = tableModel.getData();
@@ -298 +299 @@
             tableModel.fireTableDataChanged();
         });
-        remove = new JButton(tr("Remove"));
+        remove = new JButton(tr("Remove"), ImageProvider.get("dialogs/delete", ImageProvider.ImageSizes.SMALLICON));
         remove.addActionListener(e -> {
             int sel = colors.getSelectedRow();

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -43 +43 @@
 import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -213 +214 @@
             JPanel buttonPanel = new JPanel(new FlowLayout());
 
-            JButton add = new JButton(tr("Add"));
+            JButton add = new JButton(tr("Add"), ImageProvider.get("dialogs/add", ImageProvider.ImageSizes.SMALLICON));
             buttonPanel.add(add, GBC.std().insets(0, 5, 0, 0));
             add.addActionListener(e -> model.addRow(new OffsetBookmark(ProjectionRegistry.getProjection().toCode(), "", "", "", 0, 0)));
 
-            JButton delete = new JButton(tr("Delete"));
+            JButton delete = new JButton(tr("Delete"), ImageProvider.get("dialogs/delete", ImageProvider.ImageSizes.SMALLICON));
             buttonPanel.add(delete, GBC.std().insets(0, 5, 0, 0));
             delete.addActionListener(e -> {