Changeset 2602 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

Timestamp:

2009-12-10T16:34:13+01:00 (14 years ago)

Author:

bastiK

Message:

some minor things:

• layerlist dialog: right click on an entry selects it
• geoimage dialog: add button on the lower right, that moves the window to the side pane
• geoimage dialog: show image file name in the title
• chained calling for ExtendedDialog

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (modified) (11 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

@@ -9 +9 @@
 
 import java.awt.BorderLayout;
+import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.FlowLayout;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
-
+import java.awt.event.WindowEvent;
+
+import javax.swing.Box;
 import javax.swing.AbstractAction;
 import javax.swing.ImageIcon;
@@ -23 +27 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.dialogs.DialogsPanel.Action;
@@ -37 +40 @@
     private static final String COMMAND_REMOVE = "remove";
     private static final String COMMAND_PREVIOUS = "previous";
+    private static final String COMMAND_COLLAPSE = "collapse";
 
     private ImageDisplay imgDisplay = new ImageDisplay();
@@ -43 +47 @@
     // Only one instance of that class
     static private ImageViewerDialog INSTANCE = null;
+
+    private boolean collapseButtonClicked = false;
 
     public static ImageViewerDialog getInstance() {
@@ -53 +59 @@
     private JButton btnNext;
     private JButton btnPrevious;
+    private JButton btnCollapse;
 
     private ImageViewerDialog() {
@@ -73 +80 @@
         content.add(imgDisplay, BorderLayout.CENTER);
 
-        JPanel buttons = new JPanel();
-        buttons.setLayout(new FlowLayout());
-
         Dimension buttonDim = new Dimension(26,26);
-        
+
         ImageAction prevAction = new ImageAction(COMMAND_PREVIOUS, ImageProvider.get("dialogs", "previous"), tr("Previous"));
         btnPrevious = new JButton(prevAction);
         btnPrevious.setPreferredSize(buttonDim);
-        buttons.add(btnPrevious);
         Shortcut scPrev = Shortcut.registerShortcut(
             "geoimage:previous", tr("Geoimage: {0}", tr("Show previous Image")), KeyEvent.VK_PAGE_UP, Shortcut.GROUP_DIRECT);
@@ -92 +95 @@
         JButton btnDelete = new JButton(new ImageAction(COMMAND_REMOVE, ImageProvider.get("dialogs", "delete"), tr("Remove photo from layer")));
         btnDelete.setPreferredSize(buttonDim);
-        buttons.add(btnDelete);
-      
+
         ImageAction nextAction = new ImageAction(COMMAND_NEXT, ImageProvider.get("dialogs", "next"), tr("Next"));
         btnNext = new JButton(nextAction);
         btnNext.setPreferredSize(buttonDim);
-        buttons.add(btnNext);
         Shortcut scNext = Shortcut.registerShortcut(
             "geoimage:next", tr("Geoimage: {0}", tr("Show next Image")), KeyEvent.VK_PAGE_DOWN, Shortcut.GROUP_DIRECT);
@@ -108 +109 @@
         JToggleButton tbCentre = new JToggleButton(new ImageAction(COMMAND_CENTERVIEW, ImageProvider.get("dialogs", "centreview"), tr("Center view")));
         tbCentre.setPreferredSize(buttonDim);
-        buttons.add(tbCentre);
-       
+
         JButton btnZoomBestFit = new JButton(new ImageAction(COMMAND_ZOOM, ImageProvider.get("dialogs", "zoom-best-fit"), tr("Zoom best fit and 1:1")));
         btnZoomBestFit.setPreferredSize(buttonDim);
+
+        btnCollapse = new JButton(new ImageAction(COMMAND_COLLAPSE, ImageProvider.get("dialogs", "collapse"), tr("Move dialog to the side pane")));
+        btnCollapse.setPreferredSize(new Dimension(20,20));
+        btnCollapse.setAlignmentY(Component.TOP_ALIGNMENT);
+
+        JPanel buttons = new JPanel();
+        buttons.add(btnPrevious);
+        buttons.add(btnNext);
+        buttons.add(Box.createRigidArea(new Dimension(14, 0)));
+        buttons.add(tbCentre);
         buttons.add(btnZoomBestFit);
-
-        content.add(buttons, BorderLayout.SOUTH);
+        buttons.add(Box.createRigidArea(new Dimension(14, 0)));
+        buttons.add(btnDelete);
+
+        JPanel bottomPane = new JPanel();
+        bottomPane.setLayout(new GridBagLayout());
+        GridBagConstraints gc = new GridBagConstraints();
+        gc.gridx = 0;
+        gc.gridy = 0;
+        gc.anchor = GridBagConstraints.CENTER;
+        gc.weightx = 1;
+        bottomPane.add(buttons, gc);
+
+        gc.gridx = 1;
+        gc.gridy = 0;
+        gc.anchor = GridBagConstraints.PAGE_END;
+        gc.weightx = 0;
+        bottomPane.add(btnCollapse, gc);
+
+        content.add(bottomPane, BorderLayout.SOUTH);
 
         add(content, BorderLayout.CENTER);
@@ -150 +177 @@
                    currentLayer.removeCurrentPhoto();
                 }
+            } else if (COMMAND_COLLAPSE.equals(action)) {
+                collapseButtonClicked = true;
+                detachedDialog.getToolkit().getSystemEventQueue().postEvent(new WindowEvent(detachedDialog, WindowEvent.WINDOW_CLOSING));
             }
         }
@@ -186 +216 @@
         if (entry != null) {
             imgDisplay.setImage(entry.file);
+            titleBar.setTitle("Geotagged Images" + (entry.file != null ? " - " + entry.file.getName() : ""));
             StringBuffer osd = new StringBuffer(entry.file != null ? entry.file.getName() : "");
             if (entry.elevation != null) {
@@ -227 +258 @@
     @Override
     protected boolean dockWhenClosingDetachedDlg() {
+        if (collapseButtonClicked) {
+            collapseButtonClicked = false;
+            return true;
+        }
         return false;
+    }
+
+    @Override
+    protected void stateChanged() {
+        super.stateChanged();
+        if (btnCollapse != null) {
+            btnCollapse.setVisible(!isDocked);
+        }
     }