# HG changeset patch
# User Matti Hagman <ext-matti.hagman@nokia.com>
# Date 1284560906 -10800
# Node ID eb17a7f7f320b4caf23429bf1c0315a7f75fbcfc
# Parent  400fe7b031f902b146aa63887c3b10069a2890d2
Creator Carbide Extension 1.3.0

diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/build.xml
--- a/creatorextension/build.xml	Mon Sep 13 15:23:15 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,162 +0,0 @@
-  
-<project name="com.nokia.s60tools.creator" default="build.all">
-
-  <!-- declare ant4eclipse -->
-  <taskdef resource="net/sf/ant4eclipse/antlib.xml" />
-
-  <!-- Name definitions -->
-  <property name="feature.name" value="Creator"/>
-  <property name="project.name" value="com.nokia.carbide.extensions.creator" />
-  <property name="jar.filename" value="${ant.project.name}.jar"/>
-  
-  <!-- Folder definitions -->
-  <property name="workspace.path" value="." />
-  <property name="java.location" value="C:/APPS/j2sdk_1.5.0_12" />
-  <property name="destination.path" value="." />
-  
-  <property name="carbide.folder" value="C:/Carbide_internal" />
-	<property name="carbide.int.folder" location="c:/Carbide_internal/plugins"/>
-	<property name="carbide.dev.folder" location="c:/Carbide_development/plugins"/>
-	
-  <property name="reports.folder" location="reports"/>
-	<property name="reports.emma" location="${reports.folder}/emma"/>
-	<property name="instr.folder" location="instr"/>
-	<property name="binaries.folder" location="${feature.name}.binaries"/>
-	
-	
-	<!-- EMMA configuration -->
- 	<path id="emma.lib" >
-    	<pathelement location="${ant.home}/lib/emma.jar" />
-    	<pathelement location="${ant.home}/lib/emma_ant.jar" />
-  	</path>
-
-  	<taskdef resource="emma_ant.properties" classpathref="emma.lib" />
-	
-	<!-- PMD configuration -->
-	<path id="pmd.lib" >
-    	<pathelement location="${ant.home}/lib/pmd-4.2.5.jar" />
-    	<pathelement location="${ant.home}/lib/asm-3.1.jar" />
-    	<pathelement location="${ant.home}/lib/jaxen-1.1.1.jar" />
-  	</path>
-	
-	<taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.lib" />
-	
-	<!-- Folders -->
-	<delete dir="${instr.folder}"/>
-	<mkdir dir="${instr.folder}"/>
-	
-	<delete dir="${reports.folder}"/>
-	<mkdir dir="${reports.folder}"/>
-	
-	<!-- Carbide_classpath -->
-	<path id="carbide_classpath">
-		<fileset dir="${carbide.int.folder}" includes="**/*.jar" />
-	</path>
-	
-  <!-- Delete old plugins and features -->
-  <target name="delete">
-	  <delete dir="plugins" failonerror="false"/>
-	  <delete dir="features" failonerror="false"/>
-	  <delete dir="${ant.project.name}/bin" failonerror="false"/>
-  </target>
- 
- 
- 
-   
-  <!-- Target Plugin -->
-  <target name="build.creator" depends="">
-  
-  <!-- Copy necessary resources -->
-		<copy todir="${ant.project.name}/bin" failonerror="true" overwrite="false">
-			<fileset dir="${ant.project.name}/src/" excludes="**/*.java, **/package.htm*" />
-		</copy>
-  
-  <buildPlugin workspace="${workspace.path}" targetPlatformLocation="${carbide.folder}" projectname="${ant.project.name}" destDir="${destination.path}" packageAsJar="true">
-  	<javacLibraryCompiler>
-  <compilerSettings debug="true" fork="true"/>
-  </javacLibraryCompiler>
-  </buildPlugin>
-  <buildPlugin workspace="${workspace.path}" targetPlatformLocation="${carbide.folder}" projectname="${ant.project.name}.help" destDir="${destination.path}" packageAsJar="true">
-  	<javacLibraryCompiler>
-  <compilerSettings debug="true" fork="true"/>
-  </javacLibraryCompiler>
-  </buildPlugin>
-                
-  <!-- Build MultiTestRunner feature -->
-  <buildFeature workspace="${workspace.path}"
-               targetPlatformLocation="${carbide.folder}"
-               projectname="${project.name}"
-               buildPluginTarget="build.plugin"
-               destDir="${destination.path}" />
-               
-  </target>
-  
-  <!-- Empty target to do nothing --> 
-  <target name="build.plugin">
-  </target>	
-  
-  
-  
-  <!-- Instrumentation target, depends on build.mtrunner -->
-	<target name="instr" depends="build.creator">
-		<!-- Instrument the source code -->
-		<emma>
-			<instr instrpath="${ant.project.name}/bin" destdir="${instr.folder}" metadatafile="${reports.emma}/metadata.emma" merge="true"/>
-		</emma>
-	</target>
-  
-  
-  <target name="create.zip">
-  
-  	<delete dir="${binaries.folder}/nightly_builds"/>
-  	<mkdir dir="${binaries.folder}/nightly_builds"/>
-  	
- 		 <!-- Zip jars to MultiTestRunner.zip -->
- 		<tstamp>
-		   <format property="timestamp" pattern="dd-MM-yyyy" />
-		</tstamp> 
- 		 
-    <zip destfile="${binaries.folder}/nightly_builds/${feature.name}.${timestamp}.zip"
-       basedir="."
-       includes="plugins/*, features/com.nokia.carbide.extensions.*/"/>
-  </target>
-  
-  <!-- Analyze target -->
-	<target name="analyze">
-		<!-- PMD -->
-		<pmd shortFileNames="true">
-			<!-- Rules -->
-			<ruleset>basic</ruleset>
-			<ruleset>codesize</ruleset>
-			<ruleset>coupling</ruleset>
-			<ruleset>design</ruleset>
-			<ruleset>strictexception</ruleset>
-			<ruleset>strings</ruleset>
-			<ruleset>sunsecure</ruleset>
-			<ruleset>unusedcode</ruleset>
-			<ruleset>junit</ruleset>
-			
-			<!-- XML output -->
-			<formatter type="xml" toFile="${reports.folder}/report.pmd.xml"/>
-			
-			<!-- Files to analyze -->
-			<fileset dir="com.nokia.s60tools.creator/src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</pmd>
-	</target>
-	
-	<target name="copy_to_carbide">
-	<!-- Copy the actual plug-ins to the carbide folders -->
-		<copy todir="${carbide.int.folder}" failonerror="true" overwrite="true">
-				<fileset dir="plugins"/>
-		</copy>
-		<copy todir="${carbide.dev.folder}" failonerror="true" overwrite="true">
-				<fileset dir="plugins"/>
-		</copy>
-  </target>
-  
-  <!-- Target Build all -->
-  <target name="build.all" depends="delete, build.creator, instr, create.zip, analyze, copy_to_carbide" />
-  
-</project>
\ No newline at end of file
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.carbide.extension.creator/feature.xml
--- a/creatorextension/com.nokia.carbide.extension.creator/feature.xml	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.carbide.extension.creator/feature.xml	Wed Sep 15 17:28:26 2010 +0300
@@ -2,34 +2,28 @@
 <feature
       id="com.nokia.carbide.extensions.creator"
       label="Carbide.c++ Extensions - Creator Script Editor"
