# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1273086584 18000
# Node ID 62317dab6db807d0ba5b1ba55aa769ad1336bc0f
# Parent  4d3a35655205de8e1ed6384debe8c6e343f931cb# Parent  c995dc6dd227a7286216e900429fcfb7429c74bb
daily merge

diff -r 4d3a35655205 -r 62317dab6db8 project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/ProjectUIPlugin.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/ProjectUIPlugin.java	Wed May 05 14:09:03 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/ProjectUIPlugin.java	Wed May 05 14:09:44 2010 -0500
@@ -49,6 +49,7 @@
 import com.nokia.carbide.cpp.internal.project.ui.dialogs.UpdateProjectFilesQuery;
 import com.nokia.carbide.cpp.internal.project.ui.preferences.PreferenceConstants;
 import com.nokia.cpp.internal.api.utils.core.Logging;
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
 
 /**
  * The activator class controls the plug-in life cycle
@@ -214,7 +215,7 @@
 							}
 							else if ((promptSetting.equals(MessageDialogWithToggle.PROMPT))) {
 								MessageDialogWithToggle toggleDialog = MessageDialogWithToggle.openYesNoQuestion(
-										null,
+										WorkbenchUtils.getActiveShell(),
 										Messages.getString("PerspectiveSwitchDialog_Title"),
 										Messages.getString("PerspectiveSwitchDialog_Query"),
 										Messages.getString("PerspectiveSwitchDialog_RememberDecisionText"),
diff -r 4d3a35655205 -r 62317dab6db8 qt/com.nokia.carbide.cpp.qt.ui/META-INF/MANIFEST.MF
--- a/qt/com.nokia.carbide.cpp.qt.ui/META-INF/MANIFEST.MF	Wed May 05 14:09:03 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.ui/META-INF/MANIFEST.MF	Wed May 05 14:09:44 2010 -0500
@@ -22,7 +22,8 @@
  com.nokia.carbide.cdt.builder,
  org.eclipse.cdt.core,
  org.eclipse.ui.ide,
- com.trolltech.qtcppproject;bundle-version="1.5.0"
+ com.trolltech.qtcppproject;bundle-version="1.5.0",
+ com.nokia.cpp.utils.ui
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Import-Package: com.trolltech.qtcppproject,
diff -r 4d3a35655205 -r 62317dab6db8 qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/QtUIPlugin.java
--- a/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/QtUIPlugin.java	Wed May 05 14:09:03 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/QtUIPlugin.java	Wed May 05 14:09:44 2010 -0500
@@ -47,6 +47,7 @@
 import com.nokia.carbide.cpp.internal.qt.core.QtSDKUtils;
 import com.nokia.carbide.cpp.internal.qt.ui.wizard.Messages;
 import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext;
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
 
 public class QtUIPlugin extends AbstractUIPlugin implements ICarbideConfigurationChangedListener, ISDKManagerLoadedHook {
 
@@ -156,7 +157,7 @@
 							}
 							else if ((promptSetting.equals(MessageDialogWithToggle.PROMPT))) {
 								MessageDialogWithToggle toggleDialog = MessageDialogWithToggle.openYesNoQuestion(
-										null,
+										WorkbenchUtils.getActiveShell(),
 										Messages.PerspectiveSwitchDialog_Title,
 										Messages.PerspectiveSwitchDialog_Query,
 										Messages.PerspectiveSwitchDialog_RememberDecisionText,