Changeset 117

Timestamp:

09/04/08 12:31:33 (3 months ago)

Author:

bi..@lilyapp.org

Message:

first cut at adding support for custom borders on all externs. no doubt this will need to be tweaked over the coming days

Files:

• trunk/lily/lily/chrome/content/color.html (modified) (1 diff)
• trunk/lily/lily/chrome/content/externals/panel.js (modified) (4 diffs)
• trunk/lily/lily/chrome/content/externals/slider.js (modified) (5 diffs)
• trunk/lily/lily/chrome/content/lily.js (modified) (3 diffs)
• trunk/lily/lily/chrome/content/menus.js (modified) (2 diffs)
• trunk/lily/lily/chrome/content/object/base.js (modified) (3 diffs)
• trunk/lily/lily/chrome/content/object/controller.js (modified) (5 diffs)
• trunk/lily/lily/chrome/content/patch/base.js (modified) (6 diffs)
• trunk/lily/lily/chrome/content/patch/controller.js (modified) (2 diffs)
• trunk/lily/lily/chrome/content/patch/model.js (modified) (3 diffs)
• trunk/lily/lily/chrome/content/patch/view.js (modified) (1 diff)
• trunk/lily/lily/chrome/content/xul/patch.xul (modified) (2 diffs)

trunk/lily/lily/chrome/content/color.html

@@ -46 +46 @@
-                                document.getElementById("displayHex").addEventListener("change",function(){change(this.value)},false);
-
-
+||windowType=="border"
-                                        document.getElementById("transparencyDiv").style.display="none";
-                                else

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

@@ -35 +35 @@
-        var bgcolor=args.split(" ")[0]||this.color;
-        var roundness=args.split(" ")[1]||0;
-        var bwidth=args.split(" ")[2]||0;
-        var bcolor=args.split(" ")[3]||"#000000";
-        var bstyle=args.split(" ")[4]||"solid";
-                        
-        this.color=bgcolor;
-        this.cornerRoundness=roundness;
-        this.borderWidth=bwidth;
-        this.borderColor=bcolor;
-        this.borderStyle=bstyle;
-        
-        this.args=args; 
@@ -49 +43 @@
-        
-        this.setInspectorConfig([
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        ]);     
-        
@@ -74 +55 @@
-                        
-                //update the arg str
-+" "+vals["borderWidth"]+" "+vals["borderColor"]+" "+vals["borderStyle"]
+
-
-//              this.controller.objResizeControl.clearSize();
-                this.displayElement.style.MozBorderRadius=vals["cornerRoundness"]+"%";
-                this.displayElement.style.borderWidth=vals["borderWidth"]+"px";
-                this.displayElement.style.borderColor=vals["borderColor"];
-                this.displayElement.style.borderStyle=vals["borderStyle"];
-//              this.controller.objResizeControl.resetSize();
-                        
@@ -86 +64 @@
-
-        //custom html
-"+bwidth+"px "+bcolor+" "+bstyle+"
+0px #000000 solid
-        this.ui.draw();
-        

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

