Changeset 1228 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-01-09T22:11:24+01:00 (16 years ago)

Author:

ulfl

Message:

Improve panels on the right side:
a) add a normal/minimized display mechanism, with "triangle icon"
b) display number of active items in title
c) show title bold if panel has "active items"
d) add close "X" button

(b and c currently not implemented in the various plugins - but easy to do so)

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• CommandStackDialog.java (modified) (1 diff)
• ConflictDialog.java (modified) (1 diff)
• LayerListDialog.java (modified) (1 diff)
• PropertiesDialog.java (modified) (1 diff)
• RelationListDialog.java (modified) (1 diff)
• SelectionListDialog.java (modified) (1 diff)
• ToggleDialog.java (modified) (8 diffs)
• UserListDialog.java (modified) (1 diff)

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

@@ -60 +60 @@
 
     private void buildList() {
+        if(Main.main.undoRedo.commands.size() != 0) {
+            setTitle(tr("Command Stack: {0}", Main.main.undoRedo.commands.size()), true);
+        } else {
+            setTitle(tr("Command Stack"), false);
+        }
         if (Main.map == null || Main.map.mapView == null || Main.map.mapView.editLayer == null)
             return;

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

@@ -130 +130 @@
             if (osm instanceof Relation)
                 model.addElement(osm);
+
+        if(model.size() != 0) {
+            setTitle(tr("Conflicts: {0}", model.size()), true);
+        } else {
+            setTitle(tr("Conflicts"), false);
+        }
     }
 

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

@@ -286 +286 @@
         downButton.setEnabled(sel >= 0 && sel < model.getSize()-1);
         deleteAction.setEnabled(!model.isEmpty());
+        
+        if(model.getSize() != 0) {
+            setTitle(tr("Layers: {0}", model.getSize()), true);
+        } else {
+            setTitle(tr("Layers"), false);
+        }
     }
 

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

@@ -695 +695 @@
 
         membershipTable.getTableHeader().setVisible(membershipData.getRowCount() > 0);
-    }
+
+        if(propertyData.getRowCount() != 0 || membershipData.getRowCount() != 0) {
+            setTitle(tr("Properties: {0} / Memberships: {1}", 
+                propertyData.getRowCount(), membershipData.getRowCount()), true);
+        } else {
+            setTitle(tr("Properties / Memberships"), false);
+        }
+
+        }
 }

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

@@ -122 +122 @@
         }
         list.setSize(i);
+
+        if(Main.ds.relations.size() != 0) {
+            setTitle(tr("Relations: {0}", Main.ds.relations.size()), true);
+        } else {
+            setTitle(tr("Relations"), false);
+        }
     }
 

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

@@ -262 +262 @@
                 selectionHistory.removeLast();
         }
+        
+        int ways = 0;
+        int nodes = 0;
+        int relations = 0;
+        for (OsmPrimitive o : newSelection) {
+            if (o instanceof Way)
+                ways++;
+            else if (o instanceof Node)
+                nodes++;
+            else if (o instanceof Relation)
+                relations++;
+        }
+
+        if( (nodes+ways+relations) != 0) {
+            setTitle(tr("Selection: Rel.: {0} / Ways: {1} / Nodes: {2}", relations, ways, nodes), true);
+        } else {
+            setTitle(tr("Selection"), false);
+        }
     }
 

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

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.gui.dialogs;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.BorderLayout;
@@ -6 +8 @@
 import java.awt.EventQueue;
 import java.awt.GridBagLayout;
+import java.awt.Component;
+import java.awt.Image;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -20 +26 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.ImageIcon;
 
 import org.openstreetmap.josm.Main;
@@ -61 +68 @@
     public JPanel parent;
     private final JPanel titleBar = new JPanel(new GridBagLayout());
+    public JLabel label = new JLabel();
 
     public ToggleDialog(final String name, String iconName, String tooltip, Shortcut shortcut, int preferredHeight) {
@@ -68 +76 @@
     }
 
