[Pydev-cvs] org.python.pydev plugin.xml,1.7,1.8

[<fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12688

Modified Files:
	plugin.xml 
Log Message:
Method navigation added and commands in the scope, so that
the user can change the keybindings.

Also added keybindigs for next / previous method / class.

Index: plugin.xml
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/plugin.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** plugin.xml	28 Feb 2004 05:11:46 -0000	1.7
--- plugin.xml	5 Mar 2004 14:43:05 -0000	1.8
***************
*** 1,148 ****
  <?xml version="1.0" encoding="UTF-8"?>
  <plugin
! 	id="org.python.pydev"
! 	name="Pydev - Python Development Environment"
! 	version="0.3.0"
! 	provider-name="AleksTotic"
! 	class="org.python.pydev.plugin.PydevPlugin">
  
! 	<runtime>
! 		<library name="pydev.jar"/>
! 	</runtime>
! 	<requires>
! 		<import plugin="org.eclipse.core.resources"/>
! 		<import plugin="org.eclipse.core.runtime"/>
! 		<import plugin="org.eclipse.ui"/>
! 		<import plugin="org.eclipse.ui.editors"/>
! 		<import plugin="org.eclipse.ui.views"/>
! 		<import plugin="org.eclipse.ui.workbench.texteditor"/>
! 		<import plugin="org.eclipse.jface.text"/>
! 	</requires>
  
  
  <!-- Python editor -->
! 	<extension point="org.eclipse.ui.editors">
! 		<editor
! 			name="Python Editor"
! 			icon="icons/sample.gif"
! 			extensions="py"
! 			contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
! 			class="org.python.pydev.editor.PyEdit"
! 			id="org.python.pydev.editor.PythonEditor">
! 		</editor>
! 	</extension>
! 
  <!-- Preference page -->
! 	<extension point="org.eclipse.ui.preferencePages">
! 		<page
! 			name="Pydev"
! 			class="org.python.pydev.plugin.PydevPrefs"
! 			id="org.python.pydev.prefs">
! 		</page>
! 	</extension>
! 
  <!-- Editor menus -->
! 	<extension point="org.eclipse.ui.editorActions">
! 		<editorContribution 
! 			id="org.python.pydev.editor.editorContribution" 
! 			targetID="org.python.pydev.editor.PythonEditor">
! 			<menu id="org.python.pydev.editor.actions.sourceMenu"
! 				label="Source"
! 				path="edit">
! 					<separator name="editGroup"/>
! 					<separator name="addGroup"/>
! 			</menu>
! 			<action id="org.python.pydev.editor.actions.uncomment"
! 				label="Uncomment"
! 				menubarPath="org.python.pydev.editor.actions.sourceMenu/editGroup"
! 				class="org.python.pydev.editor.actions.PyUncomment"
! 				definitionId="org.python.pydev.editor.actions.uncomment"
! 				>
! 			</action>
! 			<action id="org.python.pydev.editor.actions.comment"
! 				label="Comment"
! 				menubarPath="org.python.pydev.editor.actions.sourceMenu/editGroup"
! 				class="org.python.pydev.editor.actions.PyComment"
! 				definitionId="org.python.pydev.editor.actions.comment"
! 				>
! 			</action>
! 			<action id="org.python.pydev.editor.actions.addBlockComment"
! 				label="Add comment block"
! 				menubarPath="org.python.pydev.editor.actions.sourceMenu/addGroup"
! 				class="org.python.pydev.editor.actions.PyAddBlockComment"
! 				definitionId="org.python.pydev.editor.actions.addBlockComment"
! 				>
! 			</action>
! 		</editorContribution>
! 	</extension>
! 
! <!-- Editor popup menus-->
  <!-- NOTE: EditorContext part of the targetID was deduced, that is just what Eclipse expects -->
! 	<extension point="org.eclipse.ui.popupMenus">
! 		<viewerContribution id="org.python.pydev.editor.popup"
! 			targetID="org.python.pydev.editor.PythonEditor.EditorContext">
! 			<menu id="org.python.pydev.editor.actions.editorPopup"
! 				label="Source"
! 				>
! 					<separator name="editGroup"/>
! 					<separator name="addGroup"/>
! 			</menu>
! 			<action id="org.python.pydev.editor.actions.uncomment"
! 				label="Uncomment"
! 				menubarPath="org.python.pydev.editor.actions.editorPopup/editGroup"
! 				class="org.python.pydev.editor.actions.PyUncomment"
! 				>
! 			</action>
! 			<action id="org.python.pydev.editor.actions.comment"
! 				label="Comment"
! 				menubarPath="org.python.pydev.editor.actions.editorPopup/editGroup"
! 				class="org.python.pydev.editor.actions.PyComment"
! 				>
! 			</action>
! 			<action id="org.python.pydev.editor.actions.addBlockComment"
! 				label="Add comment block"
! 				menubarPath="org.python.pydev.editor.actions.editorPopup/addGroup"
! 				class="org.python.pydev.editor.actions.PyAddBlockComment"
! 				>
! 			</action>
! 		</viewerContribution>			
! 	</extension>
! 
! <!-- Commands -->
  <!-- associates commands with keyboard shortcuts -->
! 	<extension point="org.eclipse.ui.commands">
! 		<category
! 			name="Pydev editor commands"
! 			description="Pydev editor category"
! 			id="org.python.pydev.ui.category.source">
! 		</category>
! 		<scope
! 			name="Pydev editor scope"
! 			parent="org.eclipse.ui.textEditorScope"
! 			description="Pydev commands"
! 			id="org.python.pydev.ui.editor.scope">
! 		</scope>
! 		<keyBinding
! 			string="Ctrl+/"
! 			scope="org.python.pydev.ui.editor.scope"
! 			command="org.python.pydev.editor.actions.comment"
! 			configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
! 		</keyBinding>
! 		<keyBinding
! 			string="Ctrl+\"
! 			scope="org.python.pydev.ui.editor.scope"
! 			command="org.python.pydev.editor.actions.uncomment"
! 			configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
! 		</keyBinding>
! 	</extension>
  
  <!-- file type extensions for the team (CVS) -->
! 	<extension point="org.eclipse.team.core.fileTypes">
! 		<fileTypes type="text" extension="py"/>
! 	</extension>
! 	
! 	<extension point="org.eclipse.team.core.ignore">
! 		<ignore enabled="true" pattern="*.pyc"/>
! 	</extension>
  
  </plugin>
--- 1,286 ----
  <?xml version="1.0" encoding="UTF-8"?>
  <plugin
!    id="org.python.pydev"
!    name="Pydev - Python Development Environment"
!    version="0.3.0"
!    provider-name="AleksTotic"
!    class="org.python.pydev.plugin.PydevPlugin">
  
!    <runtime>
!       <library name="pydev.jar"/>
!    </runtime>
!    <requires>
!       <import plugin="org.eclipse.core.resources"/>
!       <import plugin="org.eclipse.core.runtime"/>
!       <import plugin="org.eclipse.ui"/>
!       <import plugin="org.eclipse.ui.editors"/>
!       <import plugin="org.eclipse.ui.views"/>
!       <import plugin="org.eclipse.ui.workbench.texteditor"/>
!       <import plugin="org.eclipse.jface.text"/>
!    </requires>
  
  
  <!-- Python editor -->
!    <extension
!          point="org.eclipse.ui.editors">
!       <editor
!             name="Python Editor"
!             icon="icons/sample.gif"
!             extensions="py"
!             contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
!             class="org.python.pydev.editor.PyEdit"
!             id="org.python.pydev.editor.PythonEditor">
!       </editor>
!    </extension>
  <!-- Preference page -->
!    <extension
!          point="org.eclipse.ui.preferencePages">
!       <page
!             name="Pydev"
!             class="org.python.pydev.plugin.PydevPrefs"
!             id="org.python.pydev.prefs">
!       </page>
!    </extension>
  <!-- Editor menus -->
!    <extension
!          point="org.eclipse.ui.editorActions">
!       <editorContribution
!             targetID="org.python.pydev.editor.PythonEditor"
!             id="org.python.pydev.editor.editorContribution">
!          <menu
!                label="Source"
!                path="edit"
!                id="org.python.pydev.editor.actions.sourceMenu">
!             <separator
!                   name="editGroup">
!             </separator>
!             <separator
!                   name="addGroup">
!             </separator>
!          </menu>
!          <action
!                definitionId="org.python.pydev.editor.actions.firstChar"
!                label="Goto first char"
!                class="org.python.pydev.editor.actions.FirstCharAction"
!                menubarPath="org.python.pydev.editor.actions.sourceMenu/editGroup"
!                id="org.python.pydev.editor.actions.firstChar">
!          </action>
!          <action
!                definitionId="org.python.pydev.editor.actions.uncomment"
!                label="Uncomment"
!                class="org.python.pydev.editor.actions.PyUncomment"
!                menubarPath="org.python.pydev.editor.actions.sourceMenu/editGroup"
!                id="org.python.pydev.editor.actions.uncomment">
!          </action>
!          <action
!                definitionId="org.python.pydev.editor.actions.comment"
!                label="Comment"
!                class="org.python.pydev.editor.actions.PyComment"
!                menubarPath="org.python.pydev.editor.actions.sourceMenu/editGroup"
!                id="org.python.pydev.editor.actions.comment">
!          </action>
!          <action
!                definitionId="org.python.pydev.editor.actions.addBlockComment"
!                label="Add comment block"
!                class="org.python.pydev.editor.actions.PyAddBlockComment"
!                menubarPath="org.python.pydev.editor.actions.sourceMenu/addGroup"
!                id="org.python.pydev.editor.actions.addBlockComment">
!          </action>
!          <action
!                definitionId="org.python.pydev.editor.actions.navigation.nextMethod"
!                label="Goto next method or class"
!                class="org.python.pydev.editor.actions.navigation.PyNextMethod"
!                menubarPath="org.python.pydev.editor.actions.sourceMenu/addGroup"
!                id="org.python.pydev.editor.actions.navigation.nextMethod">
!          </action>
!          <action
!                definitionId="org.python.pydev.editor.actions.navigation.previousMethod"
!                label="Goto previous method or class"
!                class="org.python.pydev.editor.actions.navigation.PyPreviousMethod"
!                menubarPath="org.python.pydev.editor.actions.sourceMenu/addGroup"
!                id="org.python.pydev.editor.actions.navigation.previousMethod">
!          </action>
!       </editorContribution>
!    </extension>
  <!-- NOTE: EditorContext part of the targetID was deduced, that is just what Eclipse expects -->
! <!-- Editor popup menus-->
!    <extension
!          point="org.eclipse.ui.popupMenus">
!       <viewerContribution
!             targetID="org.python.pydev.editor.PythonEditor.EditorContext"
!             id="org.python.pydev.editor.popup">
!          <menu
!                label="Source"
!                id="org.python.pydev.editor.actions.editorPopup">
!             <separator
!                   name="editGroup">
!             </separator>
!             <separator
!                   name="addGroup">
!             </separator>
!          </menu>
!          <action
!                label="Uncomment"
!                class="org.python.pydev.editor.actions.PyUncomment"
!                menubarPath="org.python.pydev.editor.actions.editorPopup/editGroup"
!                id="org.python.pydev.editor.actions.uncomment">
!          </action>
!          <action
!                label="Comment"
!                class="org.python.pydev.editor.actions.PyComment"
!                menubarPath="org.python.pydev.editor.actions.editorPopup/editGroup"
!                id="org.python.pydev.editor.actions.comment">
!          </action>
!          <action
!                label="Add comment block"
!                class="org.python.pydev.editor.actions.PyAddBlockComment"
!                menubarPath="org.python.pydev.editor.actions.editorPopup/addGroup"
!                id="org.python.pydev.editor.actions.addBlockComment">
!          </action>
!          <action
!                label="Navigate to next method / class"
!                class="org.python.pydev.editor.actions.navigation.PyNextMethod"
!                menubarPath="org.python.pydev.editor.actions.editorPopup/addGroup"
!                id="org.python.pydev.editor.actions.navigation.nextMethod">
!          </action>
!          <action
!                label="Navigate to previous method / class"
!                class="org.python.pydev.editor.actions.navigation.PyPreviousMethod"
!                menubarPath="org.python.pydev.editor.actions.editorPopup/addGroup"
!                id="org.python.pydev.editor.actions.navigation.previousMethod">
!          </action>
!       </viewerContribution>
!    </extension>
  <!-- associates commands with keyboard shortcuts -->
! <!-- Commands -->
!    <extension
!          point="org.eclipse.ui.commands">
!       <scope
!             name="Pydev editor scope"
!             parent="org.eclipse.ui.textEditorScope"
!             description="Pydev commands"
!             id="org.python.pydev.ui.editor.scope">
!       </scope>
!       <category
!             name="Pydev editor commands"
!             description="Pydev editor category"
!             id="org.python.pydev.ui.category.source">
!       </category>
  
+ <!-- command: next method / class-->
+       <command
+             name="First char"
+             description="Goes to the first non space char or first char of the line depending on the cursor position."
+             category="org.python.pydev.ui.category.source"
+             id="org.python.pydev.editor.actions.firstChar">
+       </command>
+       <keyBinding
+             string="Home"
+             scope="org.python.pydev.ui.editor.scope"
+             command="org.python.pydev.editor.actions.firstChar"
+             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+       </keyBinding>
+ 
+ <!-- command: next method / class-->
+       <command
+             name="Next Method or Class"
+             description="Navigates to the next method or class declaration"
+             category="org.python.pydev.ui.category.source"
+             id="org.python.pydev.editor.actions.navigation.nextMethod">
+       </command>
+       <keyBinding
+             string="Ctrl+Shift+Arrow_Down"
+             scope="org.python.pydev.ui.editor.scope"
+             command="org.python.pydev.editor.actions.navigation.nextMethod"
+             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+       </keyBinding>
+ 
+ <!-- command: previous method / class-->
+ 
+       <command
+             name="Previous Method or Class"
+             description="Navigates to the previous method or class declaration"
+             category="org.python.pydev.ui.category.source"
+             id="org.python.pydev.editor.actions.navigation.previousMethod">
+       </command>
+       <keyBinding
+             string="Ctrl+Shift+Arrow_Up"
+             scope="org.python.pydev.ui.editor.scope"
+             command="org.python.pydev.editor.actions.navigation.previousMethod"
+             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+       </keyBinding>
+ 
+ <!-- command: block-->
+       <command
+             name="Add Comment Block"
+             description="Creates a python comment block"
+             category="org.python.pydev.ui.category.source"
+             id="org.python.pydev.editor.actions.addBlockComment">
+       </command>
+       <keyBinding
+             string="Ctrl+4"
+             scope="org.python.pydev.ui.editor.scope"
+             command="org.python.pydev.editor.actions.addBlockComment"
+             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+       </keyBinding>
+ 
+ 
+ <!-- command: uncomment-->
+       <command
+             name="Python Uncomment"
+             description="Uncomments a python line (Removes # from the beggining of the line)"
+             category="org.python.pydev.ui.category.source"
+             id="org.python.pydev.editor.actions.uncomment">
+       </command>
+       <keyBinding
+             string="Ctrl+\"
+             scope="org.python.pydev.ui.editor.scope"
+             command="org.python.pydev.editor.actions.uncomment"
+             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+       </keyBinding>
+       <keyBinding
+             string="Ctrl+Shift+3"
+             scope="org.python.pydev.ui.editor.scope"
+             command="org.python.pydev.editor.actions.uncomment"
+             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+       </keyBinding>
+ 
+ 
+ <!-- command: comment-->
+       <command
+             name="Python Comment"
+             description="Comments a python line (Adds # to beggining of the line)"
+             category="org.python.pydev.ui.category.source"
+             id="org.python.pydev.editor.actions.comment">
+       </command>
+       <keyBinding
+             string="Ctrl+/"
+             scope="org.python.pydev.ui.editor.scope"
+             command="org.python.pydev.editor.actions.comment"
+             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+       </keyBinding>
+       <keyBinding
+             string="Ctrl+3"
+             scope="org.python.pydev.ui.editor.scope"
+             command="org.python.pydev.editor.actions.comment"
+             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+       </keyBinding>
+       
+    </extension>
  <!-- file type extensions for the team (CVS) -->
!    <extension
!          point="org.eclipse.team.core.fileTypes">
!       <fileTypes
!             type="text"
!             extension="py">
!       </fileTypes>
!    </extension>
!    <extension
!          point="org.eclipse.team.core.ignore">
!       <ignore
!             enabled="true"
!             pattern="*.pyc">
!       </ignore>
!    </extension>
  
  </plugin>