# HG changeset patch
# User Da Risk <darisk972@gmail.com>
# Date 1246038914 -7200
# Node ID 4a995e8a66ab6e21fc018dd52fce1b2f2f2c53d4
# Parent  3d9a315b12e606ec1277623842773bc69ff39de0# Parent  3805671d14ffa69d2610c0bf20af35d2aadeadb1
remerge

diff -r 3805671d14ff -r 4a995e8a66ab res/layout/addcontact.xml
--- a/res/layout/addcontact.xml	Fri Jun 26 21:51:48 2009 +0200
+++ b/res/layout/addcontact.xml	Fri Jun 26 19:55:14 2009 +0200
@@ -1,45 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical" android:layout_width="fill_parent"
+<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
 	android:layout_height="fill_parent">
-	<LinearLayout
-		android:orientation="horizontal" android:layout_width="fill_parent"
-		android:layout_height="wrap_content">
-		<TextView android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:text="@string/AddCLogin"
-			android:minWidth="70dp" />
-
-		<EditText android:id="@+id/addc_login" android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:singleLine="true"
-			android:textSize="16sp" android:autoText="false" android:capitalize="none"
-			android:minWidth="250dp" android:scrollHorizontally="true" />
-	</LinearLayout>
-
-	<LinearLayout
-		android:orientation="horizontal" android:layout_width="fill_parent"
-		android:layout_height="wrap_content">
-		<TextView android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:text="@string/AddCAlias"
-			android:minWidth="70dp" />
-		<EditText android:id="@+id/addc_alias" android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:singleLine="true"
-			android:textSize="16sp" android:autoText="false" android:minWidth="250dp"
-			android:capitalize="none" android:scrollHorizontally="true" />
-	</LinearLayout>
-	<LinearLayout
-		android:orientation="horizontal" android:layout_width="fill_parent"
-		android:layout_height="wrap_content">
-		<TextView android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:text="@string/AddCGroup"
-			android:minWidth="70dp" />
-		<EditText android:id="@+id/addc_group" android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:singleLine="true"
-			android:textSize="16sp" android:autoText="false" android:minWidth="250dp"
-			android:capitalize="none" android:scrollHorizontally="true" />
-	</LinearLayout>
+	<TableRow>
+		<TextView android:text="@string/AddCLogin"
+			android:gravity="left" android:padding="3dip" 
+			/>
+		<EditText android:id="@+id/addc_login" android:inputType="textEmailAddress"
+			android:scrollHorizontally="true" android:layout_width="fill_parent"
+			android:layout_weight="1" android:layout_margin="3dip"
+			 />
+	</TableRow>
+	<TableRow>
+		<TextView android:text="@string/AddCAlias"
+			android:gravity="left" android:padding="3dip" />
+		<EditText android:id="@+id/addc_alias" android:inputType="text"
+			android:textSize="16sp" android:layout_width="fill_parent"
+			android:scrollHorizontally="true"
+			android:layout_weight="1" android:layout_margin="3dip"
+			/>
+	</TableRow>
+	<TableRow>
+		<TextView android:text="@string/AddCGroup"
+			android:minWidth="70dp" android:gravity="left" android:padding="3dip"
+			/>
+		<EditText android:id="@+id/addc_group"  android:inputType="text"
+			android:textSize="16sp" android:layout_width="fill_parent"
+			android:scrollHorizontally="true" 
+			android:layout_weight="1" android:layout_margin="3dip"
+			/>
+	</TableRow>
 	<Button android:id="@+id/addc_ok" android:layout_width="fill_parent"
 		android:layout_height="wrap_content" android:layout_gravity="center_horizontal"
 		android:text="@string/AddCOkButton">
 		<requestFocus />
 	</Button>
-</LinearLayout>
\ No newline at end of file
+</TableLayout>
\ No newline at end of file
diff -r 3805671d14ff -r 4a995e8a66ab res/layout/edit_settings.xml
--- a/res/layout/edit_settings.xml	Fri Jun 26 21:51:48 2009 +0200
+++ b/res/layout/edit_settings.xml	Fri Jun 26 19:55:14 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"
diff -r 3805671d14ff -r 4a995e8a66ab res/layout/login.xml
--- a/res/layout/login.xml	Fri Jun 26 21:51:48 2009 +0200
+++ b/res/layout/login.xml	Fri Jun 26 19:55:14 2009 +0200
@@ -11,9 +11,9 @@
 		android:layout_width="fill_parent" android:layout_height="fill_parent"
 		android:gravity="bottom">
 		<Button android:id="@+id/log_as_settings" android:layout_width="fill_parent"
