fixed broken TOC links, updated platform filtering pref panel, and reduced font size of manual
--- a/core/com.nokia.carbide.cpp.doc.user/book.css Tue Jul 27 13:49:17 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/book.css Tue Jul 27 14:37:04 2010 -0500
@@ -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: 1.0em;
+ font-size: 0.9em;
font-weight: normal;
}
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/images/wnd_sdk_platform_filter.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/images/wnd_sdk_platform_filter_sbsv2.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_platform_filter.htm Tue Jul 27 13:49:17 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_platform_filter.htm Tue Jul 27 14:37:04 2010 -0500
@@ -7,26 +7,48 @@
<title>SDK Platform Filter</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">
-<!--
-.style1 {
- color: #000000;
- font-weight: bold;
-}
-.style2 {
- color: #000000
-}
-.style3 {font-size: 14px; font-family: "Courier New", Courier, mono;}
--->
-</style>
</head>
<body bgcolor="#FFFFFF">
<h2> Platform Filtering Preferences </h2>
<p> 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.BuildPlatformFilterPage)")'>
-Platform Filtering Preferences</a> tabs in the <b>Preferences</b> window to select which platforms are visible when creating new projects or build configurations. For Symbian Build System version 1 (SBSv1), the EKA2 and EKA1 platforms are available with a list of build targets for each.</p>
-<p align="center"><img src="images/wnd_sdk_platform_filter.png" width="673" height="544" alt="" /></p>
-<p class="figure">Figure 1. SDK Platform Filter window (SBSv1 tab) </p>
-<h5>Table 1 SDK Platform Filter—SBSv1 items</h5>
+Platform Filtering Preferences</a> tabs in the <b>Preferences</b> window to select which platforms are visible when creating new projects or build configurations. </p>
+<h3>SBSv2 tab</h3>
+<p>Use the <strong>SBSv2</strong> tab to select configurations for that build system. SBSv2 is the prefered build system for the most current SDKs.</p>
+<p align="center"><img src="images/wnd_sdk_platform_filter_sbsv2.png" alt="SBSv2 tab" width="719" height="554"></p>
+<p align="center" class="figure">Figure 1. Platform Filtering Preferences page (SBSv2 tab)</p>
+<h5>Table 1 <span class="figure">Platform Filtering Preferences</span> — SBSv2 items</h5>
+<table width="100%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="29%" scope="col">Item</th>
+ <th width="57%" scope="col">Explanation</th>
+ </tr>
+ <tr>
+ <td><b>SBSv2 Configuration Filter</b></td>
+ <td><p>Select platform build targets to be displayed for OS 9.5 and later when creating new projects and build configurations. BSF’s are gone in SBSv2. All build configurations (platform/target), including the built-in platforms (WISNCW, ARMV5), are declared in xml files in the <span class="code">\sbs\lib\config</span> directory.</p>
+ <p>Build targets include:</p>
+ <ul>
+ <li>armv5_udeb</li>
+ <li>armv5_urel</li>
+ <li>armv6_udeb</li>
+ <li>armv6_urel</li>
+ <li>armv7_udeb</li>
+ <li>armv7_urel</li>
+ <li>armv9e_udeb</li>
+ <li>armv9e_urel</li>
+ <li>winscw_udeb</li>
+ <li>winscw_urel</li>
+ </ul></td>
+ </tr>
+ <tr>
+ <td><strong>Refresh</strong></td>
+ <td><p>Select this button to obtain a fresh list of configurations from SBSv2. The list is refreshed each time Carbide starts up, but this button will allow users to add configuration xml files and get those new configurations without restarting Carbide.c++. </p></td>
+ </tr>
+</table>
+<h3>SBSv1 tab</h3>
+<p>Use the <strong>SBSv1</strong> tab to select configurations for that build system.</p>
+<p align="center"><img src="images/wnd_sdk_platform_filter.png" width="501" height="387" alt="" /></p>
+<p class="figure">Figure 2. Platform Filtering Preferences page (SBSv1 tab) </p>
+<h5>Table 2 <span class="figure">Platform Filtering Preferences</span> —SBSv1 items</h5>
<table width="100%" border="0" cellpadding="2" cellspacing="0">
<tr>
<th width="29%" scope="col">Item</th>
@@ -45,59 +67,15 @@
</ul></td>
</tr>
<tr>
- <td><b>EKA1 Platforms</b></td>
- <td><p>Select platform build targets to be displayed for OS versions 8.1a and less (8.xa, 7.x, 6.x) when creating new projects and build configurations.</p>
- <p>Build targets include:</p>
- <ul>
- <li>Emulation (WINSCW)</li>
- <li>ARMI</li>
- <li>ARM4</li>
- <li>THUMB</li>
- </ul></td>
- </tr>
- <tr>
<td><b>Discover customization (.bsf) and Symbian Binary Variant (.var) platforms dynamically</b></td>
<td><p>Select this option to scan for customized platform extensions and binary variations. The variant files searched for include:</p>
<ul>
<li>.bsf files, located in the <span class="code">\epoc32\root</span> directory</li>
<li>Symbian Binary Variant (.var) files, located in the <span class="code">\epoc32\tools</span> directory</li>
- </ul>
- </td>
+ </ul> </td>
</tr>
</table>
-<p> </p>
-<p align="center"><img src="images/wnd_sdk_platform_filter_sbsv2.png" alt="SBSv2 tab" width="469" height="463"></p>
-<p align="center" class="figure">Figure 2. SDK Platform Filter window (SBSv2 tab)</p>
-<h5>Table 2 SDK Platform Filter—SBSv2 items</h5>
-<table width="100%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="29%" scope="col">Item</th>
- <th width="57%" scope="col">Explanation</th>
- </tr>
- <tr>
- <td><b>Platforms</b></td>
- <td><p>Select platform build targets to be displayed for OS 9.5 and later when creating new projects and build configurations. BSF’s are gone in SBSv2. All build configurations (platform/target), including the built-in platforms (WISNCW, ARMV5), are declared in xml files in the \sbs\lib\config directory.</p>
- <p>Build targets include:</p>
- <ul>
- <li>armv5_udeb</li>
- <li>armv5_urel</li>
- <li>armv7_udeb</li>
- <li>armv7_urel</li>
- <li>tools2_deb</li>
- <li>tools2_rel</li>
- <li>gccxml_udeb</li>
- <li>gccxml_urel</li>
- <li>tools_deb</li>
- <li>tools_rel</li>
- <li>winscw_udeb</li>
- <li>winscw_urel</li>
- </ul></td>
- </tr>
- <tr>
- <td><strong>Refresh</strong></td>
- <td><p>Select this button to obtain a fresh list of configurations from SBSv2. The list is refreshed each time Carbide starts up, but this button will allow users to add configuration xml files and get those new configurations without restarting Carbide.c++. </p></td>
- </tr>
-</table>
+<p align="left" class="note"><strong>NOTE</strong> EKA1 platform configurations are no longer supported by Carbide.</p>
<h4>Related references </h4>
<ul>
<li><a href="../WorkingwithSDKs.html">Working with SDKs</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Tue Jul 27 13:49:17 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Tue Jul 27 14:37:04 2010 -0500
@@ -63,11 +63,11 @@
<topic label="Carbide Portal" href="html/reference/view_carbide_portal.htm" >
<topic label="Installing Extensions" href="html/tasks/installing_extensions.htm" />
</topic>
- <topic label="Console view" href="html/reference/view_log.htm" />
+ <topic label="Console view" href="html/reference/view_console.htm" />
<topic label="Debug view" href="html/debugger/debug/viewing_debug.htm" />
<topic label="Disassembly view" href="html/reference/view_disassembly.htm" />
<topic label="Executables view" href="html/reference/view_executables.htm" />
- <topic label="Memory view" href="html/reference/view_memory_wnd.htm" >
+ <topic label="Memory view" href="html/reference/view_memory.htm" >
<topic href="html/concepts/working_with_memory.htm" label="Working with Memory"></topic>
<topic label="Opening a Memory View" href="html/tasks/memory/view_memory_show.htm" />
<topic label="Adding a Memory Monitor" href="html/tasks/memory/memory_monitor_adding.htm" />
@@ -75,8 +75,8 @@
<topic label="Removing a Memory Monitor or Rendering" href="html/tasks/memory/memory_monitor_removing.htm" />
<topic label="Memory Rendering Options" href="html/reference/memory_rendering_options.htm" />
</topic>
- <topic label="Modules View" href="html/reference/view_module_wnd.htm" />
- <topic label="Project Explorer view" href="html/reference/view_cpp_projects.htm" />
+ <topic label="Modules View" href="html/reference/view_module.htm" />
+ <topic label="Project Explorer view" href="html/reference/view_proj_explorer.htm" />
<topic label="Registers" href="html/concepts/registers.htm" >
<topic label="Registers view" href="html/reference/view_registers.htm" />
<topic label="Opening a Registers View" href="html/tasks/registers/mem_reg_open_wnd.htm" />
@@ -90,7 +90,7 @@
<topic href="html/tasks/debugger/view_symbian_kernel_set.htm" label="Setting the Refresh Rate"></topic>
</topic>
<topic label="Symbian Project Navigator view" href="html/reference/view_sym_proj_nav.htm" />
- <topic label="Variables and Expressions" href="Variables and Expressions" >
+ <topic label="Variables and Expressions" href="html/concepts/working_with_variables.htm" >
<topic label="Variables view" href="html/reference/view_variables.htm" />
<topic label="Viewing Variables" href="html/debugger/variables/viewing_variables.htm" />
<topic label="Adding and Removing Global Variables" href="html/debugger/variables/adding_variables.htm" />
@@ -103,17 +103,16 @@
</topic>
<topic label="Project management" >
<topic label="Carbide C/C++ perspective" href="html/concepts/CarbidePerspective.html" />
- <topic label="Carbide.c++ preferences" href="html/reference/wnd_carbide_pref.htm" >
- <topic label="Bug Reports" href="PLUGINS_ROOT/com.nokia.carbide.bugreport/html/prefs_bug_reporter.htm" />
- <topic label="Build" href="html/reference/wnd_build_prefs.htm" />
- <topic label="Carbide.c++ News" href="html/reference/prefs_carbide_news.htm" />
- <topic label="Debugger" href="html/reference/wnd_debugger_prefs.htm" />
- <topic label="Diagnostic Logs" href="html/reference/wnd_diagnostic_logs_pref.htm" />
+ <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="Performance Investigator" href="PLUGINS_ROOT/com.nokia.carbide.cpp.pi.doc.user/html/tasks/analyser/key_profile_pref.htm" />
<topic label="Platform Filtering Preferences" href="html/tasks/sdks/sdk_platform_filter.htm" />
- <topic label="Preprocess" href="html/reference/wnd_preprocess_prefs.htm" />
- <topic label="SDK Preferences" href="html/reference/SDKPreferences.html" />
- <topic label="Code Styles" href="html/reference/wnd_pref_code_style.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="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" />
</topic>
@@ -353,7 +352,7 @@
<topic href="html/reference/search/wnd_system_search.htm" label="System Search">
<topic label="System Search view" href="html/reference/search/view_system_search.htm" />
- <topic label="System Search preferences" href="html/reference/search/wnd_system_search_prefs.htm" />
+ <topic label="System Search preferences" href="html/reference/search/pref_system_search.htm" />
</topic>
<topic href="html/hints_tips.htm" label="Tips & Hints" />
<topic href="html/tasks/carbide_tools.htm" label="Creating Carbide Tools" />
--- a/core/com.nokia.carbide.cpp/book.css Tue Jul 27 13:49:17 2010 -0500
+++ b/core/com.nokia.carbide.cpp/book.css Tue Jul 27 14:37:04 2010 -0500
@@ -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: 1.0em;
+ font-size: 0.9em;
font-weight: normal;
}
@@ -32,7 +32,7 @@
/* For headlines at the top of a view, add space */
/* 20090224-changed green fade to gold header image */
h1, h2, h3 {
- background-image: url(html/images/gold_header.png);
+ background-image: url(icons/gold_header.png);
background-repeat: no-repeat;
padding:10px 0px 10px 12px;
}
@@ -101,7 +101,7 @@
}
th {
- background-color: #66CC66;
+ background-color: #C9D2C9;
}
div.ol.p {
