From 2c165dbf741371b4d4d013f3c16203ae90d9b84d Mon Sep 17 00:00:00 2001
From: "ccarlen%netscape.com"
 <ccarlen%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 29 Jul 2006 05:42:38 +0000
Subject: [PATCH] Bug 97622 - Put in UI to expose dynamic profile switching.
 r=kaie/sr=alecf

git-svn-id: svn://10.0.0.236/trunk@205762 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/suite/common/tasksOverlay.js           | 18 ++++++++++++++++++
 mozilla/suite/common/tasksOverlay.xul          |  3 +++
 .../en-US/chrome/common/tasksOverlay.dtd       |  4 ++++
 3 files changed, 25 insertions(+)

diff --git a/mozilla/suite/common/tasksOverlay.js b/mozilla/suite/common/tasksOverlay.js
index b2374a037c9..ee397c1ddea 100644
--- a/mozilla/suite/common/tasksOverlay.js
+++ b/mozilla/suite/common/tasksOverlay.js
@@ -204,4 +204,22 @@ function checkFocusedWindow()
   }
 }
 
+function toProfileManager()
+{
+  var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
+             .getService(Components.interfaces.nsIWindowWatcher);
+  var params = Components.classes["@mozilla.org/embedcomp/dialogparam;1"]
+                 .createInstance(Components.interfaces.nsIDialogParamBlock);
+  
+  params.SetNumberStrings(1);
+  params.SetString(0, "menu");
+  ww.openWindow(null, // no parent
+                "chrome://communicator/content/profile/profileSelection.xul",
+                null,
+                "centerscreen,chrome,modal,titlebar",
+                params);
+  
+  // Here, we don't care about the result code
+  // that was returned in the param block.
+}
 
diff --git a/mozilla/suite/common/tasksOverlay.xul b/mozilla/suite/common/tasksOverlay.xul
index af108e92ec5..4730df15f89 100644
--- a/mozilla/suite/common/tasksOverlay.xul
+++ b/mozilla/suite/common/tasksOverlay.xul
@@ -19,6 +19,7 @@
   <key id="key_navigator"    key="&navigatorCmd.commandkey;"   command="Tasks:Navigator" modifiers="accel"/>
 
   <!-- Tools Menu -->
+  <key id="key_switchprofile"    key="&switchProfileCmd.commandkey;"   oncommand="toProfileManager();" modifiers="accel,alt"/>
 </keyset>
 <commandset id="tasksCommands">
   <command id="Tasks:Navigator" oncommand="toNavigator();"/>
@@ -36,6 +37,8 @@
               <menuitem id="java" label="&javaConsoleCmd.label;" accesskey="&javaConsoleCmd.accesskey;" oncommand="toJavaConsole()"/>
             </menupopup>
           </menu>
+          <menuseparator/>
+          <menuitem id="cmd_switchprofile" label="&switchProfileCmd.label;" accesskey="&switchProfileCmd.accesskey;" key="key_switchprofile" oncommand="toProfileManager();"/>
         </menupopup>
       </menu>
 
diff --git a/mozilla/suite/locales/en-US/chrome/common/tasksOverlay.dtd b/mozilla/suite/locales/en-US/chrome/common/tasksOverlay.dtd
index 5bd8945ff68..0756e0d9030 100644
--- a/mozilla/suite/locales/en-US/chrome/common/tasksOverlay.dtd
+++ b/mozilla/suite/locales/en-US/chrome/common/tasksOverlay.dtd
@@ -35,3 +35,7 @@
 
 <!ENTITY downloadManagerCmd.label "Download Manager">
 <!ENTITY downloadManagerCmd.accesskey "D">
+
+<!ENTITY switchProfileCmd.label "Switch Profile...">
+<!ENTITY switchProfileCmd.accesskey "P">
+<!ENTITY switchProfileCmd.commandkey "Q">