[Commits] r361 - in apps/opengeo/geoexplorer/trunk: lib theme

[commits at geoext.org]

Author: tschaub
Date: 2009-04-08 00:43:04 +0200 (Wed, 08 Apr 2009)
New Revision: 361

Modified:
   apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js
   apps/opengeo/geoexplorer/trunk/lib/MapToolSplitToggle.js
   apps/opengeo/geoexplorer/trunk/theme/geoexplorer.css
Log:
Adding icons for existing buttons (see #136).

Modified: apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js
===================================================================
--- apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js	2009-04-07 22:19:11 UTC (rev 360)
+++ apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js	2009-04-07 22:43:04 UTC (rev 361)
@@ -265,21 +265,29 @@
 
         var toolbarItems = [
             new Ext.Button({
-                text: "Bookmark",
+                tooltip: "Bookmark",
+                iconCls: "icon-save",
                 handler: this.bookmark,
                 scope: this
             }),
             "|"
             ,
-            new MapToolToggle({
-                text: "Get Feature Info", 
-                iconCls: null,
-                toggleGroup: toolGroup, 
-                tool: mapControls.getFeatureInfo
+            new Ext.Button({
+                tooltip: "Get Feature Info",
+                iconCls: "icon-getfeatureinfo",
+                toggleGroup: toolGroup,
+                enableToggle: true,
+                toggleHandler: function(button, pressed) {
+                    if(pressed) {
+                        mapControls.getFeatureInfo.activate();
+                    } else {
+                        mapControls.getFeatureInfo.deactivate();
+                    }
+                }
             }),
             new MapToolSplitToggle({
-                text: "Measure",
-                iconCls: null,
+                tooltip: "Measure",
+                iconCls: "icon-measure",
                 defaultTool: mapControls.measureLength,
                 tools: [
                     {text: 'Length', tool: mapControls.measureLength, iconCls: null}, 

Modified: apps/opengeo/geoexplorer/trunk/lib/MapToolSplitToggle.js
===================================================================
--- apps/opengeo/geoexplorer/trunk/lib/MapToolSplitToggle.js	2009-04-07 22:19:11 UTC (rev 360)
+++ apps/opengeo/geoexplorer/trunk/lib/MapToolSplitToggle.js	2009-04-07 22:43:04 UTC (rev 361)
@@ -45,7 +45,6 @@
     this.tools = options.tools;
 
     Ext.applyIf(options, {
-        text: this.findLabel(),
         enableToggle: true,
         iconCls: this.findIconCls(),
         toggleHandler: this.handleEvent,
@@ -117,14 +116,6 @@
      */
     findIconCls: function() {
         return this.lastActiveTool.CLASS_NAME;
-    },
-
-    /**
-     * Method: findLabel
-     * Determine the text label for this split button, based on the {OpenLayers.Control} the
-     * button has been configured with.
-     */
-    findLabel: function() {
-        return this.lastActiveTool.CLASS_NAME;
     }
+
 });

Modified: apps/opengeo/geoexplorer/trunk/theme/geoexplorer.css
===================================================================
--- apps/opengeo/geoexplorer/trunk/theme/geoexplorer.css	2009-04-07 22:19:11 UTC (rev 360)
+++ apps/opengeo/geoexplorer/trunk/theme/geoexplorer.css	2009-04-07 22:43:04 UTC (rev 361)
@@ -1,7 +1,19 @@
+.icon-getfeatureinfo {
+    background-image: url(img/silk/information.png) !important;
+}
+
+.icon-save {
+    background-image: url(img/geosilk/map_save.png) !important;
+}
+
+.icon-measure {
+    background-image: url(img/geosilk/measure.png) !important;
+}
+
 .icon-zoom-in { 
-  background-image: url(img/silk/magnifier_zoom_in.png) !important;
+    background-image: url(img/silk/magnifier_zoom_in.png) !important;
 }
 
 .icon-zoom-out { 
-  background-image: url(img/silk/magnifier_zoom_out.png) !important;
+    background-image: url(img/silk/magnifier_zoom_out.png) !important;
 }
\ No newline at end of file