test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-02 19:27:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ctrl+Enter shortcut doesn't call controller.commitAndClose as it should #PL-2205

Browse Source
This commit is contained in:
Konstantin Devyatkin 2013-06-10 16:14:10 +00:00
parent 82c935585f
commit 52bbcf8a90
3 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/desktop/src/com/haulmont/cuba/desktop/gui/components/DesktopWindow.java
View File

@ -802,17 +802,6 @@ public class DesktopWindow implements Window, Component.Disposable,
public static class Editor extends DesktopWindow implements Window.Editor {
public Editor() {
super();
addAction(new AbstractShortcutAction("commitAndCloseAction",
new ShortcutAction.KeyCombination(ShortcutAction.Key.ENTER, ShortcutAction.Modifier.CTRL)) {
@Override
public void actionPerform(com.haulmont.cuba.gui.components.Component component) {
commitAndClose();
}
});
}
@Override
protected WindowDelegate createDelegate() {
return new EditorWindowDelegate(this);

10
modules/gui/src/com/haulmont/cuba/gui/components/EditorWindowDelegate.java
View File

@ -82,6 +82,16 @@ public class EditorWindowDelegate extends WindowDelegate {
}
);
this.window.addAction(new AbstractShortcutAction("commitAndCloseShortcutAction",
new ShortcutAction.KeyCombination(ShortcutAction.Key.ENTER, ShortcutAction.Modifier.CTRL)) {
@Override
public void actionPerform(com.haulmont.cuba.gui.components.Component component) {
editor.commitAndClose();
}
});
this.window.addAction(
new AbstractAction(Window.Editor.WINDOW_CLOSE) {
@Override

11
modules/web/src/com/haulmont/cuba/web/gui/WebWindow.java
View File

@ -818,17 +818,6 @@ public class WebWindow implements Window, Component.Wrapper,
public static class Editor extends WebWindow implements Window.Editor {
public Editor() {
super();
addAction(new AbstractShortcutAction("commitAndCloseAction",
new ShortcutAction.KeyCombination(ShortcutAction.Key.ENTER, ShortcutAction.Modifier.CTRL)) {
@Override
public void actionPerform(com.haulmont.cuba.gui.components.Component component) {
commitAndClose();
}
});
}
@Override
protected WindowDelegate createDelegate() {
return new EditorWindowDelegate(this);