# HG changeset patch
# User fturovic
# Date 1246476036 18000
# Node ID 7c83019e19b85a4401d793047f40fbb4b78aaee6
# Parent d31a66f9880b482917ecba68d4e9488581fdaf4c# Parent b5a4b8b0b869dde799a530d2642b991f822ef0eb
merge
diff -r b5a4b8b0b869 -r 7c83019e19b8 core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_debug_dialogs_help.xml
--- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_debug_dialogs_help.xml Wed Jul 01 11:34:30 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_debug_dialogs_help.xml Wed Jul 01 14:20:36 2009 -0500
@@ -1,379 +1,379 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Carbide.c++ global debugger settings
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Use the Symbian OS Data view to view processes, threads, chunks, and library information
-
-
-
-
-
-
-
- The Overview pane displays kernel objects by their heirarchical owner relationship
-
-
-
-
-
-
-
- The Processes pane lists processes in the target's Symbian OS
-
-
-
-
-
-
-
- The Threads pane lists threads in the target's Symbian OS
-
-
-
-
-
-
-
- The Chunks pane lists chunks in the target's Symbian OS
-
-
-
-
-
-
-
- The Libraries pane lists libraries in the target's Symbian OS
-
-
-
-
-
-
-
-
-
-
-
-
-
- Control which executables are included in the debug process.
-
-
-
-
-
-
-
-
-
-
- Define the project's launch configuration.
-
-
-
-
-
-
- Define the project's launch configuration.
-
-
-
-
-
-
- Control symbolics loading and other debugger options.
-
-
-
-
-
-
- Control the exceptions the debugger should catch.
-
-
-
-
-
-
-
-
-
-
-
- Create an Attach to Process launch configuration.
-
-
-
-
-
-
- Attaching to a process on the target device.
-
-
-
-
-
-
-
-
-
-
-
-
- Control symbolics loading and other debugger options.
-
-
-
-
- S
-
-
-
- Control entry points, message handling, and instruction set default settings.
-
-
-
-
-
-
-
-
- Specify the method used to transfer files to the target device.
-
-
-
-
-
-
-
-
- Specify the .sis file to install on the target device.
-
-
-
-
-
-
-
-
- Manage the files transfered to the target device at the start of each launch.
-
-
-
-
-
-
-
-
- Select additional files for addition to the file transfer list.
-
-
-
-
-
-
-
-
-
-
-
-
-
- Control symbolics loading and other debugger options.
-
-
-
-
-
-
-
- Control entry points, message handling, and instruction set default settings.
-
-
-
-
-
-
-
- Specify the settings for Trace32 debugging.
-
-
-
-
-
-
-
- Specify the settings for Sophia debugging.
-
-
-
-
-
-
-
-
- Specify the ROM image details.
-
-
-
-
-
-
- Specify the ROM Log file details.
-
-
-
-
-
-
-
-
-
-
-
-
- Select the target device category.
-
-
-
-
-
- Control which executables are included in the debug process.
-
-
-
-
-
- Select a launch type to create a launch configuration.
-
-
-
-
-
-
-
- Review launch configuration information.
-
-
-
-
-
- Specify Sophia configuration information.
-
-
-
-
-
- Specify Trace32 configuration information.
-
-
-
-
-
- Specify TRK connection information.
-
-
-
-
-
- Specify TRK SIS connection information.
-
-
-
-
-
- Specify ROM image information.
-
-
-
-
-
-
- Define startup options and ROM image download information.
-
-
-
-
-
-
- Specify the SIS file to install.
-
-
-
-
-
-
- Specify SIS information.
-
-
-
-
-
- Learn how to connect to a device using Bluetooth.
-
-
-
-
-
- Learn how to connect to a device using USB.
-
-
-
-
-
- Connect and verify the version of TRK on the device.
-
-
-
-
-
- Download and install the latest TRK to the device.
-
-
-
-
-
-
-
- Select how auto build applies to this launch configuration.
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Carbide.c++ global debugger settings
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Use the Symbian OS Data view to view processes, threads, chunks, and library information
+
+
+
+
+
+
+
+ The Overview pane displays kernel objects by their heirarchical owner relationship
+
+
+
+
+
+
+
+ The Processes pane lists processes in the target's Symbian OS
+
+
+
+
+
+
+
+ The Threads pane lists threads in the target's Symbian OS
+
+
+
+
+
+
+
+ The Chunks pane lists chunks in the target's Symbian OS
+
+
+
+
+
+
+
+ The Libraries pane lists libraries in the target's Symbian OS
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Control which executables are included in the debug process.
+
+
+
+
+
+
+
+
+
+
+ Define the project's launch configuration.
+
+
+
+
+
+
+ Define the project's launch configuration.
+
+
+
+
+
+
+ Control symbolics loading and other debugger options.
+
+
+
+
+
+
+ Control the exceptions the debugger should catch.
+
+
+
+
+
+
+
+
+
+
+
+ Create an Attach to Process launch configuration.
+
+
+
+
+
+
+ Attaching to a process on the target device.
+
+
+
+
+
+
+
+
+
+
+
+
+ Control symbolics loading and other debugger options.
+
+
+
+
+ S
+
+
+
+ Control entry points, message handling, and instruction set default settings.
+
+
+
+
+
+
+
+
+ Specify the method used to transfer files to the target device.
+
+
+
+
+
+
+
+
+ Specify the .sis file to install on the target device.
+
+
+
+
+
+
+
+
+ Manage the files transfered to the target device at the start of each launch.
+
+
+
+
+
+
+
+
+ Select additional files for addition to the file transfer list.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Control symbolics loading and other debugger options.
+
+
+
+
+
+
+
+ Control entry points, message handling, and instruction set default settings.
+
+
+
+
+
+
+
+ Specify the settings for Trace32 debugging.
+
+
+
+
+
+
+
+ Specify the settings for Sophia debugging.
+
+
+
+
+
+
+
+
+ Specify the ROM image details.
+
+
+
+
+
+
+ Specify the ROM Log file details.
+
+
+
+
+
+
+
+
+
+
+
+
+ Control which executables are included in the debug process.
+
+
+
+
+
+ Select a launch type to create a launch configuration.
+
+
+
+
+
+
+
+ Review launch configuration information.
+
+
+
+
+
+ Specify Sophia configuration information.
+
+
+
+
+
+ Specify Trace32 configuration information.
+
+
+
+
+
+ Specify TRK connection information.
+
+
+
+
+
+ Specify TRK SIS connection information.
+
+
+
+
+
+ Specify ROM image information.
+
+
+
+
+
+
+ Define startup options and ROM image download information.
+
+
+
+
+
+
+ Specify the SIS file to install.
+
+
+
+
+
+
+ Specify SIS information.
+
+
+
+
+
+ Learn how to connect to a device using Bluetooth.
+
+
+
+
+
+ Learn how to connect to a device using USB.
+
+
+
+
+
+ Connect and verify the version of TRK on the device.
+
+
+
+
+
+ Download and install the latest TRK to the device.
+
+
+
+
+
+
+ Select the target device category.
+
+
+
+
+
+
+ Select how auto build applies to this launch configuration.
+
+
+
+
+
diff -r b5a4b8b0b869 -r 7c83019e19b8 core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/setup.html
--- a/core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/setup.html Wed Jul 01 11:34:30 2009 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/setup.html Wed Jul 01 14:20:36 2009 -0500
@@ -45,11 +45,8 @@
New versions of the Developer Library plug-in are published regularly.
You can configure Hover Help to use a new version as follows:
- -
-
-
- Obtain the latest Developer Library plug-in from the
- Symbian Foundation website,
+
- Obtain the latest Developer Library plug-in from the
+ Forum Nokia > Symbian/C++ Documentation website,
and copy the new plug-in into Carbide’s
plugins
directory.
NOTE If you experience problems connecting to the site, verify that the connection settings are correct in the Network Connections preference panel before trying again. This is especially important if a proxy setting is required to connect to the internet.
@@ -58,19 +55,16 @@
-
- Restart Carbide.
-
-
+ Restart Carbide.
-
- From the Window > Preferences > Carbide.c++ > Hover Help preferences panel, make sure the new added Developer Library
- is selected. If not, select it from the Developer Libraries drop-down box.
-
-
+ From the Window > Preferences > Carbide.c++ > Hover Help preferences panel, make sure the added Developer Library
+ is selected. If not, select it from the Developer Libraries drop-down box.
-
+
+
Activating Hover Help
diff -r b5a4b8b0b869 -r 7c83019e19b8 core/com.nokia.carbide.cpp/themes/carbide/graphics/icons/obj48/new_obj.gif
Binary file core/com.nokia.carbide.cpp/themes/carbide/graphics/icons/obj48/new_obj.gif has changed
diff -r b5a4b8b0b869 -r 7c83019e19b8 core/com.nokia.carbide.cpp/themes/carbide/graphics/icons/obj48/newhov_obj.gif
Binary file core/com.nokia.carbide.cpp/themes/carbide/graphics/icons/obj48/newhov_obj.gif has changed
diff -r b5a4b8b0b869 -r 7c83019e19b8 core/com.nokia.carbide.cpp/themes/carbide/html/shared.css
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/shared.css Wed Jul 01 11:34:30 2009 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/shared.css Wed Jul 01 14:20:36 2009 -0500
@@ -12,12 +12,12 @@
/*
* Set up general fonts, sizes and colors
*/
-body { font-family : Helvetica, sans-serif; }
+body { font-family : Verdana, Helvetica, sans-serif; }
H1, H2, H3, H4, p, a { color : #0A94D6; }
.intro-header H1 {
- font-family: Helvetica, sans-serif;
+ font-family: Verdana, Helvetica, sans-serif;
font-size: 20px;
color: #0A94D6;
}
@@ -25,7 +25,7 @@
h2 {
font-size : 13pt;
font-weight : normal;
- color : #333333;
+ color : #EEEEEE;
}
/* For regular div labels */
H4 .div-label {
@@ -44,8 +44,8 @@
/* For the main page content's title */
#content-header H4 .div-label {
font-size : 14pt;
- font-weight : normal;
- color : #333333;
+ font-weight : bold;
+ color : #0A94D6;
float : none;
clear : both;
}
@@ -75,7 +75,7 @@
#navigation-links a .link-label {
font-size : 9pt;
font-weight : normal;
- color : #00A1D0;
+ color : #0A94D6;
}
a .text {
@@ -357,7 +357,9 @@
vertical-align : middle;
}
+/* Controls link titles on welcome page */
#page-content * a .link-label {
+ font-weight : bold;
display : block;
position : relative;
top : -50px;
@@ -367,6 +369,7 @@
#page-content * a > .link-label { left: 65px; }
+/* Controls text description 0n welcome page */
#page-content * a p .text {
display : block;
position : relative;
@@ -374,6 +377,7 @@
margin-bottom: -25px;
left : 53px;
margin-right: 53px;
+ color: #000;
}
#page-content * a p > .text { left: 58px; }
@@ -396,7 +400,7 @@
float : none;
clear : both;
text-align : left;
- color: #0A94D6;
+ /* color: #000000; */
/* Carbide branding mod
margin-bottom : 0px;
/* background-image : url(../graphics/contentpage/page-link-wide.gif); */