Frank Kobzik has uploaded a new change for review. Change subject: engine: Generalize console shortcut config values ......................................................................
engine: Generalize console shortcut config values This patch generalizes configuration names for shortcuts for: - releasing cursor from remote-viewer - toggling fullscreen in remote-viewer. The configuration names were originaly intended to be used with SPICE only, but they are actually valid for VNC as well. Change-Id: Icd339a326222e3910d835db21ac459540dc74f14 Signed-off-by: Frantisek Kobzik <fkob...@redhat.com> Bug-Url: https://bugzilla.redhat.com/1083766 --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql 4 files changed, 10 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/26880/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java index ec47658..1e58612 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java @@ -333,11 +333,11 @@ @Reloadable @TypeConverterAttribute(String.class) @DefaultValueAttribute("shift+f12") - SpiceReleaseCursorKeys, + ConsoleReleaseCursorKeys, @Reloadable @TypeConverterAttribute(String.class) @DefaultValueAttribute("shift+f11") - SpiceToggleFullScreenKeys, + ConsoleToggleFullScreenKeys, @Reloadable @TypeConverterAttribute(Boolean.class) @DefaultValueAttribute("true") diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java index 547cc25..eda62ec 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java @@ -22,8 +22,8 @@ ValidNumOfMonitors(ConfigAuthType.User), EnableUSBAsDefault(ConfigAuthType.User), SpiceSecureChannels(ConfigAuthType.User), - SpiceReleaseCursorKeys(ConfigAuthType.User), - SpiceToggleFullScreenKeys(ConfigAuthType.User), + ConsoleReleaseCursorKeys(ConfigAuthType.User), + ConsoleToggleFullScreenKeys(ConfigAuthType.User), SpiceProxyDefault(ConfigAuthType.User), ClientModeSpiceDefault(ConfigAuthType.User), ClientModeVncDefault(ConfigAuthType.User), diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java index 2875944..d1062bd 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java @@ -312,8 +312,8 @@ parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.EnableSpiceRootCertificateValidation, AsyncDataProvider.getDefaultConfigurationVersion())); parametersList.add(new IdQueryParameters(thisVm.getId())); parametersList.add(new VdcQueryParametersBase()); - parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.SpiceToggleFullScreenKeys, AsyncDataProvider.getDefaultConfigurationVersion())); - parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.SpiceReleaseCursorKeys, + parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.ConsoleToggleFullScreenKeys, AsyncDataProvider.getDefaultConfigurationVersion())); + parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.ConsoleReleaseCursorKeys, AsyncDataProvider.getDefaultConfigurationVersion())); if (isoDomain != null) { diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 6f6e3b7..d856455 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -26,6 +26,8 @@ select fn_db_rename_config_key('PowerClientAutoRegistrationDefaultVdsGroupID','AutoRegistrationDefaultVdsGroupID','general'); select fn_db_rename_config_key('PowerClientAutoInstallCertificateOnApprove','AutoInstallCertificateOnApprove','general'); select fn_db_rename_config_key('UseSecureConnectionWithServers', 'EncryptHostCommunication', 'general'); +select fn_db_rename_config_key('SpiceReleaseCursorKeys', 'ConsoleReleaseCursorKeys', 'general'); +select fn_db_rename_config_key('SpiceToggleFullScreenKeys', 'ConsoleToggleFullScreenKeys', 'general'); ------------------------------------------------------------------------------------ -- Add configuration values section @@ -473,8 +475,8 @@ select fn_db_add_config_value('SignCertTimeoutInSeconds','30','general'); --Handling Script name for signing select fn_db_add_config_value('SpiceDriverNameInGuest','RHEV-Spice','general'); -select fn_db_add_config_value('SpiceReleaseCursorKeys','shift+f12','general'); -select fn_db_add_config_value('SpiceToggleFullScreenKeys','shift+f11','general'); +select fn_db_add_config_value('ConsoleReleaseCursorKeys','shift+f12','general'); +select fn_db_add_config_value('ConsoleToggleFullScreenKeys','shift+f11','general'); --Handling Enable USB devices sharing by default in SPICE select fn_db_add_config_value('SpiceUsbAutoShare','true','general'); select fn_db_add_config_value('WANDisableEffects','animation','general'); -- To view, visit http://gerrit.ovirt.org/26880 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd339a326222e3910d835db21ac459540dc74f14 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <fkob...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
