# HG changeset patch
# User Vincent Veronis <veroni_v@epitech.net>
# Date 1263295028 -3600
# Node ID dbc66edfd61fa9a42d3ee2888152f139fd9d1a95
# Parent  d92cd8659e1ff8165b1626bb8853d6953a771eef
add string message on login.
modify some string message.

diff -r d92cd8659e1f -r dbc66edfd61f res/layout/login.xml
--- a/res/layout/login.xml	Sat Jan 09 16:55:36 2010 +0100
+++ b/res/layout/login.xml	Tue Jan 12 12:17:08 2010 +0100
@@ -12,4 +12,4 @@
 			android:textColor="#FF0000" android:textStyle="bold"
 			android:textSize="14sp" />
 	</LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff -r d92cd8659e1f -r dbc66edfd61f res/layout/preferences.xml
--- a/res/layout/preferences.xml	Sat Jan 09 16:55:36 2010 +0100
+++ b/res/layout/preferences.xml	Tue Jan 12 12:17:08 2010 +0100
@@ -17,6 +17,8 @@
 		<EditTextPreference android:name="password"
 			android:singleLine="true" android:password="true" android:summary="@string/SettingsPassword"
 			android:title="@string/settings_account_password" android:key="settings_key_account_password" />
+	</PreferenceCategory>
+	<PreferenceCategory android:title="@string/user_preferences_advanced">
 		<EditTextPreference
 		    android:key="settings_key_resource"
 		    android:title="@string/SettingsResourceTitle"
diff -r d92cd8659e1f -r dbc66edfd61f res/values-fr/strings.xml
--- a/res/values-fr/strings.xml	Sat Jan 09 16:55:36 2010 +0100
+++ b/res/values-fr/strings.xml	Tue Jan 12 12:17:08 2010 +0100
@@ -174,6 +174,7 @@
 		de l\'erreur :\n%s</string>
 	<string name="login_menu_login">Se connecter</string>
 	<string name="login_no_connectivity">Pas de connexion internet disponible</string>
+	<string name="login_start_msg">Configuration des informations dans le menu</string>
 
 	<!--
 		EditSettings Activity
@@ -184,7 +185,8 @@
 
 	<!-- EditSettings Activity Categories -->
 	<string name="general_preferences">Préférences de l\'application</string>
-	<string name="user_preferences">Utilisateur</string>
+	<string name="user_preferences">Utilisateur (obligatoire)</string>
+	<string name="user_preferences_advanced">Utilisateur avancés (facultatif)</string>
 	<string name="network_preferences">Options réseau</string>
 	<string name="proxy_proxy_settings">Paramètres du proxy</string>
 	<string name="proxy_user_settings">Identifiant proxy</string>
diff -r d92cd8659e1f -r dbc66edfd61f res/values/strings.xml
--- a/res/values/strings.xml	Sat Jan 09 16:55:36 2010 +0100
+++ b/res/values/strings.xml	Tue Jan 12 12:17:08 2010 +0100
@@ -164,6 +164,7 @@
 		detail:\n%s</string>
 	<string name="login_menu_login">Login</string>
 	<string name="login_no_connectivity">No internet connection found</string>
+	<string name="login_start_msg">Settings configuration in menu</string>
 
 	<!-- EditSettings Activity -->
 	<string name="settings_menu_create_account">Create an account</string>
@@ -174,7 +175,8 @@
 
 	<!-- EditSettings Activity Categories -->
 	<string name="general_preferences">General preferences</string>
-	<string name="user_preferences">User settings</string>
+	<string name="user_preferences">User settings (required)</string>
+	<string name="user_preferences_advanced">User settings advanced (optional)</string>
 	<string name="network_preferences">Network options</string>
 	<string name="proxy_proxy_settings">Proxy settings</string>
 	<string name="proxy_user_settings">Proxy settings</string>
diff -r d92cd8659e1f -r dbc66edfd61f src/com/beem/project/beem/ui/Login.java
--- a/src/com/beem/project/beem/ui/Login.java	Sat Jan 09 16:55:36 2010 +0100
+++ b/src/com/beem/project/beem/ui/Login.java	Tue Jan 12 12:17:08 2010 +0100
@@ -77,9 +77,6 @@
     public Login() {
     }
 
-    /* (non-Javadoc)
-     * @see android.app.Activity#onCreate(android.os.Bundle)
-     */
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 	super.onCreate(savedInstanceState);
@@ -88,25 +85,21 @@
 	mSettings = PreferenceManager.getDefaultSharedPreferences(this);
     }
 
-    /* (non-Javadoc)
-     * @see android.app.Activity#onStart()
-     */
     @Override
     protected void onStart() {
 	super.onStart();
 	mIsConfigured = mSettings.getBoolean("PreferenceIsConfigured", false);
 	// TODO utiliser une options des preference plutot.
 	if (mIsConfigured && !mIsResult && BeemConnectivity.isConnected(getApplicationContext())) {
-	    mTextView.setText("");
 	    Intent i = new Intent(this, LoginAnim.class);
 	    startActivityForResult(i, LOGIN_REQUEST_CODE);
 	    mIsResult = false;
 	}
+	else {
+	    mTextView.setText(R.string.login_start_msg);
+	}
     }
 
-    /* (non-Javadoc)
-     * @see android.app.Activity#onActivityResult(int, int, android.content.Intent)
-     */
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 	if (requestCode == LOGIN_REQUEST_CODE) {
@@ -124,9 +117,6 @@
 	}
     }
 
-    /* (non-Javadoc)
-     * @see android.app.Activity#onCreateOptionsMenu(android.view.Menu)
-     */
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
 	super.onCreateOptionsMenu(menu);
@@ -135,9 +125,6 @@
 	return true;
     }
 
-    /* (non-Javadoc)
-     * @see android.app.Activity#onOptionsItemSelected(android.view.MenuItem)
-     */
     @Override
     public final boolean onOptionsItemSelected(MenuItem item) {
 	boolean result;