- Timestamp:
- 2009-08-12T18:01:22+02:00 (15 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
r1924 r1971 294 294 return getStyleSet(null, false); 295 295 } 296 297 public Collection<String> getStyleNames() 298 { 299 return styleSet.keySet(); 300 } 296 301 } -
trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java
r1777 r1971 5 5 6 6 import java.awt.GridBagLayout; 7 import java.util.Collection; 8 import java.util.TreeSet; 7 9 8 10 import javax.swing.BorderFactory; … … 35 37 Main.pref.getBoolean("mappaint.icon.enable-defaults", true)); 36 38 37 styleCombo.addItem("standard");38 39 39 sources = new StyleSources("mappaint.style.sources", "mappaint.icon.sources", 40 40 "http://josm.openstreetmap.de/styles", false, tr("Map Paint Styles")); 41 41 42 String style = Main.pref.get("mappaint.style", "standard"); 43 if(!style.equals("standard")) 42 Collection<String> styles = new TreeSet<String>(MapPaintStyles.getStyles().getStyleNames()); 43 String defstyle = Main.pref.get("mappaint.style", "standard"); 44 styles.add(defstyle); 45 for(String style : styles) 44 46 styleCombo.addItem(style); 45 47 46 48 styleCombo.setEditable(true); 47 49 for (int i = 0; i < styleCombo.getItemCount(); ++i) { 48 if (((String)styleCombo.getItemAt(i)).equals( style)) {50 if (((String)styleCombo.getItemAt(i)).equals(defstyle)) { 49 51 styleCombo.setSelectedIndex(i); 50 52 break;
Note:
See TracChangeset
for help on using the changeset viewer.