Changeset 3737 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2010-12-21T18:37:05+01:00 (14 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 1 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
r3734 r3737 223 223 OffsetBookmark.bookmarkOffset(tBookmarkName.getText(), layer); 224 224 } 225 Main.main.menu.imageryMenu Updater.refreshOffsetMenu();225 Main.main.menu.imageryMenu.refreshOffsetMenu(); 226 226 if (Main.map == null) return; 227 227 if (oldMapMode != null) { -
trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
r3720 r3737 121 121 instance.add(info); 122 122 instance.save(); 123 Main.main.menu.imageryMenu Updater.refreshImageryMenu();123 Main.main.menu.imageryMenu.refreshImageryMenu(); 124 124 } 125 125 } -
trunk/src/org/openstreetmap/josm/gui/MainMenu.java
r3733 r3737 5 5 import static org.openstreetmap.josm.tools.I18n.marktr; 6 6 import static org.openstreetmap.josm.tools.I18n.tr; 7 import static org.openstreetmap.josm.tools.I18n.trc; 8 9 import java.awt.event.ActionEvent; 7 10 8 import java.awt.event.KeyEvent; 11 import java.util.List;12 9 13 10 import javax.swing.JCheckBoxMenuItem; … … 19 16 import org.openstreetmap.josm.Main; 20 17 import org.openstreetmap.josm.actions.AboutAction; 21 import org.openstreetmap.josm.actions.AddImageryLayerAction;22 18 import org.openstreetmap.josm.actions.AddNodeAction; 23 19 import org.openstreetmap.josm.actions.AlignInCircleAction; … … 46 42 import org.openstreetmap.josm.actions.JosmAction; 47 43 import org.openstreetmap.josm.actions.JumpToAction; 48 import org.openstreetmap.josm.actions.Map_Rectifier_WMSmenuAction;49 44 import org.openstreetmap.josm.actions.MergeLayerAction; 50 45 import org.openstreetmap.josm.actions.MergeNodesAction; … … 90 85 import org.openstreetmap.josm.actions.audio.AudioSlowerAction; 91 86 import org.openstreetmap.josm.actions.search.SearchAction; 92 import org.openstreetmap.josm.data.imagery.ImageryInfo;93 import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;94 87 import org.openstreetmap.josm.gui.io.RecentlyOpenedFilesMenu; 95 import org.openstreetmap.josm.gui.layer.ImageryLayer;96 88 import org.openstreetmap.josm.gui.layer.Layer; 97 import org.openstreetmap.josm.gui.layer.WMSLayer;98 89 import org.openstreetmap.josm.gui.tagging.TaggingPresetSearchAction; 99 import org.openstreetmap.josm.tools.ImageProvider;100 90 import org.openstreetmap.josm.tools.Shortcut; 101 91 … … 190 180 public final JMenu toolsMenu = addMenu(marktr("Tools"), KeyEvent.VK_T, 3, ht("/Menu/Tools")); 191 181 public final JMenu presetsMenu = addMenu(marktr("Presets"), KeyEvent.VK_P, 4, ht("/Menu/Presets")); 192 public final JMenu imageryMenu = addMenu(marktr("Imagery"), KeyEvent.VK_I, 5, ht("/Menu/Imagery")); 182 public final ImageryMenu imageryMenu = 183 (ImageryMenu)addMenu(new ImageryMenu(), marktr("Imagery"), KeyEvent.VK_I, 5, ht("/Menu/Imagery")); 193 184 public JMenu audioMenu = null; 194 185 public final JMenu helpMenu = addMenu(marktr("Help"), KeyEvent.VK_H, 6, ht("/Menu/Help")); … … 202 193 203 194 public final TaggingPresetSearchAction presetSearchAction = new TaggingPresetSearchAction(); 204 public final ImageryMenuUpdater imageryMenuUpdater;205 195 206 196 /** … … 223 213 224 214 public JMenu addMenu(String name, int mnemonicKey, int position, String relativeHelpTopic) { 225 JMenu menu = new JMenu(tr(name)); 215 return addMenu(new JMenu(tr(name)), name, mnemonicKey, position, relativeHelpTopic); 216 } 217 218 public JMenu addMenu(JMenu menu, String name, int mnemonicKey, int position, String relativeHelpTopic) { 226 219 Shortcut.registerShortcut("menu:" + name, tr("Menu: {0}", tr(name)), mnemonicKey, 227 220 Shortcut.GROUP_MNEMONIC).setMnemonic(menu); … … 358 351 359 352 new PresetsMenuEnabler(presetsMenu).refreshEnabled(); 360 imageryMenuUpdater = new ImageryMenuUpdater();361 353 } 362 354 … … 390 382 } 391 383 } 392 393 public class ImageryMenuUpdater implements MapView.LayerChangeListener {394 JMenuItem disabledOffset = new JMenuItem(trc("layer","Offset"));395 JMenuItem offsetSubMenu = disabledOffset;396 int offsPos;397 398 public ImageryMenuUpdater() {399 MapView.addLayerChangeListener(this);400 disabledOffset.setEnabled(false);401 }402 403 public void refreshImageryMenu() {404 imageryMenu.removeAll();405 406 // for each configured WMSInfo, add a menu entry.407 for (final ImageryInfo u : ImageryLayerInfo.instance.getLayers()) {408 imageryMenu.add(new AddImageryLayerAction(u));409 }410 imageryMenu.addSeparator();411 imageryMenu.add(new JMenuItem(new Map_Rectifier_WMSmenuAction()));412 413 imageryMenu.addSeparator();414 offsPos = imageryMenu.getMenuComponentCount();415 imageryMenu.add(offsetSubMenu);416 imageryMenu.addSeparator();417 imageryMenu.add(new JMenuItem(new JosmAction(418 tr("Blank Layer"), "blankmenu", tr("Open a blank WMS layer to load data from a file"), null, false) {419 @Override420 public void actionPerformed(ActionEvent ev) {421 if (!isEnabled()) return;422 Main.main.addLayer(new WMSLayer());423 }424 425 @Override426 protected void updateEnabledState() {427 setEnabled(Main.map != null && Main.map.mapView != null && !Main.map.mapView.getAllLayers().isEmpty());428 }429 }));430 }431 432 private JMenuItem getNewOffsetMenu(){433 if (Main.map == null || Main.map.mapView == null)434 return disabledOffset;435 List<ImageryLayer> layers = Main.map.mapView.getLayersOfType(ImageryLayer.class);436 if (layers.isEmpty())437 return disabledOffset;438 if (layers.size() == 1)439 return layers.get(0).getOffsetMenuItem();440 JMenu newMenu = new JMenu(trc("layer","Offset"));441 newMenu.setIcon(ImageProvider.get("mapmode", "adjustimg"));442 for (ImageryLayer layer : layers) {443 JMenuItem layerMenu = layer.getOffsetMenuItem();444 layerMenu.setText(layer.getName());445 layerMenu.setIcon(layer.getIcon());446 newMenu.add(layerMenu);447 }448 return newMenu;449 }450 451 public void refreshOffsetMenu() {452 JMenuItem newItem = getNewOffsetMenu();453 imageryMenu.remove(offsetSubMenu);454 imageryMenu.add(newItem, offsPos);455 offsetSubMenu = newItem;456 }457 458 @Override459 public void activeLayerChange(Layer oldLayer, Layer newLayer) {460 }461 462 @Override463 public void layerAdded(Layer newLayer) {464 if (newLayer instanceof ImageryLayer) {465 refreshOffsetMenu();466 }467 }468 469 @Override470 public void layerRemoved(Layer oldLayer) {471 if (oldLayer instanceof ImageryLayer) {472 refreshOffsetMenu();473 }474 }475 }476 384 } -
trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
r3733 r3737 19 19 import javax.swing.Icon; 20 20 import javax.swing.JCheckBoxMenuItem; 21 import javax.swing.JComponent; 21 22 import javax.swing.JMenu; 22 23 import javax.swing.JMenuItem; … … 128 129 public void actionPerformed(ActionEvent ev) { 129 130 setOffset(b.dx, b.dy); 130 Main.main.menu.imageryMenu Updater.refreshOffsetMenu();131 Main.main.menu.imageryMenu.refreshOffsetMenu(); 131 132 Main.map.repaint(); 132 133 } … … 152 153 153 154 public JMenuItem getOffsetMenuItem() { 155 JMenu subMenu = new JMenu(trc("layer", "Offset")); 156 subMenu.setIcon(ImageProvider.get("mapmode", "adjustimg")); 157 return (JMenuItem)getOffsetMenuItem(subMenu); 158 } 159 160 public JComponent getOffsetMenuItem(JComponent subMenu) { 154 161 JMenuItem adjustMenuItem = new JMenuItem(adjustAction); 155 162 if (OffsetBookmark.allBookmarks.isEmpty()) return adjustMenuItem; 156 163 157 JMenu subMenu = new JMenu(trc("layer", "Offset"));158 subMenu.setIcon(ImageProvider.get("mapmode", "adjustimg"));159 164 subMenu.add(adjustMenuItem); 160 165 subMenu.add(new JSeparator()); -
trunk/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java
r3729 r3737 274 274 boolean restartRequired = false; 275 275 ImageryLayerInfo.instance.save(); 276 Main.main.menu.imageryMenu Updater.refreshImageryMenu();277 Main.main.menu.imageryMenu Updater.refreshOffsetMenu();276 Main.main.menu.imageryMenu.refreshImageryMenu(); 277 Main.main.menu.imageryMenu.refreshOffsetMenu(); 278 278 OffsetBookmark.saveBookmarks(); 279 279 … … 746 746 ImageryLayerInfo.instance.load(); 747 747 OffsetBookmark.loadBookmarks(); 748 Main.main.menu.imageryMenu Updater.refreshImageryMenu();749 Main.main.menu.imageryMenu Updater.refreshOffsetMenu();748 Main.main.menu.imageryMenu.refreshImageryMenu(); 749 Main.main.menu.imageryMenu.refreshOffsetMenu(); 750 750 } 751 751 } -
trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
r3583 r3737 712 712 } 713 713 714 private static final String[] deftoolbar = {"open", "save", "download", "upload", "|", "undo", "redo", "|", "dialogs/search", "preference", "|", "splitway", "combineway", "wayflip", "|", " tagginggroup_Highways/Streets", "tagginggroup_Highways/Ways", "tagginggroup_Highways/Waypoints", "tagginggroup_Highways/Barriers", "|", "tagginggroup_Transport/Car", "tagginggroup_Transport/Public Transport", "|", "tagginggroup_Travel/Tourism", "tagginggroup_Travel/Food+Drinks", "|", "tagginggroup_Travel/Historic Places", "|", "tagginggroup_Man-Made/Man Made"};714 private static final String[] deftoolbar = {"open", "save", "download", "upload", "|", "undo", "redo", "|", "dialogs/search", "preference", "|", "splitway", "combineway", "wayflip", "|", "imagery-offset", "|", "tagginggroup_Highways/Streets", "tagginggroup_Highways/Ways", "tagginggroup_Highways/Waypoints", "tagginggroup_Highways/Barriers", "|", "tagginggroup_Transport/Car", "tagginggroup_Transport/Public Transport", "|", "tagginggroup_Travel/Tourism", "tagginggroup_Travel/Food+Drinks", "|", "tagginggroup_Travel/Historic Places", "|", "tagginggroup_Man-Made/Man Made"}; 715 715 716 716 private static Collection<String> getToolString() {
Note:
See TracChangeset
for help on using the changeset viewer.