updated Menu section of manual
authorfturovic <frank.turovich@nokia.com>
Tue, 20 Jul 2010 16:45:01 -0500
changeset 1648 0d551b392c77
parent 1647 0b7be06a7bee
child 1649 6444731f31a2
updated Menu section of manual
core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_project_setup.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/NewMMP_wizard.html
core/com.nokia.carbide.cpp.doc.user/html/reference/images/build_pkg_file.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/build_symbian_comp.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/clean_symbian_comp.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/codescanner_run.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_abld.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_compile_source.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_freeze_exports.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_freeze_symbian_comp.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_abld.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_compile.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_compile_source.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_freeze_comp.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_freeze_exports.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_preprocess.png
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/abld.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_pkg_file.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_symbian_comp.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/clean_symbian_comp.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_exports.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_symbian_comp.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/menus.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/new_symbian_mmp_file.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/new_symbian_project.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/open_cmd_window.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/open_explorer_window.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/preprocess_source.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/run_codescanner.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/AddingClasses.html
core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html
core/com.nokia.carbide.cpp.doc.user/intro/tutorialsCarbideExtContent.xml
core/com.nokia.carbide.cpp/book.css
core/com.nokia.carbide.cpp/html/help_home.html
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_project_setup.htm	Tue Jul 20 16:42:21 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_project_setup.htm	Tue Jul 20 16:45:01 2010 -0500
@@ -10,9 +10,9 @@
 <body bgcolor="#FFFFFF">
 <h2>Qt Development Setup</h2>
 <p>There are some prerequisites to using Qt projects within the Carbide environment. This includes downloading the correct SDKs, building <span class="code">qmake</span> to use the SDKs, and finally, building the libraries for your target environments. </p>
-<p>You should have the Qt SDK for Symbian that works with the S60 SDK in order to develop applications with Carbide. These steps include:</p>
+<p>You should have the <strong>Nokia Qt SDK 1.0</strong> in order to develop Qt applications with Carbide. These steps include:</p>
 <ol type="a">
-  <li>Download  the <a href="http://qt.nokia.com/downloads/symbian-cpp">Qt SDK for Symbian</a> package</li>
+  <li>Download  the <a href="http://www.forum.nokia.com/Develop/Qt/">Nokia Qt SDK 1.0</a> package</li>
   <li>Install the Qt SDK using the instructions found in the <span class="code">INSTALL</span> file located in the Qt SDK for Symbian folder, including:
   <ol>
         <ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/NewMMP_wizard.html	Tue Jul 20 16:42:21 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/NewMMP_wizard.html	Tue Jul 20 16:45:01 2010 -0500
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html><head>
-<title>Symbian OS MMP File</title>
+<title>New Symbian OS MMP File</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
    <body>
