X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fgui%2FMenuManager.java;h=e1c8cf0da6470dff921d1329621eaf3cc4807734;hb=52bf9e8686c916be37a26a0b75340393d4478b05;hp=5a4b009ada4d092265b337cc72234fd76ad934e4;hpb=5625a1abadb5f2ca5f017fe7dbda1d5141cb637b;p=GpsPrune.git diff --git a/tim/prune/gui/MenuManager.java b/tim/prune/gui/MenuManager.java index 5a4b009..e1c8cf0 100644 --- a/tim/prune/gui/MenuManager.java +++ b/tim/prune/gui/MenuManager.java @@ -4,8 +4,6 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; - -import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JMenu; @@ -17,6 +15,7 @@ import javax.swing.KeyStroke; import tim.prune.App; import tim.prune.DataSubscriber; import tim.prune.I18nManager; +import tim.prune.browser.UrlGenerator; import tim.prune.data.PhotoList; import tim.prune.data.Selection; import tim.prune.data.Track; @@ -37,6 +36,7 @@ public class MenuManager implements DataSubscriber // Menu items which need enabling/disabling private JMenuItem _saveItem = null; private JMenuItem _exportKmlItem = null; + private JMenuItem _exportGpxItem = null; private JMenuItem _exportPovItem = null; private JMenuItem _undoItem = null; private JMenuItem _clearUndoItem = null; @@ -52,15 +52,17 @@ public class MenuManager implements DataSubscriber private JMenuItem _selectStartItem = null; private JMenuItem _selectEndItem = null; private JMenuItem _reverseItem = null; + private JMenuItem _addTimeOffsetItem = null; + private JMenuItem _mergeSegmentsItem = null; private JMenu _rearrangeMenu = null; - private JMenuItem _rearrangeStartItem = null; - private JMenuItem _rearrangeEndItem = null; - private JMenuItem _rearrangeNearestItem = null; + private JMenuItem _cutAndMoveItem = null; private JMenuItem _show3dItem = null; + private JMenu _browserMapMenu = null; private JMenuItem _saveExifItem = null; private JMenuItem _connectPhotoItem = null; private JMenuItem _deletePhotoItem = null; - // TODO: Does Photo menu require disconnect option? + private JMenuItem _disconnectPhotoItem = null; + private JMenuItem _correlatePhotosItem = null; // ActionListeners for reuse by menu and toolbar private ActionListener _openFileAction = null; @@ -68,6 +70,8 @@ public class MenuManager implements DataSubscriber private ActionListener _saveAction = null; private ActionListener _undoAction = null; private ActionListener _editPointAction = null; + private ActionListener _deletePointAction = null; + private ActionListener _deleteRangeAction = null; private ActionListener _selectStartAction = null; private ActionListener _selectEndAction = null; private ActionListener _connectPhotoAction = null; @@ -76,6 +80,8 @@ public class MenuManager implements DataSubscriber private JButton _saveButton = null; private JButton _undoButton = null; private JButton _editPointButton = null; + private JButton _deletePointButton = null; + private JButton _deleteRangeButton = null; private JButton _selectStartButton = null; private JButton _selectEndButton = null; private JButton _connectPhotoButton = null; @@ -85,6 +91,7 @@ public class MenuManager implements DataSubscriber * Constructor * @param inParent parent object for dialogs * @param inApp application to call on menu actions + * @param inTrackInfo track info object */ public MenuManager(JFrame inParent, App inApp, TrackInfo inTrackInfo) { @@ -125,6 +132,16 @@ public class MenuManager implements DataSubscriber }; addPhotosMenuItem.addActionListener(_addPhotoAction); fileMenu.add(addPhotosMenuItem); + // Add photos + JMenuItem loadFromGpsMenuItem = new JMenuItem(I18nManager.getText("menu.file.loadfromgps")); + loadFromGpsMenuItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) + { + _app.beginLoadFromGps(); + } + }); + fileMenu.add(loadFromGpsMenuItem); + fileMenu.addSeparator(); // Save _saveItem = new JMenuItem(I18nManager.getText("menu.file.save"), KeyEvent.VK_S); _saveAction = new ActionListener() { @@ -136,7 +153,7 @@ public class MenuManager implements DataSubscriber _saveItem.addActionListener(_saveAction); _saveItem.setEnabled(false); fileMenu.add(_saveItem); - // Export + // Export - Kml _exportKmlItem = new JMenuItem(I18nManager.getText("menu.file.exportkml")); _exportKmlItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -146,6 +163,17 @@ public class MenuManager implements DataSubscriber }); _exportKmlItem.setEnabled(false); fileMenu.add(_exportKmlItem); + // Gpx + _exportGpxItem = new JMenuItem(I18nManager.getText("menu.file.exportgpx")); + _exportGpxItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) + { + _app.exportGpx(); + } + }); + _exportGpxItem.setEnabled(false); + fileMenu.add(_exportGpxItem); + // Pov _exportPovItem = new JMenuItem(I18nManager.getText("menu.file.exportpov")); _exportPovItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -165,6 +193,7 @@ public class MenuManager implements DataSubscriber }); fileMenu.add(exitMenuItem); menubar.add(fileMenu); + // Edit menu JMenu editMenu = new JMenu(I18nManager.getText("menu.edit")); editMenu.setMnemonic(KeyEvent.VK_E); _undoItem = new JMenuItem(I18nManager.getText("menu.edit.undo")); @@ -207,21 +236,23 @@ public class MenuManager implements DataSubscriber _editWaypointNameItem.setEnabled(false); editMenu.add(_editWaypointNameItem); _deletePointItem = new JMenuItem(I18nManager.getText("menu.edit.deletepoint")); - _deletePointItem.addActionListener(new ActionListener() { + _deletePointAction = new ActionListener() { public void actionPerformed(ActionEvent e) { _app.deleteCurrentPoint(); } - }); + }; + _deletePointItem.addActionListener(_deletePointAction); _deletePointItem.setEnabled(false); editMenu.add(_deletePointItem); _deleteRangeItem = new JMenuItem(I18nManager.getText("menu.edit.deleterange")); - _deleteRangeItem.addActionListener(new ActionListener() { + _deleteRangeAction = new ActionListener() { public void actionPerformed(ActionEvent e) { _app.deleteSelectedRange(); } - }); + }; + _deleteRangeItem.addActionListener(_deleteRangeAction); _deleteRangeItem.setEnabled(false); editMenu.add(_deleteRangeItem); _deleteDuplicatesItem = new JMenuItem(I18nManager.getText("menu.edit.deleteduplicates")); @@ -261,37 +292,64 @@ public class MenuManager implements DataSubscriber }); _reverseItem.setEnabled(false); editMenu.add(_reverseItem); + _addTimeOffsetItem = new JMenuItem(I18nManager.getText("menu.edit.addtimeoffset")); + _addTimeOffsetItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) + { + _app.beginAddTimeOffset(); + } + }); + _addTimeOffsetItem.setEnabled(false); + editMenu.add(_addTimeOffsetItem); + _mergeSegmentsItem = new JMenuItem(I18nManager.getText("menu.edit.mergetracksegments")); + _mergeSegmentsItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) + { + _app.mergeTrackSegments(); + } + }); + _mergeSegmentsItem.setEnabled(false); + editMenu.add(_mergeSegmentsItem); // Rearrange waypoints _rearrangeMenu = new JMenu(I18nManager.getText("menu.edit.rearrange")); _rearrangeMenu.setEnabled(false); - _rearrangeStartItem = new JMenuItem(I18nManager.getText("menu.edit.rearrange.start")); - _rearrangeStartItem.addActionListener(new ActionListener() { + JMenuItem rearrangeStartItem = new JMenuItem(I18nManager.getText("menu.edit.rearrange.start")); + rearrangeStartItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { _app.rearrangeWaypoints(App.REARRANGE_TO_START); } }); - _rearrangeStartItem.setEnabled(true); - _rearrangeMenu.add(_rearrangeStartItem); - _rearrangeEndItem = new JMenuItem(I18nManager.getText("menu.edit.rearrange.end")); - _rearrangeEndItem.addActionListener(new ActionListener() { + rearrangeStartItem.setEnabled(true); + _rearrangeMenu.add(rearrangeStartItem); + JMenuItem rearrangeEndItem = new JMenuItem(I18nManager.getText("menu.edit.rearrange.end")); + rearrangeEndItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { _app.rearrangeWaypoints(App.REARRANGE_TO_END); } }); - _rearrangeEndItem.setEnabled(true); - _rearrangeMenu.add(_rearrangeEndItem); - _rearrangeNearestItem = new JMenuItem(I18nManager.getText("menu.edit.rearrange.nearest")); - _rearrangeNearestItem.addActionListener(new ActionListener() { + rearrangeEndItem.setEnabled(true); + _rearrangeMenu.add(rearrangeEndItem); + JMenuItem rearrangeNearestItem = new JMenuItem(I18nManager.getText("menu.edit.rearrange.nearest")); + rearrangeNearestItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { _app.rearrangeWaypoints(App.REARRANGE_TO_NEAREST); } }); - _rearrangeNearestItem.setEnabled(true); - _rearrangeMenu.add(_rearrangeNearestItem); + rearrangeNearestItem.setEnabled(true); + _rearrangeMenu.add(rearrangeNearestItem); editMenu.add(_rearrangeMenu); + _cutAndMoveItem = new JMenuItem(I18nManager.getText("menu.edit.cutandmove")); + _cutAndMoveItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) + { + _app.cutAndMoveSelection(); + } + }); + _cutAndMoveItem.setEnabled(false); + editMenu.add(_cutAndMoveItem); menubar.add(editMenu); // Select menu @@ -337,6 +395,39 @@ public class MenuManager implements DataSubscriber selectMenu.add(_selectEndItem); menubar.add(selectMenu); + // Add view menu + JMenu viewMenu = new JMenu(I18nManager.getText("menu.view")); + _show3dItem = new JMenuItem(I18nManager.getText("menu.view.show3d")); + _show3dItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) + { + _app.show3dWindow(); + } + }); + _show3dItem.setEnabled(false); + viewMenu.add(_show3dItem); + // browser submenu + _browserMapMenu = new JMenu(I18nManager.getText("menu.view.browser")); + _browserMapMenu.setEnabled(false); + JMenuItem googleMapsItem = new JMenuItem(I18nManager.getText("menu.view.browser.google")); + googleMapsItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) + { + _app.showExternalMap(UrlGenerator.MAP_SOURCE_GOOGLE); + } + }); + _browserMapMenu.add(googleMapsItem); + JMenuItem openMapsItem = new JMenuItem(I18nManager.getText("menu.view.browser.openstreetmap")); + openMapsItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) + { + _app.showExternalMap(UrlGenerator.MAP_SOURCE_OSM); + } + }); + _browserMapMenu.add(openMapsItem); + viewMenu.add(_browserMapMenu); + menubar.add(viewMenu); + // Add photo menu JMenu photoMenu = new JMenu(I18nManager.getText("menu.photo")); addPhotosMenuItem = new JMenuItem(I18nManager.getText("menu.file.addphotos")); @@ -360,7 +451,18 @@ public class MenuManager implements DataSubscriber }; _connectPhotoItem.addActionListener(_connectPhotoAction); _connectPhotoItem.setEnabled(false); + photoMenu.addSeparator(); photoMenu.add(_connectPhotoItem); + // disconnect photo + _disconnectPhotoItem = new JMenuItem(I18nManager.getText("menu.photo.disconnect")); + _disconnectPhotoItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) + { + _app.disconnectPhotoFromPoint(); + } + }); + _disconnectPhotoItem.setEnabled(false); + photoMenu.add(_disconnectPhotoItem); _deletePhotoItem = new JMenuItem(I18nManager.getText("menu.photo.delete")); _deletePhotoItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -370,23 +472,29 @@ public class MenuManager implements DataSubscriber }); _deletePhotoItem.setEnabled(false); photoMenu.add(_deletePhotoItem); - menubar.add(photoMenu); - - // Add 3d menu (whether java3d available or not) - JMenu threeDMenu = new JMenu(I18nManager.getText("menu.3d")); - _show3dItem = new JMenuItem(I18nManager.getText("menu.3d.show3d")); - _show3dItem.addActionListener(new ActionListener() { + photoMenu.addSeparator(); + // correlate all photos + _correlatePhotosItem = new JMenuItem(I18nManager.getText("menu.photo.correlate")); + _correlatePhotosItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - _app.show3dWindow(); + _app.beginCorrelatePhotos(); } }); - _show3dItem.setEnabled(false); - threeDMenu.add(_show3dItem); - menubar.add(threeDMenu); + _correlatePhotosItem.setEnabled(false); + photoMenu.add(_correlatePhotosItem); + menubar.add(photoMenu); - // Help menu for About + // Help menu JMenu helpMenu = new JMenu(I18nManager.getText("menu.help")); + JMenuItem helpItem = new JMenuItem(I18nManager.getText("menu.help")); + helpItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) + { + _app.showHelp(); + } + }); + helpMenu.add(helpItem); JMenuItem aboutItem = new JMenuItem(I18nManager.getText("menu.help.about")); aboutItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -395,6 +503,14 @@ public class MenuManager implements DataSubscriber } }); helpMenu.add(aboutItem); + JMenuItem checkVersionItem = new JMenuItem(I18nManager.getText("menu.help.checkversion")); + checkVersionItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) + { + CheckVersionScreen.show(_parent); + } + }); + helpMenu.add(checkVersionItem); menubar.add(helpMenu); return menubar; @@ -409,45 +525,57 @@ public class MenuManager implements DataSubscriber { JToolBar toolbar = new JToolBar(); // Add text file - JButton openFileButton = new JButton(new ImageIcon(getClass().getResource("images/add_textfile_icon.png"))); + JButton openFileButton = new JButton(IconManager.getImageIcon(IconManager.OPEN_FILE)); openFileButton.setToolTipText(I18nManager.getText("menu.file.open")); openFileButton.addActionListener(_openFileAction); toolbar.add(openFileButton); // Add photo - JButton addPhotoButton = new JButton(new ImageIcon(getClass().getResource("images/add_photo_icon.png"))); + JButton addPhotoButton = new JButton(IconManager.getImageIcon(IconManager.ADD_PHOTO)); addPhotoButton.setToolTipText(I18nManager.getText("menu.file.addphotos")); addPhotoButton.addActionListener(_addPhotoAction); toolbar.add(addPhotoButton); // Save - _saveButton = new JButton(new ImageIcon(getClass().getResource("images/save_icon.gif"))); + _saveButton = new JButton(IconManager.getImageIcon(IconManager.SAVE_FILE)); _saveButton.setToolTipText(I18nManager.getText("menu.file.save")); _saveButton.addActionListener(_saveAction); _saveButton.setEnabled(false); toolbar.add(_saveButton); // Undo - _undoButton = new JButton(new ImageIcon(getClass().getResource("images/undo_icon.gif"))); + _undoButton = new JButton(IconManager.getImageIcon(IconManager.UNDO)); _undoButton.setToolTipText(I18nManager.getText("menu.edit.undo")); _undoButton.addActionListener(_undoAction); _undoButton.setEnabled(false); toolbar.add(_undoButton); // Edit point - _editPointButton = new JButton(new ImageIcon(getClass().getResource("images/edit_point_icon.gif"))); + _editPointButton = new JButton(IconManager.getImageIcon(IconManager.EDIT_POINT)); _editPointButton.setToolTipText(I18nManager.getText("menu.edit.editpoint")); _editPointButton.addActionListener(_editPointAction); _editPointButton.setEnabled(false); toolbar.add(_editPointButton); + // Delete point + _deletePointButton = new JButton(IconManager.getImageIcon(IconManager.DELETE_POINT)); + _deletePointButton.setToolTipText(I18nManager.getText("menu.edit.deletepoint")); + _deletePointButton.addActionListener(_deletePointAction); + _deletePointButton.setEnabled(false); + toolbar.add(_deletePointButton); + // Delete range + _deleteRangeButton = new JButton(IconManager.getImageIcon(IconManager.DELETE_RANGE)); + _deleteRangeButton.setToolTipText(I18nManager.getText("menu.edit.deleterange")); + _deleteRangeButton.addActionListener(_deleteRangeAction); + _deleteRangeButton.setEnabled(false); + toolbar.add(_deleteRangeButton); // Select start, end - _selectStartButton = new JButton(new ImageIcon(getClass().getResource("images/set_start_icon.png"))); + _selectStartButton = new JButton(IconManager.getImageIcon(IconManager.SET_RANGE_START)); _selectStartButton.setToolTipText(I18nManager.getText("menu.select.start")); _selectStartButton.addActionListener(_selectStartAction); _selectStartButton.setEnabled(false); toolbar.add(_selectStartButton); - _selectEndButton = new JButton(new ImageIcon(getClass().getResource("images/set_end_icon.png"))); + _selectEndButton = new JButton(IconManager.getImageIcon(IconManager.SET_RANGE_END)); _selectEndButton.setToolTipText(I18nManager.getText("menu.select.end")); _selectEndButton.addActionListener(_selectEndAction); _selectEndButton.setEnabled(false); toolbar.add(_selectEndButton); - _connectPhotoButton = new JButton(new ImageIcon(getClass().getResource("images/connect_photo_icon.png"))); + _connectPhotoButton = new JButton(IconManager.getImageIcon(IconManager.CONNECT_PHOTO)); _connectPhotoButton.setToolTipText(I18nManager.getText("menu.photo.connect")); _connectPhotoButton.addActionListener(_connectPhotoAction); _connectPhotoButton.setEnabled(false); @@ -481,6 +609,7 @@ public class MenuManager implements DataSubscriber _saveItem.setEnabled(hasData); _saveButton.setEnabled(hasData); _exportKmlItem.setEnabled(hasData); + _exportGpxItem.setEnabled(hasData); _exportPovItem.setEnabled(hasData); _deleteDuplicatesItem.setEnabled(hasData); _compressItem.setEnabled(hasData); @@ -489,6 +618,7 @@ public class MenuManager implements DataSubscriber _selectNoneItem.setEnabled(hasData); if (_show3dItem != null) _show3dItem.setEnabled(hasData); + _browserMapMenu.setEnabled(hasData); // is undo available? boolean hasUndo = !_app.getUndoStack().isEmpty(); _undoItem.setEnabled(hasUndo); @@ -500,26 +630,45 @@ public class MenuManager implements DataSubscriber _editPointButton.setEnabled(hasPoint); _editWaypointNameItem.setEnabled(hasPoint); _deletePointItem.setEnabled(hasPoint); + _deletePointButton.setEnabled(hasPoint); _selectStartItem.setEnabled(hasPoint); _selectStartButton.setEnabled(hasPoint); _selectEndItem.setEnabled(hasPoint); _selectEndButton.setEnabled(hasPoint); // are there any photos? - _saveExifItem.setEnabled(_photos != null && _photos.getNumPhotos() > 0); + boolean anyPhotos = _photos != null && _photos.getNumPhotos() > 0; + _saveExifItem.setEnabled(anyPhotos); // is there a current photo? - boolean hasPhoto = _photos != null && _photos.getNumPhotos() > 0 - && _selection.getCurrentPhotoIndex() >= 0; - // connect is only available when current photo is not connected to current point - boolean connectAvailable = hasPhoto && hasPoint - && _track.getPoint(_selection.getCurrentPointIndex()).getPhoto() == null; + boolean hasPhoto = anyPhotos && _selection.getCurrentPhotoIndex() >= 0; + // connect is available if photo and point selected, and photo has no point + boolean connectAvailable = hasPhoto && hasPoint && _photos.getPhoto(_selection.getCurrentPhotoIndex()) != null + && _photos.getPhoto(_selection.getCurrentPhotoIndex()).getDataPoint() == null; _connectPhotoItem.setEnabled(connectAvailable); _connectPhotoButton.setEnabled(connectAvailable); + _disconnectPhotoItem.setEnabled(hasPhoto && _photos.getPhoto(_selection.getCurrentPhotoIndex()) != null + && _photos.getPhoto(_selection.getCurrentPhotoIndex()).getDataPoint() != null); + _correlatePhotosItem.setEnabled(anyPhotos && hasData); _deletePhotoItem.setEnabled(hasPhoto); // is there a current range? boolean hasRange = (hasData && _selection.hasRangeSelected()); _deleteRangeItem.setEnabled(hasRange); + _deleteRangeButton.setEnabled(hasRange); _interpolateItem.setEnabled(hasRange && (_selection.getEnd() - _selection.getStart()) == 1); + _mergeSegmentsItem.setEnabled(hasRange); _reverseItem.setEnabled(hasRange); + _addTimeOffsetItem.setEnabled(hasRange); + // Is the currently selected point outside the current range? + _cutAndMoveItem.setEnabled(hasRange && hasPoint && + (_selection.getCurrentPointIndex() < _selection.getStart() + || _selection.getCurrentPointIndex() > (_selection.getEnd()+1))); } + + + /** + * Ignore action completed signals + * @see tim.prune.DataSubscriber#actionCompleted(java.lang.String) + */ + public void actionCompleted(String inMessage) + {} }