# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1244822089 18000
# Node ID b04f7c34bdfb57378e32635259de8f341bd96133
# Parent  bb76de95ab1e04f388c379fce874aed3b4d37240# Parent  4740e31f406172f62f95f8bf1a9559345d7a4c1d
merge

diff -r bb76de95ab1e -r b04f7c34bdfb core/com.nokia.carbide.cpp.sdk.ui/plugin.properties
--- a/core/com.nokia.carbide.cpp.sdk.ui/plugin.properties	Thu Jun 11 17:25:08 2009 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/plugin.properties	Fri Jun 12 10:54:49 2009 -0500
@@ -1,4 +1,9 @@
 // Copyright 2007 Nokia, Inc.
 
 SDKUIPlugin.SDK_Preferences=SDK Preferences
-SDKUIPlugin.Platform_Filtering_Preferences=Platform Filtering Preferences
\ No newline at end of file
+SDKUIPlugin.Platform_Filtering_Preferences=Platform Filtering Preferences
+
+#Keywords for Carbide preferences
+carbcPreference.common=carbide symbian c cpp cplusplus
+carbcPreference.sdkpreferences=sdk epocroot devices xml properties
+carbcPreference.platformfiltering=platforms sbsv1 sbsv2 emulation winscw gcce armv5 armv5_abi2 armv5_abiv1 armi arm4 thumb bsf var
diff -r bb76de95ab1e -r b04f7c34bdfb core/com.nokia.carbide.cpp.sdk.ui/plugin.xml
--- a/core/com.nokia.carbide.cpp.sdk.ui/plugin.xml	Thu Jun 11 17:25:08 2009 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/plugin.xml	Fri Jun 12 10:54:49 2009 -0500
@@ -9,12 +9,24 @@
             class="com.nokia.carbide.cpp.internal.sdk.ui.SDKPreferencePage"
             category="com.nokia.carbide.cpp.project.ui.preferences.CarbidePreferencePage"
             id="com.nokia.carbide.cpp.sdk.ui.preferences.SDKPreferencePage">
+         <keywordReference
+               id="com.nokia.carbide.cpp.sdk.common">
+         </keywordReference>
+         <keywordReference
+               id="com.nokia.carbide.cpp.sdk.sdkpreferences">
+         </keywordReference>
       </page>
       <page
             name="%SDKUIPlugin.Platform_Filtering_Preferences"
             class="com.nokia.carbide.cpp.internal.api.sdk.ui.BuildPlatformFilterPage"
             category="com.nokia.carbide.cpp.project.ui.preferences.CarbidePreferencePage"
             id="com.nokia.carbide.cpp.sdk.ui.preferences.BuildPlatformFilterPage">
+         <keywordReference
+               id="com.nokia.carbide.cpp.sdk.common">
+         </keywordReference>
+         <keywordReference
+               id="com.nokia.carbide.cpp.sdk.platfromfiltering">
+         </keywordReference>
       </page>
    </extension>
    <extension
@@ -26,6 +38,21 @@
    <extension
          point="org.eclipse.ui.startup">
    </extension>
+   <extension
+         point="org.eclipse.ui.keywords">
+      <keyword
+            id="com.nokia.carbide.cpp.sdk.common"
+            label="%carbcPreference.common">
+      </keyword>
+      <keyword
+            id="com.nokia.carbide.cpp.sdk.sdkpreferences"
+            label="%carbcPreference.platformpreferences">
+      </keyword>
+      <keyword
+            id="com.nokia.carbide.cpp.sdk.platfromfiltering"
+            label="%carbcPreference.platformfiltering">
+      </keyword>
+   </extension>
    
 
 </plugin>