Fix #1368081: First suggestion in #1368081 seems to be working better

[phpeclipse.git] / net.sourceforge.phpeclipse.phphelp / plugin.xml

diff --git a/net.sourceforge.phpeclipse.phphelp/plugin.xml b/net.sourceforge.phpeclipse.phphelp/plugin.xml
index ee11706..8691566 100644 (file)
--- a/net.sourceforge.phpeclipse.phphelp/plugin.xml
+++ b/net.sourceforge.phpeclipse.phphelp/plugin.xml
@@ -3,12 +3,14 @@
 <plugin
    id="net.sourceforge.phpeclipse.phphelp"
    name="%pluginName"
-   version="1.0.4"
+   version="1.1.7"
    provider-name="%providerName"
    class="net.sourceforge.phpdt.phphelp.PHPHelpPlugin">
 
    <runtime>
-      <library name="phphelp.jar"/>
+      <library name="phphelp.jar">
+      <export name="*"/>
+      </library>
    </runtime>
    <requires>
       <import plugin="org.eclipse.core.runtime.compatibility"/>
@@ -23,21 +25,66 @@
       <import plugin="org.eclipse.swt"/>
       <import plugin="net.sourceforge.phpeclipse"/>
    </requires>
-  
    <extension
          point="org.eclipse.ui.popupMenus">   
       <viewerContribution
             targetID="#PHPEditorContext"
             id="net.sourceforge.phpdt.phphelp.actions.popup.editor">
          <action
+               definitionId="net.sourceforge.phpdt.phphelp.actions.contexthelp"
                label="%phphelpLabel"
                class="net.sourceforge.phpdt.phphelp.actions.PHPEclipseShowContextHelp"
                menubarPath="additions"
-               id="net.sourceforge.phpdt.phphelp.actions.contexthelp">
+               id="net.sourceforge.phpdt.phphelp.actions.PHPEclipseShowContextHelp">
          </action>
       </viewerContribution>
    </extension>
+  
+   <extension
+         point="org.eclipse.ui.editorActions">
+      <editorContribution 
+            id="net.sourceforge.phpdt.phphelp.actions"
+            targetID="net.sourceforge.phpeclipse.PHPUnitEditor">
+         <action
+               definitionId="net.sourceforge.phpdt.phphelp.actions.contexthelp"
+               label="PHP Help"
+               class="net.sourceforge.phpdt.phphelp.actions.PHPEclipseShowContextHelp"
+               id="net.sourceforge.phpdt.phphelp.actions.PHPEclipseShowContextHelp">
+         </action>
+      </editorContribution>
+   </extension>   
+   
+   <extension point="org.eclipse.ui.contexts">
+      <context 
+        name="%context.editingPHPSource.name" 
+        description="%context.editingPHPSource.description" 
+        parentId="org.eclipse.ui.textEditorScope" 
+        id="net.sourceforge.phpdt.ui.phpEditorScope" /> 
+   </extension>
    <extension
+         point="org.eclipse.ui.commands">
+      <category
+            name="%category.source.name"
+            description="%category.source.description"
+            id="net.sourceforge.phpeclipse.ui.category.source">
+      </category>
+    
+      <command
+            name="%ActionDefinition.contexthelp.name"
+            description="%ActionDefinition.contexthelp.description"
+            category="net.sourceforge.phpeclipse.ui.category.source"
+            id="net.sourceforge.phpdt.phphelp.actions.contexthelp">
+      </command>
+     
+      <keyBinding
+            string="Ctrl+Shift+H"
+            scope="net.sourceforge.phpdt.ui.phpEditorScope"
+            command="net.sourceforge.phpdt.phphelp.actions.contexthelp"
+            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </keyBinding>
+  </extension>
+  
+  <extension
          point="org.eclipse.help.toc">
       <toc
             file="phphelp.xml"
@@ -48,7 +95,7 @@
          point="org.eclipse.ui.preferencePages">
       <page
             name="%phphelpFormat"
-            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
             class="net.sourceforge.phpdt.phphelp.PHPHelpPreferencePage"
             id="net.sourceforge.phpdt.phphelp.PHPHelpPreferencePage">
       </page>