# HG changeset patch
# User Eugene Ostroukhov <eugeneo@symbian.org>
# Date 1268698793 25200
# Node ID f0f78f7ebf4d49d973c300fa25b6e5e800d5d67c
# Parent  341206d7aab8282ea77408f1adbc7a9f67d0b359
Several minor bugfixes

diff -r 341206d7aab8 -r f0f78f7ebf4d org.symbian.tools.wrttools.product/plugin.xml
--- a/org.symbian.tools.wrttools.product/plugin.xml	Mon Mar 15 16:48:22 2010 -0700
+++ b/org.symbian.tools.wrttools.product/plugin.xml	Mon Mar 15 17:19:53 2010 -0700
@@ -215,33 +215,4 @@
          </showInPart>
       </perspectiveExtension>
    </extension>
-   <extension
-         point="org.eclipse.ui.intro">
-      <intro
-            class="org.eclipse.ui.intro.config.CustomizableIntroPart"
-            id="org.symbian.tools.wrttools.product.intro">
-      </intro>
-      <introProductBinding
-            introId="org.symbian.tools.wrttools.product.intro"
-            productId="org.symbian.tools.wrttools.product.product">
-      </introProductBinding>
-   </extension>
-<!--
-   <extension
-         point="org.eclipse.ui.intro.config">
-      <config
-            content="introContent.xml"
-            id="org.symbian.tools.wrttools.product.introConfigId"
-            introId="org.symbian.tools.wrttools.product.intro">
-         <presentation
-               home-page-id="root">
-            <implementation
-                  kind="html"
-                  os="win32,linux,macosx"
-                  style="content/shared.css">
-            </implementation>
-         </presentation>
-      </config>
-   </extension>
--->
 </plugin>
diff -r 341206d7aab8 -r f0f78f7ebf4d org.symbian.tools.wrttools/plugin.xml
--- a/org.symbian.tools.wrttools/plugin.xml	Mon Mar 15 16:48:22 2010 -0700
+++ b/org.symbian.tools.wrttools/plugin.xml	Mon Mar 15 17:19:53 2010 -0700
@@ -159,7 +159,7 @@
          </description>
 		</wizard>
   <wizard
-        category="org.symbian.tools.wrttools.import"
+        category="org.symbian.tools.wrttools.core.category"
         class="org.symbian.tools.wrttools.wizards.WgzImportWizard"
         finalPerspective="org.symbian.tools.wrttools.mainPerspective"
         hasPages="true"
diff -r 341206d7aab8 -r f0f78f7ebf4d org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/IWRTConstants.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/IWRTConstants.java	Mon Mar 15 16:48:22 2010 -0700
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/IWRTConstants.java	Mon Mar 15 17:19:53 2010 -0700
@@ -30,6 +30,7 @@
 	public static final String CONVERT = "Converter";
 	public static final String DEPLOY_PATH="\\epoc32\\winscw\\c\\Data\\Others";
 	public static final String DEVICES_XML_PATH = "c:/program files/common files/symbian/devices.xml";
+    public static final String DEVICES_VISTA_XML_PATH = "appdata/local/virtualstore/program files/common files/symbian/devices.xml";
 	public static final String DEVICES_TAG="devices";
 	public static final String DEVICE_TAG="device";
 	public static final String EPOC_ROOT_TAG="epocroot";
diff -r 341206d7aab8 -r f0f78f7ebf4d org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/deploy/emulator/EmulatorListProvider.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/deploy/emulator/EmulatorListProvider.java	Mon Mar 15 16:48:22 2010 -0700
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/deploy/emulator/EmulatorListProvider.java	Mon Mar 15 17:19:53 2010 -0700
@@ -28,14 +28,15 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.symbian.tools.wrttools.core.IWRTConstants;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
-import org.symbian.tools.wrttools.core.IWRTConstants;
-
 
 
 
@@ -76,6 +77,11 @@
 		try {
 			DocumentBuilder builder = factory.newDocumentBuilder();			
 			File file = new File(IWRTConstants.DEVICES_XML_PATH);
+            if (!file.exists()) {
+                IPath otherPath = new Path(System.getProperty("user.home"))
+                        .append(IWRTConstants.DEVICES_VISTA_XML_PATH);
+                file = otherPath.toFile();
+            }
 			if(file.exists()){				
 				FileInputStream fin = new FileInputStream(file);
 				Document document = builder.parse(fin);
diff -r 341206d7aab8 -r f0f78f7ebf4d org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/projectimport/WrtProjectLocationWizardPage.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/projectimport/WrtProjectLocationWizardPage.java	Mon Mar 15 16:48:22 2010 -0700
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/projectimport/WrtProjectLocationWizardPage.java	Mon Mar 15 17:19:53 2010 -0700
@@ -123,9 +123,8 @@
 		}
 	}
 
-	// constant from WizardArchiveFileResourceImportPage1
-	private static final String[] FILE_IMPORT_MASK = {
-			"*.jar;*.zip;*.tar;*.tar.gz;*.tgz", "*.*" }; //$NON-NLS-1$ //$NON-NLS-2$
+    // constant from WizardArchiveFileResourceImportPage1
+    private static final String[] FILE_IMPORT_MASK = { "*.zip;*.tar;*.tar.gz;*.tgz;*.wgz", "*.*" }; //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
 	 * The name of the folder containing metadata information for the workspace.