# HG changeset patch
# User Maria Zhelezova <ext-maria.zhelezova@nokia.com>
# Date 1283751569 -10800
# Node ID aa3399e010585a2eac8a01f080e9e099ab232a8b
# Parent  a7167d9d37923552f0c6214a715c601cb88c01af
RemoteControl 1.5.0

diff -r a7167d9d3792 -r aa3399e01058 remotecontrol/com.nokia.carbide.extensions.remotecontrol.discovery/META-INF/MANIFEST.MF
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/remotecontrol/com.nokia.carbide.extensions.remotecontrol.discovery/META-INF/MANIFEST.MF	Mon Sep 06 08:39:29 2010 +0300
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: com.nokia.carbide.extensions.remotecontrol Discovery Items
+Bundle-SymbolicName: com.nokia.carbide.extensions.remotecontrol.discovery;singleton:=true
+Bundle-Version: 1.5.0.qualifier
+Bundle-Localization: plugin
+Bundle-Vendor: Nokia
+Require-Bundle: org.eclipse.equinox.p2.discovery
diff -r a7167d9d3792 -r aa3399e01058 remotecontrol/com.nokia.carbide.extensions.remotecontrol.discovery/build.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/remotecontrol/com.nokia.carbide.extensions.remotecontrol.discovery/build.properties	Mon Sep 06 08:39:29 2010 +0300
@@ -0,0 +1,4 @@
+bin.includes = META-INF/,\
+               plugin.xml,\
+               images/,\
+               plugin.properties
diff -r a7167d9d3792 -r aa3399e01058 remotecontrol/com.nokia.carbide.extensions.remotecontrol.discovery/images/RC_icon.png
Binary file remotecontrol/com.nokia.carbide.extensions.remotecontrol.discovery/images/RC_icon.png has changed
diff -r a7167d9d3792 -r aa3399e01058 remotecontrol/com.nokia.carbide.extensions.remotecontrol.discovery/images/RC_shot.png
Binary file remotecontrol/com.nokia.carbide.extensions.remotecontrol.discovery/images/RC_shot.png has changed
diff -r a7167d9d3792 -r aa3399e01058 remotecontrol/com.nokia.carbide.extensions.remotecontrol.discovery/plugin.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/remotecontrol/com.nokia.carbide.extensions.remotecontrol.discovery/plugin.properties	Mon Sep 06 08:39:29 2010 +0300
@@ -0,0 +1,5 @@
+summary=The Remote Control Carbide.c++ Extension provides an easy way of sharing a device screen on a PC and controlling a device with a PC. Remote Control uses the HTI Connection service for communicating between Carbide.c++ and a device or an emulator.\n\
+\n\
+\t --Provides an easy way of sharing a device screen on a PC. The device screen appears in the Carbide.c++ view\n\
+\t --Transfer files between a device and a PC.\n\
+\t --Touch support - tapping and dragging the screen
diff -r a7167d9d3792 -r aa3399e01058 remotecontrol/com.nokia.carbide.extensions.remotecontrol.discovery/plugin.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/remotecontrol/com.nokia.carbide.extensions.remotecontrol.discovery/plugin.xml	Mon Sep 06 08:39:29 2010 +0300
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.mylyn.discovery.core.connectorDiscovery">
+      
+      <connectorDescriptor
+            categoryId="com.nokia.carbide.rndutilities.category"
+            description="An easy way of sharing a device screen on a PC and controlling a device with a PC"
+            groupId="com.nokia.carbide.rndutilities.category"
+            id="com.nokia.carbide.extensions.remotecontrol.feature.group"
+            kind="task"
+            license="EPL 1.0"
+            name="Remote Control"
+            provider="Nokia"
+            siteUrl="${SITE_URL}">
+         <overview
+               summary="%summary"
+               screenshot="images/RC_shot.png"
+               url="http://developer.symbian.org/wiki/index.php/Remote_Control_Carbide_Extension">
+         </overview>
+         <icon
+               image32="images/RC_icon.png">
+         </icon>
+      </connectorDescriptor>
+
+   </extension>
+</plugin>
diff -r a7167d9d3792 -r aa3399e01058 remotecontrol/com.nokia.carbide.extensions.remotecontrol/feature.xml
--- a/remotecontrol/com.nokia.carbide.extensions.remotecontrol/feature.xml	Mon Sep 06 08:30:18 2010 +0300
+++ b/remotecontrol/com.nokia.carbide.extensions.remotecontrol/feature.xml	Mon Sep 06 08:39:29 2010 +0300
@@ -2,7 +2,7 @@
 <feature
       id="com.nokia.carbide.extensions.remotecontrol"
       label="Carbide.c++ Extensions - Remote Control"
-      version="1.4.0"
+      version="1.5.0"
       provider-name="Nokia"
       plugin="com.nokia.s60tools.remotecontrol">
 
