# HG changeset patch # User fturovic <frank.turovich@nokia.com> # Date 1280432498 18000 # Node ID 90bba933bb36c215db208231a49525364411773c # Parent b386036cfe5d88af7622f8f0f3dea8b5e1d4b9e7 added views overview and modified css file colors diff -r b386036cfe5d -r 90bba933bb36 core/com.nokia.carbide.cpp.doc.user/html/concepts/CarbidePerspective.html --- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/CarbidePerspective.html Thu Jul 29 13:33:19 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/CarbidePerspective.html Thu Jul 29 14:41:38 2010 -0500 @@ -13,15 +13,15 @@ <li><a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view - shows all files that belong to the current build configuration </li> <li><a href="../hints_tips.htm">Editor</a> view - one or more source code editor windows </li> - <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm">Outline</a> view - displays an outline of a structured C/C++ file that is currently open in the editor view </li> - <li><a href="../reference/view_install_extensions.htm">Install Extensions</a> view - displays a list of installable plug-ins</li> + <li><a href="../reference/view_carbide_portal.htm">Carbide Portals</a> editor - provides Carbide news, release information, additional extensions, and support options</li> + <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm">Outline</a> view - displays an outline of a structured C/C++ file that is currently open in the editor view </li> <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_problems_view.htm">Problems</a> view - displays build errors </li> <li><a href="../reference/view_console.htm">Console</a> view - shows the output of a process and allows you to provide keyboard input to a process</li> <li><a href="../reference/view_executables.htm">Executables</a> view - provides a dynamic list of executables and their related source files</li> <li><a href="../reference/trk/view_remote_connection.htm">Remote Connections</a> view – use to monitor, create, edit, or remove common connection settings</li> </ul> - <p align="center"><img src="images/workbench.png" width="1028" height="789" /></p> + <p align="center"><img src="images/workbench.png" width="1028" height="789" /></p> <p class="figure">Figure 1 - Carbide C/C++ perspective </p> <p class="note"><b>NOTE</b> Click the <img src="../images/icons/double_arrow_icon.png" width="12" height="9" align="absmiddle" /> icon to show additional options that may not be visible in the perspective view.</p> <p>For more information on perspectives see <b>Workbench User Guide > Concepts > <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/concepts/concepts-4.htm">Perspectives</a></b>, and for views see <b>C/C++ Development User Guide > Reference diff -r b386036cfe5d -r 90bba933bb36 core/com.nokia.carbide.cpp.doc.user/html/reference/view_disassembly.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_disassembly.htm Thu Jul 29 13:33:19 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_disassembly.htm Thu Jul 29 14:41:38 2010 -0500 @@ -99,7 +99,7 @@ <td>Select this option to open the <b>Breakpoint Properties</b> dialog. </td> </tr> </table> -<p class="figure"><img src="images/view_disassm_breakpoint.png" width="785" height="202" alt="" /></p> +<p class="figure"><img src="images/view_disassm_breakpoint.png" width="506" height="172" alt="" /></p> <p class="figure">Figure 3 - Setting Breakpoints in the Disassembly view </p> <div class="step"> <h4>Opening the Disassembly view </h4> diff -r b386036cfe5d -r 90bba933bb36 core/com.nokia.carbide.cpp.doc.user/html/reference/views_overview.htm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/views_overview.htm Thu Jul 29 14:41:38 2010 -0500 @@ -0,0 +1,38 @@ +<!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>Carbide Views</title> +<link rel="StyleSheet" href="../../book.css" type="text/css"/> +</head> +<body bgcolor="#FFFFFF"> +<h2>Carbide Views</h2> +<p> Here are all the views available within the Carbide IDE and debugging environments.</p> +<h4>Carbide C/++ perspective views:</h4> +<ul> + <li><a href="view_carbide_portal.htm">Carbide Portal</a> view</li> + <li><a href="view_executables.htm">Executables</a> view</li> + <li><a href="view_proj_explorer.htm">Project Explorer </a>view</li> + <li><a href="trk/view_remote_connection.htm">Remote Connections</a> view</li> + <li><a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> view</li> +</ul> +<h4>Debug perspective views:</h4> +<ul> + <li><a href="view_breakpoints.htm">Breakpoints</a> view</li> + <li><a href="view_console.htm">Console</a> view</li> + <li><a href="../debugger/debug/viewing_debug.htm">Debug</a> view</li> + <li><a href="view_disassembly.htm">Disassembly</a> view</li> + <li><a href="view_expressions.htm">Expressions</a> view</li> + <li><a href="view_memory.htm">Memory</a> view</li> + <li><a href="view_module.htm">Modules</a> view</li> + <li><a href="view_registers.htm">Registers</a> view</li> + <li><a href="view_symbian_kernel.htm">Symbian OS Data</a> view</li> + <li><a href="view_signals.htm">Signels</a> view</li> + <li><a href="view_variables.htm">Variables</a> view</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> diff -r b386036cfe5d -r 90bba933bb36 core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml --- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Thu Jul 29 13:33:19 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Thu Jul 29 14:41:38 2010 -0500 @@ -57,7 +57,7 @@ <topic label="Toggle HW Breakpoint" href="html/reference/menus/hardware_breakpoints.htm" /> <topic label="Update Projects" href="html/reference/olderproject_updater.html" /> </topic> - <topic label="Carbide views" > + <topic label="Carbide views" href="html/reference/view_overview.htm" > <topic label="BreakPoints view" href="html/reference/view_breakpoints.htm" /> <topic label="Carbide Portal" href="html/reference/view_carbide_portal.htm" > <topic label="Installing Extensions" href="html/tasks/installing_extensions.htm" /> diff -r b386036cfe5d -r 90bba933bb36 core/com.nokia.carbide.cpp/build.properties --- a/core/com.nokia.carbide.cpp/build.properties Thu Jul 29 13:33:19 2010 -0500 +++ b/core/com.nokia.carbide.cpp/build.properties Thu Jul 29 14:41:38 2010 -0500 @@ -1,43 +1,41 @@ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml,\ - icons/,\ - plugin.properties,\ - plugin_customization.ini,\ - plugin_customization.properties,\ - splash.bmp,\ - intro/,\ - about.ini,\ - about.html,\ - about.mappings,\ - about.properties,\ - carbide.css,\ - src/,\ - html/,\ - nokiaTOC.xml,\ - introDATA.xml,\ - themes/,\ - book.css,\ - component.xml -src.includes = META-INF/,\ - about.html,\ - about.ini,\ - about.mappings,\ - about.properties,\ - carbide.css,\ - html/,\ - icons/,\ - nokiaTOC.xml,\ - plugin.properties,\ - plugin.xml,\ - plugin_customization.ini,\ - plugin_customization.properties,\ - splash.bmp,\ - src/com/nokia/carbide/cpp/ProductPlugin.java,\ - intro/,\ - introDATA.xml,\ - themes/,\ - book.css -source.. = src/ -bin.excludes = src/com/nokia/carbide/cpp/cs/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.xml,\ + icons/,\ + plugin.properties,\ + plugin_customization.ini,\ + plugin_customization.properties,\ + splash.bmp,\ + intro/,\ + about.ini,\ + about.html,\ + about.mappings,\ + about.properties,\ + carbide.css,\ + src/,\ + html/,\ + nokiaTOC.xml,\ + introDATA.xml,\ + book.css,\ + component.xml +src.includes = META-INF/,\ + about.html,\ + about.ini,\ + about.mappings,\ + about.properties,\ + carbide.css,\ + html/,\ + icons/,\ + nokiaTOC.xml,\ + plugin.properties,\ + plugin.xml,\ + plugin_customization.ini,\ + plugin_customization.properties,\ + splash.bmp,\ + src/com/nokia/carbide/cpp/ProductPlugin.java,\ + intro/,\ + introDATA.xml,\ + book.css +source.. = src/ +bin.excludes = src/com/nokia/carbide/cpp/cs/ diff -r b386036cfe5d -r 90bba933bb36 core/com.nokia.carbide.cpp/carbide.css --- a/core/com.nokia.carbide.cpp/carbide.css Thu Jul 29 13:33:19 2010 -0500 +++ b/core/com.nokia.carbide.cpp/carbide.css Thu Jul 29 14:41:38 2010 -0500 @@ -6,14 +6,14 @@ body { font-family: Verdana, Helvetica, sans-serif; - color: #000000; + color: #5B6B74; margin:20px; } .intro-header h1 { font-family: Verdana, Helvetica, sans-serif; font-size: 20px; - color: #00A1D0; + color: #5B6B74; } .bgbox { background-image: url(images/whitebg.gif); background-repeat: repeat} diff -r b386036cfe5d -r 90bba933bb36 core/com.nokia.carbide.cpp/intro/css/root.css --- a/core/com.nokia.carbide.cpp/intro/css/root.css Thu Jul 29 13:33:19 2010 -0500 +++ b/core/com.nokia.carbide.cpp/intro/css/root.css Thu Jul 29 14:41:38 2010 -0500 @@ -1,187 +1,249 @@ -/* - * Set up general font colours, sizes, etc. Some of these will override - * settings from the shared CSS - */ -.intro-header H1 { - font-family: Arial, Helvetica, sans-serif; - font-size: 20px; - color: #00A1D0; -/* font-size : 18pt; */ -} -#page-links a .link-label, #action-links a .link-label { - font-size : 13pt; font-weight : 600; color : #1B1B1B; -} -#page-links a p .text, #action-links a p .text { - font-size : 13pt; font-weight : 500; color : #1B1B1B; -} -/* - * Set up the content for the root page. - */ -body { - min-width : 770px; /* since IE doesn't support min-width, use expression */ - width:expression(document.body.clientWidth < 770? "770px": "auto" ); /* swapped Eclipse background image for Carbide version */ - background-image : url(graphics/rootpage/background_carbide.jpg); background-repeat : no-repeat; background-position : top left; background-color : #CCC; -} -#root { - /* Carbide branding mod */ - /* swapped Eclipse background image for Carbide version */ - /* background-image : url(graphics/rootpage/brandmark.gif); */ /* background-image : url(graphics/rootpage/brandmark.png); */ - background-repeat : no-repeat; background-position : bottom left; min-height : 450px; height : 100%; height : expression(document.body.clientHeight < 450? "450px": "100%" ); -} -/* - * Set up the navigation bar. It should be centered in the middle - * of the page - */ -#links-background { - /* removed dot graphic that ran across page! */ - width : 100%; height : 177px; margin-top : 18%; margin-bottom : auto; text-align : center; -} -/* specify a width for Moz so we can center. - * **Important** If additional links are added, we will have to increase this width - * to accomodate them, otherwise they will wrap to a new line - */ -#links-background > #page-links { - width : 33em; margin : 0 auto; -} -#page-links { - position : relative; top : 50px; -} -#page-links a { - position : relative; width : 86px; margin-left : 1em; margin-right : 1em; text-align : center; vertical-align : top; -} -/* float left for Moz so the items all appear inline */ -#page-links > a { - float : left; position : relative; -} -#page-links a img { - height : 72px; /* was 82 */ width : 72px; /* was 82 */ vertical-align : middle; -} -/* remove the hover image from the flow of the document, - so it doesn't take up space and change the position - of the link label and descriptions */ -#page-links a .background-image { - position : absolute; -} -/* properly align the link label and text based on class (left vs. right) */ -#page-links a:hover { - /* This is needed for IE to force the hover pseudo selectors below to work.*/ padding : 0 em; -} -/* Hide both the label and the description of the link and remove them from static HTML flow, until user hovers over link */ -/* First, set the width of both the label and the description to a max of 15 em. */ -/* This can be changed when translated to different country locals. */ -#page-links a span { - width : 16em; } -/* Set up left links orientation first. */ -#page-links a.left:link .link-label, -#page-links a.left:visited .link-label { - display: none; -} -#page-links a.left:hover .link-label, -#page-links a.left:focus .link-label, -#page-links a.left:active .link-label { - text-align: left; display: block; position: absolute; top : 120 %; left : 0; -} -/* hide description and remove it from static HTML flow, until user hovers over link */ -#page-links a.left:link .text, -#page-links a.left:visited .text { - display: none; -} -#page-links a.left:hover .text, -#page-links a.left:focus .text, -#page-links a.left:active .text { - text-align: left; display: block; position: absolute; left : 0; top: 145%; -} -/* Set up right links orientation now. */ -#page-links a.right:link .link-label, -#page-links a.right:visited .link-label { - display: none; -} -#page-links a.right:hover .link-label, -#page-links a.right:focus .link-label, -#page-links a.right:active .link-label { - text-align: right; display: block; position: absolute; top : 120 %; right : 0; -} -/* hide description and remove it from static HTML flow, until user hovers over link */ -#page-links a.right:link .text, -#page-links a.right:visited .text { - display: none; -} -#page-links a.right:hover .text, -#page-links a.right:focus .text, -#page-links a.right:active .text { - text-align: right; display: block; position: absolute; right : 0; top: 145%; -} -/* properties for each of the page-links */ -a#overview .background-image { - background-image : url(graphics/icons/ctool/overview72.gif); visibility : hidden; -} -a#tutorials .background-image { - background-image : url(graphics/icons/ctool/tutorials72.gif); visibility : hidden; -} -a#samples .background-image { - background-image : url(graphics/icons/ctool/samples72.gif); visibility : hidden; -} -a#news .background-image { - background-image : url(graphics/icons/ctool/whatsnew72.gif); visibility : hidden; -} -/* show the hover image on hover, focus, and active */ -#page-links a:hover .background-image, -#page-links a:focus .background-image, -#page-links a:active .background-image { - visibility : visible; -} -/* - * Set up the action links - */ -#action-links { - width : 98%; position : absolute; left : 0px; top : 20px; -} -#action-links a#workbench { - position : absolute; top : -16px; right : -8px; text-align : right; -} -#action-links a .background-image, -#action-links a #workbench_img { - height : 53px; width : 53px; text-align : center; vertical-align : top; -} -/* special case for mozilla */ -#action-links a > .background-image, -#action-links a > #workbench_img { - vertical-align : middle; -} -/* remove the hover image from the flow of the document, - so it doesn't take up space and change the position - of the main image */ -#action-links a .background-image { - position : absolute; -} -#action-links a#workbench .background-image { - background-image : url(graphics/icons/ctool/wb48.gif); visibility : hidden; -} -#action-links a#workbench:hover .background-image, -#action-links a#workbench:focus .background-image, -#action-links a#workbench:active .background-image { - visibility : visible; - position: absolute; - top: 0px; - right: 0px; -} -/* hide the link and description until users hover over the link */ -#action-links a p .text, #action-links a .link-label { - display : none; -} -#action-links a:hover .link-label, -#action-links a:focus .link-label, -#action-links a:active .link-label { - display : block; width : 16em; - margin-left : 10px; -} -#action-links a:hover p .text, -#action-links a:focus p .text, -#action-links a:active p .text { - display : block; width : 16em; -} -#action-links a:hover, -#action-links a:focus, -#action-links a:active { - border : 0px; -} +/* + * Set up general font colours, sizes, etc. Some of these will override + * settings from the shared CSS + */ +.intro-header H1 { + font-family: Arial, Helvetica, sans-serif; + font-size: 20px; + color: #5B6B74; +/* font-size : 18pt; */ +} +#page-links a .link-label, #action-links a .link-label { + font-size : 13pt; + font-weight : 600; + color : #5B6B74; +} +#page-links a p .text, #action-links a p .text { + font-size : 13pt; + font-weight : 500; + color : #5B6B74; +} +/* + * Set up the content for the root page. + */ +body { + min-width : 770px; + /* since IE doesn't support min-width, use expression */ + width:expression(document.body.clientWidth < 770? "770px": "auto" ); + /* swapped Eclipse background image for Carbide version */ + background-image : url(graphics/rootpage/background_carbide.jpg); + background-repeat : no-repeat; + background-position : top left; + background-color : #CCC; +} +#root { + /* Carbide branding mod */ + /* swapped Eclipse background image for Carbide version */ + /* background-image : url(graphics/rootpage/brandmark.gif); */ + /* background-image : url(graphics/rootpage/brandmark.png); */ + background-repeat : no-repeat; + background-position : bottom left; + min-height : 450px; + height : 100%; + height : expression(document.body.clientHeight < 450? "450px": "100%" ); +} +/* + * Set up the navigation bar. It should be centered in the middle + * of the page + */ +#links-background { + /* removed dot graphic that ran across page! */ + width : 100%; + height : 177px; + margin-top : 18%; + margin-bottom : auto; + text-align : center; +} +/* specify a width for Moz so we can center. + * **Important** If additional links are added, we will have to increase this width + * to accomodate them, otherwise they will wrap to a new line + */ +#links-background > #page-links { + width : 33em; + margin : 0 auto; +} +#page-links { + position : relative; + top : 50px; +} +#page-links a { + position : relative; + width : 86px; + margin-left : 1em; + margin-right : 1em; + text-align : center; + vertical-align : top; +} +/* float left for Moz so the items all appear inline */ +#page-links > a { + float : left; + position : relative; +} +#page-links a img { + height : 72px; /* was 82 */ + width : 72px; /* was 82 */ + vertical-align : middle; +} +/* remove the hover image from the flow of the document, + so it doesn't take up space and change the position + of the link label and descriptions */ +#page-links a .background-image { + position : absolute; +} +/* properly align the link label and text based on class (left vs. right) */ +#page-links a:hover { + /* This is needed for IE to force the hover pseudo selectors below to work.*/ + padding : 0 em; +} +/* Hide both the label and the description of the link and remove them from static HTML flow, until user hovers over link */ +/* First, set the width of both the label and the description to a max of 15 em. */ +/* This can be changed when translated to different country locals. */ +#page-links a span { + width : 16em; +} +/* Set up left links orientation first. */ +#page-links a.left:link .link-label, +#page-links a.left:visited .link-label { + display: none; +} +#page-links a.left:hover .link-label, +#page-links a.left:focus .link-label, +#page-links a.left:active .link-label { + text-align: left; + display: block; + position: absolute; + top : 120 %; + left : 0; +} +/* hide description and remove it from static HTML flow, until user hovers over link */ +#page-links a.left:link .text, +#page-links a.left:visited .text { + display: none; +} +#page-links a.left:hover .text, +#page-links a.left:focus .text, +#page-links a.left:active .text { + text-align: left; + display: block; + position: absolute; + left : 0; + top: 145%; +} +/* Set up right links orientation now. */ +#page-links a.right:link .link-label, +#page-links a.right:visited .link-label { + display: none; +} +#page-links a.right:hover .link-label, +#page-links a.right:focus .link-label, +#page-links a.right:active .link-label { + text-align: right; + display: block; + position: absolute; + top : 120 %; + right : 0; +} +/* hide description and remove it from static HTML flow, until user hovers over link */ +#page-links a.right:link .text, +#page-links a.right:visited .text { + display: none; +} +#page-links a.right:hover .text, +#page-links a.right:focus .text, +#page-links a.right:active .text { + text-align: right; + display: block; + position: absolute; + right : 0; + top: 145%; +} +/* properties for each of the page-links */ +a#overview .background-image { + background-image : url(graphics/icons/ctool/overview72.gif); + visibility : hidden; +} +a#tutorials .background-image { + background-image : url(graphics/icons/ctool/tutorials72.gif); + visibility : hidden; +} +a#samples .background-image { + background-image : url(graphics/icons/ctool/samples72.gif); + visibility : hidden; +} +a#news .background-image { + background-image : url(graphics/icons/ctool/whatsnew72.gif); + visibility : hidden; +} +/* show the hover image on hover, focus, and active */ +#page-links a:hover .background-image, +#page-links a:focus .background-image, +#page-links a:active .background-image { + visibility : visible; +} +/* + * Set up the action links + */ +#action-links { + width : 98%; + position : absolute; + left : 0px; + top : 20px; +} +#action-links a#workbench { + position : absolute; + top : -16px; + right : -8px; + text-align : right; +} +#action-links a .background-image, +#action-links a #workbench_img { + height : 53px; + width : 53px; + text-align : center; + vertical-align : top; +} +/* special case for mozilla */ +#action-links a > .background-image, +#action-links a > #workbench_img { + vertical-align : middle; +} +/* remove the hover image from the flow of the document, + so it doesn't take up space and change the position + of the main image */ +#action-links a .background-image { + position : absolute; +} +#action-links a#workbench .background-image { + background-image : url(graphics/icons/ctool/wb48.gif); + visibility : hidden; +} +#action-links a#workbench:hover .background-image, +#action-links a#workbench:focus .background-image, +#action-links a#workbench:active .background-image { + visibility : visible; + position: absolute; + top: 0px; + right: 0px; +} +/* hide the link and description until users hover over the link */ +#action-links a p .text, #action-links a .link-label { + display : none; +} +#action-links a:hover .link-label, +#action-links a:focus .link-label, +#action-links a:active .link-label { + display : block; + width : 16em; + margin-left : 10px; +} +#action-links a:hover p .text, +#action-links a:focus p .text, +#action-links a:active p .text { + display : block; + width : 16em; +} +#action-links a:hover, +#action-links a:focus, +#action-links a:active { + border : 0px; +} diff -r b386036cfe5d -r 90bba933bb36 core/com.nokia.carbide.cpp/intro/css/root_swt.properties --- a/core/com.nokia.carbide.cpp/intro/css/root_swt.properties Thu Jul 29 13:33:19 2010 -0500 +++ b/core/com.nokia.carbide.cpp/intro/css/root_swt.properties Thu Jul 29 14:41:38 2010 -0500 @@ -1,35 +1,35 @@ -# -# intro/css/root_swt.properties -# -root.links-background.page-links.overview.link-icon = intro/css/graphics/icons/etool/overview72.gif -root.links-background.page-links.tutorials.link-icon = intro/css/graphics/icons/etool/tutorials72.gif -root.links-background.page-links.samples.link-icon= intro/css/graphics/icons/etool/samples72.gif -root.links-background.page-links.news.link-icon = intro/css/graphics/icons/etool/whatsnew72.gif -root.action-links.workbench.link-icon = intro/css/graphics/icons/etool/wb48.gif - -root.links-background.page-links.overview.hover-icon = intro/css/graphics/icons/ctool/overview72.gif -root.links-background.page-links.tutorials.hover-icon = intro/css/graphics/icons/ctool/tutorials72.gif -root.links-background.page-links.samples.hover-icon = intro/css/graphics/icons/ctool/samples72.gif -root.links-background.page-links.news.hover-icon = intro/css/graphics/icons/ctool/whatsnew72.gif -root.action-links.workbench.hover-icon = intro/css/graphics/icons/ctool/wb48.gif - - -root.links-background.page-links.overview.small-link-icon = intro/css/graphics/icons/etool/overview48.gif -root.links-background.page-links.tutorials.small-link-icon = intro/css/graphics/icons/etool/tutorials48.gif -root.links-background.page-links.samples.small-link-icon = intro/css/graphics/icons/etool/samples48.gif -root.links-background.page-links.news.small-link-icon = intro/css/graphics/icons/etool/whatsnew48.gif -root.action-links.workbench.small-link-icon = intro/css/graphics/icons/etool/wb48.gif - -root.links-background.page-links.overview.small-hover-icon = intro/css/graphics/icons/ctool/overview48.gif -root.links-background.page-links.tutorials.small-hover-icon = intro/css/graphics/icons/ctool/tutorials48.gif -root.links-background.page-links.samples.small-hover-icon = intro/css/graphics/icons/ctool/samples48.gif -root.links-background.page-links.news.small-hover-icon = intro/css/graphics/icons/ctool/whatsnew48.gif -root.action-links.workbench.small-hover-icon = intro/css/graphics/icons/ctool/wb48.gif - -# added generic carbide icon to set -root.links-background.page-links.carbide.link-icon = icons/brandmark_cpp.gif -root.links-background.page-links.carbide.hover-icon = icons/brandmark_cpp.gif - -root.layout.ncolumns = 1 -root.links-background.page-links.layout.hspacing = 40 -root.layout.vspacing = 35 +# +# intro/css/root_swt.properties +# +root.links-background.page-links.overview.link-icon = intro/css/graphics/icons/etool/overview72.gif +root.links-background.page-links.tutorials.link-icon = intro/css/graphics/icons/etool/tutorials72.gif +root.links-background.page-links.samples.link-icon= intro/css/graphics/icons/etool/samples72.gif +root.links-background.page-links.news.link-icon = intro/css/graphics/icons/etool/whatsnew72.gif +root.action-links.workbench.link-icon = intro/css/graphics/icons/etool/wb48.gif + +root.links-background.page-links.overview.hover-icon = intro/css/graphics/icons/ctool/overview72.gif +root.links-background.page-links.tutorials.hover-icon = intro/css/graphics/icons/ctool/tutorials72.gif +root.links-background.page-links.samples.hover-icon = intro/css/graphics/icons/ctool/samples72.gif +root.links-background.page-links.news.hover-icon = intro/css/graphics/icons/ctool/whatsnew72.gif +root.action-links.workbench.hover-icon = intro/css/graphics/icons/ctool/wb48.gif + + +root.links-background.page-links.overview.small-link-icon = intro/css/graphics/icons/etool/overview48.gif +root.links-background.page-links.tutorials.small-link-icon = intro/css/graphics/icons/etool/tutorials48.gif +root.links-background.page-links.samples.small-link-icon = intro/css/graphics/icons/etool/samples48.gif +root.links-background.page-links.news.small-link-icon = intro/css/graphics/icons/etool/whatsnew48.gif +root.action-links.workbench.small-link-icon = intro/css/graphics/icons/etool/wb48.gif + +root.links-background.page-links.overview.small-hover-icon = intro/css/graphics/icons/ctool/overview48.gif +root.links-background.page-links.tutorials.small-hover-icon = intro/css/graphics/icons/ctool/tutorials48.gif +root.links-background.page-links.samples.small-hover-icon = intro/css/graphics/icons/ctool/samples48.gif +root.links-background.page-links.news.small-hover-icon = intro/css/graphics/icons/ctool/whatsnew48.gif +root.action-links.workbench.small-hover-icon = intro/css/graphics/icons/ctool/wb48.gif + +# added generic carbide icon to set +root.links-background.page-links.carbide.link-icon = icons/Carbide_c_icon_32x32.png +root.links-background.page-links.carbide.hover-icon = icons/Carbide_c_icon_32x32.png + +root.layout.ncolumns = 1 +root.links-background.page-links.layout.hspacing = 40 +root.layout.vspacing = 35 diff -r b386036cfe5d -r 90bba933bb36 core/com.nokia.carbide.cpp/intro/css/shared.css --- a/core/com.nokia.carbide.cpp/intro/css/shared.css Thu Jul 29 13:33:19 2010 -0500 +++ b/core/com.nokia.carbide.cpp/intro/css/shared.css Thu Jul 29 14:41:38 2010 -0500 @@ -1,280 +1,280 @@ -/* - * Set up general fonts, sizes and colors - */ -body { font-family : Arial, sans-serif; } - -H1, H2, H3, H4, p, a { color : #4D4D4D; } - -.intro-header H1 { - font-size : 16pt; - font-weight : normal; - /* color : #E5E5E5; */ - /* added turquose to titles */ - color : #00A1D0; -} - -h2 { - font-size : 13pt; - font-weight : normal; - /* color : #7B8694; */ - /* changed color to dark gray */ - color : #333333; -} -/* For regular div labels */ -H4 .div-label { - font-size : 10pt; - font-weight : bold; -} - -/* For the main page content's title */ -#content-header H4 .div-label { - font-size : 14pt; - font-weight : normal; - /* color : #8C96A2; */ - /* changed color to dark gray */ - color : #333333; - float : none; - clear : both; -} - -/* Carbide branding mod */ -#copyright-footer{ - width:225px; - position:absolute; - bottom:5px; - left:5px; - font-family: Arial, Helvetica, sans-serif; - font-size: xx-small; - color: #666666; - font-weight: 500; - margin:0px; - padding: 5px; - /* BUGZ#1287 TEST TEST TEST */ - /* height : expression(document.body.clientHeight < 450? "450px": "100%" ); */ - /* top : expression(document.body.clientHeight < 500? "500px" : "100%" ); */ -} - -.page-description { - font-size : 10pt; - float : none; - clear : both; -} - -a { - font-weight : bold; - text-decoration : none; - color : #4D4D4D; -} - -a .link-label { - font-size : 10pt; - font-weight : normal; -} - -#navigation-links a .link-label { - font-size : 9pt; - font-weight : normal; - /* color : #E5E5E5; */ - /* added turquose to links */ - color : #00A1D0; -} - -a .text { - font-size : 8pt; - font-weight : normal; -} - -p .group-description { - font-size : 10pt; - font-weight : normal; -} - - -/* - * Set up other general properties like padding/margins - */ -html, body { width : 100%; height : 100%; } - -html, body, div, h1, h4, p, a { margin : 0px; padding : 0px; } - -.intro-header H1 { padding-top : 10px; margin-left : 10px; } - -/* For regular div labels */ -#page-content div H4 { - padding : 10px; - padding-bottom : 0px; -} - -/* For the main page content's div label */ -#page-content #content-header H4 { - padding-bottom : 10px; - padding-top : 0px; -} - -/* special case for Mozilla's main content-header label. - Mozilla 1.4 needs more room at the top */ -#page-content > #content-header H4 { padding-top : 10px; } - -/* Needed in IE to get shift+tab to show the active image properly */ -a:active { - border : solid 0px; -} - -a img { - border-width : 0; - background-repeat : no-repeat; -} - -/* - * to get scrollbars working in both IE and Mozilla - */ -html,body { overflow: auto; } -html>body { overflow: visible; } - -/* - * Set up the body, decorative background, and navigation for the content - * pages. - * Note: the root page handles its own background and navigation; these - * settings primarily apply to the content pages - */ -body { - background-color : #FFFFFF; - background-repeat : no-repeat; - background-position : bottom right; -} - -#curve-image { -/* width : 100%; - height : 164px; - position : absolute; - top : 0px; - background-image : url(graphics/contentpage/backgroundcurve.gif); - background-repeat : no-repeat; - background-position : top center; - margin : 0; - padding : 0; -*/ -} - -.intro-header { background-color : transparent; z-index : 100;} - -body, .page{ - min-width : 770px; - /* since IE doesn't support min-width, try expression */ - width:expression(document.body.clientWidth < 770? "770px": "auto" ); - min-height : 425px; - height : 100%; - height : expression(document.body.clientHeight < 425? "425px": "100%" ); -} - -.page { - min-height : 475px; - /* Carbide branding mod */ - /* background-image : url(graphics/contentpage/background.jpg); */ - background-image : url(graphics/rootpage/background_carbide.jpg); - background-repeat : repeat-x; - background-position : top left; -} - -#page-content { - background-repeat : no-repeat; - background-position : bottom right; - height : 70%; -} - -/* - * Lay out the navigation links - * (Root page does something similar for its navigation) - */ -#navigation-links { - position : relative; - left : 10px; - top : 5px; - height : 60px; - width : 98%; -} - -#navigation-links a { - padding-left : 5px; - padding-right : 5px; - float : left; - text-align : center; -} - -#navigation-links a img { - height : 52px; - width : 52px; - vertical-align : middle; -} - -#navigation-links a .link-label { display : block; margin-top : 5px;} - -#navigation-links a .text { display : none; } - -#navigation-links a:hover, -#navigation-links a:focus -#navigation-links a:active { border-right : 0px;} - -/* properties for each of the navigation-links */ -#navigation-links a#overview img { background-image : url(graphics/icons/etool/overview48.gif); } -#navigation-links a#overview:hover img, -#navigation-links a#overview:focus img, -#navigation-links a#overview:active img { background-image : url(graphics/icons/ctool/overview48.gif); } -/*#navigation-links a#overview:active img { background-image : url(graphics/icons/ctool/overview48sel.gif); }*/ - -#navigation-links a#tutorials img { background-image : url(graphics/icons/etool/tutorials48.gif); } -#navigation-links a#tutorials:hover img, -#navigation-links a#tutorials:active img, -#navigation-links a#tutorials:focus img { background-image : url(graphics/icons/ctool/tutorials48.gif); } -/*#navigation-links a#tutorials:active img { background-image : url(graphics/icons/ctool/tutorials48sel.gif); }*/ - -#navigation-links a#samples img { background-image : url(graphics/icons/etool/samples48.gif); } -#navigation-links a#samples:hover img, -#navigation-links a#samples:active img, -#navigation-links a#samples:focus img { background-image : url(graphics/icons/ctool/samples48.gif); } -/*#navigation-links a#samples:active img { background-image : url(graphics/icons/ctool/samples48sel.gif); }*/ - -#navigation-links a#news img { background-image : url(graphics/icons/etool/whatsnew48.gif); } -#navigation-links a#news:hover img, -#navigation-links a#news:focus img, -#navigation-links a#news:active img { background-image : url(graphics/icons/ctool/whatsnew48.gif); } -/*#navigation-links a#news:active img { background-image : url(graphics/icons/ctool/whatsnew48sel.gif); }*/ - -#navigation-links a#workbench { position : absolute; right : 0px; top : -35px; text-align : right;} -#navigation-links a#workbench .text { display : none; } -#navigation-links a#workbench img { background-image : url(graphics/icons/etool/wb48.gif); width : 53px; height : 53px;} -#navigation-links a#workbench:hover img, -#navigation-links a#workbench:focus img, -#navigation-links a#workbench:active img { background-image : url(graphics/icons/ctool/wb48.gif); } - -/* - * Lay out the page title and description - */ -h1, p { margin-left : 10px; } /* required in mozilla so the page description is properly indented */ - -/* position the page content so that the page title overlays the bottom - * of the background image, but make sure the content is always on top - * (using z-index) */ -#page-content { - float : none; - clear : both; - text-align : center; - margin-top : 35px; -} - -.page > #page-content { margin-top : 50px; } - -#page-content p { - padding-bottom : 15px; - text-align : left; - float : none; - clear : both; -} - -#page-content #content-header H4, .page-description { - text-align : left; - margin-right : 10px; - float : none; - clear : both; -} - +/* + * Set up general fonts, sizes and colors + */ +body { font-family : Arial, sans-serif; } + +H1, H2, H3, H4, p, a { color : #5B6B74; } + +.intro-header H1 { + font-size : 16pt; + font-weight : normal; + /* color : #E5E5E5; */ + /* added turquose to titles */ + color : #5B6B74; +} + +h2 { + font-size : 13pt; + font-weight : normal; + /* color : #7B8694; */ + /* changed color to dark gray */ + color : #5B6B74; +} +/* For regular div labels */ +H4 .div-label { + font-size : 10pt; + font-weight : bold; +} + +/* For the main page content's title */ +#content-header H4 .div-label { + font-size : 14pt; + font-weight : normal; + /* color : #8C96A2; */ + /* changed color to dark gray */ + color : #5B6B74; + float : none; + clear : both; +} + +/* Carbide branding mod */ +#copyright-footer{ + width:225px; + position:absolute; + bottom:5px; + left:5px; + font-family: Arial, Helvetica, sans-serif; + font-size: xx-small; + color: #666666; + font-weight: 500; + margin:0px; + padding: 5px; + /* BUGZ#1287 TEST TEST TEST */ + /* height : expression(document.body.clientHeight < 450? "450px": "100%" ); */ + /* top : expression(document.body.clientHeight < 500? "500px" : "100%" ); */ +} + +.page-description { + font-size : 10pt; + float : none; + clear : both; +} + +a { + font-weight : bold; + text-decoration : none; + color : #5B6B74; +} + +a .link-label { + font-size : 10pt; + font-weight : normal; +} + +#navigation-links a .link-label { + font-size : 9pt; + font-weight : normal; + /* color : #E5E5E5; */ + /* added turquose to links */ + color : #5B6B74; +} + +a .text { + font-size : 8pt; + font-weight : normal; +} + +p .group-description { + font-size : 10pt; + font-weight : normal; +} + + +/* + * Set up other general properties like padding/margins + */ +html, body { width : 100%; height : 100%; } + +html, body, div, h1, h4, p, a { margin : 0px; padding : 0px; } + +.intro-header H1 { padding-top : 10px; margin-left : 10px; } + +/* For regular div labels */ +#page-content div H4 { + padding : 10px; + padding-bottom : 0px; +} + +/* For the main page content's div label */ +#page-content #content-header H4 { + padding-bottom : 10px; + padding-top : 0px; +} + +/* special case for Mozilla's main content-header label. + Mozilla 1.4 needs more room at the top */ +#page-content > #content-header H4 { padding-top : 10px; } + +/* Needed in IE to get shift+tab to show the active image properly */ +a:active { + border : solid 0px; +} + +a img { + border-width : 0; + background-repeat : no-repeat; +} + +/* + * to get scrollbars working in both IE and Mozilla + */ +html,body { overflow: auto; } +html>body { overflow: visible; } + +/* + * Set up the body, decorative background, and navigation for the content + * pages. + * Note: the root page handles its own background and navigation; these + * settings primarily apply to the content pages + */ +body { + background-color : #FFFFFF; + background-repeat : no-repeat; + background-position : bottom right; +} + +#curve-image { +/* width : 100%; + height : 164px; + position : absolute; + top : 0px; + background-image : url(graphics/contentpage/backgroundcurve.gif); + background-repeat : no-repeat; + background-position : top center; + margin : 0; + padding : 0; +*/ +} + +.intro-header { background-color : transparent; z-index : 100;} + +body, .page{ + min-width : 770px; + /* since IE doesn't support min-width, try expression */ + width:expression(document.body.clientWidth < 770? "770px": "auto" ); + min-height : 425px; + height : 100%; + height : expression(document.body.clientHeight < 425? "425px": "100%" ); +} + +.page { + min-height : 475px; + /* Carbide branding mod */ + /* background-image : url(graphics/contentpage/background.jpg); */ + background-image : url(graphics/rootpage/background_carbide.jpg); + background-repeat : repeat-x; + background-position : top left; +} + +#page-content { + background-repeat : no-repeat; + background-position : bottom right; + height : 70%; +} + +/* + * Lay out the navigation links + * (Root page does something similar for its navigation) + */ +#navigation-links { + position : relative; + left : 10px; + top : 5px; + height : 60px; + width : 98%; +} + +#navigation-links a { + padding-left : 5px; + padding-right : 5px; + float : left; + text-align : center; +} + +#navigation-links a img { + height : 52px; + width : 52px; + vertical-align : middle; +} + +#navigation-links a .link-label { display : block; margin-top : 5px;} + +#navigation-links a .text { display : none; } + +#navigation-links a:hover, +#navigation-links a:focus +#navigation-links a:active { border-right : 0px;} + +/* properties for each of the navigation-links */ +#navigation-links a#overview img { background-image : url(graphics/icons/etool/overview48.gif); } +#navigation-links a#overview:hover img, +#navigation-links a#overview:focus img, +#navigation-links a#overview:active img { background-image : url(graphics/icons/ctool/overview48.gif); } +/*#navigation-links a#overview:active img { background-image : url(graphics/icons/ctool/overview48sel.gif); }*/ + +#navigation-links a#tutorials img { background-image : url(graphics/icons/etool/tutorials48.gif); } +#navigation-links a#tutorials:hover img, +#navigation-links a#tutorials:active img, +#navigation-links a#tutorials:focus img { background-image : url(graphics/icons/ctool/tutorials48.gif); } +/*#navigation-links a#tutorials:active img { background-image : url(graphics/icons/ctool/tutorials48sel.gif); }*/ + +#navigation-links a#samples img { background-image : url(graphics/icons/etool/samples48.gif); } +#navigation-links a#samples:hover img, +#navigation-links a#samples:active img, +#navigation-links a#samples:focus img { background-image : url(graphics/icons/ctool/samples48.gif); } +/*#navigation-links a#samples:active img { background-image : url(graphics/icons/ctool/samples48sel.gif); }*/ + +#navigation-links a#news img { background-image : url(graphics/icons/etool/whatsnew48.gif); } +#navigation-links a#news:hover img, +#navigation-links a#news:focus img, +#navigation-links a#news:active img { background-image : url(graphics/icons/ctool/whatsnew48.gif); } +/*#navigation-links a#news:active img { background-image : url(graphics/icons/ctool/whatsnew48sel.gif); }*/ + +#navigation-links a#workbench { position : absolute; right : 0px; top : -35px; text-align : right;} +#navigation-links a#workbench .text { display : none; } +#navigation-links a#workbench img { background-image : url(graphics/icons/etool/wb48.gif); width : 53px; height : 53px;} +#navigation-links a#workbench:hover img, +#navigation-links a#workbench:focus img, +#navigation-links a#workbench:active img { background-image : url(graphics/icons/ctool/wb48.gif); } + +/* + * Lay out the page title and description + */ +h1, p { margin-left : 10px; } /* required in mozilla so the page description is properly indented */ + +/* position the page content so that the page title overlays the bottom + * of the background image, but make sure the content is always on top + * (using z-index) */ +#page-content { + float : none; + clear : both; + text-align : center; + margin-top : 35px; +} + +.page > #page-content { margin-top : 50px; } + +#page-content p { + padding-bottom : 15px; + text-align : left; + float : none; + clear : both; +} + +#page-content #content-header H4, .page-description { + text-align : left; + margin-right : 10px; + float : none; + clear : both; +} + diff -r b386036cfe5d -r 90bba933bb36 core/com.nokia.carbide.cpp/plugin.xml --- a/core/com.nokia.carbide.cpp/plugin.xml Thu Jul 29 13:33:19 2010 -0500 +++ b/core/com.nokia.carbide.cpp/plugin.xml Thu Jul 29 14:41:38 2010 -0500 @@ -37,7 +37,7 @@ value="Carbide.c++ v3.0.0 for Symbian"/> <property name="introBrandingImage" - value="product:themes/carbide/graphics/root/brandmark.png"/> + value="intro/css/graphics/rootpage/brandmark.png"/> <property name="introBrandingImageText" value="Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved."/>