[Commits] r845 - in apps/opengeo/geoexplorer/trunk: lib lib/GeoExplorer theme theme/img/geosilk

[commits at geoext.org]

Author: dwins
Date: 2009-05-22 20:16:57 +0200 (Fri, 22 May 2009)
New Revision: 845

Added:
   apps/opengeo/geoexplorer/trunk/theme/img/geosilk/ruler.png
   apps/opengeo/geoexplorer/trunk/theme/img/geosilk/ruler_square.png
Removed:
   apps/opengeo/geoexplorer/trunk/theme/img/geosilk/measure.png
Modified:
   apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js
   apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/MapToolSplitToggle.js
   apps/opengeo/geoexplorer/trunk/theme/geoexplorer.css
Log:
Switch to new geosilk ruler icons for measure tool


Modified: apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/MapToolSplitToggle.js
===================================================================
--- apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/MapToolSplitToggle.js	2009-05-22 17:57:55 UTC (rev 844)
+++ apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/MapToolSplitToggle.js	2009-05-22 18:16:57 UTC (rev 845)
@@ -136,6 +136,7 @@
             var t = this.tools[i].tool || this.tools[i];
             if (t.active) {
                this.lastActiveTool = t;
+               if (item.iconCls) this.setIconClass(item.iconCls);
                this.toggle(true);
             }
         }

Modified: apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js
===================================================================
--- apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js	2009-05-22 17:57:55 UTC (rev 844)
+++ apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js	2009-05-22 18:16:57 UTC (rev 845)
@@ -688,12 +688,12 @@
             infoButton,
             new MapToolSplitToggle({
                 tooltip: "Measure",
-                iconCls: "icon-measure",
+                iconCls: "icon-measure-length",
                 defaultTool: measureLength,
                 allowDepress: false,
                 tools: [
-                    {text: 'Length', tool: measureLength, iconCls: null}, 
-                    {text: 'Area', tool: measureArea, iconCls: null}
+                    {text: 'Length', tool: measureLength, iconCls: 'icon-measure-length'}, 
+                    {text: 'Area', tool: measureArea, iconCls: 'icon-measure-area'}
                 ],
                 enableToggle: true,
                 toggleGroup: toolGroup 

Modified: apps/opengeo/geoexplorer/trunk/theme/geoexplorer.css
===================================================================
--- apps/opengeo/geoexplorer/trunk/theme/geoexplorer.css	2009-05-22 17:57:55 UTC (rev 844)
+++ apps/opengeo/geoexplorer/trunk/theme/geoexplorer.css	2009-05-22 18:16:57 UTC (rev 845)
@@ -39,10 +39,14 @@
     background-image: url(img/geosilk/map_save.png);
 }
 
-.x-btn .icon-measure {
-    background-image: url(img/geosilk/measure.png);
+.x-btn .icon-measure-length, .icon-measure-length {
+    background-image: url(img/geosilk/ruler.png);
 }
 
+.x-btn .icon-measure-area, .icon-measure-area {
+   background-image: url(img/geosilk/ruler_square.png);
+}
+
 .x-btn .icon-zoom-in { 
     background-image: url(img/silk/magnifier_zoom_in.png);
 }

Deleted: apps/opengeo/geoexplorer/trunk/theme/img/geosilk/measure.png
===================================================================
(Binary files differ)

Added: apps/opengeo/geoexplorer/trunk/theme/img/geosilk/ruler.png
===================================================================
(Binary files differ)


Property changes on: apps/opengeo/geoexplorer/trunk/theme/img/geosilk/ruler.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: apps/opengeo/geoexplorer/trunk/theme/img/geosilk/ruler_square.png
===================================================================
(Binary files differ)


Property changes on: apps/opengeo/geoexplorer/trunk/theme/img/geosilk/ruler_square.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream