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-88465 Remove mnemonics for "Rollback/Revert", where needed (in dialog title, in progress indicator text).

Browse Source
This commit is contained in:
Kirill Likhodedov
2012-07-09 12:13:29 +04:00
parent f6471966fc
commit 8526dae778
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java
+1 -1
View File
@@ -222,7 +222,7 @@ public class RollbackAction extends AnAction implements DumbAware {
if (rollbackEnvironment != null) {
if (indicator != null) {
indicator.setText(vcs.getDisplayName() +
": performing " + rollbackEnvironment.getRollbackOperationName().toLowerCase() + "...");
": performing " + UIUtil.removeMnemonic(rollbackEnvironment.getRollbackOperationName()).toLowerCase() + "...");
indicator.setIndeterminate(false);
}
rollbackEnvironment
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/RollbackChangesDialog.java
+3 -7
View File
@@ -110,14 +110,10 @@ public class RollbackChangesDialog extends DialogWrapper {
}
String operationName = RollbackUtil.getRollbackOperationName(affectedVcs);
int pos = operationName.indexOf(UIUtil.MNEMONIC);
if (pos >= 0) {
setOKButtonMnemonic(Character.toUpperCase(operationName.charAt(pos + 1)));
operationName = operationName.replace(Character.toString(UIUtil.MNEMONIC), "");
}
setTitle(VcsBundle.message("changes.action.rollback.custom.title", operationName).replace("_", ""));
setOKButtonText(operationName);
operationName = UIUtil.removeMnemonic(operationName);
setTitle(VcsBundle.message("changes.action.rollback.custom.title", operationName));
setCancelButtonText(CommonBundle.getCloseButtonText());
myBrowser.setToggleActionTitle("Include in " + operationName.toLowerCase());
plugins/git4idea/src/git4idea/actions/GitRevert.java
+2 -1
View File
@@ -23,6 +23,7 @@ import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.ChangeListManager;
import com.intellij.openapi.vcs.changes.ui.RollbackChangesDialog;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.ui.UIUtil;
import git4idea.GitUtil;
import git4idea.GitVcs;
import git4idea.i18n.GitBundle;
@@ -65,7 +66,7 @@ public class GitRevert extends BasicAction {
@Override
@NotNull
protected String getActionName() {
return GitBundle.getString("revert.action.name");
return UIUtil.removeMnemonic(GitBundle.getString("revert.action.name"));
}
@Override