Changeset 4203 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2011-07-06T17:10:23+02:00 (13 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java
r4139 r4203 45 45 selected = Main.pref.getBoolean("draw.fullscreen", false); 46 46 notifySelectedState(); 47 }48 49 public boolean canFullscreen() {50 /* We only support fullscreen, see51 * http://lists.openstreetmap.org/pipermail/josm-dev/2009-March/002659.html52 * for why53 */54 return Main.platform instanceof PlatformHookUnixoid && gd.isFullScreenSupported();55 47 } 56 48 … … 105 97 frame.setBounds(new Rectangle(Toolkit.getDefaultToolkit().getScreenSize())); 106 98 } 107 99 108 100 // we cannot use hw-exclusive fullscreen mode in MS-Win, as long 109 101 // as josm throws out modal dialogs, see here: -
trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
r4198 r4203 42 42 Collections.<Collection<String>>emptySet())) { 43 43 ImageryInfo i = new ImageryInfo(c); 44 /* FIXME: Remove the attribution copy stuff end of 2011 */ 45 if(!i.hasAttribution()) { 46 String url = i.getUrl(); 47 for(ImageryInfo d : defaultLayers) { 48 if(url.equals(d.getUrl())) { 49 i.copyAttribution(d); 50 i.setBounds(d.getBounds()); 51 break; 44 String url = i.getUrl(); 45 if(url != null) { 46 /* FIXME: Remove the attribution copy stuff end of 2011 */ 47 if(!i.hasAttribution()) { 48 for(ImageryInfo d : defaultLayers) { 49 if(url.equals(d.getUrl())) { 50 i.copyAttribution(d); 51 i.setBounds(d.getBounds()); 52 break; 53 } 52 54 } 53 55 } 56 add(i); 54 57 } 55 add(i);56 58 } 57 59 Collections.sort(layers); -
trunk/src/org/openstreetmap/josm/gui/MainMenu.java
r4175 r4203 306 306 // -- fullscreen toggle action 307 307 fullscreenToggleAction = new FullscreenToggleAction(); 308 if ( fullscreenToggleAction.canFullscreen()) {308 if (Main.platform.canFullscreen()) { 309 309 final JCheckBoxMenuItem fullscreen = new JCheckBoxMenuItem(fullscreenToggleAction); 310 310 viewMenu.addSeparator(); -
trunk/src/org/openstreetmap/josm/tools/PlatformHook.java
r4153 r4203 104 104 public String getDefaultStyle(); 105 105 106 public boolean canFullscreen(); 107 106 108 public boolean rename(File from, File to); 107 109 } -
trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
r4153 r4203 272 272 273 273 @Override 274 public boolean canFullscreen() 275 { 276 return false; 277 } 278 279 @Override 274 280 public boolean rename(File from, File to) 275 281 { -
trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
r4153 r4203 2 2 package org.openstreetmap.josm.tools; 3 3 4 import java.awt.GraphicsEnvironment; 4 5 import java.awt.event.KeyEvent; 5 6 import java.io.File; … … 81 82 82 83 @Override 84 public boolean canFullscreen() 85 { 86 return GraphicsEnvironment.getLocalGraphicsEnvironment() 87 .getDefaultScreenDevice().isFullScreenSupported(); 88 } 89 90 @Override 83 91 public boolean rename(File from, File to) 84 92 { -
trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
r4153 r4203 63 63 64 64 @Override 65 public boolean canFullscreen() 66 { 67 return false; 68 } 69 70 @Override 65 71 public boolean rename(File from, File to) 66 72 {
Note:
See TracChangeset
for help on using the changeset viewer.