tidy up the login window code, extend Ext.Window instead.

focus the password field upon the login window being displayed

deluge/ui/web/js/deluge-bars.js

@@ -50,7 +50,7 @@ Deluge.ToolBar = {
 	onLogout: function() {
 		this.Bar.items.get('logout').disable();
 		Deluge.Events.fire('logout');
-		Deluge.Login.Window.show();
+		Deluge.Login.show();
 	},
 	
 	onConnectionManagerClick: function(item) {

deluge/ui/web/js/deluge-login.js

@@ -21,13 +21,70 @@ Copyright:
 		Boston, MA  02110-1301, USA.
 */
 
-Deluge.Login = {
+(function(){
+	var LoginWindow = function(config) {
+		Ext.apply(this, {
+			layout: 'fit',
+			width: 300,
+			height: 120,
+			bodyStyle: 'padding: 10px 5px;',
+			buttonAlign: 'center',
+			closeAction: 'hide',
+			closable: false,
+			modal: true,
+			plain: true,
+			resizable: false,
+			title: _('Login'),
+			iconCls: 'x-deluge-login-window-icon'
+		});
+		Ext.apply(this, config);
+		LoginWindow.superclass.constructor.call(this);
+	};
+	
+	Ext.extend(LoginWindow, Ext.Window, {
+		initComponent: function() {
+			LoginWindow.superclass.initComponent.call();
+			Deluge.Events.on('logout', this.onLogout);
+			this.on('show', this.onShow, this);
+			
+			this.addButton({
+				text: _('Login'),
+				handler: this.onLogin,
+				scope: this
+			});
+			
+			this.loginForm = this.add({
+				xtype: 'form',
+				defaultType: 'textfield',
+				id: 'loginForm',
+				baseCls: 'x-plain',
+				labelWidth: 55,
+				items: [{
+					fieldLabel: _('Password'),
+					id: 'password',
+					name: 'password',
+					inputType: 'password',
+					anchor: '100%',
+					listeners: {
+						'specialkey': {
+							fn: this.onKey,
+							scope: this
+						}
+					}
+				}]
+			});
+		},
+		
+		onKey: function(field, e) {
+			if (e.getKey() == 13) this.onLogin();
+		},
+		
 		onLogin: function() {
-        var passwordField = Deluge.Login.Form.items.get('password');
+			var passwordField = this.loginForm.items.get('password');
 			Deluge.Client.web.login(passwordField.getValue(), {
 				onSuccess: function(result) {
 					if (result == true) {
-                    Deluge.Login.Window.hide();
+						this.hide();
 						Deluge.Connections.loginShow();
 						passwordField.setRawValue('');
 						Deluge.Events.fire('login')
@@ -41,59 +98,19 @@ Deluge.Login = {
 							iconCls: 'x-deluge-icon-warning'
 						});
 					}
-            }
+				}.bindWithEvent(this)
 			});
 		},
 		
 		onLogout: function() {
-        Deluge.Login.Window.show();
+			this.show();
 		},
 		
-    onKey: function(field, e) {
+		onShow: function() {
-        if (e.getKey() == 13) Deluge.Login.onLogin();
+			var passwordField = this.loginForm.items.get('password');
-    },
+			passwordField.focus(false, 150);
-    
-    onRender: function() {  
-        Deluge.Events.on('logout', this.onLogout);
 		}
-}
-
-Deluge.Login.Form = new Ext.form.FormPanel({
-    defaultType: 'textfield',
-    id: 'loginForm',
-    baseCls: 'x-plain',
-    labelWidth: 55,
-    items: [{
-        fieldLabel: _('Password'),
-        id: 'password',
-        name: 'password',
-        inputType: 'password',
-        anchor: '100%',
-        listeners: {
-            'specialkey': {
-                fn: Deluge.Login.onKey,
-                scope: Deluge.Login
-            }
-        }
-    }]
 	});
 	
-Deluge.Login.Window = new Ext.Window({
+	Deluge.Login = new LoginWindow();
-    layout: 'fit',
+})();
-    width: 300,
-    height: 120,
-    bodyStyle: 'padding: 10px 5px;',
-    buttonAlign: 'center',
-    closeAction: 'hide',
-    closable: false,
-    modal: true,
-    plain: true,
-    title: _('Login'),
-    iconCls: 'x-deluge-login-window-icon',
-    items: Deluge.Login.Form,
-    buttons: [{
-        text: _('Login'),
-        handler: Deluge.Login.onLogin
-    }],
-    listeners: {'render': {fn: Deluge.Login.onRender, scope: Deluge.Login}}
-});

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

@@ -48,7 +48,7 @@ Deluge.UI = {
 			items: [this.MainPanel]
 		});
 
-		Deluge.Login.Window.show();
+		Deluge.Login.show();
 		
 		Deluge.Events.on("connect", this.onConnect.bindWithEvent(this));
 		Deluge.Events.on("disconnect", this.onDisconnect.bindWithEvent(this));
@@ -56,7 +56,7 @@ Deluge.UI = {
 	},
 	
 	notify: function(title, message) {
-		this.roar.alert(title, message);
+		//this.roar.alert(title, message);
 	},
 	
 	update: function() {