--- a/core/com.nokia.carbide.cpp.doc.user/META-INF/MANIFEST.MF Thu Aug 05 11:17:37 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/META-INF/MANIFEST.MF Thu Aug 05 11:20:23 2010 -0500
@@ -5,4 +5,5 @@
Bundle-Version: 1.4.0.qualifier
Bundle-Vendor: Nokia
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.help
+Require-Bundle: org.eclipse.help,
+ org.eclipse.ui.cheatsheets
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_sdk_preferencea.html Thu Aug 05 11:17:37 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html><head>
-<title>SDK Preferences</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-<style type="text/css">
-<!--
-.style2 {
- color: #FF0000;
- font-weight: bold;
-}
--->
-</style>
-</head>
- <body>
- <div class="Head1">
-<h2>SDK Preferences</h2>
-</div>
-Use the <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.sdk.ui.preferences.SDKPreferencePage)")'>
-SDK Preferences</a> page in the <b>Preferences</b> window to control which installed SDKs are available to projects during an import. To
- access SDK preferences preference panel, select <b>Window > Preferences > Carbide.c++ > SDK Preferences</b>.
- <p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. If the SDK you have installed is not recognized, you may still be able to add it to the Discovered Symbian OS SDK list. See <a href="../tasks/start/carbide_requirements.htm">Carbide.c++ Requirements</a> for a list of supported SDKs. </p>
- <p class="note"><b>NOTE</b> This panel serves as a <span class="code">devices.xml</span> file editor. The <span class="code">devices.xml</span> file stores information about the installed SDKs used for Symbian OS development.</p>
- <div class="Figure">
-
- <p align="center" class="Image"><img src="../images/SDKPreferences.png" width="696" height="583" alt="SDK preferences panel" /></p>
- <p align="center" class="figure">Figure 1. SDK Preferences preference panel </p>
- </div>
- <table cellpadding="2" cellspacing="0"
-border="0">
- <tr valign="top"><th width="221" class="Cell">Name</th><th width="584" class="Cell">Function</th></tr>
- <tr valign="top">
- <td class="Cell"><b>Available Symbian OS SDK's</b></td>
- <td class="Cell"><p>Lists all the installed and recognized SDKs supported by the IDE. Only SDKs supported by the IDE are included in the list. </p>
- <p>Checked SDKs indicate build configurations available for creating projects. Unchecked SDKs are not displayed when creating new projects. </p>
- <p>SDKs shown in <span class="style2">red</span> indicate a problem, usually no <span class="code">EPOCROOT</span> or missing build configurations. </p>
- <p>Click on a SDK name to see its EPOCROOT location and build configuration status in the SDK Information area. </p></td>
- </tr>
- <tr valign="top">
- <td class="Cell"><b>Remove SDK </b></td>
- <td class="Cell">Click to remove the selected SDK from the Available Symbian OS SDK's list. </td>
- </tr>
- <tr valign="top">
- <td class="Cell"><b>Add New SDK </b></td>
- <td class="Cell"><p>Click to <a href="../tasks/sdks/sdk_add.htm">add</a> an SDK to the <b>Available Symbian OS SDKs</b> list.</p> </td>
- </tr>
- <tr valign="top">
- <td class="Cell"><b>SDK Properties</b></td>
- <td class="Cell"><p>Click to view and edit the <a href="../tasks/sdks/sdk_view_properties.htm">properties</a> of the currently selected SDK in the <b>Available Symbian OS SDKs</b> list.</p> </td>
- </tr>
- <tr valign="top">
- <td class="Cell"><b>Listen for devices.xml changes outside of Carbide </b></td>
- <td class="Cell">Enable of have Carbide issue an alert prompting you to rescan your SDKs when changes to the <span class="code">devices.xml</span> file are made outside of Carbide. When disabled the <span class="code">devices.xml</span> file is not scanned for changes. </td>
- </tr>
- <tr valign="top">
- <td class="Cell"><p><b>Rescan All SDKs</b></p> </td>
- <td class="Cell"><p>Click to <a href="../tasks/sdks/sdk_search.htm">rescan</a> the drive for newly installed SDKs. The devices.xml file is scanned for SDKs and the list of available SDKs is updated if the devices.xml file has changed.</p>
- <p class="note"><b>NOTE</b> Carbide.c++ scans for available SDKs each time it is started.</p></td>
- </tr>
- </table>
- <h5>Related tasks</h5>
- <ul>
-
- <li><a href="../tasks/WorkingwithSDKs.html">Working with SDKs</a></li>
- <li><a href="../tasks/AddinganSDK.html">Adding an SDK</a></li>
- <li><a href="../tasks/RmvngandVwngPropsosSDK.html">SDK Properties</a></li>
- </ul>
-<div id="footer">Copyright © 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></div>
-
- </body>
- </html>
-
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/plugin.xml Thu Aug 05 11:17:37 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/plugin.xml Thu Aug 05 11:20:23 2010 -0500
@@ -36,13 +36,21 @@
point="org.eclipse.ui.cheatsheets.cheatSheetContent">
<category
id="com.nokia.carbide.ide.cheatsheets"
- name="Carbide.c++ Getting Started" />
+ name="Carbide How to..." />
<cheatsheet
category="com.nokia.carbide.ide.cheatsheets"
+ composite="false"
contentFile="html/cheatsheets/getStarted_cs.xml"
id="com.nokia.carbide.cpp.doc.user.getStarted"
- name="HelloCarbide Project Example"/>
+ name="Application Project Example"/>
+ <cheatsheet
+ category="com.nokia.carbide.ide.cheatsheets"
+ composite="false"
+ contentFile="html/cheatsheets/getStarted_cs.xml"
+ id="com.nokia.carbide.cpp.doc.user.dll_example"
+ name="DLL Project Example">
+ </cheatsheet>
</extension>
<extension
@@ -75,6 +83,13 @@
contentFile="html/cheatsheets/stop_mode_cs.xml"
id="com.nokia.carbide.cpp.doc.user.stop_mode"
name="Stop Mode On-Device Debugging" />
+ <cheatsheet
+ category="com.nokia.carbide.ide.cheatsheets"
+ composite="false"
+ contentFile="$nl$/html/cheatsheets/getStarted_cs.xml"
+ id="com.nokia.carbide.cpp.doc.user.cheatsheet1176819414"
+ name="Creating and debugging an application project">
+ </cheatsheet>
</extension>
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Thu Aug 05 11:17:37 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Thu Aug 05 11:20:23 2010 -0500
@@ -101,15 +101,15 @@
<topic label="Workspace Information" href="html/concepts/workspaces.htm" />
</topic>
<topic label="Project management" >
- <topic label="Carbide C/C++ perspective" href="html/concepts/CarbidePerspective.html" />
- <topic label="Carbide.c++ preferences" href="html/reference/pref_carb_cpp.htm" >
- <topic label="Build" href="html/reference/pref_carb_build.htm" />
- <topic label="Carbide.c++ News" href="html/reference/pref_carb_carbide_news.htm" />
- <topic label="Debugger" href="html/reference/pref_carb_debugger.htm" />
- <topic label="Diagnostic Logs" href="html/reference/pref_carb_diagnostic_logs.htm" />
- <topic label="Platform Filtering Preferences" href="html/tasks/sdks/sdk_platform_filter.htm" />
- <topic label="Preprocess" href="html/reference/pref_carb_preprocess.htm" />
- <topic label="SDK Preferences" href="html/reference/pref_carb_sdk_preferencea.html" />
+ <topic label="Carbide C/C++ perspective" href="html/concepts/CarbidePerspective.html" />
+ <topic label="Carbide.c++ preferences" href="html/reference/pref_carb_cpp.htm" >
+ <topic label="Build" href="html/reference/pref_carb_build.htm" />
+ <topic label="Debugger" href="html/reference/pref_carb_debugger.htm" />
+ <topic label="Diagnostic Logs" href="html/reference/pref_carb_diagnostic_logs.htm" />
+ <topic label="Platform Filtering Preferences" href="html/tasks/sdks/sdk_platform_filter.htm" />
+ <topic label="Preprocess" href="html/reference/pref_carb_preprocess.htm" />
+ <topic label="SDK Preferences" href="html/reference/pref_carb_sdk_preference.html" />
+ <topic label="Symbian SDKs" href="html/reference/pref_carb_symbian_sdk.htm" />
<topic label="Code Styles" href="html/reference/pref_cpp_code_style.htm" >
<topic label="Setting the Workspace Code Style" href="html/tasks/code_style_workspace.htm" />
<topic label="Reformatting a Source File" href="html/tasks/code_style_reformatting_sources.htm" />
@@ -117,6 +117,7 @@
</topic>
<topic label="Working with SDKs" href="html/tasks/WorkingwithSDKs.html" >
<topic label="SDK Preferences" href="html/reference/SDKPreferences.html" />
+ <topic label="Symbian SDKs" href="html/reference/pref_carb_symbian_sdk.htm" />
<topic label="Adding an SDK" href="html/tasks/AddinganSDK.html" >
<topic label="Adding SDKs" href="html/tasks/sdks/sdk_add.htm" />
</topic>
@@ -341,7 +342,6 @@
<topic label="Emulation Debugging" href="html/concepts/emulators.htm" />
<topic label="Debugging DLLs" href="html/tasks/projects/prj_debug_dlls.htm" />
<topic label="Debugging in ROM" href="html/tasks/projects/prj_debug_rom.htm" />
- <topic label="Importing Symbian Executables" href="html/tasks/projects/prj_import_exe.htm" />
</topic>
<topic label="Troubleshooting" href="html/tasks/trk/trk_troubleshooting.htm"/>