wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 391598 - "make upgrade/update process smoother and avoid confusing/modal dialogs" (rename the "Later" button, remove the modal dialog) [p=dao@mozilla.com (Dão Gottwald) r=mconnor a=blocking-firefox3+]

Browse Source
This commit is contained in:
reed@reedloden.com 2008-01-29 20:42:33 -08:00
parent 79085d9d3d
commit 8b495c89e5
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toolkit/locales/en-US/chrome/mozapps/update/updates.properties
View File

@ -45,12 +45,10 @@ downloadButton_minor=Download & Install Now »
downloadButton_minor.accesskey=D
downloadButton_major=Get the new version »
downloadButton_major.accesskey=G
laterButton=Later
laterButton.accesskey=a
notNowButton=Not Now
notNowButton.accesskey=o
neverButton=Never
neverButton.accesskey=N
restartLaterTitle=Software Update
restartLaterMsg=The update will be installed the next time %S starts.
resumePausedAfterCloseTitle=Software Update
resumePausedAfterCloseMessage=You have paused downloading this update. Do you want %S to download the update in the background while you continue to browse?

13
toolkit/mozapps/update/content/updates.js
View File

@ -740,7 +740,7 @@ var gUpdatesAvailablePage = {
gUpdates.setButtons(null, true, "downloadButton_" + severity,
false, null, false,
null, false, true,
"laterButton", false,
"notNowButton", false,
severity == "major" ? "neverButton" : null, false);
gUpdates.wiz.getButton("next").focus();
},
@ -1573,7 +1573,7 @@ var gFinishedPage = {
*/
onPageShow: function(aDelayRestart) {
gUpdates.setButtons(null, true, null, true, "restartButton", aDelayRestart,
"laterButton", false, false, null, false, null, false);
"notNowButton", false, false, null, false, null, false);
if (aDelayRestart)
setTimeout(this._enableRestartButton, 2000);
else
@ -1662,17 +1662,10 @@ var gFinishedPage = {
},
/**
* Called when the wizard is canceled, i.e. when the "Later" button is
* Called when the wizard is canceled, i.e. when the "Not Now" button is
* clicked.
*/
onWizardCancel: function() {
var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
.getService(Components.interfaces.nsIPromptService);
var message = gUpdates.strings.getFormattedString("restartLaterMsg",
[gUpdates.brandName]);
ps.alert(window, gUpdates.strings.getString("restartLaterTitle"),
message);
var interval = getPref("getIntPref", PREF_UPDATE_NAGTIMER_RESTART, 86400);
gUpdates.registerNagTimer("restart-nag-timer", interval,
"showUpdateComplete");