From 1da6992c3661849b2698860b17d7e41b4e7af3d1 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Mon, 7 Jun 2010 15:46:54 -0400
Subject: [PATCH] Bug 570156 - Convert download dialog to a nsIPromptService
 prompt [r=mbrubeck]

---
 mobile/chrome/content/browser.js              | 39 -------------
 mobile/chrome/content/browser.xul             | 12 ----
 mobile/components/HelperAppDialog.js          | 55 +++++++++++++++++--
 mobile/locales/en-US/chrome/browser.dtd       |  5 --
 .../locales/en-US/chrome/browser.properties   |  8 +++
 mobile/themes/hildon/platform.css             |  1 +
 6 files changed, 59 insertions(+), 61 deletions(-)

diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index 5c01c771cdf..07d67760b38 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -2718,45 +2718,6 @@ var AlertsHelper = {
   }
 };
 
-var HelperAppDialog = {
-  _launcher: null,
-  _container: null,
-
-  show: function had_show(aLauncher) {
-    this._launcher = aLauncher;
-    document.getElementById("helperapp-target").value = this._launcher.suggestedFileName;
-
-    if (!this._launcher.MIMEInfo.hasDefaultHandler)
-      document.getElementById("helperapp-open").disabled = true;
-
-    this._container = document.getElementById("helperapp-container");
-    this._container.hidden = false;
-
-    let rect = this._container.getBoundingClientRect();
-    this._container.top = (window.innerHeight - rect.height) / 2;
-    this._container.left = (window.innerWidth - rect.width) / 2;
-
-    BrowserUI.pushPopup(this, this._container);
-  },
-
-  save: function had_save() {
-    this._launcher.saveToDisk(null, false);
-    this.hide();
-  },
-
-  open: function had_open() {
-    this._launcher.launchWithApplication(null, false);
-    this.hide();
-  },
-
-  hide: function had_hide() {
-    document.getElementById("helperapp-target").value = "";
-    this._container.hidden = true;
-
-    BrowserUI.popPopup();
-  }
-};
-
 function ProgressController(tab) {
   this._tab = tab;
 
diff --git a/mobile/chrome/content/browser.xul b/mobile/chrome/content/browser.xul
index bb4a0b8b8c5..1304d0b4002 100644
--- a/mobile/chrome/content/browser.xul
+++ b/mobile/chrome/content/browser.xul
@@ -497,18 +497,6 @@
       <placelist id="bookmark-items" type="bookmarks" flex="1" onopen="BookmarkList.openBookmark();" autoedit="true"/>
     </vbox>
 
-    <!-- save/open dialog -->
-    <vbox id="helperapp-container" class="dialog-dark" hidden="true" align="center" top="0" left="0">
-      <label id="helperapp-prompt" value="&helperApp.prompt;"/>
-      <label id="helperapp-target" value="" crop="center"/>
-      <separator/>
-      <hbox pack="center">
-        <button id="helperapp-open" class="button-dark" label="&helperApp.open;" oncommand="HelperAppDialog.open();"/>
-        <button id="helperapp-save" class="button-dark" label="&helperApp.save;" oncommand="HelperAppDialog.save();"/>
-        <button id="helperapp-nothing" class="button-dark" label="&helperApp.nothing;" oncommand="HelperAppDialog.hide();"/>
-      </hbox>
-    </vbox>
-
     <vbox id="context-popup" hidden="true" class="dialog-dark" top="0" left="0">
       <hbox id="context-header">
         <label id="context-hint" crop="center" flex="1"/>
diff --git a/mobile/components/HelperAppDialog.js b/mobile/components/HelperAppDialog.js
index 4fb7efa6551..81fc2d6c37c 100644
--- a/mobile/components/HelperAppDialog.js
+++ b/mobile/components/HelperAppDialog.js
@@ -54,12 +54,57 @@ HelperAppLauncherDialog.prototype = {
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIHelperAppLauncherDialog]),
 
   show: function hald_show(aLauncher, aContext, aReason) {
-    this._launcher = aLauncher;
-    this._context  = aContext;
+    let window = aContext.QueryInterface(Ci.nsIInterfaceRequestor)
+                         .getInterface(Ci.nsIDOMWindowInternal);
 
-    let wm = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator);
-    let browser = wm.getMostRecentWindow("navigator:browser");
-    browser.HelperAppDialog.show(aLauncher);
+    let sbs = Cc["@mozilla.org/intl/stringbundle;1"].getService(Ci.nsIStringBundleService);
+    let bundle = sbs.createBundle("chrome://browser/locale/browser.properties");
+
+    let prompter = Cc["@mozilla.org/embedcomp/prompt-service;1"].getService(Ci.nsIPromptService);
+    let flags = Ci.nsIPrompt.BUTTON_POS_1_DEFAULT +
+        (Ci.nsIPrompt.BUTTON_TITLE_IS_STRING * Ci.nsIPrompt.BUTTON_POS_0) +
+        (Ci.nsIPrompt.BUTTON_TITLE_IS_STRING * Ci.nsIPrompt.BUTTON_POS_1);
+
+    let title = bundle.GetStringFromName("helperApp.title");
+    let message = bundle.GetStringFromName("helperApp.prompt");
+    message += "\n  " + aLauncher.suggestedFileName;
+    
+    let type = aLauncher.MIMEInfo.description;
+    if (type == "") {
+      try {
+        type = aLauncher.MIMEInfo.primaryExtension.toUpperCase();
+      } catch (e) {
+        type = aLauncher.MIMEInfo.MIMEType;
+      }
+    }
+    message += "\n  " + type;
+
+    let open = bundle.GetStringFromName("helperApp.open");
+    let save = bundle.GetStringFromName("helperApp.save");
+    let nothing = bundle.GetStringFromName("helperApp.nothing");
+
+    // Check to see if we can open this file or not
+    if (aLauncher.MIMEInfo.hasDefaultHandler) {
+      flags += (Ci.nsIPrompt.BUTTON_TITLE_IS_STRING * Ci.nsIPrompt.BUTTON_POS_2);
+
+      let choice = prompter.confirmEx(window,
+                                      title, message,
+                                      flags, save, open, nothing,
+                                      null, {});
+
+      if (choice == 0)
+        aLauncher.saveToDisk(null, false);
+      else if (choice == 1)
+        aLauncher.launchWithApplication(null, false);
+    } else {
+      let choice = prompter.confirmEx(window,
+                                      title, message,
+                                      flags, save, nothing, null,
+                                      null, {});
+
+      if (choice == 0)
+        aLauncher.saveToDisk(null, false);
+    }
   },
 
   promptForSaveToFile: function hald_promptForSaveToFile(aLauncher, aContext, aDefaultFile, aSuggestedFileExt, aForcePrompt) {
diff --git a/mobile/locales/en-US/chrome/browser.dtd b/mobile/locales/en-US/chrome/browser.dtd
index d52d2a09e8c..1e96207bf2d 100644
--- a/mobile/locales/en-US/chrome/browser.dtd
+++ b/mobile/locales/en-US/chrome/browser.dtd
@@ -27,11 +27,6 @@
 <!ENTITY editBookmarkDone.label    "Done">
 <!ENTITY editBookmarkTags.label    "Add tags here">
 
-<!ENTITY helperApp.prompt          "What would you like to do with">
-<!ENTITY helperApp.open            "Open">
-<!ENTITY helperApp.save            "Save">
-<!ENTITY helperApp.nothing         "Nothing">
-
 <!ENTITY formHelper.previous       "Previous">
 <!ENTITY formHelper.next           "Next">
 <!ENTITY formHelper.done           "Done">
diff --git a/mobile/locales/en-US/chrome/browser.properties b/mobile/locales/en-US/chrome/browser.properties
index 4749a3982ac..da32f84065b 100644
--- a/mobile/locales/en-US/chrome/browser.properties
+++ b/mobile/locales/en-US/chrome/browser.properties
@@ -149,3 +149,11 @@ pageactions.geo=Location
 pageactions.popup=Popups
 pageactions.offline-app=Offline Storage
 pageactions.password=Password
+
+# Helper App Dialog (Save/Open)
+helperApp.title=Opening File
+helperApp.prompt=What would you like to do with:
+helperApp.open=Open
+helperApp.save=Save
+helperApp.nothing=Nothing
+
diff --git a/mobile/themes/hildon/platform.css b/mobile/themes/hildon/platform.css
index 10942710aae..9cf0a09512e 100644
--- a/mobile/themes/hildon/platform.css
+++ b/mobile/themes/hildon/platform.css
@@ -160,6 +160,7 @@ dialog .prompt-title {
 
 dialog .prompt-message {
   margin-top: 8px;
+  white-space: pre-wrap;
 }
 
 dialog .button-checkbox {