--- a/res/layout/edit_settings.xml	Fri Jun 26 20:13:58 2009 +0200
+++ b/res/layout/edit_settings.xml	Fri Jun 26 19:45:07 2009 +0200
@@ -134,6 +134,7 @@
     				android:layout_width="wrap_content"
     				android:layout_height="wrap_content"
     				android:text="@string/settings_proxy_use"
+    				android:focusable="true"
     				style="@style/CheckBoxLabel" />
     			<LinearLayout android:id="@+id/settings_proxy_parameters"
     				android:layout_width="fill_parent"

--- a/res/values-en/strings.xml	Fri Jun 26 20:13:58 2009 +0200
+++ b/res/values-en/strings.xml	Fri Jun 26 19:45:07 2009 +0200
@@ -162,6 +162,7 @@
 	<string name="login_about_button">Close</string>
 	<string name="login_settings_button">Settings</string>
 	<string name="login_login_button">Log in</string>
+	<string name="login_login_progress">Connecting. Please wait...</string>
 	
 	
 	<!--

--- a/res/values-fr/strings.xml	Fri Jun 26 20:13:58 2009 +0200
+++ b/res/values-fr/strings.xml	Fri Jun 26 19:45:07 2009 +0200
@@ -156,7 +156,8 @@
 	</string>
 	<string name="login_about_button">Fermer</string>
 	<string name="login_settings_button">Paramètres</string>
-	<string name="login_login_button">Connexion</string>	
+	<string name="login_login_button">Connexion</string>
+	<string name="login_login_progress">Connexion en cours. Veuillez patienter...</string>	
 	
 	<!--
 		EditSettings Activity

--- a/src/com/beem/project/beem/ui/EditSettings.java	Fri Jun 26 20:13:58 2009 +0200
+++ b/src/com/beem/project/beem/ui/EditSettings.java	Fri Jun 26 19:45:07 2009 +0200
@@ -99,6 +99,16 @@
 	proxyPortField.setEnabled(false);
 	proxyUsernameField.setEnabled(false);
 	proxyPasswordField.setEnabled(false);
+	proxyTypeSpinner.setFocusable(false);
+	proxyServerField.setFocusable(false);
+	proxyPortField.setFocusable(false);
+	proxyUsernameField.setFocusable(false);
+	proxyPasswordField.setFocusable(false);
+	proxyTypeSpinner.setFocusableInTouchMode(false);
+	proxyServerField.setFocusableInTouchMode(false);
+	proxyPortField.setFocusableInTouchMode(false);
+	proxyUsernameField.setFocusableInTouchMode(false);
+	proxyPasswordField.setFocusableInTouchMode(false);
     }
 
     private void displayNotification(CharSequence msg) {
@@ -115,6 +125,16 @@
 	proxyPortField.setEnabled(true);
 	proxyUsernameField.setEnabled(true);
 	proxyPasswordField.setEnabled(true);
+	proxyTypeSpinner.setFocusable(true);
+	proxyServerField.setFocusable(true);
+	proxyPortField.setFocusable(true);
+	proxyUsernameField.setFocusable(true);
+	proxyPasswordField.setFocusable(true);
+	proxyTypeSpinner.setFocusableInTouchMode(true);
+	proxyServerField.setFocusableInTouchMode(true);
+	proxyPortField.setFocusableInTouchMode(true);
+	proxyUsernameField.setFocusableInTouchMode(true);
+	proxyPasswordField.setFocusableInTouchMode(true);
     }
 
     /**
@@ -244,6 +264,7 @@
 	proxyPortField = (EditText) findViewById(R.id.settings_proxy_port);
 	proxyUsernameField = (EditText) findViewById(R.id.settings_proxy_username);
 	proxyPasswordField = (EditText) findViewById(R.id.settings_proxy_password);
+	disableProxyParameters();
     }
 
     /**

--- a/src/com/beem/project/beem/ui/Login.java	Fri Jun 26 20:13:58 2009 +0200
+++ b/src/com/beem/project/beem/ui/Login.java	Fri Jun 26 19:45:07 2009 +0200
@@ -207,7 +207,7 @@
 
 			@Override
 			public void run() {
-			    progressDialog.setMessage("Connecting. Please wait...");
+			    progressDialog.setMessage(getString(R.string.login_login_progress));
 			    progressDialog.show();
 			}
 		    });