@@ -28,8 +28,8 @@
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="com.nokia.s60tools.util" version="1.1.11" match="greaterOrEqual"/>
-      <import plugin="com.nokia.s60tools.hticonnection" version="1.4.0" match="greaterOrEqual"/>
+      <import feature="com.nokia.s60tools.extensions.framework"/>
+      <import feature="com.nokia.carbide.extensions.hticonnection" version="1.4.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff -r a7167d9d3792 -r aa3399e01058 remotecontrol/com.nokia.s60tools.remotecontrol.help/META-INF/MANIFEST.MF
--- a/remotecontrol/com.nokia.s60tools.remotecontrol.help/META-INF/MANIFEST.MF	Mon Sep 06 08:30:18 2010 +0300
+++ b/remotecontrol/com.nokia.s60tools.remotecontrol.help/META-INF/MANIFEST.MF	Mon Sep 06 08:39:29 2010 +0300
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Carbide.c++ Extensions - Remote Control Help Plug-in
+Bundle-Name: Carbide.c++ Extensions - Remote Control Help
 Bundle-SymbolicName: com.nokia.s60tools.remotecontrol.help;singleton:=true
-Bundle-Version: 1.4.0
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Nokia
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime
diff -r a7167d9d3792 -r aa3399e01058 remotecontrol/com.nokia.s60tools.remotecontrol/META-INF/MANIFEST.MF
--- a/remotecontrol/com.nokia.s60tools.remotecontrol/META-INF/MANIFEST.MF	Mon Sep 06 08:30:18 2010 +0300
+++ b/remotecontrol/com.nokia.s60tools.remotecontrol/META-INF/MANIFEST.MF	Mon Sep 06 08:39:29 2010 +0300
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Carbide.c++ Extensions - Remote Control
 Bundle-SymbolicName: com.nokia.s60tools.remotecontrol;singleton:=true
-Bundle-Version: 1.4.0
+Bundle-Version: 1.5.0.qualifier
 Bundle-Activator: com.nokia.s60tools.remotecontrol.RemoteControlActivator
 Bundle-Vendor: Nokia
 Require-Bundle: org.eclipse.ui,
diff -r a7167d9d3792 -r aa3399e01058 remotecontrol/com.nokia.s60tools.remotecontrol/plugin.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/remotecontrol/com.nokia.s60tools.remotecontrol/plugin.properties	Mon Sep 06 08:39:29 2010 +0300
@@ -0,0 +1,22 @@
+################################################################################
+#
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+#
+################################################################################
+# plugin.properties
+# contains externalized strings for plugin.xml
+
+remoteControlPreference.common=remotecontrol 
diff -r a7167d9d3792 -r aa3399e01058 remotecontrol/com.nokia.s60tools.remotecontrol/plugin.xml
--- a/remotecontrol/com.nokia.s60tools.remotecontrol/plugin.xml	Mon Sep 06 08:30:18 2010 +0300
+++ b/remotecontrol/com.nokia.s60tools.remotecontrol/plugin.xml	Mon Sep 06 08:39:29 2010 +0300
@@ -49,13 +49,25 @@
             id="com.nokia.s60tools.remotecontrol.ui.views.main.MainView"
             name="Remote Control"/>
    </extension>
+   
+   <extension
+       point="org.eclipse.ui.keywords">
+    <keyword
+          id="com.nokia.s60tools.remotecontrol.common"
+          label="%remoteControlPreference.common">
+    </keyword>
+   </extension>
+   
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
             category="com.nokia.carbide.cpp.preferences.ExtensionsPreferencesPage"
             class="com.nokia.s60tools.remotecontrol.preferences.RCPreferencePage"
             id="com.nokia.s60tools.remotecontrol.RCPreferencePage"
-            name="Remote Control Preferences">
+            name="Remote Control">
+         <keywordReference
+               id="com.nokia.s60tools.remotecontrol.common">
+         </keywordReference>
       </page>
    </extension>
    <extension
diff -r a7167d9d3792 -r aa3399e01058 remotecontrol/com.nokia.s60tools.remotecontrol/src/com/nokia/s60tools/remotecontrol/preferences/RCPreferencePage.java
--- a/remotecontrol/com.nokia.s60tools.remotecontrol/src/com/nokia/s60tools/remotecontrol/preferences/RCPreferencePage.java	Mon Sep 06 08:30:18 2010 +0300
+++ b/remotecontrol/com.nokia.s60tools.remotecontrol/src/com/nokia/s60tools/remotecontrol/preferences/RCPreferencePage.java	Mon Sep 06 08:39:29 2010 +0300
@@ -35,7 +35,7 @@
 import com.nokia.s60tools.remotecontrol.resources.Messages;
 
 /**
- * Reference page for Remote control
+ * Preference page for Remote control
  */
 public class RCPreferencePage extends PreferencePage implements
 		IWorkbenchPreferencePage {
@@ -70,7 +70,7 @@
 	 * General constructor for opening default page.
 	 */
 	public RCPreferencePage() {
-		super(ProductInfoRegistry.getProductName() + Messages.getString("RCPreferencePage.Preferences")); //$NON-NLS-1$
+		super(ProductInfoRegistry.getProductName());
 	}
 
 	/*