Changeset 5028 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

Timestamp:

2012-02-28T11:29:30+01:00 (14 years ago)

Author:

jttt

Message:

Add possibility to hide side buttons in toggle dialogs permanently, show actions from buttons in popup menu

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) (10 diffs)

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

@@ -118 +118 @@
     ActivateLayerAction activateLayerAction;
     ShowHideLayerAction showHideLayerAction;
-    
+
     //TODO This duplicates ShowHide actions functionality
     /** stores which layer index to toggle and executes the ShowHide action if the layer is present */
@@ -160 +160 @@
         super(tr("Layers"), "layerlist", tr("Open a list of all loaded layers."),
                 Shortcut.registerShortcut("subwindow:layers", tr("Toggle: {0}", tr("Layers")), KeyEvent.VK_L,
-                Shortcut.ALT_SHIFT), 100, true);
+                        Shortcut.ALT_SHIFT), 100, true);
 
         // create the models
@@ -240 +240 @@
         MultikeyActionsHandler.getInstance().addAction(activateLayerAction);
         adaptTo(activateLayerAction, selectionModel);
-    
+
         JumpToMarkerActions.initialize();
 
@@ -445 +445 @@
          */
         public ShowHideLayerAction(boolean init) {
+            putValue(NAME, tr("Show/hide"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "showhide"));
             putValue(SHORT_DESCRIPTION, tr("Toggle visible state of the selected layer."));
             putValue("help", HelpUtil.ht("/Dialog/LayerList#ShowHideLayer"));
             multikeyShortcut = Shortcut.registerShortcut("core_multikey:showHideLayer", tr("Multikey: {0}",
-            tr("Show/hide layer")), KeyEvent.VK_S, Shortcut.SHIFT);
+                    tr("Show/hide layer")), KeyEvent.VK_S, Shortcut.SHIFT);
             if (init) {
                 updateEnabledState();
@@ -549 +550 @@
          */
         public LayerOpacityAction() {
+            putValue(NAME, tr("Opacity"));
             putValue(SHORT_DESCRIPTION, tr("Adjust opacity of the layer."));
             putValue(SMALL_ICON, ImageProvider.get("dialogs/layerlist", "transparency"));
@@ -640 +642 @@
 
         public ActivateLayerAction() {
+            putValue(NAME, tr("Activate"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "activate"));
             putValue(SHORT_DESCRIPTION, tr("Activate the selected layer"));
             multikeyShortcut = Shortcut.registerShortcut("core_multikey:activateLayer", tr("Multikey: {0}",
-            tr("Activate layer")), KeyEvent.VK_A, Shortcut.SHIFT);
+                    tr("Activate layer")), KeyEvent.VK_A, Shortcut.SHIFT);
             putValue("help", HelpUtil.ht("/Dialog/LayerList#ActivateLayer"));
         }
@@ -737 +740 @@
 
         public MergeAction() {
+            putValue(NAME, tr("Merge"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "mergedown"));
             putValue(SHORT_DESCRIPTION, tr("Merge this layer into another layer"));
@@ -799 +803 @@
             CheckParameterUtil.ensureParameterNotNull(layer, "layer");
             this.layer = layer;
+            updateEnabledState();
+        }
+
+        public DuplicateAction() {
             putValue(NAME, tr("Duplicate"));
-            updateEnabledState();
-        }
-
-        public DuplicateAction() {
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "duplicatelayer"));
             putValue(SHORT_DESCRIPTION, tr("Duplicate this layer"));
@@ -1033 +1037 @@
     class MoveUpAction extends AbstractAction implements  IEnabledStateUpdating{
         public MoveUpAction() {
+            putValue(NAME, tr("Move up"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "up"));
             putValue(SHORT_DESCRIPTION, tr("Move the selected layer one row up."));
@@ -1054 +1059 @@
     class MoveDownAction extends AbstractAction implements IEnabledStateUpdating {
         public MoveDownAction() {
+            putValue(NAME, tr("Move down"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "down"));
             putValue(SHORT_DESCRIPTION, tr("Move the selected layer one row down."));