--- a/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/ResourcesChangeListener.java	Thu Mar 18 09:51:41 2010 -0700
+++ b/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/ResourcesChangeListener.java	Thu Mar 18 11:10:35 2010 -0700
@@ -22,7 +22,6 @@
 import java.util.HashSet;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceChangeEvent;
 import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IResourceDelta;
@@ -43,7 +42,10 @@
         private final ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
 
         public boolean visit(IResourceDelta delta) throws CoreException {
-            if (delta.getResource().getType() == IResource.PROJECT) {
+            int d = delta.getFlags()
+                    & (IResourceDelta.CONTENT | IResourceDelta.OPEN | IResourceDelta.MOVED_TO
+                            | IResourceDelta.MOVED_FROM | IResourceDelta.SYNC | IResourceDelta.REPLACED);
+            if (delta.getKind() != IResourceDelta.CHANGED || d != 0) {
                 IProject project = delta.getResource().getProject();
                 if (DebugUtil.isProjectDebugged(project, launchManager, null)) {
                     projects.add(project);

--- a/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/ui/DebugPreferencePage.java	Thu Mar 18 09:51:41 2010 -0700
+++ b/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/ui/DebugPreferencePage.java	Thu Mar 18 11:10:35 2010 -0700
@@ -50,7 +50,7 @@
         check.setText("Show warning dialog when resources in the debugged project were changed");
         check.setLayoutData(new GridData(GridData.BEGINNING, GridData.END, false, false, 3, 1));
 
-        check.setSelection(MessageDialogWithToggle.ALWAYS.equals(getPreferenceStore().getString(
+        check.setSelection(!MessageDialogWithToggle.ALWAYS.equals(getPreferenceStore().getString(
                 IConstants.PREF_SHOW_RESOURCE_CHANGE_ERROR)));
 	}
 
@@ -63,9 +63,9 @@
     @Override
     public boolean performOk() {
         if (check.getSelection()) {
-            getPreferenceStore().setValue(IConstants.PREF_SHOW_RESOURCE_CHANGE_ERROR, MessageDialogWithToggle.ALWAYS);
+            getPreferenceStore().setToDefault(IConstants.PREF_SHOW_RESOURCE_CHANGE_ERROR);
         } else {
-            getPreferenceStore().setToDefault(IConstants.PREF_SHOW_RESOURCE_CHANGE_ERROR);
+            getPreferenceStore().setValue(IConstants.PREF_SHOW_RESOURCE_CHANGE_ERROR, MessageDialogWithToggle.ALWAYS);
         }
         return super.performOk();
     }

--- a/org.symbian.tools.wrttools/plugin.xml	Thu Mar 18 09:51:41 2010 -0700
+++ b/org.symbian.tools.wrttools/plugin.xml	Thu Mar 18 11:10:35 2010 -0700
@@ -464,7 +464,22 @@
              suppressedExtensionId="org.eclipse.ui.navigator.resourceContent">
        </override>
        <commonWizard
-             menuGroupId="group.new"
+             menuGroupId="group.new.z"
+             type="new"
+             wizardId="org.symbian.tools.wrttools.importwgz">
+          <enablement>
+             <or>
+                <adapt
+                      type="org.eclipse.core.resources.IResource">
+                </adapt>
+                <adapt
+                      type="java.util.Collection">
+                </adapt>
+             </or>
+          </enablement>
+       </commonWizard>
+       <commonWizard
+             menuGroupId="group.new.z"
              type="new"
              wizardId="org.symbian.tools.wrttools.core.wrtwidgetwizard">
           <enablement>
@@ -488,6 +503,26 @@
           </enablement>
        </commonWizard>
        <commonWizard
+             menuGroupId="group.new.generic"
+             type="new"
+             wizardId="org.eclipse.ui.wizards.new.folder">
+          <enablement>
+             <adapt
+                   type="org.eclipse.core.resources.IResource">
+             </adapt>
+          </enablement>
+       </commonWizard>
+       <commonWizard
+             menuGroupId="group.new.generic"
+             type="new"
+             wizardId="org.eclipse.ui.wizards.new.file">
+          <enablement>
+             <adapt
+                   type="org.eclipse.core.resources.IResource">
+             </adapt>
+          </enablement>
+       </commonWizard>
+       <commonWizard
              type="new"
              wizardId="org.eclipse.wst.css.ui.internal.wizard.NewCSSWizard">
           <enablement>
@@ -519,21 +554,6 @@
              </or>
           </enablement>
        </commonWizard>
-       <commonWizard
-             menuGroupId="group.new"
-             type="new"
-             wizardId="org.symbian.tools.wrttools.importwgz">
-          <enablement>
-             <or>
-                <adapt
-                      type="org.eclipse.core.resources.IResource">
-                </adapt>
-                <adapt
-                      type="java.util.Collection">
-                </adapt>
-             </or>
-          </enablement>
-       </commonWizard>
        <dropAssistant
              class="org.eclipse.wst.jsdt.internal.ui.navigator.JavaDropAdapterAssistant"
              id="org.eclipse.wst.jsdt.ui.dropAssistant">