Changeset 5030 in josm for trunk


Ignore:
Timestamp:
2012-02-29T09:44:59+01:00 (8 years ago)
Author:
jttt
Message:

Fix #7462 No action definded for buttons (becauase of r5028)

Location:
trunk/src/org/openstreetmap/josm/gui/dialogs
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

    r5028 r5030  
    251251        LayerOpacityAction layerOpacityAction = new LayerOpacityAction();
    252252        adaptTo(layerOpacityAction, selectionModel);
    253         opacityButton = new SideButton(layerOpacityAction);
     253        opacityButton = new SideButton(layerOpacityAction, false);
    254254
    255255        // -- merge layer action
     
    269269
    270270        createLayout(layerList, true, Arrays.asList(new SideButton[] {
    271                 new SideButton(moveUpAction),
    272                 new SideButton(moveDownAction),
    273                 new SideButton(activateLayerAction),
    274                 new SideButton(showHideLayerAction),
     271                new SideButton(moveUpAction, false),
     272                new SideButton(moveDownAction, false),
     273                new SideButton(activateLayerAction, false),
     274                new SideButton(showHideLayerAction, false),
    275275                opacityButton,
    276                 new SideButton(mergeLayerAction),
    277                 new SideButton(duplicateLayerAction),
     276                new SideButton(mergeLayerAction, false),
     277                new SideButton(duplicateLayerAction, false),
    278278                new SideButton(deleteLayerAction, false)
    279279        }));
  • trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

    r4982 r5030  
    8686    public MapPaintDialog() {
    8787        super(tr("Map Paint Styles"), "mapstyle", tr("configure the map painting style"),
    88             Shortcut.registerShortcut("subwindow:mappaint", tr("Toggle: {0}", tr("MapPaint")),
    89             KeyEvent.VK_M, Shortcut.ALT_SHIFT), 150);
     88                Shortcut.registerShortcut("subwindow:mappaint", tr("Toggle: {0}", tr("MapPaint")),
     89                        KeyEvent.VK_M, Shortcut.ALT_SHIFT), 150);
    9090        build();
    9191    }
     
    144144
    145145        createLayout(p, true, Arrays.asList(new SideButton[] {
    146                 new SideButton(onoffAction),
    147                 new SideButton(upAction),
    148                 new SideButton(downAction),
    149                 new SideButton(new LaunchMapPaintPreferencesAction())
     146                new SideButton(onoffAction, false),
     147                new SideButton(upAction, false),
     148                new SideButton(downAction, false),
     149                new SideButton(new LaunchMapPaintPreferencesAction(), false)
    150150        }));
    151151    }
     
    296296    protected class OnOffAction extends AbstractAction implements ListSelectionListener {
    297297        public OnOffAction() {
     298            putValue(NAME, tr("On/Off"));
    298299            putValue(SHORT_DESCRIPTION, tr("Turn selected styles on or off"));
    299300            putValue(SMALL_ICON, ImageProvider.get("apply"));
     
    330331        public MoveUpDownAction(boolean isDown) {
    331332            increment = isDown ? 1 : -1;
     333            putValue(NAME, isDown?tr("Down"):tr("Up"));
    332334            putValue(SMALL_ICON, isDown ? ImageProvider.get("dialogs", "down") : ImageProvider.get("dialogs", "up"));
    333335            putValue(SHORT_DESCRIPTION, isDown ? tr("Move the selected entry one row down.") : tr("Move the selected entry one row up."));
     
    362364    static class LaunchMapPaintPreferencesAction extends AbstractAction {
    363365        public LaunchMapPaintPreferencesAction() {
     366            putValue(NAME, tr("Preferences"));
    364367            putValue(SMALL_ICON, ImageProvider.get("dialogs", "mappaintpreference"));
    365368        }
  • trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

    r5028 r5030  
    766766                } else {
    767767                    System.err.println("Button " + button + " doesn't have action defined");
     768                    new Exception().printStackTrace();
    768769                }
    769770            }
Note: See TracChangeset for help on using the changeset viewer.