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 A1D726A266 for ; Thu, 4 Mar 2021 13:52:18 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9E4FC1A611 for ; Thu, 4 Mar 2021 13:52:18 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id 0B1761A5DA for ; Thu, 4 Mar 2021 13:52:17 +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 CBCB8462C6 for ; Thu, 4 Mar 2021 13:52:16 +0100 (CET) From: Stefan Reiter To: pve-devel@lists.proxmox.com Date: Thu, 4 Mar 2021 13:52:08 +0100 Message-Id: <20210304125209.24078-7-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210304125209.24078-1-s.reiter@proxmox.com> References: <20210304125209.24078-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.024 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH manager 6/7] ui: create MachineEdit window 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: Thu, 04 Mar 2021 12:52:18 -0000 no functional change intended Signed-off-by: Stefan Reiter --- www/manager6/Makefile | 1 + www/manager6/qemu/HardwareView.js | 16 +------------ www/manager6/qemu/MachineEdit.js | 38 +++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 15 deletions(-) create mode 100644 www/manager6/qemu/MachineEdit.js diff --git a/www/manager6/Makefile b/www/manager6/Makefile index 85f90ecd..a2f7be6d 100644 --- a/www/manager6/Makefile +++ b/www/manager6/Makefile @@ -204,6 +204,7 @@ JSSRC= \ qemu/HardwareView.js \ qemu/IPConfigEdit.js \ qemu/KeyboardEdit.js \ + qemu/MachineEdit.js \ qemu/MemoryEdit.js \ qemu/Monitor.js \ qemu/NetworkEdit.js \ diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js index 41d65b40..470baa46 100644 --- a/www/manager6/qemu/HardwareView.js +++ b/www/manager6/qemu/HardwareView.js @@ -154,21 +154,7 @@ Ext.define('PVE.qemu.HardwareView', { }, machine: { header: gettext('Machine'), - editor: caps.vms['VM.Config.HWType'] ? { - xtype: 'proxmoxWindowEdit', - subject: gettext('Machine'), - width: 350, - items: [{ - xtype: 'proxmoxKVComboBox', - name: 'machine', - value: '__default__', - fieldLabel: gettext('Machine'), - comboItems: [ - ['__default__', PVE.Utils.render_qemu_machine('')], - ['q35', 'q35'], - ], - }], -} : undefined, + editor: caps.vms['VM.Config.HWType'] ? 'PVE.qemu.MachineEdit' : undefined, iconCls: 'cogs', never_delete: true, group: 6, diff --git a/www/manager6/qemu/MachineEdit.js b/www/manager6/qemu/MachineEdit.js new file mode 100644 index 00000000..8a3a6f7a --- /dev/null +++ b/www/manager6/qemu/MachineEdit.js @@ -0,0 +1,38 @@ +Ext.define('PVE.qemu.MachineInputPanel', { + extend: 'Proxmox.panel.InputPanel', + xtype: 'pveMachineInputPanel', + + items: [{ + name: 'machine', + xtype: 'proxmoxKVComboBox', + fieldLabel: gettext('Machine'), + comboItems: [ + ['__default__', PVE.Utils.render_qemu_machine('')], + ['q35', 'q35'], + ], + }], +}); + +Ext.define('PVE.qemu.MachineEdit', { + extend: 'Proxmox.window.Edit', + + subject: gettext('Machine'), + + items: [{ + xtype: 'pveMachineInputPanel', + }], + + initComponent: function() { + let me = this; + + me.callParent(); + + me.load({ + success: function(response) { + let vmconfig = response.result.data; + let machine = vmconfig.machine || '__default__'; + me.setValues({ machine: machine }); + }, + }); + }, +}); -- 2.20.1