--- a/core/com.nokia.carbide.cpp.doc.user/html/hints_tips.htm Fri Nov 20 13:22:29 2009 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/hints_tips.htm Thu Dec 03 11:15:14 2009 -0600
@@ -26,23 +26,19 @@
<blockquote>
<p>Use the <a href="reference/search/wnd_system_search.htm">System Search</a> feature in Carbide. Click <b>Search > System...</b>, enter the search data, press Search. </p>
</blockquote>
- <h5 class="note">How can I quickly open a .h file associated from the source file I am currently editing ? </h5>
+ <h5 class="note">How can I quickly open a .h file associated from the source file I am currently editing? </h5>
<blockquote>
<p>The CDT editor supports quick opening of associated .h files. To view the .h file, select the name of the .h file in the source you are currently editing and press F3 (Open Declaration). A new editor view will appear and display the .h file. </p>
</blockquote>
<h5 class="note">I can't locate the eclipse.ini file to modify the behavior of Carbide.c++, where can I find it? </h5>
<blockquote>
- <p>The <span class="code">eclipse.ini</span> file was renamed the <span class="code">carbide.c++.1.x.ini</span> file to keep the <span class="code">.exe</span> and <span class="code">.ini</span> files in sync. </p>
+ <p>The <span class="code">eclipse.ini</span> file was renamed the <span class="code">carbide.c++.2.x.ini</span> file to keep the <span class="code">.exe</span> and <span class="code">.ini</span> files in sync. </p>
</blockquote>
<h5 class="note"><a name="VMissues"></a>I can't launch Carbide.c++ due to "Error occurred in initialization of VM, could not reserve enough space for object heap? </h5>
<blockquote>
<p>By default, the heap space set aside for Carbide is 1024MB. You can see this setting in the <span class="code">carbide.c++.1.x.ini</span> file as the line "<span class="code">-Xmx1024m</span>". Some system may have limited VM space available so we suggest you try lowering the default amount to "<span class="code">-Xmx512m</span>" and relaunching Carbide. </p>
</blockquote>
- <h5 class="note">I want to use CDT for other C/C++ development in Carbide.c++</h5>
- <blockquote>
- <p>Carbide.c++ hides some CDT UI elements using capabilities. We do this to avoid confusion as there are several things labeled C/C++ that don't really apply to Symbian development. To show these items, you need to add the Eclipse SDK to your Carbide.c++ installation (download link:<span class="code"> www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.2.1-200609210945/eclipse-SDK-3.2.1-win32.zip</span>), and then enable it from the preferences (<b>Window > Preferences > General > Capabilities > Nokia Debug</b>).</p>
-</blockquote>
- <h5 class="note">When I press F1 in a dialog, the help pane isn't very helpful? </h5>
+<h5 class="note">When I press F1 in a dialog, the help pane isn't very helpful? </h5>
<blockquote>
<p>If the Help pane does not display information specific to the page content, it may be because the page in the dialog doesn't have focus. This often occurs in a wizard page when nothing has been selected on the page. The help system has not been told which help content to display in the About section of the help pane. </p>
<p class="note"><b>NOTE</b> The Dynamic help section usually displays the proper helpful links, just not as specific as the About section should display. </p>
@@ -89,12 +85,12 @@
</blockquote>
<h5>New debug launch configuration fields not filled in correctly upon creation </h5>
<blockquote>
- <p>See "Debug icon not visible on executable in C/C++ Projects view" to correct this issue. Once completed, try to create a debug launch configuration again. Click the New button in the Configuration window to create a new configuration with the correct project information. </p>
+ <p>See "Debug icon not visible on executable in Project Explorer view" to correct this issue. Once completed, try to create a debug launch configuration again. Click the New button in the Configuration window to create a new configuration with the correct project information. </p>
</blockquote>
- <h5>Debug icon not visible on executable in C/C++ Projects view </h5>
- <blockquote>
- <p>This is commonly caused when the binary parser is not set correctly in the project. To correct, open the project properties window (right-click project name in C/C++ Projects view and select Properties), expand the C/C++ Build section and click the Binary Parser tab in the C/C++ Build page. Now look for the PE Windows Parser option. If it's not checkmarked, checkmark it and click Apply. If it is already set then uncheck it and click Apply, then reapply a checkmark and click Apply. The debug icon should now appear.</p>
- </blockquote>
+ <h5>Debug icon not visible on executable in Project Explorer view </h5>
+<blockquote>
+ <p>This is commonly caused when the binary parser is not set correctly in the project. To correct, open the project properties window (right-click project name in Project Explorer view and select Properties), expand the C/C++ Build section and click the Binary Parser tab in the C/C++ Build page. Now look for the PE Windows Parser option. If it's not checkmarked, checkmark it and click Apply. If it is already set then uncheck it and click Apply, then reapply a checkmark and click Apply. The debug icon should now appear.</p>
+</blockquote>
<h3><a name="connectivity" id="connectivity"></a>Connectivity</h3>
<h5>Unable to connect to device using Bluetooth and debug it using TRK </h5>
<blockquote>
--- a/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml Fri Nov 20 13:22:29 2009 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml Thu Dec 03 11:15:14 2009 -0600
@@ -1,3 +1,66 @@
+<<<<<<< local
+<?xml version="1.0" encoding="utf-8" ?>
+
+<introContent>
+ <extensionContent
+ id="com.nokia.carbide.cpp.doc.user-whatsnew"
+ style="carbide.css"
+ alt-style="carbide.properties"
+ name="Carbide.c++ Release Notes"
+ path="whatsnew/@">
+
+ <group style-id="content-group" id="carbide-cpp">
+ <link
+ label="Carbide.c++ Release Notes (2.4)"
+ url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/release_notes.htm"
+ id="carbide-link"
+ style-id="content-link">
+ <text>Learn about what's new in Carbide.c++ for Symbian OS developers.</text>
+ </link>
+ </group>
+
+ <group style-id="content-group" id="carbide-cpp">
+ <link
+ label="Performance Improvements (2.1)"
+ url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/release_notes.htm#210"
+ id="carbide-link"
+ style-id="content-link">
+ <text>Carbide performance improvements in 2.1 for large project importing, building, and other critical areas.</text>
+ </link>
+ </group>
+
+ <group style-id="content-group" id="carbide-cpp">
+ <link
+ label="Hover Help (2.0.4)"
+ url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.sysdoc.hover/resources/help%20context/dl_hover/html/getting_started.html"
+ id="carbide-link"
+ style-id="content-link">
+ <text>See Symbian API Reference information appear when you hover over a Symbian symbol in C/C++ editors.</text>
+ </link>
+ </group>
+
+ <group style-id="content-group" id="carbide-cpp">
+ <link
+ label="Carbide.c++ News Reader (2.0.3)"
+ url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_news.htm"
+ id="carbide-link"
+ style-id="content-link">
+ <text>Provides updates on the latest Carbide, Symbian, and S60 news.</text>
+ </link>
+ </group>
+
+ <group style-id="content-group" id="carbide-cpp">
+ <link
+ label="On-Device Connection (2.0)"
+ url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm"
+ id="carbide-link"
+ style-id="content-link">
+ <text>Create remote connection settings and update Carbide software services on devices.</text>
+ </link>
+ </group>
+
+ </extensionContent>
+=======
<?xml version="1.0" encoding="utf-8" ?>
<introContent>
@@ -59,4 +122,5 @@
</group>
</extensionContent>
+>>>>>>> other
</introContent>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp/html/intro/migrateExtensionContent.xml Fri Nov 20 13:22:29 2009 -0600
+++ b/core/com.nokia.carbide.cpp/html/intro/migrateExtensionContent.xml Thu Dec 03 11:15:14 2009 -0600
@@ -1,34 +1,28 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<introContent>
-
- <extensionContent
- id="com.nokia.carbide.cpp-migrate"
- name="Carbide.c+ Development"
- alt-style="carbide.properties"
- style="carbide.css"
- path="migrate/@">
-
- <group label="Carbide.c++ Development" id="carbide-cpp" style-id="content-group">
-
- <link
- label="Switching to Carbide.c++"
- url="http://sw.nokia.com/id/efb22f32-66d4-4dab-ac3f-9f107b81e4c6/Switching_to_Carbide_cpp_White_Paper_v1_0_en.pdf"
- id="carbide"
- style-id="content-link">
- <text>Download this whitepaper to learn how Carbide.c++ compares to Microsoft Visual Studio and Nokia CodeWarrior for Symbian development.</text>
- </link>
-
- <link
- label="Carbide.c++ Shortcuts"
- url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp/html/help_keys_Toc.htm"
- id="carbide-keys"
- style-id="content-link">
- <text>Carbide.c++ shortcuts include support for Microsoft Visual Studio as well as Nokia CodeWarrior.</text>
- </link>
-
- </group>
-
- </extensionContent>
-
-</introContent>
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<introContent>
+
+ <extensionContent
+ id="com.nokia.carbide.cpp-migrate"
+ name="Carbide.c+ Development"
+ alt-style="carbide.properties"
+ style="carbide.css"
+ path="migrate/@">
+
+ <!-- Removed 20091201 since links are no longer valid
+ <group label="Carbide.c++ Development" id="carbide-cpp" style-id="content-group">
+
+ <link
+ label="Carbide.c++ Shortcuts"
+ url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp/html/help_keys_Toc.htm"
+ id="carbide-keys"
+ style-id="content-link">
+ <text>Carbide.c++ shortcuts include support for Microsoft Visual Studio.</text>
+ </link>
+
+ </group>
+ -->
+
+ </extensionContent>
+
+</introContent>
--- a/core/com.nokia.carbide.cpp/intro/introContent.xml Fri Nov 20 13:22:29 2009 -0600
+++ b/core/com.nokia.carbide.cpp/intro/introContent.xml Thu Dec 03 11:15:14 2009 -0600
@@ -1,259 +1,260 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
- A content file for the Universal Welcome
--->
-<introContent>
- <!-- Root page -->
- <page id="root" alt-style="$theme$/swt/root.properties" style="$theme$/html/root.css" style-id="page">
- <anchor id="head-anchor"/>
- <title style-id="intro-header">$introTitle$</title>
- <group id="links-background">
- <group id="page-links" computed="true"/>
- </group>
- <group id="action-links" computed="true">
- </group>
- <group id="branding">
- <img src="$introBrandingImage$" alt="$introBrandingImageText$"/>
- </group>
- <!-- General purpose groups for adding additional content -->
- <group id="extra-group1" filteredFrom="swt"><anchor id="anchor"/></group>
- <group id="extra-group2" filteredFrom="swt"><anchor id="anchor"/></group>
- <group id="extra-group3" filteredFrom="swt"><anchor id="anchor"/></group>
- <group id="extra-group4" filteredFrom="swt"><anchor id="anchor"/></group>
- <group id="extra-group5" filteredFrom="swt"><anchor id="anchor"/></group>
- </page>
-
- <!-- Standby page -->
- <page id="standby" alt-style="$theme$/swt/standby.properties" style="$theme$/html/standby.css" style-id="page">
- <anchor id="head-anchor"/>
- <title style-id="intro-header">$introTitle$</title>
- <group id="links-background">
- <group id="page-links" computed="true">
- </group>
- </group>
- <group id="action-links" computed="true">
- </group>
- <group id="branding">
- <img src="$introBrandingImage$" alt="$introBrandingImageText$"/>
- </group>
- <!-- General-purpose groups for additional content -->
- <group id="extra-group1" filteredFrom="swt"><anchor id="anchor"/></group>
- <group id="extra-group2" filteredFrom="swt"><anchor id="anchor"/></group>
- <group id="extra-group3" filteredFrom="swt"><anchor id="anchor"/></group>
- </page>
-
- <!-- Overview page -->
- <page id="overview" style="$theme$/html/overview.css" alt-style="$theme$/swt/overview.properties" style-id="page">
- <anchor id="head-anchor"/>
- <title style-id="intro-header">$introTitle$</title>
- <group id="extra-group1" filteredFrom="swt"/>
- <!-- navigation -->
- <group id="navigation-links" filteredFrom="swt">
- <group id="page-links" computed="true">
- </group>
- <group id="action-links">
- <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench" style-id="$high-contrast$">
- <text>Go to the workbench</text>
- </link>
- </group>
- </group>
- <!-- content -->
- <group id="page-content">
- <group id="content-header" label="Overview" filteredFrom="swt">
- </group>
- <text style-id="page-title" id="page-title" filteredFrom="html">Overview</text>
- <text style-id="page-description" id="page-description">$introDescription-overview$</text>
- <!-- panes -->
- <group id="top-left" computed="true"/>
- <group id="top-right" computed="true"/>
- <group id="content-divider" filteredFrom="swt"/>
- <group id="bottom-left" computed="true"/>
- <group id="bottom-right" computed="true"/>
- </group>
- <!-- extra groups for additional effects -->
- <group id="extra-group2" filteredFrom="swt"><anchor id="anchor"/></group>
- <group id="extra-group3" filteredFrom="swt"><anchor id="anchor"/></group>
- <group id="extra-group4" filteredFrom="swt"><anchor id="anchor"/></group>
- </page>
-
- <!-- Tutorials page -->
- <page id="tutorials" style="$theme$/html/tutorials.css" alt-style="$theme$/swt/tutorials.properties" style-id="page">
- <anchor id="head-anchor"/>
- <title style-id="intro-header">$introTitle$</title>
- <group id="extra-group1" filteredFrom="swt"/>
- <group id="navigation-links" filteredFrom="swt">
- <group id="page-links" computed="true">
- </group>
- <group id="action-links">
- <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench" style-id="$high-contrast$">
- <text>Go to the workbench</text>
- </link>
- </group>
- </group>
- <group id="page-content">
- <group id="content-header" label="Tutorials" filteredFrom="swt">
- </group>
- <text style-id="page-title" id="page-title" filteredFrom="html">Tutorials</text>
- <text style-id="page-description" id="page-description">$introDescription-tutorials$</text>
- <group id="top-left" computed="true"/>
- <group id="top-right" computed="true"/>
- <group id="content-divider" filteredFrom="swt"/>
- <group id="bottom-left" computed="true"/>
- <group id="bottom-right" computed="true"/>
- </group>
- <group id="extra-group2" filteredFrom="swt"><anchor id="anchor"/></group>
- <group id="extra-group3" filteredFrom="swt"><anchor id="anchor"/></group>
- <group id="extra-group4" filteredFrom="swt"><anchor id="anchor"/></group>
- </page>
-
- <!-- Samples page -->
- <page id="samples" style="$theme$/html/samples.css" alt-style="$theme$/swt/samples.properties" style-id="page">
- <anchor id="head-anchor"/>
- <title style-id="intro-header">$introTitle$</title>
- <group id="extra-group1" filteredFrom="swt"/>
- <group id="navigation-links" filteredFrom="swt">
- <group id="page-links" computed="true">
- </group>
- <group id="action-links">
- <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench" style-id="$high-contrast$">
- <text>Go to the workbench</text>
- </link>
- </group>
- </group>
- <group id="page-content">
- <group id="content-header" label="Samples" filteredFrom="swt">
- </group>
- <text style-id="page-title" id="page-title" filteredFrom="html">Samples</text>
- <text style-id="page-description" id="page-description">$introDescription-samples$</text>
- <group id="top-left" computed="true"/>
- <group id="top-right" computed="true"/>
- <group id="content-divider" filteredFrom="swt"/>
- <group id="bottom-left" computed="true"/>
- <group id="bottom-right" computed="true"/>
- </group>
- <group id="extra-group2" filteredFrom="swt"><anchor id="anchor"/></group>
- <group id="extra-group3" filteredFrom="swt"><anchor id="anchor"/></group>
- <group id="extra-group4" filteredFrom="swt"><anchor id="anchor"/></group>
- </page>
-
- <!-- What's New page -->
- <page id="whatsnew" style="$theme$/html/whatsnew.css" alt-style="$theme$/swt/whatsnew.properties" style-id="page">
- <anchor id="head-anchor"/>
- <title style-id="intro-header">$introTitle$</title>
- <group id="extra-group1" filteredFrom="swt"/>
- <group id="navigation-links" filteredFrom="swt">
- <group id="page-links" computed="true">
- </group>
- <group id="action-links">
- <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench" style-id="$high-contrast$">
- <text>Go to the workbench</text>
- </link>
- </group>
- </group>
- <group id="page-content">
- <group id="content-header" label="What's New" filteredFrom="swt">
- </group>
- <text style-id="page-title" id="page-title" filteredFrom="html">What's New</text>
- <text style-id="page-description" id="page-description">$introDescription-whatsnew$</text>
- <group id="top-left" computed="true"/>
- <group id="top-right" computed="true"/>
- <group id="content-divider" filteredFrom="swt"/>
- <group id="bottom-left" computed="true"/>
- <group id="bottom-right" computed="true"/>
- </group>
- <group id="extra-group2" filteredFrom="swt"><anchor id="anchor"/></group>
- <group id="extra-group3" filteredFrom="swt"><anchor id="anchor"/></group>
- <group id="extra-group4" filteredFrom="swt"><anchor id="anchor"/></group>
- </page>
-
- <!-- First Steps page -->
- <page id="firststeps" style="$theme$/html/firststeps.css" alt-style="$theme$/swt/firststeps.properties" style-id="page">
- <anchor id="head-anchor"/>
- <title style-id="intro-header">$introTitle$</title>
- <group id="extra-group1" filteredFrom="swt"/>
- <group id="navigation-links" filteredFrom="swt">
- <group id="page-links" computed="true">
- </group>
- <group id="action-links">
- <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench" style-id="$high-contrast$">
- <text>Go to the workbench</text>
- </link>
- </group>
- </group>
- <group id="page-content">
- <group id="content-header" label="First Steps" filteredFrom="swt">
- </group>
- <text style-id="page-title" id="page-title" filteredFrom="html">First Steps</text>
- <text style-id="page-description" id="page-description">$introDescription-firststeps$</text>
- <group id="top-left" computed="true"/>
- <group id="top-right" computed="true"/>
- <group id="content-divider" filteredFrom="swt"/>
- <group id="bottom-left" computed="true"/>
- <group id="bottom-right" computed="true"/>
- </group>
- <group id="extra-group2" filteredFrom="swt"><anchor id="anchor"/></group>
- <group id="extra-group3" filteredFrom="swt"><anchor id="anchor"/></group>
- <group id="extra-group4" filteredFrom="swt"><anchor id="anchor"/></group>
- </page>
-
- <!-- Web resources page -->
- <page id="webresources" style="$theme$/html/webresources.css" alt-style="$theme$/swt/webresources.properties" style-id="page">
- <anchor id="head-anchor"/>
- <title style-id="intro-header">$introTitle$</title>
- <group id="extra-group1" filteredFrom="swt"/>
- <group id="navigation-links" filteredFrom="swt">
- <group id="page-links" computed="true">
- </group>
- <group id="action-links">
- <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench" style-id="$high-contrast$">
- <text>Go to the workbench</text>
- </link>
- </group>
- </group>
- <group id="page-content">
- <group id="content-header" label="Web Resources" filteredFrom="swt">
- </group>
- <text style-id="page-title" id="page-title" filteredFrom="html">Web Resources</text>
- <text style-id="page-description" id="page-description">$introDescription-webresources$</text>
- <group id="top-left" computed="true"/>
- <group id="top-right" computed="true"/>
- <group id="content-divider" filteredFrom="swt"/>
- <group id="bottom-left" computed="true"/>
- <group id="bottom-right" computed="true"/>
- </group>
- <group id="extra-group2" filteredFrom="swt"><anchor id="anchor"/></group>
- <group id="extra-group3" filteredFrom="swt"><anchor id="anchor"/></group>
- <group id="extra-group4" filteredFrom="swt"><anchor id="anchor"/></group>
- </page>
-
-
- <!-- Migrate page -->
- <page id="migrate" style="$theme$/html/migrate.css" alt-style="$theme$/swt/migrate.properties" style-id="page">
- <anchor id="head-anchor"/>
- <title style-id="intro-header">$introTitle$</title>
- <group id="extra-group1" filteredFrom="swt"/>
- <group id="navigation-links" filteredFrom="swt">
- <group id="page-links" computed="true">
- </group>
- <group id="action-links">
- <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench" style-id="$high-contrast$">
- <text>Go to the workbench</text>
- </link>
- </group>
- </group>
- <group id="page-content">
- <group id="content-header" label="Migrate" filteredFrom="swt">
- </group>
- <text style-id="page-title" id="page-title" filteredFrom="html">Migrate</text>
- <text style-id="page-description" id="page-description">$introDescription-migrate$</text>
- <group id="top-left" computed="true"/>
- <group id="top-right" computed="true"/>
- <group id="content-divider" filteredFrom="swt"/>
- <group id="bottom-left" computed="true"/>
- <group id="bottom-right" computed="true"/>
- </group>
- <group id="extra-group2" filteredFrom="swt"><anchor id="anchor"/></group>
- <group id="extra-group3" filteredFrom="swt"><anchor id="anchor"/></group>
- <group id="extra-group4" filteredFrom="swt"><anchor id="anchor"/></group>
- </page>
-</introContent>
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ A content file for the Universal Welcome
+-->
+<introContent>
+ <!-- Root page -->
+ <page id="root" alt-style="$theme$/swt/root.properties" style="$theme$/html/root.css" style-id="page">
+ <anchor id="head-anchor"/>
+ <title style-id="intro-header">$introTitle$</title>
+ <group id="links-background">
+ <group id="page-links" computed="true"/>
+ </group>
+ <group id="action-links" computed="true">
+ </group>
+ <group id="branding">
+ <img src="$introBrandingImage$" alt="$introBrandingImageText$"/>
+ </group>
+ <!-- General purpose groups for adding additional content -->
+ <group id="extra-group1" filteredFrom="swt"><anchor id="anchor"/></group>
+ <group id="extra-group2" filteredFrom="swt"><anchor id="anchor"/></group>
+ <group id="extra-group3" filteredFrom="swt"><anchor id="anchor"/></group>
+ <group id="extra-group4" filteredFrom="swt"><anchor id="anchor"/></group>
+ <group id="extra-group5" filteredFrom="swt"><anchor id="anchor"/></group>
+ </page>
+
+ <!-- Standby page -->
+ <page id="standby" alt-style="$theme$/swt/standby.properties" style="$theme$/html/standby.css" style-id="page">
+ <anchor id="head-anchor"/>
+ <title style-id="intro-header">$introTitle$</title>
+ <group id="links-background">
+ <group id="page-links" computed="true">
+ </group>
+ </group>
+ <group id="action-links" computed="true">
+ </group>
+ <group id="branding">
+ <img src="$introBrandingImage$" alt="$introBrandingImageText$"/>
+ </group>
+ <!-- General-purpose groups for additional content -->
+ <group id="extra-group1" filteredFrom="swt"><anchor id="anchor"/></group>
+ <group id="extra-group2" filteredFrom="swt"><anchor id="anchor"/></group>
+ <group id="extra-group3" filteredFrom="swt"><anchor id="anchor"/></group>
+ </page>
+
+ <!-- Overview page -->
+ <page id="overview" style="$theme$/html/overview.css" alt-style="$theme$/swt/overview.properties" style-id="page">
+ <anchor id="head-anchor"/>
+ <title style-id="intro-header">$introTitle$</title>
+ <group id="extra-group1" filteredFrom="swt"/>
+ <!-- navigation -->
+ <group id="navigation-links" filteredFrom="swt">
+ <group id="page-links" computed="true">
+ </group>
+ <group id="action-links">
+ <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench" style-id="$high-contrast$">
+ <text>Go to the workbench</text>
+ </link>
+ </group>
+ </group>
+ <!-- content -->
+ <group id="page-content">
+ <group id="content-header" label="Overview" filteredFrom="swt">
+ </group>
+ <text style-id="page-title" id="page-title" filteredFrom="html">Overview</text>
+ <text style-id="page-description" id="page-description">$introDescription-overview$</text>
+ <!-- panes -->
+ <group id="top-left" computed="true"/>
+ <group id="top-right" computed="true"/>
+ <group id="content-divider" filteredFrom="swt"/>
+ <group id="bottom-left" computed="true"/>
+ <group id="bottom-right" computed="true"/>
+ </group>
+ <!-- extra groups for additional effects -->
+ <group id="extra-group2" filteredFrom="swt"><anchor id="anchor"/></group>
+ <group id="extra-group3" filteredFrom="swt"><anchor id="anchor"/></group>
+ <group id="extra-group4" filteredFrom="swt"><anchor id="anchor"/></group>
+ </page>
+
+ <!-- Tutorials page -->
+ <page id="tutorials" style="$theme$/html/tutorials.css" alt-style="$theme$/swt/tutorials.properties" style-id="page">
+ <anchor id="head-anchor"/>
+ <title style-id="intro-header">$introTitle$</title>
+ <group id="extra-group1" filteredFrom="swt"/>
+ <group id="navigation-links" filteredFrom="swt">
+ <group id="page-links" computed="true">
+ </group>
+ <group id="action-links">
+ <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench" style-id="$high-contrast$">
+ <text>Go to the workbench</text>
+ </link>
+ </group>
+ </group>
+ <group id="page-content">
+ <group id="content-header" label="Tutorials" filteredFrom="swt">
+ </group>
+ <text style-id="page-title" id="page-title" filteredFrom="html">Tutorials</text>
+ <text style-id="page-description" id="page-description">$introDescription-tutorials$</text>
+ <group id="top-left" computed="true"/>
+ <group id="top-right" computed="true"/>
+ <group id="content-divider" filteredFrom="swt"/>
+ <group id="bottom-left" computed="true"/>
+ <group id="bottom-right" computed="true"/>
+ </group>
+ <group id="extra-group2" filteredFrom="swt"><anchor id="anchor"/></group>
+ <group id="extra-group3" filteredFrom="swt"><anchor id="anchor"/></group>
+ <group id="extra-group4" filteredFrom="swt"><anchor id="anchor"/></group>
+ </page>
+
+ <!-- Samples page -->
+ <page id="samples" style="$theme$/html/samples.css" alt-style="$theme$/swt/samples.properties" style-id="page">
+ <anchor id="head-anchor"/>
+ <title style-id="intro-header">$introTitle$</title>
+ <group id="extra-group1" filteredFrom="swt"/>
+ <group id="navigation-links" filteredFrom="swt">
+ <group id="page-links" computed="true">
+ </group>
+ <group id="action-links">
+ <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench" style-id="$high-contrast$">
+ <text>Go to the workbench</text>
+ </link>
+ </group>
+ </group>
+ <group id="page-content">
+ <group id="content-header" label="Samples" filteredFrom="swt">
+ </group>
+ <text style-id="page-title" id="page-title" filteredFrom="html">Samples</text>
+ <text style-id="page-description" id="page-description">$introDescription-samples$</text>
+ <group id="top-left" computed="true"/>
+ <group id="top-right" computed="true"/>
+ <group id="content-divider" filteredFrom="swt"/>
+ <group id="bottom-left" computed="true"/>
+ <group id="bottom-right" computed="true"/>
+ </group>
+ <group id="extra-group2" filteredFrom="swt"><anchor id="anchor"/></group>
+ <group id="extra-group3" filteredFrom="swt"><anchor id="anchor"/></group>
+ <group id="extra-group4" filteredFrom="swt"><anchor id="anchor"/></group>
+ </page>
+
+ <!-- What's New page -->
+ <page id="whatsnew" style="$theme$/html/whatsnew.css" alt-style="$theme$/swt/whatsnew.properties" style-id="page">
+ <anchor id="head-anchor"/>
+ <title style-id="intro-header">$introTitle$</title>
+ <group id="extra-group1" filteredFrom="swt"/>
+ <group id="navigation-links" filteredFrom="swt">
+ <group id="page-links" computed="true">
+ </group>
+ <group id="action-links">
+ <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench" style-id="$high-contrast$">
+ <text>Go to the workbench</text>
+ </link>
+ </group>
+ </group>
+ <group id="page-content">
+ <group id="content-header" label="What's New" filteredFrom="swt">
+ </group>
+ <text style-id="page-title" id="page-title" filteredFrom="html">What's New</text>
+ <text style-id="page-description" id="page-description">$introDescription-whatsnew$</text>
+ <group id="top-left" computed="true"/>
+ <group id="top-right" computed="true"/>
+ <group id="content-divider" filteredFrom="swt"/>
+ <group id="bottom-left" computed="true"/>
+ <group id="bottom-right" computed="true"/>
+ </group>
+ <group id="extra-group2" filteredFrom="swt"><anchor id="anchor"/></group>
+ <group id="extra-group3" filteredFrom="swt"><anchor id="anchor"/></group>
+ <group id="extra-group4" filteredFrom="swt"><anchor id="anchor"/></group>
+ </page>
+
+ <!-- First Steps page -->
+ <page id="firststeps" style="$theme$/html/firststeps.css" alt-style="$theme$/swt/firststeps.properties" style-id="page">
+ <anchor id="head-anchor"/>
+ <title style-id="intro-header">$introTitle$</title>
+ <group id="extra-group1" filteredFrom="swt"/>
+ <group id="navigation-links" filteredFrom="swt">
+ <group id="page-links" computed="true">
+ </group>
+ <group id="action-links">
+ <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench" style-id="$high-contrast$">
+ <text>Go to the workbench</text>
+ </link>
+ </group>
+ </group>
+ <group id="page-content">
+ <group id="content-header" label="First Steps" filteredFrom="swt">
+ </group>
+ <text style-id="page-title" id="page-title" filteredFrom="html">First Steps</text>
+ <text style-id="page-description" id="page-description">$introDescription-firststeps$</text>
+ <group id="top-left" computed="true"/>
+ <group id="top-right" computed="true"/>
+ <group id="content-divider" filteredFrom="swt"/>
+ <group id="bottom-left" computed="true"/>
+ <group id="bottom-right" computed="true"/>
+ </group>
+ <group id="extra-group2" filteredFrom="swt"><anchor id="anchor"/></group>
+ <group id="extra-group3" filteredFrom="swt"><anchor id="anchor"/></group>
+ <group id="extra-group4" filteredFrom="swt"><anchor id="anchor"/></group>
+ </page>
+
+ <!-- Web resources page -->
+ <page id="webresources" style="$theme$/html/webresources.css" alt-style="$theme$/swt/webresources.properties" style-id="page">
+ <anchor id="head-anchor"/>
+ <title style-id="intro-header">$introTitle$</title>
+ <group id="extra-group1" filteredFrom="swt"/>
+ <group id="navigation-links" filteredFrom="swt">
+ <group id="page-links" computed="true">
+ </group>
+ <group id="action-links">
+ <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench" style-id="$high-contrast$">
+ <text>Go to the workbench</text>
+ </link>
+ </group>
+ </group>
+ <group id="page-content">
+ <group id="content-header" label="Web Resources" filteredFrom="swt">
+ </group>
+ <text style-id="page-title" id="page-title" filteredFrom="html">Web Resources</text>
+ <text style-id="page-description" id="page-description">$introDescription-webresources$</text>
+ <group id="top-left" computed="true"/>
+ <group id="top-right" computed="true"/>
+ <group id="content-divider" filteredFrom="swt"/>
+ <group id="bottom-left" computed="true"/>
+ <group id="bottom-right" computed="true"/>
+ </group>
+ <group id="extra-group2" filteredFrom="swt"><anchor id="anchor"/></group>
+ <group id="extra-group3" filteredFrom="swt"><anchor id="anchor"/></group>
+ <group id="extra-group4" filteredFrom="swt"><anchor id="anchor"/></group>
+ </page>
+
+
+ <!-- Migrate page -->
+ <page id="migrate" style="$theme$/html/migrate.css" alt-style="$theme$/swt/migrate.properties" style-id="page">
+ <anchor id="head-anchor"/>
+ <title style-id="intro-header">$introTitle$</title>
+ <group id="extra-group1" filteredFrom="swt"/>
+ <group id="navigation-links" filteredFrom="swt">
+ <group id="page-links" computed="true">
+ </group>
+ <group id="action-links">
+ <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench" style-id="$high-contrast$">
+ <text>Go to the workbench</text>
+ </link>
+ </group>
+ </group>
+ <group id="page-content">
+ <group id="content-header" label="Migrate" filteredFrom="swt">
+ </group>
+ <text style-id="page-title" id="page-title" filteredFrom="html">Migrate</text>
+ <text style-id="page-description" id="page-description">$introDescription-migrate$</text>
+ <group id="top-left" computed="true"/>
+ <group id="top-right" computed="true"/>
+ <group id="content-divider" filteredFrom="swt"/>
+ <group id="bottom-left" computed="true"/>
+ <group id="bottom-right" computed="true"/>
+ </group>
+ <group id="extra-group2" filteredFrom="swt"><anchor id="anchor"/></group>
+ <group id="extra-group3" filteredFrom="swt"><anchor id="anchor"/></group>
+ <group id="extra-group4" filteredFrom="swt"><anchor id="anchor"/></group>
+ </page>
+
+</introContent>
--- a/core/com.nokia.carbide.cpp/plugin.properties Fri Nov 20 13:22:29 2009 -0600
+++ b/core/com.nokia.carbide.cpp/plugin.properties Thu Dec 03 11:15:14 2009 -0600
@@ -6,7 +6,7 @@
CHEAT_SHEETS = Cheat Sheets
CHEAT_SHEETS_MENU = &Cheat Sheets...
-productBlurb=\nCarbide.c++ Version 2.3.0\n\
+productBlurb=\nCarbide.c++ Version 2.4.0\n\
Build {0} {1}\n\n\n\n\n\n\n\
Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.\n\
Visit http://developer.symbian.org/\n\
--- a/core/com.nokia.carbide.cpp/plugin.xml Fri Nov 20 13:22:29 2009 -0600
+++ b/core/com.nokia.carbide.cpp/plugin.xml Thu Dec 03 11:15:14 2009 -0600
@@ -139,9 +139,11 @@
configId="org.eclipse.ui.intro.universalConfig"
content="html/intro/webresourcesExtensionContent2.xml" />
+ <!-- Removed 20091201 as links were outdated
<configExtension
configId="org.eclipse.ui.intro.universalConfig"
content="html/intro/migrateExtensionContent.xml" />
+ -->
</extension>