-   <h2>Symbian OS MMP File</h2>
+   <h2>New Symbian OS MMP File</h2>
    
    <p>
    Use the <b>Symbian OS MMP File</b> wizard (figure 1) to create a new MMP project file for the currently selected project. Symbian projects are defined by an <code class="code">.mmp</code> file which specifies the essential project elements of a Symbian OS project. All details of the project lifecycle are handled by the IDE. There is no editable makefile the user can edit to modify the build behavior of the project.</p>
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/build_pkg_file.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/build_symbian_comp.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/clean_symbian_comp.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/codescanner_run.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_abld.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_compile_source.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_freeze_exports.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_freeze_symbian_comp.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_abld.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_compile.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_compile_source.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_freeze_comp.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_freeze_exports.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_preprocess.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/abld.htm	Tue Jul 20 16:42:21 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/abld.htm	Tue Jul 20 16:45:01 2010 -0500
@@ -10,8 +10,8 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>ABLD Actions </h2>
-<p>Use the <b>ABLD</b> menu option to invoke an specific <span class="code">abld</span> command on the selected project or file. ABLD is available under  <b>Project &gt; ABLD</b> or by right-clicking a project or file in the <a href="../view_cpp_projects.htm">Project Explorer</a>, <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a>, and <a href="../view_disassembly.htm">Disassembly</a> views and choosing <b>ABLD &gt; <i>command</i></b>. When executed any arguments specified in the <a href="../build_properties/pane_build_config_args.htm">Carbide Build Configurations</a> pane for the command are passed to the selected tool. </p>
-<p align="center"><img src="../images/menu_abld.png" width="496" height="136"></p>
+<p>Use the <b>ABLD</b> menu option to invoke an specific <span class="code">abld</span> command on the selected project or file. ABLD is available under  <b>Symbian Build &gt; ABLD</b> or by right-clicking a project or file in the <a href="../view_cpp_projects.htm">Project Explorer</a>, <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a>, and <a href="../view_disassembly.htm">Disassembly</a> views and choosing <b>ABLD &gt; <i>command</i></b>. When executed any arguments specified in the <a href="../build_properties/pane_build_config_args.htm">Carbide Build Configurations</a> pane for the command are passed to the selected tool. </p>
+<p align="center"><img src="../images/menu_abld.png" width="890" height="204"></p>
 <p class="figure">Figure 1 - Available ABLD actions</p>
 <p>The available commands include:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_pkg_file.htm	Tue Jul 20 16:42:21 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_pkg_file.htm	Tue Jul 20 16:45:01 2010 -0500
@@ -9,8 +9,8 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Build Package (.pkg) File</h2>
-<p>Select a .pkg file in a project&prime;s sis folder in the <a href="../view_cpp_projects.htm">Project Explorer</a> view and right-click to display the context menu. Select <b>Build PKG File</b> to build the package file and create the .sis installation file. This option is also available from an editor view when the file is open. The <span class="code">makesis</span> tool uses the package file and packs all the required resources together into a SIS installation file. The <a href="../view_log.htm">Console</a> view will display the processing output.  The .sis and .sisx files will appear in the sis folder.</p>
-<p align="center"><img src="../images/build_pkg_file.png" width="371" height="420" /></p>
+<p>Select a <span class="code">.PKG</span> file in a project&prime;s <em>/sis</em> folder in the <a href="../view_cpp_projects.htm">Project Explorer</a> view and right-click to display the context menu. Select <b>Symbian Build &gt; Build PKG File</b> to build the package file and create the .sis installation file. This option is also available from an editor view when the file is open. The <span class="code">makesis</span> tool uses the package file and packs all the required resources together into a SIS installation file. The <a href="../view_log.htm">Console</a> view displays the processing output.  The .sis and .sisx files will appear in the project's <em>/sis</em> folder.</p>
+<p align="center"><img src="../images/build_pkg_file.png" width="543" height="117" /></p>
 <p align="center" class="figure">Figure 1. Build PKG File context menu </p>
 <h5>Other references</h5>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_symbian_comp.htm	Tue Jul 20 16:42:21 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_symbian_comp.htm	Tue Jul 20 16:45:01 2010 -0500
@@ -8,8 +8,8 @@
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/></head>
 <body bgcolor="#FFFFFF">
 <h2>Build Symbian Component </h2>
-<p>Select a .mmp or .mk  file in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then right-click and select<b> Build Symbian Component</b> (<span class="code">CTRL+ALT+P</span>) to build the selected component file or makefile. You can also right-click the file in an editor view and select <b>Build Symbian Component</b> to also build the file. </p>
-<p align="center"><img src="../images/build_symbian_comp.png" width="432" height="357" /></p>
+<p>Select a .mmp or .mk  file in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then right-click and select<b> Symbian Build &gt; Build Symbian Component</b> (<span class="code">CTRL+ALT+P</span>) to build the selected component file or makefile. You can also right-click the file in an editor view to use the same option. </p>
+<p align="center"><img src="../images/build_symbian_comp.png" width="580" height="197" /></p>
 <p align="center" class="figure">Figure 1. Build Symbian Component menu item </p>
 <p></p>
 <h5>Other references</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/clean_symbian_comp.htm	Tue Jul 20 16:42:21 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/clean_symbian_comp.htm	Tue Jul 20 16:45:01 2010 -0500
