Changeset 4230 in josm for trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
- Timestamp:
- 2011-07-13T10:41:01+02:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
r3754 r4230 24 24 import javax.swing.Icon; 25 25 import javax.swing.JCheckBoxMenuItem; 26 import javax.swing.JColorChooser;27 26 import javax.swing.JOptionPane; 28 27 import javax.swing.SwingUtilities; … … 39 38 import org.openstreetmap.josm.gui.dialogs.LayerListDialog; 40 39 import org.openstreetmap.josm.gui.dialogs.LayerListPopup; 40 import org.openstreetmap.josm.gui.layer.CustomizeColor; 41 41 import org.openstreetmap.josm.gui.layer.GpxLayer; 42 42 import org.openstreetmap.josm.gui.layer.Layer; … … 149 149 } 150 150 151 static public Color getColor(String name) 151 @Override 152 public Color getColor(boolean ignoreCustom) 152 153 { 154 String name = getName(); 153 155 return Main.pref.getColor(marktr("gps marker"), name != null ? "layer "+name : null, Color.gray); 156 } 157 158 /* for preferences */ 159 static public Color getGenericColor() 160 { 161 return Main.pref.getColor(marktr("gps marker"), Color.gray); 154 162 } 155 163 156 164 @Override public void paint(Graphics2D g, MapView mv, Bounds box) { 157 165 boolean showTextOrIcon = isTextOrIconShown(); 158 g.setColor(getColor( getName()));166 g.setColor(getColor(true)); 159 167 160 168 if (mousePressed) { … … 203 211 components.add(LayerListDialog.getInstance().createDeleteLayerAction()); 204 212 components.add(SeparatorLayerAction.INSTANCE); 205 components.add(new CustomizeColor( ));213 components.add(new CustomizeColor(this)); 206 214 components.add(SeparatorLayerAction.INSTANCE); 207 215 components.add(new SynchronizeAudio()); … … 396 404 } 397 405 398 399 406 @Override 400 407 public boolean supportLayers(List<Layer> layers) { 401 408 return layers.size() == 1 && layers.get(0) instanceof MarkerLayer; 402 }403 }404 405 private class CustomizeColor extends AbstractAction {406 407 public CustomizeColor() {408 super(tr("Customize Color"), ImageProvider.get("colorchooser"));409 putValue("help", ht("/Action/LayerCustomizeColor"));410 }411 412 @Override413 public void actionPerformed(ActionEvent e) {414 JColorChooser c = new JColorChooser(getColor(getName()));415 Object[] options = new Object[]{tr("OK"), tr("Cancel"), tr("Default")};416 int answer = JOptionPane.showOptionDialog(417 Main.parent,418 c,419 tr("Choose a color"),420 JOptionPane.OK_CANCEL_OPTION,421 JOptionPane.PLAIN_MESSAGE,422 null,423 options,424 options[0]425 );426 switch (answer) {427 case 0:428 Main.pref.putColor("layer "+getName(), c.getColor());429 break;430 case 1:431 return;432 case 2:433 Main.pref.putColor("layer "+getName(), null);434 break;435 }436 Main.map.repaint();437 409 } 438 410 }
Note:
See TracChangeset
for help on using the changeset viewer.