Changeset 1246 in josm for trunk/src/org

Timestamp:

2009-01-11T16:41:49+01:00 (16 years ago)

Author:

stoecker

Message:

bring texts back in side view buttons

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• SideButton.java (modified) (3 diffs)
• dialogs/LayerListDialog.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/SideButton.java

@@ -21 +21 @@
     }
 
-    private static ImageIcon smallIcon(String imagename) {
+    public static ImageIcon makeIcon(String imagename) {
         Image im = ImageProvider.get("dialogs", imagename).getImage();
         return new ImageIcon(im.getScaledInstance(20 , 20, Image.SCALE_SMOOTH));
@@ -28 +28 @@
     public SideButton(String imagename, String property, String tooltip, ActionListener actionListener)
     {
-        super(smallIcon(imagename));
+        super(makeIcon(imagename));
         doStyle();
         setActionCommand(imagename);
@@ -36 +36 @@
     public SideButton(String name, String imagename, String property, String tooltip, Shortcut shortcut, ActionListener actionListener)
     {
-        super(smallIcon(imagename));
+        super(tr(name), makeIcon(imagename));
         if(shortcut != null)
-                {
+        {
             shortcut.setMnemonic(this);
-                        if(tooltip != null)
+            if(tooltip != null)
                 tooltip = Main.platform.makeTooltip(tooltip, shortcut);
-                }
+        }
         setup(name, property, tooltip, actionListener);
     }
     public SideButton(String name, String imagename, String property, String tooltip, ActionListener actionListener)
     {
-        super(smallIcon(imagename));
+        super(tr(name), makeIcon(imagename));
         setup(name, property, tooltip, actionListener);
     }

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

@@ -62 +62 @@
 
         public DeleteLayerAction(Layer layer) {
-            super(tr("Delete"), ImageProvider.get("dialogs", "delete"));
+            super(tr("Delete"), SideButton.makeIcon("delete"));
             putValue(SHORT_DESCRIPTION, tr("Delete the selected layer."));
             putValue("help", "Action/LayerDelete");
@@ -98 +98 @@
 
         public ShowHideLayerAction(Layer layer) {
-            super(tr("Show/Hide"), ImageProvider.get("dialogs", "showhide"));
+            super(tr("Show/Hide"), SideButton.makeIcon("showhide"));
             putValue(SHORT_DESCRIPTION, tr("Toggle visible state of the selected layer."));
             putValue("help", "Action/LayerShowHide");
@@ -254 +254 @@
         buttonPanel.add(new SideButton(deleteAction));
 
-        mergeButton = new SideButton("Merge", "mergedown", "LayerList", tr("Merge the layer directly below into the selected layer."),
+        mergeButton = new SideButton("mergedown", "LayerList", tr("Merge the layer directly below into the selected layer."),
         new ActionListener(){
             public void actionPerformed(ActionEvent e) {
@@ -265 +265 @@
             }
         });
-        mergeButton.setText(null);
         buttonPanel.add(mergeButton);
 
@@ -286 +285 @@
         downButton.setEnabled(sel >= 0 && sel < model.getSize()-1);
         deleteAction.setEnabled(!model.isEmpty());
-        
+
         if(model.getSize() != 0) {
             setTitle(tr("Layers: {0}", model.getSize()), true);