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

Timestamp:

2015-09-29T18:32:27+02:00 (9 years ago)

Author:

simon04

Message:

fix #10432 - Session: get rid of submenu

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SessionSaveAsAction.java (modified) (1 diff)
• gui/MainMenu.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java

@@ -58 +58 @@
      */
     public SessionSaveAsAction() {
-        super(tr("Save Session As..."), "save_as", tr("Save the current session to a new file."), null, true, "save_as-session", true);
+        super(tr("Save Session As..."), "session", tr("Save the current session to a new file."), null, true, "save_as-session", true);
         putValue("help", ht("/Action/SessionSaveAs"));
     }

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

@@ -97 +97 @@
 import org.openstreetmap.josm.actions.SelectAllAction;
 import org.openstreetmap.josm.actions.SelectNonBranchingWaySequencesAction;
-import org.openstreetmap.josm.actions.SessionLoadAction;
 import org.openstreetmap.josm.actions.SessionSaveAsAction;
 import org.openstreetmap.josm.actions.ShowStatusReportAction;
@@ -134 +133 @@
 import org.openstreetmap.josm.gui.tagging.TaggingPresetSearchPrimitiveDialog;
 import org.openstreetmap.josm.gui.widgets.DisableShortcutsOnFocusGainedTextField;
-import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -162 +160 @@
     /** File / Save As... **/
     public final SaveAsAction saveAs = SaveAsAction.getInstance();
-    /** File / Session > Load Session **/
-    public SessionLoadAction sessionLoad;
     /** File / Session > Save Session As... **/
     public SessionSaveAsAction sessionSaveAs;
@@ -331 +327 @@
     public final JMenu fileMenu = addMenu("File", /* I18N: mnemonic: F */ trc("menu", "File"), KeyEvent.VK_F, 0, ht("/Menu/File"));
     /**
-     * sessionMenu is a submenu of File menu containing all session actions
-     */
-    public final JMenu sessionMenu = new JMenu(tr("Session"));
-    /**
      * editMenu contains editing actions
      */
@@ -665 +657 @@
         add(fileMenu, save);
         add(fileMenu, saveAs);
-        sessionMenu.setToolTipText(tr("Save and load the current session (list of layers, etc.)"));
-        sessionMenu.setIcon(new ImageProvider("session").setSize(ImageProvider.ImageSizes.MENU).get());
         sessionSaveAs = new SessionSaveAsAction();
-        sessionLoad = new SessionLoadAction();
-        add(sessionMenu, sessionSaveAs);
-        add(sessionMenu, sessionLoad);
-        fileMenu.add(sessionMenu);
-        ExpertToggleAction.addVisibilitySwitcher(sessionMenu);
+        ExpertToggleAction.addVisibilitySwitcher(fileMenu.add(sessionSaveAs));
         add(fileMenu, gpxExport, true);
         fileMenu.addSeparator();