# HG changeset patch # User Felix Wolfsteller # Date 1346159713 0 # Node ID 57eb3826001505abee0e39880fdea51b2768eb2b # Parent abc5957bfe1cbf5457bafd4a750cc76e9df34fb9 Show logo selection box for logo chart property. flys-client/trunk@5281 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r abc5957bfe1c -r 57eb38260015 flys-client/ChangeLog --- a/flys-client/ChangeLog Tue Aug 28 13:14:03 2012 +0000 +++ b/flys-client/ChangeLog Tue Aug 28 13:15:13 2012 +0000 @@ -1,3 +1,8 @@ +2012-08-28 Felix Wolfsteller + + * src/main/java/de/intevation/flys/client/client/ui/chart/ChartPropertiesEditor.java: + Special chart properties should trigger different ui (logo select box). + 2012-08-28 Felix Wolfsteller * src/main/java/de/intevation/flys/client/client/FLYSConstants.java, diff -r abc5957bfe1c -r 57eb38260015 flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartPropertiesEditor.java --- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartPropertiesEditor.java Tue Aug 28 13:14:03 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartPropertiesEditor.java Tue Aug 28 13:15:13 2012 +0000 @@ -1,5 +1,6 @@ package de.intevation.flys.client.client.ui.chart; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -19,6 +20,7 @@ import com.smartgwt.client.widgets.form.DynamicForm; import com.smartgwt.client.widgets.form.fields.FormItem; import com.smartgwt.client.widgets.form.fields.CheckboxItem; +import com.smartgwt.client.widgets.form.fields.SelectItem; import com.smartgwt.client.widgets.form.fields.TextItem; import com.smartgwt.client.widgets.events.ClickEvent; @@ -49,6 +51,8 @@ import de.intevation.flys.client.client.services.CollectionAttributeServiceAsync; /** + * Dialog for the Chart-Properties, constructed from respective xml document. + * * @author Raimund Renkert */ public class ChartPropertiesEditor @@ -160,6 +164,7 @@ centerInPage(); } + /** * This method is called when the user aborts theming. * @param event The event. @@ -266,7 +271,8 @@ /** - * + * Generate a form with items for the properties/settings, preset with + * values. */ protected DynamicForm generatePropertySetting( Property setting, @@ -288,9 +294,13 @@ item.setValue(((IntegerProperty)orig).getValue()); } else if (setting instanceof StringProperty) { - item = createStringProperty((StringProperty)setting); + StringProperty property = (StringProperty) setting; + item = createStringProperty(property); item.setValue(((StringProperty)orig).getValue()); } + else { + GWT.log("generatePropertySetting: unknown setting type."); + } form.setFields(item); return form; } @@ -301,6 +311,33 @@ if (name.contains("-")) { name = name.replace("-", "_"); } + + String choiceAttribute = sp.getAttribute("choice"); + if (choiceAttribute != null && choiceAttribute.equals("logo")) { + SelectItem logoChooser = new SelectItem(); + LinkedHashMap valueMap = new LinkedHashMap(); + valueMap.put("BfG", "Bfg"); + valueMap.put("Intevation", "Intevation"); + logoChooser.setValueMap(valueMap); + logoChooser.setTitleStyle("color:#000;"); + logoChooser.setTitleAlign(Alignment.LEFT); + logoChooser.setTitle(MSG.getString(name)); + logoChooser.setTitleAlign(Alignment.LEFT); + logoChooser.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 logoChooser; + } + TextItem item = new TextItem(); item.setTitle(MSG.getString(name)); item.setTitleAlign(Alignment.LEFT);