Changeset 30 in josm for src/org/openstreetmap/josm/gui/dialogs

Timestamp:

2005-12-03T14:14:35+01:00 (19 years ago)

Author:

imi

Message:

• Removed edit layer, combine action, save gpx (integrated in normal save)
• Simplified and unified shortkeys
• many small code simplifications
• added undo
• broken checkin!

Location:

src/org/openstreetmap/josm/gui/dialogs

Files:

• LayerList.java (modified) (1 diff)
• PropertiesDialog.java (modified) (4 diffs)
• SelectionListDialog.java (modified) (4 diffs)
• ToggleDialog.java (modified) (4 diffs)

src/org/openstreetmap/josm/gui/dialogs/LayerList.java

@@ -74 +74 @@
          */
         public LayerList(MapFrame mapFrame) {
-                super(mapFrame, "Layers", "List of all layers", "layerlist", KeyEvent.VK_L, "Open a list of all loaded layers.");
-                setSize(250,256);
-                setMinimumSize(new Dimension(70,70));
+                super("Layers", "List of all layers", "layerlist", KeyEvent.VK_L, "Open a list of all loaded layers.");
+                setPreferredSize(new Dimension(320,100));
                 add(new JScrollPane(layers), BorderLayout.CENTER);
                 layers.setBackground(UIManager.getColor("Button.background"));

src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -3 +3 @@
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.GridLayout;
@@ -210 +211 @@
          */
         public PropertiesDialog(MapFrame mapFrame) {
-                super(mapFrame, "Properties", "Properties Dialog", "properties", KeyEvent.VK_P, "Property for selected objects.");
+                super("Properties", "Properties Dialog", "properties", KeyEvent.VK_P, "Property for selected objects.");
                 mv = mapFrame.mapView;
 
-                setLayout(new BorderLayout());
-                setSize(350,450);
+                setPreferredSize(new Dimension(320,150));
                 
                 data.setColumnIdentifiers(new String[]{"Key", "Value"});
@@ -241 +241 @@
                 JScrollPane scrollPane = new JScrollPane(propertyTable);
                 scrollPane.addMouseListener(new DblClickWatch());
-                getContentPane().add(scrollPane, BorderLayout.CENTER);
+                add(scrollPane, BorderLayout.CENTER);
                 
                 JPanel buttonPanel = new JPanel(new GridLayout(1,3));
@@ -264 +264 @@
                 buttonPanel.add(createButton("Add", "Add a new key/value pair to all objects", KeyEvent.VK_A, buttonAction));
                 buttonPanel.add(createButton("Edit", "Edit the value of the selected key for all objects", KeyEvent.VK_E, buttonAction));
-                buttonPanel.add(createButton("Delete", "Delete the selected key in all objects", KeyEvent.VK_DELETE, buttonAction));
-                getContentPane().add(buttonPanel, BorderLayout.SOUTH);
+                buttonPanel.add(createButton("Delete", "Delete the selected key in all objects", KeyEvent.VK_D, buttonAction));
+                add(buttonPanel, BorderLayout.SOUTH);
         }
         

src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -3 +3 @@
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -46 +47 @@
          */
         public SelectionListDialog(MapFrame mapFrame) {
-                super(mapFrame, "Current Selection", "Selection List", "selectionlist", KeyEvent.VK_E, "Open a selection list window.");
-                setLayout(new BorderLayout());
-                setSize(300,400);
+                super("Current Selection", "Selection List", "selectionlist", KeyEvent.VK_E, "Open a selection list window.");
+                setPreferredSize(new Dimension(320,150));
                 displaylist.setCellRenderer(new DefaultListCellRenderer(){
                         private SelectionComponentVisitor visitor = new SelectionComponentVisitor();
@@ -64 +64 @@
                 displaylist.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
 
-                getContentPane().add(new JScrollPane(displaylist), BorderLayout.CENTER);
+                add(new JScrollPane(displaylist), BorderLayout.CENTER);
 
                 JButton button = new JButton("Select", ImageProvider.get("mapmode", "selection"));
@@ -73 +73 @@
                         }
                 });
-                getContentPane().add(button, BorderLayout.SOUTH);
+                add(button, BorderLayout.SOUTH);
 
                 selectionChanged(Main.main.ds.getSelected());

src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -1 +1 @@
 package org.openstreetmap.josm.gui.dialogs;
 
+import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.util.HashMap;
 import java.util.Map;
@@ -9 +8 @@
 import javax.swing.AbstractButton;
 import javax.swing.Action;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.KeyStroke;
+import javax.swing.BorderFactory;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.ImageProvider;
-import org.openstreetmap.josm.gui.MapFrame;
 
 /**
@@ -23 +20 @@
  * @author imi
  */
-public class ToggleDialog extends JDialog implements Action {
+public class ToggleDialog extends JPanel implements Action {
 
         /**
@@ -29 +26 @@
          * @param title The title of the dialog.
          */
-        public ToggleDialog(MapFrame mapFrame, String title, String name, String iconName, int mnemonic, String tooltip) {
-                super(Main.main, title, false);
+        public ToggleDialog(String title, String name, String iconName, int mnemonic, String tooltip) {
                 putValue(SMALL_ICON, ImageProvider.get("dialogs", iconName));
                 putValue(NAME, name);
                 putValue(MNEMONIC_KEY, mnemonic);
-                KeyStroke ks = KeyStroke.getKeyStroke(mnemonic,0);
-                putValue(ACCELERATOR_KEY, ks);
-                mapFrame.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(ks, this);
-                mapFrame.getActionMap().put(this, this);
-                putValue(LONG_DESCRIPTION, tooltip);
-                mapFrame.addPropertyChangeListener("visible", new PropertyChangeListener(){
-                        public void propertyChange(PropertyChangeEvent evt) {
-                                if (evt.getNewValue() == Boolean.FALSE)
-                                        setVisible(false);
-                        }
-                });
+                putValue(SHORT_DESCRIPTION, tooltip);
+                
+                setLayout(new BorderLayout());
+                add(new JLabel(title), BorderLayout.NORTH);
+                setVisible(false);
+                setBorder(BorderFactory.createEtchedBorder());
         }