@@ -9,8 +9,8 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Clean Symbian Component </h2>
-<p>You can select a MMP or MK  file in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view and right-click to select <b>Symbian Build &gt; Clean Symbian Component</b> (<span class="code">CTRL+ALT+X</span>) to clean the selected MMP project file or makefile. You can also right-click the file in an editor view to see the same option. The cleaning process removes the object and make files, and output files. The files that are removed by this command include all the intermediate files created during compilation and all the executables and import libraries created by the linker.</p>
-<p align="center"><img src="../images/clean_symbian_comp.png" width="461" height="347" /></p>
+<p>You can select a MMP or MK  file in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view and right-click to select <b>Symbian Build &gt; Clean Symbian Component</b> (<span class="code">CTRL+ALT+X</span>) to clean the selected MMP project file or makefile. You can also right-click the file in an editor view to use the same option. The cleaning process removes the object and make files, and output files. The files that are removed by this command include all the intermediate files created during compilation and all the executables and import libraries created by the linker.</p>
+<p align="center"><img src="../images/clean_symbian_comp.png" width="580" height="200" /></p>
 <p align="center" class="figure">Figure 1. Clean Symbian Component context menu </p>
 <h5>Other references</h5>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_exports.htm	Tue Jul 20 16:42:21 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_exports.htm	Tue Jul 20 16:45:01 2010 -0500
@@ -9,8 +9,8 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Freeze Exports </h2>
-<p>Right click  a project in the Project Explorer, or Symbian Project Navigator view, then  choose <b> Freeze Exports</b>. This command calls the appropriate <b>abld</b> command  and a .def file is generated. This  enables released versions of DLLs to freeze their exports, ensuring backward compatibility of a library.</p>
-<p align="center"><img src="../images/menu_freeze_exports.png" width="335" height="410"></p>
+<p>Right-click  a project in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then  choose <b> Symbian Build &gt; Freeze Exports</b>. This command calls the appropriate <b>abld</b> command  and a .def file is generated. This  enables released versions of DLLs to freeze their exports, ensuring backward compatibility of a library.</p>
+<p align="center"><img src="../images/menu_symb_freeze_exports.png" width="543" height="115"></p>
 <p class="figure">Figure 1. Choosing Freeze Exports on a project </p>
 <h5>Other references</h5>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_symbian_comp.htm	Tue Jul 20 16:42:21 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_symbian_comp.htm	Tue Jul 20 16:45:01 2010 -0500
@@ -9,8 +9,8 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Freeze Symbian Component </h2>
-<p>Right-click  a Symbian OS MMP file in the <a href="../view_cpp_projects.htm">Project Explorer</a>, or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then  choose <b> Freeze Symbian  Component</b> (<span class="code">CTRL+ALT+F</span>). This command only freezes the selected MMP file and not the entire project.</p>
-<p align="center"><img src="../images/menu_freeze_symbian_comp.png" width="443" height="506"></p>
+<p>Right-click  a Symbian OS MMP file in the <a href="../view_cpp_projects.htm">Project Explorer</a>, or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then  choose <b> Symbian Build &gt; Freeze Symbian  Component</b> (<span class="code">CTRL+ALT+F</span>). You can also right-click the file in an editor view to use the same option. This command only freezes the selected MMP file and not the entire project.</p>
+<p align="center"><img src="../images/menu_symb_freeze_comp.png" width="580" height="201"></p>
 <p class="figure">Figure 1. Choosing Freeze Symbian  Component on a file </p>
 <h5>Other references</h5>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/menus.htm	Tue Jul 20 16:42:21 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/menus.htm	Tue Jul 20 16:45:01 2010 -0500
