Changeset 8212 in josm for trunk/src/org

Timestamp:

2015-04-18T02:23:03+02:00 (9 years ago)

Author:

simon04

Message:

see #11147 see #11321 - Add "Download notes in current view" to file menu and notes toggle dialog

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DownloadNotesInViewAction.java (added)
• gui/MainMenu.java (modified) (3 diffs)
• gui/dialogs/NotesDialog.java (modified) (4 diffs)

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

@@ -52 +52 @@
 import org.openstreetmap.josm.actions.DistributeAction;
 import org.openstreetmap.josm.actions.DownloadAction;
+import org.openstreetmap.josm.actions.DownloadNotesInViewAction;
 import org.openstreetmap.josm.actions.DownloadPrimitiveAction;
 import org.openstreetmap.josm.actions.DownloadReferrersAction;
@@ -167 +168 @@
     /** File / Download object... **/
     public final DownloadPrimitiveAction downloadPrimitive = new DownloadPrimitiveAction();
+    /** File / Download notes in current view **/
+    public final DownloadNotesInViewAction downloadNotesInView = DownloadNotesInViewAction.newActionWithNoteIcon();
     /** File / Search Notes... **/
     public final SearchNotesDownloadAction searchNotes = new SearchNotesDownloadAction();
@@ -638 +641 @@
         add(fileMenu, downloadPrimitive);
         add(fileMenu, searchNotes);
+        add(fileMenu, downloadNotesInView);
         add(fileMenu, downloadReferrers);
         add(fileMenu, update);

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

@@ -31 +31 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.DownloadNotesInViewAction;
 import org.openstreetmap.josm.actions.UploadNotesAction;
 import org.openstreetmap.josm.actions.mapmode.AddNoteAction;
@@ -78 +79 @@
     private final AddCommentAction addCommentAction;
     private final CloseAction closeAction;
+    private final DownloadNotesInViewAction downloadNotesInViewAction;
     private final NewAction newAction;
     private final ReopenAction reopenAction;
@@ -90 +92 @@
         addCommentAction = new AddCommentAction();
         closeAction = new CloseAction();
+        downloadNotesInViewAction = DownloadNotesInViewAction.newActionWithDownloadIcon();
         newAction = new NewAction();
         reopenAction = new ReopenAction();
@@ -132 +135 @@
 
         createLayout(pane, false, Arrays.asList(new SideButton[]{
+                new SideButton(downloadNotesInViewAction, false),
                 new SideButton(newAction, false),
                 new SideButton(addCommentAction, false),