changeset 2447:1695d66896f9

Deactivate GetFeatureInfo button if another toggle button is pressed. flys-client/trunk@4121 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Mon, 05 Mar 2012 13:30:10 +0000 (2012-03-05)
parents caae9d686372
children 30c7f8f9f1b7
files flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java
diffstat 2 files changed, 16 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/flys-client/ChangeLog	Mon Mar 05 13:09:46 2012 +0000
+++ b/flys-client/ChangeLog	Mon Mar 05 13:30:10 2012 +0000
@@ -1,3 +1,8 @@
+2012-03-05  Ingo Weinzierl <ingo@intevation.de>
+
+	* src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java:
+	  Deactivate GetFeatureInfo button if another toggle button is pressed.
+
 2012-03-05  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/client/client/ui/ProjectList.java:
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java	Mon Mar 05 13:09:46 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java	Mon Mar 05 13:30:10 2012 +0000
@@ -191,6 +191,13 @@
 
 
     protected void activateGetFeatureInfo(boolean activate) {
+        if (activate) {
+            infoButton.select();
+        }
+        else {
+            infoButton.deselect();
+        }
+
         getFeatureInfo.activate(activate);
     }
 
@@ -262,11 +269,12 @@
 
         EnableDisableCmd cmd = new EnableDisableCmd() {
             public void enable() {
-                activateZoomBox(true);
                 activatePan(false);
                 activateDrawFeature(false);
                 activateSelectFeature(false);
                 activateMeasureControl(false);
+                activateGetFeatureInfo(false);
+                activateZoomBox(true);
             }
 
             public void disable() {
@@ -309,10 +317,11 @@
         EnableDisableCmd cmd = new EnableDisableCmd() {
             public void enable() {
                 activateZoomBox(false);
-                activatePan(true);
                 activateDrawFeature(false);
                 activateSelectFeature(false);
                 activateMeasureControl(false);
+                activateGetFeatureInfo(false);
+                activatePan(true);
             }
 
             public void disable() {

http://dive4elements.wald.intevation.org