finalise the layout of the options tab in the add window

deluge/ui/web/js/deluge-add.js

@@ -231,107 +231,40 @@ Deluge.Add.Options = new Ext.TabPanel({
 		title: _('Options'),
 		layout: 'fit',
 		items: [new Ext.form.FormPanel({
-			xtype: 'form',
 			id: 'addOptionsForm',
 			bodyStyle: 'padding: 5px;',
-			items: [/*{
+			items: [{
 				xtype: 'fieldset',
+				style: 'padding: 0px; padding-top: 5px;',
 				title: _('Download Location'),
 				border: false,
+				autoHeight: true,
+				border: false,
+				labelWidth: 1,
+				items: [{
+					layout: 'column',
+					border: false,
 					items: [{
 						xtype: 'textfield',
-					fieldLabel: '',
 						id: 'download_location',
-					name: 'download_location',
+						fieldLabel: '',
-					anchor: '100%'
+						labelSeparator: '',
+						width: 300
+					}, {
+						border: false,
+						style: 'padding-left: 5px;',
+						items: [{
+							xtype: 'button',
+							text: _('Browse') + '...'
 						}]
-			}, */{
+					}]
+				}]
+			}, {
 				layout: 'column',
 				border: false,
 				defaults: {
 					border: false
 				},
-				items: [{
-					xtype: 'fieldset',
-					title: _('Bandwidth'),
-					layout: 'table',
-					layoutConfig: {columns: 3},
-					autoHeight: true,
-					defaultType: 'uxspinner',
-					width: 250,
-					items: [{
-						xtype: 'label',
-						text: _('Max Down Speed'),
-						forId: 'add_max_download_speed',
-						cls: 'x-deluge-options-label',
-						width: 120,
-						style: 'margin-left: 10px;'
-					}, {
-						id: 'add_max_download_speed',
-						width: 60,
-						value: 1024,
-						strategy: new Ext.ux.form.Spinner.NumberStrategy({
-							minValue: -1,
-							maxValue: 99999,
-							incrementValue: 1
-						})
-					}, {
-						xtype: 'label',
-						text: 'KiB/s',
-						style: 'margin-left: 5px;'
-					}, {
-						xtype: 'label',
-						text: _('Max Up Speed'),
-						forId: 'add_max_upload_speed',
-						cls: 'x-deluge-options-label',
-						style: 'margin-left: 10px;'
-					}, {
-						id: 'add_max_upload_speed',
-						width: 60,
-						value: -1,
-						strategy: new Ext.ux.form.Spinner.NumberStrategy({
-							minValue: -1,
-							maxValue: 99999,
-							incrementValue: 1
-						})
-					}, {
-						xtype: 'label',
-						text: 'KiB/s',
-						style: 'margin-left: 5px;'
-					}, {
-						xtype: 'label',
-						text: _('Max Connections'),
-						forId: 'add_max_connections',
-						cls: 'x-deluge-options-label',
-						style: 'margin-left: 10px;'
-					}, {
-						id: 'add_max_connections',
-						colspan: 2,
-						width: 60,
-						value: -1,
-						strategy: new Ext.ux.form.Spinner.NumberStrategy({
-							minValue: -1,
-							maxValue: 99999,
-							incrementValue: 1
-						})
-					}, {
-						xtype: 'label',
-						text: _('Max Upload Slots'),
-						forId: 'add_max_upload_slots',
-						cls: 'x-deluge-options-label',
-						style: 'margin-left: 10px;'
-					}, {
-						id: 'add_max_upload_slots',
-						colspan: 2,
-						width: 60,
-						value: -1,
-						strategy: new Ext.ux.form.Spinner.NumberStrategy({
-							minValue: -1,
-							maxValue: 99999,
-							incrementValue: 1
-						})
-					}]
-				}, {
 				items: [{
 					xtype: 'fieldset',
 					bodyStyle: 'margin-left: 5px; margin-right:5px;',
@@ -340,11 +273,6 @@ Deluge.Add.Options = new Ext.TabPanel({
 					autoHeight: true,
 					border: false,
 					labelWidth: 1,
-						layout: 'table',
-						layoutConfig: {
-							columns: 2
-						},
-						width: 140,
 					items: [{
 						fieldLabel: '',
 						labelSeparator: '',
@@ -360,6 +288,55 @@ Deluge.Add.Options = new Ext.TabPanel({
 						name: 'compact_allocation',
 						width: 75
 					}]
+				}, {
+					xtype: 'fieldset',
+					title: _('Bandwidth'),
+					layout: 'form',
+					autoHeight: true,
+					defaultType: 'uxspinner',
+					labelWidth: 100,
+					items: [{
+						id: 'add_max_download_speed',
+						fieldLabel: _('Max Down Speed'),
+						width: 60,
+						value: -1,
+						strategy: new Ext.ux.form.Spinner.NumberStrategy({
+							minValue: -1,
+							maxValue: 99999,
+							incrementValue: 1
+						})
+					}, {
+						id: 'add_max_upload_speed',
+						fieldLabel: _('Max Up Speed'),
+						width: 60,
+						value: -1,
+						strategy: new Ext.ux.form.Spinner.NumberStrategy({
+							minValue: -1,
+							maxValue: 99999,
+							incrementValue: 1
+						})
+					}, {
+						id: 'add_max_connections',
+						fieldLabel: _('Max Connections'),
+						width: 60,
+						value: -1,
+						strategy: new Ext.ux.form.Spinner.NumberStrategy({
+							minValue: -1,
+							maxValue: 99999,
+							incrementValue: 1
+						})
+					}, {
+						id: 'add_max_upload_slots',
+						fieldLabel: _('Max Upload Slots'),
+						colspan: 2,
+						width: 60,
+						value: -1,
+						strategy: new Ext.ux.form.Spinner.NumberStrategy({
+							minValue: -1,
+							maxValue: 99999,
+							incrementValue: 1
+						})
+					}]
 				}, {
 					xtype: 'fieldset',
 					title: _('General'),
@@ -381,7 +358,6 @@ Deluge.Add.Options = new Ext.TabPanel({
 					}]
 				}]
 			}]
-			}]
 		})],
 		listeners: {
 			'render': {
@@ -512,7 +488,7 @@ Deluge.Add.Url.Window = new Ext.Window({
 
 Deluge.Add.Window = new Ext.Window({
 	layout: 'border',
-    width: 500,
+    width: 460,
     height: 450,
     bodyStyle: 'padding: 10px 5px;',
     buttonAlign: 'right',