# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1245703372 18000
# Node ID ca271fb95b0343d92217628fd595fa0c622d9d79
# Parent  fcb0ab439c55a2e43e3f383b7f7d4da8b681dc50# Parent  a7b7fa512cdc411a9f5c29938fcf225a48f9338a
merged

diff -r a7b7fa512cdc -r ca271fb95b03 builder/com.nokia.carbide.cdt.builder/plugin.properties
--- a/builder/com.nokia.carbide.cdt.builder/plugin.properties	Mon Jun 22 14:34:02 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/plugin.properties	Mon Jun 22 15:42:52 2009 -0500
@@ -13,3 +13,8 @@
 #Keywords for Carbide preferences
 carbcPreference.common=carbide symbian c cpp cplusplus
 carbcPreference.build=winscw build emulator bld.inf concurrent jobs clean dependency actions mmp
+
+#Keywords for Carbide property pages
+carbcProperty.build=build sis paths symbols environment rom arguments configuration partial upgrade bldmake abld
+carbcProperty.macro=macro preprocessor symbols MACRO paths
+carbcProperty.project=bld.inf order components extension makefiles test
diff -r a7b7fa512cdc -r ca271fb95b03 builder/com.nokia.carbide.cdt.builder/plugin.xml
--- a/builder/com.nokia.carbide.cdt.builder/plugin.xml	Mon Jun 22 14:34:02 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/plugin.xml	Mon Jun 22 15:42:52 2009 -0500
@@ -84,16 +84,17 @@
             id="com.nokia.carbide.cdt.builder.build"
             label="%carbcPreference.build">
       </keyword>
-   </extension>
-   <extension
-         point="org.eclipse.ui.keywords">
       <keyword
-            id="com.nokia.carbide.cdt.builder.common"
-            label="%carbcPreference.common">
+            id="com.nokia.carbide.cdt.builder.buildproperty"
+            label="%carbcProperty.build">
       </keyword>
       <keyword
-            id="com.nokia.carbide.cdt.builder.build"
-            label="%carbcPreference.build">
+            id="com.nokia.carbide.cdt.builder.macroproperty"
+            label="%carbcProperty.macro">
+      </keyword>
+      <keyword
+            id="com.nokia.carbide.cdt.builder.projectproperty"
+            label="%carbcProperty.project">
       </keyword>
    </extension>
   <extension
@@ -136,6 +137,9 @@
 		     <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
 		    </or>          
          </enabledWhen>
+         <keywordReference
+               id="com.nokia.carbide.cdt.builder.projectproperty">
+         </keywordReference>
       </page>
       <page
             name="%CarbideBuilder.Carbide_Build_Configurations"
@@ -152,6 +156,9 @@
 		     <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
 		    </or>          
          </enabledWhen>
+         <keywordReference
+               id="com.nokia.carbide.cdt.builder.buildproperty">
+         </keywordReference>
       </page>
       <page
             name="%CarbideBuilder.Carbide_Macro_Settings"
@@ -168,6 +175,9 @@
 		     <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
 		    </or>          
          </enabledWhen>
+         <keywordReference
+               id="com.nokia.carbide.cdt.builder.macroproperty">
+         </keywordReference>
       </page>
     </extension>
 	<!-- ************* ERROR PARSERS ************** -->
diff -r a7b7fa512cdc -r ca271fb95b03 core/carbide_releases/readme/readme_sdks.html
--- a/core/carbide_releases/readme/readme_sdks.html	Mon Jun 22 14:34:02 2009 -0500
+++ b/core/carbide_releases/readme/readme_sdks.html	Mon Jun 22 15:42:52 2009 -0500
@@ -15,7 +15,7 @@
 
 <h2>You're not done installing just yet... </h2>
 <p>Release: 2.1.0<br>
-  Revised:&nbsp;April 2009</p>
+  Revised:&nbsp;June 2009</p>
 <p>Read the <b>Release Notes</b> and <b>Bug Fixes</b> for the latest infomation about this product. In Carbide.c++ simply click the <b>Help &gt; Help Contents &gt; Carbide.c++ User Guide</b> to find the pages.</p>
 <p>To complete your installation and start Symbian C++ application development, you <span class="style3">must</span>  install the following: </p>
 <table width="80%"  border="0">
