Changeset 57

Timestamp:

07/16/08 00:15:59 (2 months ago)

Author:

bi..@lilyapp.org

Message:

Adding a patch properties dialog with the ability to defined the size of a patch when opened in a subpatch.

Files:

• trunk/lily/lily/chrome/content/externals.js (modified) (2 diffs)
• trunk/lily/lily/chrome/content/externals/patcher.js (modified) (1 diff)
• trunk/lily/lily/chrome/content/externals/subpatch.js (modified) (7 diffs)
• trunk/lily/lily/chrome/content/externals/wow.js (modified) (1 diff)
• trunk/lily/lily/chrome/content/lily.js (modified) (7 diffs)
• trunk/lily/lily/chrome/content/model.js (modified) (1 diff)
• trunk/lily/lily/chrome/content/patch.js (modified) (4 diffs)
• trunk/lily/lily/chrome/content/patch.xul (modified) (1 diff)
• trunk/lily/lily/chrome/content/utils.js (modified) (4 diffs)
• trunk/lily/lily/chrome/locale/en-US/lily.dtd (modified) (1 diff)

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

@@ -125 +125 @@
-        */
-        includeAll:function() {
+                
-                for(var i=0;i<this.objArray.length;i++) { //don't load patches
-                        if(this.isLoadable(this.objArray[i].name) && this.objArray[i].path && typeof this.objLeaf[this.objArray[i].name]=="undefined") {
-                                //log(this.objArray[i].name)
-                                var extName = LilyUtils.stripExtension(this.objArray[i].name);
-                                try {
@@ -135 +135 @@
-                                        this.objArray[i].menuName=LilyUtils.getObjectMetaData(objName).textName;
-                                        this.objArray[i].catName=LilyUtils.getObjectMetaData(objName).objectCategory;
-LilyUtils.getObjectMetaData(objName).objectSummary
+(LilyUtils.getObjectMetaData(objName).objectSummary?LilyUtils.getObjectMetaData(objName).objectSummary:LilyUtils.extractPatchDesc(this.objArray[i].sourceCode))
-                                        this.objArray[i].objArguments=LilyUtils.getObjectMetaData(objName).objectArguments;                                                             
-                                        this.objDisplay[((this.objArray[i].menuName)?this.objArray[i].menuName:"tmp")]=objName;

trunk/lily/lily/chrome/content/externals/patcher.js

@@ -179 +179 @@
-        function openPatch(data,file) {
-                                                                
-
+Utils
-                var parentDir=(file.parent.isDirectory())?file.parent:null; //patch's parent dir.
-                thisPatch.obj = new LilyPatch(pid,Lily,sizeArr[0],sizeArr[1],false,{type:"iframe",win:iframe,parent:thisPtr.parent.patchView.xulWin}); //call the patch constructor

trunk/lily/lily/chrome/content/externals/subpatch.js

@@ -40 +40 @@
-        //inspector values
-        var argsArr = LilyUtils.splitArgs(args); //split the args
-
+
+
-        this.patchArgs = argsArr.join(" ")||""; //the remainder of the args as string
+        
+        if(/##\w+##/.test(this.patchArgs)) {
+                //pull out the patch name and use that as the display
+                this.displayName = this.patchArgs.match(/##(\w+)##/)[1];
+                //if there any additional args, strip out the classname and assign them to display args. otherwise displayargs = false.
+                this.displayArgs = (!/^##\w+##/.test(this.patchArgs))?this.patchArgs.replace(/##\w+##/,""):false;
+                this.loadsSubPatchByName = true;
+        }       
-        
-        //inlet/outlet arrays
@@ -49 +58 @@
-        this.setInspectorConfig([
-                {name:"fPath",value:thisPtr.fPath,label:"Patch Path",type:"string",input:"file"},
-
+Ptr
-        ]);
-        
@@ -73 +82 @@
-        function replacePatchArgs(arg_str,data) {
-                var patch_str = data;
-);
+.replace(/##\w+##/,""));          
-                for(var i=0;i<tmp.length;i++) {
-                        var re = new RegExp("\\#"+(i+1),"g");
@@ -86 +95 @@
-                        setTimeout(function(){
-                                //thisPatch = {obj:null,id:pid,file:null,json:null}; //reset the thispatch object
-args
+patchArgs.replace(/##\w+##/,"")
-                                o.setHeight(thisPtr.height);
-                                o.setWidth(thisPtr.width);
@@ -177 +186 @@
-        function openPatch(data,file) {
-                                                
-
+Utils
-                var parentDir=(file.parent.isDirectory())?file.parent:null; //patch's parent dir.
-                thisPatch.obj = new LilyPatch(pid,Lily,sizeArr[0],sizeArr[1],false,{type:"iframe",win:thisPtr.displayElement,parent:thisPtr.parent.patchView.xulWin}); //call the patch constructor
@@ -234 +243 @@
-                        
-                        var parent_patch = thisPatch.obj.getTopPatch(); //get the top level patch
-
-
-
+
+
+
+
+
+
+
-                
-        }
@@ -251 +264 @@
-        function frameLoad() {
-                thisPtr.displayElement.removeEventListener("load",frameLoad,true); //remove this so we don't loop
-
+
+
+
-        }
-                

trunk/lily/lily/chrome/content/externals/wow.js

@@ -274 +274 @@
-        function openPatch(data,file) {
-                                                                
-
+Utils
-                var parentDir=(file.parent.isDirectory())?file.parent:null; //patch's parent dir.
-                thisPatch.obj = new LilyPatch(pid,Lily,sizeArr[0],sizeArr[1],false,{type:"iframe",win:_iframe,parent:thisPtr.parent.patchView.xulWin}); //call the patch constructor

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

@@ -591 +591 @@
-                var hidden=hide||false;
-                
-thi
+LilyUtil
-                var patchID=this.newPatch(sizeArr[0],sizeArr[1],readonly,hidden); //patch constructor- opens blank window.
-                var parentDir=(file.parent.isDirectory())?file.parent:null; //patch's parent dir.
@@ -643 +643 @@
-                } else {
-                        
-thi
+LilyUtil
-                        var patchID=this.newPatch(sizeArr[0],sizeArr[1],readonly,false);
-                                                
@@ -714 +714 @@
-                var data=fileObj.data;
-                
-thi
+LilyUtil
-                
-                document.getElementById("lilyContentSplitter").setAttribute("collapsed",false);
@@ -748 +748 @@
-                        
-        },      
-                
-        /*
-                Method: extractPatchSize
-                        get the patch size without having to eval the patch JSON.
-                        
-                Arguments: 
-                        data - JSON patch string.
-                        
-                Returns: 
-                        An array of patch width & height.                                                                       
-        */      
-        extractPatchSize: function(data) {
-                var wArr=data.match(/'width':(\d+)/);
-                var hArr=data.match(/'height':(\d+)/);          
-                
-                if(wArr && hArr)
-                        return [wArr[1],hArr[1]];
-                else
-                        return [0,0];
-        },
-        
-        /*
@@ -834 +814 @@
-                var data=LilyUtils.readFile(file);
-                
-thi
+LilyUtil
-                var patchID=this.newPatch(sizeArr[0],sizeArr[1],false,false);
-                
@@ -974 +954 @@
-                        //update the patch name before we serialize
-                        //yes, this is a mess
-
-
-
+
+
+
+
+
-                        //now we've updated the patch title, so serialize
-                        var data=this.patchObj[pID].obj.patchModel.serializeDom();
@@ -1198 +1180 @@
-                if(this.patchObj[id]&&this.patchObj[id].obj.patchController.getEditable()=="edit")              
-                        this.patchObj[id].obj.patchController.selectAll();
+        },
+
+        /*
+                Method: openPatchProperties
+                        dispatch menu command.
+        */
+        openPatchProperties: function() {
+                var p = this.patchObj[this.currPatch].obj;
+                var win = p.patchView.xulWin;
+                
+                var initVals = { 
+                        title:  p.title,
+                        color:  p.color,                        
+                        height: p.heightInSubPatch, 
+                        width:  p.widthInSubPatch,
+                        desc:   LilyUtils.unescape(p.description)       
+                };
+                
+                win.openDialog("chrome://lily/content/patch-properties.xul", "cWin","width=450,height=405,left=50,top=550,close=no,scrollbars=no,dialog=yes,resizable=no,toolbar=no,menubar=no,location=no,status=no,chrome=yes,alwaysRaised=yes",function(val){
+                        for(var x in val) {
+                                switch(x) {
+                                        case "title":
+                                                p.patchView.setPatchTitle(val[x]);
+                                        case "color":
+                                                p.patchView.setPatchColor(val[x]);
+                                        case "height":
+                                                p.heightInSubPatch=val[x];
+                                        case "width":
+                                                p.widthInSubPatch=val[x];
+                                        case "desc":
+                                                p.description=LilyUtils.escape(val[x]);
+                                }                               
+                        }
+                },initVals);
+                        
-        },
-

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

@@ -103 +103 @@
-                j+="'height':"+this.patch.height+comma;
-                j+="'color':"+quote+this.patch.color+quote+comma;
-
+
+
+
+
-                
-                j+="'objArray':"+oBrace;

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

@@ -33 +33 @@
-        this.width=(width&&!hide)?width:(hide)?0:800; //width   
-        this.height=(height&&!hide)?height:(hide)?0:600; //height
+        this.heightInSubPatch=0; //height when loaded in a subpatch
+        this.widthInSubPatch=0;  //width when loaded in a subpatch
+        this.description="";    //patch description.
-        this.color="#FFFFFF" //background color
+        this.desc="";           //patch description
-        this.fontSize=LilyUtils.getDefaultFont()[1]; //font size in px
-        this.fontFamily=LilyUtils.getDefaultFont()[0]; //font face
@@ -416 +420 @@
-                        o.init(); //generic- user defined
-                } else if(obj && typeof obj == "string") {
-
+
+
+
+
+
+
+
-                }
-                
@@ -729 +739 @@
-                        if(typeof patch.color!="undefined" && !subPatchID && !opID)
-                                this.patchView.setPatchColor(patch.color); //update color
+                                
+                        if(typeof patch.description!="undefined" && !subPatchID && !opID)
+                                this.description=patch.description; //update color
+                                
+                        if(typeof patch.heightInSubPatch!="undefined" && !subPatchID && !opID)
+                                this.heightInSubPatch=parseInt(patch.heightInSubPatch); //update color  
+                                
+                        if(typeof patch.widthInSubPatch!="undefined" && !subPatchID && !opID)
+                                this.widthInSubPatch=parseInt(patch.widthInSubPatch); //update color                                                    
-                        
-                        var oArray=patch.objArray; //top level 'patch' object defined in the patch json
@@ -1679 +1698 @@
-                var patchArr = thisPtr.patch.patchModel.subPatchArray;
-                for(var x  in patchArr) {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                }
-        }

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

@@ -83 +83 @@
-                    <menuitem id="patchEditOption" key="lilyToggleEditKey" label="&lily.Edit;" type="checkbox" autocheck="true" checked="false" option="patchEdit" oncommand="opener.Lily.toggleEdit()"/>
-                                <menuitem id="menu_PatchColor" label="&lily.Color;" oncommand="opener.Lily.openColorPicker('patch')"/>
+                                <menuitem id="menu_PatchProperties" label="&lily.PatchProperties;..." oncommand="opener.Lily.openPatchProperties()"/>
-                                <!--<menuitem id="menu_PatchZoomIn" label="&lily.ZoomIn;" oncommand="opener.Lily.zoomIn()"/>
-                                <menuitem id="menu_PatchZoomOut" label="&lily.ZoomOut;" oncommand="opener.Lily.zoomOut()"/>

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

@@ -441 +441 @@
-        */
-        stripLTQuotes: function(str) {
-
+
+
+
+
+
-        },
-        
@@ -1401 +1405 @@
-        isPatchString: function(str) {
-                return (/var patch={/.test(str));
+        },
+        
+        /*
+                Method: extractPatchDesc
+                        get the patch size without having to eval the patch JSON.
+                        
+                Arguments: 
+                        data - JSON patch string.
+                        
+                Returns: 
+                        Patch description.                                                                      
+        */      
+        extractPatchDesc: function(data) {
+                var desc=data.match(/'description':'([\S|\s]+)','heightInSubPatch'/);           
+                
+                if(desc && desc.length>1)
+                        return desc[1];
+                else
+                        return "";
+        },
+        
+        /*
+                Method: extractPatchSize
+                        get the patch size without having to eval the patch JSON.
+                        
+                Arguments: 
+                        data - JSON patch string.
+                        
+                Returns: 
+                        An array of patch width & height.                                                                       
+        */      
+        extractPatchSize: function(data) {
+                var wArr=data.match(/'width':(\d+)/);
+                var hArr=data.match(/'height':(\d+)/);          
+                
+                if(wArr && hArr)
+                        return [wArr[1],hArr[1]];
+                else
+                        return [0,0];
+        },
+        
+        /*
+                Method: extractSizeInSubPatch
+                        get the size in subpatch without having to eval the patch JSON.
+                        
+                Arguments: 
+                        data - JSON patch string.
+                        
+                Returns: 
+                        An array of patch width & height when opened in subpatch.                                                                       
+        */      
+        extractSizeInSubPatch: function(data) {
+                                
+                if(typeof data == "string") {
+                        var wArr=data.match(/'widthInSubPatch':'(\d+)'/);
+                        var hArr=data.match(/'heightInSubPatch':'(\d+)'/);      
+                        
+                        if(wArr && hArr){
+                                return [parseInt(wArr[1]),parseInt(hArr[1])];
+                        }else{
+                                return [0,0];
+                        }
+                                
+                } else {
+                                return [0,0];
+                }
-        },      
-        
@@ -2331 +2401 @@
-        }
-        
+        this.resize=function(w,h) {
+                parent.setHeight(h);
+                parent.setWidth(w);
+                frameCover.style.height=(h+5)+"px";
+                frameCover.style.width=(w+5)+"px";              
+        }
+        
-        //set the object size
-        if(h)
@@ -2341 +2418 @@
-        frameCover=parent.parent.patchView.displayHTML("");
-        frameCover.id=parent.createElID("frameCover");
-
+ //debug
-        frameCover.style.position='absolute';
-        frameCover.style.left=(parent.left)+"px";

trunk/lily/lily/chrome/locale/en-US/lily.dtd

@@ -32 +32 @@
-<!ENTITY  lily.Show                         "Show on Lock">
-<!ENTITY  lily.PatchFolder          "Open Patch Directory">
+<!ENTITY  lily.PatchProperties      "Patch Properties">
-
-<!ENTITY  lily.ObjectMenu           "Externals">