# HG changeset patch
# User timkelly
# Date 1274381850 18000
# Node ID d1b0b4e203e9cb94c5bbfbfd9a35a6c74166ca0e
# Parent c70ff7f198876368c78c12966d947216ab52280f# Parent 9a387b0094c7241ba257bd67d49d46cec98a778e
merge commit
diff -r c70ff7f19887 -r d1b0b4e203e9 connectivity/com.nokia.carbide.remoteConnections/plugin.xml
--- a/connectivity/com.nokia.carbide.remoteConnections/plugin.xml Thu May 20 13:57:04 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/plugin.xml Thu May 20 13:57:30 2010 -0500
@@ -24,7 +24,7 @@
- The Symbian OS plug-ins for the Eclipse environment help provide support - for developers to create and build C++ programs that run on Symbian OS. -
-- The plug-ins provide the following support to Symbian OS developers: -
- -- Project Support: developers can create new Symbian OS - projects based on provided templates. Projects can also be - imported from the traditional bld.inf file formats. -
-- Build Support: The Symbian OS plug-ins eliminate the - need to use command line build tools to ease Symbian OS development. - Programs can be built and run from within the IDE. The developer can - also choose to build the binary automatically while saving the project. -
-- SDK Support: users of the Carbide.c++ IDE can use a predefined series of supported SDKs. Developers can choose which of their - installed SDKs to work with for a particular project.
-- Documentation is available in the C/C++ Development Toolkit User Guide (CDT) for the Symbian OS plug-ins that work with the C/C++ Development Toolkit (CDT). Programming for Symbian OS based platforms is described in the - documentation supplied with the development kit that you use. Please consult - that documentation for further information on Symbian OS concepts and - development processes.
- - - - + + + + + ++ The Symbian OS plug-ins for the Eclipse environment help provide support + for developers to create and build C++ programs that run on Symbian OS. +
++ The plug-ins provide the following support to Symbian OS developers: +
+ ++ Project Support: developers can create new Symbian OS + projects based on provided templates. Projects can also be + imported from the traditional bld.inf file formats. +
++ Build Support: The Symbian OS plug-ins eliminate the + need to use command line build tools to ease Symbian OS development. + Programs can be built and run from within the IDE. The developer can + also choose to build the binary automatically while saving the project. +
++ SDK Support: users of the Carbide.c++ IDE can use a predefined series of supported SDKs. Developers can choose which of their + installed SDKs to work with for a particular project.
++ Documentation is available in the C/C++ Development Toolkit User Guide (CDT) for the Symbian OS plug-ins that work with the C/C++ Development Toolkit (CDT). Programming for Symbian OS based platforms is described in the + documentation supplied with the development kit that you use. Please consult + that documentation for further information on Symbian OS concepts and + development processes.
+ + + + \ No newline at end of file diff -r c70ff7f19887 -r d1b0b4e203e9 core/com.nokia.carbide.cpp.doc.user/html/concepts/MBMDefWizard.html --- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/MBMDefWizard.html Thu May 20 13:57:04 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/MBMDefWizard.html Thu May 20 13:57:30 2010 -0500 @@ -1,66 +1,66 @@ - -- 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 - bitmaps without masks. It optimizes the bitmap handling capability of Symbian - OS. The MMP Editor (in Sources tab > Resources > Bitmaps) and Symbian Project Navigator view provide support for creating and editing MBM - files. In the Symbian Project Navigator view you can right-click on a scalable icon makefile (for example, Icons_scalable_dc.mk) and select Add MBM/MIF Entry... to open the Edit MBM/MIF Contents window.
-- The following information is required to add a bitmap without a mask: -
-- Color format : Specifies whether the bitmap is a gray - scale image or a color scale image. -
-- Color Depth: Specifies the color depth, if the bitmap is - a color scale image. -
-- Bitmap: This is the name of the bitmap file to add to - the MBM file. -
-- To add a bitmap with a mask, you will also need to specify: -
-- Mask Depth: Specifies the depth of the mask being - applied to the bitmap. -
-- Mask: The name of the bitmap file that is used to mask - the original bitmap. -
-+ 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 + bitmaps without masks. It optimizes the bitmap handling capability of Symbian + OS. The MMP Editor (in Sources tab > Resources > Bitmaps) and Symbian Project Navigator view provide support for creating and editing MBM + files. In the Symbian Project Navigator view you can right-click on a scalable icon makefile (for example, Icons_scalable_dc.mk) and select Add MBM/MIF Entry... to open the Edit MBM/MIF Contents window.
++ The following information is required to add a bitmap without a mask: +
++ Color format : Specifies whether the bitmap is a gray + scale image or a color scale image. +
++ Color Depth: Specifies the color depth, if the bitmap is + a color scale image. +
++ Bitmap: This is the name of the bitmap file to add to + the MBM file. +
++ To add a bitmap with a mask, you will also need to specify: +
++ Mask Depth: Specifies the depth of the mask being + applied to the bitmap. +
++ Mask: The name of the bitmap file that is used to mask + the original bitmap. +
+- This section explains the changes that can be done to an existing project - and the tools provided to make those changes. Once you have created a new - project or imported an existing project, you can make changes to that project. - The tools provided to support this task are specific to Symbian OS development - and are there to support the Symbian OS developers using the Eclipse IDE. -
-- The tools that are available to support modification of existing project - are: -
- - - - -+ This section explains the changes that can be done to an existing project + and the tools provided to make those changes. Once you have created a new + project or imported an existing project, you can make changes to that project. + The tools provided to support this task are specific to Symbian OS development + and are there to support the Symbian OS developers using the Eclipse IDE. +
++ The tools that are available to support modification of existing project + are: +
+ + + + +- This section of the User Guide provides conceptual overview about working - with different types of projects, including importing an .inf file, modifying - existing projects and accessing help. -
-+ This section of the User Guide provides conceptual overview about working + with different types of projects, including importing an .inf file, modifying + existing projects and accessing help. +
+The Carbide.c++ build system provides a wrapper around the standard Symbian OS build process utilizing component description files (bld.inf) and project definition files (.mmp files). Because the Carbide.++ build system provides a visual view into this system, it will be useful for new developers to the Symbian OS to become familiar with the basic Symbian OS build process. Further information on the Symbian OS build system can be found in the Symbian Developer Library under the Build Tools Guide and Build Tools Reference sections. If you are already familiar with the Symbian OS build system then you should feel right at home with the Carbide.c++ builder user interface.
-In Carbide.c++, as in the Symbian OS, a project is described by a bld.inf file. Hence, all projects must start with a bld.inf file. Carbide.c++ supports either building all components of a project (including extension makefiles) or only building selected sub-components. This gives the developer the granularity to either build all of a project’s dependencies or, if you are working on very large projects, only building a small sub-component of a larger project.
-There are several methods of invoking the Symbian OS build tools on a project or source file.
-NOTE The debugger has a setting under the Run/Debug > Launching preference page which performs a full build before the start of each debug session. If you prefer to do your own target build only you will want to turn the “Build (if required) before launching” setting off.
-The Carbide build system supports the use of command-line arguments for all stages of the build system. You can add these arguments in the Arguments pane of the -Carbide Build Configurations panel in the Properties for <project> window.
-For example, to generate a SYM file for UREL build you need to add the -debug argument to the abld makefile stage of the build process.
-Always refer to the Symbian Developer Library to learn which arguments are supported by the SDK used by the project.
-The Carbide.c++ build system provides a wrapper around the standard Symbian OS build process utilizing component description files (bld.inf) and project definition files (.mmp files). Because the Carbide.++ build system provides a visual view into this system, it will be useful for new developers to the Symbian OS to become familiar with the basic Symbian OS build process. Further information on the Symbian OS build system can be found in the Symbian Developer Library under the Build Tools Guide and Build Tools Reference sections. If you are already familiar with the Symbian OS build system then you should feel right at home with the Carbide.c++ builder user interface.
+In Carbide.c++, as in the Symbian OS, a project is described by a bld.inf file. Hence, all projects must start with a bld.inf file. Carbide.c++ supports either building all components of a project (including extension makefiles) or only building selected sub-components. This gives the developer the granularity to either build all of a project’s dependencies or, if you are working on very large projects, only building a small sub-component of a larger project.
+There are several methods of invoking the Symbian OS build tools on a project or source file.
+NOTE The debugger has a setting under the Run/Debug > Launching preference page which performs a full build before the start of each debug session. If you prefer to do your own target build only you will want to turn the “Build (if required) before launching” setting off.
+The Carbide build system supports the use of command-line arguments for all stages of the build system. You can add these arguments in the Arguments pane of the +Carbide Build Configurations panel in the Properties for <project> window.
+For example, to generate a SYM file for UREL build you need to add the -debug argument to the abld makefile stage of the build process.
+Always refer to the Symbian Developer Library to learn which arguments are supported by the SDK used by the project.
+Carbide.c++ supports the Concurrent Versions System (CVS) for immediate version control support. Other revision systems are also supported but require the downloading of an Eclipse plug-in to add that feature to Carbide. Visit the eclipse.org or eclipse-plugins.2y.net sites to locate the plug-ins you need.
-For more informaton on using CVS within Carbide, see the Workbench User Guide > Concepts > Team programming with CVS.
-Carbide.c++ supports the Concurrent Versions System (CVS) for immediate version control support. Other revision systems are also supported but require the downloading of an Eclipse plug-in to add that feature to Carbide. Visit the eclipse.org or eclipse-plugins.2y.net sites to locate the plug-ins you need.
+For more informaton on using CVS within Carbide, see the Workbench User Guide > Concepts > Team programming with CVS.
+Data Viewers are plug-ins that include an user interface to show a custom view of data. These plug-ins are often platform specific. Data editors are data viewers that also let you modify and write data.
-The IDE will keep a registry of plug-ins that can view particular types. The plug-ins will register themselves with the IDE and indicate which formats and platforms they support. When a variable or memory address is selected, you can choose the plugin from the Data menu.
-A Data Viewer plugin may also be designed without a custom user interface. This type of viewer would override the built in debugger methods of showing a variable value as text and parsing an edited value back into variable data.
- - - - + + + + + + +Data Viewers are plug-ins that include an user interface to show a custom view of data. These plug-ins are often platform specific. Data editors are data viewers that also let you modify and write data.
+The IDE will keep a registry of plug-ins that can view particular types. The plug-ins will register themselves with the IDE and indicate which formats and platforms they support. When a variable or memory address is selected, you can choose the plugin from the Data menu.
+A Data Viewer plugin may also be designed without a custom user interface. This type of viewer would override the built in debugger methods of showing a variable value as text and parsing an edited value back into variable data.
+ + + + diff -r c70ff7f19887 -r d1b0b4e203e9 core/com.nokia.carbide.cpp.doc.user/html/concepts/debugger_about.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/debugger_about.htm Thu May 20 13:57:04 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/debugger_about.htm Thu May 20 13:57:30 2010 -0500 @@ -43,7 +43,7 @@