@@ -9,26 +9,37 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Carbide Menus </h2>
-<p>Common menu and context menu commands used in Carbide.c++:</p>
+<p>Carbide has several menu options unique to developing Symbian OS applications and other shortcuts. Most project related commands are grouped under the Symbian Build option in context menus, while others appear under specific menus like Run or Project. </p>
 <ul>
-  <li><a href="abld.htm">ABLD Actions</a></li>
-  <li><a href="build_all_targets.htm">Build All Configurations</a></li>
-  <li><a href="build_pkg_file.htm">Build PKG File</a></li>
-  <li><a href="build_symbian_comp.htm">Build Symbian Component</a></li>
-  <li><a href="clean_symbian_comp.htm">Clean Symbian Component</a></li>
-  <li><a href="compile_source.htm">Compile</a></li>
-  <li><a href="freeze_exports.htm">Freeze Exports</a></li>
-  <li><a href="freeze_symbian_comp.htm">Freeze Symbian Component</a></li>
-  <li><a href="../trk/wnd_on_device_setup.htm">On-Device Connections...</a> </li>
-  <li><a href="open_cmd_window.htm">Open Command Window</a></li>
-  <li><a href="preprocess_source.htm">Preprocess</a></li>
-  <li><a href="run_codescanner.htm">Run Codescanner</a></li>
-  <li><a href="open_explorer_window.htm">Show in  Explorer</a></li>
-  <li><a href="new_symbian_class.htm">Symbian OS C++ Class</a></li>
-  <li><a href="new_symbian_project.htm">Symbian OS C++ Project</a></li>
-  <li><a href="new_symbian_project.htm">Symbian OS MMP File </a></li>
-  <li><a href="hardware_breakpoints.htm">Toggle HW Breakpoint</a></li>
-</ul>
+  <li><strong>File &gt; New </strong> menu options
+      <ul>
+          <li>Qt Project</li>
+          <li><a href="new_symbian_class.htm">Symbian OS C++ Class</a></li>
+          <li><a href="../../tasks/CreatingNewProjects.html">Symbian OS C++ Project</a></li>
+          <li><a href="../NewMMP_wizard.html">Symbian OS MMP File</a></li>
+      </ul>
+  </li>
+  <li><strong>Right-click <em>object</em> &gt; Symbian Build</strong> menu options
+      <ul>
+          <li><a href="abld.htm">ABLD Actions</a></li>
+            <li><a href="build_all_targets.htm">Build All Configurations</a></li>
+            <li><a href="build_pkg_file.htm">Build PKG File</a></li>
+            <li><a href="build_symbian_comp.htm">Build Symbian Component</a></li>
+            <li><a href="clean_symbian_comp.htm">Clean Symbian Component</a></li>
+            <li><a href="compile_source.htm">Compile</a></li>
+            <li><a href="freeze_exports.htm">Freeze Exports</a></li>
+            <li><a href="freeze_symbian_comp.htm">Freeze Symbian Component</a></li>
+            <li><a href="preprocess_source.htm">Preprocess</a></li>
+        </ul>
+  </li>
+  <li><a href="freeze_symbian_comp.htm"></a>Other menu options
+      <ul>
+          <li><a href="open_cmd_window.htm">Open Command Window</a></li>
+          <li><a href="open_explorer_window.htm">Show in  Explorer</a></li>
+          <li><a href="hardware_breakpoints.htm">Toggle HW Breakpoint</a></li>
+      </ul>
+  </li>
+  </ul>
 <div id="footer">Copyright &copy; 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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/new_symbian_mmp_file.htm	Tue Jul 20 16:42:21 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Symbian OS MMP File</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Symbian OS MMP File</h2>
