X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml index 57699a0..663efab 100644 --- a/net.sourceforge.phpeclipse/plugin.xml +++ b/net.sourceforge.phpeclipse/plugin.xml @@ -666,14 +666,14 @@ id="net.sourceforge.phpeclipse.phpeditor.ShiftRight"> </action> <action - definitionId="net.sourceforge.phpeclipse.remove.block.comment" + definitionId="net.sourceforge.phpeclipse.phpeditor.remove.block.comment" label="%RemoveBlockCommentAction.label" retarget="true" menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup" id="net.sourceforge.phpeclipse.ui.actions.RemoveBlockComment"> </action> <action - definitionId="net.sourceforge.phpeclipse.add.block.comment" + definitionId="net.sourceforge.phpeclipse.phpeditor.add.block.comment" label="%AddBlockCommentAction.label" retarget="true" menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup" @@ -1029,7 +1029,6 @@ id="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"> </action> </viewerContribution> - <viewerContribution targetID="#PHPRulerContext" id="net.sourceforge.phpdt.ui.PHPEditorPopupActions"> @@ -1049,7 +1048,24 @@ </action> </viewerContribution> </extension> - + <extension + point="org.eclipse.ui.actionSets"> + <actionSet + label="%OpenActionSet.label" + description="%OpenActionSet.description" + visible="false" + id="net.sourceforge.phpeclipse.ui.A_OpenActionSet"> + <action + definitionId="net.sourceforge.phpeclipse.ui.edit.text.java.open.editor" + label="%OpenDeclaration" + tooltip="%OpenDeclaration" + retarget="true" + menubarPath="navigate/open.ext" + allowLabelUpdate="true" + id="net.sourceforge.phpeclipse.ui.actions.Open"> + </action> + </actionSet> + </extension> <extension point="org.eclipse.ui.editorActions"> <editorContribution @@ -1078,7 +1094,7 @@ class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction" id="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"> </action> - </editorContribution> + </editorContribution> </extension> <extension point="org.eclipse.ui.popupMenus"> @@ -1211,7 +1227,7 @@ platform="carbon" string="Ctrl+/" scope="net.sourceforge.phpdt.ui.phpEditorScope" - command="" + command="net.sourceforge.phpeclipse.phpeditor.toggle.comment" configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> </keyBinding> <keyBinding @@ -1357,6 +1373,64 @@ <!-- navigate --> <command + name="%ActionDefinition.gotoNextMember.name" + description="%ActionDefinition.gotoNextMember.description" + category="org.eclipse.ui.category.navigate" + id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.next.member"> + </command> + <keyBinding + string="Ctrl+Shift+ARROW_DOWN" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.next.member" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Ctrl+Shift+ARROW_DOWN" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Command+Shift+ARROW_DOWN" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.next.member" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <command + name="%ActionDefinition.gotoPreviousMember.name" + description="%ActionDefinition.gotoPreviousMember.description" + category="org.eclipse.ui.category.navigate" + id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member"> + </command> + <keyBinding + string="Ctrl+Shift+ARROW_UP" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Ctrl+Shift+ARROW_UP" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Command+Shift+ARROW_UP" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + string="" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="org.eclipse.jdt.ui.edit.text.java.show.next.problem" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <command name="%ActionDefinition.gotoMatchingBracket.name" description="%ActionDefinition.gotoMatchingBracket.description" category="org.eclipse.ui.category.navigate" @@ -1382,7 +1456,6 @@ command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket" configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> </keyBinding> - <command name="%OpenDeclaration" description="%OpenDeclaration" @@ -1394,8 +1467,8 @@ scope="net.sourceforge.phpdt.ui.phpEditorScope" command="net.sourceforge.phpeclipse.actions.opendeclaration" configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> - </keyBinding> - </extension> + </keyBinding> + </extension> <extension id="net.sourceforge.phpeclipse.JavaDocumentSetupParticipant" name="%javaDocumentSetupParticipant"