-      version="1.2.0"
+      version="1.3.0"
       provider-name="Nokia"
       plugin="com.nokia.s60tools.creator">
 
    <description>
-      Creator Script Editor is an editor for creating scripts to S60 RnD
+      Creator Script Editor is an editor for creating scripts to S60 RnD
 application Creator.
    </description>
 
    <copyright>
-      Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
+      Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
       All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html.
    </copyright>
 
    <license url="license.txt">
-Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+      Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 All rights reserved.
 This component and the accompanying materials are made available
 under the terms of &quot;Eclipse Public License v1.0&quot;
 which accompanies this distribution, and is available
 at the URL &quot;http://www.eclipse.org/legal/epl-v10.html&quot;.
    </license>
-
-   <url>
-      <update label="Carbide.c++ Update Site" url="http://tools.ext.nokia.com/updates/carbide22"/>
-      <discovery label="Carbide.c++ Update Site" url="http://tools.ext.nokia.com/updates/carbide22"/>
-   </url>
-
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
@@ -42,8 +36,7 @@
       <import plugin="org.eclipse.jface"/>
       <import plugin="com.nokia.carbide.cdt.builder" version="2.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.help"/>
-      <import plugin="com.nokia.s60tools.ui" version="1.1.9" match="greaterOrEqual"/>
-      <import plugin="com.nokia.s60tools.util" version="1.1.10" match="greaterOrEqual"/>
+      <import feature="com.nokia.s60tools.extensions.framework" version="1.1.9" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.carbide.extensions.creator.discovery/META-INF/MANIFEST.MF
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/creatorextension/com.nokia.carbide.extensions.creator.discovery/META-INF/MANIFEST.MF	Wed Sep 15 17:28:26 2010 +0300
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: com.nokia.carbide.extensions.creator Discovery Items
+Bundle-SymbolicName: com.nokia.carbide.extensions.creator.discovery;singleton:=true
+Bundle-Version: 1.3.0.qualifier
+Bundle-Localization: plugin
+Bundle-Vendor: Nokia
+Require-Bundle: org.eclipse.equinox.p2.discovery
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.carbide.extensions.creator.discovery/build.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/creatorextension/com.nokia.carbide.extensions.creator.discovery/build.properties	Wed Sep 15 17:28:26 2010 +0300
@@ -0,0 +1,4 @@
+bin.includes = META-INF/,\
+               plugin.xml,\
+               images/,\
+               plugin.properties
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.carbide.extensions.creator.discovery/images/CrS_icon.png
Binary file creatorextension/com.nokia.carbide.extensions.creator.discovery/images/CrS_icon.png has changed
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.carbide.extensions.creator.discovery/images/CrS_shot.png
Binary file creatorextension/com.nokia.carbide.extensions.creator.discovery/images/CrS_shot.png has changed
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.carbide.extensions.creator.discovery/images/creator_32x32.png
Binary file creatorextension/com.nokia.carbide.extensions.creator.discovery/images/creator_32x32.png has changed
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.carbide.extensions.creator.discovery/plugin.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/creatorextension/com.nokia.carbide.extensions.creator.discovery/plugin.properties	Wed Sep 15 17:28:26 2010 +0300
@@ -0,0 +1,12 @@
+summary=The Creator Carbide.c++ Extension is a useful application for any software developer who needs to create test data into a device. The data can be, for example, contacts, SMS messages, bookmarks, appointments and to-dos).\n\
+\n\
+In specific, the Creator tool simplifies the creation of certain types of test data such as Access Points, which may be time-consuming to create manually. It can also save time in test data creation when, for example:\n\
+\n\
+\t --a device should be saving high amounts of data, \n\
+\t --the data is saved to a device several times, \n\
+\t --the data is saved to multiple devices at the same time. \n\
+\n\
+Test data configurations are stored as an XML-format script file, identified by .creatorxml file extension. The .creatorxml file is used as input for the S60 Creator tool that works on an S60 device or an emulator. You can transfer the Creator file into the device in the same way as any other file, for example, via a USB cable or a Bluetooth connection. On the device, the default location of the .creatorxml file is in c:\data, or at the root of the memory card.\n\
+\n\
+To make the creation of data entries faster in the Creator Script Editor, you can define all or some of the field values to be Random instead of typing in the values manually. With this option, the S60 Creator tool will randomly pick the needed values based on a pre-defined resource file. \n
+
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.carbide.extensions.creator.discovery/plugin.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/creatorextension/com.nokia.carbide.extensions.creator.discovery/plugin.xml	Wed Sep 15 17:28:26 2010 +0300
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.mylyn.discovery.core.connectorDiscovery">
+
+    <connectorDescriptor
+            categoryId="com.nokia.carbide.rndutilities.category"
+            description="A useful application for creating test data into a device."
+            groupId="com.nokia.carbide.rndutilities.category"
+            id="com.nokia.carbide.extensions.creator.feature.group"
+            kind="task"
+            license="EPL 1.0"
+            name="Creator Script Editor"
+            provider="Nokia"
+            siteUrl="${SITE_URL}">
+         <overview
+               summary="%summary"
+               screenshot="images/CrS_shot.png"
+               url="http://developer.symbian.org/wiki/index.php/Creator_Carbide_Extension">
+         </overview>
+         <icon
+               image32="images/creator_32x32.png">
+         </icon>
+      </connectorDescriptor>
+
+   </extension>
+</plugin>
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator.help/META-INF/MANIFEST.MF
--- a/creatorextension/com.nokia.s60tools.creator.help/META-INF/MANIFEST.MF	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator.help/META-INF/MANIFEST.MF	Wed Sep 15 17:28:26 2010 +0300
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Carbide.c++ Extensions - Creator Help Plug-in
+Bundle-Name: Carbide.c++ Extensions - Creator Help
 Bundle-SymbolicName: com.nokia.s60tools.creator.help;singleton:=true
-Bundle-Version: 1.2.0
+Bundle-Version: 1.3.0.qualifier
 Bundle-Vendor: Nokia
 Bundle-Activator: com.nokia.s60tools.creator.CreatorActivator
 Bundle-ActivationPolicy: lazy
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator.help/about.html
--- a/creatorextension/com.nokia.s60tools.creator.help/about.html	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator.help/about.html	Wed Sep 15 17:28:26 2010 +0300
@@ -1,18 +1,23 @@
 <!DOCTYPE HTML PUBLIC “-//W3C//DTD HTML 4.0//EN”>
 <html>
 <head>
