From: Markus Frank <m.frank@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager v3 5/6] added clipboard checkbox & combobox to DisplayEdit
Date: Fri, 28 Oct 2022 14:33:21 +0200 [thread overview]
Message-ID: <20221028123322.93142-6-m.frank@proxmox.com> (raw)
In-Reply-To: <20221028123322.93142-1-m.frank@proxmox.com>
If display is set to spice the checkbox gets replaced by a combobox to
show the available clipboard options.
Signed-off-by: Markus Frank <m.frank@proxmox.com>
---
www/manager6/qemu/DisplayEdit.js | 62 +++++++++++++++++++++++++++++++-
1 file changed, 61 insertions(+), 1 deletion(-)
diff --git a/www/manager6/qemu/DisplayEdit.js b/www/manager6/qemu/DisplayEdit.js
index 9bb1763e..2cef5ad2 100644
--- a/www/manager6/qemu/DisplayEdit.js
+++ b/www/manager6/qemu/DisplayEdit.js
@@ -33,22 +33,54 @@ Ext.define('PVE.qemu.DisplayInputPanel', {
return;
}
let memoryfield = this.up('panel').down('field[name=memory]');
+ let clipboardBox = this.up('panel').down('field[itemId=clipboardBox]');
+ let clipboardDrop = this.up('panel').down('field[itemId=clipboardDrop]');
+ let vdagentHint = this.up('panel').down('field[name=vdagentHint]');
let disableMemoryField = false;
+ let spice = false;
+ let showClipboardAndHint = true;
if (val === "cirrus") {
memoryfield.setEmptyText("4");
- } else if (val === "std" || val.match(/^qxl\d?$/) || val === "vmware") {
+ } else if (val === "std" || val === "vmware") {
memoryfield.setEmptyText("16");
+ } else if (val.match(/^qxl\d?$/)) {
+ memoryfield.setEmptyText("16");
+ spice = true;
} else if (val.match(/^virtio/)) {
memoryfield.setEmptyText("256");
+ spice = true;
} else if (val.match(/^(serial\d|none)$/)) {
memoryfield.setEmptyText("N/A");
disableMemoryField = true;
+ showClipboardAndHint = false;
} else {
console.debug("unexpected display type", val);
memoryfield.setEmptyText(Proxmox.Utils.defaultText);
}
memoryfield.setDisabled(disableMemoryField);
+ vdagentHint.setVisible(showClipboardAndHint);
+ if (showClipboardAndHint) {
+ // switch from Checkbox to ComboBox and vice versa
+ clipboardBox.setDisabled(spice);
+ clipboardDrop.setDisabled(!spice);
+ clipboardBox.setVisible(!spice);
+ clipboardDrop.setVisible(spice);
+ // reset value when changing to spice,
+ // so that you have to actively change to noVNC Clipboard
+ if (spice) {
+ clipboardDrop.setValue('__default__');
+ }
+ } else {
+ // reset to default
+ clipboardBox.setValue(false);
+ clipboardDrop.setValue('__default__');
+ // show only the disabled Checkbox
+ clipboardBox.setDisabled(true);
+ clipboardDrop.setDisabled(true);
+ clipboardBox.setVisible(true);
+ clipboardDrop.setVisible(false);
+ }
},
},
},
@@ -60,6 +92,34 @@ Ext.define('PVE.qemu.DisplayInputPanel', {
maxValue: 512,
step: 4,
name: 'memory',
+ },
+ {
+ xtype: 'proxmoxcheckbox',
+ fieldLabel: gettext('noVNC Clipboard'),
+ name: 'clipboard',
+ itemId: 'clipboardBox',
+ },
+ {
+ name: 'clipboard',
+ itemId: 'clipboardDrop',
+ xtype: 'proxmoxKVComboBox',
+ value: '__default__',
+ deleteEmpty: false,
+ fieldLabel: gettext('Clipboard'),
+ comboItems: [
+ ['__default__', 'SPICE-Clipboard'],
+ ['1', 'noVNC-Clipboard'],
+ ],
+ disabled: true,
+ hidden: true,
+ },
+ {
+ itemId: 'vdagentHint',
+ name: 'vdagentHint',
+ xtype: 'displayfield',
+ userCls: 'pmx-hint',
+ value: 'Clipboard for noVNC requires spice-tools installed and ' +
+ 'enabled in the Guest-VM.',
}],
});
--
2.30.2
next prev parent reply other threads:[~2022-10-28 12:34 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-28 12:33 [pve-devel] [PATCH qemu-server/novnc/manager/docs v3 0/6] Feature noVNC-Clipboard Markus Frank
2022-10-28 12:33 ` [pve-devel] [PATCH qemu-server v3 1/6] enable clipboard parameter in vga_fmt Markus Frank
2023-03-02 10:28 ` Dominik Csapak
2022-10-28 12:33 ` [pve-devel] [PATCH qemu-server v3 2/6] added clipboard variable to return at status/current Markus Frank
2023-03-02 10:28 ` Dominik Csapak
2022-10-28 12:33 ` [pve-devel] [PATCH qemu-server v3 3/6] test cases for clipboard spice & std Markus Frank
2022-10-28 12:33 ` [pve-devel] [PATCH novnc v3 4/6] added show clipboard button patch to series Markus Frank
2022-10-28 12:33 ` Markus Frank [this message]
2023-03-02 10:28 ` [pve-devel] [PATCH manager v3 5/6] added clipboard checkbox & combobox to DisplayEdit Dominik Csapak
2022-10-28 12:33 ` [pve-devel] [PATCH docs v3 6/6] added noVNC clipboard documentation Markus Frank
2023-03-02 10:28 ` 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=20221028123322.93142-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.