Changeset 86

Timestamp:

08/17/08 09:19:50 (4 months ago)

Author:

bi..@lilyapp.org

Message:

fix bug #47.
add activity icons to the images directory and remove the gif that was there.
add a "runInBackground" method to utils.

Files:

• trunk/lily/lily/chrome/content/images/activity-extra-large.png (added)
• trunk/lily/lily/chrome/content/images/activity-large.png (added)
• trunk/lily/lily/chrome/content/images/activity-medium.png (added)
• trunk/lily/lily/chrome/content/images/activity-small.png (added)
• trunk/lily/lily/chrome/content/images/ajax-loader-black.gif (deleted)
• trunk/lily/lily/chrome/content/lily.js (modified) (3 diffs)
• trunk/lily/lily/chrome/content/patch.js (modified) (5 diffs)
• trunk/lily/lily/chrome/content/patch.xul (modified) (1 diff)
• trunk/lily/lily/chrome/content/utils.js (modified) (1 diff)

trunk/lily/lily/chrome/content/lily.js

@@ -289 +289 @@
-                //win,str,width,color
-                if(!this.initialized)
-jax-loader-black.gif
+ctivity-medium.png
-        },
-                                
@@ -873 +873 @@
-        */
-        savePatchAsAddOn: function(pID) {
-
+
-                var patchID=pID||this.currPatch;
-                
-                var exportParams = {id:patchID,type:"addon",platform:LilyUtils.navigatorPlatform()};    
-
+
-                //show a dialog to get the export details
-        Lily.getCurrentPatch().patchView.xulWin.openDialog("chrome://lily/content/exportDialog.xul", "lilyExportDialog", "chrome,titlebar,toolbar,centerscreen,modal",exportParams);            
-
+
+
+
+
-                if(exportParams.saved) {
-
+
+
+
+
+
+
-                }
-                
@@ -900 +907 @@
-        Lily.getCurrentPatch().patchView.xulWin.openDialog("chrome://lily/content/exportDialog.xul", "lilyExportDialog", "chrome,titlebar,toolbar,centerscreen,modal",exportParams);                    
-                
+                Lily.getCurrentPatch().patchView.showWindowStatusActivity(true);
+                Lily.getCurrentPatch().patchView.setWindowStatusText("Saving as app...")
+
-                if(exportParams.saved) {
-
+
+
+
+
+
+
-                }               
+                
-        },      
-

trunk/lily/lily/chrome/content/patch.js

@@ -2029 +2029 @@
-        this.chromeWin=null; //browsers chrome window
-        this.statusBar=null; //status bar
-
+
+
-        this.document=null;
-        this.body=null;
@@ -2166 +2167 @@
-                this.body.style.fontSize=LilyUtils.sizeFontForPlatform(size);
-        }
+        
+        this.showWindowStatusActivity=function(state) {                         
+                if(state)
+                        this.statusBarActivity.style.visibility="visible";
+                else
+                        this.statusBarActivity.style.visibility="hidden";
+        }       
-        
-        this.setWindowStatusIcon=function(state) {              
@@ -2235 +2243 @@
-
-                thisPtr.statusBar={setAttribute:function(){}};//
-;
+
-
-                //pass the window refs to the controller
@@ -2276 +2284 @@
-                thisPtr.head=thisPtr.oWin.document.getElementById("headElement");
-
-
-
+
+
+
-
-                //pass the window refs to the controller
@@ -2357 +2366 @@
-                thisPtr.statusBar=thisPtr.xulWin.document.getElementById("lilyStatusPanel");
-                thisPtr.statusBarIcon=thisPtr.xulWin.document.getElementById("lilyIconPanel");
+                thisPtr.statusBarActivity=thisPtr.xulWin.document.getElementById("lilyStatusActivity");         
-                                                                
-                //pass the window refs to the controller

trunk/lily/lily/chrome/content/patch.xul

@@ -189 +189 @@
-                        <statusbarpanel tooltiptext="Patch is unlocked for editing. Click to lock." onclick="opener.Lily.toggleEdit()" class="statusbarpanel-iconic" src="chrome://lily/content/images/lock_open.png" id="lilyIconPanel" width="20"/>
-                        <statusbarpanel style="height:24px;font-size:18px;font-family:verdana,DejaVu Sans,sans-serif;" id="lilyStatusPanel" flex="1"/>
+                        <image style="visibility:hidden" id="lilyStatusActivity" src="chrome://lily/content/images/activity-medium.png"/>
-                </statusbar>
-        </vbox>

trunk/lily/lily/chrome/content/utils.js

@@ -2076 +2076 @@
-        },
-        
+        /*
+                Method: runInBackGround
+                        run a method in the background.
+        
+                Arguments: 
+                        f - function to run in the background
+                        cb - function to call with the result
+        */
+        runInBackGround: function(f,cb) {
+                
+                var workingThread = function(threadID,func) {
+                  this.threadID = threadID;
+                  this.func = func;
+              this.result;
+                };
+
+                workingThread.prototype = {
+                  run: function() {
+                    try {
+                      // This is where the working thread does its processing work.
+                          this.result = this.func();
+                      // When it's done, call back to the main thread to let it know
+                      // we're finished.
+                      main.dispatch(new mainThread(this.threadID, this.result),
+                        background.DISPATCH_NORMAL);
+                    } catch(err) {
+                      Components.utils.reportError(err);
+                    }
+                  },
+
+                  QueryInterface: function(iid) {
+                    if (iid.equals(Components.interfaces.nsIRunnable) ||
+                        iid.equals(Components.interfaces.nsISupports)) {
+                            return this;
+                    }
+                    throw Components.results.NS_ERROR_NO_INTERFACE;
+                  }
+                };
+                
+                
+                var mainThread = function(threadID,result) {
+                  this.threadID = threadID;
+                  this.result = result;
+                };
+
+                mainThread.prototype = {
+                  run: function() {
+                    try {
+                      // This is where we react to the completion of the working thread.
+                                cb(this.threadID,this.result);
+                    } catch(err) {
+                      Components.utils.reportError(err);
+                    }
+                  },
+
+                  QueryInterface: function(iid) {
+                    if (iid.equals(Components.interfaces.nsIRunnable) ||
+                        iid.equals(Components.interfaces.nsISupports)) {
+                            return this;
+                    }
+                    throw Components.results.NS_ERROR_NO_INTERFACE;
+                  }
+                };      
+                
+                var background = Components.classes["@mozilla.org/thread-manager;1"].getService().newThread(0);
+                var main = Components.classes["@mozilla.org/thread-manager;1"].getService().mainThread;
+                background.dispatch(new workingThread(1,f), background.DISPATCH_NORMAL);
+                
+        },
+        
-        //drag code from https://addons.mozilla.org/en-US/seamonkey/addon/2190/ by Emanuele Ruffaldi- http://www.teslacore.it
-        dragDropHandler: function(cb) {