Frank Kobzik has uploaded a new change for review. Change subject: frontend: Load default value for "Remap Ctrl-Alt-Delete" ......................................................................
frontend: Load default value for "Remap Ctrl-Alt-Delete" ... from backend config. This affects default value of "Remap Ctrl-Alt-Delete to Remap Ctrl-Alt-End" checkbox in Console Options popup (the value can be overriden by local storage value). Change-Id: I919b58ecba001cda1b69a12451eef20832bc5eb1 Signed-off-by: Frantisek Kobzik <fkob...@redhat.com> Bug-Url: https://bugzilla.redhat.com/1184445 --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractSpice.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractVnc.java 2 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/71/39071/2 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractSpice.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractSpice.java index a7f77c0..dc56d57 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractSpice.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractSpice.java @@ -4,10 +4,12 @@ import java.util.Arrays; import java.util.List; +import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.ui.uicommonweb.ConsoleUtils; import org.ovirt.engine.ui.uicommonweb.TypeResolver; +import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.vms.SpiceConsoleModel; import org.ovirt.engine.ui.uicommonweb.models.vms.WANDisableEffects; import org.ovirt.engine.ui.uicommonweb.models.vms.WanColorDepth; @@ -76,7 +78,8 @@ setWANDisableEffects(new ArrayList<WANDisableEffects>()); setWanOptionsEnabled(false); setWANColorDepth(WanColorDepth.depth16); - setRemapCtrlAltDel(true); + setRemapCtrlAltDel((Boolean) AsyncDataProvider.getInstance() + .getConfigValuePreConverted(ConfigurationValues.RemapCtrlAltDelDefault)); setNoTaskMgrExecution(false); } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractVnc.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractVnc.java index 9fbb42b..569598d 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractVnc.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractVnc.java @@ -1,7 +1,9 @@ package org.ovirt.engine.ui.common.uicommon; +import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.ui.uicommonweb.ConsoleUtils; import org.ovirt.engine.ui.uicommonweb.TypeResolver; +import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; public class AbstractVnc { @@ -17,7 +19,8 @@ private String releaseCursorHotKey; public AbstractVnc() { - setRemapCtrlAltDelete(true); + setRemapCtrlAltDelete((Boolean) AsyncDataProvider.getInstance() + .getConfigValuePreConverted(ConfigurationValues.RemapCtrlAltDelDefault)); } public String getTitle() { -- To view, visit https://gerrit.ovirt.org/39071 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I919b58ecba001cda1b69a12451eef20832bc5eb1 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <fkob...@redhat.com> Gerrit-Reviewer: Frank Kobzik <fkob...@redhat.com> Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
