import tim.prune.I18nManager;
import tim.prune.UpdateMessageBroker;
import tim.prune.config.Config;
-import tim.prune.data.AudioFile;
+import tim.prune.data.AudioClip;
import tim.prune.data.Photo;
+import tim.prune.data.RecentFile;
+import tim.prune.data.RecentFileList;
import tim.prune.data.Selection;
import tim.prune.data.Track;
import tim.prune.data.TrackInfo;
private JMenuItem _exportGpxItem = null;
private JMenuItem _exportPovItem = null;
private JMenuItem _exportSvgItem = null;
+ private JMenu _recentFileMenu = 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 _cropTrackItem = null;
private JMenuItem _compressItem = null;
+ private JMenuItem _markRectangleItem = null;
private JMenuItem _deleteMarkedPointsItem = null;
private JMenuItem _interpolateItem = null;
private JMenuItem _averageItem = null;
private JMenuItem _correlateAudiosItem = null;
private JMenuItem _selectNoAudioItem = null;
private JCheckBoxMenuItem _onlineCheckbox = null;
+ private JCheckBoxMenuItem _autosaveSettingsCheckbox = null;
// ActionListeners for reuse by menu and toolbar
private ActionListener _openFileAction = 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 JButton _editPointButton = null;
private JButton _deletePointButton = null;
private JButton _deleteRangeButton = null;
+ private JButton _cutAndMoveButton = null;
private JButton _selectStartButton = null;
private JButton _selectEndButton = null;
private JButton _connectButton = null;
};
openMenuItem.addActionListener(_openFileAction);
fileMenu.add(openMenuItem);
+ // import through gpsbabel
+ JMenuItem importBabelItem = makeMenuItem(FunctionLibrary.FUNCTION_IMPORTBABEL);
+ fileMenu.add(importBabelItem);
// Add photos
JMenuItem addPhotosMenuItem = new JMenuItem(I18nManager.getText("menu.file.addphotos"));
_addPhotoAction = new ActionListener() {
};
addPhotosMenuItem.addActionListener(_addPhotoAction);
fileMenu.add(addPhotosMenuItem);
- // Add audio files
+ // Add audio clips
JMenuItem addAudioMenuItem = makeMenuItem(FunctionLibrary.FUNCTION_LOAD_AUDIO);
fileMenu.add(addAudioMenuItem);
+ // recent files
+ _recentFileMenu = new JMenu(I18nManager.getText("menu.file.recentfiles"));
+ _recentFileMenu.setEnabled(false);
+ fileMenu.add(_recentFileMenu);
fileMenu.addSeparator();
// Load from GPS
JMenuItem loadFromGpsMenuItem = makeMenuItem(FunctionLibrary.FUNCTION_GPSLOAD);
});
fileMenu.add(exitMenuItem);
menubar.add(fileMenu);
+
// Track menu
JMenu trackMenu = new JMenu(I18nManager.getText("menu.track"));
setAltKey(trackMenu, "altkey.menu.track");
_compressItem = makeMenuItem(FunctionLibrary.FUNCTION_COMPRESS, false);
setShortcut(_compressItem, "shortcut.menu.edit.compress");
trackMenu.add(_compressItem);
+ _markRectangleItem = new JMenuItem(I18nManager.getText("menu.track.markrectangle"));
+ _markRectangleItem.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ _app.setCurrentMode(App.AppMode.DRAWRECT);
+ UpdateMessageBroker.informSubscribers();
+ }
+ });
+ _markRectangleItem.setEnabled(false);
+ trackMenu.add(_markRectangleItem);
_deleteMarkedPointsItem = new JMenuItem(I18nManager.getText("menu.track.deletemarked"));
_deleteMarkedPointsItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
_selectEndItem.addActionListener(_selectEndAction);
rangeMenu.add(_selectEndItem);
rangeMenu.addSeparator();
- _deleteRangeItem = new JMenuItem(I18nManager.getText("menu.range.deleterange"));
- _deleteRangeAction = new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- _app.deleteSelectedRange();
- }
- };
- _deleteRangeItem.addActionListener(_deleteRangeAction);
- _deleteRangeItem.setEnabled(false);
+ _deleteRangeItem = makeMenuItem(FunctionLibrary.FUNCTION_DELETE_RANGE, false);
rangeMenu.add(_deleteRangeItem);
+ _cropTrackItem = makeMenuItem(FunctionLibrary.FUNCTION_CROP_TRACK, false);
+ rangeMenu.add(_cropTrackItem);
_reverseItem = new JMenuItem(I18nManager.getText("menu.range.reverse"));
_reverseItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
_deleteFieldValuesItem = makeMenuItem(FunctionLibrary.FUNCTION_DELETE_FIELD_VALUES, false);
rangeMenu.add(_deleteFieldValuesItem);
rangeMenu.addSeparator();
- _interpolateItem = new JMenuItem(I18nManager.getText("menu.range.interpolate"));
- _interpolateItem.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- _app.interpolateSelection();
- }
- });
- _interpolateItem.setEnabled(false);
+ _interpolateItem = makeMenuItem(FunctionLibrary.FUNCTION_INTERPOLATE, false);
rangeMenu.add(_interpolateItem);
_averageItem = new JMenuItem(I18nManager.getText("menu.range.average"));
_averageItem.addActionListener(new ActionListener() {
_mapCheckbox.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
Config.setConfigBoolean(Config.KEY_SHOW_MAP, _mapCheckbox.isSelected());
- UpdateMessageBroker.informSubscribers();
- }
+ UpdateMessageBroker.informSubscribers(MAPSERVER_CHANGED);
+ }
});
viewMenu.add(_mapCheckbox);
// Turn off the sidebars
_app.toggleSidebars();
}
});
+ sidebarsCheckbox.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F11, 0)); // shortcut F11
viewMenu.add(sidebarsCheckbox);
// 3d
_show3dItem = makeMenuItem(FunctionLibrary.FUNCTION_3D, false);
// connect audio
_connectAudioItem = makeMenuItem(FunctionLibrary.FUNCTION_CONNECT_TO_POINT, false);
audioMenu.add(_connectAudioItem);
- // Disconnect current audio file
+ // Disconnect current audio clip
_disconnectAudioItem = makeMenuItem(FunctionLibrary.FUNCTION_DISCONNECT_AUDIO, false);
audioMenu.add(_disconnectAudioItem);
- // Remove current audio file
+ // Remove current audio clip
_removeAudioItem = makeMenuItem(FunctionLibrary.FUNCTION_REMOVE_AUDIO, false);
audioMenu.add(_removeAudioItem);
audioMenu.addSeparator();
- // Correlate audio files
+ // Correlate audio clips
_correlateAudiosItem = makeMenuItem(FunctionLibrary.FUNCTION_CORRELATE_AUDIOS, false);
audioMenu.add(_correlateAudiosItem);
menubar.add(audioMenu);
settingsMenu.addSeparator();
// Save configuration
settingsMenu.add(makeMenuItem(FunctionLibrary.FUNCTION_SAVECONFIG));
+ _autosaveSettingsCheckbox = new JCheckBoxMenuItem(
+ I18nManager.getText("menu.settings.autosave"), false);
+ _autosaveSettingsCheckbox.setSelected(Config.getConfigBoolean(Config.KEY_AUTOSAVE_SETTINGS));
+ _autosaveSettingsCheckbox.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ Config.setConfigBoolean(Config.KEY_AUTOSAVE_SETTINGS, _autosaveSettingsCheckbox.isSelected());
+ }
+ });
+ settingsMenu.add(_autosaveSettingsCheckbox);
menubar.add(settingsMenu);
// Help menu
toolbar.add(_deletePointButton);
// Delete range
_deleteRangeButton = new JButton(IconManager.getImageIcon(IconManager.DELETE_RANGE));
- _deleteRangeButton.setToolTipText(I18nManager.getText("menu.range.deleterange"));
- _deleteRangeButton.addActionListener(_deleteRangeAction);
+ _deleteRangeButton.setToolTipText(I18nManager.getText("function.deleterange"));
+ _deleteRangeButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent arg0) {
+ FunctionLibrary.FUNCTION_DELETE_RANGE.begin();
+ }
+ });
_deleteRangeButton.setEnabled(false);
toolbar.add(_deleteRangeButton);
+ // Cut and move
+ _cutAndMoveButton = new JButton(IconManager.getImageIcon(IconManager.CUT_AND_MOVE));
+ _cutAndMoveButton.setToolTipText(I18nManager.getText("menu.range.cutandmove"));
+ _cutAndMoveButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent arg0) {
+ _app.cutAndMoveSelection();
+ }
+ });
+ _cutAndMoveButton.setEnabled(false);
+ toolbar.add(_cutAndMoveButton);
// Select start, end
_selectStartButton = new JButton(IconManager.getImageIcon(IconManager.SET_RANGE_START));
_selectStartButton.setToolTipText(I18nManager.getText("menu.range.start"));
_exportPovItem.setEnabled(hasData);
_exportSvgItem.setEnabled(hasData);
_compressItem.setEnabled(hasData);
+ _markRectangleItem.setEnabled(hasData);
_deleteMarkedPointsItem.setEnabled(hasData && _track.hasMarkedPoints());
_rearrangeMenu.setEnabled(hasData && _track.hasTrackPoints() && _track.hasWaypoints());
_selectAllItem.setEnabled(hasData);
_duplicatePointItem.setEnabled(hasPoint);
// are there any photos?
boolean anyPhotos = _app.getTrackInfo().getPhotoList().getNumPhotos() > 0;
- _saveExifItem.setEnabled(anyPhotos);
+ _saveExifItem.setEnabled(anyPhotos && _app.getTrackInfo().getPhotoList().hasMediaWithFile());
// is there a current photo, audio?
Photo currentPhoto = _app.getTrackInfo().getCurrentPhoto();
boolean hasPhoto = currentPhoto != null;
- AudioFile currentAudio = _app.getTrackInfo().getCurrentAudio();
+ AudioClip currentAudio = _app.getTrackInfo().getCurrentAudio();
boolean hasAudio = currentAudio != null;
// connect is available if (photo/audio) and point selected, and media has no point
boolean connectAvailable = (hasPhoto && hasPoint && currentPhoto.getDataPoint() == null)
boolean hasRange = (hasData && _selection.hasRangeSelected());
_deleteRangeItem.setEnabled(hasRange);
_deleteRangeButton.setEnabled(hasRange);
- _interpolateItem.setEnabled(hasRange
- && (_selection.getEnd() - _selection.getStart()) == 1);
+ _cropTrackItem.setEnabled(hasRange);
+ _interpolateItem.setEnabled(hasRange);
_averageItem.setEnabled(hasRange);
_mergeSegmentsItem.setEnabled(hasRange);
_reverseItem.setEnabled(hasRange);
_deleteFieldValuesItem.setEnabled(hasRange);
_fullRangeDetailsItem.setEnabled(hasRange);
// Is the currently selected point outside the current range?
- _cutAndMoveItem.setEnabled(hasRange && hasPoint &&
+ boolean canCutAndMove = hasRange && hasPoint &&
(_selection.getCurrentPointIndex() < _selection.getStart()
- || _selection.getCurrentPointIndex() > (_selection.getEnd()+1)));
+ || _selection.getCurrentPointIndex() > (_selection.getEnd()+1));
+ _cutAndMoveItem.setEnabled(canCutAndMove);
+ _cutAndMoveButton.setEnabled(canCutAndMove);
// Has the map been switched on/off?
boolean mapsOn = Config.getConfigBoolean(Config.KEY_SHOW_MAP);
if (_mapCheckbox.isSelected() != mapsOn) {
_mapCheckbox.setSelected(mapsOn);
}
+ // Are there any recently-used files?
+ RecentFileList rfl = Config.getRecentFileList();
+ final int numRecentFiles = rfl.getNumEntries();
+ final boolean hasRecentFiles = numRecentFiles > 0;
+ _recentFileMenu.setEnabled(hasRecentFiles);
+ if (hasRecentFiles)
+ {
+ int numItems = _recentFileMenu.getMenuComponentCount();
+ if (numItems == numRecentFiles)
+ {
+ // Right number of items, just change texts
+ for (int i=0; i<numRecentFiles; i++)
+ {
+ JMenuItem item = _recentFileMenu.getItem(i);
+ item.setText(rfl.getFile(i)==null?"":rfl.getFile(i).getFile().getName());
+ item.setToolTipText(rfl.getFile(i)==null?null:rfl.getFile(i).getFile().getAbsolutePath());
+ }
+ }
+ else
+ {
+ // Rebuild menus
+ _recentFileMenu.removeAll();
+ for (int i=0; i<rfl.getSize(); i++)
+ {
+ RecentFile rf = rfl.getFile(i);
+ if (rf != null && rf.isValid())
+ {
+ JMenuItem menuItem = new JMenuItem(rf.getFile().getName());
+ menuItem.setToolTipText(rf.getFile().getAbsolutePath());
+ menuItem.addActionListener(new RecentFileTrigger(_app, i));
+ _recentFileMenu.add(menuItem);
+ }
+ }
+ }
+ }
}