@@ -43 +43 @@
-        var bgcolor=argsArr[0]||"#FF0000";
-        var roundness=argsArr[1]||0;
-        var bwidth=argsArr[2]||0;
-        var bcolor=argsArr[3]||"#000000";
-        var bstyle=argsArr[4]||"solid";
-        this.orientation=(argsArr.length>=6&&typeof argsArr[5]!="undefined")?argsArr[5]:"horizontal"; //slider orientation      
-        this.rangeStart=(argsArr.length>=7&&typeof argsArr[6]!="undefined")?parseInt(argsArr[6]):1; //slider range
@@ -52 +49 @@
-        this.handleColor=bgcolor;
-        this.cornerRoundness=roundness;
-        this.borderWidth=bwidth;
-        this.borderColor=bcolor;
-        this.borderStyle=bstyle;
-        
-        //default size
@@ -81 +75 @@
-                {name:"handleColor",value:thisPtr.handleColor,label:"Handle Color",type:"text",input:"text"},
-                {name:"cornerRoundness",value:thisPtr.cornerRoundness,label:"% Corner Roundness",type:"number",input:"text"},
-                {name:"borderWidth",value:thisPtr. borderWidth,label:"Border Width",type:"number",input:"text"},
-                {name:"borderColor",value:thisPtr. borderColor,label:"Border Color",type:"text",input:"text"},                          
-                {name:"borderStyle",value:thisPtr. borderStyle,label:"Border Style",type:"string",options:[
-                        {label:"None",value:"none"},
-                        {label:"Dashed",value:"dashed"},
-                        {label:"Dotted",value:"dotted"},
-                        {label:"Double",value:"double"},
-                        {label:"Groove",value:"groove"},
-                        {label:"Inset",value:"inset"},
-                        {label:"Outset",value:"outset"},
-                        {label:"Ridge",value:"ridge"},
-                        {label:"Solid",value:"solid"}
-                ],input:"select"},
-                {name:"orientation",value:thisPtr.orientation,label:"Orientation",type:"string",options:[{label:"Vertical",value:"vertical"},{label:"Horizontal",value:"horizontal"}],input:"radio"},
-                {name:"rangeStart",value:thisPtr.rangeStart,label:"Range Start",type:"number",input:"text"},
@@ -108 +89 @@
-                        
-                //update the arg str
-borderWidth"]+" "+vals["borderColor"]+" "+vals["borderStyle"]+" "+vals["
+
-
-                handle.style.background=vals["handleColor"];
-                handle.style.MozBorderRadius=vals["cornerRoundness"]+"%";
-                handle.style.borderWidth=vals["borderWidth"]+"px";
-                handle.style.borderColor=vals["borderColor"];
-                handle.style.borderStyle=vals["borderStyle"];
-                
-                thisPtr.init();
@@ -121 +99 @@
-                
-        //custom html
-
-border:"+bwidth+"px "+bcolor+" "+bstyle+";
+border:0px #000000 solid;
+
-        "</div>";
-                

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