-			android:layout_height="wrap_content" android:text="Settings" />
+			android:layout_height="wrap_content" android:text="@string/login_settings_button" />
 		<Button android:id="@+id/log_as_login" android:layout_width="fill_parent"
-			android:layout_height="wrap_content" android:text="Login" />
+			android:layout_height="wrap_content" android:text="@string/login_login_button" />
 	</LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff -r 3805671d14ff -r 4a995e8a66ab res/layout/sendim.xml
--- a/res/layout/sendim.xml	Fri Jun 26 21:51:48 2009 +0200
+++ b/res/layout/sendim.xml	Fri Jun 26 19:55:14 2009 +0200
@@ -28,31 +28,6 @@
 		</LinearLayout>
 	</LinearLayout>
 
-	<!--
-		<LinearLayout android:paddingLeft="5px" android:paddingTop="5px"
-		android:background="@drawable/beem_sendim_header_1"
-		android:orientation="horizontal" android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:layout_weight="4">
-
-		<ImageView android:id="@+id/sendimavatar"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content" android:maxHeight="80px"
-		android:layout_weight="5" android:src="@drawable/background"/>
-
-		<LinearLayout android:layout_width="fill_parent"
-		android:layout_height="fill_parent" android:layout_weight="1"
-		android:orientation="vertical"> <TextView
-		android:id="@+id/sendimlogin" android:paddingLeft="15px"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:hint="@string/SendIMLoginHint"/> <TextView
-		android:id="@+id/sendimstatus" android:paddingLeft="20px"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:hint="@string/SendIMNoStatusSet"/> </LinearLayout>
-		</LinearLayout>
-	-->
-
 	<ScrollView android:id="@+id/sendimscroll"
 		android:layout_width="fill_parent" android:layout_height="fill_parent"
 		android:scrollbarTrackVertical="@drawable/scrollbar_vertical_track"
diff -r 3805671d14ff -r 4a995e8a66ab res/values-en/strings.xml
--- a/res/values-en/strings.xml	Fri Jun 26 21:51:48 2009 +0200
+++ b/res/values-en/strings.xml	Fri Jun 26 19:55:14 2009 +0200
@@ -7,21 +7,17 @@
 	<string name="RefuseButton">Refuse</string>
 
 	<!--  Beem class -->
-
 	<string name="BeemJabberID">Jabber ID</string>
 
 	<!--  BeemApplication class -->
-
 	<string name="BeemApplicationConnect">Connecting...</string>
 
 	<!--  BeemService class -->
-
 	<string name="BeemServiceDescription">Use the Beem Service</string>
 	<string name="BeemServiceCreated">BeemService Created</string>
 	<string name="BeemServiceDestroyed">BeemService destroyed</string>
 
 	<!--  Preferences informations -->
-
 	<string name="PreferenceFileName">Beem</string>
 	<string name="PreferenceHostKey">host</string>
 	<string name="PreferenceJID">Jabber ID</string>
@@ -76,9 +72,9 @@
 
 	<!-- AddContact class -->
 	<string name="AddCActTitle">Beem - Add contact</string>
-	<string name="AddCLogin">Login:</string>
-	<string name="AddCAlias">Alias:</string>
-	<string name="AddCGroup">Group:</string>
+	<string name="AddCLogin">Login :</string>
+	<string name="AddCAlias">Alias :</string>
+	<string name="AddCGroup">Group :</string>
 	<string name="AddCOkButton">Ok</string>
 	<string name="AddCContactAdded">Contact added</string>
 	<string name="AddCContactAddedError">Error Contact not added</string>
@@ -86,7 +82,6 @@
 	<string name="AddCBadForm">Bad form</string>
 
 	<!--  SendIM class -->
-
 	<string name="SendIMActTitle">Beem - Chat</string>
 	<string name="SendIMSays"> %s says :\n%s\n</string>
 	<string name="SendIMYouSay">You say :\n%s\n</string>
@@ -102,12 +97,10 @@
 	<!--  ChangeStatus class -->
 	<string name="ChangeStatusText">Type here your status message :</string>
 	<string name="ChangeStatusActTitle">Beem - Change status</string>
-
 	<string name="MenuAddContact">Add new contact</string>
 	<string name="MenuAccountAbout">Beem Project</string>
 	<string name="MenuAccountCreate">Create account</string>
 	<string name="MenuConnection">Edit account</string>
-
 	<string name="ChangeStatusOk">Updating status</string>
 	<string name="ChangeStatusNoChange">Nothing to change</string>
 	
@@ -157,19 +150,19 @@
     -->
 	<string name="login_username">Username</string>
 	<string name="login_password">Password</string>
