[pve-devel] r6255 - in pve-manager/pve2: . www/manager/form

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-07-07 12:28:27 +0200 (Thu, 07 Jul 2011)
New Revision: 6255

Modified:
   pve-manager/pve2/ChangeLog
   pve-manager/pve2/www/manager/form/BondModeSelector.js
   pve-manager/pve2/www/manager/form/BusTypeSelector.js
   pve-manager/pve2/www/manager/form/DiskFormatSelector.js
   pve-manager/pve2/www/manager/form/NetworkCardSelector.js
Log:
use KVComboBox everywhere


Modified: pve-manager/pve2/ChangeLog
===================================================================
--- pve-manager/pve2/ChangeLog	2011-07-07 10:25:18 UTC (rev 6254)
+++ pve-manager/pve2/ChangeLog	2011-07-07 10:28:27 UTC (rev 6255)
@@ -1,5 +1,13 @@
 2011-07-07  Proxmox Support Team  <support at proxmox.com>
 
+	* www/manager/form/DiskFormatSelector.js: use PVE.form.KVComboBox
+
+	* www/manager/form/BondModeSelector.js: use PVE.form.KVComboBox
+
+	* www/manager/form/BusTypeSelector.js: use PVE.form.KVComboBox
+
+	* www/manager/form/NetworkCardSelector.js: use PVE.form.KVComboBox
+
 	* www/manager/PVEUtils.js: impl. MacAddress vtype
 
 	* www/manager/window/Wizard.js: make it easy to use two column

Modified: pve-manager/pve2/www/manager/form/BondModeSelector.js
===================================================================
--- pve-manager/pve2/www/manager/form/BondModeSelector.js	2011-07-07 10:25:18 UTC (rev 6254)
+++ pve-manager/pve2/www/manager/form/BondModeSelector.js	2011-07-07 10:28:27 UTC (rev 6255)
@@ -1,31 +1,20 @@
 Ext.define('PVE.form.BondModeSelector', {
-    extend: 'Ext.form.field.ComboBox',
+    extend: 'PVE.form.KVComboBox',
     alias: ['widget.bondModeSelector'],
   
     initComponent: function() {
 	var me = this;
 
-	var store = Ext.create('Ext.data.ArrayStore', {
-	    model: 'KeyValue',
-            data : [ 
-		['balance-rr', ''], 
-		['active-backup', ''], 
-		['balance-xor', ''], 
-		['broadcast', ''], 
-		['802.3ad', ''], 
-		['balance-tlb', ''], 
-		['balance-alb', '']
-	    ]
-        });
-
-	Ext.apply(me, {
-	    store: store,
-	    queryMode: 'local',
-	    editable: false,
-	    displayField: 'key',
-	    valueField: 'key'
-	});
-
+        me.data = [ 
+	    ['balance-rr', 'balance-rr'], 
+	    ['active-backup', 'active-backup'], 
+	    ['balance-xor', 'balance-xor'], 
+	    ['broadcast', 'broadcast'], 
+	    ['802.3ad', '802.3ad'], 
+	    ['balance-tlb', 'balance-tlb'], 
+	    ['balance-alb', 'balance-alb']
+	];
+ 
 	me.callParent();
     }
 });

Modified: pve-manager/pve2/www/manager/form/BusTypeSelector.js
===================================================================
--- pve-manager/pve2/www/manager/form/BusTypeSelector.js	2011-07-07 10:25:18 UTC (rev 6254)
+++ pve-manager/pve2/www/manager/form/BusTypeSelector.js	2011-07-07 10:28:27 UTC (rev 6255)
@@ -1,31 +1,18 @@
 Ext.define('PVE.form.BusTypeSelector', {
-    extend: 'Ext.form.field.ComboBox',
+    extend: 'PVE.form.KVComboBox',
     alias: ['widget.PVE.form.BusTypeSelector'],
   
     initComponent: function() {
 	var me = this;
 
-	var data = [['ide', 'IDE']];
+	me.data = [['ide', 'IDE']];
 
 	if (!me.noVirtIO) 
-	    data.push(['virtio', 'VIRTIO']);
+	    me.data.push(['virtio', 'VIRTIO']);
 
 	if (!me.noScsi) 
-	    data.push(['scsi', 'SCSI']);
+	    me.data.push(['scsi', 'SCSI']);
 
-	var store = Ext.create('Ext.data.ArrayStore', {
-	    model: 'KeyValue',
-            data : data
-        });
-
-	Ext.apply(me, {
-	    store: store,
-	    queryMode: 'local',
-	    editable: false,
-	    displayField: 'value',
-	    valueField: 'key'
-	});
-
 	me.callParent();
     }
 });

Modified: pve-manager/pve2/www/manager/form/DiskFormatSelector.js
===================================================================
--- pve-manager/pve2/www/manager/form/DiskFormatSelector.js	2011-07-07 10:25:18 UTC (rev 6254)
+++ pve-manager/pve2/www/manager/form/DiskFormatSelector.js	2011-07-07 10:28:27 UTC (rev 6255)
@@ -1,27 +1,16 @@
 Ext.define('PVE.form.DiskFormatSelector', {
-    extend: 'Ext.form.field.ComboBox',
+    extend: 'PVE.form.KVComboBox',
     alias: ['widget.PVE.form.DiskFormatSelector'],
   
     initComponent: function() {
 	var me = this;
 
-	var store = Ext.create('Ext.data.ArrayStore', {
-	    model: 'KeyValue',
-            data : [ 
-		['raw', 'Raw disk image (raw)'], 
-		['qcow2', 'QEMU image format (qcow2)'],
-		['vmdk', 'VMware image format (vmdk)']
-	    ]
-        });
+        me.data = [ 
+	    ['raw', 'Raw disk image (raw)'], 
+	    ['qcow2', 'QEMU image format (qcow2)'],
+	    ['vmdk', 'VMware image format (vmdk)']
+	];
 
-	Ext.apply(me, {
-	    store: store,
-	    queryMode: 'local',
-	    editable: false,
-	    displayField: 'value',
-	    valueField: 'key'
-	});
-
 	me.callParent();
     }
 });

Modified: pve-manager/pve2/www/manager/form/NetworkCardSelector.js
===================================================================
--- pve-manager/pve2/www/manager/form/NetworkCardSelector.js	2011-07-07 10:25:18 UTC (rev 6254)
+++ pve-manager/pve2/www/manager/form/NetworkCardSelector.js	2011-07-07 10:28:27 UTC (rev 6255)
@@ -1,27 +1,16 @@
 Ext.define('PVE.form.NetworkCardSelector', {
-    extend: 'Ext.form.field.ComboBox',
+    extend: 'PVE.form.KVComboBox',
     alias: ['widget.PVE.form.NetworkCardSelector'],
   
     initComponent: function() {
 	var me = this;
 
-	var store = Ext.create('Ext.data.ArrayStore', {
-	    model: 'KeyValue',
-            data : [ 
-		['rtl8139', 'Realtec RTL8139'], 
-		['e1000', 'Intel E1000'],
-		['virtio', 'VirtIO (paravirtualized)']
-	    ]
-        });
-
-	Ext.apply(me, {
-	    store: store,
-	    queryMode: 'local',
-	    editable: false,
-	    displayField: 'value',
-	    valueField: 'key'
-	});
-
+        me.data = [ 
+	    ['rtl8139', 'Realtec RTL8139'], 
+	    ['e1000', 'Intel E1000'],
+	    ['virtio', 'VirtIO (paravirtualized)']
+	];
+ 
 	me.callParent();
     }
 });