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 EC4A26C322 for ; Wed, 22 Sep 2021 11:28:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 48AA017F8D for ; Wed, 22 Sep 2021 11:28:07 +0200 (CEST) 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 id 8953B17BDC for ; Wed, 22 Sep 2021 11:27:57 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id DD79444A58 for ; Wed, 22 Sep 2021 11:27:50 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 22 Sep 2021 11:27:38 +0200 Message-Id: <20210922092749.2386238-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210922092749.2386238-1-d.csapak@proxmox.com> References: <20210922092749.2386238-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.367 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [me.drive] Subject: [pve-devel] [PATCH manager v2 01/12] ui: qemu/HDEdit: move Bandwidth options to a different tab 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: Wed, 22 Sep 2021 09:28:39 -0000 for that we have to nest the now two tabs in a tabpanel into an inputpanel. to prevent the options to be collected twice, we override the 'getValues' function of the 'sub-inputpanels' to return an empty object. (we could make that an option for the inputpanel, but not necessary for now) also we have to move the 'bodyPadding' of the wizard to the 'defaults' so we can override it for specific panels and we have to manually set the width of the edit window since it believes we only have a single column ('twoColumns' could also be an option of the edit window should we need that again) Signed-off-by: Dominik Csapak --- www/manager6/qemu/CreateWizard.js | 1 + www/manager6/qemu/HDEdit.js | 113 +++++++++++++++++++++--------- www/manager6/window/Wizard.js | 5 +- 3 files changed, 85 insertions(+), 34 deletions(-) diff --git a/www/manager6/qemu/CreateWizard.js b/www/manager6/qemu/CreateWizard.js index d4535c9d..015a099d 100644 --- a/www/manager6/qemu/CreateWizard.js +++ b/www/manager6/qemu/CreateWizard.js @@ -155,6 +155,7 @@ Ext.define('PVE.qemu.CreateWizard', { }, { xtype: 'pveQemuHDInputPanel', + padding: 0, bind: { nodename: '{nodename}', }, diff --git a/www/manager6/qemu/HDEdit.js b/www/manager6/qemu/HDEdit.js index 95a98b0b..ae7e3fde 100644 --- a/www/manager6/qemu/HDEdit.js +++ b/www/manager6/qemu/HDEdit.js @@ -155,6 +155,8 @@ Ext.define('PVE.qemu.HDInputPanel', { me.down('#hdimage').setStorage(undefined, nodename); }, + hasAdvanced: true, + initComponent: function() { var me = this; @@ -162,17 +164,17 @@ Ext.define('PVE.qemu.HDInputPanel', { me.drive = {}; - me.column1 = []; - me.column2 = []; + let column1 = []; + let column2 = []; - me.advancedColumn1 = []; - me.advancedColumn2 = []; + let advancedColumn1 = []; + let advancedColumn2 = []; if (!me.confid || me.unused) { me.bussel = Ext.create('PVE.form.ControllerSelector', { vmconfig: me.insideWizard ? { ide2: 'cdrom' } : {}, }); - me.column1.push(me.bussel); + column1.push(me.bussel); me.scsiController = Ext.create('Ext.form.field.Display', { fieldLabel: gettext('SCSI Controller'), @@ -184,7 +186,7 @@ Ext.define('PVE.qemu.HDInputPanel', { submitValue: false, hidden: true, }); - me.column1.push(me.scsiController); + column1.push(me.scsiController); } if (me.unused) { @@ -198,9 +200,9 @@ Ext.define('PVE.qemu.HDInputPanel', { data: [], allowBlank: false, }); - me.column1.push(me.unusedDisks); + column1.push(me.unusedDisks); } else if (me.isCreate) { - me.column1.push({ + column1.push({ xtype: 'pveDiskStorageSelector', storageContent: 'images', name: 'disk', @@ -208,7 +210,7 @@ Ext.define('PVE.qemu.HDInputPanel', { autoSelect: me.insideWizard, }); } else { - me.column1.push({ + column1.push({ xtype: 'textfield', disabled: true, submitValue: false, @@ -217,7 +219,7 @@ Ext.define('PVE.qemu.HDInputPanel', { }); } - me.column2.push( + column2.push( { xtype: 'CacheTypeSelector', name: 'cache', @@ -232,7 +234,7 @@ Ext.define('PVE.qemu.HDInputPanel', { }, ); - me.advancedColumn1.push( + advancedColumn1.push( { xtype: 'proxmoxcheckbox', disabled: me.confid && me.confid.match(/^virtio/), @@ -249,6 +251,31 @@ Ext.define('PVE.qemu.HDInputPanel', { reference: 'iothread', name: 'iothread', }, + ); + + advancedColumn2.push( + { + xtype: 'proxmoxcheckbox', + fieldLabel: gettext('Backup'), + autoEl: { + tag: 'div', + 'data-qtip': gettext('Include volume in backup job'), + }, + labelWidth: labelWidth, + name: 'backup', + bind: { + value: '{isIncludedInBackup}', + }, + }, + { + xtype: 'proxmoxcheckbox', + fieldLabel: gettext('Skip replication'), + labelWidth: labelWidth, + name: 'noreplicate', + }, + ); + + let bwColumn1 = [ { xtype: 'numberfield', name: 'mbps_rd', @@ -285,28 +312,9 @@ Ext.define('PVE.qemu.HDInputPanel', { labelWidth: labelWidth, emptyText: gettext('unlimited'), }, - ); + ]; - me.advancedColumn2.push( - { - xtype: 'proxmoxcheckbox', - fieldLabel: gettext('Backup'), - autoEl: { - tag: 'div', - 'data-qtip': gettext('Include volume in backup job'), - }, - labelWidth: labelWidth, - name: 'backup', - bind: { - value: '{isIncludedInBackup}', - }, - }, - { - xtype: 'proxmoxcheckbox', - fieldLabel: gettext('Skip replication'), - labelWidth: labelWidth, - name: 'noreplicate', - }, + let bwColumn2 = [ { xtype: 'numberfield', name: 'mbps_rd_max', @@ -343,10 +351,46 @@ Ext.define('PVE.qemu.HDInputPanel', { labelWidth: labelWidth, emptyText: gettext('default'), }, - ); + ]; + + me.items = [ + { + xtype: 'tabpanel', + plain: true, + bodyPadding: 10, + border: 0, + items: [ + { + title: gettext('Disk'), + xtype: 'inputpanel', + reference: 'diskpanel', + column1, + column2, + advancedColumn1, + advancedColumn2, + showAdvanced: me.showAdvanced, + getValues: () => ({}), + }, + { + title: gettext('Bandwidth'), + xtype: 'inputpanel', + reference: 'bwpanel', + column1: bwColumn1, + column2: bwColumn2, + showAdvanced: me.showAdvanced, + getValues: () => ({}), + }, + ], + }, + ]; me.callParent(); }, + + setAdvancedVisible: function(visible) { + this.lookup('diskpanel').setAdvancedVisible(visible); + this.lookup('bwpanel').setAdvancedVisible(visible); + }, }); Ext.define('PVE.qemu.HDEdit', { @@ -356,6 +400,9 @@ Ext.define('PVE.qemu.HDEdit', { backgroundDelay: 5, + width: 600, + bodyPadding: 0, + initComponent: function() { var me = this; diff --git a/www/manager6/window/Wizard.js b/www/manager6/window/Wizard.js index 47d60b8e..d12f4d90 100644 --- a/www/manager6/window/Wizard.js +++ b/www/manager6/window/Wizard.js @@ -131,7 +131,7 @@ Ext.define('PVE.window.Wizard', { itemId: 'wizcontent', xtype: 'tabpanel', activeItem: 0, - bodyPadding: 10, + bodyPadding: 0, listeners: { afterrender: function(tp) { tabchange(tp, this.getActiveTab()); @@ -140,6 +140,9 @@ Ext.define('PVE.window.Wizard', { tabchange(tp, newcard, oldcard); }, }, + defaults: { + padding: 10, + }, items: tabs, }], }, -- 2.30.2