-	
 	<string name="login_error_dialog_title">Login - Error</string>
 	<string name="login_close_dialog_button">Close</string>
-	
 	<string name="login_menu_create_account">Create an account</string>
 	<string name="login_menu_settings">Settings</string>
 	<string name="login_menu_about">About</string>
-	
 	<string name="login_about_title">About</string>
 	<string name="login_about_msg">
 		BEEM is an EPITECH Innovative Project. Visit us at http://www.beem-project.com !
 	</string>
 	<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>
 	
 	
 	<!--
@@ -177,9 +170,7 @@
 	-->
 	<string name="settings_menu_create_account">Create an account</string>
 	<string name="settings_menu_login">Login</string>
-
 	<string name="settings_saved_ok">The settings have been saved successfully.</string>
-	
 	<string name="settings_filename">beem_settings</string>
 	<string name="settings_key_account_username">beem_account_username</string>
 	<string name="settings_key_account_password">beem_account_password</string>
@@ -196,10 +187,8 @@
 	<!-- EditSettings Activity tabs -->
 	<string name="settings_tab_tag_account">edit_settings_tab_account</string>
 	<string name="settings_tab_label_account">Account</string>
-	
 	<string name="settings_tab_tag_xmpp">edit_settings_tab_xmpp</string>
 	<string name="settings_tab_label_xmpp">XMPP</string>
-	
 	<string name="settings_tab_tag_proxy">edit_settings_tab_proxy</string>
 	<string name="settings_tab_label_proxy">Proxy</string>
 	
@@ -209,7 +198,6 @@
 	<string name="settings_account_server">Server</string>
 	<string name="settings_account_port">Port</string>
 	
-	
 	<!-- EditSettings Activity XMPP tab -->
 	<string name="settings_xmpp_server">Server</string>
 	<string name="settings_xmpp_port">Port</string>
@@ -230,11 +218,8 @@
 	<string name="create_account_err_dialog_title">Create an account - Error</string>
 	<string name="create_account_err_dialog_settings_button">Change my settings</string>
 	<string name="create_account_close_dialog_button">Close</string>
-
-	
 	<string name="create_account_successfull_after">has been created successfully</string>
 	<string name="create_account_err_passwords">Passwords do not match.</string>
-	
 	<string name="create_account_username">Username</string>
 	<string name="create_account_password">Password</string>
 	<string name="create_account_confirm_password">Confirm password</string>
diff -r 3805671d14ff -r 4a995e8a66ab res/values-fr/strings.xml
--- a/res/values-fr/strings.xml	Fri Jun 26 21:51:48 2009 +0200
+++ b/res/values-fr/strings.xml	Fri Jun 26 19:55:14 2009 +0200
@@ -7,21 +7,17 @@
 	<string name="RefuseButton">Refuser</string>
 
 	<!--  Beem class -->
-
 	<string name="BeemJabberID">Jabber ID</string>
 
 	<!--  BeemApplication class -->
-
 	<string name="BeemApplicationConnect">Connexion en cours...</string>
 
 	<!--  BeemService class -->
-
 	<string name="BeemServiceDescription">Utilisation du service BEEM</string>
 	<string name="BeemServiceCreated">BeemService Créé</string>
 	<string name="BeemServiceDestroyed">BeemService détruit</string>
 
 	<!--  Preferences informations -->
-
 	<string name="PreferenceFileName">Beem</string>
 	<string name="PreferenceHostKey">host</string>
 	<string name="PreferenceJID">Jabber ID</string>
@@ -75,9 +71,9 @@
 
 	<!-- AddContact class -->
 	<string name="AddCActTitle">Beem - Ajouter un contact</string>
-	<string name="AddCLogin">Nom d'utilisateur:</string>
-	<string name="AddCAlias">Alias:</string>
-	<string name="AddCGroup">Groupe:</string>
+	<string name="AddCLogin">Nom d\'utilisateur :</string>
+	<string name="AddCAlias">Alias :</string>
+	<string name="AddCGroup">Groupe :</string>
 	<string name="AddCOkButton">Ok</string>
 	<string name="AddCContactAdded">Contact ajouté</string>
 	<string name="AddCContactAddedError">Erreur Contact pas ajouté</string>
@@ -85,7 +81,6 @@
 	<string name="AddCBadForm">Mauvais formulaire</string>
 
 	<!--  SendIM class -->
-
 	<string name="SendIMActTitle">Beem - Chat</string>
 	<string name="SendIMSays"> %s dit :\n%s\n</string>
 	<string name="SendIMYouSay">Vous dites :\n%s\n</string>
@@ -101,12 +96,10 @@
 	<!--  ChangeStatus class -->
 	<string name="ChangeStatusText">Tapez votre message de statut ici :</string>
 	<string name="ChangeStatusActTitle">Beem - Changer statut</string>
