X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse.phphelp/plugin.xml b/net.sourceforge.phpeclipse.phphelp/plugin.xml
index 5fcaff1..9ada7a3 100644
--- a/net.sourceforge.phpeclipse.phphelp/plugin.xml
+++ b/net.sourceforge.phpeclipse.phphelp/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.phpeclipse.phphelp"
    name="%pluginName"
-   version="1.1.3"
+   version="1.1.7"
    provider-name="%providerName"
    class="net.sourceforge.phpdt.phphelp.PHPHelpPlugin">
 
@@ -13,20 +13,19 @@
       </library>
    </runtime>
    <requires>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
+      <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.help"/>
+      <import plugin="org.eclipse.jface.text"/>
       <import plugin="org.eclipse.swt"/>
       <import plugin="net.sourceforge.phpeclipse"/>
+      <import plugin="net.sourceforge.phpeclipse.webbrowser"/>
+      <import plugin="org.eclipse.ui.editors"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
    </requires>
    <extension
-         point="org.eclipse.ui.popupMenus">   
+         point="org.eclipse.ui.popupMenus">
       <viewerContribution
             targetID="#PHPEditorContext"
             id="net.sourceforge.phpdt.phphelp.actions.popup.editor">
@@ -39,10 +38,10 @@
          </action>
       </viewerContribution>
    </extension>
-  
+
    <extension
          point="org.eclipse.ui.editorActions">
-      <editorContribution 
+      <editorContribution
             id="net.sourceforge.phpdt.phphelp.actions"
             targetID="net.sourceforge.phpeclipse.PHPUnitEditor">
          <action
@@ -52,14 +51,14 @@
                id="net.sourceforge.phpdt.phphelp.actions.PHPEclipseShowContextHelp">
          </action>
       </editorContribution>
-   </extension>   
-   
+   </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" /> 
+      <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">
@@ -68,22 +67,15 @@
             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"
+            categoryId="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
@@ -95,9 +87,88 @@
          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>
+      <page
+           name="%httpQuery"
+           category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
+           class="net.sourceforge.phpdt.httpquery.preferences.ConfigurationPreferencePage"
+           id="net.sourceforge.phpdt.httpquery.preferences.configurationPreferencePage">
+      </page>
+   </extension>
+   <extension
+         point="org.eclipse.ui.bindings">
+      <key
+            sequence="Ctrl+Shift+H"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpdt.phphelp.actions.contexthelp"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
    </extension>
+
+   <extension
+         point="org.eclipse.ui.popupMenus">
+     <viewerContribution
+            targetID="#PHPEditorContext"
+            id="net.sourceforge.phpdt.phphelp.actions.httpquery">
+           <menu
+			id="httpqueryMenu"
+			label="%HTTPQuery.label"
+			path="rest">
+		 </menu>
+		 <action
+               label="Koders.com Search"
+               class="net.sourceforge.phpdt.httpquery.KodersAction"
+               menubarPath="httpqueryMenu/additions"
+               id="net.sourceforge.phpdt.httpquery.KodersAction">
+         </action>
+		 <action
+               label="Google Search"
+               class="net.sourceforge.phpdt.httpquery.GoogleAction"
+               menubarPath="httpqueryMenu/additions"
+               id="net.sourceforge.phpdt.httpquery.GoogleAction">
+         </action>
+         <action
+               label="PHP Online Manual"
+               class="net.sourceforge.phpdt.httpquery.PHPHelpAction"
+               menubarPath="httpqueryMenu/additions"
+               id="net.sourceforge.phpdt.httpquery.PHPHelpAction">
+         </action>
+		 <action
+               label="HTTP Query..."
+               class="net.sourceforge.phpdt.httpquery.HTTPQueryAction"
+               menubarPath="httpqueryMenu/additions"
+               id="net.sourceforge.phpdt.httpquery.HTTPQueryAction">
+         </action>
+      </viewerContribution>
+      <viewerContribution
+            targetID="#EditorContext"
+            id="net.sourceforge.phpeclipse.wiki.texteditor.viewercontribution">
+         <menu
+			id="httpqueryMenu"
+			label="%HTTPQuery.label"
+			path="rest">
+		 </menu>
+		 <action
+               label="Koders.com Search"
+               class="net.sourceforge.phpdt.httpquery.KodersAction"
+               menubarPath="httpqueryMenu/additions"
+               id="net.sourceforge.phpdt.httpquery.KodersAction">
+         </action>
+		 <action
+               label="Google Search"
+               class="net.sourceforge.phpdt.httpquery.GoogleAction"
+               menubarPath="httpqueryMenu/additions"
+               id="net.sourceforge.phpdt.httpquery.GoogleAction">
+         </action>
+		 <action
+               label="HTTP Query..."
+               class="net.sourceforge.phpdt.httpquery.HTTPQueryAction"
+               menubarPath="httpqueryMenu/additions"
+               id="net.sourceforge.phpdt.httpquery.HTTPQueryAction">
+         </action>
+      </viewerContribution>
+  </extension>
 </plugin>