From 42c6aadb80f990f5be164398d725c3b643337512 Mon Sep 17 00:00:00 2001
From: "reed%reedloden.com" <reed%reedloden.com>
Date: Mon, 25 Feb 2008 06:12:31 +0000
Subject: [PATCH] Bug 399312 - "Incomplete Import Installation - impossible to
 restart process" (Manual migration implementation) [p=beckley@qualcomm.com
 (Jeff Beckley) r=bienvenu sr=mscott]

---
 mail/base/content/mailCore.js                 |  2 +-
 .../en-US/chrome/messenger/importDialog.dtd   |  9 ++++----
 .../import/resources/content/importDialog.js  | 22 ++++++++++++++-----
 .../import/resources/content/importDialog.xul | 16 +++++++++-----
 4 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/mail/base/content/mailCore.js b/mail/base/content/mailCore.js
index 74077ba8a1f..8e154ba603b 100644
--- a/mail/base/content/mailCore.js
+++ b/mail/base/content/mailCore.js
@@ -164,7 +164,7 @@ function toAddressBook()
 
 function toImport()
 {
-  window.openDialog("chrome://messenger/content/importDialog.xul","importDialog","chrome, modal, titlebar", {importType: "addressbook"});
+  window.openDialog("chrome://messenger/content/importDialog.xul","importDialog","chrome, modal, titlebar, centerscreen");
 }
 
 // aPaneID
diff --git a/mail/locales/en-US/chrome/messenger/importDialog.dtd b/mail/locales/en-US/chrome/messenger/importDialog.dtd
index 41f23161879..debc1a7b1b2 100644
--- a/mail/locales/en-US/chrome/messenger/importDialog.dtd
+++ b/mail/locales/en-US/chrome/messenger/importDialog.dtd
@@ -44,6 +44,7 @@ LOCALIZATION NOTE : Do not translate any of the occurrences of the word
 -->
 
 <!ENTITY importDialog.windowTitle "Import">
+<!ENTITY importDialog.allTitle    "Import everything">
 <!ENTITY importDialog.mailTitle   "Mail">
 <!ENTITY importDialog.addressbookTitle "Address Books">
 <!ENTITY importDialog.settingsTitle "Settings">
@@ -51,11 +52,11 @@ LOCALIZATION NOTE : Do not translate any of the occurrences of the word
 <!ENTITY  window.width            "40em">
 <!ENTITY  window.macWidth         "45em">
 
-<!ENTITY importTitle.label        "&brandShortName; Mail Import Wizard">
+<!ENTITY importTitle.label        "&brandShortName; Import Wizard">
 <!ENTITY importDesc.label         "Import Mail, Address Books and Settings from other programs">
 
-<!ENTITY importDescription.label  "This wizard will import mail messages, address book entries, and/or preferences from other mail programs and common address book formats into &brandShortName; Mail.">
-<!ENTITY importDescription2.label "Once they have been imported, you will be able to access them from within &brandShortName; Mail and/or Address Book.">
+<!ENTITY importDescription.label  "This wizard will import mail messages, address book entries, and/or preferences from other mail programs and common address book formats into &brandShortName;.">
+<!ENTITY importDescription2.label "Once they have been imported, you will be able to access them from within &brandShortName;.">
 
 <!ENTITY selectDescription.label  "Please select the type of file that you would like to import:">
 
@@ -64,7 +65,7 @@ LOCALIZATION NOTE : Do not translate any of the occurrences of the word
 <!ENTITY finish.label             "Finish">
 <!ENTITY cancel.label             "Cancel">
 
-<!ENTITY select.label             "Select the type of material to import:">
+<!ENTITY select.label             "or select the type of material to import:">
 
 <!ENTITY title.label              "Title">
 <!ENTITY processing.label         "Importing...">
diff --git a/mailnews/import/resources/content/importDialog.js b/mailnews/import/resources/content/importDialog.js
index 07c10c72da1..46495634a15 100644
--- a/mailnews/import/resources/content/importDialog.js
+++ b/mailnews/import/resources/content/importDialog.js
@@ -73,8 +73,8 @@ function OnLoadImportDialog()
   }
   else
   {
-    importType = "addressbook";
-    progressInfo.importType = "addressbook";
+    importType = "all";
+    progressInfo.importType = "all";
   }
 
   SetUpImportType();
@@ -914,10 +914,20 @@ function next()
     var backButton = document.getElementById("back");
     backButton.removeAttribute("disabled");
     var radioGroup = document.getElementById("importFields");
-    SwitchType(radioGroup.value);
-    deck.setAttribute("selectedIndex", "1");
-    SelectFirstItem();
-    enableAdvance();
+
+    if (radioGroup.value == "all")
+    {
+      window.openDialog("chrome://messenger/content/migration/migration.xul",
+                        "", "chrome,dialog,modal,centerscreen");
+      close();
+    }
+    else
+    {
+      SwitchType(radioGroup.value);
+      deck.setAttribute("selectedIndex", "1");
+      SelectFirstItem();
+      enableAdvance();
+    }
     break;
   case "1":
     ImportDialogOKButton();
diff --git a/mailnews/import/resources/content/importDialog.xul b/mailnews/import/resources/content/importDialog.xul
index e74d6001709..be9a963ddd9 100644
--- a/mailnews/import/resources/content/importDialog.xul
+++ b/mailnews/import/resources/content/importDialog.xul
@@ -72,12 +72,16 @@
       <description>&importDescription.label;</description>
       <description>&importDescription2.label;</description>
       <separator/>
-      <label control="importFields">&select.label;</label>
-      <separator class="thin"/>
-      <radiogroup id="importFields" class="indent">
-        <radio value="addressbook" id="addressbookRadio" label="&importDialog.addressbookTitle;"/>
-        <radio value="mail" id="mailRadio" label="&importDialog.mailTitle;"/>
-        <radio value="settings" id="settingsRadio" label="&importDialog.settingsTitle;"/>
+      <radiogroup id="importFields">
+        <radio value="all" id="allRadio" label="&importDialog.allTitle;"/>
+        <separator/>
+        <label control="importFields">&select.label;</label>
+        <separator class="thin"/>
+        <vbox class="indent">
+          <radio value="addressbook" id="addressbookRadio" label="&importDialog.addressbookTitle;"/>
+          <radio value="mail" id="mailRadio" label="&importDialog.mailTitle;"/>
+          <radio value="settings" id="settingsRadio" label="&importDialog.settingsTitle;"/>
+        </vbox>
       </radiogroup>
     </vbox>
     <vbox class="wizard-box">