-
 	<string name="MenuAddContact">Ajouter un nouveau contact</string>
 	<string name="MenuAccountAbout">Beem Project</string>
 	<string name="MenuAccountCreate">Créé un compte</string>
 	<string name="MenuConnection">Modifier compte</string>
-
 	<string name="ChangeStatusOk">Mise à jour du statut</string>
 	<string name="ChangeStatusNoChange">Rien à changer</string>
 	
@@ -130,16 +123,12 @@
     	Activities
     -->
     <string name="login_tag">BEEM - Activité de connexion</string>
-    
     <string name="edit_settings_name">BEEM - Paramètres</string>
 	<string name="edit_settings_tag">BEEM - EditSettings Activity</string>
-	
     <string name="create_account_name">BEEM - Créer un compte</string>
     <string name="create_account_tag">BEEM - CreateAccount Activity</string>
-    
     <string name="contact_list_name">BEEM - Contacts</string>
     <string name="contact_list_tag">BEEM - ContactList Activity</string>
-
     
     <!--
     	Buttons
@@ -156,29 +145,26 @@
     -->
 	<string name="login_username">Nom d'utilisateur</string>
 	<string name="login_password">Mot de passe</string>
-	
 	<string name="login_error_dialog_title">Connexion - Erreur</string>
 	<string name="login_close_dialog_button">Fermer</string>
-	
 	<string name="login_menu_create_account">Créer un compte</string>
 	<string name="login_menu_settings">Paramètres</string>
 	<string name="login_menu_about">À propos</string>
-	
 	<string name="login_about_title">À propos</string>
 	<string name="login_about_msg">
 		BEEM est un EPITECH Innovative Project. Rencontrez nous sur http://www.beem-project.com !
 	</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_progress">Connexion en cours. Veuillez patienter...</string>	
 	
 	<!--
 		EditSettings Activity
 	-->
 	<string name="settings_menu_create_account">Créer un compte</string>
 	<string name="settings_menu_login">Se connecter</string>
-
 	<string name="settings_saved_ok">Les paramètres ont été enregistrés avec succès.</string>
-	
 	<string name="settings_filename">beem_settings</string>
 	<string name="settings_key_account_username">beem_account_username</string>
 	<string name="settings_key_account_password">beem_account_password</string>
@@ -195,10 +181,8 @@
 	<!-- EditSettings Activity tabs -->
 	<string name="settings_tab_tag_account">edit_settings_tab_account</string>
 	<string name="settings_tab_label_account">Compte</string>
-	
 	<string name="settings_tab_tag_xmpp">edit_settings_tab_xmpp</string>
 	<string name="settings_tab_label_xmpp">XMPP</string>
-	
 	<string name="settings_tab_tag_proxy">edit_settings_tab_proxy</string>
 	<string name="settings_tab_label_proxy">Proxy</string>
 	
@@ -208,7 +192,6 @@
 	<string name="settings_account_server">Serveur</string>
 	<string name="settings_account_port">Port</string>
 	
-	
 	<!-- EditSettings Activity XMPP tab -->
 	<string name="settings_xmpp_server">Serveur</string>
 	<string name="settings_xmpp_port">Port</string>
@@ -229,11 +212,8 @@
 	<string name="create_account_err_dialog_title">Créer un compte - Erreur</string>
 	<string name="create_account_err_dialog_settings_button">Changer mes paramètres</string>
 	<string name="create_account_close_dialog_button">Fermer</string>
-
-	
 	<string name="create_account_successfull_after">a été créé avec succès</string>
 	<string name="create_account_err_passwords">Les mots de passe ne correspondent pas</string>
-	
 	<string name="create_account_username">Nom d\'utilisateur</string>
 	<string name="create_account_password">Mot de passe</string>
 	<string name="create_account_confirm_password">Confirmer le mot de passe</string>
diff -r 3805671d14ff -r 4a995e8a66ab src/com/beem/project/beem/ui/EditSettings.java
--- a/src/com/beem/project/beem/ui/EditSettings.java	Fri Jun 26 21:51:48 2009 +0200
+++ b/src/com/beem/project/beem/ui/EditSettings.java	Fri Jun 26 19:55:14 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();
     }
 
     /**
diff -r 3805671d14ff -r 4a995e8a66ab src/com/beem/project/beem/ui/Login.java
--- a/src/com/beem/project/beem/ui/Login.java	Fri Jun 26 21:51:48 2009 +0200
+++ b/src/com/beem/project/beem/ui/Login.java	Fri Jun 26 19:55:14 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();
 			}
 		    });