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)
i used the 'plain' style mostly because in the wizard we already have a
tabpanel (for the steps) and two layers of that seems like too much,
even if that is now also set for the 'normal' editwindow
we could make it dependant on 'insideWizard' but that leads to
unconsistent ux imho
Signed-off-by: Dominik Csapak <d.csa...@proxmox.com>
---
this can be seen as an alternative/successor to dominics' patch from
july[0]. it functionally does the same (split the bandwidth options
into a new tab), but keeps it limited to the HDEdit panel instead
of rewriting it. (also i keep the order of the remaining fields)
there will be another patch to also introduce the multi disk panel
for the wizard, but it's not done yet
0: https://lists.proxmox.com/pipermail/pve-devel/2021-July/049295.html
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..fd78f0bb 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',
+ column1,
+ column2,
+ advancedColumn1,
+ advancedColumn2,
+ showAdvanced: me.showAdvanced,
+ getValues: () => { return {} },
+ },
+ {
+ title: gettext('Bandwidth'),
+ xtype: 'inputpanel',
+ column1: bwColumn1,
+ column2: bwColumn2,
+ showAdvanced: me.showAdvanced,
+ getValues: () => { return {} },
+ },
+ ],
+ },
+ ];
me.callParent();
},
+
+ setAdvancedVisible: function(visible) {
+ let me = this;
+ me.query('inputpanel').forEach((tab) => {
+ tab.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
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
