--- a/builder/com.nokia.carbide.cdt.builder/plugin.properties Thu Jun 11 16:14:53 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/plugin.properties Thu Jun 11 16:16:05 2009 -0500
@@ -8,3 +8,8 @@
CarbideBuilder.Change_Config_ToolTip=Change the Active Build Configuration for the Selected Project
CarbideBuilder.Build_Selected_Project_ToolTip=Build the Selected Project
+
+
+#Keywords for Carbide preferences
+carbcPreference.common=carbide symbian c cpp cplusplus
+carbcPreference.build=winscw build emulator bld.inf concurrent jobs clean dependency actions mmp
--- a/builder/com.nokia.carbide.cdt.builder/plugin.xml Thu Jun 11 16:14:53 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/plugin.xml Thu Jun 11 16:16:05 2009 -0500
@@ -66,8 +66,36 @@
category="com.nokia.carbide.cpp.project.ui.preferences.CarbidePreferencePage"
class="com.nokia.carbide.cdt.internal.builder.ui.BuilderPreferencePage"
id="com.nokia.carbide.cdt.internal.builder.ui.BuilderPreferencePage">
+ <keywordReference
+ id="com.nokia.carbide.cdt.builder.common">
+ </keywordReference>
+ <keywordReference
+ id="com.nokia.carbide.cdt.builder.build">
+ </keywordReference>
</page>
</extension>
+ <extension
+ point="org.eclipse.ui.keywords">
+ <keyword
+ id="com.nokia.carbide.cdt.builder.common"
+ label="%carbcPreference.common">
+ </keyword>
+ <keyword
+ 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">
+ </keyword>
+ <keyword
+ id="com.nokia.carbide.cdt.builder.build"
+ label="%carbcPreference.build">
+ </keyword>
+ </extension>
<extension
point="org.eclipse.core.runtime.preferences">
<initializer
--- a/core/com.nokia.carbide.bugdatacollector/plugin.properties Thu Jun 11 16:14:53 2009 -0500
+++ b/core/com.nokia.carbide.bugdatacollector/plugin.properties Thu Jun 11 16:16:05 2009 -0500
@@ -12,4 +12,9 @@
\n\
\n\
Copyright (c)2007 Nokia Corporation. All rights reserved.\n\
-(http://www.forum.nokia.com)\n\
\ No newline at end of file
+(http://www.forum.nokia.com)\n\
+
+
+#Keywords for Carbide preferences
+carbcPreference.common=carbide symbian c cpp cplusplus
+carbcPreference.bugreporter=bug error bugzilla report reporter password login diagnostic log sdk email
\ No newline at end of file
--- a/core/com.nokia.carbide.bugdatacollector/plugin.xml Thu Jun 11 16:14:53 2009 -0500
+++ b/core/com.nokia.carbide.bugdatacollector/plugin.xml Thu Jun 11 16:16:05 2009 -0500
@@ -18,6 +18,12 @@
class="com.nokia.carbide.internal.bugdatacollector.ui.preferences.BugDataCollectorPreferencePage"
category="com.nokia.carbide.cpp.project.ui.preferences.CarbidePreferencePage"
id="com.nokia.carbide.bugdatacollector.ui.preferences.BugDataCollectorPreferencePage">
+ <keywordReference
+ id="com.nokia.carbide.bugdatacollector.common">
+ </keywordReference>
+ <keywordReference
+ id="com.nokia.carbide.bugdatacollector.bugreporter">
+ </keywordReference>
</page>
</extension>
@@ -27,5 +33,16 @@
class="com.nokia.carbide.internal.bugdatacollector.ui.preferences.BugDataCollectorPreferenceInitializer">
</initializer>
</extension>
+ <extension
+ point="org.eclipse.ui.keywords">
+ <keyword
+ id="com.nokia.carbide.bugdatacollector.common"
+ label="%carbcPreference.common">
+ </keyword>
+ <keyword
+ id="com.nokia.carbide.bugdatacollector.bugreporter"
+ label="%carbcPreference.bugreporter">
+ </keyword>
+ </extension>
</plugin>
--- a/core/com.nokia.carbide.cpp.codescanner/plugin.properties Thu Jun 11 16:14:53 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/plugin.properties Thu Jun 11 16:16:05 2009 -0500
@@ -19,3 +19,8 @@
providerName=Nokia.com
CSProblemMarker.name=CodeScanner Problem
+
+#Keywords for Carbide preferences
+carbcPreference.common=carbide symbian c cpp cplusplus
+carbcPreference.codescanner=codescanner html xml knowledge base filters rules patterns
+
--- a/core/com.nokia.carbide.cpp.codescanner/plugin.xml Thu Jun 11 16:14:53 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/plugin.xml Thu Jun 11 16:16:05 2009 -0500
@@ -69,6 +69,12 @@
category="com.nokia.carbide.cpp.project.ui.preferences.CarbidePreferencePage"
class="com.nokia.carbide.cpp.internal.codescanner.ui.CSPreferencePage"
id="com.nokia.carbide.cpp.codescanner.ui.CSPreferencePage">
+ <keywordReference
+ id="com.nokia.carbide.cpp.codescanner.common">
+ </keywordReference>
+ <keywordReference
+ id="com.nokia.carbide.cpp.codescanner.codescanner">
+ </keywordReference>
</page>
</extension>
<!-- =================================================================================== -->
@@ -338,5 +344,16 @@
<!-- Extension point(s) provided by the CodeScanner plugin -->
<!-- =================================================================================== -->
<extension-point id="rules" name="Rules" schema="schema/knowledgeBase.exsd"/>
+ <extension
+ point="org.eclipse.ui.keywords">
+ <keyword
+ id="com.nokia.carbide.cpp.codescanner.common"
+ label="%carbcPreference.common">
+ </keyword>
+ <keyword
+ id="com.nokia.carbide.cpp.codescanner.codescanner"
+ label="%carbcPreference.codescanner">
+ </keyword>
+ </extension>
</plugin>
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_categories.png has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_types.htm Thu Jun 11 16:16:05 2009 -0500
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Launch Types</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<h2>Launch Types</h2>
+<p>The following launch configuration types are available:</p>
+<ul>
+ <li><a href="applications.htm">Applications</a></li>
+ <li><a href="run_mode.htm">Application TRK</a></li>
+ <li><a href="attach_process.htm">Attach to Process</a></li>
+ <li><a href="emulation.htm">Emulation</a></li>
+ <li><a href="sophia.htm">Sophia (STI)</a></li>
+ <li><a href="stop_mode.htm">System TRK</a></li>
+ <li><a href="trace32.htm">Trace32</a></li>
+</ul>
+<h4>Other references</h4>
+<ul>
+ <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
+</ul>
+<div id="footer">Copyright © 2009 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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm Thu Jun 11 16:14:53 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-<!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>New Launch Configuration Wizard</title>
- <link rel="StyleSheet" href="../../../book.css" type="text/css" />
-</head>
-<body bgcolor="#ffffff">
-<h2>New Launch Configuration Wizard </h2>
-<p>The <b>New Launch Configuration Wizard</b> launches when no launch configuration exists for a project. Wherever possible the <b>New Launch Configuration </b> wizard gathers the information from the project and asks additional questions based on the type of launch configuration chosen. For example, a launch configuration using Application TRK requires different information than one targeted for System TRK. </p>
-<p>For Application TRK and System TRK the following pages appear: </p>
-<ul>
- <li><a href="#LAUNCH">Launch Type</a></li>
- <li><a href="#EXE_SEL">Executable Selection </a></li>
- <li><a href="#TRK_CONN">TRK Connection Settings</a></li>
- <li><a href="#TRK_SIS">TRK SIS Selection</a> (<i>Application TRK only</i>) </li>
- <li><a href="#FINISH">New Launch Configuration</a></li>
-</ul>
-<p>For Trace32 launch configurations the following wizard pages appear:</p>
-<ul>
- <li><a href="#LAUNCH">Launch Type</a></li>
- <li><a href="#EXE_SEL">Executable Selection </a></li>
- <li><a href="#TRACE32">Trace32 Initialization Settings</a></li>
- <li><a href="#ROM_IMG">Symbian ROM Image Settings</a></li>
- <li><a href="#FINISH">New Launch Configuration</a></li>
-</ul>
-<p>For Sophia STI launch configurations the following wizard pages appear:</p>
-<ul>
- <li><a href="#LAUNCH">Launch Type</a></li>
- <li><a href="#EXE_SEL">Executable Selection </a></li>
- <li><a href="#SOPHIA">Sophia Initialization Settings</a></li>
- <li><a href="#ROM_IMG">Symbian ROM Image Settings</a></li>
- <li><a href="#FINISH">New Launch Configuration</a></li>
-</ul>
-<p>For Attach to Process launch configurations the following wizard pages appear:</p>
-<ul>
- <li><a href="#TRK_CONN">TRK Connection Settings</a></li>
- <li><a href="#FINISH">New Launch Configuration</a></li>
-</ul>
-<p>To access the <b>New Launch Configurtion Wizard</b>, set the Build Target to a Phone Debug target (Figure 1), then click the <b>Debug</b> icon (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle">). If no launch configuration exists for the build target the wizard is launched. If a launch configuration already exists, then that launch configuration is launched and not the wizard.</p>
-<p>For emulator targets, the New Launch Configuration Wizard can gather all the information it needs from the project, so clicking <b>Debug</b> just launches the debug session.</p>
-<p align="center"><img src="../../images/icons/menu_build_target.png" width="270" height="120"></p>
-<p class="figure">Figure 1 - Build Target selection list </p>
-<h3><a name="LAUNCH" id="LAUNCH"></a>Launch Types</h3>
-<p>Use the<b> Launch Types</b> page to select the type of launch configuration for the build target. Available types are listed from the most frequently chosen (Application TRK) to the least likely type (Attach to Process). Select a type and click <b>Next</b>. </p>
-<p align="center"><img src="../../images/icons/wiz_launch_config_launch_types.png" width="438" height="533"></p>
-<p class="figure">Figure 2 - Launch Type page </p>
-<p> </p>
-<h3><a name="EXE_SEL" id="EXE_SEL"></a>Executable Selection </h3>
-<p>Use the <b>Application Selection </b> page to choose a binary created by the project to launch and debug and verify its location. If only a single binary is available the <b>Executable to launch</b> option is disabled. Use the <b>Specify device or emulator path of executable to launch</b> option to specify alternate paths for launching the executable from RAM (c:\sys\bin\), ROM (z:\sys\bin\) or memory cards (e:\sys\bin\) . </p>
-<p>Use the <b>Location</b> field for emulator targets to verify that the correct executable on the host is selected. This field is not used with on-device launch configurations. </p>
-<p>Select the Executable to launch, verify it is the correct binary, then click <b>Next</b>. </p>
-<p align="center"><img src="../../images/icons/wiz_launch_config_app_selection.png" width="438" height="533"> </p>
-<p class="figure">Figure 3 - Executable Selection page </p>
-<h3><a name="TRK_CONN" id="TRK_CONN"></a>TRK Connection Settings </h3>
-<p>Use the <b>TRK Connection Settings</b> page to specify the COM port used to communicate with the target device. If the device is already connected, the drop down list will include both the COM port and the name of the device using that port. Use the <a href="../../../reference/trk/wnd_on_device_setup.htm">On-Device Setup</a> dialog to verify and update all Carbide software services on the device. Choose the serial port used to communicate with the target device and click <b>Next</b>. </p>
-<p align="center"><img src="../../images/icons/wiz_launch_config_trk_conn.png" width="463" height="533"> </p>
-<p class="figure">Figure 4 - TRK Connection Settings page </p>
-<p> </p>
-<h3><a name="TRK_SIS" id="TRK_SIS"></a>TRK SIS Selection</h3>
-<p>Use the <b>TRK SIS Selection</b> page to select the SIS file to install on the target device. Click the <b>Modify SIS builder settings for build configuration</b> link to open the <a href="../../reference/wnd_debug_configuration.htm">SIS Builder</a> properties page to add, edit, or review the SIS files to build. Once the correct SIS File to Install is selected, click <b>Next</b>. </p>
-<p align="center"><img src="../../images/icons/wiz_launch_config_trk_sis.png" width="463" height="533"></p>
-<p class="figure">Figure 5 - TRK SIS Selection page </p>
-<h3><a name="FINISH" id="FINISH"></a>New Launch Configuration</h3>
-<p>Use the <b>New Launch Configuration</b> page to note the name of the configuration, confirm the launch configuration settings, and then launch the debug session. If something doesn't look right, click <b>Back</b> to return to a page and change its setting. If all the settings are correct, click <b>Finish</b> to start the debug session using this launch configuration. </p>
-<p>If you checkmark <b> Advanced settings</b>, the <a href="trace32.htm">Debug</a> dialog appears instead of launching the project. This enables you to make additional changes to the new launch configuration before starting the debug session. By design and intent, this should seldom be required for the initial launch. </p>
-<p align="center"><img src="../../images/icons/wiz_launch_config_finish.png" width="438" height="533"></p>
-<p class="figure">Figure 6 - New Launch Configuration page </p>
-<h3><a name="TRACE32" id="TRACE32"></a>Trace32 Initialization Settings</h3>
-<p>Use the <b>Trace32 Initialization Settings</b> page to specify the <a href="sophia.htm">initialization</a> script and target processor of the target device.Enter the Trace32 Initialization Script and choose the Target Processor, then click <b>Next</b>. </p>
-<p> This page only appears when creating a Trace32 launch configuration. </p>
-<p align="center"><img src="../../images/icons/wiz_launch_config_trace32.png" width="438" height="533"></p>
-<p class="figure">Figure 7 - <b>Trace32 Initialization Settings</b> page </p>
-<h3><a name="SOPHIA" id="SOPHIA"></a>Sophia STI Initialization Settings</h3>
-<p>Use the <b>Sophia STI Initialization Settings</b> page to specify the target interface, <a href="page_rom_image.htm">initialization</a> file, and target processor of the target device. Enter the Sophia Target Interface and Target Initialization File paths, choose a Target Processor, then click <b>Next</b>. </p>
-<p>This page only appears when creating a Sophia STI launch configuration. </p>
-<p align="center"><img src="../../images/icons/wiz_launch_config_sophia.png" width="438" height="533"></p>
-<p class="figure">Figure 8 - Sophia STI Initialization Settings page </p>
-<h3><a name="ROM_IMG" id="ROM_IMG"></a>Symbian ROM Image Settings</h3>
-<p>Use the <b>Symbian ROM Image Settings</b> page to specify the method of <a href="page_debugger.htm">debugging</a>, the start address, and the <a href="../../../reference/launch_configs/stop_mode_rom_image.htm">ROM Image</a> and Log File locations. </p>
-<p>This page appears when creating a Trace32 or Sophia STI launch configuration. </p>
-<p align="center"><img src="../../images/icons/wiz_launch_config_rom_image.png" width="438" height="533"></p>
-<p class="figure">Figure 9 - Symbian ROM Image Settings page</p>
-<h5>Other references</h5>
-<ul>
- <li><a href="launch_configs_overview.htm">Launch Configuration</a> </li>
-</ul>
-<div id="footer">Copyright © 2009 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>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Thu Jun 11 16:14:53 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Thu Jun 11 16:16:05 2009 -0500
@@ -189,7 +189,7 @@
<topic label="New Launch Configuration Wizard" href="html/projects/launch/wiz_new_launch_config.htm" />
<topic label="Debug dialog" href="html/projects/launch/wnd_debug_configuration.htm" />
- <topic label="Launch types" href="html/concepts/launch_configuration.htm" >
+ <topic label="Launch types" href="html/projects/launch/launch_types.htm" >
<topic label="Applications" href="html/projects/launch/applications.htm" />
<topic label="Application TRK" href="html/projects/launch/run_mode.htm" />
<topic label="Attach to Process" href="html/projects/launch/attach_process.htm" />
--- a/core/com.nokia.carbide.cpp.news.reader/plugin.properties Thu Jun 11 16:14:53 2009 -0500
+++ b/core/com.nokia.carbide.cpp.news.reader/plugin.properties Thu Jun 11 16:16:05 2009 -0500
@@ -6,3 +6,8 @@
pluginName = FeedListing Model
providerName = www.example.org
+
+
+#Keywords for Carbide preferences
+carbcPreference.common=carbide symbian c cpp cplusplus
+carbcPreference.newsreader=news feed reader rss info start video training online help
--- a/core/com.nokia.carbide.cpp.news.reader/plugin.xml Thu Jun 11 16:14:53 2009 -0500
+++ b/core/com.nokia.carbide.cpp.news.reader/plugin.xml Thu Jun 11 16:16:05 2009 -0500
@@ -85,11 +85,28 @@
category="com.nokia.carbide.cpp.project.ui.preferences.CarbidePreferencePage"
class="com.nokia.carbide.cpp.internal.news.reader.ui.NewsPreferencePage"
id="com.nokia.carbide.cpp.news.reader.NewsPreferencePage">
+ <keywordReference
+ id="com.nokia.carbide.cpp.news.reader.common">
+ </keywordReference>
+ <keywordReference
+ id="com.nokia.carbide.cpp.news.reader.newsreader">
+ </keywordReference>
</page>
</extension>
<extension
point="org.eclipse.ui.startup">
</extension>
+ <extension
+ point="org.eclipse.ui.keywords">
+ <keyword
+ id="com.nokia.carbide.cpp.news.reader.common"
+ label="%carbcPreference.common">
+ </keyword>
+ <keyword
+ id="com.nokia.carbide.cpp.news.reader.newsreader"
+ label="%carbcPreference.newsreader">
+ </keyword>
+ </extension>
</plugin>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/plugin.properties Thu Jun 11 16:16:05 2009 -0500
@@ -0,0 +1,4 @@
+
+#Keywords for Carbide preferences
+carbcPreference.common=carbide symbian c cpp cplusplus
+carbcPreference.hoverhelp=hover help libraries developer
--- a/core/com.nokia.carbide.cpp.sysdoc.hover/plugin.xml Thu Jun 11 16:14:53 2009 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/plugin.xml Thu Jun 11 16:16:05 2009 -0500
@@ -18,6 +18,12 @@
id="com.nokia.carbide.cpp.sysdoc.internal.hover.preferences.HoverHelpPreferencePage"
name="Hover Help"
category="com.nokia.carbide.cpp.project.ui.preferences.CarbidePreferencePage">
+ <keywordReference
+ id="com.nokia.carbide.cpp.sysdoc.hover.common">
+ </keywordReference>
+ <keywordReference
+ id="com.nokia.carbide.cpp.sysdoc.hover.hoverhelp">
+ </keywordReference>
</page>
</extension>
<extension
@@ -66,6 +72,22 @@
file="resources/help context/hoverTOC.xml"
primary="false" />
</extension>
+
+<!-- =================================================================================== -->
+<!-- PREFERENCE PANEL FILTER SETUP FOR CARBIDE -->
+<!-- =================================================================================== -->
+
+ <extension
+ point="org.eclipse.ui.keywords">
+ <keyword
+ id="com.nokia.carbide.cpp.sysdoc.hover.common"
+ label="%carbcPreference.common">
+ </keyword>
+ <keyword
+ id="com.nokia.carbide.cpp.sysdoc.hover.hoverhelp"
+ label="%carbcPreference.hoverhelp">
+ </keyword>
+ </extension>
</plugin>
--- a/core/com.nokia.carbide.search.system/plugin.properties Thu Jun 11 16:14:53 2009 -0500
+++ b/core/com.nokia.carbide.search.system/plugin.properties Thu Jun 11 16:16:05 2009 -0500
@@ -31,7 +31,7 @@
SearchPreferencePage.label= System Search
-preferenceKeywords.general=System Search
+preferenceKeywords.general=system search editors color perspective matches
ActionDefinition.openFileSearchPage.name= System Search
ActionDefinition.openFileSearchPage.description= Open the System Search dialog\'s file search page
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/plugin.properties Thu Jun 11 16:14:53 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/plugin.properties Thu Jun 11 16:16:05 2009 -0500
@@ -1,3 +1,7 @@
HwBreakpoint.label=Toggle HW Breakpoint
-SkipAction.name=Skip Action
\ No newline at end of file
+SkipAction.name=Skip Action
+
+#Keywords for Carbide preferences
+carbcPreference.common=carbide symbian c cpp cplusplus
+carbcPreference.carbidedebugger=debug debugger dynamic runtime objects support code arrays sdk view
\ No newline at end of file
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/plugin.xml Thu Jun 11 16:14:53 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/plugin.xml Thu Jun 11 16:16:05 2009 -0500
@@ -15,6 +15,8 @@
category="org.eclipse.cdt.debug.ui.CDebugPreferencePage"
class="com.nokia.cdt.debug.cw.symbian.ui.GlobalSettings"
id="com.nokia.cdt.debug.cw.symbian.ui.GlobalSettings">
+ <keywordReference id="com.nokia.cdt.debug.cw.symbian.carbidecommon"/>
+ <keywordReference id="com.nokia.cdt.debug.cw.symbian.carbidedebugger"/>
</page>
</extension>
<extension
@@ -199,5 +201,18 @@
point="org.eclipse.cdt.debug.core.SourceRemappingProvider">
<provider class="com.nokia.cdt.debug.cw.symbian.ui.executables.SymbianSourceFileRemapping"/>
</extension>
+
+ <!-- *************** Preference Page Keyword Filtering **************** -->
+ <extension
+ point="org.eclipse.ui.keywords">
+ <keyword
+ id="com.nokia.cdt.debug.cw.symbian.carbidedebugger"
+ label="%carbcPreference.carbidedebugger">
+ </keyword>
+ <keyword
+ id="com.nokia.cdt.debug.cw.symbian.carbidecommon"
+ label="%carbcPreference.common">
+ </keyword>
+ </extension>
</plugin>
--- a/project/com.nokia.carbide.cpp.project.ui/plugin.properties Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/plugin.properties Thu Jun 11 16:16:05 2009 -0500
@@ -31,3 +31,8 @@
markerGrouping.errors=Errors
markerGrouping.warnings=Warnings
markerGrouping.other=Other
+
+
+#Keywords for Carbide preferences
+carbcPreference.common=carbide symbian c cpp cplusplus
+carbcPreference.carbidecpp=project bld.inf mmp moved modified
--- a/project/com.nokia.carbide.cpp.project.ui/plugin.xml Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/plugin.xml Thu Jun 11 16:16:05 2009 -0500
@@ -78,6 +78,12 @@
name="%carbidePrefPageName"
class="com.nokia.carbide.cpp.internal.project.ui.preferences.CarbidePreferencePage"
id="com.nokia.carbide.cpp.project.ui.preferences.CarbidePreferencePage">
+ <keywordReference
+ id="com.nokia.carbide.cpp.project.ui.common">
+ </keywordReference>
+ <keywordReference
+ id="com.nokia.carbide.cpp.project.ui.carbidecpp">
+ </keywordReference>
</page>
</extension>
<extension
@@ -516,5 +522,16 @@
</command>
</menuContribution>
</extension>
+ <extension
+ point="org.eclipse.ui.keywords">
+ <keyword
+ id="com.nokia.carbide.cpp.project.ui.common"
+ label="%carbdPreference.common">
+ </keyword>
+ <keyword
+ id="com.nokia.carbide.cpp.project.ui.carbidecpp"
+ label="%carbcPreference.carbidecpp">
+ </keyword>
+ </extension>
</plugin>
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/BldInfEditor.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/BldInfEditor.java Thu Jun 11 16:16:05 2009 -0500
@@ -45,6 +45,7 @@
import com.nokia.carbide.cdt.internal.api.builder.ui.ManageConfigurationsDialog;
import com.nokia.carbide.cpp.epoc.engine.model.BldInfModelFactory;
import com.nokia.carbide.cpp.epoc.engine.model.IView;
+import com.nokia.carbide.cpp.epoc.engine.model.bldinf.IBldInfView;
import com.nokia.carbide.cpp.internal.project.ui.editors.common.CarbideFormEditor;
import com.nokia.carbide.cpp.internal.project.ui.editors.common.CarbideTextEditor;
import com.nokia.cpp.internal.api.utils.core.Check;
@@ -338,4 +339,8 @@
return exportsPage;
}
+ public IBldInfView getBldInfView() {
+ return editorContext.bldInfView;
+ }
+
}
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/ExportsPage.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/ExportsPage.java Thu Jun 11 16:16:05 2009 -0500
@@ -105,7 +105,7 @@
return testExports;
}
- public String getErrorMesaage() {
+ public String getErrorMessage() {
return getManagedForm().getForm().getMessage();
}
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/OverviewPage.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/OverviewPage.java Thu Jun 11 16:16:05 2009 -0500
@@ -194,7 +194,7 @@
return testMakMakeFiles;
}
- public String getErrorMesaage() {
+ public String getErrorMessage() {
return getManagedForm().getForm().getMessage();
}
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/testapi/BldInfEditorTester.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/testapi/BldInfEditorTester.java Thu Jun 11 16:16:05 2009 -0500
@@ -21,6 +21,7 @@
import org.eclipse.ui.forms.editor.FormEditor;
import org.eclipse.ui.forms.editor.FormPage;
+import com.nokia.carbide.cpp.epoc.engine.model.bldinf.IBldInfView;
import com.nokia.carbide.cpp.internal.project.ui.editors.inf.BldInfEditor;
/**
@@ -67,4 +68,17 @@
return null;
}
+ /**
+ * Retrieves the view model of the Bld.inf editor.
+ * @param editor - editor part provided by caller
+ * @return Bld.inf view model if success, null otherwise
+ */
+ public static IBldInfView getBldInfView(FormEditor editor) {
+ if (editor != null && editor instanceof BldInfEditor) {
+ BldInfEditor infEditor = (BldInfEditor) editor;
+ return infEditor.getBldInfView();
+ }
+ return null;
+ }
+
}
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/testapi/ExpportsPageTester.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/testapi/ExpportsPageTester.java Thu Jun 11 16:16:05 2009 -0500
@@ -36,10 +36,10 @@
* @param page - Exports page provided by caller
* @return error message string if success, null otherwise
*/
- public static String getErrorMesaage(FormPage page) {
+ public static String getErrorMessage(FormPage page) {
if (page != null && page instanceof ExportsPage) {
ExportsPage exportsPage = (ExportsPage) page;
- return exportsPage.getErrorMesaage();
+ return exportsPage.getErrorMessage();
}
return null;
}
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/testapi/OverviewPageTester.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/testapi/OverviewPageTester.java Thu Jun 11 16:16:05 2009 -0500
@@ -39,10 +39,10 @@
* @param page - Overview page provided by caller
* @return error message string if success, null otherwise
*/
- public static String getErrorMesaage(FormPage page) {
+ public static String getErrorMessage(FormPage page) {
if (page != null && page instanceof OverviewPage) {
OverviewPage overviewPage = (OverviewPage) page;
- return overviewPage.getErrorMesaage();
+ return overviewPage.getErrorMessage();
}
return null;
}
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/LibrariesPage.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/LibrariesPage.java Thu Jun 11 16:16:05 2009 -0500
@@ -156,7 +156,7 @@
return debugLibraries;
}
- public String getErrorMesaage() {
+ public String getErrorMessage() {
return getManagedForm().getForm().getMessage();
}
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/MMPEditor.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/MMPEditor.java Thu Jun 11 16:16:05 2009 -0500
@@ -21,6 +21,7 @@
import com.nokia.carbide.cdt.internal.api.builder.ui.ManageConfigurationsDialog;
import com.nokia.carbide.cpp.epoc.engine.model.IView;
import com.nokia.carbide.cpp.epoc.engine.model.MMPModelFactory;
+import com.nokia.carbide.cpp.epoc.engine.model.mmp.IMMPView;
import com.nokia.carbide.cpp.internal.project.ui.editors.common.*;
import com.nokia.cpp.internal.api.utils.core.*;
import com.nokia.cpp.internal.api.utils.ui.*;
@@ -370,4 +371,7 @@
return optionsPage;
}
+ public IMMPView getMMPView() {
+ return editorContext.mmpView;
+ }
}
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/OptionsPage.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/OptionsPage.java Thu Jun 11 16:16:05 2009 -0500
@@ -127,7 +127,7 @@
return kernelSectionPart;
}
- public String getErrorMesaage() {
+ public String getErrorMessage() {
return getManagedForm().getForm().getMessage();
}
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/OverviewPage.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/OverviewPage.java Thu Jun 11 16:16:05 2009 -0500
@@ -453,7 +453,7 @@
return optionsImageHyperlink;
}
- public String getErrorMesaage() {
+ public String getErrorMessage() {
return getManagedForm().getForm().getMessage();
}
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/SourcesPage.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/SourcesPage.java Thu Jun 11 16:16:05 2009 -0500
@@ -136,7 +136,7 @@
return missingSourcesSectionPart;
}
- public String getErrorMesaage() {
+ public String getErrorMessage() {
return getManagedForm().getForm().getMessage();
}
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/LibrariesPageTester.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/LibrariesPageTester.java Thu Jun 11 16:16:05 2009 -0500
@@ -36,10 +36,10 @@
* @param page - Libraries page provided by caller
* @return error message string if success, null otherwise
*/
- public static String getErrorMesaage(FormPage page) {
+ public static String getErrorMessage(FormPage page) {
if (page != null && page instanceof LibrariesPage) {
LibrariesPage librariesPage = (LibrariesPage) page;
- return librariesPage.getErrorMesaage();
+ return librariesPage.getErrorMessage();
}
return null;
}
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/MMPEditorTester.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/MMPEditorTester.java Thu Jun 11 16:16:05 2009 -0500
@@ -21,6 +21,7 @@
import org.eclipse.ui.forms.editor.FormEditor;
import org.eclipse.ui.forms.editor.FormPage;
+import com.nokia.carbide.cpp.epoc.engine.model.mmp.IMMPView;
import com.nokia.carbide.cpp.internal.project.ui.mmpEditor.MMPEditor;
/**
@@ -93,4 +94,17 @@
return null;
}
+ /**
+ * Retrieves the view model of the MMP editor.
+ * @param editor - editor part provided by caller
+ * @return MMP view model if success, null otherwise
+ */
+ public static IMMPView getMMPView(FormEditor editor) {
+ if (editor != null && editor instanceof MMPEditor) {
+ MMPEditor mmpEditor = (MMPEditor) editor;
+ return mmpEditor.getMMPView();
+ }
+ return null;
+ }
+
}
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/OptionsPageTester.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/OptionsPageTester.java Thu Jun 11 16:16:05 2009 -0500
@@ -41,10 +41,10 @@
* @param page - Options page provided by caller
* @return error message string if success, null otherwise
*/
- public static String getErrorMesaage(FormPage page) {
+ public static String getErrorMessage(FormPage page) {
if (page != null && page instanceof OptionsPage) {
OptionsPage optionsPage = (OptionsPage) page;
- return optionsPage.getErrorMesaage();
+ return optionsPage.getErrorMessage();
}
return null;
}
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/OverviewPageTester.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/OverviewPageTester.java Thu Jun 11 16:16:05 2009 -0500
@@ -36,10 +36,10 @@
* @param page - Overview page provided by caller
* @return error message string if success, null otherwise
*/
- public static String getErrorMesaage(FormPage page) {
+ public static String getErrorMessage(FormPage page) {
if (page != null && page instanceof OverviewPage) {
OverviewPage overviewPage = (OverviewPage) page;
- return overviewPage.getErrorMesaage();
+ return overviewPage.getErrorMessage();
}
return null;
}
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/SourcesPageTester.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/SourcesPageTester.java Thu Jun 11 16:16:05 2009 -0500
@@ -39,10 +39,10 @@
* @param page - Sources page provided by caller
* @return error message string if success, null otherwise
*/
- public static String getErrorMesaage(FormPage page) {
+ public static String getErrorMessage(FormPage page) {
if (page != null && page instanceof SourcesPage) {
SourcesPage sourcesPage = (SourcesPage) page;
- return sourcesPage.getErrorMesaage();
+ return sourcesPage.getErrorMessage();
}
return null;
}
--- a/uidesigner/com.nokia.sdt.uidesigner/plugin.properties Thu Jun 11 16:14:53 2009 -0500
+++ b/uidesigner/com.nokia.sdt.uidesigner/plugin.properties Thu Jun 11 16:16:05 2009 -0500
@@ -19,4 +19,9 @@
pluginName = My Model
providerName = www.example.org
-carbideCPPCategory = Carbide.c++
\ No newline at end of file
+carbideCPPCategory = Carbide.c++
+
+
+#Keywords for Carbide preferences
+carbcPreference.common=carbide symbian c cpp cplusplus
+carbcPreference.uidesigner=ui designer event handler source design objects sync
--- a/uidesigner/com.nokia.sdt.uidesigner/plugin.xml Thu Jun 11 16:14:53 2009 -0500
+++ b/uidesigner/com.nokia.sdt.uidesigner/plugin.xml Thu Jun 11 16:16:05 2009 -0500
@@ -55,6 +55,24 @@
category="com.nokia.carbide.cpp.project.ui.preferences.CarbidePreferencePage"
class="com.nokia.sdt.uidesigner.preferences.UIDesignerPreferences"
id="com.nokia.sdt.uidesigner.preferences.UIDesignerPreferences"
- name="UI Designer"/>
+ name="UI Designer">
+ <keywordReference
+ id="com.nokia.sdt.uidesigner.common">
+ </keywordReference>
+ <keywordReference
+ id="com.nokia.sdt.uidesigner.uidesigner">
+ </keywordReference>
+ </page>
+ </extension>
+ <extension
+ point="org.eclipse.ui.keywords">
+ <keyword
+ id="com.nokia.sdt.uidesigner.common"
+ label="%carbcPreference.common">
+ </keyword>
+ <keyword
+ id="com.nokia.sdt.uidesigner.uidesigner"
+ label="%carbcPreference.uidesigner">
+ </keyword>
</extension>
</plugin>