Changeset 90
- Timestamp:
- 08/17/08 14:51:40 (4 months ago)
- Files:
-
- trunk/lily/lily/chrome/content/apikey.xul (deleted)
- trunk/lily/lily/chrome/content/applicationpatch.xul (deleted)
- trunk/lily/lily/chrome/content/color.xul (deleted)
- trunk/lily/lily/chrome/content/debug.js (modified) (1 diff)
- trunk/lily/lily/chrome/content/debug.xul (deleted)
- trunk/lily/lily/chrome/content/export-window.xul (deleted)
- trunk/lily/lily/chrome/content/export.xul (deleted)
- trunk/lily/lily/chrome/content/exportDialog.xul (deleted)
- trunk/lily/lily/chrome/content/exporter.js (modified) (1 diff)
- trunk/lily/lily/chrome/content/hiddenpatch.xul (deleted)
- trunk/lily/lily/chrome/content/inspector.js (modified) (1 diff)
- trunk/lily/lily/chrome/content/inspector.xul (deleted)
- trunk/lily/lily/chrome/content/lily.js (modified) (4 diffs)
- trunk/lily/lily/chrome/content/patch-properties.xul (deleted)
- trunk/lily/lily/chrome/content/patch.js (modified) (2 diffs)
- trunk/lily/lily/chrome/content/patch.xul (deleted)
- trunk/lily/lily/chrome/content/readonlypatch.xul (deleted)
- trunk/lily/lily/chrome/content/xul (added)
- trunk/lily/lily/chrome/content/xul/apikey.xul (added)
- trunk/lily/lily/chrome/content/xul/applicationpatch.xul (added)
- trunk/lily/lily/chrome/content/xul/color.xul (added)
- trunk/lily/lily/chrome/content/xul/debug.xul (added)
- trunk/lily/lily/chrome/content/xul/export-window.xul (added)
- trunk/lily/lily/chrome/content/xul/export.xul (added)
- trunk/lily/lily/chrome/content/xul/exportDialog.xul (added)
- trunk/lily/lily/chrome/content/xul/hiddenpatch.xul (added)
- trunk/lily/lily/chrome/content/xul/inspector.xul (added)
- trunk/lily/lily/chrome/content/xul/patch-properties.xul (added)
- trunk/lily/lily/chrome/content/xul/patch.xul (added)
- trunk/lily/lily/chrome/content/xul/readonlypatch.xul (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lily/lily/chrome/content/debug.js
r40 r90 40 40 open:function () { 41 41 if(!this.dWin) { 42 this.dWin=window.openDialog("chrome://lily/content/ debug.xul", "dWin","width=350,height=600,left=50,top=50,toolbar=no,menubar=no,location=no,resizable=yes,scrollbars=yes,status=no,chrome=yes",function(){LilyDebugWindow.init();});42 this.dWin=window.openDialog("chrome://lily/content/xul/debug.xul", "dWin","width=350,height=600,left=50,top=50,toolbar=no,menubar=no,location=no,resizable=yes,scrollbars=yes,status=no,chrome=yes",function(){LilyDebugWindow.init();}); 43 43 } 44 44 }, trunk/lily/lily/chrome/content/exporter.js
r89 r90 466 466 tmpOut.append("prefs.xul"); 467 467 LilyUtils.writeFile(tmpOut,LilyUtils.readFile(tmpIn).replace(/chrome:\/\/lily/g,("chrome://"+projectName))); 468 469 //readonlypatch.xul470 /*471 var tmpIn = contentIn.clone();472 tmpIn.append("applicationpatch.xul");473 var tmpOut = contentOut.clone();474 tmpOut.append("readonlypatch.xul");475 LilyUtils.writeFile(tmpOut,LilyUtils.readFile(tmpIn).replace(/chrome:\/\/lily/g,("chrome://"+projectName)));476 */477 468 478 469 //readonlypatch.xul trunk/lily/lily/chrome/content/inspector.js
r76 r90 73 73 if(!this.iWin) { 74 74 var tmp_coords = LilyUtils.getOpenDialogCoords(300,300); 75 this.iWin=window.openDialog("chrome://lily/content/ inspector.xul", "iWin","width=300,height=300,left="+tmp_coords[0]+",top="+tmp_coords[1]+",toolbar=no,menubar=no,location=no,resizable=yes,scrollbars=yes,status=no,chrome=yes",function(){LilyInspectorWindow.init(id);});75 this.iWin=window.openDialog("chrome://lily/content/xul/inspector.xul", "iWin","width=300,height=300,left="+tmp_coords[0]+",top="+tmp_coords[1]+",toolbar=no,menubar=no,location=no,resizable=yes,scrollbars=yes,status=no,chrome=yes",function(){LilyInspectorWindow.init(id);}); 76 76 } else { 77 77 LilyInspectorWindow.init(id); trunk/lily/lily/chrome/content/lily.js
r87 r90 878 878 879 879 //show a dialog to get the export details 880 Lily.getCurrentPatch().patchView.xulWin.openDialog("chrome://lily/content/ exportDialog.xul", "lilyExportDialog", "chrome,titlebar,toolbar,centerscreen,modal",exportParams);880 Lily.getCurrentPatch().patchView.xulWin.openDialog("chrome://lily/content/xul/exportDialog.xul", "lilyExportDialog", "chrome,titlebar,toolbar,centerscreen,modal",exportParams); 881 881 882 882 Lily.getCurrentPatch().patchView.showWindowStatusActivity(true); … … 905 905 906 906 //show a dialog to get the export details 907 Lily.getCurrentPatch().patchView.xulWin.openDialog("chrome://lily/content/ exportDialog.xul", "lilyExportDialog", "chrome,titlebar,toolbar,centerscreen,modal",exportParams);907 Lily.getCurrentPatch().patchView.xulWin.openDialog("chrome://lily/content/xul/exportDialog.xul", "lilyExportDialog", "chrome,titlebar,toolbar,centerscreen,modal",exportParams); 908 908 909 909 Lily.getCurrentPatch().patchView.showWindowStatusActivity(true); … … 1216 1216 var tmp = LilyUtils.getOpenDialogCoords(450,450); 1217 1217 1218 win.openDialog("chrome://lily/content/ patch-properties.xul", "cWin","width=450,height=450,left="+tmp[0]+",top="+tmp[1]+",close=no,scrollbars=no,dialog=yes,resizable=no,toolbar=no,menubar=no,location=no,status=no,chrome=yes,alwaysRaised=yes",function(val){1218 win.openDialog("chrome://lily/content/xul/patch-properties.xul", "cWin","width=450,height=450,left="+tmp[0]+",top="+tmp[1]+",close=no,scrollbars=no,dialog=yes,resizable=no,toolbar=no,menubar=no,location=no,status=no,chrome=yes,alwaysRaised=yes",function(val){ 1219 1219 for(var x in val) { 1220 1220 switch(x) { … … 1261 1261 var initVals = { color: color, type: type }; 1262 1262 1263 win.openDialog("chrome://lily/content/ color.xul", "cWin","width=250,height="+height+",left="+tmp[0]+",top="+tmp[1]+",close=no,scrollbars=no,dialog=yes,resizable=no,toolbar=no,menubar=no,location=no,status=no,chrome=yes,alwaysRaised=yes",function (val) {1263 win.openDialog("chrome://lily/content/xul/color.xul", "cWin","width=250,height="+height+",left="+tmp[0]+",top="+tmp[1]+",close=no,scrollbars=no,dialog=yes,resizable=no,toolbar=no,menubar=no,location=no,status=no,chrome=yes,alwaysRaised=yes",function (val) { 1264 1264 if(type=="patch") 1265 1265 Lily.setPatchColor(val); trunk/lily/lily/chrome/content/patch.js
r87 r90 2391 2391 if(!this.patch.hidden && !this.patch.readonly && !extWin) { 2392 2392 var tmp_coords = LilyUtils.getOpenDialogOffset(winWidth,winHeight); 2393 this.xulWin=window.openDialog("chrome://lily/content/ patch.xul", pID,"width="+winWidth+",height="+winHeight+",left="+tmp_coords[0]+",top="+tmp_coords[1]+",menubar=yes,toolbar=no,location=no,resizable=yes,scrollbars=yes,status=yes,chrome=yes",initWindow,pID);2393 this.xulWin=window.openDialog("chrome://lily/content/xul/patch.xul", pID,"width="+winWidth+",height="+winHeight+",left="+tmp_coords[0]+",top="+tmp_coords[1]+",menubar=yes,toolbar=no,location=no,resizable=yes,scrollbars=yes,status=yes,chrome=yes",initWindow,pID); 2394 2394 //hidden patch 2395 2395 } else if(this.patch.hidden && !extWin) { … … 2398 2398 extWin.win.addEventListener("load",initIframe,true); 2399 2399 extWin.win.contentWindow.location.href="chrome://lily/content/patch.xhtml"; 2400 //this.xulWin=window.openDialog("chrome://lily/content/ hiddenpatch.xul", pID,"",initReadOnlyWindow,pID); //hidden patch2400 //this.xulWin=window.openDialog("chrome://lily/content/xul/hiddenpatch.xul", pID,"",initReadOnlyWindow,pID); //hidden patch 2401 2401 } else if(this.patch.readonly && !extWin) { 2402 2402 var tmp_coords = LilyUtils.getOpenDialogOffset(winWidth,winHeight); 2403 this.xulWin=window.openDialog("chrome://lily/content/ readonlypatch.xul", pID,"width="+winWidth+",height="+winHeight+",left="+tmp_coords[0]+",top="+tmp_coords[1]+",menubar=yes,toolbar=no,location=no,resizable=yes,scrollbars=yes,status=yes,chrome=yes",initReadOnlyWindow,pID);2403 this.xulWin=window.openDialog("chrome://lily/content/xul/readonlypatch.xul", pID,"width="+winWidth+",height="+winHeight+",left="+tmp_coords[0]+",top="+tmp_coords[1]+",menubar=yes,toolbar=no,location=no,resizable=yes,scrollbars=yes,status=yes,chrome=yes",initReadOnlyWindow,pID); 2404 2404 //patch in iframe 2405 2405 } else if(extWin && extWin.type=="iframe") {