-<p>Click <b>File &gt; New &gt; Symbian OS MMP File</b> to launch the <b><a href="../NewMMP_wizard.html">Symbian OS MMP File</a></b> wizard.</p>
-<h5>Other references</h5>
-<ul>
-  <li><a href="menus.htm">Carbide Menus</a></li>
-  <li><a href="../MMP_Editor.html">MMP Editor</a></li>
-  <li><a href="../../concepts/mmpfiles.htm">MMP Files </a></li>
-</ul>
-<div id="footer">Copyright &copy; 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/html/reference/menus/new_symbian_project.htm	Tue Jul 20 16:42:21 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Symbian OS C++ Project</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Symbian OS C++  Project </h2>
-<p>Click <b>File &gt; New &gt; New Symbian OS C++ Project</b> to launch  the <b><a href="../../tasks/CreatingNewProjects.html">New Symbian OS C++  Project</a> </b> wizard. </p>
-<h5>Other references</h5>
-<ul>
-  <li><a href="menus.htm">Carbide Menus</a></li>
-</ul>
-<div id="footer">Copyright &copy; 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/html/reference/menus/open_cmd_window.htm	Tue Jul 20 16:42:21 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/open_cmd_window.htm	Tue Jul 20 16:45:01 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Open Command Window</h2>
-<p>Launches a Microsoft Windows <b>Command Prompt </b>  set to the workspace directory. </p>
+<p>Launches a Microsoft Windows <b>Command Prompt </b>  window set to the chosen project or file's directory. </p>
 <h5>Other references</h5>
 <ul>
   <li><a href="menus.htm">Carbide Menus</a> </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/open_explorer_window.htm	Tue Jul 20 16:42:21 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/open_explorer_window.htm	Tue Jul 20 16:45:01 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Show in Explorer</h2>
-<p>Launches a Microsoft Windows <b>Explorer</b> window set to the workspace directory.</p>
+<p>Launches a Microsoft Windows <b>Explorer</b> window that shows the chosen project or file directory and its location on the hard disk.</p>
 <h5>Other references</h5>
 <ul>
   <li><a href="menus.htm">Carbide Menus</a> </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/preprocess_source.htm	Tue Jul 20 16:42:21 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/preprocess_source.htm	Tue Jul 20 16:45:01 2010 -0500
@@ -9,7 +9,9 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Preprocess</h2>
-<p>Right-click to select a .c, .cpp, or .cia source file in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view,  and choose <b> Preprocess </b>  to preprocess the file. You define the preprocess command in the <a href="../wnd_preprocess_prefs.htm">Preprocess preference panel</a>. This is also available from within a C/C++ editor view. You can use the shift or control key to select one or more of these file types across the same or different projects. The preprocess progress is displayed in the Console view.</p>
+<p>Right-click to select a .c, .cpp, or .cia source file in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view,  and choose <b> Symbian Build &gt; Preprocess </b>  to preprocess the file. You define the preprocess command in the <a href="../wnd_preprocess_prefs.htm">Preprocess preference panel</a>. This is also available from within a C/C++ editor view. You can use the shift or control key to select one or more of these file types across the same or different projects. The preprocess progress is displayed in the <a href="../view_log.htm">Console</a> view.</p>
+<p align="center"><img src="../images/menu_symb_preprocess.png" alt="Preprocess menu option" width="580" height="202"></p>
+<p class="figure">Figure 1. Choosing to Preprocess a file </p>
 <h5>Other references</h5>
 <ul>
   <li><a href="menus.htm">Carbide Menus</a> </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/run_codescanner.htm	Tue Jul 20 16:42:21 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Run CodeScanner </title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Run CodeScanner </h2>
