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-131298 Eliminate Ctrl+enter vs Enter confusion in evaluation dialog - switched to ctrl+shift+enter

Browse Source
This commit is contained in:
Egor.Ushakov
2014-10-15 18:57:33 +04:00
parent 7048b5d0d1
commit 1458ac8af0
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources-en/src/messages/XDebuggerBundle.properties
+1 -1
View File
@@ -56,7 +56,7 @@ xdebugger.button.evaluate=E&valuate
xdebugger.evaluate.dialog.close=Close
xdebugger.dialog.title.evaluate.expression=Evaluate Expression
xdebugger.evaluate.label.expression=Expression:
xdebugger.evaluate.addtowatches.hint=Use Alt+Enter to add to Watches
xdebugger.evaluate.addtowatches.hint=Use Control+Shift+Enter to add to Watches
dialog.title.evaluate.code.fragment=Evaluate Code Fragment
button.text.code.fragment.mode=Code Fragment &Mode
button.text.expression.mode=Expression &Mode
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/ExpressionInputComponent.java
+5 -5
View File
@@ -46,6 +46,11 @@ public class ExpressionInputComponent extends EvaluationInputComponent {
myExpressionComboBox = new XDebuggerExpressionComboBox(project, editorsProvider, "evaluateExpression", sourcePosition);
myExpressionComboBox.getComboBox().setMinimumAndPreferredWidth(250);
myMainPanel.add(myExpressionComboBox.getComponent(), BorderLayout.CENTER);
final JBLabel help = new JBLabel(XDebuggerBundle.message("xdebugger.evaluate.addtowatches.hint"), SwingConstants.RIGHT);
help.setBorder(IdeBorderFactory.createEmptyBorder(2,0,6,0));
help.setComponentStyle(UIUtil.ComponentStyle.SMALL);
help.setFontColor(UIUtil.FontColor.BRIGHTER);
myMainPanel.add(help, BorderLayout.SOUTH);
if (expression != null) {
myExpressionComboBox.setExpression(expression);
}
@@ -56,11 +61,6 @@ public class ExpressionInputComponent extends EvaluationInputComponent {
public void addComponent(JPanel contentPanel, JPanel resultPanel) {
contentPanel.add(resultPanel, BorderLayout.CENTER);
contentPanel.add(myMainPanel, BorderLayout.NORTH);
final JBLabel hint = new JBLabel(XDebuggerBundle.message("xdebugger.evaluate.addtowatches.hint"), SwingConstants.RIGHT);
hint.setBorder(IdeBorderFactory.createEmptyBorder(2, 0, 6, 0));
hint.setComponentStyle(UIUtil.ComponentStyle.SMALL);
hint.setFontColor(UIUtil.FontColor.BRIGHTER);
contentPanel.add(hint, BorderLayout.SOUTH);
}
@NotNull
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java
+2 -2
View File
@@ -121,7 +121,7 @@ public class XDebuggerEvaluationDialog extends DialogWrapper {
doOKAction();
addToWatches();
}
}.registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.ALT_DOWN_MASK)), getRootPane(), myDisposable);
}.registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK)), getRootPane(), myDisposable);
new AnAction() {
@Override
@@ -169,7 +169,7 @@ public class XDebuggerEvaluationDialog extends DialogWrapper {
@Override
public void actionPerformed(ActionEvent e) {
super.actionPerformed(e);
if (((e.getModifiers() & InputEvent.ALT_MASK) != 0)) {
if (((e.getModifiers() & (InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK)) == (InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK))) {
addToWatches();
}
}