Changeset 8728 in josm for trunk

Timestamp:

2015-09-04T10:25:30+02:00 (9 years ago)

Author:

simon04

Message:

Layer dialog: make duplicate and merge only accessible in context menu to have more space for more frequently used buttons

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/LayerListDialog.java (modified) (4 diffs)
• layer/OsmDataLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -261 +261 @@
         opacityButton = new SideButton(layerOpacityAction, false);
 
-        // -- merge layer action
-        MergeAction mergeLayerAction = new MergeAction();
-        adaptTo(mergeLayerAction, model);
-        adaptTo(mergeLayerAction, selectionModel);
-
-        // -- duplicate layer action
-        DuplicateAction duplicateLayerAction = new DuplicateAction();
-        adaptTo(duplicateLayerAction, model);
-        adaptTo(duplicateLayerAction, selectionModel);
-
         // -- delete layer action
         DeleteLayerAction deleteLayerAction = new DeleteLayerAction();
@@ -292 +282 @@
         InputMapUtils.addSpacebarAction(layerList, showHideLayerAction);
 
-        createLayout(layerList, true, Arrays.asList(new SideButton[] {
+        createLayout(layerList, true, Arrays.asList(
                 new SideButton(moveUpAction, false),
                 new SideButton(moveDownAction, false),
@@ -298 +288 @@
                 new SideButton(showHideLayerAction, false),
                 opacityButton,
-                new SideButton(mergeLayerAction, false),
-                new SideButton(duplicateLayerAction, false),
                 new SideButton(deleteLayerAction, false)
-        }));
+        ));
 
         createVisibilityToggleShortcuts();
@@ -1646 +1634 @@
 
     /**
+     * Creates a {@link DuplicateAction} for <code>layer</code> in the
+     * context of this {@link LayerListDialog}.
+     *
+     * @param layer the layer
+     * @return the action
+     */
+    public DuplicateAction createDuplicateLayerAction(Layer layer) {
+        return new DuplicateAction(layer);
+    }
+
+    /**
      * Returns the layer at given index, or {@code null}.
      * @param index the index

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -521 +521 @@
                 SeparatorLayerAction.INSTANCE,
                 LayerListDialog.getInstance().createMergeLayerAction(this),
+                LayerListDialog.getInstance().createDuplicateLayerAction(this),
                 new LayerSaveAction(this),
                 new LayerSaveAsAction(this),