archives/citylimitsj
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tools: define default tool colors

Browse source 
so that colors do not need to be explicitly specified every time
a new tool is defined.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@914 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2014-01-05 22:13:44 +00:00
parent 2a77ddb26c
commit ec0d9ffee6
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/micropolisj/gui/MicropolisDrawingArea.java
View file

@ -253,10 +253,14 @@ public class MicropolisDrawingArea extends JComponent
ToolCursor tp = new ToolCursor(); ToolCursor tp = new ToolCursor();
tp.rect = newRect; tp.rect = newRect;
tp.borderColor = parseColor( tp.borderColor = parseColor(
strings.getString("tool."+tool.name()+".border") strings.containsKey("tool."+tool.name()+".border") ?
strings.getString("tool."+tool.name()+".border") :
strings.getString("tool.*.border")
); );
tp.fillColor = parseColor( tp.fillColor = parseColor(
strings.getString("tool."+tool.name()+".bgcolor") strings.containsKey("tool."+tool.name()+".bgcolor") ?
strings.getString("tool."+tool.name()+".bgcolor") :
strings.getString("tool.*.bgcolor")
); );
setToolCursor(tp); setToolCursor(tp);
} }

2
strings/GuiStrings.properties
View file

@ -236,6 +236,7 @@ tool.QUERY.icon = /icqry.png
tool.QUERY.selected_icon = /icqryhi.png tool.QUERY.selected_icon = /icqryhi.png
tool.QUERY.tip = Query Zone Status tool.QUERY.tip = Query Zone Status
tool.*.border = #bf7900
tool.BULLDOZER.border = #bf7900 tool.BULLDOZER.border = #bf7900
tool.WIRE.border = #ffff00 tool.WIRE.border = #ffff00
tool.ROADS.border = #5d5d5d tool.ROADS.border = #5d5d5d
@ -252,6 +253,7 @@ tool.POWERPLANT.border = #ffff00
tool.NUCLEAR.border = #ffff00 tool.NUCLEAR.border = #ffff00
tool.AIRPORT.border = #bf7900 tool.AIRPORT.border = #bf7900
tool.*.bgcolor = rgba(0,0,0,0)
tool.BULLDOZER.bgcolor = rgba(0,0,0,0) tool.BULLDOZER.bgcolor = rgba(0,0,0,0)
tool.WIRE.bgcolor = rgba(0,0,0,0.375) tool.WIRE.bgcolor = rgba(0,0,0,0.375)
tool.ROADS.bgcolor = rgba(255,255,255,0.375) tool.ROADS.bgcolor = rgba(255,255,255,0.375)