Changeset 10481 in josm


Ignore:
Timestamp:
2016-06-24T21:28:15+02:00 (3 years ago)
Author:
stoecker
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java

    r10035 r10481  
    1414
    1515import javax.swing.AbstractAction;
     16import javax.swing.JButton;
    1617import javax.swing.JComponent;
    1718import javax.swing.JDialog;
     
    2526import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
    2627import org.openstreetmap.josm.data.osm.history.HistoryDataSetListener;
    27 import org.openstreetmap.josm.gui.SideButton;
    2828import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
    2929import org.openstreetmap.josm.gui.help.HelpUtil;
     
    101101        JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
    102102
    103         SideButton btn = new SideButton(new ReloadAction());
     103        JButton btn = new JButton(new ReloadAction());
    104104        btn.setName("btn.reload");
    105105        pnl.add(btn);
    106106
    107         btn = new SideButton(closeAction);
     107        btn = new JButton(closeAction);
    108108        final String closeHistoryBrowserDialogKey = "CloseHistoryBrowserDialog";
    109109        KeyStroke escapeKey = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0, false);
     
    113113        pnl.add(btn);
    114114
    115         btn = new SideButton(new ContextSensitiveHelpAction(ht("/Action/ObjectHistory")));
     115        btn = new JButton(new ContextSensitiveHelpAction(ht("/Action/ObjectHistory")));
    116116        btn.setName("btn.help");
    117117        pnl.add(btn);
     
    159159            putValue(NAME, tr("Close"));
    160160            putValue(SHORT_DESCRIPTION, tr("Close the dialog"));
    161             putValue(SMALL_ICON, ImageProvider.get("ok"));
     161            new ImageProvider("ok").getResource().attachImageIcon(this);
    162162        }
    163163
     
    178178            putValue(NAME, tr("Reload"));
    179179            putValue(SHORT_DESCRIPTION, tr("Reload the history from the server"));
    180             putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh"));
     180            new ImageProvider("dialogs", "refresh").getResource().attachImageIcon(this);
    181181        }
    182182
Note: See TracChangeset for help on using the changeset viewer.