-<title>About</title>
-<meta http-equiv=Content-Type content=”text/html; charset=ISO-8859-1”>
+  <title>About</title>
+  <meta http-equiv="content-type"
+  content="application/xhtml+xml; charset=iso-8859-1" charset="ISO-8859-1”">
 </head>
-<body lang=”EN-US”>
+
+<body lang="”EN-US”">
 <h2>About This Content</h2>
- 
-<p>February 5, 2009</p>	
+
+<p>September 8, 2010</p>
 
 <h3>Copyright</h3>
 
-<p>Copyright &copy; 2007-2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.<br>
-License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.<p>
+<p>Copyright © 2007-2010 Nokia Corporation and/or its subsidiary(-ies). All
+rights reserved.<br>
+License: <a
+href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</p>
 
+<p></p>
 </body>
 </html>
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator.help/html/concepts/components.htm
--- a/creatorextension/com.nokia.s60tools.creator.help/html/concepts/components.htm	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator.help/html/concepts/components.htm	Wed Sep 15 17:28:26 2010 +0300
@@ -50,7 +50,7 @@
 <li><a href="../tasks/modifying_components.htm">Modifying components</a></li>
 </ul>
 
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
+<div id="footer">Copyright &copy; 2007-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
 License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
 </body>
 </html>
\ No newline at end of file
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator.help/html/concepts/concepts.htm
--- a/creatorextension/com.nokia.s60tools.creator.help/html/concepts/concepts.htm	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator.help/html/concepts/concepts.htm	Wed Sep 15 17:28:26 2010 +0300
@@ -14,7 +14,7 @@
 <li><a href="contact_set.htm">Contact set</a></li> 
 </ul>
 
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
+<div id="footer">Copyright &copy; 2007-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
 License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
 </body>
 </html>
\ No newline at end of file
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator.help/html/concepts/contact_set.htm
--- a/creatorextension/com.nokia.s60tools.creator.help/html/concepts/contact_set.htm	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator.help/html/concepts/contact_set.htm	Wed Sep 15 17:28:26 2010 +0300
@@ -25,7 +25,7 @@
 </li>
 </ul>
 
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
+<div id="footer">Copyright &copy; 2007-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
 License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
 </body>
 </html>
\ No newline at end of file
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator.help/html/gettingstarted/GS_index.htm
--- a/creatorextension/com.nokia.s60tools.creator.help/html/gettingstarted/GS_index.htm	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator.help/html/gettingstarted/GS_index.htm	Wed Sep 15 17:28:26 2010 +0300
@@ -15,7 +15,7 @@
 <li><a href="walk_through.htm">Basic walk-through</a></li>
 </ul>
 
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
+<div id="footer">Copyright &copy; 2007-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
 License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
 </body>
 </html>
\ No newline at end of file
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator.help/html/gettingstarted/overview.htm
--- a/creatorextension/com.nokia.s60tools.creator.help/html/gettingstarted/overview.htm	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator.help/html/gettingstarted/overview.htm	Wed Sep 15 17:28:26 2010 +0300
@@ -18,7 +18,7 @@
 <p>Test data configurations are stored as an XML-format script file, identified by <i>.creatorxml</i> file extension. The <i>.creatorxml</i> file is used as input for the S60 Creator tool that works on an S60 device or an emulator. You can transfer the Creator file into the device in the same way as any other file, for example, via a USB cable or a Bluetooth connection. On the device, the default location of the <i>.creatorxml</i> file is in <i>c:\data</i>, or at the root of the memory card.</p>
 <p>To make the creation of data entries faster in the Creator Script Editor, you can define all or some of the field values to be <b>Random</b> instead of typing in the values manually. With this option, the S60 Creator tool will randomly pick the needed values based on a pre-defined resource file. </p><p>For more information on the script usage in the device, see <i>S60 Creator User's Guide</i> available in the S60 platform releases under: <i>\s60\tools\commontools\creator\doc</i></p>
 
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
+<div id="footer">Copyright &copy; 2007-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
 License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
 </body>
 </html>
\ No newline at end of file
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator.help/html/gettingstarted/walk_through.htm
--- a/creatorextension/com.nokia.s60tools.creator.help/html/gettingstarted/walk_through.htm	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator.help/html/gettingstarted/walk_through.htm	Wed Sep 15 17:28:26 2010 +0300
@@ -18,7 +18,7 @@
 <p>You can edit scripts in the Creator tool at any time by modifying the component data or removing one or more components. For instructions, see <a href="../tasks/modifying_components.htm">Modifying components</a>.</p>
 <p><b>Tip:</b> Script files that have already been created are listed in the Project Explorer view of your workspace. In this case, you can also start the tool by right-clicking the XML file and selecting <b>Open With > Creator Script Editor</b>.</p>
 
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
+<div id="footer">Copyright &copy; 2007-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
 License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
 </body>
 </html>
\ No newline at end of file
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator.help/html/legal.htm
--- a/creatorextension/com.nokia.s60tools.creator.help/html/legal.htm	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator.help/html/legal.htm	Wed Sep 15 17:28:26 2010 +0300
@@ -1,21 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-	<title>License Information</title>
-    <link href="../book.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-<h3>License Information</h3>
-
-<h5>COPYRIGHT</h5>
-<p>Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. This component and the accompanying materials are made available under the terms of "Eclipse Public License v1.0" which accompanies this distribution and is available at the URL <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</p>
-<p>Initial Contributors:<br>
-Nokia Corporation - initial contribution</p>
-
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
-License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
-</body>
-</html>
\ No newline at end of file
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
+  <title>License Information</title>
+  <link href="../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<h3>License Information</h3>
+
+<h5>COPYRIGHT</h5>
+
+<p>Copyright © 2007-2010 Nokia Corporation and/or its subsidiary(-ies). All
+rights reserved. This component and the accompanying materials are made
+available under the terms of "Eclipse Public License v1.0" which accompanies
+this distribution and is available at the URL <a
+href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</p>
+
+<p>Initial Contributors:<br>
+Nokia Corporation - initial contribution</p>
+
+<div id="footer">
+Copyright © 2007-2010 Nokia Corporation and/or its subsidiary(-ies). All rights
+reserved. License: <a
+href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
+</body>
+</html>
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator.help/html/reference/calendar.htm
--- a/creatorextension/com.nokia.s60tools.creator.help/html/reference/calendar.htm	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator.help/html/reference/calendar.htm	Wed Sep 15 17:28:26 2010 +0300
@@ -56,7 +56,7 @@
 <li><a href="generic_items.htm">Generic component reference</a></li>
 </ul>
 
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
+<div id="footer">Copyright &copy; 2007-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
 License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
 </body>
 </html>
\ No newline at end of file
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator.help/html/reference/contacts.htm
--- a/creatorextension/com.nokia.s60tools.creator.help/html/reference/contacts.htm	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator.help/html/reference/contacts.htm	Wed Sep 15 17:28:26 2010 +0300
@@ -57,7 +57,7 @@
 <li><a href="generic_items.htm">Generic component reference</a></li>
 </ul>
 
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
+<div id="footer">Copyright &copy; 2007-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
 License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
 </body>
 </html>
