public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Markus Frank <m.frank@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager v13 5/6] add clipboard checkbox to VM Options
Date: Thu, 21 Sep 2023 13:47:57 +0200	[thread overview]
Message-ID: <20230921114758.352377-6-m.frank@proxmox.com> (raw)
In-Reply-To: <20230921114758.352377-1-m.frank@proxmox.com>

Signed-off-by: Markus Frank <m.frank@proxmox.com>
---
 www/manager6/qemu/DisplayEdit.js |  8 +++
 www/manager6/qemu/Options.js     | 89 ++++++++++++++++++++++++++++++++
 2 files changed, 97 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..73d0c923 100644
--- a/www/manager6/qemu/Options.js
+++ b/www/manager6/qemu/Options.js
@@ -154,6 +154,95 @@ 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 vncHint = inputpanel.lookup('vncHint');
+					let defaultHint = inputpanel.lookup('defaultHint');
+					if (value === "__default__") {
+					    vncHint.setVisible(false);
+					    defaultHint.setVisible(true);
+					} else if (value === "vnc") {
+					    vncHint.setVisible(true);
+					    defaultHint.setVisible(false);
+					}
+				    },
+				},
+				value: '__default__',
+				comboItems: [
+				    ['__default__', Proxmox.Utils.defaultText + ' (SPICE)'],
+				    ['vnc', 'VNC'],
+				],
+			    },
+			    {
+				itemId: 'vncHint',
+				name: 'vncHint',
+				reference: 'vncHint',
+				xtype: 'displayfield',
+				userCls: 'pmx-hint',
+				hidden: true,
+				value: 'You cannot use the default SPICE clipboard' +
+				    ' if the VNC Clipboard is selected',
+			    },
+
+			    {
+				itemId: 'defaultHint',
+				name: 'defaultHint',
+				reference: 'defaultHint',
+				xtype: 'displayfield',
+				userCls: 'pmx-hint',
+				hidden: false,
+				value: 'This option depends on your display type.' +
+				    ' If the display type uses SPICE you are' +
+				    ' able to use the default SPICE Clipboard',
+			    },
+
+			],
+			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',
-- 
2.39.2





  parent reply	other threads:[~2023-09-21 11:48 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-21 11:47 [pve-devel] [PATCH qemu-sever/novnc/manager/docs v13 0/6] Feature VNC-Clipboard Markus Frank
2023-09-21 11:47 ` [pve-devel] [PATCH qemu-sever v13 1/6] enable VNC clipboard parameter in vga_fmt Markus Frank
2023-11-10  9:33   ` Dominik Csapak
2023-09-21 11:47 ` [pve-devel] [PATCH qemu-sever v13 2/6] add clipboard variable to return at status/current Markus Frank
2023-09-21 11:47 ` [pve-devel] [PATCH qemu-sever v13 3/6] test cases for clipboard spice & std Markus Frank
2023-09-21 11:47 ` [pve-devel] [PATCH novnc v13 4/6] add "show clipboard button" patch to series Markus Frank
2023-09-21 11:47 ` Markus Frank [this message]
2023-11-10  9:34   ` [pve-devel] [PATCH manager v13 5/6] add clipboard checkbox to VM Options Dominik Csapak
2023-11-10 10:00     ` Thomas Lamprecht
2023-09-21 11:47 ` [pve-devel] [PATCH docs v13 6/6] add VNC clipboard documentation Markus Frank
2023-11-10  9:34 ` [pve-devel] [PATCH qemu-sever/novnc/manager/docs v13 0/6] Feature VNC-Clipboard Dominik Csapak

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230921114758.352377-6-m.frank@proxmox.com \
    --to=m.frank@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal