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 594504 - Show a message to explain why downloads with no helper apps were cancelled [r=mfinkle]

Browse Source
This commit is contained in:
Wesley Johnston 2010-09-10 15:25:09 -04:00
parent 39792f5a54
commit 738c2897bc
3 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mobile/components/HelperAppDialog.js
View File

@ -40,6 +40,11 @@ const Cu = Components.utils;
const Cr = Components.results;
const PREF_BD_USEDOWNLOADDIR = "browser.download.useDownloadDir";
#ifdef ANDROID
const URI_GENERIC_ICON_DOWNLOAD = "drawable://alertdownloads";
#else
const URI_GENERIC_ICON_DOWNLOAD = "chrome://browser/skin/images/alert-downloads-30.png";
#endif
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
@ -60,13 +65,28 @@ HelperAppLauncherDialog.prototype = {
aLauncher.MIMEInfo.preferredAction = Ci.nsIMIMEInfo.useSystemDefault;
aLauncher.launchWithApplication(null, false);
} else {
aLauncher.cancel(Cr.NS_BINDING_ABORTED);
let wasClicked = false;
let listener = {
observe: function(aSubject, aTopic, aData) {
if (aTopic == "alertclickcallback") {
wasClicked = true;
let win = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator).getMostRecentWindow("navigator:browser");
if (win)
win.BrowserUI.showPanel("downloads-container");
aLauncher.saveToDisk(null, false);
} else {
if (!wasClicked)
aLauncher.cancel(Cr.NS_BINDING_ABORTED);
}
}
};
this._notify(aLauncher, listener);
}
},
promptForSaveToFile: function hald_promptForSaveToFile(aLauncher, aContext, aDefaultFile, aSuggestedFileExt, aForcePrompt) {
let file = null;
let prefs = Services.prefs;
if (!aForcePrompt) {
@ -216,6 +236,16 @@ HelperAppLauncherDialog.prototype = {
isUsableDirectory: function hald_isUsableDirectory(aDirectory) {
return aDirectory.exists() && aDirectory.isDirectory() && aDirectory.isWritable();
},
_notify: function hald_notify(aLauncher, aCallback) {
let bundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
let notifier = Cc["@mozilla.org/alerts-service;1"].getService(Ci.nsIAlertsService);
notifier.showAlertNotification(URI_GENERIC_ICON_DOWNLOAD,
bundle.GetStringFromName("alertDownloads"),
bundle.GetStringFromName("alertCantOpenDownload"),
true, "", aCallback, "downloadopen-fail");
}
};

2
mobile/components/Makefile.in
View File

@ -54,6 +54,7 @@ EXTRA_PP_COMPONENTS = \
AboutRedirector.js \
BrowserCLH.js \
DirectoryProvider.js\
HelperAppDialog.js \
Sidebar.js \
SessionStore.js \
$(NULL)
@ -64,7 +65,6 @@ EXTRA_COMPONENTS = \
ContentPermissionPrompt.js \
XPIDialogService.js \
DownloadManagerUI.js \
HelperAppDialog.js \
PromptService.js \
ContentDispatchChooser.js \
AutoCompleteCache.js \

1
mobile/locales/en-US/chrome/browser.properties
View File

@ -89,6 +89,7 @@ alertAddonsDisabled=#1 incompatible add-on was disabled;#1 incompatible add-ons
alertDownloads=Downloads
alertDownloadsStart=Downloading: %S
alertDownloadsDone=%S has finished downloading
alertCantOpenDownload=Can't open file. Tap to save it.
# Notifications
notificationRestart.normal=Restart to complete changes.