\ No newline at end of file
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator.help/html/reference/generic_items.htm
--- a/creatorextension/com.nokia.s60tools.creator.help/html/reference/generic_items.htm	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator.help/html/reference/generic_items.htm	Wed Sep 15 17:28:26 2010 +0300
@@ -73,7 +73,7 @@
 <li><a href="calendar.htm">Calendar components</a></li>
 </ul>
 
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
+<div id="footer">Copyright &copy; 2007-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
 License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
 </body>
 </html>
\ No newline at end of file
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator.help/html/reference/messages.htm
--- a/creatorextension/com.nokia.s60tools.creator.help/html/reference/messages.htm	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator.help/html/reference/messages.htm	Wed Sep 15 17:28:26 2010 +0300
@@ -61,7 +61,7 @@
 <li><a href="generic_items.htm">Generic component reference</a></li>
 </ul>
 
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
+<div id="footer">Copyright &copy; 2007-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
 License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
 </body>
 </html>
\ No newline at end of file
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator.help/html/reference/references.htm
--- a/creatorextension/com.nokia.s60tools.creator.help/html/reference/references.htm	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator.help/html/reference/references.htm	Wed Sep 15 17:28:26 2010 +0300
@@ -16,7 +16,7 @@
 <li><a href="calendar.htm">Calendar components</a></li>
 </ul>
 
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
+<div id="footer">Copyright &copy; 2007-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
 License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
 </body>
 </html>
