Changeset 12871 in josm for trunk/src/org

Timestamp:

2017-09-17T12:44:57+02:00 (7 years ago)

Author:

simon04

Message:

fix #14578 - Open external history viewers

Popup menu is added to version info of history dialog and changeset manager.

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/changeset/ChangesetDetailPanel.java (modified) (7 diffs)
• history/OpenChangesetPopupMenu.java (added)
• history/VersionInfoPanel.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java

@@ -23 +23 @@
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
+import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -38 +39 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.history.OpenChangesetPopupMenu;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
@@ -63 +65 @@
     private final JosmTextField tfClosedOn  = new JosmTextField(20);
 
+    private final OpenChangesetPopupMenuAction   actOpenChangesetPopupMenu   = new OpenChangesetPopupMenuAction();
     private final DownloadChangesetContentAction actDownloadChangesetContent = new DownloadChangesetContentAction(this);
     private final UpdateChangesetAction          actUpdateChangesets         = new UpdateChangesetAction();
@@ -69 +72 @@
     private final ZoomInCurrentLayerAction       actZoomInCurrentLayerAction = new ZoomInCurrentLayerAction();
     // CHECKSTYLE.ON: SingleSpaceSeparator
+    
+    private JButton btnOpenChangesetPopupMenu;
 
     private transient Changeset currentChangeset;
@@ -77 +82 @@
         JToolBar tb = new JToolBar(JToolBar.VERTICAL);
         tb.setFloatable(false);
+
+        // -- display changeset
+        btnOpenChangesetPopupMenu = tb.add(actOpenChangesetPopupMenu);
+        actOpenChangesetPopupMenu.initProperties(currentChangeset);
 
         // -- remove from cache action
@@ -259 +268 @@
             updateView(cs);
         }
+        actOpenChangesetPopupMenu.initProperties(currentChangeset);
         actDownloadChangesetContent.initProperties();
         actUpdateChangesets.initProperties(currentChangeset);
@@ -322 +332 @@
         public void initProperties(Changeset cs) {
             setEnabled(cs != null && !Main.isOffline(OnlineResource.OSM_API));
+        }
+    }
+
+    /**
+     * The action for opening {@link OpenChangesetPopupMenu}
+     */
+    class OpenChangesetPopupMenuAction extends AbstractAction {
+        OpenChangesetPopupMenuAction() {
+            putValue(NAME, tr("View changeset"));
+            new ImageProvider("help/internet").getResource().attachImageIcon(this);
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent evt) {
+            if (currentChangeset != null)
+                new OpenChangesetPopupMenu(currentChangeset.getId()).show(btnOpenChangesetPopupMenu);
+        }
+
+        void initProperties(Changeset cs) {
+            setEnabled(cs != null);
         }
     }

trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

@@ -16 +16 @@
 
 import javax.swing.AbstractAction;
+import javax.swing.AbstractButton;
 import javax.swing.JButton;
 import javax.swing.JComponent;
@@ -23 +24 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+import javax.swing.plaf.basic.BasicArrowButton;
 
 import org.openstreetmap.josm.Main;
@@ -109 +111 @@
         pnlUserAndChangeset.add(lblUser, GBC.eol().insets(5, 0, 0, 0).weight(1, 0));
 
+        final JPanel changesetPanel = new JPanel(new BorderLayout());
         changesetButton.setMargin(new Insets(0, 0, 0, 2));
-        pnlUserAndChangeset.add(changesetButton, GBC.std().fill().weight(0, 0));
+        changesetPanel.add(changesetButton, BorderLayout.CENTER);
+        final BasicArrowButton arrowButton = new BasicArrowButton(BasicArrowButton.SOUTH);
+        arrowButton.addActionListener(action -> {
+            final OpenChangesetPopupMenu popupMenu = new OpenChangesetPopupMenu(changesetDialogAction.id);
+            popupMenu.insert(changesetDialogAction, 0);
+            ((AbstractButton) popupMenu.getComponent(0)).setText(tr("Open Changeset Manager"));
+            popupMenu.show(arrowButton);
+        });
+        changesetPanel.add(arrowButton, BorderLayout.EAST);
+        pnlUserAndChangeset.add(changesetPanel, GBC.std().fill().weight(0, 0));
 
         lblChangeset = new UrlLabel("", 2);