-<p>CodeScanner is a static source code analysis tool for Symbian OS&trade; programs written in C++. Use <b>Run CodeScanner</b> to examine your project code and report any issues. </p>
-<p>Static analysis tools delve deep into code, exploring line by line for the sources of defects.  CodeScanner is specifically for use with Symbian OS&trade; code. As well as identifying C++ coding  convention deviations, CodeScanner identifies incorrect descriptor usage, cleanup stack errors,  UID clashes, and other subtle problems that are hard to track down. </p>
-<p align="center"><img src="../images/codescanner_run.png" width="311" height="375" /></p>
-<p align="center" class="figure">Figure 1. Invoking Run CodeScanner on a project <br />
-</p>
-<h5>Other references</h5>
-<ul>
-  <li><a href="menus.htm">Carbide Menus</a></li>
-  <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.codescanner/html/pref_codescanner_01.htm">CodeScanner Preferences</a><br />
-  </li>
-</ul>
-<div id="footer">Copyright &copy; 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/html/tasks/AddingClasses.html	Tue Jul 20 16:42:21 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/AddingClasses.html	Tue Jul 20 16:45:01 2010 -0500
@@ -69,7 +69,7 @@
    </div>
    <h5>Related tasks</h5>
 	   <ul>
-         <li><a href="../reference/NewClassWizard.html">New C++ Classs Wizard</a></li>
+         <li><a href="../reference/NewClassWizard.html">New C++ Class Wizard</a></li>
    </ul>
 <div id="footer">Copyright &copy; 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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html	Tue Jul 20 16:42:21 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html	Tue Jul 20 16:45:01 2010 -0500
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-  <title>Creating New Projects</title>
+  <title>Creating New Symbian OS C++ Projects</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
 <body>
-<h2>Creating New Projects</h2>
+<h2>Creating New Symbian OS C++ Projects</h2>
   <div class="Bodytext">
     <p>New  projects are created using the <b>New Project Wizard</b>. Carbide includes a number of templates that make creating projects for different SDKs and executables quick and easy.</p>
     <p class="note"><b>NOTE</b> You must have  at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/intro/tutorialsCarbideExtContent.xml	Tue Jul 20 16:42:21 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/tutorialsCarbideExtContent.xml	Tue Jul 20 16:45:01 2010 -0500
@@ -12,7 +12,7 @@
 		<group label="Carbide.c++ Development" id="carbide-cpp" style-id="content-group">
 		
 			<link 
-				label="Creating and Debugging Symbian OS Projects" 
+				label="Emulator Application Projects" 
 				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_00.htm" 
 				id="carbide-sample" 
 				style-id="content-link">
@@ -20,7 +20,7 @@
 			</link>
 			
 			<link 
-				label="Creating and Debugging DLL Projects" 
+				label="DLL Projects" 
 				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_00.htm"  
 				id="carbide-sample" 
 				style-id="content-link">
@@ -28,13 +28,14 @@
 			</link>
 			
 			<link 
-				label="Debugging on Remote Targets (Run-mode)" 
+				label="Remote Target Debugging (Run-mode)" 
 				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_00.htm"  
 				id="carbide-sample" 
 				style-id="content-link">
-				<text>Learn how debug applications on remote devices using the TRK debug agent.</text>
+				<text>Learn how debug applications on remote devices using the TRK remote agent.</text>
 			</link>
 
+			<!--
 			<link 
 				label="Create a stop mode debugging application" 
 				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm"  
@@ -42,6 +43,7 @@
 				style-id="content-link">
 				<text>Learn how to create and build an application and debug it on a device using JTAG debug software on Lauterbach hardware.</text>
 			</link>
+			-->
 			
 		</group>
 	</extensionContent>
--- a/core/com.nokia.carbide.cpp/book.css	Tue Jul 20 16:42:21 2010 -0500
+++ b/core/com.nokia.carbide.cpp/book.css	Tue Jul 20 16:45:01 2010 -0500
@@ -1,5 +1,5 @@
 /*	
-	Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+	Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
 	All rights reserved. 
 	License: http://www.eclipse.org/legal/epl-v10.html
 */
@@ -12,7 +12,7 @@
 /* 20091007 added verdana and ariel to list to match SFO website fonts choices */
 body, p, table, li {
 	font-family: Verdana, Ariel, Helvetica, sans-serif;
-	font-size: 1em;
+	font-size: 1.0em;
 	font-weight: normal;
 }
 
