Changeset 10481 in josm for trunk/src/org/openstreetmap/josm/gui/history

Timestamp:

2016-06-24T21:28:15+02:00 (8 years ago)

Author:

stoecker

Message:

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

File:

• trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java

@@ -14 +14 @@
 
 import javax.swing.AbstractAction;
+import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
@@ -25 +26 @@
 import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
 import org.openstreetmap.josm.data.osm.history.HistoryDataSetListener;
-import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -101 +101 @@
         JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
 
-        SideButton btn = new SideButton(new ReloadAction());
+        JButton btn = new JButton(new ReloadAction());
         btn.setName("btn.reload");
         pnl.add(btn);
 
-        btn = new SideButton(closeAction);
+        btn = new JButton(closeAction);
         final String closeHistoryBrowserDialogKey = "CloseHistoryBrowserDialog";
         KeyStroke escapeKey = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0, false);
@@ -113 +113 @@
         pnl.add(btn);
 
-        btn = new SideButton(new ContextSensitiveHelpAction(ht("/Action/ObjectHistory")));
+        btn = new JButton(new ContextSensitiveHelpAction(ht("/Action/ObjectHistory")));
         btn.setName("btn.help");
         pnl.add(btn);
@@ -159 +159 @@
             putValue(NAME, tr("Close"));
             putValue(SHORT_DESCRIPTION, tr("Close the dialog"));
-            putValue(SMALL_ICON, ImageProvider.get("ok"));
+            new ImageProvider("ok").getResource().attachImageIcon(this);
         }
 
@@ -178 +178 @@
             putValue(NAME, tr("Reload"));
             putValue(SHORT_DESCRIPTION, tr("Reload the history from the server"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh"));
+            new ImageProvider("dialogs", "refresh").getResource().attachImageIcon(this);
         }