@@ -1257 +1257 @@
-                        var color = this.patchObj[this.currPatch].obj.patchController.getSelectedObjectsProperty("fontColor");
-                        height = 350;
+                } else if(type=="border") {
+                        var color = this.patchObj[this.currPatch].obj.patchController.getSelectedObjectsProperty("borderColor");
+                        height = 350;
-                } else {
-                        var color = this.patchObj[this.currPatch].obj.patchController.getSelectedObjectsProperty("color");
@@ -1270 +1273 @@
-                        else if(type=="font") {
-                                Lily.setFont("fontColor",val,null);
-
+
+
+
-                                Lily.setColor(val,null,true);   
-                        }       
@@ -1423 +1428 @@
-        
-        /*
+                Method: setBorder
+                        dispatch menu command.
+                        
+                Arguments: 
+                        name - border style, 
+                        value - border size, 
+                        pID - patch ID.                                                                                 
+        */
+        setBorder: function(name, value, pID) {
+                var id=pID||this.currPatch;             
+                if(this.patchObj[id]) {
+                        this.patchObj[id].obj.patchController.setSelectedBorder(name,value); //store the updated value in the current patch     
+                        this.patchObj[id].obj.patchController.setBorder(); //notify patch listeners that the font has changed.
+                }
+        },      
+        
+        /*
-                Method: setSharedValue
-                        set shared value.

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

@@ -486 +486 @@
-                }
-                                
-
+     
-        
-        deselectFontValue: function(menu) {
@@ -585 +585 @@
-                menu.statusText="true";
-        },
+        
+        initBorderMenus:function(win) {
+                //preload the font menu
+                if(win && win.document.getElementById("menu_ObjectBorderPopup")&&win.document.getElementById("contextMenu_ObjectBorderPopup")) {
+                        this.setBorderList(win.document.getElementById("menu_ObjectBorderPopup"));
+                        this.setBorderList(win.document.getElementById("contextMenu_ObjectBorderPopup"));
+                }               
+        },
+
+        setBorderValue: function(menu) {
+                this.deselectBorderValue(menu); //clear the font menu
+
+                var menuArr=menu.childNodes;
+
+                var patch=Lily.getCurrentPatch().patchController;
+                var size=patch.getSelectedObjectsProperty("borderStyle");
+                var style=patch.getSelectedObjectsProperty("borderWidth");
+                
+                for(var i=0;i<menuArr.length;i++) {
+
+                        var label=menuArr[i].getAttribute("label");     
+                        //FIXME XXXX *** hack until we normalize the patches.                   
+                        if(size==label||style && (style.toString().toLowerCase()==label.toLowerCase())) {
+                                menuArr[i].setAttribute("checked",true);                        
+                        }
+
+                }
+        },      
+
+        deselectBorderValue: function(menu) {                   
+                var menuArr=menu.childNodes;
+
+                for(var i=0;i<menuArr.length;i++) {
+                        menuArr[i].setAttribute("checked",false);
+                }
+        },      
+        
+        setBorderList: function(menu) {
+                                
+                if(menu.statusText=="true") {
+                        return; 
+                }
+                
+                var styleArray = [
+                        "none",
+                        "dashed",
+                        "dotted",
+                        "double",
+                        "groove",
+                        "inset",
+                        "outset",
+                        "ridge",
+                        "solid"
+                ];
+                
+                var win = LilyUtils.getActiveXULWindow(); ///get the chrome window for the patch.                               
+
+        // For each search term, create a menu item element
+        var tempItem = null;
+        tempItem = win.document.createElement("menuitem");
+
+                //set attributes                        
+        tempItem.setAttribute("label", "Color...");
+        tempItem.setAttribute("name", "borderColor");
+        tempItem.setAttribute("id", "bc");
+        tempItem.setAttribute("type", "radio"); 
+                
+        tempItem.setAttribute("oncommand", "opener.Lily.openColorPicker('border')");    
+
+        // Add the item to our menu
+        menu.appendChild(tempItem);
+                
+                menu.appendChild(win.document.createElement("menuseparator"));          
+                
+            // Load the search terms into our menu
+            for(var i=0; i<15; i++)
+            {
+                // For each search term, create a menu item element
+                var tempItem = null;
+                tempItem = win.document.createElement("menuitem");
+
+                        //set attributes                        
+                tempItem.setAttribute("label", i);
+                tempItem.setAttribute("name", "borderWidth");
+                tempItem.setAttribute("id", "bs"+i);    
+                tempItem.setAttribute("type", "radio"); 
+                        
+                tempItem.setAttribute("oncommand", "opener.Lily.setBorder(\"borderWidth\","+ i +")");   
+
+                // Add the item to our menu
+                menu.appendChild(tempItem);
+            }           
+                
+            // Load the search terms into our menu
+            for(var i=15; i<150; i+=5)
+            {
+                // For each search term, create a menu item element
+                var tempItem = null;
+                tempItem = win.document.createElement("menuitem");
+
+                        //set attributes                        
+                tempItem.setAttribute("label", i);
+                tempItem.setAttribute("name", "borderWidth");
+                tempItem.setAttribute("id", "bs"+i);    
+                tempItem.setAttribute("type", "radio"); 
+                        
+                tempItem.setAttribute("oncommand", "opener.Lily.setBorder(\"borderWidth\","+ i +")");   
+
+                // Add the item to our menu
+                menu.appendChild(tempItem);
+            }   
+
+                menu.appendChild(win.document.createElement("menuseparator"));
+
+            // Load the search terms into our menu
+            for(var i=0; i<styleArray.length; i++)
+            {
+                // For each search term, create a menu item element
+                var tempItem = null;
+                tempItem = win.document.createElement("menuitem");
+
+                        //set attributes                        
+                tempItem.setAttribute("label", styleArray[i]);
+                tempItem.setAttribute("id", styleArray[i]);     
+                tempItem.setAttribute("name", "borderStyle");
+                tempItem.setAttribute("type", "radio");
+                        
+                tempItem.setAttribute("oncommand", "opener.Lily.setBorder(\"borderStyle\",\""+styleArray[i]+"\")");     
+
+                // Add the item to our menu
+                menu.appendChild(tempItem);
+            }           
+                menu.statusText="true";
+        },      
-                                
-        setObjectList: function(menu,help,context,opener) {

trunk/lily/lily/chrome/content/object/base.js

@@ -43 +43 @@
-        this.fontFamily=this.parent.fontFamily; //font family
-        this.fontColor="#000000"; //font color- maps to style property "color"  
+        this.borderColor="#000000"; //color
+        this.borderStyle="solid";
+        this.borderWidth=0;
+        this.customBorder=false; //if true then the border is saved.    
-        this.hiddenInPerf=false;
-        this.opacity=1.0; //transparency
@@ -111 +115 @@
-        }
-        
-
+
+
+
+
+
+
+
+
+
+
-        this.setCustomColor=function(val) {
-                if(val=="true") {
@@ -123 +136 @@
-        this.setPermColor=function(color) {
-                this.setColor(color,true);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-        //color

trunk/lily/lily/chrome/content/object/controller.js

@@ -110 +110 @@
-                        this.patchController.startConnection(id,true);
-                }
-LilyDebugWindow.print
+log
-                return false;           
-        }
+        
+        this.updateBorder=function() {
+                var borderArr=thisPtr.patch.patchController.getBorder();
+
+                thisPtr.objView.parent.setBorderStyle(borderArr[0],true);
+                thisPtr.objView.parent.setBorderSize(parseInt(borderArr[1]),true);
+                thisPtr.objView.parent.setBorderColor(borderArr[2],true);                               
+
+                //log(borderArr.toSource());
+        }       
-        
-        this.updateFont=function() {
@@ -121 +131 @@
-                thisPtr.objView.parent.setFontColor(fontArr[2]);                                
-                
-LilyDebugWindow.print
+log
-        }
-        
@@ -170 +180 @@
-                                fontFace:thisPtr.objView.parent.fontFamily,
-                                fontColor:thisPtr.objView.parent.fontColor,
+                                borderWidth:thisPtr.objView.parent.borderWidth,
+                                borderStyle:thisPtr.objView.parent.borderStyle,
+                                borderColor:thisPtr.objView.parent.borderColor,                         
-                                className:thisPtr.objView.parent.name,
-                                hideInPerf:thisPtr.objView.parent.hiddenInPerf
@@ -187 +200 @@
-                //font
-                thisPtr.patchController.attachPatchObserver(thisPtr.id,"fontChanged",thisPtr.updateFont,"select");
-
-name
-
+
+border
+
-                
-                //color
@@ -300 +313 @@
-                thisPtr.patchController.removePatchObserver(thisPtr.id,"fontChanged",thisPtr.updateFont,"select");
-
-name
-//             thisPtr.patchController.removePatchObserver(thisPtr.id,"nameChanged",thisPtr.updateNames
+border listener
+               thisPtr.patchController.removePatchObserver(thisPtr.id,"borderChanged",thisPtr.updateBorder
-                
-                //color

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

@@ -442 +442 @@
-                        o.setFontFamily(o.fontFamily);
-                        o.setFontSize(o.fontSize);
-
+                       
-                        
-                        //set to the default color
@@ -504 +504 @@
-                if(replaceWithSame) {
-                        //set some object properties
+                        //font
-                        if(typeof oldObj.fontSize!="undefined")
-                                o.setFontSize(oldObj.fontSize);
@@ -509 +510 @@
-                                o.setFontFamily(oldObj.fontFamily);
-                        if(typeof oldObj.fontColor!="undefined")
-
+
+
+
+
+
+
+
+
+
+
+
-                        if(typeof oldObj.opacity!="undefined")
-                                o.setTransparency(oldObj.opacity);
@@ -520 +531 @@
-                        if(typeof oldObj.height!="undefined")
-                                o.setHeight(oldObj.height);
+                        //name,cssname,hideinperf       
-                        if(typeof oldObj.hiddenInPerf!="undefined")
-                                o.controller.setHiddenInPerf(oldObj.hiddenInPerf);
@@ -526 +538 @@
-                        if(typeof oldObj.cssName!="undefined" && oldObj.cssName)
-                                o.setCSSName(oldObj.cssName);
+                        //color 
-                        if(typeof oldObj.customColor!="undefined")
-                                o.setCustomColor(oldObj.customColor);
@@ -867 +880 @@
-                                                o.setFontFamily(oArray[x].fontFamily);
-                                        if(typeof oArray[x].fontColor!="undefined")
-
+
+
+
+
+
+
+
+
+
-                                        if(typeof oArray[x].opacity!="undefined")
-                                                o.setTransparency(oArray[x].opacity);

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

@@ -88 +88 @@
-                                        fontSize:this.patch.getObj(selObj[i]).fontSize,
-                                        fontFace:this.patch.getObj(selObj[i]).fontFamily,
-
+
+
+
+
-                                        className:this.patch.getObj(selObj[i]).name,
-                                        hideInPerf:this.patch.getObj(selObj[i]).hiddenInPerf
@@ -152 +155 @@
-        }
-        
+//////////////////////////////////////////////////////////////////
+
+        //where we store updated border info destined for selected objects
+        this.selectedBorder={borderStyle:null,borderWidth:null,borderColor:null};
+
+        //notify objects that are registered for the border changed event.
+        this.setBorder=function() {
+                this.notifyPatchListeners("borderChanged");
+                this.refreshSelectedObjects();
+                setTimeout(function(){thisPtr.revertBorderToDefault();},100); //clear the font after we've notified the listeners.
+        }
+
+        //return the new border info.
+        this.getBorder=function() {
+                return [this.selectedBorder["borderStyle"],this.selectedBorder["borderWidth"]+("px"),this.selectedBorder["borderColor"]];
+        }       
+
+        //store the new border info.
+        this.setSelectedBorder=function(name,value) {
+                this.selectedBorder[name]=value;
+        }
+
+        //clear new border
+        this.revertBorderToDefault=function() {
+                this.selectedBorder["borderStyle"]=null;
+                this.selectedBorder["borderWidth"]=null;
+                this.selectedBorder["borderColor"]=null;                
+        }
+
-//////////////////////////////////////////////////////////////////
-        

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

@@ -120 +120 @@
-                        }
-                        
-
-
+
-                                j+="'name':"+quote+this.objArray[x].name+quote+comma;
-                                j+="'top':"+this.objArray[x].top+comma;
@@ -129 +128 @@
-                                j+="'fontFamily':"+quote+this.objArray[x].fontFamily+quote+comma;
-                                j+="'fontColor':"+quote+this.objArray[x].fontColor+quote+comma;                         
+                                j+="'borderWidth':"+quote+this.objArray[x].borderWidth+quote+comma;
+                                j+="'borderStyle':"+quote+this.objArray[x].borderStyle+quote+comma;
+                                j+="'borderColor':"+quote+this.objArray[x].borderColor+quote+comma;                                                     
-                                j+="'opacity':"+this.objArray[x].opacity+comma;
-                                j+="'zIndex':"+this.objArray[x].zIndex+comma;
@@ -137 +139 @@
-                                j+="'groupName':"+quote+this.objArray[x].groupName+quote+comma;
-                                j+="'cssName':"+quote+this.objArray[x].cssName+quote+comma;
-
+
+
-                                j+="'hasBeenResized':"+quote+this.objArray[x].hasBeenResized+quote+comma;                                       
-                                                                                                                                                                                                                                                                                                                                                        

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

@@ -328 +328 @@
-                thisPtr.oWin.addEventListener("contextmenu",LilyMenuBar.onContextMenu,false); //move this function.
-                //preload the font menus
-
+
+
+
+
-                                
-                //add patch listeners

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

@@ -102 +102 @@
-                                <menupopup statustext="false" id="menu_ObjectFontPopup" onpopupshowing="opener.LilyMenuBar.setFontValue(this);"/>
-                                </menu>
+                                <menu id="menu_ObjectBorder" label="&lily.Border;">
+                                <menupopup statustext="false" id="menu_ObjectBorderPopup" onpopupshowing="opener.LilyMenuBar.setBorderValue(this);"/>
+                                </menu>                         
-                                <menuitem id="menu_ObjectColor" label="&lily.Color;" oncommand="opener.Lily.openColorPicker('object')"/>                                                                                                                
-                                <menuitem id="bringForwardItem" key="lilyBringForwardKey" label="&lily.BringForward;" oncommand="opener.Lily.bringForward()"/>
@@ -176 +179 @@
-                <menupopup id="contextMenu_ObjectFontPopup" onpopupshowing="opener.LilyMenuBar.setFontValue(this);"/>
-                </menu>
+                <menu style="display:none" id="contextMenu_ObjectBorder" label="&lily.Border;">
+                <menupopup id="contextMenu_ObjectBorderPopup" onpopupshowing="opener.LilyMenuBar.setBorderValue(this);"/>
+                </menu>         
-                <menuitem style="display:none" id="contextBringForwardItem" label="&lily.BringForward;" oncommand="opener.Lily.bringForward()"/>
-                <menuitem style="display:none" id="contextSendBackItem" label="&lily.SendBack;" oncommand="opener.Lily.sendBack()"/>