\ No newline at end of file
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator.help/html/release_notes.htm
--- a/creatorextension/com.nokia.s60tools.creator.help/html/release_notes.htm	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator.help/html/release_notes.htm	Wed Sep 15 17:28:26 2010 +0300
@@ -1,147 +1,197 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-<title>Release notes</title>
-<link href="../book.css" type="text/css" rel="stylesheet">
-<style type="text/css"></style>
-</head>
-<body>
-
-<h2>Release notes</h2>
-
-<h4>Creator Carbide.c++ Extension &ndash; Version 1.2.0</h4>
-<p>Released 27th November 2009</p>
-<ul>
-	<li><a href="#description">Product description</a></li>
-	<li><a href="#features">Main features</a></li>
-	<li><a href="#newfeatures">What's new</a></li>
-	<li><a href="#installation">Installation notes</a></li>
-	<li><a href="#requirements">System requirements</a></li>
-	<li><a href="#compissues">Compatibility issues</a></li>
-	<li><a href="#issues">Known issues</a></li>
-</ul>
-
-<h3><a name="description"></a>Product description</h3>
-<p>The Creator tool is used to create different kinds of test data (for example, contacts, messages or calendar entries) into a device. Creator is a useful tool for testing situations where a device is saving high amounts of data, or the data is either saved to a device several times or to multiple devices at the same time. </p>
-<p>The test data itself is contained in XML scripts, identified by the <i>.creatorxml</i> file extension. The Creator Carbide.c++ Extension automates and simplifies the creation of these scripts by enabling you to add components such as contacts, messages, notes, and files in the Carbide IDE. You can also create advanced test data combinations that associate, for example, contact data with messaging data. </p>
-<p>The Creator extension can be started by selecting <b>File > New > Other > Carbide Extensions > Creator script file</b> or <b>Carbide > Creator Script Editor</b>.</p>
-
-<h3><a name="features"></a>Main features</h3>
-<ul>
-	<li>UI for creating an XML format script file. </li>
-	<li>UI for adding the following types of components to the script:
-	<ul>
-		<li>phonebook items: contacts, contact sets, contact groups</li>
-		<li>connection methods</li>
-		<li>calendar items: to-dos, appointments, events, reminders, anniversaries</li>
-		<li>mail boxes</li>
-		<li>message items: text messages (SMS), multimedia messages (MMS), audio messages (AMS), emails, smart messages (such as vCards and ringing tones), infra-red (IR) messages, Bluetooth (BT) messages</li>
-		<li>notes</li>
-		<li>browser items: bookmarks and bookmark folders, saved pages and saved page folders</li>
-		<li>log entries: sent or received calls, call duration</li>
-		<li>instant messaging and presence service (IMPS) servers</li>
-		<li>landmarks (for location identification purposes) </li>
-		<li>files in the following formats and identifications: 3GPP-70kB, AAC-100kB, AMR-20kB, XLS-15kB, GIF-2kB, JPEG-200kB. JPEG-25kB, JPEG-500kB, MIDI-10kB, MP3-250kB, PNG-15kB, PPT-40kB, RM-95kB, RNG-1kB, TXT-10kB, TXT-70kB, WAV-20kB, DOC-20kB, SWF-15kB, JAD-1kB, JAR-10kB, TIF-25kB, MXMF-40kB, BMP-25kB, JP2-25kB, SVG-15kB, HTML-20kB, VCF-1kB, VCS-1kB, MP4-200kB, SISX-10kB, RAM-1kB,  WMV-200kB, WMA-50kB.</li>
-	</ul>
-	</li>
-</ul>
-
-<h3><a name="newfeatures"></a>What's new</h3>
-<ul>
-	<li>Feature: It is now possible to upload a script file to a target device and run it in the device via an HTI connection.</li>
-	<li>Feature: Added Run in device via HTI connection.</li>
-</ul>
-
-<h3><a name="installation"></a>Installation notes</h3>
-<h5>How to upgrade from the older versions</h5>
-<p>New version of the extension comes with the updated versions of common utility plug-ins. Once you have installed the new set of plug-ins, perform the following steps:</p>
-<ol>
-<li>Open 'Command Prompt'.</li>
-<li>Go to the Carbide.c++ installation directory (for example <i>C:\Program Files\Nokia\Carbide.c++ v2.0</i>).</li>
-<li>Start Carbide.c++ with the following command line: "Carbide.c++.exe" -clean</li>
-</ol>
-<p>The starting of Carbide.c++ with the clean option ensures that the latest versions of plug-ins are loaded.</p>
-
-<h3><a name="requirements"></a>System requirements</h3>
-<p>Basic requirements:</p>
-<ul>
-	<li>Windows 2000, Windows XP</li>
-	<li>Minimum Platform/SDK build PC.</li>
-	<li>Normal Platform/SDK build PC.</li>
-</ul>
-<p>Additional requirements:</p>
-<ul>
-	<li> N/A </li>
-</ul>
-
-<h3><a name="compissues"></a>Compatibility issues</h3>
-<ul>
-<li>N/A</li>
-</ul>
-
-<h3><a name="issues"></a>Known issues</h3>   <ul>
-<li>N/A</li>
-</ul>
-
-<h3>Version history</h3>
-<h5>Version 1.2.0 &ndash; 5th February 2009</h5>
-<ul>
-	<li>Feature: It is now possible to upload a script file to a target device and run it in the device via an HTI connection.</li>
-	<li>Feature: Added Run in device via HTI connection.</li>
-</ul>
-
-<h5>Version 1.1.0 &ndash; 3rd November 2008</h5>
-<ul>
-<li>Feature: It is possible to define random length by selecting <b>Mode > Random -
-Custom length</b>, and define value to the <b>Item value</b> field.</li>
-<li>With File, DRM encryption added.</li>
-<li>Feature: Dialogs for Component that can have reference to Contact-set has now a
-button to create Contact-Sets. Those components are: Contact, Messages (SMS,
-MMS, AMS, Email, Smart Message, IR message, BT message), Appointment and Contact
-Group.</li>
-<li>Feature: All Item values that can have only known values has now fixed values in
-combos instead of text field. For example in SMS, Folder has values: "Sent",
-"Inbox", "Draft" and "Outbox" and Status has values: "Read" and "New".</li>
-<li>Feature: New Mode <b>Increase for each copy</b> added. The Increase for each copy
-mode is applied only with phone number fields in contacts, messages and logs.
-This mode is used together with the "amount" attribute. When the Increase
-for each copy mode is selected, phone number will increase for each copy of
-component created. For example, if phone number "12300" is given, the first
-copy will have phone number "123000", and the second copy will have "12301",
-third "12302" and so on. If the Amount attribute of Phone number is used,
-each copy will have a different phone number. For more information, see Creator
-Help or User's Guide.</li>
-<li>Feature: Added limitation that if element's max occurence is defined, it is not
-possible to add more than one row of that element to script with the Script
-Editor. For example, Connection method can have only one Connection Name.
-</li>
-<li>Feature: Added usage logging and update site URL.</li>
-<li>Feature: With File, new types added: WMV-200kB and WMA-50kB.</li>
-<li>Feature: Editor area contains an own button for creating Contact-Sets instead of selecting type from combo.</li>
-<li>Feature: Wizard selects automatically a project where new Creator Script file will be created if the project is selected in Project Explorer or only one project exists in workspace.</li>
-<li>Change: 'Random' column header changed to 'Mode. Under 'Mode', there is also Increase for each Copy mode.</li>
-<li>Change: Several minor UI updates.</li>
-<li>Fix: Unable to start Wizard for creating a new Creator Script file if no projects exist in workspace.</li>
-</ul>
-
-<h5>Version 1.0.0 &ndash; 29th April 2008</h5>
-<p>The first version.</p>
-
-<div id="footer">
-Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies).<br>
-All rights reserved. <br>
-This component and the accompanying materials are made available <br>
-under the terms of "Eclipse Public License v1.0" <br>
-which accompanies this distribution and is available <br>
-at the URL <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-<br><br>
-Initial Contributors:<br>
-Nokia Corporation - initial contribution
-<br><br>
-Contributors:<br>
-Description:
-
-</div>
-</body>
-</html>
\ No newline at end of file
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
+  <title>Release notes</title>
+  <link href="../book.css" type="text/css" rel="stylesheet">
+  <style type="text/css">
+ </style>
+</head>
+
+<body>
+<h2>Release notes</h2>
+
+<h4>Creator Carbide.c++ Extension &ndash; Version 1.3.0</h4>
+
+<p>Released 8th September 2010</p>
+<ul>
+  <li><a href="#description">Product description</a></li>
+  <li><a href="#features">Main features</a></li>
+  <li><a href="#newfeatures">What's new</a></li>
+  <li><a href="#installation">Installation notes</a></li>
+  <li><a href="#requirements">System requirements</a></li>
+  <li><a href="#compissues">Compatibility issues</a></li>
+  <li><a href="#issues">Known issues</a></li>
+</ul>
+
+<h3><a name="description"></a>Product description</h3>
+
+<p>The Creator tool is used to create different kinds of test data (for
+example, contacts, messages or calendar entries) into a device. Creator is a
+useful tool for testing situations where a device is saving high amounts of
+data, or the data is either saved to a device several times or to multiple
+devices at the same time. </p>
+
+<p>The test data itself is contained in XML scripts, identified by the
+<i>.creatorxml</i> file extension. The Creator Carbide.c++ Extension automates
+and simplifies the creation of these scripts by enabling you to add components
+such as contacts, messages, notes, and files in the Carbide IDE. You can also
+create advanced test data combinations that associate, for example, contact
+data with messaging data. </p>
+
+<p>The Creator extension can be started by selecting <b>File &gt; New &gt;
+Other &gt; Carbide Extensions &gt; Creator script file</b> or <b>Carbide &gt;
+Creator Script Editor</b>.</p>
+
+<h3><a name="features"></a>Main features</h3>
+<ul>
+  <li>UI for creating an XML format script file. </li>
+  <li>UI for adding the following types of components to the script: 
+    <ul>
+      <li>phonebook items: contacts, contact sets, contact groups</li>
+      <li>connection methods</li>
+      <li>calendar items: to-dos, appointments, events, reminders,
+      anniversaries</li>
+      <li>mail boxes</li>
+      <li>message items: text messages (SMS), multimedia messages (MMS), audio
+        messages (AMS), emails, smart messages (such as vCards and ringing
+        tones), infra-red (IR) messages, Bluetooth (BT) messages</li>
+      <li>notes</li>
+      <li>browser items: bookmarks and bookmark folders, saved pages and saved
+        page folders</li>
+      <li>log entries: sent or received calls, call duration</li>
+      <li>instant messaging and presence service (IMPS) servers</li>
+      <li>landmarks (for location identification purposes) </li>
+      <li>files in the following formats and identifications: 3GPP-70kB,
+        AAC-100kB, AMR-20kB, XLS-15kB, GIF-2kB, JPEG-200kB. JPEG-25kB,
+        JPEG-500kB, MIDI-10kB, MP3-250kB, PNG-15kB, PPT-40kB, RM-95kB, RNG-1kB,
+        TXT-10kB, TXT-70kB, WAV-20kB, DOC-20kB, SWF-15kB, JAD-1kB, JAR-10kB,
+        TIF-25kB, MXMF-40kB, BMP-25kB, JP2-25kB, SVG-15kB, HTML-20kB, VCF-1kB,
+        VCS-1kB, MP4-200kB, SISX-10kB, RAM-1kB, WMV-200kB, WMA-50kB.</li>
+    </ul>
+  </li>
+</ul>
+
+<h3><a name="newfeatures"></a>What's new</h3>
+<ul>
+  <li>Feature: Updated support for Carbide 3 </li>
+</ul>
+
+<h3><a name="installation"></a>Installation notes</h3>
+
+<h5>How to upgrade from the older versions</h5>
+
+<p>New version of the extension comes with the updated versions of common
+utility plug-ins. Once you have installed the new set of plug-ins, perform the
+following steps:</p>
+<ol>
+  <li>Open 'Command Prompt'.</li>
+  <li>Go to the Carbide.c++ installation directory (for example <i>C:\Program
+    Files\Nokia\Carbide.c++ v2.0</i>).</li>
+  <li>Start Carbide.c++ with the following command line: "Carbide.c++.exe"
+    -clean</li>
+</ol>
+
+<p>The starting of Carbide.c++ with the clean option ensures that the latest
+versions of plug-ins are loaded.</p>
+
+<h3><a name="requirements"></a>System requirements</h3>
+
+<p>Basic requirements:</p>
+<ul>
+  <li>Windows 2000, Windows XP</li>
+  <li>Minimum Platform/SDK build PC.</li>
+  <li>Normal Platform/SDK build PC.</li>
+</ul>
+
+<p>Additional requirements:</p>
+<ul>
+  <li>N/A </li>
+</ul>
+
+<h3><a name="compissues"></a>Compatibility issues</h3>
+<ul>
+  <li>N/A</li>
+</ul>
+
+<h3><a name="issues"></a>Known issues</h3>
+<ul>
+  <li>N/A</li>
+</ul>
+
+<h3>Version history</h3>
+
+<h5>Version 1.2.1 &ndash; 21st April 2010</h5>
+<ul>
+  <li><strong>Fix</strong>: Help link to HTI connection documentation
+  fixed.</li>
+</ul>
+
+<h5>Version 1.2.0 &ndash; 5th February 2009</h5>
+<ul>
+  <li>Feature: It is now possible to upload a script file to a target device
+    and run it in the device via an HTI connection.</li>
+  <li>Feature: Added Run in device via HTI connection.</li>
+</ul>
+
+<h5>Version 1.1.0 &ndash; 3rd November 2008</h5>
+<ul>
+  <li>Feature: It is possible to define random length by selecting <b>Mode &gt;
+    Random - Custom length</b>, and define value to the <b>Item value</b>
+  field.</li>
+  <li>With File, DRM encryption added.</li>
+  <li>Feature: Dialogs for Component that can have reference to Contact-set has
+    now a button to create Contact-Sets. Those components are: Contact,
+    Messages (SMS, MMS, AMS, Email, Smart Message, IR message, BT message),
+    Appointment and Contact Group.</li>
+  <li>Feature: All Item values that can have only known values has now fixed
+    values in combos instead of text field. For example in SMS, Folder has
+    values: "Sent", "Inbox", "Draft" and "Outbox" and Status has values: "Read"
+    and "New".</li>
+  <li>Feature: New Mode <b>Increase for each copy</b> added. The Increase for
+    each copy mode is applied only with phone number fields in contacts,
+    messages and logs. This mode is used together with the "amount" attribute.
+    When the Increase for each copy mode is selected, phone number will
+    increase for each copy of component created. For example, if phone number
+    "12300" is given, the first copy will have phone number "123000", and the
+    second copy will have "12301", third "12302" and so on. If the Amount
+    attribute of Phone number is used, each copy will have a different phone
+    number. For more information, see Creator Help or User's Guide.</li>
+  <li>Feature: Added limitation that if element's max occurence is defined, it
+    is not possible to add more than one row of that element to script with the
+    Script Editor. For example, Connection method can have only one Connection
+    Name. </li>
+  <li>Feature: With File, new types added: WMV-200kB and WMA-50kB.</li>
+  <li>Feature: Editor area contains an own button for creating Contact-Sets
+    instead of selecting type from combo.</li>
+  <li>Feature: Wizard selects automatically a project where new Creator Script
+    file will be created if the project is selected in Project Explorer or only
+    one project exists in workspace.</li>
+  <li>Change: 'Random' column header changed to 'Mode. Under 'Mode', there is
+    also Increase for each Copy mode.</li>
+  <li>Change: Several minor UI updates.</li>
+  <li>Fix: Unable to start Wizard for creating a new Creator Script file if no
+    projects exist in workspace.</li>
+</ul>
+
+<h5>Version 1.0.0 &ndash; 29th April 2008</h5>
+
+<p>The first version.</p>
+
+<div id="footer">
+Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies).<br>
+All rights reserved. <br>
+This component and the accompanying materials are made available <br>
+under the terms of "Eclipse Public License v1.0" <br>
+which accompanies this distribution and is available <br>
+at the URL <a
+href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+<br>
+<br>
+Initial Contributors:<br>
+Nokia Corporation - initial contribution <br>
+<br>
+Contributors:<br>
+Description: </div>
+</body>
+</html>
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator.help/html/tasks/adding_components.htm
--- a/creatorextension/com.nokia.s60tools.creator.help/html/tasks/adding_components.htm	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator.help/html/tasks/adding_components.htm	Wed Sep 15 17:28:26 2010 +0300
@@ -56,7 +56,7 @@
 <li><a href="../reference/calendar.htm">Calendar components</a></li>
 </ul>
 
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
+<div id="footer">Copyright &copy; 2007-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
 License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
 </body>
 </html>
