--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/AIFDefWizard.html Tue Jun 22 15:25:44 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title>AIF File in Concepts</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
- <body>
- <h2>AIF File</h2>
-
- <p>
- The AIF, or application information file, is a Symbian OS-specific file
- format. An AIF file contains information about captions, icons, capabilities
- and MIME priority support used by the application. The MMP editor provides support for the AIF editor in the Sources > Resources group.</p>
- <p class="note">
- <b>NOTE</b> AIF files are used only for Symbian OS versions before 9.1.
- </p>
- <p>
- The kind of information an AIF file can contain are:</p>
- <ul>
- <li>
- <p>
- <b>Icons</b>: Icons are used to represent applications and
- their associated document files in the system shell or application launcher. If
- the phone's UI supports embedding, icons may also be used to represent embedded
- documents.
- </p>
- <p>
- The source files for icons are .bmp bitmaps. These source files are
- built into a single .mbm file (Symbian OS multiple bitmap file) which is
- incorporated into the aif file as part of the build process.
- </p>
- </li>
- <li>
- <p>
- <b>Captions</b>: A caption is the text displayed beside its
- icon. Typically it is the application's name.</p>
- <p>
- Captions for multiple languages can be defined in a single aif, and
- the one corresponding to the current system language will be used. In some UIs,
- captions may be defined in a caption file, separate from the aif file.
- </p>
- </li>
- <li>
- <p>
- <b>MIME Support</b>: Multipurpose Internet Mail Extensions,
- MIMEs, define a file format for transferring non-ASCII data, such as graphics,
- audio and fax, over the Internet. The AIF file lists the MIME types that the
- application supports, and the priority of support that each type is given. When
- a file is opened, Symbian OS launches the application which has the highest
- priority of support for the type of data in the file.
- </p>
- <p>
- Given two applications with the same MIME type priority, Symbian OS
- arbitrarily launches one of them.
- </p>
- </li>
- </ul>
- <h5>Related tasks</h5>
- <ul>
- <li><a href="../tasks/AppInfoFile.html">Creating an AIF File</a></li>
- </ul>
- <h5>Related references</h5>
- <ul>
- <li><a href="../reference/AIFEditor.html">AIF Editor</a></li>
- <li><a href="../reference/MMP_Editor.html">MMP Editor</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/html/concepts/MBMDefWizard.html Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/MBMDefWizard.html Tue Jun 22 15:26:27 2010 -0500
@@ -7,7 +7,7 @@
<p>
MBM, or multi-bitmap, is a Symbian OS-specific bitmap file format. This
- file contains multiple bitmaps and it can contain both bitmaps with masks and
+ file contains multiple bitmaps and can contain bitmaps with masks and
bitmaps without masks. It optimizes the bitmap handling capability of Symbian
OS. The <a href="../reference/MMP_Editor.html">MMP Editor</a> (in <b>Sources</b> tab <b>> Resources > Bitmaps</b>) and <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view provide support for creating and editing MBM
files. In the <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view you can right-click on a scalable icon makefile (for example, <span class="code">Icons_scalable_dc.mk</span>) and select <b>Add MBM/MIF Entry...</b> to open the Edit MBM/MIF Contents window.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/Modify.html Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/Modify.html Tue Jun 22 15:26:27 2010 -0500
@@ -21,8 +21,7 @@
</p>
<ul>
<li><a href="MBMDefWizard.html">MBM Definition Wizard</a></li>
-<li><a href="AIFDefWizard.html">AIF Definition Wizard</a></li>
- </ul>
+</ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_configurations.htm Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_configurations.htm Tue Jun 22 15:26:27 2010 -0500
@@ -14,20 +14,20 @@
<li>a project</li>
<li>a <a href="../projects/launch/launch_configs_overview.htm">build configuration</a> - a project level configuration that includes an SDK and any related files required to compile and build the project </li>
</ul>
-<p>Build configurations are defined when the project is created. A project can have any number of build configurations and more can be <a href="../tasks/projects/prj_new_build_config.htm">added</a> as necessary. Each build configuration can have its own combination of tool settings to precisely control how it is defined and built. Build configurations are maintained in the project Properties window in the Carbide Build Configurations panel. To open the panel, select a project in the <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> or <a href="../reference/view_cpp_projects.htm">Project Explorer</a> view and select <b>Project > Properties</b> or right-click and select Properties.</p>
-<p align="center"><img src="images/build_configs.png" width="778" height="595"></p>
-<p>You can select a build configuration in the <b>Active Configuration</b> dropdown list or use the <b>Project > Active Configuration</b> menu option to <a href="../tasks/projects/prj_set_build_tgt.htm">set</a> which build configuration to launch when running or debugging a program. The currently selected project can be launched by clicking the <b>Run</b> (<img src="../images/icons/btn_run.png" width="16" height="16" align="absmiddle" />) or <b>Debug</b> (<img src="../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) control on the tool bar to launch the project with the currently active build configuration. When no project is selected the last project debugged will be launched.</p>
+<p>Build configurations are defined when the project is created. A project can have any number of build configurations and more can be <a href="../tasks/projects/prj_new_build_config.htm">added</a> as necessary. Each build configuration can have its own combination of tool settings to precisely control how it is defined and built. Build configurations are maintained in the project Properties window in the Carbide Build Configurations panel. To open the panel, select a project in the <a href="../reference/view_cpp_projects.htm">Project Explorer</a> or <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view and select <b>Project > Properties</b> or right-click and select Properties.</p>
+<p align="center"><img src="images/build_configs.png" width="801" height="350"></p>
+<p>You can select a build configuration in the <b>Active Configuration</b> group or use the <b>Project > Active Configuration</b> menu option to <a href="../tasks/projects/prj_set_build_tgt.htm">set</a> which build configuration to launch when running or debugging a program. The currently selected project can be launched by clicking the <b>Run</b> (<img src="../images/icons/btn_run.png" width="16" height="16" align="absmiddle" />) or <b>Debug</b> (<img src="../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) control on the tool bar to launch the project with the currently active build configuration. When no project is selected the last project debugged will be launched.</p>
<p>If no <a href="../projects/launch/launch_configs_overview.htm">launch configuration</a> is present in the project, one is created on initial launch. Subsequent launches of the project will use either the last launch configuration or if more than one launch configuration exists, it uses the most correct one.</p>
<p class="note"><b>NOTE</b> The Carbide <b>Run</b> and <b>Debug</b> buttons are shaded in blue to indicate their behavior differs from the standard Eclipse behavior.</p>
-<h5>Table 1 Carbide Build Configuration items </h5>
+<h5>Table 1 Build Configuration items </h5>
<table width="100%" border="0" cellpadding="2" cellspacing="0">
<tr>
<th width="20%" scope="col">Item</th>
<th width="71%" scope="col">Explanation</th>
</tr>
<tr>
- <td width="20%"><b>Active Configuration </b></td>
- <td>The <b>Active Configuration</b> drop down list allows you to <a href="../tasks/projects/prj_set_build_tgt.htm">select</a> a configuration that is currently available for the selected project. The entries in the related sub-panes will change according to the selected configuration. The Configuration name consists of a target name and an SDK identifier in brackets.</td>
+ <td width="20%"><b>Configuration </b></td>
+ <td>The <b> Configuration</b> drop down list allows you to <a href="../tasks/projects/prj_set_build_tgt.htm">select</a> a configuration that is currently available for the selected project. The entries in the related sub-panes will change according to the selected configuration. The Configuration name consists of a target name and an SDK identifier in brackets.</td>
</tr>
<tr>
<td width="20%"><b>Manage...</b></td>
@@ -35,17 +35,17 @@
</tr>
</table>
<h5>Build Configuration Naming</h5>
-<p>When the Carbide.c++ IDE creates an build configuration it uses a standard naming convention to make it easy to identify. For example, <span class="code">HelloCarbide S60 5.0 Emulator Debug</span> is a typical configuration name. The default name follows the form of:</p>
+<p>When the Carbide.c++ IDE creates an build configuration it uses a standard naming convention to make it easy to identify. For example, <span class="code">HelloCarbide (armv5_udeb) Emulator Debug</span> is a typical configuration name. The default name follows the form of:</p>
<ul>
<li><span class="code"><Phone|Emulator> </span>The build target (Emulator, Phone, etc.)</li>
<li><span class="code"><Debug|Release> </span>Debug (final file contains debug symbols) or Release version</li>
- <li><span class="code"><platform> </span>Platform on which you are building</li>
- <li><span class="code"><sdk ID from devices.xml> </span>The SDK and version used by the build configurations (S60, etc.)</li>
+ <li><span class="code"><platform_build> </span>Platform on which you are building (<span class="code">winscw_urel</span>, <span class="code">armv5_udeb</span>)</li>
+ <li><span class="code"><sdk ID from devices.xml> </span>The SDK and version used by the build configurations (Symbian3, etc.)</li>
</ul>
<p>You can use the <a href="../reference/wnd_debug_configuration.htm">Debug</a> window to edit the default build configuration names.</p>
<h5>Other references </h5>
<ul>
- <li><a href="../reference/build_properties/pane_build_config.htm">Carbide Build Configurations</a> </li>
+ <li><a href="../reference/build_properties/pane_build_config.htm">Build Configurations</a> </li>
<li><a href="../tasks/projects/prj_set_build_tgt.htm">Setting an Active Configuration</a></li>
<li><a href="../tasks/projects/prj_debug_config.htm">Creating Launch Configurations</a> </li>
<li><a href="../tasks/projects/prj_new_build_config.htm">Adding/Removing Build Configurations</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_targets.htm Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_targets.htm Tue Jun 22 15:26:27 2010 -0500
@@ -21,7 +21,7 @@
<tr>
<th width="17%" rowspan="2" valign="middle" scope="col">Target Types </th>
<th colspan="2" scope="col">Platform Security<br />
-(S60 3.2, S60 5.0, Symbian ^3) </th>
+(S60 5.0, Symbian ^3) </th>
</tr>
<tr>
<th width="15%" valign="middle" scope="col"><div align="center">RAPTOR, GCCE, ARMV5, ARMV5_ABIV2</div></th>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/concepts.htm Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/concepts.htm Tue Jun 22 15:26:27 2010 -0500
@@ -16,7 +16,7 @@
functionality provided by Eclipse and the C/C++ Development Toolkit (CDT). </p>
<p> The plug-ins simplify Symbian OS development by removing the need to use
command line build tools, and provide a graphical interface to Symbian OS
- specific file formats, such as AIF and MBM. </p>
+ specific file formats, such as MBM. </p>
<p> The plug-ins provide a new perspective, called the <a href="CarbidePerspective.html">Carbide.c++ Perspective</a>, on
the Eclipse workbench. This perspective enhances the standard CDT C/C++
perspective by allowing you to select easily the SDKs and build target types
@@ -24,7 +24,6 @@
<p> The following topics discuss these concepts in more detail: </p>
<ul>
<li><a href="build_configurations.htm">Active Build Configuration</a></li>
- <li><a href="AIFDefWizard.html">AIF File</a></li>
<li><a href="breakpoints.htm">Breakpoints</a></li>
<li><a href="build_targets.htm">Build Targets</a></li>
<li><a href="macros_carbide.htm">Carbide Macros</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/cvs.htm Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/cvs.htm Tue Jun 22 15:26:27 2010 -0500
@@ -18,7 +18,11 @@
<li><a href="http://en.wikipedia.org/wiki/Mercurial">Mercurial</a></li>
<li><a href="http://en.wikipedia.org/wiki/Perforce">Perforce</a></li>
</ul>
-<p>Other revision systems are also supported but require the downloading of an Eclipse plug-in to add that capability to Carbide. Visit the <a href="http://eclipse-plugins.2y.net">eclipse-plugins.2y.net</a> sites to locate the plug-ins you need. </p>
+<p>Other revision systems are also supported but require the downloading of an Eclipse plug-in to add that capability to Carbide. Visit the <a href="http://eclipse-plugins.2y.net">eclipse-plugins.2y.net</a> sites to locate the plug-ins you need.</p>
+<h2>Using SCM in Carbide</h2>
+<p>The SCM you install normally adds its commands to the <strong>Team</strong> sub-menu in the <a href="../reference/view_cpp_projects.htm">Project Explorer</a> view's context menu (Figure 1). Some SCM's install their own menu to Carbide. If this is the case, refer to the documentation included with the plug-in for details.</p>
+<p align="center"><img src="../reference/images/menu_team_commands.png" alt="Team commands" width="739" height="607"></p>
+<p class="figure">Figure 1. Team sub-menu</p>
<div class="step">
<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/dependency_tracking.htm Tue Jun 22 15:25:44 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +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>Dependency Tracking</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<style type="text/css">
-<!--
-.style1 {font-family: "Courier New", Courier, mono}
--->
-</style>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Dependency Tracking</h2>
-<p> This section only applies to the SBSv1 (abld) build system. If you are using the Raptor (SBSv2) build system Carbide does not perform any build system modifications to optimize dependency tracking.</p>
-<p>Carbide has made some performance improvements over command-line builds when performing incremental builds. Once a project has been built, many users invoke 'abld build' on their project, not knowing that their makefiles are regenerated each time, taking a large performance hit. Although a command-line user can invoke 'abld target' to improve incremental build performance, Carbide invokes each build stage independently for a full incremental build (including the 'abld makefile' stage). In order to get around this performance hit from the IDE, Carbide manages the source and resource dependencies in separate <span class="style1">.d</span> (dependency) files generated under the build system. Then Carbide makes a small modification to each component's (MMP) makefile under the <span class="style1">\epoc32\build</span>\ directory by including the generated .d files as dependency includes. This performance modification makes incremental builds faster from Carbide.</p>
-<p>Normally, you do not need to know the details of dependency management unless you first build from the command-line and then try to build their project from the IDE. When this happens, Carbide will prompt you with the <b>Project rebuild notification</b> dialog when you initiate a build from the IDE.</p>
-<p align="center"><img src="images/deps_track_query.png" width="483" height="203"></p>
-<p align="left" class="figure">Figure 1 -Dependency Tracking dialog</p>
-<p>It is recommended you choose the <strong>Improve Carbide build times</strong> option if you plan to continue building in Carbide. However, be cautious of this as Carbide will remove all the object code and build everything from scratch. </p>
-<p>If you choose the option <strong>Do not update dependencies</strong>, Carbide disables the option to manage dependencies under the <b><a href="../reference/build_properties/pane_project_settings.htm">Carbide Project Settings</a></b>, <strong>SBSv1</strong> tab. </p>
-<h5>Related references <b></b></h5>
-<ul>
- <li><a href="../reference/build_properties/pane_project_settings.htm">Carbide Project Settings</a></li>
- <li><a href="../reference/wnd_build_prefs.htm">Carbide Global Build Settings</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>
Binary file core/com.nokia.carbide.cpp.doc.user/html/concepts/images/build_configs.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/concepts/images/deps_track_query.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/tour.html Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/tour.html Tue Jun 22 15:26:27 2010 -0500
@@ -52,12 +52,10 @@
</li>
<li>
<p>
- Add scalable graphics (MIF), Symbian OS bitmaps (MBM) and application information (AIF)
- resources to projects, and edit these resources. You can add these using the New command, which is available on the File menu, and on the pop-up menus of the C/C++ Projects and Navigator views. MBM, MIF and AIF editors are provided to modify
+ Add scalable graphics (MIF) and Symbian OS bitmaps (MBM) to projects, and edit these resources. You can add these using the New command, which is available on the File menu, and on the pop-up menus of the Project Explorer and Symbian Project Navigator views. MBM and MIF editors are provided to modify
the resources.</p>
<p>
- For more information, see <a href="../tasks/Multi-BitmapFile.html">Creating an MBM File</a> and <a href="../tasks/AppInfoFile.html">Creating an AIF File</a>.
- </p>
+ For more information, see <a href="../tasks/Multi-BitmapFile.html">Creating an MBM File</a>. </p>
</li>
<li>
<p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_ide_dialogs_help.xml Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_ide_dialogs_help.xml Tue Jun 22 15:26:27 2010 -0500
@@ -349,19 +349,10 @@
<topic label="MBM/MIF Editor" href="html/reference/view_mifdef_editor.htm" />
</context>
- <!-- AIF Editor -->
- <context id="aif_editor_dialog" >
- <description>Use the AIF editor to specify the Symbian OS resource file and bitmaps that should be included in a Symbian OS application information (AIF) file.</description>
- <topic label="AIF Editor" href="html/reference/AIFEditor.html" />
- <topic label="AIF File" href="html/concepts/AIFDefWizard.html" />
- <topic label="Creating an AIF File" href="html/tasks/AppInfoFile.html" />
- </context>
-
<!-- Image Editor add images from project -->
<context id="add_project_images_dialog" >
<description>Use the add image from project dialog to search for image files in your project.</description>
<topic label="Add Images from Project" href="html/reference/add_from_project.htm" />
- <topic label="AIF Editor" href="html/reference/AIFEditor.html" />
<topic label="MBM Editor" href="html/reference/MBMEditor.html" />
<topic label="MBM/MIF Editor" href="html/reference/view_mifdef_editor.htm" />
</context>
@@ -370,7 +361,6 @@
<context id="add_filesystem_images_dialog" >
<description>Use the add image from file system dialog to search for image files on your file system.</description>
<topic label="Add Images from Filesystem" href="html/reference/add_from_filesys.htm" />
- <topic label="AIF Editor" href="html/reference/AIFEditor.html" />
<topic label="MBM Editor" href="html/reference/MBMEditor.html" />
<topic label="MBM/MIF Editor" href="html/reference/view_mifdef_editor.htm" />
</context>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/AIFEditor.html Tue Jun 22 15:25:44 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head>
-<title>AIF Editor in AIF Definition File</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
- <body>
- <h2>AIF Editor</h2>
-
- <p>
- The <b>AIF Editor</b> allows you to specify the Symbian OS
- resource file and bitmaps that should be included in a Symbian OS application
- information (AIF) file. Use of AIF files is restricted to using <span class="filename">.bmp</span> files and works for versions 2.x and later releases of the Symbian OS SDKs. For more information, see <a href="../concepts/AIFDefWizard.html">AIF File</a>.</p>
- <p>
- The AIF Editor is shown when a new AIF file is created or an existing file is edited in the Resources group of the MMP editor's Sources tab. Refer to <a href="../tasks/AppInfoFile.html">Creating an AIF File</a> for more information.</p>
-
- <p align="center" class="Image"><img src="../tasks/projects/images/AIF_editor2.png" width="700" height="575" /></p>
- <h5>Table 1. AIF Editor —Items</h5>
- <table width="94%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="32%" scope="col">Item</th>
- <th width="68%" scope="col">Explanation</th>
- </tr>
- <tr>
- <td><b>Target File </b></td>
- <td><p>Specifies the filename of the compiled AIF file, relative to the target path. Click the untitled.aif button to set the target file based on the SDK and project name.</p></td>
- </tr>
- <tr>
- <td><b>Resource File Path </b></td>
- <td>Choose a resource file from the current project, browse the file system or enter the path. For relative paths use the Carbide project as the reference point, not the MMP file location. </td>
- </tr>
- <tr>
- <td><b>Up</b></td>
- <td>Select an image in the list and click Up to move the selection one position up in the list.</td>
- </tr>
- <tr>
- <td><b>Down</b></td>
- <td><p>Select an image in the list and click Down to move the selection one position down in the list. </p></td>
- </tr>
- <tr>
- <td><b>Pair Image and Mask </b></td>
- <td>Select two adjacent unpaired BMP image entries in the list and click this button to combine the images together into image/mask pairs.</td>
- </tr>
- <tr>
- <td><b>Split Image and Mask </b></td>
- <td>Select a paired BMP image in the list and click this button to split the image into image and mask entries. </td>
- </tr>
- <tr>
- <td><b>Swap Image and Mask </b></td>
- <td>Select a paired BMP image in the list and click this button to swap the image and mask files and format information in paired image entries. </td>
- </tr>
- <tr>
- <td><b><a href="add_from_project.htm">Add From Project</a> </b></td>
- <td>Click this button to open an Add Images from Project dialog to reference available images in the project.</td>
- </tr>
- <tr>
- <td><b><a href="add_from_filesys.htm">Add From Filesystem</a></b></td>
- <td>Click this button to open an Add Images From Filesystem dialog to locate and reference existing images in the filesystem or copy images to the project.</td>
- </tr>
- <tr>
- <td><b>Remove</b></td>
- <td>Select an image and click Remove to remove image entry from the list. This does not delete file from directory.</td>
- </tr>
- <tr>
- <td><b>Color depth </b></td>
- <td>Select the bit depth used to encode the image at build time.</td>
- </tr>
- <tr>
- <td><b>Mask depth </b></td>
- <td><p>Select the bit depth used to encode the mask at build time. Options include:</p>
- <ul>
- <li>n/a - Do not apply mask depth to images </li>
- <li>1 - A 1-bit mask treats pixels as "on/off" bits, where black is opaque and white is transparent. </li>
- <li>8 - An 8-bit mask is treated as alpha values, where black is transparent and white is opaque.</li>
- </ul></td>
- </tr>
- <tr>
- <td><b>Color format </b></td>
- <td>Select Color to encode the image(s) as color or select Grayscale to encode the image(s) as grayscale.</td>
- </tr>
- <tr>
- <td><b>Preview</b></td>
- <td>A preview of the image as it will appear at runtime. </td>
- </tr>
- </table>
- <p> </p>
- <h5>Related concepts</h5>
- <ul>
- <li><a href="../concepts/AIFDefWizard.html">AIF File</a></li>
- </ul>
- <h5>Related tasks</h5>
- <ul>
- <li><a href="../tasks/AppInfoFile.html">Creating an AIF File</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/html/reference/MMP_Editor_sources.html Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_sources.html Tue Jun 22 15:26:27 2010 -0500
@@ -28,7 +28,7 @@
<p>
<b>Resources</b></p></td><td class="Cell">
<p>
- Add, remove, or edit resources, bitmaps, languages, and AIF files to be compiled with your project.</p></td></tr>
+ Add, remove, or edit resources, bitmaps, and languages to compile with your project.</p></td></tr>
</table>
<h5>Related references</h5>
<ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/add_from_filesys.htm Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/add_from_filesys.htm Tue Jun 22 15:26:27 2010 -0500
@@ -9,8 +9,8 @@
<h2>Add Images From Filesystem</h2>
<p>The <b>Add Images from Filesystem</b> dialog allows you to search for and add images currently available in the filesystem. Select an image and click <b>OK</b> to add the image.</p>
- <p class="note"><b>NOTE</b> Information displayed under Help group will vary slightly depending upon whether this dialog was called from a MBM, MIF, or AIF editor. </p>
- <p align="center" class="Image"><img src="images/add_images_from_filesys.png" width="608" height="581"></p>
+ <p class="note"><b>NOTE</b> Information displayed under Help group will vary slightly depending upon whether this dialog was called from a MBM or MIF editor. </p>
+ <p align="center" class="Image"><img src="images/add_images_from_filesys.png" width="608" height="581"></p>
<p class="figure">Figure 1 - Add Images from Filesystem </p>
<h5>Table 1. Add Images—Items</h5>
<table width="94%" border="0" cellpadding="2" cellspacing="0">
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/add_from_project.htm Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/add_from_project.htm Tue Jun 22 15:26:27 2010 -0500
@@ -9,7 +9,7 @@
<h2>Add Images From Project </h2>
<p>The <b>Add Images from Project</b> dialog allows you to add images currently included in the project. Select one or more images and click <b>OK</b> to add the image to the MMP file. </p>
- <p class="note"><b>NOTE</b> Information displayed under Help group will vary slightly depending upon whether this dialog was called from a MBM, MIF, or AIF editor.</p>
+ <p class="note"><b>NOTE</b> Information displayed under Help group will vary slightly depending upon whether this dialog was called from a MBM or MIF editor.</p>
<p align="center" class="Image"><img src="images/add_images_from_project.png" width="608" height="581"></p>
<p class="figure">Figure 1 - Add Images from Project </p>
<h5>Other references</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_args.htm Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_args.htm Tue Jun 22 15:26:27 2010 -0500
@@ -33,7 +33,7 @@
</table>
<h5>Other references </h5>
<ul>
- <li><a href="pane_build_config.htm">Carbide Build Configurations</a></li>
+ <li><a href="pane_build_config.htm">Build Configurations</a></li>
<li><a href="pane_build_config.htm">SIS Builder</a></li>
<li><a href="pane_build_config_env.htm">Environment</a></li>
<li><a href="pane_build_config_paths.htm">Paths and Symbols </a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_env.htm Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_env.htm Tue Jun 22 15:26:27 2010 -0500
@@ -1,63 +1,63 @@
-<!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" />
-<meta name="keywords" content="Environment" >
-<title>Environment Variables</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Environment Variables</h2>
-<p> The <b>Environment Variables </b> pane allows you to view the current User and System environment variables that will be used when any abld command is invoked. User variables are modified or added when a process is invoked. Read only system variables are listed. Variables and values in bold are items that have been modified from their default values.</p>
-<p>Some variables have special meaning, including:</p>
-<ul>
- <li><span class="code">PATH</span> — will always place "<span class="code">${EPOCROOT}\epoc32\tools;${EPOCROOT}\epoc32\gcc\bin;</span>" at the front of the <span class="code">PATH</span> regardless of what it is changed to </li>
- <li><span class="code">PATH</span>, <span class="code">EPOCROOT</span>, and <span class="code">*MW</span> variables — <span class="note">cannot be undefined as they are required for system builds</span></li>
-</ul>
-<p align="center"><img src="../images/page_build_config_env.png" width="575" height="473"></p>
-<p class="figure">Figure 1 - Environment Variables</p>
-<h5>Table 1 Environment variable 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>New</b></td>
- <td>Click to add a new environment variable. You must specify a name and a value. </td>
- </tr>
- <tr>
- <td><b>Edit</b></td>
- <td>Allows you to edit the name and value of an environment variable.</td>
- </tr>
- <tr>
- <td><b>Undefine</b></td>
- <td><p>Undefines the selected variable so that it is not used during a build.</p>
- <p class="note"><b>NOTE</b> Some variables, like <span class="code">PATH</span>, <span class="code">EPOCROOT</span>, and those beginning with <span class="code">MW*</span> have special meaning and cannot be undefined. </p></td>
- </tr>
- <tr>
- <td><b>Variable use</b></td>
- <td><p>Shows the use for the selected variable. Uses include:</p>
- <ul>
- <li>Default – Take the variable as-is from the system, do not modify it.</li>
- <li>Append – Add the value displayed to the end of the existing variable (the existing variable name is not displayed.</li>
- <li>Prepend – Add the value displayed to the front of the existing variable (the existing variable name is not displayed.</li>
- <li>Replace – Replace the value displayed with the existing variable.</li>
- <li>Undefine – Not used during a build</li>
- </ul></td>
- </tr>
-</table>
-<h5>Other references </h5>
-<ul>
- <li><a href="pane_build_config.htm">Carbide Build Configurations</a></li>
- <li><a href="pane_build_config.htm">SIS Builder</a></li>
- <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
- <li><a href="pane_build_config_paths.htm">Paths and Symbols </a></li>
- <li><a href="../ROM_build_settings.html">ROM Builder</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>
+<!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" />
+<meta name="keywords" content="Environment" >
+<title>Environment Variables</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Environment Variables</h2>
+<p> The <b>Environment Variables </b> pane allows you to view the current User and System environment variables that will be used when any abld command is invoked. User variables are modified or added when a process is invoked. Read only system variables are listed. Variables and values in bold are items that have been modified from their default values.</p>
+<p>Some variables have special meaning, including:</p>
+<ul>
+ <li><span class="code">PATH</span> — will always place "<span class="code">${EPOCROOT}\epoc32\tools;${EPOCROOT}\epoc32\gcc\bin;</span>" at the front of the <span class="code">PATH</span> regardless of what it is changed to </li>
+ <li><span class="code">PATH</span>, <span class="code">EPOCROOT</span>, and <span class="code">*MW</span> variables — <span class="note">cannot be undefined as they are required for system builds</span></li>
+</ul>
+<p align="center"><img src="../images/page_build_config_env.png" width="575" height="473"></p>
+<p class="figure">Figure 1 - Environment Variables</p>
+<h5>Table 1 Environment variable 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>New</b></td>
+ <td>Click to add a new environment variable. You must specify a name and a value. </td>
+ </tr>
+ <tr>
+ <td><b>Edit</b></td>
+ <td>Allows you to edit the name and value of an environment variable.</td>
+ </tr>
+ <tr>
+ <td><b>Undefine</b></td>
+ <td><p>Undefines the selected variable so that it is not used during a build.</p>
+ <p class="note"><b>NOTE</b> Some variables, like <span class="code">PATH</span>, <span class="code">EPOCROOT</span>, and those beginning with <span class="code">MW*</span> have special meaning and cannot be undefined. </p></td>
+ </tr>
+ <tr>
+ <td><b>Variable use</b></td>
+ <td><p>Shows the use for the selected variable. Uses include:</p>
+ <ul>
+ <li>Default – Take the variable as-is from the system, do not modify it.</li>
+ <li>Append – Add the value displayed to the end of the existing variable (the existing variable name is not displayed.</li>
+ <li>Prepend – Add the value displayed to the front of the existing variable (the existing variable name is not displayed.</li>
+ <li>Replace – Replace the value displayed with the existing variable.</li>
+ <li>Undefine – Not used during a build</li>
+ </ul></td>
+ </tr>
+</table>
+<h5>Other references </h5>
+<ul>
+ <li><a href="pane_build_config.htm">Build Configurations</a></li>
+ <li><a href="pane_build_config.htm">SIS Builder</a></li>
+ <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
+ <li><a href="pane_build_config_paths.htm">Paths and Symbols </a></li>
+ <li><a href="../ROM_build_settings.html">ROM Builder</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/html/reference/build_properties/pane_build_config_paths.htm Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_paths.htm Tue Jun 22 15:26:27 2010 -0500
@@ -1,34 +1,34 @@
-<!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" />
-<meta name="keywords" content="Paths and Symbols, Include Paths, Symbols" >
-<title>Paths and Symbols </title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Paths and Symbols </h2>
-<p> The <b>Paths and Symbols </b> pane shows the paths and symbols used to the build the project index. This is a read-only list based on the setting of the <b>Build configuration for the indexer</b> option in the <b>C/C++ General</b> > <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_idx.htm">Indexer</a> panel. Carbide now caches the paths and symbols which persist between debug sessions. If any of the files like bld.inf, MMP, or any of their <span class="code">include</span> files change, the list is automatically recalculated and CDT notified. </p>
-<p>To change what appears in the list:</p>
-<ul>
- <li>In the <a href="../MMP_Editor.html">MMP Editor</a> - add macros, user, or system include </li>
- <li>Using the Macro File defined in the <a href="pane_macro_settings.htm">Carbide Macro Settings</a> panel </li>
-</ul>
-<p>You can also specify a macro file using the <a href="pane_macro_settings.htm">Carbide Macro Settings</a> page in the <b>Properties for <i>project</i></b> dialog. </p>
-<p align="center"><img src="../images/page_build_config_paths.png" width="575" height="473"></p>
-<p class="figure">Figure 1 - Paths and Symbols pane </p>
-<h5>Other references </h5>
-<ul>
- <li><a href="pane_build_config.htm">Carbide Build Configurations</a></li>
- <li><a href="pane_build_config.htm">SIS Builder</a></li>
- <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
- <li><a href="pane_build_config_env.htm">Environment</a></li>
- <li><a href="../ROM_build_settings.html">ROM Builder</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>
+<!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" />
+<meta name="keywords" content="Paths and Symbols, Include Paths, Symbols" >
+<title>Paths and Symbols </title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Paths and Symbols </h2>
+<p> The <b>Paths and Symbols </b> pane shows the paths and symbols used to the build the project index. This is a read-only list based on the setting of the <b>Build configuration for the indexer</b> option in the <b>C/C++ General</b> > <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_idx.htm">Indexer</a> panel. Carbide now caches the paths and symbols which persist between debug sessions. If any of the files like bld.inf, MMP, or any of their <span class="code">include</span> files change, the list is automatically recalculated and CDT notified. </p>
+<p>To change what appears in the list:</p>
+<ul>
+ <li>In the <a href="../MMP_Editor.html">MMP Editor</a> - add macros, user, or system include </li>
+ <li>Using the Macro File defined in the <a href="pane_macro_settings.htm">Macro Settings</a> panel </li>
+</ul>
+<p>You can also specify a macro file using the <a href="pane_macro_settings.htm">Macro Settings</a> page in the <b>Properties for <i>project</i></b> dialog. </p>
+<p align="center"><img src="../images/page_build_config_paths.png" width="558" height="456"></p>
+<p class="figure">Figure 1 - Paths and Symbols pane </p>
+<h5>Other references </h5>
+<ul>
+ <li><a href="pane_build_config.htm">Build Configurations</a></li>
+ <li><a href="pane_build_config.htm">SIS Builder</a></li>
+ <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
+ <li><a href="pane_build_config_env.htm">Environment</a></li>
+ <li><a href="../ROM_build_settings.html">ROM Builder</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/html/reference/build_properties/pane_macro_settings.htm Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_macro_settings.htm Tue Jun 22 15:26:27 2010 -0500
@@ -11,8 +11,8 @@
<h2> Macro Settings</h2>
<p> The <b> Macro Settings</b> properties page allows you to specify a file containing macros that CDT uses to parse the source code. </p>
<p align="center"><img src="../images/carbide_macro_settings.png" width="786" height="476"></p>
-<p class="figure">Figure 1 - Carbide Macros Settings panel </p>
-<h5>Table 1 Carbide <span class="figure">Macros Settings</span> items </h5>
+<p class="figure">Figure 1 - Macros Settings panel </p>
+<h5>Table 1 <span class="figure">Macros Settings</span> items </h5>
<table width="700" border="0" cellpadding="2" cellspacing="0">
<tr>
<th width="30%" scope="col">Item</th>
@@ -34,8 +34,7 @@
<h5>Related references </h5>
<ul>
<li><a href="../../tasks/projects/prj_build.htm">Building Projects</a></li>
- <li><a href="pane_build_config.htm">Carbide Build Configuration</a></li>
- <li>Carbide Rom Build Settings </li>
+ <li><a href="pane_build_config.htm">Build Configurations</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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_pkg_config.htm Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_pkg_config.htm Tue Jun 22 15:26:27 2010 -0500
@@ -9,7 +9,7 @@
</head>
<body bgcolor="#FFFFFF">
<h2>Set PKG File for Build Configuration</h2>
-<p>The <b>Set PKG File for Build Configuration</b> dialog appears when an Application TRK build configuration does not include a PKG file. Use it to assign a PKG file to the project's current build configuration that will be used to create a project's SIS installation file. If you define a launch configuration used for on-device debugging with the TRK debug agent, you will need to specify a PKG file for the project. A PKG file primarily provides a list of program and resource files to install on the device.</p>
+<p>The <b>Set PKG File for Build Configuration</b> dialog appears when an <strong>Application TRK</strong> build configuration does not include a PKG file. Use it to assign a PKG file to the project's current build configuration that will be used to create a project's SIS installation file. If you define a launch configuration used for on-device debugging with the TRK debug agent, you will need to specify a PKG file for the project. A PKG file primarily provides a list of program and resource files to install on the device.</p>
<p align="center"><img src="../images/set_pkg.png" width="544" height="359" /></p>
<p class="figure">Figure 1 - Set PKG File for Build Configuration</p>
<h5>Table 1 Items </h5>
@@ -44,7 +44,7 @@
</ul>
<h5>Related reference </h5>
<ul>
- <li><a href="pane_build_config.htm">Carbide Build Configurations</a></li>
+ <li><a href="pane_build_config.htm">Build Configurations</a></li>
<li><a href="pane_build_config_env.htm">Environment variables</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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/wnd_sis_properties.htm Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/wnd_sis_properties.htm Tue Jun 22 15:26:27 2010 -0500
@@ -1,60 +1,60 @@
-<!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>SIS Properties </title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>SIS Properties </h2>
-<p> Use the<b> SIS Properties</b> dialog to specify SIS file creation and signing options for the selected SIS file included in the project. </p>
-<p align="center"><img src="../images/wnd_sis_properties.png" width="375" height="452" /></p>
-<p class="figure">Figure 1 - SIS Properties dialog </p>
-<h5>Table 1 <span class="figure">SIS Properties window</span> items </h5>
-<table width="100%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="20%" scope="col">Item</th>
- <th width="71%" scope="col">Explanation</th>
- </tr>
- <tr>
- <td width="20%"><b>SIS File Creation Options </b></td>
- <td><p>Define the SIS file created: </p>
- <ul>
- <li><b>PKG File</b> — name of the PKG file to build. Click Browse to locate or else type in the file path and name. </li>
- <li><b>Output File Name</b> — unsigned file name that is generated from the PKG file selected</li>
- <li><b>Content Search Location</b> — root location where PKG files are specified to search </li>
- <li><b>Generate partial upgrade when appropriate</b> — enable to create package update files that only contain files changed since the last build</li>
- </ul></td>
- </tr>
- <tr>
- <td><b>Signing Options </b></td>
- <td><p>Defines the signing options applied to the configuration. The options include: </p>
- <ul>
- <li><b>Don't sign sis file</b> — builds sis file without signing it </li>
- <li><b>Self sign sis file</b> — signs the sis file without specifying the certificate/key pair </li>
- <li><b>Sign sis file with certificate/key pair</b> — signs the sis file using the specified certificate/key pair </li>
- </ul>
- <p>Enter the required information into the enabled fields based on the signing option selected above: </p>
- <ul>
- <li><b>Signed SIS File Name</b> —Final output signed file name. Default is input PKG name with ‘sisx’ extension.</li>
- <li><b>Password</b> — Optional password</li>
- <li><b>Additional options</b> — Enter unfiltered options to be passed to the tool</li>
- <li><b>Certificate</b> – Enter or browse to certificate</li>
- <li><b>Key</b> — Enter or browse to key</li>
- </ul>
- <p class="note"><b>NOTE</b> On Symbian OS 9.x builds, if the key/cert pair are not defined, <span class="code">makekeys</span> will be called and temporary ones will be generated for you to "self-sign" the application. Self-signed applications should be in the
- 0xE0000000-0xEFFFFFFF range.</p>
- <p class="note"><b>NOTE</b> All Application TRK build configuration require a PKG file. If none is found in the active project then you will be asked to <a href="pane_pkg_config.htm">choose</a> one.</p> </td>
- </tr>
-</table>
-<h5>Related reference </h5>
-<ul>
- <li><a href="pane_build_config.htm">Carbide Build Configurations</a></li>
- <li><a href="pane_build_config_env.htm">Environment variables</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>
+<!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>SIS Properties </title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>SIS Properties </h2>
+<p> Use the<b> SIS Properties</b> dialog to specify SIS file creation and signing options for the selected SIS file included in the project. </p>
+<p align="center"><img src="../images/wnd_sis_properties.png" width="455" height="452" /></p>
+<p class="figure">Figure 1 - SIS Properties dialog </p>
+<h5>Table 1 <span class="figure">SIS Properties window</span> items </h5>
+<table width="100%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="20%" scope="col">Item</th>
+ <th width="71%" scope="col">Explanation</th>
+ </tr>
+ <tr>
+ <td width="20%"><b>SIS File Creation Options </b></td>
+ <td><p>Define the SIS file created: </p>
+ <ul>
+ <li><b>PKG File</b> — name of the PKG file to build. Click Browse to locate or else type in the file path and name. </li>
+ <li><b>Output File Name</b> — unsigned file name that is generated from the PKG file selected</li>
+ <li><b>Content Search Location</b> — root location where PKG files are specified to search </li>
+ <li><b>Generate partial upgrade when appropriate</b> — enable to create package update files that only contain files changed since the last build</li>
+ </ul></td>
+ </tr>
+ <tr>
+ <td><b>Signing Options </b></td>
+ <td><p>Defines the signing options applied to the configuration. The options include: </p>
+ <ul>
+ <li><b>Don't sign sis file</b> — builds sis file without signing it </li>
+ <li><b>Self sign sis file</b> — signs the sis file without specifying the certificate/key pair </li>
+ <li><b>Sign sis file with certificate/key pair</b> — signs the sis file using the specified certificate/key pair </li>
+ </ul>
+ <p>Enter the required information into the enabled fields based on the signing option selected above: </p>
+ <ul>
+ <li><b>Signed SIS File Name</b> —Final output signed file name. Default is input PKG name with ‘sisx’ extension.</li>
+ <li><b>Password</b> — Optional password</li>
+ <li><b>Additional options</b> — Enter unfiltered options to be passed to the tool</li>
+ <li><b>Certificate</b> – Enter or browse to certificate</li>
+ <li><b>Key</b> — Enter or browse to key</li>
+ </ul>
+ <p class="note"><b>NOTE</b> On Symbian OS 9.x builds, if the key/cert pair are not defined, <span class="code">makekeys</span> will be called and temporary ones will be generated for you to "self-sign" the application. Self-signed applications should be in the
+ 0xE0000000-0xEFFFFFFF range.</p>
+ <p class="note"><b>NOTE</b> All Application TRK build configuration require a PKG file. If none is found in the active project then you will be asked to <a href="pane_pkg_config.htm">choose</a> one.</p> </td>
+ </tr>
+</table>
+<h5>Related reference </h5>
+<ul>
+ <li><a href="pane_build_config.htm">Build Configurations</a></li>
+ <li><a href="pane_build_config_env.htm">Environment variables</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
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/build_all_targets.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_team_commands.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_all_targets.htm Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_all_targets.htm Tue Jun 22 15:26:27 2010 -0500
@@ -15,7 +15,7 @@
<li>Right-click the project name and select <strong>Symbian Build > Build All Configurations</strong></li>
</ul>
<p>To build all target build configurations enabled for the current project.</p>
-<p align="center"><img src="../images/build_all_targets.png" width="368" height="500" /></p>
+<p align="center"><img src="../images/build_all_targets.png" width="280" height="262" /></p>
<p align="center" class="figure">Figure 1. Build All Configurations menu </p>
<h5>Other references</h5>
<ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_disassembly.htm Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_disassembly.htm Tue Jun 22 15:26:27 2010 -0500
@@ -24,7 +24,7 @@
<li>Set breakpoints at the start of any assembler instruction by right-clicking the left hand column to view the context menu options (Figure 2) </li>
</ul>
<p>Figure 1 shows the <b>Dissassembly</b> view stopped at a breakpoint.</p>
-<p align="center"><img src="images/view_disassembly.png" width="785" height="202" alt="" /></p>
+<p align="center"><img src="images/view_disassembly.png" width="555" height="272" alt="" /></p>
<p class="figure">Figure 1 - Disassembly view</p>
<p>Figure 2 shows the context menu that appears when you right-click in the Dissassembly pane. Right-clicking the left border opens the breakpoint context menu in Figure 3.</p>
<p class="figure"><img src="images/view_disassembly_menu.png" width="232" height="133"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_mifdef_editor.htm Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_mifdef_editor.htm Tue Jun 22 15:26:27 2010 -0500
@@ -1,106 +1,106 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html><head>
-<title>MIF Editor</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
- <body>
-
-<h2>MBM/MIF Editor</h2>
-
- <p>The <b>MIF Editor</b> allows you to create or edit the <span class="code">.mif</span> files list of scalable icons (<span class="code">.svg</span>)
- included in a S60 v3.0 and later GUI projects as well as standard <span class="code">.bmp</span> files. A .mif file is a MSX Interchange Format (MIF) file that should be built by the project. MIF files replace the functionality of AIF (and MBM) files.</p>
- <p class="note"><b>NOTE</b> This editor is only supported by the S60 3.0 and later SDKs.</p>
- <p class="note"><b>NOTE</b> For resources that are included after creating a project, you should ensure that the output location is set correctly by viewing the file properties. The output location is set to "<span class="code">{EPOCROOT}\epoc32\include</span>" by default, so if an alternate location is required you can set this in the file properties.</p>
- <p align="center" class="Image"><img src="../tasks/projects/images/mif_file_symprojnav.png" width="299" height="292"></p>
- <p class="figure">Figure 1 - MIF File in the Symbian Project Navigator view</p>
- <p>The <b>MIF Editor</b> appears when a MIF file is
- opened for editing. To open the editor double-click on a .mif file in the <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> view (figure 1), or select a scalable icon makefile (for example, <span class="code">Icons_scalable_dc.mk</span>), right-click and select the <b>Add MBM/MIF Entry</b> command.</p>
- <p align="center"><img src="../tasks/projects/images/MBM_MIF_editor.png" width="900" height="600"> </p>
- <p class="figure">Figure 2 - MBM/MIF Editor</p>
- <h5>Table 1. MBM/MIF Editor —Items</h5>
- <table width="94%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="32%" scope="col">Item</th>
- <th width="68%" scope="col">Explanation</th>
- </tr>
- <tr>
- <td><b>Target File </b></td>
- <td><p>Specifies the <span class="code">EPOCROOT</span> relative path for the compiled images. Click the Default button to set the target file based on the SDK and project name. </p></td>
- </tr>
- <tr>
- <td><b>Header File </b></td>
- <td>Shows the generated header file. Select the Header option in the Header Generation group to create a default .mbg file. The path cannot be edited in this field. </td>
- </tr>
- <tr>
- <td><b>Header Generation</b></td>
- <td><p>Options include:</p>
- <ul>
- <li>No header - If selected, no .mbg header will be generated. </li>
- <li>Header - If selected, a .mbg header will be generated.</li>
- </ul></td>
- </tr>
- <tr>
- <td><b>Up</b></td>
- <td>Select an image in the list and click Up to move the selection one position up in the list.</td>
- </tr>
- <tr>
- <td><b>Down</b></td>
- <td><p>Select an image in the list and click Down to move the selection one position down in the list. </p></td>
- </tr>
- <tr>
- <td><b>Pair Image and Mask </b></td>
- <td>Select two adjacent unpaired BMP image entries in the list and click this button to combine the images together into image/mask pairs.</td>
- </tr>
- <tr>
- <td><b>Split Image and Mask </b></td>
- <td>Select a paired BMP image in the list and click this button to split the image into image and mask entries. </td>
- </tr>
- <tr>
- <td><b>Swap Image and Mask </b></td>
- <td>Select a paired BMP image in the list and click this button to swap the image and mask files and format information in paired image entries. </td>
- </tr>
- <tr>
- <td><b>Add From Project </b></td>
- <td>Click this button to open the <b>Add Images from Project</b> dialog to reference available images in the project.</td>
- </tr>
- <tr>
- <td><b>Add From Filesystem </b></td>
- <td>Click this button to open the <b>Add Images From Filesystem</b> dialog to locate and reference existing images in the filesystem or copy images to the project.</td>
- </tr>
- <tr>
- <td><b>Remove</b></td>
- <td>Select an image and click <b>Remove</b> to remove image entry from the list. This does not delete file from directory.</td>
- </tr>
- <tr>
- <td><b>Color depth </b></td>
- <td>Select the bit depth used to encode the image at build time.</td>
- </tr>
- <tr>
- <td><b>Mask depth </b></td>
- <td><p>Select the bit depth used to encode the mask at build time. Options include:</p>
- <ul>
- <li>n/a - Do not apply mask depth to images </li>
- <li>1 - A 1-bit mask treats pixels as "on/off" bits, where black is opaque and white is transparent. </li>
- <li>8 - An 8-bit mask is treated as alpha values, where black is transparent and white is opaque.</li>
- </ul></td>
- </tr>
- <tr>
- <td><b>Color format </b></td>
- <td>Select Color to encode the image(s) as color or select Grayscale to encode the image(s) as grayscale.</td>
- </tr>
- <tr>
- <td><b>Set from image </b></td>
- <td>Click this button to auto-detect the image depth, mask depth, and color/grayscale setting from the image contents.</td>
- </tr>
- <tr>
- <td><b>Preview</b></td>
- <td>A preview of the image as it will appear at runtime. </td>
- </tr>
- </table>
- <p> </p>
- <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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html><head>
+<title>MIF Editor</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+ <body>
+
+<h2>MBM/MIF Editor</h2>
+
+ <p>The <b>MIF Editor</b> allows you to create or edit the <span class="code">.mif</span> files list of scalable icons (<span class="code">.svg</span>)
+ included in a S60 v3.0 and later GUI projects as well as standard <span class="code">.bmp</span> files. A .mif file is a MSX Interchange Format (MIF) file that should be built by the project.</p>
+ <p class="note"><b>NOTE</b> This editor is only supported by the S60 3.0 and later SDKs.</p>
+ <p class="note"><b>NOTE</b> For resources that are included after creating a project, you should ensure that the output location is set correctly by viewing the file properties. The output location is set to "<span class="code">{EPOCROOT}\epoc32\include</span>" by default, so if an alternate location is required you can set this in the file properties.</p>
+ <p align="center" class="Image"><img src="../tasks/projects/images/mif_file_symprojnav.png" width="299" height="292"></p>
+ <p class="figure">Figure 1 - MIF File in the Symbian Project Navigator view</p>
+ <p>The <b>MIF Editor</b> appears when a MIF file is
+ opened for editing. To open the editor double-click on a .mif file in the <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> view (figure 1), or select a scalable icon makefile (for example, <span class="code">Icons_scalable_dc.mk</span>), right-click and select the <b>Add MBM/MIF Entry</b> command.</p>
+ <p align="center"><img src="../tasks/projects/images/MBM_MIF_editor.png" width="900" height="600"> </p>
+ <p class="figure">Figure 2 - MBM/MIF Editor</p>
+ <h5>Table 1. MBM/MIF Editor —Items</h5>
+ <table width="94%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="32%" scope="col">Item</th>
+ <th width="68%" scope="col">Explanation</th>
+ </tr>
+ <tr>
+ <td><b>Target File </b></td>
+ <td><p>Specifies the <span class="code">EPOCROOT</span> relative path for the compiled images. Click the Default button to set the target file based on the SDK and project name. </p></td>
+ </tr>
+ <tr>
+ <td><b>Header File </b></td>
+ <td>Shows the generated header file. Select the Header option in the Header Generation group to create a default .mbg file. The path cannot be edited in this field. </td>
+ </tr>
+ <tr>
+ <td><b>Header Generation</b></td>
+ <td><p>Options include:</p>
+ <ul>
+ <li>No header - If selected, no .mbg header will be generated. </li>
+ <li>Header - If selected, a .mbg header will be generated.</li>
+ </ul></td>
+ </tr>
+ <tr>
+ <td><b>Up</b></td>
+ <td>Select an image in the list and click Up to move the selection one position up in the list.</td>
+ </tr>
+ <tr>
+ <td><b>Down</b></td>
+ <td><p>Select an image in the list and click Down to move the selection one position down in the list. </p></td>
+ </tr>
+ <tr>
+ <td><b>Pair Image and Mask </b></td>
+ <td>Select two adjacent unpaired BMP image entries in the list and click this button to combine the images together into image/mask pairs.</td>
+ </tr>
+ <tr>
+ <td><b>Split Image and Mask </b></td>
+ <td>Select a paired BMP image in the list and click this button to split the image into image and mask entries. </td>
+ </tr>
+ <tr>
+ <td><b>Swap Image and Mask </b></td>
+ <td>Select a paired BMP image in the list and click this button to swap the image and mask files and format information in paired image entries. </td>
+ </tr>
+ <tr>
+ <td><b>Add From Project </b></td>
+ <td>Click this button to open the <b>Add Images from Project</b> dialog to reference available images in the project.</td>
+ </tr>
+ <tr>
+ <td><b>Add From Filesystem </b></td>
+ <td>Click this button to open the <b>Add Images From Filesystem</b> dialog to locate and reference existing images in the filesystem or copy images to the project.</td>
+ </tr>
+ <tr>
+ <td><b>Remove</b></td>
+ <td>Select an image and click <b>Remove</b> to remove image entry from the list. This does not delete file from directory.</td>
+ </tr>
+ <tr>
+ <td><b>Color depth </b></td>
+ <td>Select the bit depth used to encode the image at build time.</td>
+ </tr>
+ <tr>
+ <td><b>Mask depth </b></td>
+ <td><p>Select the bit depth used to encode the mask at build time. Options include:</p>
+ <ul>
+ <li>n/a - Do not apply mask depth to images </li>
+ <li>1 - A 1-bit mask treats pixels as "on/off" bits, where black is opaque and white is transparent. </li>
+ <li>8 - An 8-bit mask is treated as alpha values, where black is transparent and white is opaque.</li>
+ </ul></td>
+ </tr>
+ <tr>
+ <td><b>Color format </b></td>
+ <td>Select Color to encode the image(s) as color or select Grayscale to encode the image(s) as grayscale.</td>
+ </tr>
+ <tr>
+ <td><b>Set from image </b></td>
+ <td>Click this button to auto-detect the image depth, mask depth, and color/grayscale setting from the image contents.</td>
+ </tr>
+ <tr>
+ <td><b>Preview</b></td>
+ <td>A preview of the image as it will appear at runtime. </td>
+ </tr>
+ </table>
+ <p> </p>
+ <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/html/tasks/AppInfoFile.html Tue Jun 22 15:25:44 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Creating an AIF File in Modifying Resources</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
- <body>
- <h2>Creating an AIF File</h2>
-
- <p>
- The <b>AIF Definition File</b> wizard creates a file that
- specifies an AIF file to be built as part of the project. An AIF file is a
- Symbian OS application information file, which describes an application's icons
- and properties. For more information, see <a href="../concepts/AIFDefWizard.html">Concepts >AIF File</a>.</p>
- <p class="note"><b>NOTE</b> AIF files are used only for projects created for Symbian OS versions
- before v9.1.</p>
- <div class="step">
- <h4>
- To create an AIF file</h4>
- <ol>
- <li>
- <p>
- Open the MMP file associated with the project in the <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> (double-click on MMP file or right-click and select <b>Open</b>).</p>
-
- <p align="center" class="Image"><img src="projects/images/AIF_editor_mmp_symprojnav.png" width="271" height="261" /></p>
- </li>
- <p class="figure">Figure 1 - MMP File in Symbian Project Navigator</p>
- <li>The MMP editor opens.</li>
-
- <p align="center" class="Image"><img src="projects/images/AIF_editor_mmp_editor.png" width="581" height="383" /></p>
- <p class="figure">Figure 2 - Access to AIF Editor in MMP Editor</p>
- <li>
- Select the Sources tab and select AIF in the Resources group.
- </li>
- <li>Click Add button to open the AIF editor.</li>
- <p align="center"><img src="projects/images/AIF_editor.png" width="700" height="575" /></p>
- <p class="figure">Figure 3 - AIF Editor</p>
- <li>
- Enter a name for the .aif file or click untitled.aif button to set a default name based on the SDK and project name.</li>
- <li>Specify a resource file from the dropdown list or browse the filesystem.</li>
- <li>Click the Add From Project or Add From Filesystem buttons to add image and mask bitmaps.</li>
- <li>Set the Shared Image Properties (color depth, mask depth, and color format).</li>
- <li>Select the two images (image and mask) and select Pair Image and Mask button.</li>
- <li>Click Ok to create AIF file from the information you defined in the editor. </li>
- </ol>
- <p align="center"><img src="projects/images/AIF_editor2.png" width="700" height="575" /></p>
- <p align="left" class="figure">Figure 4- AIF Editor with information defined</p>
- </div>
- <h5>Related concepts</h5>
- <ul>
- <li> <a href="../concepts/AIFDefWizard.html">AIF File</a></li>
- </ul>
- <h5>Related reference </h5>
- <ul>
- <li> <a href="../reference/AIFEditor.html">AIF Editor</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/html/tasks/ModifyingResources.html Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/ModifyingResources.html Tue Jun 22 15:26:27 2010 -0500
@@ -9,10 +9,8 @@
<p>
- This section describes the steps for adding and modifying resources of an
- existing project. The resources may be a bitmap resource (MBM) or an
- application information file (AIF) definition file.
- </p>
+ This section describes the steps for adding and modifying bitmap resources (MBM) of an
+ existing project. </p>
<p>
Note that the Symbian OS plug-ins do not provide a graphical editor for the
Symbian OS resource (.rss) file format. Files of this type though
@@ -20,7 +18,6 @@
resource compiler.</p>
<ul>
<li><a href="Multi-BitmapFile.html">Creating an MBM File</a></li>
-<li><a href="AppInfoFile.html">Creating an AIF File</a></li>
</ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/index.html Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/index.html Tue Jun 22 15:26:27 2010 -0500
@@ -36,15 +36,12 @@
<p>
You can then add and build code in the project. This is mostly done using
the standard CDT tools and techniques. The plug-ins through also offer special
- support for the Symbian OS specific file formats for application information
- files (AIF) and multi-bitmap files (MBM), as described in <i>Modifying
- Resources</i>.
- </p>
+ support for the Symbian OS specific file formats and multi-bitmap files (MBM), as described in <i>Modifying
+ Resources</i>. </p>
<ul>
<li><a href="WorkingwithSDKs.html">Working with SDKs</a></li>
<li><a href="CreatingNewProjects.html">Creating New Projects</a></li>
<li><a href="ImportingProjects.html">Importing Projects from a Bld.Inf File</a></li>
-<li><a href="ExportingtoMMP_BLDinf.html">Exporting Project(s) to MMP/Bld.inf Files </a></li>
<li><a href="AddingClasses.html">Adding Classes</a></li>
<li><a href="ModifyingResources.html">Modifying Resources</a></li>
<li><a href="projects/prj_build.htm">Building Projects</a></li>
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/add_build_config_manage_wnd.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/panel_active_config.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wiz_add_sos_class_03.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wiz_add_sos_class_04.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wiz_add_sos_class_05.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wiz_add_sos_class_06.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wiz_add_sos_class_07.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wiz_new_sos_class_01.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wiz_new_sos_class_02.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wiz_new_sos_class_03.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wiz_new_sos_class_04.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wiz_new_sos_class_05.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wnd_add_build_config_manager.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_adding_symbian_class.htm Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_adding_symbian_class.htm Tue Jun 22 15:26:27 2010 -0500
@@ -15,23 +15,23 @@
<ol class="figure">
<li>Right-click the project name and select the New > Symbian OS C++ Class menu item.</li>
<p>The <b>New Symbian OS C++ Class</b> wizard appears showing the <b>Select project</b> page (Figure 1).</p>
- <p align="center"><img src="images/wiz_add_sos_class_03.png" width="388" height="404" /></p>
+ <p align="center"><img src="images/wiz_new_sos_class_01.png" width="624" height="500" /></p>
<p class="figure">Figure 1 - Symbian OS C++ Class wizard window</p>
<li>Select the project to add the new class to, then click Next.</li>
<p>The <b>Name and Location</b> page appears (Figure 2). </p>
- <p align="center"><img src="images/wiz_add_sos_class_05.png" alt="location" width="531" height="319" /></p>
+ <p align="center"><img src="images/wiz_new_sos_class_02.png" width="624" height="500"></p>
<p class="figure">Figure 2 - Name and Location page</p>
<li>Enter class name and header and source directory information, and optionally enable filenames to be lowercase, then click Next.</li>
<p>The <b>Select a type of class</b> page appears (Figure 3). </p>
- <p align="center"><img src="images/wiz_add_sos_class_04.png" alt="template" width="388" height="404" /></p>
+ <p align="center"><img src="images/wiz_new_sos_class_03.png" width="624" height="500"></p>
<p class="figure">Figure 3 - <b>Select a type of class</b> page</p>
<li>Click a class template to use for the new class, then click Next.</li>
<p>The <b>Other Settings</b> page appears (Figure 4).</p>
- <p align="center"><img src="images/wiz_add_sos_class_06.png" width="419" height="420" /></p>
+ <p align="center"><img src="images/wiz_new_sos_class_04.png" width="624" height="500"></p>
<p class="figure">Figure 4 - Other Settings page</p>
<li>Enter Author and Copyright information, then click Finish. </li>
- <p>The new defined Symbian-based class titled <span class="code">NewClass</span>, is added to the project and appears in the src folder (Figure 5). </p>
- <p align="center"><img src="images/wiz_add_sos_class_07.png" width="279" height="436" /></p>
+ <p>The new defined Symbian-based class titled <span class="code">SOSClassName</span> is added to the project and appears in the src folder (Figure 5). </p>
+ <p align="center"><img src="images/wiz_new_sos_class_05.png" width="281" height="390"></p>
<p class="figure">Figure 5 -New class appears in Project Explorer list inside the project </p>
</ol>
</div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_new_build_config.htm Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_new_build_config.htm Tue Jun 22 15:26:27 2010 -0500
@@ -15,16 +15,16 @@
<ol>
<li>Open Carbide Build Configuration panel in the project's Properties window
<p>Select the <b>Project > Properties</b> menu item or right-click the project name in the <a href="../../reference/view_cpp_projects.htm">Project Explorer</a> view, then select <b>Properties</b>. The project <b>Properties for <em><project_name></em></b> window appears. Then select Carbide Build Configurations. </p>
- <p align="center"><img src="images/panel_active_config.png" width="695" height="291" alt=""/></p>
+ <p align="center"><img src="images/panel_active_config.png" width="801" height="350" alt=""/></p>
<p class="figure">Figure 1 - Active Configuration group in project Properties window </p></li>
<li>Click Manage... in the Active Configuration group (Figure 1)
<p>The <b>Add/Remove Carbide Build Configuration </b> window appears (Figure 2). Use the <b>Add/Remove Carbide Build Configuration</b> window to manage the build configurations that appear on the Build Configurations sub-menu for the current project. You can also click the <b>Manage configurations for the current project</b> icon (<img src="images/icon_manage_project_configs.png" width="16" height="16" align="absmiddle">) on the toolbar to open this dialog. </p>
</li>
- <li>
- <p align="center"><img src="images/add_build_config_manage_wnd.png" width="650" height="500" alt="" /></p>
+ </ol>
+ <p align="center"><img src="images/wnd_add_build_config_manager.png" width="650" height="500" alt="" /></p>
+ <blockquote>
<p class="figure">Figure 2 - Window for managing build configurations</p>
- </li>
- </ol>
+ </blockquote>
</div>
<h5>Related concepts</h5>
<ul>
--- a/core/com.nokia.carbide.cpp.doc.user/index.xml Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/index.xml Tue Jun 22 15:26:27 2010 -0500
@@ -8,11 +8,6 @@
<topic href="html/concepts/build_configurations.htm"/>
</entry>
- <entry keyword="AIF">
- <topic label="editor" href="html/reference/AIFEditor.html"/>
- <topic label="file" href="html/concepts/AIFDefWizard.html"/>
- </entry>
-
<entry keyword="ARM registers">
<topic href="html/concepts/arm_registers.htm"/>
</entry>
--- a/core/com.nokia.carbide.cpp.doc.user/plugin.xml Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/plugin.xml Tue Jun 22 15:26:27 2010 -0500
@@ -140,7 +140,7 @@
<contexts file="html/context_help/carbide_ide_dialogs_help.xml"
plugin="com.nokia.carbide.cpp.builder.utils" />
- <!-- SPN VIEW, INF IMPORTER, MMP, MBM, AIF editors, and miscellaneous HELP -->
+ <!-- SPN VIEW, INF IMPORTER, MMP, MBM, and miscellaneous HELP -->
<contexts file="html/context_help/carbide_ide_dialogs_help.xml"
plugin="com.nokia.carbide.cpp.project.ui" />
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Tue Jun 22 15:25:44 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Tue Jun 22 15:26:27 2010 -0500
@@ -129,10 +129,6 @@
<topic label="Freeze Exports" href="html/reference/menus/freeze_exports.htm" />
</topic>
<topic label="Resource and project editors" href="html/tasks/ModifyingResources.html" >
- <topic label="AIF files" href="html/concepts/AIFDefWizard.html" >
- <topic label="AIF Editor" href="html/reference/AIFEditor.html" />
- <topic label="Creating an AIF File" href="html/tasks/AppInfoFile.html" />
- </topic>
<topic label="Classes" href="html/tasks/ClassesToc.htm" >
<topic label="Adding Classes" href="html/tasks/AddingClasses.html" />
<topic label="New C++ Class Wizard" href="html/reference/NewClassWizard.html" />
--- a/debuggercdi/com.nokia.carbide.cpp.debug.kernelaware/plugin.xml Tue Jun 22 15:25:44 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.cpp.debug.kernelaware/plugin.xml Tue Jun 22 15:26:27 2010 -0500
@@ -9,7 +9,7 @@
id="com.nokia.carbide.cpp">
</category>
<view
- name="Symbian OS Data"
+ name="Classic Symbian OS Data"
icon="icons/symbian-120.gif"
category="com.nokia.carbide.cpp"
class="com.nokia.carbide.cpp.debug.kernelaware.ui.SymbianOSView"
