]> gitweb.fperrin.net Git - GpsPrune.git/blobdiff - tim/prune/gui/MenuManager.java
Version 6, October 2008
[GpsPrune.git] / tim / prune / gui / MenuManager.java
index 665142e07b82f067176d7adfd62916c43db229c9..e1c8cf0da6470dff921d1329621eaf3cc4807734 100644 (file)
@@ -4,23 +4,26 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
-
+import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
+import javax.swing.JToolBar;
 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;
 import tim.prune.data.TrackInfo;
 
 /**
- * Class to manage the menu bar,
- * including enabling and disabling the menu items
+ * Class to manage the menu bar and tool bar,
+ * including enabling and disabling the items
  */
 public class MenuManager implements DataSubscriber
 {
@@ -28,31 +31,67 @@ public class MenuManager implements DataSubscriber
        private App _app = null;
        private Track _track = null;
        private Selection _selection = null;
+       private PhotoList _photos = null;
 
        // Menu items which need enabling/disabling
-       JMenuItem _saveItem = null;
-       JMenuItem _exportItem = null;
-       JMenuItem _undoItem = null;
-       JMenuItem _clearUndoItem = null;
-       JMenuItem _deletePointItem = null;
-       JMenuItem _deleteRangeItem = null;
-       JMenuItem _deleteDuplicatesItem = null;
-       JMenuItem _compressItem = null;
-       JMenuItem _interpolateItem = null;
-       JMenuItem _selectAllItem = null;
-       JMenuItem _selectNoneItem = null;
-       JMenuItem _show3dItem = null;
-       JMenuItem _reverseItem = null;
-       JMenu     _rearrangeMenu = null;
-       JMenuItem _rearrangeStartItem = null;
-       JMenuItem _rearrangeEndItem = null;
-       JMenuItem _rearrangeNearestItem = null;
+       private JMenuItem _saveItem = null;
+       private JMenuItem _exportKmlItem = null;
+       private JMenuItem _exportGpxItem = null;
+       private JMenuItem _exportPovItem = null;
+       private JMenuItem _undoItem = null;
+       private JMenuItem _clearUndoItem = null;
+       private JMenuItem _editPointItem = null;
+       private JMenuItem _editWaypointNameItem = null;
+       private JMenuItem _deletePointItem = null;
+       private JMenuItem _deleteRangeItem = null;
+       private JMenuItem _deleteDuplicatesItem = null;
+       private JMenuItem _compressItem = null;
+       private JMenuItem _interpolateItem = null;
+       private JMenuItem _selectAllItem = null;
+       private JMenuItem _selectNoneItem = null;
+       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 _cutAndMoveItem = null;
+       private JMenuItem _show3dItem = null;
+       private JMenu     _browserMapMenu = null;
+       private JMenuItem _saveExifItem = null;
+       private JMenuItem _connectPhotoItem = null;
+       private JMenuItem _deletePhotoItem = null;
+       private JMenuItem _disconnectPhotoItem = null;
+       private JMenuItem _correlatePhotosItem = null;
+
+       // ActionListeners for reuse by menu and toolbar
+       private ActionListener _openFileAction = null;
+       private ActionListener _addPhotoAction = null;
+       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;
+
+       // Toolbar buttons which need enabling/disabling
+       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;
 
 
        /**
         * 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)
        {
@@ -60,6 +99,7 @@ public class MenuManager implements DataSubscriber
                _app = inApp;
                _track = inTrackInfo.getTrack();
                _selection = inTrackInfo.getSelection();
+               _photos = inTrackInfo.getPhotoList();
        }
 
 
@@ -71,34 +111,78 @@ public class MenuManager implements DataSubscriber
        {
                JMenuBar menubar = new JMenuBar();
                JMenu fileMenu = new JMenu(I18nManager.getText("menu.file"));
+               // Open file
                JMenuItem openMenuItem = new JMenuItem(I18nManager.getText("menu.file.open"));
                openMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.CTRL_DOWN_MASK));
-               openMenuItem.addActionListener(new ActionListener() {
+               _openFileAction = new ActionListener() {
                        public void actionPerformed(ActionEvent e)
                        {
                                _app.openFile();
                        }
-               });
+               };
+               openMenuItem.addActionListener(_openFileAction);
                fileMenu.add(openMenuItem);
+               // Add photos
+               JMenuItem addPhotosMenuItem = new JMenuItem(I18nManager.getText("menu.file.addphotos"));
+               _addPhotoAction = new ActionListener() {
+                       public void actionPerformed(ActionEvent e)
+                       {
+                               _app.addPhotos();
+                       }
+               };
+               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);
-               _saveItem.addActionListener(new ActionListener() {
+               _saveAction = new ActionListener() {
                        public void actionPerformed(ActionEvent e)
                        {
                                _app.saveFile();
                        }
-               });
+               };
+               _saveItem.addActionListener(_saveAction);
                _saveItem.setEnabled(false);
                fileMenu.add(_saveItem);
-               // Export
-               _exportItem = new JMenuItem(I18nManager.getText("menu.file.export"));
-               _exportItem.addActionListener(new ActionListener() {
+               // Export - Kml
+               _exportKmlItem = new JMenuItem(I18nManager.getText("menu.file.exportkml"));
+               _exportKmlItem.addActionListener(new ActionListener() {
                        public void actionPerformed(ActionEvent e)
                        {
                                _app.exportKml();
                        }
                });
-               _exportItem.setEnabled(false);
-               fileMenu.add(_exportItem);
+               _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)
+                       {
+                               _app.exportPov();
+                       }
+               });
+               _exportPovItem.setEnabled(false);
+               fileMenu.add(_exportPovItem);
                fileMenu.addSeparator();
                JMenuItem exitMenuItem = new JMenuItem(I18nManager.getText("menu.file.exit"));
                exitMenuItem.addActionListener(new ActionListener() {
@@ -109,15 +193,17 @@ 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"));
-               _undoItem.addActionListener(new ActionListener() {
+               _undoAction = new ActionListener() {
                        public void actionPerformed(ActionEvent e)
                        {
                                _app.beginUndo();
                        }
-               });
+               };
+               _undoItem.addActionListener(_undoAction);
                _undoItem.setEnabled(false);
                editMenu.add(_undoItem);
                _clearUndoItem = new JMenuItem(I18nManager.getText("menu.edit.clearundo"));
@@ -130,22 +216,43 @@ public class MenuManager implements DataSubscriber
                _clearUndoItem.setEnabled(false);
                editMenu.add(_clearUndoItem);
                editMenu.addSeparator();
+               _editPointItem = new JMenuItem(I18nManager.getText("menu.edit.editpoint"));
+               _editPointAction = new ActionListener() {
+                       public void actionPerformed(ActionEvent e)
+                       {
+                               _app.editCurrentPoint();
+                       }
+               };
+               _editPointItem.addActionListener(_editPointAction);
+               _editPointItem.setEnabled(false);
+               editMenu.add(_editPointItem);
+               _editWaypointNameItem = new JMenuItem(I18nManager.getText("menu.edit.editwaypointname"));
+               _editWaypointNameItem.addActionListener(new ActionListener() {
+                       public void actionPerformed(ActionEvent e)
+                       {
+                               _app.editCurrentPointName();
+                       }
+               });
+               _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"));
@@ -185,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
@@ -238,26 +372,129 @@ public class MenuManager implements DataSubscriber
                        }
                });
                selectMenu.add(_selectNoneItem);
+               selectMenu.addSeparator();
+               _selectStartItem = new JMenuItem(I18nManager.getText("menu.select.start"));
+               _selectStartItem.setEnabled(false);
+               _selectStartAction = new ActionListener() {
+                       public void actionPerformed(ActionEvent e)
+                       {
+                               _selection.selectRangeStart();
+                       }
+               };
+               _selectStartItem.addActionListener(_selectStartAction);
+               selectMenu.add(_selectStartItem);
+               _selectEndItem = new JMenuItem(I18nManager.getText("menu.select.end"));
+               _selectEndItem.setEnabled(false);
+               _selectEndAction = new ActionListener() {
+                       public void actionPerformed(ActionEvent e)
+                       {
+                               _selection.selectRangeEnd();
+                       }
+               };
+               _selectEndItem.addActionListener(_selectEndAction);
+               selectMenu.add(_selectEndItem);
                menubar.add(selectMenu);
 
-               // Add 3d menu if available
-               if (isJava3dEnabled())
-               {
-                       JMenu threeDMenu = new JMenu(I18nManager.getText("menu.3d"));
-                       _show3dItem = new JMenuItem(I18nManager.getText("menu.3d.show3d"));
-                       _show3dItem.addActionListener(new ActionListener() {
-                               public void actionPerformed(ActionEvent e)
-                               {
-                                       _app.show3dWindow();
-                               }
-                       });
-                       _show3dItem.setEnabled(false);
-                       threeDMenu.add(_show3dItem);
-                       menubar.add(threeDMenu);
-               }
+               // 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"));
+               addPhotosMenuItem.addActionListener(_addPhotoAction);
+               photoMenu.add(addPhotosMenuItem);
+               _saveExifItem = new JMenuItem(I18nManager.getText("menu.photo.saveexif"));
+               _saveExifItem.addActionListener(new ActionListener() {
+                       public void actionPerformed(ActionEvent e)
+                       {
+                               _app.saveExif();
+                       }
+               });
+               _saveExifItem.setEnabled(false);
+               photoMenu.add(_saveExifItem);
+               _connectPhotoItem = new JMenuItem(I18nManager.getText("menu.photo.connect"));
+               _connectPhotoAction = new ActionListener() {
+                       public void actionPerformed(ActionEvent e)
+                       {
+                               _app.connectPhotoToPoint();
+                       }
+               };
+               _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)
+                       {
+                               _app.deleteCurrentPhoto();
+                       }
+               });
+               _deletePhotoItem.setEnabled(false);
+               photoMenu.add(_deletePhotoItem);
+               photoMenu.addSeparator();
+               // correlate all photos
+               _correlatePhotosItem = new JMenuItem(I18nManager.getText("menu.photo.correlate"));
+               _correlatePhotosItem.addActionListener(new ActionListener() {
+                       public void actionPerformed(ActionEvent e)
+                       {
+                               _app.beginCorrelatePhotos();
+                       }
+               });
+               _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)
@@ -266,12 +503,89 @@ 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;
        }
 
 
+       /**
+        * Create a JToolBar containing all toolbar buttons
+        * @return toolbar containing buttons
+        */
+       public JToolBar createToolBar()
+       {
+               JToolBar toolbar = new JToolBar();
+               // Add text file
+               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(IconManager.getImageIcon(IconManager.ADD_PHOTO));
+               addPhotoButton.setToolTipText(I18nManager.getText("menu.file.addphotos"));
+               addPhotoButton.addActionListener(_addPhotoAction);
+               toolbar.add(addPhotoButton);
+               // Save
+               _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(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(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(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(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(IconManager.getImageIcon(IconManager.CONNECT_PHOTO));
+               _connectPhotoButton.setToolTipText(I18nManager.getText("menu.photo.connect"));
+               _connectPhotoButton.addActionListener(_connectPhotoAction);
+               _connectPhotoButton.setEnabled(false);
+               toolbar.add(_connectPhotoButton);
+               // finish off
+               toolbar.setFloatable(false);
+               return toolbar;
+       }
+
+
        /**
         * Method to update menu when file loaded
         */
@@ -285,34 +599,18 @@ public class MenuManager implements DataSubscriber
        }
 
 
-       /**
-        * @return true if 3d capability is installed
-        */
-       private static boolean isJava3dEnabled()
-       {
-               boolean has3d = false;
-               try
-               {
-                       Class universeClass = Class.forName("com.sun.j3d.utils.universe.SimpleUniverse");
-                       has3d = true;
-               }
-               catch (ClassNotFoundException e)
-               {
-                       // no java3d classes available
-               }
-               return has3d;
-       }
-
-
        /**
         * @see tim.prune.DataSubscriber#dataUpdated(tim.prune.data.Track)
         */
-       public void dataUpdated()
+       public void dataUpdated(byte inUpdateType)
        {
                boolean hasData = (_track != null && _track.getNumPoints() > 0);
                // set functions which require data
                _saveItem.setEnabled(hasData);
-               _exportItem.setEnabled(hasData);
+               _saveButton.setEnabled(hasData);
+               _exportKmlItem.setEnabled(hasData);
+               _exportGpxItem.setEnabled(hasData);
+               _exportPovItem.setEnabled(hasData);
                _deleteDuplicatesItem.setEnabled(hasData);
                _compressItem.setEnabled(hasData);
                _rearrangeMenu.setEnabled(hasData && _track.hasMixedData());
@@ -320,18 +618,57 @@ 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);
+               _undoButton.setEnabled(hasUndo);
                _clearUndoItem.setEnabled(hasUndo);
                // is there a current point?
                boolean hasPoint = (hasData && _selection.getCurrentPointIndex() >= 0);
+               _editPointItem.setEnabled(hasPoint);
+               _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?
+               boolean anyPhotos = _photos != null && _photos.getNumPhotos() > 0;
+               _saveExifItem.setEnabled(anyPhotos);
+               // is there a current photo?
+               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)
+       {}
 }