Mercurial > dive4elements > river
changeset 267:7e484390d191
ISSUE-48 Added placeholder for the toolbar and the theme control in the chart output tab.
flys-client/trunk@1888 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Tue, 10 May 2011 16:49:15 +0000 |
parents | e3565f58b0ae |
children | eb3f9b6496a5 |
files | flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/client/ui/ChartOutputTab.java |
diffstat | 2 files changed, 52 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/ChangeLog Tue May 10 16:25:00 2011 +0000 +++ b/flys-client/ChangeLog Tue May 10 16:49:15 2011 +0000 @@ -1,3 +1,11 @@ +2011-05-10 Ingo Weinzierl <ingo@intevation.de> + + ISSUE-48 + + * src/main/java/de/intevation/flys/client/client/ui/ChartOutputTab.java: + Added labels placeholder for the theme control panel and the toolbar. + Both panels now have a black border. + 2011-05-10 Ingo Weinzierl <ingo@intevation.de> ISSUE-38
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/ChartOutputTab.java Tue May 10 16:25:00 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/ChartOutputTab.java Tue May 10 16:49:15 2011 +0000 @@ -6,7 +6,9 @@ import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.Img; +import com.smartgwt.client.widgets.Label; import com.smartgwt.client.widgets.layout.HLayout; +import com.smartgwt.client.widgets.layout.VLayout; import de.intevation.flys.client.shared.model.Collection; import de.intevation.flys.client.shared.model.OutputMode; @@ -18,6 +20,9 @@ */ public class ChartOutputTab extends OutputTab { + /** The canvas that wraps the chart toolbar.*/ + protected Canvas tbarPanel; + /** The canvas that wraps the theme editor.*/ protected Canvas left; @@ -35,12 +40,19 @@ public ChartOutputTab(String title, Collection collection, OutputMode mode){ super(title, collection, mode); - left = new Canvas(); - right = new Canvas(); + tbarPanel = new Canvas(); + left = new Canvas(); + right = new Canvas(); + tbarPanel.setBorder("1px solid black"); + tbarPanel.setHeight(25); + left.setBorder("1px solid black"); left.setWidth("25%"); right.setWidth("*"); + VLayout vLayout = new VLayout(); + vLayout.setMembersMargin(2); + HLayout hLayout = new HLayout(); hLayout.setWidth100(); hLayout.setHeight100(); @@ -49,13 +61,41 @@ hLayout.addMember(left); hLayout.addMember(right); + right.addChild(createChartPanel()); + left.addChild(createThemeControlPanel()); + tbarPanel.addChild(createTBarPanel()); + + vLayout.addMember(tbarPanel); + vLayout.addMember(hLayout); + + setPane(vLayout); + } + + + protected Canvas createTBarPanel() { + Label label = new Label("Werkzeugleiste"); + label.setHeight(25); + label.setMargin(5); + + return label; + } + + + protected Canvas createChartPanel() { Img chart = getChartImg(); chart.setWidth100(); chart.setHeight100(); - right.addChild(chart); + return chart; + } - setPane(hLayout); + + protected Canvas createThemeControlPanel() { + Label label = new Label("Themensteuerung"); + label.setHeight(25); + label.setMargin(5); + + return label; }