Changeset 13832 in josm

Timestamp:

2018-05-25T21:05:36+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #5603, see #5256, see #15240 - add first/last buttons for geoimage dialog. Fixed shortcuts. Switch to SVG icons taken from ​https://commons.wikimedia.org/wiki/GNOME_Desktop_icons#Navigation

Location:

trunk

Files:

• images/dialogs/down.png (deleted)
• images/dialogs/down.svg (added)
• images/dialogs/first.svg (added)
• images/dialogs/last.svg (added)
• images/dialogs/next.png (deleted)
• images/dialogs/next.svg (added)
• images/dialogs/previous.png (deleted)
• images/dialogs/previous.svg (added)
• images/dialogs/up.png (deleted)
• images/dialogs/up.svg (added)
• src/org/openstreetmap/josm/gui/MapFrame.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (modified) (11 diffs)

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

@@ -27 +27 @@
 import javax.swing.ButtonGroup;
 import javax.swing.ImageIcon;
+import javax.swing.InputMap;
 import javax.swing.JButton;
 import javax.swing.JCheckBoxMenuItem;
@@ -222 +223 @@
         splitPane.setUI(new NoBorderSplitPaneUI());
 
-        // JSplitPane supports F6 and F8 shortcuts by default, but we need them for Audio actions
-        splitPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_F6, 0), new Object());
-        splitPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_F8, 0), new Object());
+        // JSplitPane supports F6, F8, Home and End shortcuts by default, but we need them for Audio and Image Mapping actions
+        InputMap splitInputMap = splitPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+        splitInputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_F6, 0), new Object());
+        splitInputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_F8, 0), new Object());
+        splitInputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_HOME, 0), new Object());
+        splitInputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_END, 0), new Object());
 
         add(splitPane, BorderLayout.CENTER);

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

@@ -75 +75 @@
     }
 
+    private JButton btnLast;
     private JButton btnNext;
     private JButton btnPrevious;
+    private JButton btnFirst;
     private JButton btnCollapse;
     private JToggleButton tbCentre;
@@ -88 +90 @@
     }
 
+    private static JButton createNavigationButton(JosmAction action, Dimension buttonDim) {
+        JButton btn = new JButton(action);
+        btn.setPreferredSize(buttonDim);
+        btn.setEnabled(false);
+        return btn;
+    }
+
     private void build() {
         JPanel content = new JPanel(new BorderLayout());
@@ -95 +104 @@
         Dimension buttonDim = new Dimension(26, 26);
 
-        btnPrevious = new JButton(imagePreviousAction);
-        btnPrevious.setPreferredSize(buttonDim);
-        btnPrevious.setEnabled(false);
+        btnFirst = createNavigationButton(imageFirstAction, buttonDim);
+        btnPrevious = createNavigationButton(imagePreviousAction, buttonDim);
 
         JButton btnDelete = new JButton(imageRemoveAction);
@@ -108 +116 @@
         btnCopyPath.setPreferredSize(buttonDim);
 
-        btnNext = new JButton(imageNextAction);
-        btnNext.setPreferredSize(buttonDim);
-        btnNext.setEnabled(false);
+        btnNext = createNavigationButton(imageNextAction, buttonDim);
+        btnLast = createNavigationButton(imageLastAction, buttonDim);
 
         tbCentre = new JToggleButton(imageCenterViewAction);
@@ -123 +130 @@
 
         JPanel buttons = new JPanel();
+        buttons.add(btnFirst);
         buttons.add(btnPrevious);
         buttons.add(btnNext);
+        buttons.add(btnLast);
         buttons.add(Box.createRigidArea(new Dimension(7, 0)));
         buttons.add(tbCentre);
@@ -204 +213 @@
     private class ImageFirstAction extends JosmAction {
         ImageFirstAction() {
-            super(null, (ImageProvider) null, null, Shortcut.registerShortcut(
+            super(null, new ImageProvider("dialogs", "first"), tr("First"), Shortcut.registerShortcut(
                     "geoimage:first", tr("Geoimage: {0}", tr("Show first Image")), KeyEvent.VK_HOME, Shortcut.DIRECT),
                   false, null, false);
@@ -219 +228 @@
     private class ImageLastAction extends JosmAction {
         ImageLastAction() {
-            super(null, (ImageProvider) null, null, Shortcut.registerShortcut(
+            super(null, new ImageProvider("dialogs", "last"), tr("Last"), Shortcut.registerShortcut(
                     "geoimage:last", tr("Geoimage: {0}", tr("Show last Image")), KeyEvent.VK_END, Shortcut.DIRECT),
                   false, null, false);
@@ -319 +328 @@
     }
 
+    /**
+     * Displays image for the given layer.
+     * @param layer geo image layer
+     * @param entry image entry
+     */
     public static void showImage(GeoImageLayer layer, ImageEntry entry) {
         getInstance().displayImage(layer, entry);
@@ -334 +348 @@
      */
     public static void setPreviousEnabled(boolean value) {
+        getInstance().btnFirst.setEnabled(value);
         getInstance().btnPrevious.setEnabled(value);
     }
@@ -343 +358 @@
     public static void setNextEnabled(boolean value) {
         getInstance().btnNext.setEnabled(value);
+        getInstance().btnLast.setEnabled(value);
     }
 
@@ -361 +377 @@
     private transient ImageEntry currentEntry;
 
+    /**
+     * Displays image for the given layer.
+     * @param layer geo image layer
+     * @param entry image entry
+     */
     public void displayImage(GeoImageLayer layer, ImageEntry entry) {
         boolean imageChanged;