diff -r a7b7fa512cdc -r ca271fb95b03 core/com.nokia.carbide.cpp.codescanner/plugin.xml
--- a/core/com.nokia.carbide.cpp.codescanner/plugin.xml	Mon Jun 22 14:34:02 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/plugin.xml	Mon Jun 22 15:42:52 2009 -0500
@@ -97,6 +97,12 @@
 				<instanceof value="org.eclipse.cdt.core.model.ICProject"/>
 				</or>          
 			</enabledWhen>
+   <keywordReference
+         id="com.nokia.carbide.cpp.codescanner.common">
+   </keywordReference>
+   <keywordReference
+         id="com.nokia.carbide.cpp.codescanner.codescanner">
+   </keywordReference>
 		</page>
 	</extension>
 <!-- =================================================================================== -->
diff -r a7b7fa512cdc -r ca271fb95b03 core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Mon Jun 22 14:34:02 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Mon Jun 22 15:42:52 2009 -0500
@@ -45,7 +45,7 @@
       <li><b>Executables View Refreshing</b> - The Executables view refresh was impacting everything from IDE start-up to import and project creation as well refreshes during rebuilds. Some of our wall clock tests on large projects (such as contacts the browser) show the executables job running from 15-25 seconds down to about 5 seconds.</li>
     </ul>
   </li>
-  <li><b>New Launch Configuration improvements</b> - The <b>New Launch Configuration</b> wizard now starts with a new <b>Category Selection</b> page which helps guide developers in choosing the correct launch configuration  for a project, whether it be for Phones, Boards, or other target devices. In addition, the <span class="fix">??</span> page enables developers to define if a project is automatically built or not at the launch configuration level.</li>
+  <li><b>New Launch Configuration improvements</b> - The <b>New Launch Configuration</b> wizard now starts with a new <a href="projects/launch/wiz_new_launch_config.htm#CATEGORY">Category Selection</a> page which helps guide developers in choosing the correct launch configuration  for a project, whether it be for Phones, Boards, or other target devices. In addition, the Build Options Selection page enables developers to define if a project is automatically built or not at the launch configuration level.</li>
   <li><b>Customization (.bsf) and Symbian Variant Binary (.var) platform</b> discovery is now supported. See the Platform Filtering Preference panel for details.</li>
   <li><b>Keywords in preference panels</b> - All Carbide related preference panels now include keywords to make searching for options a bit easier.</li>
   <li><b>New Carbide Extensions section</b> - Project Property dialogs now include a <b>Carbide Extensions</b> section which allows Carbide plug-in and utilities a place to add their own project  settings.</li>
diff -r a7b7fa512cdc -r ca271fb95b03 core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml
--- a/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml	Mon Jun 22 14:34:02 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml	Mon Jun 22 15:42:52 2009 -0500
@@ -10,7 +10,7 @@
 		  
 		<group style-id="content-group" id="carbide-cpp">
        		<link 
-       		label="Carbide.c++ Release Notes" 
+       		label="Carbide.c++ Release Notes (2.1)" 
        		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/release_notes.htm" 
        		id="carbide-link" 
        		style-id="content-link">
@@ -20,6 +20,36 @@
 		  
 		<group style-id="content-group" id="carbide-cpp">
        		<link 
+       		label="Performance Improvements (2.1)" 
+       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/release_notes.htm" 
+       		id="carbide-link" 
+       		style-id="content-link">
+          	<text>Carbide performance improvements for large project importing, building, and other critical areas.</text>
+       		</link>
+       	</group>
+
+		<group style-id="content-group" id="carbide-cpp">
+       		<link 
+       		label="Hover Help (2.0.4)" 
+       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_news.htm" 
+       		id="carbide-link" 
+       		style-id="content-link">
+          	<text>See Symbian API Reference information appear when you hover over a Symbian symbol in C/C++ editors.</text>
+       		</link>
+       	</group>
+
+		<group style-id="content-group" id="carbide-cpp">
+       		<link 
+       		label="Carbide.c++ News Reader (2.0.3)" 
+       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_news.htm" 
+       		id="carbide-link" 
+       		style-id="content-link">
+          	<text>Provides updates on the latest Carbide, Symbian, and S60 news.</text>
+       		</link>
+       	</group>
+
+		<group style-id="content-group" id="carbide-cpp">
+       		<link 
        		label="On-Device Connection (2.0)" 
        		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm" 
        		id="carbide-link" 
