Changeset 10479 in josm


Ignore:
Timestamp:
2016-06-24T10:16:10+02:00 (5 years ago)
Author:
stoecker
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java

    r10179 r10479  
    1515
    1616import javax.swing.AbstractAction;
     17import javax.swing.JButton;
    1718import javax.swing.JComponent;
    1819import javax.swing.JDialog;
     
    2324
    2425import org.openstreetmap.josm.gui.HelpAwareOptionPane;
    25 import org.openstreetmap.josm.gui.SideButton;
    2626import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
    2727import org.openstreetmap.josm.gui.help.HelpUtil;
     
    7474        JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
    7575
    76         // -- query action
    77         pnl.add(new SideButton(new QueryAction()));
    78 
    79         // -- cancel action
    80         pnl.add(new SideButton(new CancelAction()));
    81 
    82         // -- help action
    83         pnl.add(new SideButton(new ContextSensitiveHelpAction(HelpUtil.ht("/Dialog/ChangesetQuery"))));
     76        pnl.add(new JButton(new QueryAction()));
     77        pnl.add(new JButton(new CancelAction()));
     78        pnl.add(new JButton(new ContextSensitiveHelpAction(HelpUtil.ht("/Dialog/ChangesetQuery"))));
    8479
    8580        return pnl;
     
    158153        QueryAction() {
    159154            putValue(NAME, tr("Query"));
    160             putValue(SMALL_ICON, ImageProvider.get("dialogs", "search"));
     155            new ImageProvider("dialogs", "search").getResource().attachImageIcon(this);
    161156            putValue(SHORT_DESCRIPTION, tr("Query and download changesets"));
    162157        }
     
    206201        CancelAction() {
    207202            putValue(NAME, tr("Cancel"));
    208             putValue(SMALL_ICON, ImageProvider.get("cancel"));
     203            new ImageProvider("cancel").getResource().attachImageIcon(this);
    209204            putValue(SHORT_DESCRIPTION, tr("Close the dialog and abort querying of changesets"));
    210205        }
Note: See TracChangeset for help on using the changeset viewer.