Mercurial > dive4elements > river

changeset 880:22dc88b17253

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added tooltips for the maptoolbar. flys-client/trunk@2709 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Tue, 13 Sep 2011 04:49:10 +0000
parents 5a299d49a989
children 4af1ee86b0b1
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/map/DrawControl.java flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MeasureControl.java
diffstat 8 files changed, 79 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/flys-client/ChangeLog	Mon Sep 12 15:14:45 2011 +0000
+++ b/flys-client/ChangeLog	Tue Sep 13 04:49:10 2011 +0000
@@ -1,3 +1,18 @@
+2011-09-13  Ingo Weinzierl <ingo@intevation.de>
+
+	flys/issue286 (Karte: Tooltips für die Werkzeugleiste)
+
+	* src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java,
+	  src/main/java/de/intevation/flys/client/client/ui/map/MeasureControl.java,
+	  src/main/java/de/intevation/flys/client/client/ui/map/DrawControl.java:
+	  Added tooltips for map controls.
+
+	* src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties,
+	  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_de.properties:
+	  Added tooltip texts.
+
 2011-09-12  Raimund Renkert <raimund.renkert@intevation.de>
 
 	* src/main/java/de/intevation/flys/client/client/ui/TableDataPanel.java:
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java	Mon Sep 12 15:14:45 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java	Tue Sep 13 04:49:10 2011 +0000
@@ -361,5 +361,25 @@
     String step();
 
     String calculationStarted();
+
+    String zoomMaxExtent();
+
+    String zoomIn();
+
+    String zoomOut();
+
+    String zoomLayer();
+
+    String moveMap();
+
+    String digitizeObjects();
+
+    String selectObject();
+
+    String removeObject();
+
+    String measureDistance();
+
+    String measureArea();
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties	Mon Sep 12 15:14:45 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties	Tue Sep 13 04:49:10 2011 +0000
@@ -185,3 +185,13 @@
 measurePolygon = images/measurePolygon.png
 step = Step
 calculationStarted = Calculation started.
+zoomMaxExtent = Max extent
+zoomIn = Zoom in
+zoomOut = Zoom out
+zoomLayer = Zoom to layer
+moveMap = Move
+digitizeObjects = Creation of pipes, ditches, dams and ringdikes
+selectObject = Select tool
+removeObject = Remove selected object
+measureDistance = Measure line
+measureArea = Measure area
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties	Mon Sep 12 15:14:45 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties	Tue Sep 13 04:49:10 2011 +0000
@@ -185,3 +185,13 @@
 measurePolygon = images/measurePolygon.png
 step = Schritt
 calculationStarted = Berechnung wurde gestarted.
+zoomMaxExtent = Gesamtausschnitt
+zoomIn = Hereinzoomen
+zoomOut = Herauszoomen
+zoomLayer = Zoom auf Layer
+moveMap = Verschieben
+digitizeObjects = Erstellung von Rohren, Gr\u00e4ben, D\u00e4mmen und Ringdeichen
+selectObject = Auswahlwerkzeug
+removeObject = Ausgew\u00e4hltes Objekt l\u00f6schen
+measureDistance = L\u00e4ngenmessung
+measureArea = Streckenmessung
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties	Mon Sep 12 15:14:45 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties	Tue Sep 13 04:49:10 2011 +0000
@@ -180,3 +180,13 @@
 measurePolygon = images/measurePolygon.png
 step = Step
 calculationStarted = Calculation started.
+zoomMaxExtent = Max extent
+zoomIn = Zoom in
+zoomOut = Zoom out
+zoomLayer = Zoom to layer
+moveMap = Move
+digitizeObjects = Creation of pipes, ditches, dams and ringdikes
+selectObject = Select tool
+removeObject = Remove selected object
+measureDistance = Measure line
+measureArea = Measure area
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/DrawControl.java	Mon Sep 12 15:14:45 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/DrawControl.java	Tue Sep 13 04:49:10 2011 +0000
@@ -76,6 +76,7 @@
         button.setSize(20);
         button.setShowRollOver(false);
         button.setSelected(false);
+        button.setTooltip(MSG.digitizeObjects());
 
         button.addClickHandler(new ClickHandler() {
             public void onClick(ClickEvent e) {
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java	Mon Sep 12 15:14:45 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java	Tue Sep 13 04:49:10 2011 +0000
@@ -202,6 +202,8 @@
             }
         });
 
+        zoomToMax.setTooltip(MSG.zoomMaxExtent());
+
         return zoomToMax;
     }
 
@@ -224,7 +226,9 @@
         };
 
         ImgButton button = createToggleButton(MSG.zoom_in(), cmd);
-        Map       map    = getMap();
+        button.setTooltip(MSG.zoomIn());
+
+        Map map = getMap();
         map.addControl(zoomBox);
 
         return button;
@@ -243,6 +247,8 @@
             }
         });
 
+        zoomOut.setTooltip(MSG.zoomOut());
+
         return zoomOut;
     }
 
@@ -266,6 +272,7 @@
         };
 
         final ImgButton button = createToggleButton(MSG.pan(), cmd);
+        button.setTooltip(MSG.moveMap());
 
         return button;
     }
@@ -332,6 +339,7 @@
         };
 
         ImgButton button = createToggleButton(MSG.selectFeature(), cmd);
+        button.setTooltip(MSG.selectObject());
 
         return button;
     }
@@ -361,6 +369,8 @@
             }
         });
 
+        remove.setTooltip(MSG.removeObject());
+
         return remove;
     }
 
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MeasureControl.java	Mon Sep 12 15:14:45 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MeasureControl.java	Tue Sep 13 04:49:10 2011 +0000
@@ -77,6 +77,7 @@
         btn.setSize(20);
         btn.setShowRollOver(false);
         btn.setSelected(false);
+        btn.setTooltip(MSG.measureDistance());
         btn.addClickHandler(new ClickHandler() {
             public void onClick(ClickEvent e) {
                 if (btn.isSelected()) {
@@ -118,6 +119,7 @@
         btn.setSize(20);
         btn.setShowRollOver(false);
         btn.setSelected(false);
+        btn.setTooltip(MSG.measureArea());
         btn.addClickHandler(new ClickHandler() {
             public void onClick(ClickEvent e) {
                 if (btn.isSelected()) {
http://dive4elements.wald.intevation.org