Mercurial > dive4elements > river
changeset 1311:981dde77b49f
#288 Added icons to the barriers combobox for digitizing features.
flys-client/trunk@2946 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Wed, 12 Oct 2011 10:22:46 +0000 |
| parents | c4c957a9c092 |
| children | 32efaea1336c |
| files | flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/client/ui/map/DrawControl.java flys-client/src/main/webapp/images/dam.png flys-client/src/main/webapp/images/ditch.png flys-client/src/main/webapp/images/pipe1.png flys-client/src/main/webapp/images/pipe2.png flys-client/src/main/webapp/images/ring_dike.png |
| diffstat | 7 files changed, 26 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/ChangeLog Wed Oct 12 09:34:38 2011 +0000 +++ b/flys-client/ChangeLog Wed Oct 12 10:22:46 2011 +0000 @@ -1,3 +1,17 @@ +2011-10-12 Ingo Weinzierl <ingo@intevation.de> + + flys/issue288 (ÜSK: Legende hinzufügen) + + * src/main/java/de/intevation/flys/client/client/ui/map/DrawControl.java: + Added icons to the barrier combobox. + + * src/main/webapp/images/dam.png, + src/main/webapp/images/pipe1.png, + src/main/webapp/images/pipe2.png, + src/main/webapp/images/ditch.png, + src/main/webapp/images/ring_dike.png: New icons used in the barrier + combobox in the digitize panel. + 2011-10-12 Ingo Weinzierl <ingo@intevation.de> * src/main/java/de/intevation/flys/client/server/CollectionItemAttributeServiceImpl.java:
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/DrawControl.java Wed Oct 12 09:34:38 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/DrawControl.java Wed Oct 12 10:22:46 2011 +0000 @@ -96,7 +96,7 @@ }); form = new DynamicForm(); - form.setWidth(75); + form.setWidth(100); form.setTitlePrefix(""); form.setTitleSuffix(""); @@ -107,10 +107,20 @@ map.put(BARRIER_DAM, MSG.getString(BARRIER_DAM)); map.put(BARRIER_RINGDIKE, MSG.getString(BARRIER_RINGDIKE)); + LinkedHashMap<String, String> ics = new LinkedHashMap<String, String>(); + ics.put(BARRIER_PIPE1, BARRIER_PIPE1); + ics.put(BARRIER_PIPE2, BARRIER_PIPE2); + ics.put(BARRIER_DITCH, BARRIER_DITCH); + ics.put(BARRIER_DAM, BARRIER_DAM); + ics.put(BARRIER_RINGDIKE, BARRIER_RINGDIKE); + SelectItem box = new SelectItem(FIELD_BARRIER_TYPE); box.setTitle(""); - box.setWidth(75); + box.setWidth(100); box.setValueMap(map); + box.setImageURLSuffix(".png"); + box.setValueIcons(ics); + box.addChangedHandler(new ChangedHandler() { public void onChanged(ChangedEvent e) { setSelectedControl();