Mercurial > dive4elements > river
changeset 3512:b8a8ecdebc0d
i18n and interpretation for logo placement chart property.
flys-client/trunk@5285 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 28 Aug 2012 15:54:38 +0000 |
| parents | 57eb38260015 |
| children | c657c0bbcf8f |
| files | flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartPropertiesEditor.java |
| diffstat | 6 files changed, 42 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/ChangeLog Tue Aug 28 13:15:13 2012 +0000 +++ b/flys-client/ChangeLog Tue Aug 28 15:54:38 2012 +0000 @@ -1,3 +1,14 @@ +2012-08-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + * src/main/java/de/intevation/flys/client/client/ui/chart/ChartPropertiesEditor.java: + Special chart properties should trigger different ui (logo placement box). + + * src/main/java/de/intevation/flys/client/client/FLYSConstants.java, + src/main/java/de/intevation/flys/client/client/FLYSConstants.properties, + src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties, + src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties: + Added i18n strings for logo-placements in charts. + 2012-08-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> * src/main/java/de/intevation/flys/client/client/ui/chart/ChartPropertiesEditor.java:
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Tue Aug 28 13:15:13 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Tue Aug 28 15:54:38 2012 +0000 @@ -845,6 +845,8 @@ String display_logo(); + String logo_place(); + String linetype(); String textstyle();
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Tue Aug 28 13:15:13 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Tue Aug 28 15:54:38 2012 +0000 @@ -432,6 +432,7 @@ subtitle = Subtitle display_grid = Display grid display_logo = Display logo +logo_place = Place for logo linetype = Linetype textstyle = Textstyle
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Tue Aug 28 13:15:13 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Tue Aug 28 15:54:38 2012 +0000 @@ -432,6 +432,7 @@ subtitle = Untertitel display_grid = Gitterlinien anzeigen display_logo = Logo anzeigen +logo_place = Logoort linetype = Linientyp textstyle = Textstil
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Tue Aug 28 13:15:13 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Tue Aug 28 15:54:38 2012 +0000 @@ -433,6 +433,7 @@ subtitle = Subtitle display_grid = Display grid display_logo = Display logo +logo_place = Place for logo linetype = Linetype textstyle = Textstyle
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartPropertiesEditor.java Tue Aug 28 13:15:13 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartPropertiesEditor.java Tue Aug 28 15:54:38 2012 +0000 @@ -337,6 +337,32 @@ }); return logoChooser; } + else if (choiceAttribute != null && choiceAttribute.equals("place")) { + SelectItem placeChooser = new SelectItem(); + LinkedHashMap valueMap = new LinkedHashMap<String, String>(); + valueMap.put("top", "top"); + valueMap.put("bottom", "bottom"); + valueMap.put("left", "left"); + valueMap.put("right", "right"); + placeChooser.setValueMap(valueMap); + placeChooser.setTitleStyle("color:#000;"); + placeChooser.setTitleAlign(Alignment.LEFT); + placeChooser.setTitle(MSG.getString(name)); + placeChooser.setTitleAlign(Alignment.LEFT); + placeChooser.addBlurHandler(new BlurHandler() { + public void onBlur(BlurEvent e) { + String val; + if (e.getItem().getValue() == null) { + val = ""; + } + else { + val = e.getItem().getValue().toString(); + } + sp.setValue(val); + } + }); + return placeChooser; + } TextItem item = new TextItem(); item.setTitle(MSG.getString(name));