Changeset 10355 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-06-11T23:42:19+02:00 (8 years ago)

Author:

stoecker

Message:

don't use SideButton outside side panel

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (modified) (5 diffs)

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

@@ -21 +21 @@
 import javax.swing.JCheckBox;
 import javax.swing.JComponent;
+import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JPanel;
@@ -26 +27 @@
 
 import org.openstreetmap.josm.actions.ExpertToggleAction;
-import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -67 +67 @@
         JPanel btns = new JPanel(new FlowLayout(FlowLayout.CENTER));
         btns.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        btns.add(new SideButton(new OKAction()));
-        btns.add(new SideButton(new CancelAction()));
-        btns.add(new SideButton(new ContextSensitiveHelpAction(HelpUtil.ht("/Action/Preferences"))));
+        btns.add(new JButton(new OKAction()));
+        btns.add(new JButton(new CancelAction()));
+        btns.add(new JButton(new ContextSensitiveHelpAction(HelpUtil.ht("/Action/Preferences"))));
         pnl.add(expert, GBC.std().insets(5, 0, 0, 0));
         pnl.add(btns, GBC.std().fill(GBC.HORIZONTAL));
@@ -157 +157 @@
         CancelAction() {
             putValue(NAME, tr("Cancel"));
-            putValue(SMALL_ICON, ImageProvider.get("cancel"));
+            new ImageProvider("cancel").getResource().getImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Close the preferences dialog and discard preference updates"));
         }
@@ -176 +176 @@
         OKAction() {
             putValue(NAME, tr("OK"));
-            putValue(SMALL_ICON, ImageProvider.get("ok"));
+            new ImageProvider("ok").getResource().getImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Save the preferences and close the dialog"));
         }