Changeset 786 in josm
- Timestamp:
- 2008-08-15T21:32:41+02:00 (16 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java
r775 r786 1 1 // License: GPL. Copyright 2007 by Immanuel Scholz and others 2 2 package org.openstreetmap.josm.data.osm.visitor; 3 4 import static org.openstreetmap.josm.tools.I18n.marktr; 3 5 4 6 import java.awt.BasicStroke; … … 368 370 // Shows areas before non-areas 369 371 public void visitAll(DataSet data) { 370 inactiveColor = Preferences.getPreferencesColor( "inactive", Color.DARK_GRAY);371 selectedColor = Preferences.getPreferencesColor( "selected", Color.YELLOW);372 nodeColor = Preferences.getPreferencesColor( "node", Color.RED);373 dfltWayColor = Preferences.getPreferencesColor( "way", darkblue);374 incompleteColor = Preferences.getPreferencesColor( "incomplete way", darkerblue);375 backgroundColor = Preferences.getPreferencesColor( "background", Color.BLACK);376 untaggedColor = Preferences.getPreferencesColor( "untagged",Color.GRAY);377 textColor = Preferences.getPreferencesColor ( "text", Color.WHITE);372 inactiveColor = Preferences.getPreferencesColor(marktr("inactive"), Color.DARK_GRAY); 373 selectedColor = Preferences.getPreferencesColor(marktr("selected"), Color.YELLOW); 374 nodeColor = Preferences.getPreferencesColor(marktr("node"), Color.RED); 375 dfltWayColor = Preferences.getPreferencesColor(marktr("way"), darkblue); 376 incompleteColor = Preferences.getPreferencesColor(marktr("incomplete way"), darkerblue); 377 backgroundColor = Preferences.getPreferencesColor(marktr("background"), Color.BLACK); 378 untaggedColor = Preferences.getPreferencesColor(marktr("untagged"),Color.GRAY); 379 textColor = Preferences.getPreferencesColor (marktr("text"), Color.WHITE); 378 380 showDirectionArrow = Main.pref.getBoolean("draw.segment.direction"); 379 381 showRelevantDirectionsOnly = Main.pref.getBoolean("draw.segment.relevant_directions_only"); -
trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java
r775 r786 1 1 // License: GPL. Copyright 2007 by Immanuel Scholz and others 2 2 package org.openstreetmap.josm.data.osm.visitor; 3 4 import static org.openstreetmap.josm.tools.I18n.marktr; 3 5 4 6 import java.awt.BasicStroke; … … 90 92 91 93 public void visitAll(DataSet data) { 92 inactiveColor = Preferences.getPreferencesColor( "inactive", Color.DARK_GRAY);93 selectedColor = Preferences.getPreferencesColor( "selected", Color.WHITE);94 nodeColor = Preferences.getPreferencesColor( "node", Color.RED);95 dfltWayColor = Preferences.getPreferencesColor( "way", darkblue);96 relationColor = Preferences.getPreferencesColor( "relation", teal);97 untaggedWayColor = Preferences.getPreferencesColor( "untagged way", darkgreen);98 incompleteColor = Preferences.getPreferencesColor( "incomplete way", darkerblue);99 backgroundColor = Preferences.getPreferencesColor( "background", Color.BLACK);94 inactiveColor = Preferences.getPreferencesColor(marktr("inactive"), Color.DARK_GRAY); 95 selectedColor = Preferences.getPreferencesColor(marktr("selected"), Color.WHITE); 96 nodeColor = Preferences.getPreferencesColor(marktr("node"), Color.RED); 97 dfltWayColor = Preferences.getPreferencesColor(marktr("way"), darkblue); 98 relationColor = Preferences.getPreferencesColor(marktr("relation"), teal); 99 untaggedWayColor = Preferences.getPreferencesColor(marktr("untagged way"), darkgreen); 100 incompleteColor = Preferences.getPreferencesColor(marktr("incomplete way"), darkerblue); 101 backgroundColor = Preferences.getPreferencesColor(marktr("background"), Color.BLACK); 100 102 showDirectionArrow = Main.pref.getBoolean("draw.segment.direction"); 101 103 showRelevantDirectionsOnly = Main.pref.getBoolean("draw.segment.relevant_directions_only"); -
trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
r743 r786 3 3 package org.openstreetmap.josm.gui.layer; 4 4 5 import static org.openstreetmap.josm.tools.I18n.marktr; 5 6 import static org.openstreetmap.josm.tools.I18n.tr; 6 7 import static org.openstreetmap.josm.tools.I18n.trn; … … 156 157 Point p1 = mv.getPoint(en1); 157 158 Point p2 = mv.getPoint(en2); 158 Color color = inactive ? Preferences.getPreferencesColor( "inactive", Color.DARK_GRAY) :159 Preferences.getPreferencesColor( "downloaded Area", Color.YELLOW);159 Color color = inactive ? Preferences.getPreferencesColor(marktr("inactive"), Color.DARK_GRAY) : 160 Preferences.getPreferencesColor(marktr("downloaded Area"), Color.YELLOW); 160 161 g.setColor(color); 161 162 g.drawRect(Math.min(p1.x,p2.x), Math.min(p1.y, p2.y), Math.abs(p2.x-p1.x), Math.abs(p2.y-p1.y));
Note:
See TracChangeset
for help on using the changeset viewer.