diff -r a7b7fa512cdc -r ca271fb95b03 core/com.nokia.carbide.cpp/html/intro/overviewExtensionContent.xml
--- a/core/com.nokia.carbide.cpp/html/intro/overviewExtensionContent.xml	Mon Jun 22 14:34:02 2009 -0500
+++ b/core/com.nokia.carbide.cpp/html/intro/overviewExtensionContent.xml	Mon Jun 22 15:42:52 2009 -0500
@@ -12,7 +12,7 @@
 			<link label="Carbide.c++ Welcome message" 
 				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp/html/welcome_note.htm"  
 				id="carbide" 
-				style-id="overview-links">
+				style-id="content-link">
 				<text>Welcome message to Carbide.c++ developers</text>
 			</link>
 		</group>
diff -r a7b7fa512cdc -r ca271fb95b03 core/com.nokia.carbide.cpp/intro/css/overview/overview.css
--- a/core/com.nokia.carbide.cpp/intro/css/overview/overview.css	Mon Jun 22 14:34:02 2009 -0500
+++ b/core/com.nokia.carbide.cpp/intro/css/overview/overview.css	Mon Jun 22 15:42:52 2009 -0500
@@ -101,7 +101,10 @@
 #overview-links a > .link-label { width : 700px; }
 #overview-links a p > .text { width : 700px; }
 
-#overview-links a:hover { border-right : 5px; }
+/* #overview-links a:hover { border-right : 5px; } */
+#overview-links a:hover { 
+	background-image : url(../graphics/contentpage/page-link-wide.gif);
+}
 
 a#basics img { background-image : url(../graphics/icons/obj48/wbbasics_obj.gif); }
 a#basics:hover img { background-image : url(../graphics/icons/obj48/wbbasicshov_obj.gif); }
diff -r a7b7fa512cdc -r ca271fb95b03 core/com.nokia.carbide.cpp/themes/carbide/graphics/contentpage/page-link-wide.gif
Binary file core/com.nokia.carbide.cpp/themes/carbide/graphics/contentpage/page-link-wide.gif has changed
diff -r a7b7fa512cdc -r ca271fb95b03 core/com.nokia.carbide.cpp/themes/carbide/graphics/icons/etool/migrate48sel.gif
Binary file core/com.nokia.carbide.cpp/themes/carbide/graphics/icons/etool/migrate48sel.gif has changed
diff -r a7b7fa512cdc -r ca271fb95b03 core/com.nokia.carbide.cpp/themes/carbide/html/root.css
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/root.css	Mon Jun 22 14:34:02 2009 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/root.css	Mon Jun 22 15:42:52 2009 -0500
@@ -22,7 +22,7 @@
 #page-links a .link-label, #action-links a .link-label {
 	font-size : 13pt;
 	font-weight : 600;
-	color : #0A94D6;
+	color : #EEEEEE;
 }
 #page-links a p .text, #action-links a p .text {
 	font-size : 13pt;
diff -r a7b7fa512cdc -r ca271fb95b03 core/com.nokia.carbide.cpp/themes/carbide/html/shared.css
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/shared.css	Mon Jun 22 14:34:02 2009 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/shared.css	Mon Jun 22 15:42:52 2009 -0500
@@ -396,7 +396,7 @@
 	float : none;
 	clear : both;
 	text-align : left;
-	color: #03c;
+	color: #0A94D6;
 	/* Carbide branding mod
 	margin-bottom : 0px;
 	/* background-image : url(../graphics/contentpage/page-link-wide.gif); */
@@ -405,6 +405,7 @@
 	*/
 }
 
+
 .categoryContentnav {
 	font-size: 9pt; 
 	font-weight: bold; 
@@ -417,7 +418,11 @@
 	color: #00507C;
 }
 
-.content-link:hover { border-right : 0px; }
+/* .content-link:hover { border-right : 0px; } */
+.content-link:hover { 
+	background-image : url(../graphics/contentpage/page-link-wide.gif);
+}
+
 
 iframe {
 	position:relative;
diff -r a7b7fa512cdc -r ca271fb95b03 core/com.nokia.carbide.cpp/themes/carbide/html/standby.css
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/standby.css	Mon Jun 22 14:34:02 2009 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/standby.css	Mon Jun 22 15:42:52 2009 -0500
@@ -50,7 +50,7 @@
 	/* background-image : url(../graphics/root/background.jpg); */
 	background-repeat : no-repeat;
 	background-position : top left;
-	background-color : #7169D1;
+	/* background-color : #7169D1; */
 }
 
 .page {