[fusion-commits] r1598 - in trunk/widgets: . TaskPane

[svn_fusion at osgeo.org]

Author: pagameba
Date: 2008-10-14 14:53:23 -0400 (Tue, 14 Oct 2008)
New Revision: 1598

Added:
   trunk/widgets/TaskPane/taskpane.png
Modified:
   trunk/widgets/TaskPane.js
   trunk/widgets/TaskPane/TaskPane.css
Log:
See #115.  Finally update TaskPane to use an image strip for its embedded icons.

Modified: trunk/widgets/TaskPane/TaskPane.css
===================================================================
--- trunk/widgets/TaskPane/TaskPane.css	2008-10-14 16:01:41 UTC (rev 1597)
+++ trunk/widgets/TaskPane/TaskPane.css	2008-10-14 18:53:23 UTC (rev 1598)
@@ -25,4 +25,10 @@
 .taskPaneHelp p {
 	font-family: Arial, sans-serif;
 	font-size: 12px;
-}
\ No newline at end of file
+}
+
+/* default icons for the images in the task pane */
+img.TaskPane_back { background-position: 0px 0px; }
+img.TaskPane_forward { background-position: -16px 0px; }
+img.TaskPane_home { background-position: -32px 0px; }
+img.TaskPane_tasks { background-position: -48px 0px; }

Added: trunk/widgets/TaskPane/taskpane.png
===================================================================
(Binary files differ)


Property changes on: trunk/widgets/TaskPane/taskpane.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/widgets/TaskPane.js
===================================================================
--- trunk/widgets/TaskPane.js	2008-10-14 16:01:41 UTC (rev 1597)
+++ trunk/widgets/TaskPane.js	2008-10-14 18:53:23 UTC (rev 1598)
@@ -34,27 +34,39 @@
     aExecutedTasks: null,   //array of URLs for tasks execcuted in the TaskPane
     nCurrentTask: 0,
     nTasks: 0,
-    homeAction: null,
-    prevAction: null,
-    nextAction: null,
     
     initializeWidget: function(widgetTag){
         this.aExecutedTasks = [];
-        this.defHomeIcon = 'images/icon_home.png';
-        this.defPrevTaskIcon = 'images/icon_back.png';
-        this.defNextTaskIcon = 'images/icon_forward.png';
-        this.defTaskListIcon = 'images/icon_tasks.png';
-        this.defInitialTask = widgetTag.location + 'TaskPane/TaskPane.html';
+        var url = Fusion.getFusionURL();
+        var homeIcon =  url + widgetTag.location + 'TaskPane/taskpane.png';
+        var homeClass = 'TaskPane_home';
+        var prevIcon =  url + widgetTag.location + 'TaskPane/taskpane.png';
+        var prevClass = 'TaskPane_back';
+        var nextIcon =  url + widgetTag.location + 'TaskPane/taskpane.png';
+        var nextClass = 'TaskPane_forward';
+        var taskIcon =  url + widgetTag.location + 'TaskPane/taskpane.png';
+        var taskClass = 'TaskPane_tasks';
+        var initialTask = widgetTag.location + 'TaskPane/TaskPane.html';
               
         var json = widgetTag.extension;
-       
         
         if (json.InitialTask) {
-            this.initialTask = taskURL = json.InitialTask[0];
+            initialTask = taskURL = json.InitialTask[0];
         } else {
-            this.initialTask = Fusion.getFusionURL() + this.defInitialTask;
+            initialTask = url + initialTask;
         }
         
+        console.log(homeIcon);
+        
+        homeIcon  = json.HomeIcon  ? json.HomeIcon[0]  : homeIcon;
+        homeClass = json.HomeClass ? json.HomeClass[0] : homeClass;
+        prevIcon  = json.PreviousIcon  ? json.PreviousIcon[0]  : prevIcon;
+        prevClass = json.PreviousClass ? json.PreviousClass[0] : prevClass;
+        nextIcon  = json.NextIcon  ? json.NextIcon[0]  : nextIcon;
+        nextClass = json.NextClass ? json.NextClass[0] : nextClass;
+        taskIcon  = json.TaskIcon  ? json.TaskIcon[0]  : taskIcon;
+        taskClass = json.TaskClass ? json.TaskClass[0] : taskClass;
+        
         if (json.MenuContainer) {
             this.menuName = json.MenuContainer[0];
         }
@@ -62,17 +74,20 @@
         this.toolbar = new Jx.Toolbar();
 
         this.homeButton = new Jx.Button({
-            image: this.defHomeIcon, 
+            image: homeIcon, 
+            imageClass: homeClass,
             tooltip: OpenLayers.i18n('taskHome'),
             onClick: OpenLayers.Function.bind(this.goHome, this)
         });
         this.prevButton = new Jx.Button({
-            image: this.defPrevTaskIcon, 
+            image: prevIcon, 
+            imageClass: prevClass,
             tooltip: OpenLayers.i18n('prevTask'),
             onClick: OpenLayers.Function.bind(this.gotoPrevTask, this)
         });
         this.nextButton = new Jx.Button({
-            image: this.defNextTaskIcon, 
+            image: nextIcon, 
+            imageClass: nextClass,
             tooltip: OpenLayers.i18n('nextTask'),
             onClick: OpenLayers.Function.bind(this.gotoNextTask, this)
         });
@@ -83,7 +98,8 @@
         );
 
         this.taskMenu = new Jx.Menu({
-            image: this.defTaskListIcon, 
+            image: taskIcon,
+            imageClass: taskClass,
             label: OpenLayers.i18n('taskList'), 
             right:0
         });
@@ -112,7 +128,7 @@
         this.oTaskPane.domObj.resize();
         
         Fusion.registerForEvent(Fusion.Event.FUSION_INITIALIZED, OpenLayers.Function.bind(this.setTaskMenu, this));
-        this.getMap().registerForEvent(Fusion.Event.MAP_LOADED, OpenLayers.Function.bind(this.setContent, this,this.initialTask));
+        this.getMap().registerForEvent(Fusion.Event.MAP_LOADED, OpenLayers.Function.bind(this.setContent, this, initialTask));
     },
     
     updateButtons: function() {