Mercurial > dive4elements > river
changeset 1619:f8c03d3af300
Reactivated the Enterprise Blue theme. Fixes some icon and image issues in IE8.
flys-client/trunk@4000 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Thu, 09 Feb 2012 13:56:55 +0000 |
| parents | 95b821d63db3 |
| children | 4a86c250d6a5 |
| files | flys-client/ChangeLog flys-client/pom.xml flys-client/src/main/java/de/intevation/flys/client/FLYS.gwt.xml flys-client/src/main/java/de/intevation/flys/client/client/FLYS.java flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageButton.java flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWidget.java flys-client/src/main/java/de/intevation/flys/client/client/ui/Toolbar.java flys-client/src/main/java/de/intevation/flys/client/client/ui/map/ElevationWindow.java |
| diffstat | 9 files changed, 41 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/ChangeLog Thu Feb 09 10:55:28 2012 +0000 +++ b/flys-client/ChangeLog Thu Feb 09 13:56:55 2012 +0000 @@ -1,3 +1,24 @@ +2012-02-09 Raimund Renkert <raimund.renkert@intevation.de> + + Reactivated the Enterprise Blue theme. + + * src/main/java/de/intevation/flys/client/FLYS.gwt.xml: + Inherit the Enterprise Blue Theme. + + * src/main/java/de/intevation/flys/client/client/FLYS.java, + src/main/java/de/intevation/flys/client/client/ui/map/ElevationWindow.java, + src/main/java/de/intevation/flys/client/client/ui/Toolbar.java, + src/main/java/de/intevation/flys/client/client/ui/CollectionView.java, + src/main/java/de/intevation/flys/client/client/ui/DatacageButton.java: + CloseClientEvent was renamed to CloseClickEvent. + + * src/main/java/de/intevation/flys/client/client/ui/DatacageWidget.java: + Adjusted icon path. + + * pom.xml: + Added dependency for smartgwt-2.5-patch containing changes for Enterprise + Blue Theme. + 2012-02-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> * src/main/java/de/intevation/flys/client/client/ui/MultipleLocationPanel.java:
--- a/flys-client/pom.xml Thu Feb 09 10:55:28 2012 +0000 +++ b/flys-client/pom.xml Thu Feb 09 13:56:55 2012 +0000 @@ -38,10 +38,15 @@ <version>${gwtVersion}</version> <scope>test</scope> </dependency> + <!--dependency> + <groupId>com.smartgwt</groupId> + <artifactId>smartgwt</artifactId> + <version>2.5</version> + </dependency--> <dependency> <groupId>com.smartgwt</groupId> <artifactId>smartgwt</artifactId> - <version>2.5</version> + <version>2.5-patch</version> </dependency> <dependency> <groupId>de.intevation.artifacts.common</groupId>
--- a/flys-client/src/main/java/de/intevation/flys/client/FLYS.gwt.xml Thu Feb 09 10:55:28 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/FLYS.gwt.xml Thu Feb 09 13:56:55 2012 +0000 @@ -16,13 +16,12 @@ <!-- Inherit the smartgwt Enterprise Theme. --> <inherits name="com.smartgwt.SmartGwtNoTheme" /> - <inherits name="com.smartclient.theme.enterprise.Enterprise"/> - <inherits name="com.smartclient.theme.enterprise.EnterpriseResources"/> + <!--inherits name="com.smartclient.theme.enterprise.Enterprise"/> + <inherits name="com.smartclient.theme.enterprise.EnterpriseResources"/--> - <!-- Does not work + <!-- Works again with smart-gwt2.5 patch from maven repository--> <inherits name="com.smartclient.theme.enterpriseblue.EnterpriseBlue"/> <inherits name="com.smartclient.theme.enterpriseblue.EnterpriseBlueResources"/> - --> <!-- Works: <inherits name="com.smartclient.theme.graphite.Graphite"/>
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYS.java Thu Feb 09 10:55:28 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYS.java Thu Feb 09 13:56:55 2012 +0000 @@ -16,7 +16,7 @@ import com.smartgwt.client.widgets.layout.VLayout; import com.smartgwt.client.widgets.layout.HLayout; import com.smartgwt.client.widgets.events.CloseClickHandler; -import com.smartgwt.client.widgets.events.CloseClientEvent; +import com.smartgwt.client.widgets.events.CloseClickEvent; import de.intevation.flys.client.shared.model.Artifact; import de.intevation.flys.client.shared.model.Collection; @@ -444,7 +444,7 @@ this.uuid = uuid; } - public void onCloseClick(CloseClientEvent event) { + public void onCloseClick(CloseClickEvent event) { flys.closeProject(uuid); } }
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java Thu Feb 09 10:55:28 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java Thu Feb 09 13:56:55 2012 +0000 @@ -12,7 +12,7 @@ import com.smartgwt.client.util.SC; import com.smartgwt.client.widgets.Window; -import com.smartgwt.client.widgets.events.CloseClientEvent; +import com.smartgwt.client.widgets.events.CloseClickEvent; import com.smartgwt.client.widgets.events.CloseClickHandler; import com.smartgwt.client.widgets.layout.Layout; import com.smartgwt.client.widgets.layout.VLayout; @@ -571,7 +571,7 @@ } - public void onCloseClick(CloseClientEvent event) { + public void onCloseClick(CloseClickEvent event) { if (collection != null) { flys.closeProject(collection.identifier()); }
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageButton.java Thu Feb 09 10:55:28 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageButton.java Thu Feb 09 13:56:55 2012 +0000 @@ -4,7 +4,7 @@ import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; import com.smartgwt.client.widgets.events.CloseClickHandler; -import com.smartgwt.client.widgets.events.CloseClientEvent; +import com.smartgwt.client.widgets.events.CloseClickEvent; import de.intevation.flys.client.shared.model.Artifact; import de.intevation.flys.client.shared.model.User; @@ -39,7 +39,7 @@ final DatacageWindow dc = new DatacageWindow( artifact, user, outs, view); dc.addCloseClickHandler(new CloseClickHandler() { - public void onCloseClick(CloseClientEvent event) { + public void onCloseClick(CloseClickEvent event) { dc.destroy(); } });
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWidget.java Thu Feb 09 10:55:28 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWidget.java Thu Feb 09 13:56:55 2012 +0000 @@ -131,7 +131,7 @@ treeGrid.setWidth100(); treeGrid.setHeight100(); treeGrid.setShowRoot(false); - treeGrid.setNodeIcon("[SKIN]/images/blank.gif"); + treeGrid.setNodeIcon("[SKIN]/../blank.gif"); treeGrid.setShowConnectors(true); treeGrid.addRecordDoubleClickHandler(new RecordDoubleClickHandler() {
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/Toolbar.java Thu Feb 09 10:55:28 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/Toolbar.java Thu Feb 09 13:56:55 2012 +0000 @@ -2,7 +2,7 @@ import com.smartgwt.client.widgets.layout.HLayout; import com.smartgwt.client.widgets.events.CloseClickHandler; -import com.smartgwt.client.widgets.events.CloseClientEvent; +import com.smartgwt.client.widgets.events.CloseClickEvent; import de.intevation.flys.client.shared.model.Artifact; import de.intevation.flys.client.shared.model.User; @@ -47,7 +47,7 @@ artifact, user, outs, outputTab.getCollectionView()); dc.addRedrawRequestHandler(handler); dc.addCloseClickHandler(new CloseClickHandler() { - public void onCloseClick(CloseClientEvent event) { + public void onCloseClick(CloseClickEvent event) { dc.destroy(); } });
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/ElevationWindow.java Thu Feb 09 10:55:28 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/ElevationWindow.java Thu Feb 09 13:56:55 2012 +0000 @@ -13,7 +13,7 @@ import com.smartgwt.client.widgets.Window; import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; -import com.smartgwt.client.widgets.events.CloseClientEvent; +import com.smartgwt.client.widgets.events.CloseClickEvent; import com.smartgwt.client.widgets.events.CloseClickHandler; import com.smartgwt.client.widgets.layout.HLayout; import com.smartgwt.client.widgets.layout.VLayout; @@ -85,7 +85,7 @@ protected void init() { addCloseClickHandler(new CloseClickHandler() { - public void onCloseClick(CloseClientEvent evt) { + public void onCloseClick(CloseClickEvent evt) { doClose(); } });