mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-03-06 00:31:27 +00:00
Seamonkey downloading UI changes necessitated by b214985. r=bz, sr=brendan.
This commit is contained in:
parent
5003044cd4
commit
464dcde0ef
@ -17,8 +17,8 @@
|
||||
|
||||
<!ENTITY prompt.label "What should #1 do with this file?">
|
||||
|
||||
<!ENTITY alwaysAsk.label "Always show this dialog before handling files of this type">
|
||||
<!ENTITY alwaysAsk.accesskey "a">
|
||||
<!ENTITY alwaysHandle.label "Always perform this action when handling files of this type">
|
||||
<!ENTITY alwaysHandle.accesskey "a">
|
||||
|
||||
<!ENTITY saveToDisk.label "Save it to disk">
|
||||
<!ENTITY saveToDisk.accesskey "s">
|
||||
|
@ -271,14 +271,14 @@ nsHelperAppDialog.prototype = {
|
||||
// Initialize "always ask me" box. This should always be disabled
|
||||
// and set to true for the ambiguous type application/octet-stream.
|
||||
// Same if this dialog was forced
|
||||
var alwaysAskCheckbox = this.dialogElement( "alwaysAskMe" );
|
||||
var alwaysHandleCheckbox = this.dialogElement( "alwaysHandle" );
|
||||
if (this.mForced ||
|
||||
this.mLauncher.MIMEInfo.MIMEType == "application/octet-stream"){
|
||||
alwaysAskCheckbox.checked = true;
|
||||
alwaysAskCheckbox.disabled = true;
|
||||
alwaysHandleCheckbox.checked = false;
|
||||
alwaysHandleCheckbox.disabled = true;
|
||||
}
|
||||
else {
|
||||
alwaysAskCheckbox.checked = this.mLauncher.MIMEInfo.alwaysAskBeforeHandling;
|
||||
alwaysHandleCheckbox.checked = !this.mLauncher.MIMEInfo.alwaysAskBeforeHandling;
|
||||
}
|
||||
|
||||
// Position it.
|
||||
@ -535,7 +535,7 @@ nsHelperAppDialog.prototype = {
|
||||
if ( !this.mForced )
|
||||
{
|
||||
// We will also need to update if the "always ask" flag has changed.
|
||||
needUpdate = needUpdate || this.mLauncher.MIMEInfo.alwaysAskBeforeHandling != this.dialogElement( "alwaysAskMe" ).checked;
|
||||
needUpdate = needUpdate || this.mLauncher.MIMEInfo.alwaysAskBeforeHandling == this.dialogElement( "alwaysHandle" ).checked;
|
||||
|
||||
// One last special case: If the input "always ask" flag was false, then we always
|
||||
// update. In that case we are displaying the helper app dialog for the first
|
||||
@ -546,7 +546,7 @@ nsHelperAppDialog.prototype = {
|
||||
needUpdate = needUpdate || !this.mLauncher.MIMEInfo.alwaysAskBeforeHandling;
|
||||
|
||||
// Make sure mime info has updated setting for the "always ask" flag.
|
||||
this.mLauncher.MIMEInfo.alwaysAskBeforeHandling = this.dialogElement( "alwaysAskMe" ).checked;
|
||||
this.mLauncher.MIMEInfo.alwaysAskBeforeHandling = !this.dialogElement( "alwaysHandle" ).checked;
|
||||
}
|
||||
|
||||
return needUpdate;
|
||||
|
@ -91,7 +91,7 @@
|
||||
|
||||
<separator orient="horizontal" class="thin"/>
|
||||
|
||||
<checkbox id="alwaysAskMe" label="&alwaysAsk.label;" accesskey="&alwaysAsk.accesskey;"/>
|
||||
<checkbox id="alwaysHandle" label="&alwaysHandle.label;" accesskey="&alwaysHandle.accesskey;"/>
|
||||
|
||||
<separator class="groove"/>
|
||||
</vbox>
|
||||
|
Loading…
x
Reference in New Issue
Block a user