@@ -32,11 +32,15 @@
 /*	For headlines at the top of a view, add space	*/
 /*	20090224-changed green fade to gold header image	*/
 h1, h2, h3 {
-	background-image: url(icons/gold_header.png);
+	background-image: url(html/images/gold_header.png);
 	background-repeat: no-repeat;
 	padding:10px 0px 10px 12px;	
 	}
 
+/* 20091007 SFO styling added */
+h1.NavTitle		{ font-size: 1.2em }
+h3	.NavListTitle 	{ font-size: 1.1em }
+
 li	{
 	margin-bottom:8px;	
 	margin-top:8px;
@@ -53,7 +57,7 @@
 	}
 
 .listing	{
-	background-color: #ffe869;
+	background-color: #FFFFCC;
 	font-family: "Courier New", Courier, mono;
 	font-size: 1.1em;
 	color: #000000;
@@ -97,7 +101,7 @@
 	}
 	
 th	{
-	background-color: #8FCAE7;
+	background-color: #66CC66;
 	}
 
 div.ol.p	{
@@ -116,7 +120,7 @@
 	
 div h5, div h4	{
 	padding:5px 0px 5px 12px;
-	background-color: #ffd62c;
+	background-color: #D3DAD4;
 	font-weight:bold;
 	color: #000000;
 	}
@@ -174,4 +178,4 @@
 
 a:link 		{ color: #026690 }
 a:visited	{ color: #555555 }
-aa:hover 	{ color: #FFD62C }
+a:hover 	{ color: #FFD62C }
--- a/core/com.nokia.carbide.cpp/html/help_home.html	Tue Jul 20 16:42:21 2010 -0500
+++ b/core/com.nokia.carbide.cpp/html/help_home.html	Tue Jul 20 16:45:01 2010 -0500
@@ -6,12 +6,12 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Using the Carbide help system</title>
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-<LINK REL="STYLESHEET" HREF="../carbide.css" CHARSET="ISO-8859-1" TYPE="text/css">
+<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
 </head>
 
 <body style="margin-top: 5; margin-left: 5; margin-right: 5;">
 <table width="100%" >
-	<tr><td align=right valign="center" bgcolor="#FFC550"><img src="../intro/css/graphics/rootpage/brandmark.gif" alt="Carbide icon"></td>
+	<tr><td align=right valign="center" bgcolor="#CCCCCC"><img src="../intro/css/graphics/rootpage/brandmark.gif" alt="Carbide icon"></td>
   </tr>
 </table>
 	
@@ -22,24 +22,20 @@
     <ul>
       <li>New technologies support:
         <ul>
-          <li>PnP On-device Debugging</li>
-          <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/index.html">Hover Help</a></li>
-          <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_overview.htm">Qt SDK for S60</a></li>
-        </ul>
+          <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_overview.htm">Nokia Qt SDK 1.0</a></li>
+          </ul>
       </li>
-      <li>Connecting, updating,  and installing remote agents
-        <ul>
-          <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_setup.htm">On-Device Connections</a> dialog</li>
-        </ul>
+      <li>Carbide Portal
+          <ul>
+              <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_portal.htm">Install Extensions</a></li>
+          </ul>
       </li>
       <li>Carbide examples and tutorials
-        <ul>
-          <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/soft_attach_debug.htm">Soft-attach for on-device debugging </a></li>
-            <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/concepts/ngage_projects.htm">Importing and Building N-Gage Projects </a></li>
-            <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example.htm">Application Emulator Debug Example using Templates</a></li>
-            <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm">Run Mode Debug Example (Application TRK)</a></li>
-            <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm">Stop Mode Debug Example</a></li>
-          </ul>
+          <ul>
+              <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_00.htm">Emulator Application Project Tutorial</a></li>
+                    <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_00.htm">DLL Project Tutorial</a></li>
+                    <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_00.htm">Remote Project Debugging (Run-mode)</a></li>
+              </ul>
       </li>
       <li><a href="help_keys_Toc.htm">Key Shortcuts</a></li>
     </ul></td>