-    private void ToggleDialogInit(final String name, String iconName, String tooltip, Shortcut shortcut, int preferredHeight) {
+    private void ToggleDialogInit(final String name, String iconName, String tooltip, Shortcut shortcut, final int preferredHeight) {
         setPreferredSize(new Dimension(330,preferredHeight));
         action = new ToggleDialogAction(name, "dialogs/"+iconName, tooltip, shortcut, iconName);
@@ -75 +83 @@
         setLayout(new BorderLayout());
 
-        titleBar.add(new JLabel(name), GBC.std());
+        // show the minimize button
+        final JLabel minimize = new JLabel(ImageProvider.get("misc", "normal"));
+        titleBar.add(minimize);
+        
+        // scale down the dialog icon
+        ImageIcon inIcon = ImageProvider.get("dialogs", iconName);
+        ImageIcon smallIcon = new ImageIcon(inIcon.getImage().getScaledInstance(16 , 16, Image.SCALE_SMOOTH));
+        JLabel labelSmallIcon = new JLabel(smallIcon);
+        titleBar.add(labelSmallIcon);
+
+        final ActionListener hideActionListener = new ActionListener(){
+            public void actionPerformed(ActionEvent e) {
+                boolean nowVisible = false;
+                Component comps[] = getComponents();
+                for(int i=0; i<comps.length; i++)
+                {
+                    if(comps[i] != titleBar)
+                    {
+                        if(comps[i].isVisible()) {
+                            comps[i].setVisible(false);
+                        } else {
+                            comps[i].setVisible(true);
+                            nowVisible = true;
+                        }
+                    }
+                }
+                
+                Main.pref.put(action.prefname+".minimized", !nowVisible);
+                if(nowVisible == true) {
+                    setPreferredSize(new Dimension(330,preferredHeight));
+                    setMaximumSize(new Dimension(Short.MAX_VALUE, Short.MAX_VALUE));
+                    minimize.setIcon(ImageProvider.get("misc", "normal"));
+                } else {
+                    setPreferredSize(new Dimension(330,20));
+                    setMaximumSize(new Dimension(330,20));
+                    minimize.setIcon(ImageProvider.get("misc", "minimized"));
+                }
+                // doLayout() - workaround
+                parent.setVisible(false);
+                parent.setVisible(true);
+            }
+        };
+        //hide.addActionListener(hideActionListener);
+
+        final MouseListener titleMouseListener = new MouseListener(){
+            public void mouseClicked(MouseEvent e) {
+                hideActionListener.actionPerformed(null);
+            }
+            public void mouseEntered(MouseEvent e) {}
+            public void mouseExited(MouseEvent e) {}
+            public void mousePressed(MouseEvent e) {}
+        public void mouseReleased(MouseEvent e) {}
+        };
+        titleBar.addMouseListener(titleMouseListener);
+
+        // add some padding space (there must be a better way to do this!)
+        JLabel padding = new JLabel(" ");
+        titleBar.add(padding);
+
+        // show the title label
+        label.setText(name);
+        titleBar.add(label, GBC.std());
         titleBar.add(Box.createHorizontalGlue(),GBC.std().fill(GBC.HORIZONTAL));
 
+        // show the sticky button
         JButton sticky = new JButton(ImageProvider.get("misc", "sticky"));
+        sticky.setToolTipText(tr("Undock the panel"));
         sticky.setBorder(BorderFactory.createEmptyBorder());
         final ActionListener stickyActionListener = new ActionListener(){
@@ -121 +192 @@
         };
         sticky.addActionListener(stickyActionListener);
-
         titleBar.add(sticky);
+
+        // show the close button
+        JButton close = new JButton(ImageProvider.get("misc", "close"));
+        close.setToolTipText(tr("Close this panel. You can reopen it with the buttons in the left toolbar"));
+        close.setBorder(BorderFactory.createEmptyBorder());
+        final ActionListener closeActionListener = new ActionListener(){
+            public void actionPerformed(ActionEvent e) {
+                // fake an event to toggle dialog
+                action.actionPerformed(new ActionEvent(titleBar, 0, ""));
+            }
+        };
+        close.addActionListener(closeActionListener);
+        titleBar.add(close);
+
         add(titleBar, BorderLayout.NORTH);
+        titleBar.setToolTipText(tr("Click to minimize/maximize the panel content"));
 
         setVisible(false);
@@ -135 +220 @@
             });
         }
+        if (Main.pref.getBoolean(action.prefname+".minimized", false)) {
+            EventQueue.invokeLater(new Runnable(){
+                public void run() {
+                    titleMouseListener.mouseClicked(null);
+                }
+            });
+        }
+    }
+
+    public void setTitle(String title, boolean active) {
+        if(active) {
+            label.setText("<html><b>" + title + "</b>");
+        } else {
+            label.setText(title);
+        }
     }
 

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

@@ -109 +109 @@
             data.addRow(new Object[] { uc.user.name, uc.count, uc.count * 100 / all });
         }
+
+        if(ucArr.length != 0) {
+            setTitle(tr("Authors: {0}", ucArr.length), true);
+        } else {
+            setTitle(tr("Authors"), false);
+        }
     }