\ No newline at end of file
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator.help/html/tasks/creating_xml_file.htm
--- a/creatorextension/com.nokia.s60tools.creator.help/html/tasks/creating_xml_file.htm	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator.help/html/tasks/creating_xml_file.htm	Wed Sep 15 17:28:26 2010 +0300
@@ -18,7 +18,7 @@
 <li>Click <b>Finish</b>. <p>The Creator Script Editor tab opens and you can now start adding components to the script. </p><p>For the next steps, see <a href="adding_components.htm">Adding components</a>.</p></li>
 </ol>
 
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
+<div id="footer">Copyright &copy; 2007-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
 License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
 </body>
 </html>
\ No newline at end of file
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator.help/html/tasks/run_in_device.htm
--- a/creatorextension/com.nokia.s60tools.creator.help/html/tasks/run_in_device.htm	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator.help/html/tasks/run_in_device.htm	Wed Sep 15 17:28:26 2010 +0300
@@ -10,7 +10,7 @@
 <h2>Running script in device</h2>
 
 <h5>Before you start</h5>
-<p>Make sure that you have a <i>.creatorxml</i> script file you want to run in a target device, and that you have an HTI connection to the target device. For more instructions on configuring the HTI connection, see the <a href="../../../com.nokia.s60tools.hticonnection.help/html/toc.htm">HTI Connection Help</a>.</p>
+<p>Make sure that you have a <i>.creatorxml</i> script file you want to run in a target device, and that you have an HTI connection to the target device. For more instructions on configuring the HTI connection, see the <a href="../../../com.nokia.s60tools.hticonnection.help/html/tool.htm">HTI Connection Help</a>.</p>
 <p>Check also the version of the Creator S60 device application. The Run in device functionality requires version 5.0.3 or newer. <b>Note</b>: It is suggested to always use the latest version of Creator S60 device application.</p>
 
 <p>To upload and run script files in a target device, do the following:</p>
@@ -26,7 +26,7 @@
 <li><a href="creating_xml_file.htm">Creating the script file</a></li>
 </ul>
 
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
+<div id="footer">Copyright &copy; 2007-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
 License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
 </body>
 </html>
