MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-60208 VCS GUI: "Revert" and "Rollback" are used intermixed

Browse Source
This commit is contained in:
irengrig
2012-07-24 20:07:03 +04:00
parent 3726932703
commit 7cbfbd4133
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources/src/idea/VcsActions.xml
+3
View File
@@ -69,6 +69,9 @@
<add-to-group group-id="MainMenu" anchor="after" relative-to-action="ToolsMenu"/>
</group>
<action id="ChangesView.Revert" class="com.intellij.openapi.vcs.changes.actions.RollbackAction"
icon="AllIcons.Actions.Rollback" text="_Revert" description="Revert selected changes"/>
<group id="ChangesViewToolbar">
<action id="ChangesView.Refresh" class="com.intellij.openapi.vcs.changes.actions.RefreshAction"
icon="AllIcons.Actions.Sync"/>
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java
+2 -2
View File
@@ -82,9 +82,9 @@ public class RollbackAction extends AnAction implements DumbAware {
}
}
e.getPresentation().setEnabled(isEnabled);
String operationName = RollbackUtil.getRollbackOperationName(project);
e.getPresentation().setText(operationName);
if (isEnabled) {
String operationName = RollbackUtil.getRollbackOperationName(project);
e.getPresentation().setText(operationName);
e.getPresentation().setDescription(operationName + " selected changes");
}
}
plugins/git4idea/src/git4idea/actions/GitQuickListContentProvider.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class GitQuickListContentProvider implements VcsQuickListContentProvider
actions.add(new Separator(activeVcs.getDisplayName()));
add("CheckinProject", manager, actions);
add("CheckinFiles", manager, actions);
add("ChangesView.Rollback", manager, actions);
add("ChangesView.Revert", manager, actions);
addSeparator(actions);
add("Vcs.ShowTabbedFileHistory", manager, actions);
plugins/hg4idea/src/META-INF/plugin.xml
+1 -1
View File
@@ -36,7 +36,7 @@
<group id="hg4idea.file.menu" popup="true" class="org.zmlx.hg4idea.action.HgMercurialMenu">
<reference ref="CheckinFiles"/>
<reference ref="ChangesView.AddUnversioned"/>
<reference ref="ChangesView.Rollback"/>
<reference ref="ChangesView.Revert"/>
<separator/>
<reference ref="Compare.SameVersion"/>
plugins/svn4idea/src/META-INF/plugin.xml
+2 -2
View File
@@ -58,7 +58,7 @@
<action id="Subversion.SetProperty" class="org.jetbrains.idea.svn.actions.SetPropertyAction"/>
<action id="ShowPropertiesDiffVsLocal" class="org.jetbrains.idea.svn.actions.ShowPropertiesDiffWithLocalAction" icon="/icons/PropertiesDiffWithLocal.png">
</action>
<reference id="ChangesView.Rollback"/>
<reference id="ChangesView.Revert"/>
<action id="Subversion.Resolve" class="org.jetbrains.idea.svn.actions.ResolveAction"/>
<action id="Subversion.MarkResolved" class="org.jetbrains.idea.svn.actions.MarkResolvedAction"/>
<action id="Subversion.MarkTreeResolved" class="org.jetbrains.idea.svn.actions.MarkTreeConflictResolvedAction"/>
@@ -90,7 +90,7 @@
</reference>
<group id="SubversionUpdateActionGroup" class="org.jetbrains.idea.svn.actions.SubversionGroup">
<reference id="Subversion.Add"/>
<reference id="ChangesView.Rollback"/>
<reference id="ChangesView.Revert"/>
<reference id="Subversion.Resolve"/>
<reference id="Subversion.MarkResolved"/>
<separator/>