more sane arrangement of the Version Control menu

This commit is contained in:
Dmitry Jemerov
2010-10-15 16:14:30 +04:00
parent 1a813e8fd3
commit f0724a92e6
6 changed files with 33 additions and 35 deletions
@@ -1189,3 +1189,5 @@ action.ConvertIndentsToSpaces.text=Convert Indents to Spaces
action.ConvertIndentsToSpaces.description=Convert the indentation in the file or selected block to use spaces instead of tabs
action.ConvertIndentsToTabs.text=Convert Indents to Tabs
action.ConvertIndentsToTabs.description=Convert the indentation in the file or selected block to use tabs instead of spaces
group.Vcs.Import.text=Import into Version Control
group.Vcs.Browse.text=Browse VCS Repository
@@ -57,12 +57,17 @@
<action id="Vcs.IntegrateProject" class="com.intellij.openapi.vcs.update.CommonIntegrateProjectAction"/>
<action id="Vcs.RefreshStatuses" class="com.intellij.openapi.vcs.actions.RefreshStatuses"/>
<separator/>
<group id="Vcs.Specific" class="com.intellij.ide.actions.NonEmptyActionGroup"/>
<separator/>
<action id="ChangesView.CreatePatch" class="com.intellij.openapi.vcs.changes.actions.CreatePatchAction"/>
<action id="ChangesView.ApplyPatch" class="com.intellij.openapi.vcs.changes.patch.ApplyPatchAction"/>
<action id="ChangesView.Shelve" class="com.intellij.openapi.vcs.changes.shelf.ShelveChangesAction"/>
</group>
<separator/>
<group id="Vcs.Checkout" class="com.intellij.openapi.vcs.checkout.CheckoutActionGroup" popup="true"/>
<group id="Vcs.Import" class="com.intellij.ide.actions.NonEmptyActionGroup" popup="true"/>
<group id="Vcs.Browse" class="com.intellij.ide.actions.NonEmptyActionGroup" popup="true"/>
<add-to-group group-id="MainMenu" anchor="after" relative-to-action="ToolsMenu"/>
</group>
@@ -44,18 +44,16 @@
</extensions>
<actions>
<action id="Cvs.Import" class="com.intellij.cvsSupport2.actions.ImportAction">
<add-to-group group-id="Vcs.Import"/>
</action>
<group id="CvsFileGroup">
<separator/>
<add-to-group group-id="VcsGroups" anchor="after" relative-to-action="VcsGlobalGroup"/>
<action id="Cvs.Import" class="com.intellij.cvsSupport2.actions.ImportAction"/>
<action id="Cvs.BrowseCVSRepository" class="com.intellij.cvsSupport2.actions.BrowseCvsRepositoryAction"
/>
<separator/>
</group>
<action id="Cvs.BrowseCVSRepository" class="com.intellij.cvsSupport2.actions.BrowseCvsRepositoryAction">
<add-to-group group-id="Vcs.Browse"/>
</action>
<group id="CvsGlobalGroup" class="com.intellij.cvsSupport2.actions.Cvs2Group" test="CVS" popup="true">
<add-to-group group-id="VcsGroups" anchor="last"/>
<add-to-group group-id="VcsGlobalGroup" anchor="after" relative-to-action="Vcs.Specific"/>
<separator/>
<action id="GlobalSettings" class="com.intellij.cvsSupport2.actions.GlobalSettingsAction"/>
<action id="ConfigureCvsRoots" class="com.intellij.cvsSupport2.actions.ConfigureCvsRootsAction"/>
+4 -9
View File
@@ -10,14 +10,9 @@
<actions>
<group id="GitFileGroup">
<separator/>
<action id="Git.Init" class="git4idea.actions.GitInit" text="Git Init..."/>
/>
<separator/>
<add-to-group group-id="VcsGroups" anchor="after" relative-to-action="VcsGlobalGroup"/>
</group>
<action id="Git.Init" class="git4idea.actions.GitInit" text="Create Git Repository...">
<add-to-group group-id="Vcs.Import"/>
</action>
<group id="Git.Menu" class="git4idea.actions.GitMenu" popup="true" text="_Git">
<reference ref="CheckinFiles"/>
@@ -65,7 +60,7 @@
<separator/>
<add-to-group group-id="VcsGroup" anchor="last"/>
<add-to-group group-id="VcsGroups" anchor="last"/>
<add-to-group group-id="VcsGlobalGroup" anchor="after" relative-to-action="Vcs.Specific"/>
<!-- <add-to-group anchor="last" group-id="VcsGlobalGroup" /> -->
</group>
</actions>
+5 -8
View File
@@ -24,13 +24,10 @@
</extensions>
<actions>
<group id="MercurialFileGroup">
<separator/>
<action id="Hg.Init" class="org.zmlx.hg4idea.action.HgInit" text="Create Mercurial Repository"/>
<separator/>
<add-to-group group-id="VcsGroups" anchor="after" relative-to-action="VcsGlobalGroup"/>
</group>
<action id="Hg.Init" class="org.zmlx.hg4idea.action.HgInit" text="Create Mercurial Repository">
<add-to-group group-id="Vcs.Import"/>
</action>
<group id="hg4idea.file.menu" popup="true" icon="/images/mercurial.png" class="org.zmlx.hg4idea.action.HgMercurialMenu">
<reference ref="CheckinFiles"/>
<reference ref="ChangesView.AddUnversioned"/>
@@ -56,7 +53,7 @@
<action id="hg4idea.resolve.mark" class="org.zmlx.hg4idea.action.HgMarkResolved"/>
<add-to-group group-id="VcsGroup" anchor="last"/>
<add-to-group group-id="VcsGroups" anchor="last"/>
<add-to-group group-id="VcsGlobalGroup" anchor="after" relative-to-action="Vcs.Specific"/>
</group>
</actions>
+10 -9
View File
@@ -22,18 +22,19 @@
<actions>
<group id="SubversionFileGroup">
<separator/>
<action id="Subversion.ImportToSVNRepository" class="org.jetbrains.idea.svn.actions.ImportToRepositoryAction"/>
<action id="Subversion.BrowseSVNRepository" class="org.jetbrains.idea.svn.actions.BrowseRepositoryAction"/>
<action id="Subversion.ShareWholeProject" class="org.jetbrains.idea.svn.actions.ShareWholeProject"/>
<separator/>
<add-to-group group-id="VcsGroups" anchor="after" relative-to-action="VcsGlobalGroup"/>
</group>
<action id="Subversion.ImportToSVNRepository" class="org.jetbrains.idea.svn.actions.ImportToRepositoryAction">
<add-to-group group-id="Vcs.Import"/>
</action>
<action id="Subversion.BrowseSVNRepository" class="org.jetbrains.idea.svn.actions.BrowseRepositoryAction">
<add-to-group group-id="Vcs.Browse"/>
</action>
<action id="Subversion.ShareWholeProject" class="org.jetbrains.idea.svn.actions.ShareWholeProject">
<add-to-group group-id="Vcs.Import"/>
</action>
<group id="SubversionFilePopupGroup" popup="true" class="org.jetbrains.idea.svn.actions.SubversionGroup">
<add-to-group group-id="VcsGroup" anchor="last"/>
<add-to-group group-id="VcsGroups" anchor="last"/>
<add-to-group group-id="VcsGlobalGroup" anchor="after" relative-to-action="Vcs.Specific"/>
</group>