\ No newline at end of file
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator.help/html/tasks/setting_creator_preferences.htm
--- a/creatorextension/com.nokia.s60tools.creator.help/html/tasks/setting_creator_preferences.htm	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator.help/html/tasks/setting_creator_preferences.htm	Wed Sep 15 17:28:26 2010 +0300
@@ -24,7 +24,7 @@
 <li><a href="run_in_device.htm">Running script in device</a></li>
 </ul>
 
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
+<div id="footer">Copyright &copy; 2007-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
 License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
 </body>
 </html>
\ No newline at end of file
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator.help/html/tasks/tasks.htm
--- a/creatorextension/com.nokia.s60tools.creator.help/html/tasks/tasks.htm	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator.help/html/tasks/tasks.htm	Wed Sep 15 17:28:26 2010 +0300
@@ -17,7 +17,7 @@
 	<li><a href="setting_creator_preferences.htm">Setting Creator preferences</a></li>
 </ul>
 
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
+<div id="footer">Copyright &copy; 2007-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. 
 License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
 </body>
 </html>
\ No newline at end of file
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator.help/html/tool.htm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/creatorextension/com.nokia.s60tools.creator.help/html/tool.htm	Wed Sep 15 17:28:26 2010 +0300
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
+  <title>Carbide.c++ User Guide</title>
+  <link href="../book.css" rel="stylesheet" type="text/css">
+  <style>
+                table, td, th { border: 0px none #FFF; }
+  </style>
+</head>
+
+<body background="images/background_carbide.jpg">
+<p> </p>
+
+<table width="530" border="0" align="center" cellpadding="0" cellspacing="5"
+bgcolor="#FFFFFF">
+  <tbody>
+    <tr>
+      <td width="215"><img src="images/about_cpp.png" width="225"
+      height="200"></td>
+      <td width="294" valign="bottom"><p align="right"><b><img
+        src="images/brandmark_cpp.gif" width="106" height="52"></b></p>
+
+        <p> </p>
+
+        <p> </p>
+
+        <p> </p>
+
+        <p class="titleSmall">Copyright © 2007-2010 Nokia Corporation and/or
+        its subsidiary(-ies). All rights reserved. <br>
+        License: <a
+        href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></p>
+      </td>
+    </tr>
+    <tr>
+      <td colspan="2"><h1 align="center">Creator User Guide </h1>
+
+        <p align="center" class="titleSmall">Version 1.2.1; April, 2010</p>
+      </td>
+    </tr>
+  </tbody>
+</table>
+</body>
+</html>
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator/META-INF/MANIFEST.MF
--- a/creatorextension/com.nokia.s60tools.creator/META-INF/MANIFEST.MF	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator/META-INF/MANIFEST.MF	Wed Sep 15 17:28:26 2010 +0300
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Carbide.c++ Extensions - Creator Script Editor
 Bundle-SymbolicName: com.nokia.s60tools.creator; singleton:=true
-Bundle-Version: 1.2.0
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: com.nokia.s60tools.creator.CreatorActivator
 Bundle-Vendor: Nokia
 Require-Bundle: org.eclipse.ui,
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator/ccbuild.xml
--- a/creatorextension/com.nokia.s60tools.creator/ccbuild.xml	Mon Sep 13 15:23:15 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.nokia.s60tools.creator" default="cc" basedir=".">
-
-	<!-- Targets -->
-	<target name="cc" depends="clean-test,jar, instr,feature, analyze, zip" description="Build, instrument, run unit tests and analyze code"/>
-
-
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-
-	<!-- Compiler settings -->
-	<property name="javacFailOnError" value="true"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="javacSource" value="5"/>
-	<property name="javacTarget" value="5"/>
-	
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-	
-	<property name="help.project.name" value="${ant.project.name}.help"/>
-	<property name="feature.project.name" value="com.nokia.carbide.extension.creator"/>
-	<property name="feature.name" value="Creator"/>
-	
-	<property name="jar.filename" value="${ant.project.name}.jar"/>
-	<property name="help.jar.filename" value="${help.project.name}.jar"/>
-	
-	<!-- Folder definitions -->
-	<property name="feature.project.folder" location="../com.nokia.carbide.extension.creator"/>
-	<property name="binaries.folder" location="../${feature.name}.binaries"/>
-	
-	<!-- Carbide layouts -->
-	<property name="carbide.dev.folder" location="c:/Carbide_development/plugins"/>
-	<property name="carbide.int.folder" location="c:/Carbide_internal/plugins"/>
-	<property name="carbide.adt.folder" location="c:/Carbide_ADT/plugins"/>
-	
-	<property name="reports.folder" location="../reports"/>
-	<property name="reports.emma" location="${reports.folder}/emma"/>
-	<property name="instr.folder" location="../instr"/>
-	
-	
-	<!-- EMMA configuration -->
- 	<path id="emma.lib" >
-    	<pathelement location="${ant.home}/lib/emma.jar" />
-    	<pathelement location="${ant.home}/lib/emma_ant.jar" />
-  	</path>
-
-  	<taskdef resource="emma_ant.properties" classpathref="emma.lib" />
-	
-	<!-- PMD configuration -->
-	<path id="pmd.lib" >
-    	<pathelement location="${ant.home}/lib/pmd-4.2.jar" />
-    	<pathelement location="${ant.home}/lib/asm-3.1.jar" />
-    	<pathelement location="${ant.home}/lib/jaxen-1.1.1.jar" />
-  	</path>
-	
-	<taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.lib" />
-	
-	<path id="path_bootclasspath">
-		<fileset dir="${java.home}/lib">
-			<include name="*.jar"/>
-		</fileset>
-	</path>	
-	
-	<path id="build_classpath">
-		<path refid="carbide_classpath"/>
-	</path>
-	
-	<!-- Select Carbide layout -->
-	<path id="carbide_classpath">
-		<fileset dir="${carbide.int.folder}" includes="**/*.jar" />
-	</path>
-	
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-	</target>
-
-	<!-- Initialization -->
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/${ant.project.name}">
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-
-		<property name="jar.filename" value="${ant.project.name}.jar"/>
-		
-		<delete dir="${reports.folder}"/>
-		<mkdir dir="${reports.folder}"/>
-		
-		<delete dir="../plugins"/>
-		<mkdir dir="../plugins"/>
-		
-		<!-- Delete build folders -->
-		<delete dir="${basedir}/com"/>
-		
-		<exec executable="svn" dir="../.">
-			<arg line="up"/>
-		</exec>
-	</target>
-
-	<!-- Build target -->
-	<target name="build" depends="init" description="Build the source">
-	
-		<!-- Build the source -->
-		<javac destdir="" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}">
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="build_classpath" />
-			<src path="src/" />
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-			<compilerarg line="-log '${temp.folder}/bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-		</javac>
-
-		<!-- Copy necessary resources -->
-		<copy todir="" failonerror="true" overwrite="false">
-			<fileset dir="src/" excludes="**/*.java, **/package.htm*" />
-		</copy>
-
-		<!-- Create build result folder -->
-		<mkdir dir="${build.result.folder}"/>
-
-	</target>
-
-	
-	<!-- JAR target -->
-	<target name="jar" depends="build" description="Create JAR">
-
-		<!-- Create JARs -->
-		<zip destfile="../plugins/${jar.filename}">
-				<fileset dir="${build.result.folder}">
-						  <include name="com/**"/>
-					    <include name="icons/**"/>
-					    <include name="META-INF/**"/>
-					    <include name="plugin.xml"/>
-					    <include name="about.html"/>
-					    <include name="about.ini"/> 
-					    <include name="about.mappings"/> 
-					    <include name="about.properties"/> 
-				</fileset>
-		</zip>
-		
-
-	</target>
-	
-	
-	<!-- Instrumentation target, depends on JAR -->
-	<target name="instr" depends="jar">
-		<!-- Instrument the source code -->
-		<emma>
-			<instr instrpath="../plugins/${jar.filename}" destdir="${instr.folder}" metadatafile="${reports.emma}/metadata.emma" merge="true"/>
-		</emma>
-	</target>
-	
-	
-
-	<!-- Feature target -->
-	<target name="feature" depends="jar" description="Create feature">
-		<property name="feature.folder" location="${binaries.folder}/feature"/>
-		
-		
-		<mkdir dir="${feature.folder}"/>
-		<mkdir dir="${feature.folder}/plugins"/>
-		<mkdir dir="${feature.folder}/features/${feature.project.name}"/>
-		<mkdir dir="${binaries.folder}/nightly_builds"/>		
-				
-		<!-- Create help JAR -->
-		<zip destfile="../plugins/${help.jar.filename}" basedir="../${help.project.name}" excludes="src/,.*"/>
-		
-		<!-- Copy feature stuff to the temp folder -->
-		<copy todir="${feature.folder}/features/${feature.project.name}" file="${feature.project.folder}/feature.xml"/>
-		<copy todir="${feature.folder}/features/${feature.project.name}" file="${feature.project.folder}/license.txt"/>
-		
-		<!-- Set version numbers to plugins jar packages -->
-		<exec dir="../" executable="bash" resolveexecutable="true" failonerror="true"> 
-				<arg value="-c"/>
-				<arg value="C:\\hudson\\jobs\\setPluginVersion.sh ${ant.project.name}.help"/>
-		</exec>	
-		<exec dir="../" executable="bash" resolveexecutable="true" failonerror="true"> 
-				<arg value="-c"/>
-				<arg value="C:\\hudson\\jobs\\setPluginVersion.sh ${ant.project.name}"/>
-		</exec>
-		
-		<!-- Copy the actual plug-in to the feature folder -->
-		<copy todir="${feature.folder}/plugins">
-			<fileset dir="../plugins"/>
-		</copy>
-		
-		
-		<!-- Copy the actual plug-ins to the carbide folders -->
-		<copy todir="${carbide.int.folder}" failonerror="true" overwrite="true">
-				<fileset dir="${feature.folder}/plugins"/>
-		</copy>
-		<copy todir="${carbide.dev.folder}" failonerror="true" overwrite="true">
-				<fileset dir="${feature.folder}/plugins"/>
-		</copy>
-		<copy todir="${carbide.adt.folder}" failonerror="true" overwrite="true">
-				<fileset dir="${feature.folder}/plugins"/>
-		</copy>
-		
-	</target>
-	
-	<!-- Analyze target -->
-	<target name="analyze">
-		<!-- PMD -->
-		<pmd>
-			<!-- Rules -->
-			<ruleset>basic</ruleset>
-			<ruleset>codesize</ruleset>
-			<ruleset>coupling</ruleset>
-			<ruleset>design</ruleset>
-			<ruleset>strictexception</ruleset>
-			<ruleset>strings</ruleset>
-			<ruleset>sunsecure</ruleset>
-			<ruleset>unusedcode</ruleset>
-			<ruleset>junit</ruleset>
-			
-			<!-- XML output -->
-			<formatter type="xml" toFile="${reports.folder}/report.pmd.xml"/>
-			<formatter type="html" toFile="${reports.folder}/report.pmd.html"/>
-			
-			<!-- Files to analyze -->
-			<fileset dir="src/">
-					<include name="**/*.java"/>
-			</fileset>
-			
-		</pmd>
-	</target>
-			
-	<!-- Clean tests target -->
-  	<target name="clean-test" description="Clean test">
-	    	<delete dir="${instr.folder}"/>
-	    	<delete dir="${reports.folder}"/>
-  	</target>
-  
-	
-	<!-- Make zip package of the feature and plugins -->
-	<target name="zip">
-	
-			<!-- Create the feature zip -->
-			<zip destfile="${binaries.folder}/${feature.name}.zip" basedir="${feature.folder}"/>
-			
-			<delete dir="${feature.folder}"/>
-			
-			<!-- Nightly build -->
-			<tstamp>
-			   <format property="timestamp" pattern="dd-MM-yyyy" />
-			</tstamp>
-	
-			<delete dir="${binaries.folder}/nightly_builds"/>
-	  	<mkdir dir="${binaries.folder}/nightly_builds"/>
-	
-			<copy tofile="${binaries.folder}/nightly_builds/${feature.name}-${timestamp}.zip" file="${binaries.folder}/${feature.name}.zip"/>
-			
-	</target>
-	
-</project>
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator/plugin.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/creatorextension/com.nokia.s60tools.creator/plugin.properties	Wed Sep 15 17:28:26 2010 +0300
@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# plugin.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# Plugin properties for Analyze Tool
+# This file should be translated.
+creatorKeywords.common= creator script
+productBlurb=Carbide.c++ Extensions - Creator Script Editor \n\
+\n\
+Version: 1.3\n\
+Build id: {0}\n\
+\n\
+\n\
+Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).\n\
+All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html.
\ No newline at end of file
diff -r 400fe7b031f9 -r eb17a7f7f320 creatorextension/com.nokia.s60tools.creator/plugin.xml
--- a/creatorextension/com.nokia.s60tools.creator/plugin.xml	Mon Sep 13 15:23:15 2010 -0500
+++ b/creatorextension/com.nokia.s60tools.creator/plugin.xml	Wed Sep 15 17:28:26 2010 +0300
@@ -70,11 +70,20 @@
        <extension
          point="org.eclipse.ui.preferencePages">
       <page
-            name="Creator Script Editor Preferences"
+            name="Creator Script Editor"
             class="com.nokia.s60tools.creator.preferences.CreatorPreferencePage"
             category="com.nokia.carbide.cpp.preferences.ExtensionsPreferencesPage"
             id="com.nokia.s60tools.creator.preferences.CreatorPreferencePage">
+            <keywordReference
+             id="com.nokia.s60tools.creator.keywords.common">
+            </keywordReference>
       </page>
    </extension>   
-
+<extension
+       point="org.eclipse.ui.keywords">
+    <keyword
+          id="com.nokia.s60tools.creator.keywords.common"
+          label="%creatorKeywords.common">
+    </keyword>
+ </extension>
 </plugin>