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

Timestamp:

2016-06-24T10:16:10+02:00 (8 years ago)

Author:

stoecker

Message:

Don't use SideButton outside toggle dialogs, see #12994

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java

@@ -15 +15 @@
 
 import javax.swing.AbstractAction;
+import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
@@ -23 +24 @@
 
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
-import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -74 +74 @@
         JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
 
-        // -- query action
-        pnl.add(new SideButton(new QueryAction()));
-
-        // -- cancel action
-        pnl.add(new SideButton(new CancelAction()));
-
-        // -- help action
-        pnl.add(new SideButton(new ContextSensitiveHelpAction(HelpUtil.ht("/Dialog/ChangesetQuery"))));
+        pnl.add(new JButton(new QueryAction()));
+        pnl.add(new JButton(new CancelAction()));
+        pnl.add(new JButton(new ContextSensitiveHelpAction(HelpUtil.ht("/Dialog/ChangesetQuery"))));
 
         return pnl;
@@ -158 +153 @@
         QueryAction() {
             putValue(NAME, tr("Query"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "search"));
+            new ImageProvider("dialogs", "search").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Query and download changesets"));
         }
@@ -206 +201 @@
         CancelAction() {
             putValue(NAME, tr("Cancel"));
-            putValue(SMALL_ICON, ImageProvider.get("cancel"));
+            new ImageProvider("cancel").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Close the dialog and abort querying of changesets"));
         }