--- a/core/com.nokia.carbide.cpp/about.html Mon May 03 10:11:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp/about.html Mon May 03 12:10:25 2010 -0500
@@ -12,7 +12,7 @@
<table width="530" border="0" align="center" cellspacing="5" bgcolor="#FFFFFF">
<tr>
<td width="215"><img src="icons/about.png" width="215" height="199"></td>
- <td width="294"><p align="right" class="text"><b><img src="intro/css/graphics/rootpage/brandmark.gif" ></b></p>
+ <td width="294"><p align="right" class="text"><b><img src="intro/css/graphics/rootpage/brandmark.png" ></b></p>
<p class="text"> </p>
<p class="text"> </p>
<p class="titleSmall">Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
--- a/core/com.nokia.carbide.cpp/html/help_home.html Mon May 03 10:11:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp/html/help_home.html Mon May 03 12:10:25 2010 -0500
@@ -11,7 +11,7 @@
<body style="margin-top: 5; margin-left: 5; margin-right: 5;">
<table width="100%" >
- <tr><td align=right valign="center" bgcolor="#CCCCCC"><img src="../intro/css/graphics/rootpage/brandmark.gif" alt="Carbide icon"></td>
+ <tr><td align=right valign="center" bgcolor="#CCCCCC"><img src="../intro/css/graphics/rootpage/brandmark.png" alt="Carbide icon"></td>
</tr>
</table>
--- a/core/com.nokia.carbide.cpp/html/online_banner.html Mon May 03 10:11:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp/html/online_banner.html Mon May 03 12:10:25 2010 -0500
@@ -37,7 +37,7 @@
<table width="100%" cellspacing="0" cellpadding="8" border="0">
<tr>
- <td align="left" valign="center" bgcolor="#CCCCCC"><img src="../intro/css/graphics/rootpage/brandmark.gif" alt="Carbide icon" title="Carbide icon"> </td>
+ <td align="left" valign="center" bgcolor="#CCCCCC"><img src="../intro/css/graphics/rootpage/brandmark.png" alt="Carbide icon" title="Carbide icon"> </td>
<td align="right" valign="center" bgcolor="#CCCCCC"><B>Carbide Online Help Center v2.6.0</B></td>
</tr>
</table>
--- a/core/com.nokia.carbide.cpp/intro/css/root.css Mon May 03 10:11:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp/intro/css/root.css Mon May 03 12:10:25 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: #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;
+}
--- a/core/com.nokia.carbide.cpp/plugin.xml Mon May 03 10:11:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp/plugin.xml Mon May 03 12:10:25 2010 -0500
@@ -37,7 +37,7 @@
value="Carbide.c++ v2.6.0 for Symbian"/>
<property
name="introBrandingImage"
- value="product:themes/carbide/graphics/root/brandmark.gif"/>
+ value="product:themes/carbide/graphics/root/"/>
<property
name="introBrandingImageText"
value="Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved."/>
Binary file core/com.nokia.carbide.cpp/themes/carbide/graphics/contentpage/brandmark.png has changed
Binary file core/com.nokia.carbide.cpp/themes/carbide/graphics/root/brandmark.png has changed
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/root.css Mon May 03 10:11:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/root.css Mon May 03 12:10:25 2010 -0500
@@ -52,7 +52,7 @@
}
#root {
/*
- /* background-image : url(../graphics/root/brandmark.gif); */
+ /* background-image : url(../graphics/root/brandmark.png); */
*/
background-repeat : no-repeat;
background-position : bottom left;
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/standby.css Mon May 03 10:11:07 2010 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/standby.css Mon May 03 12:10:25 2010 -0500
@@ -55,7 +55,7 @@
.page {
/*
- /* background-image : url(../graphics/root/brandmark.gif); */
+ /* background-image : url(../graphics/root/brandmark.png); */
background-repeat : no-repeat;
background-position : bottom left;
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/uidesigner/com.nokia.sdt.emf.dm.tests/.cproject Mon May 03 12:10:25 2010 -0500
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?>
+
+<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+<storageModule moduleId="org.eclipse.cdt.core.settings">
+<cconfiguration id="converted.config.1675229784">
+<storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="converted.config.1675229784" moduleId="org.eclipse.cdt.core.settings" name="convertedConfig">
+<externalSettings/>
+<extensions/>
+</storageModule>
+</cconfiguration>
+</storageModule>
+</cproject>
