From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 377B69A9FC for ; Fri, 17 Nov 2023 16:07:43 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1A6F635E25 for ; Fri, 17 Nov 2023 16:07:43 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 17 Nov 2023 16:07:42 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 442D043E1F; Fri, 17 Nov 2023 16:07:42 +0100 (CET) Message-ID: <387f4fed-5f38-47d9-8a83-e76f7fb92347@proxmox.com> Date: Fri, 17 Nov 2023 16:07:41 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta Content-Language: en-US To: Proxmox VE development discussion , Markus Frank References: <20231114092256.86137-1-m.frank@proxmox.com> <20231114092256.86137-6-m.frank@proxmox.com> From: Dominik Csapak In-Reply-To: <20231114092256.86137-6-m.frank@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.017 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pve-devel] [PATCH manager v14 5/6] add clipboard checkbox to VM Options X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Nov 2023 15:07:43 -0000 one minor nit inline, but not a blocker for me did not test again, but the changes are small enough imho aside from that, this patch (and the series since i already reviewed the previous versions and there did not change anything) Reviewed-by: Dominik Csapak On 11/14/23 10:22, Markus Frank wrote: > Signed-off-by: Markus Frank > --- > www/manager6/qemu/DisplayEdit.js | 8 ++++ > www/manager6/qemu/Options.js | 82 ++++++++++++++++++++++++++++++++ > 2 files changed, 90 insertions(+) > > diff --git a/www/manager6/qemu/DisplayEdit.js b/www/manager6/qemu/DisplayEdit.js > index 9bb1763e..d7cd51a9 100644 > --- a/www/manager6/qemu/DisplayEdit.js > +++ b/www/manager6/qemu/DisplayEdit.js > @@ -4,6 +4,9 @@ Ext.define('PVE.qemu.DisplayInputPanel', { > onlineHelp: 'qm_display', > > onGetValues: function(values) { > + if (typeof this.originalConfig.clipboard !== 'undefined') { > + values.clipboard = this.originalConfig.clipboard; > + } > let ret = PVE.Parser.printPropertyString(values, 'type'); > if (ret === '') { > return { 'delete': 'vga' }; > @@ -11,6 +14,11 @@ Ext.define('PVE.qemu.DisplayInputPanel', { > return { vga: ret }; > }, > > + onSetValues: function(values) { > + this.originalConfig = values; > + return values; > + }, > + > items: [{ > name: 'type', > xtype: 'proxmoxKVComboBox', > diff --git a/www/manager6/qemu/Options.js b/www/manager6/qemu/Options.js > index 7b112400..fd76feb8 100644 > --- a/www/manager6/qemu/Options.js > +++ b/www/manager6/qemu/Options.js > @@ -154,6 +154,88 @@ Ext.define('PVE.qemu.Options', { > }, > } : undefined, > }, > + vga: { > + header: gettext('Clipboard'), > + defaultValue: false, > + renderer: function(value) { > + let vga = PVE.Parser.parsePropertyString(value, 'type'); > + if (vga.clipboard) { > + return vga.clipboard.toUpperCase(); > + } else { > + return Proxmox.Utils.defaultText + ' (SPICE)'; > + } > + }, > + editor: caps.vms['VM.Config.HWType'] ? { > + xtype: 'proxmoxWindowEdit', > + subject: gettext('Clipboard'), > + onlineHelp: 'qm_display', > + items: { > + xtype: 'pveDisplayInputPanel', > + referenceHolder: true, > + items: [ > + { > + xtype: 'proxmoxKVComboBox', > + name: 'clipboard', > + reference: 'clipboard', > + itemId: 'clipboardBox', > + fieldLabel: gettext('Clipboard'), > + deleteDefaultValue: true, > + listeners: { > + change: function(field, value) { > + let inputpanel = field.up("inputpanel"); > + let isVnc = value === 'vnc'; > + inputpanel.lookup('vncHint').setVisible(isVnc); > + inputpanel.lookup('defaultHint').setVisible(!isVnc); > + }, > + }, > + value: '__default__', > + comboItems: [ > + ['__default__', Proxmox.Utils.defaultText + ' (SPICE)'], > + ['vnc', 'VNC'], > + ], > + }, > + { > + itemId: 'vncHint', > + name: 'vncHint', > + reference: 'vncHint', > + xtype: 'displayfield', > + userCls: 'pmx-hint', > + hidden: true, > + value: gettext('You cannot use the default SPICE clipboard if the VNC Clipboard is selected.') > + + ' ' + gettext('VNC Clipboard requires spice-tools installed in the Guest-VM.'), > + }, this > + > + { > + itemId: 'defaultHint', > + name: 'defaultHint', > + reference: 'defaultHint', > + xtype: 'displayfield', > + userCls: 'pmx-hint', > + hidden: false, > + value: gettext('This option depends on your display type.') + ' ' + > + gettext('If the display type uses SPICE you are able to use the default SPICE Clipboard.'), > + }, and this should have the same style of line break (iow. + ' ' + ath the end of the first line or at the beginning of the second one, but noth both ;) > + > + ], > + onGetValues: function(values) { > + values = Ext.apply(this.originalConfig, values); > + if (values.delete === "clipboard") { > + delete values.clipboard; > + delete values.delete; > + } > + let ret = PVE.Parser.printPropertyString(values, 'type'); > + if (ret === "") { > + return { 'delete': "vga" }; > + } > + return { vga: ret }; > + }, > + onSetValues: function(values) { > + this.originalConfig = PVE.Parser.parsePropertyString(values.vga, 'type'); > + return this.originalConfig; > + }, > + }, > + } : undefined, > + }, > hotplug: { > header: gettext('Hotplug'), > defaultValue: 'disk,network,usb',