Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 226958 convert xpistatus.xul to <dialog> p=gautheri@noos.fr r=me sr=ben a=asa

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@149993 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
neil%parkwaycc.co.uk 2003-12-03 23:44:58 +00:00
parent 131d5aeaa4
commit 6bb3a484e5
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/xpinstall/res/content/xpistatus.js
View File

@ -74,8 +74,9 @@ var progressHooks =
// nsXPInstallManager is done with us, but we'll let users
// dismiss the dialog themselves so they can see the status
// (unless we're closing because the user cancelled)
document.getElementById("ok").disabled = false;
document.getElementById("cancel").disabled = true;
document.documentElement.getButton("accept").disabled = false;
document.documentElement.getButton("cancel").disabled = true;
document.documentElement.getButton("accept").focus();
gCanClose = true;
if (gCancelled)
@ -105,9 +106,8 @@ var progressHooks =
function onLoad()
{
doSetOKCancel(dlgOK, dlgCancel);
document.getElementById("ok").disabled = true;
document.getElementById("cancel").focus();
document.documentElement.getButton("accept").disabled = true;
document.documentElement.getButton("cancel").focus();
gBundle = document.getElementById("xpinstallBundle");
var param = window.arguments[0].QueryInterface(
@ -161,9 +161,7 @@ function addTreeItem(aRow, aName, aUrl)
document.getElementById("xpirows").appendChild(row);
}
function dlgOK() { return true; }
function dlgCancel()
function onCancel()
{
gCancelled = true;
if (gManager)

16
mozilla/xpinstall/res/content/xpistatus.xul
View File

@ -25,22 +25,20 @@
-->
<?xml-stylesheet href="chrome://communicator/skin/xpinstall/xpinstall.css" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<!DOCTYPE window SYSTEM "chrome://communicator/locale/xpinstall/xpistatus.dtd" >
<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/xpinstall/xpistatus.dtd">
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
title="&progressTitle.label;"
onload="onLoad()"
onclose="return gCanClose"
id="statusDlg"
class="dialog"
style="width: 50em"
ondialogcancel="return onCancel();"
>
<script src="chrome://communicator/content/xpinstall/xpistatus.js"/>
<keyset id="dialogKeys"/>
<stringbundle id="xpinstallBundle" src="chrome://communicator/locale/xpinstall/xpinstall.properties"/>
<vbox id="mainProgressBox" flex="1">
@ -56,10 +54,6 @@
</rows>
</grid>
</groupbox>
<separator class="thin"/>
<hbox id="okCancelButtonsRight"/>
</vbox>
</window>
</dialog>