diff --git a/Ted/.classpath b/Ted/.classpath
old mode 100755
new mode 100644
index 3e2b42f..a7f4ccf
--- a/Ted/.classpath
+++ b/Ted/.classpath
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="lib" path="./libs/juniversalchardet-1.0.3.jar"/>
-	<classpathentry kind="output" path="bin/classes"/>
+<?xml version="1.0" encoding="UTF-8"?> 
+ <classpath> 
+    <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> 
+    <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> 
+    <classpathentry kind="src" path="src"/> 
+    <classpathentry kind="src" path="gen"/> 
+    <classpathentry kind="lib" path="./libs/juniversalchardet-1.0.3.jar"/> 
+    <classpathentry kind="output" path="bin/classes"/> 
 </classpath>
diff --git a/Ted/AndroidManifest.xml b/Ted/AndroidManifest.xml
index 77f06a1..889b3af 100755
--- a/Ted/AndroidManifest.xml
+++ b/Ted/AndroidManifest.xml
@@ -4,9 +4,9 @@
     android:installLocation="auto"
     android:versionCode="19"
     android:versionName="Release 1.8.1" >
-
+    
     <uses-sdk
-        android:minSdkVersion="8"
+        android:minSdkVersion="9"
         android:targetSdkVersion="16" />
 
     <permission
@@ -17,7 +17,8 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="fr.xgouchet.texteditor.permission.TED_INTERNAL" />
-
+    <uses-permission android:name="android.permission.SEND_SMS" />
+    
     <application
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name" >
@@ -107,6 +108,7 @@
             android:name=".TedSettingsActivity"
             android:label="@string/title_settings"
             android:windowSoftInputMode="stateHidden" >
+            
         </activity>
 
         <!-- Ted save as activity -->
@@ -152,6 +154,24 @@
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
             </intent-filter>
         </activity>
+            <activity
+            android:label="@string/title_mail"
+            android:name=".SendEmailActivity"
+            android:windowSoftInputMode="stateHidden" >
+
+        </activity>
+        <activity
+            android:label="@string/title_sms"
+            android:name=".SendSMSActivity" 
+            android:windowSoftInputMode="stateHidden" >
+            
+        </activity>
+         <activity
+            android:label="@string/title_rating"
+            android:name=".RatingActivity" 
+            android:windowSoftInputMode="stateHidden" >
+            
+        </activity>   
 
         <!-- Widget Receiver -->
         <receiver
@@ -166,5 +186,6 @@
                 android:resource="@xml/ted_widget" />
         </receiver>
     </application>
+    
 
 </manifest>
\ No newline at end of file
diff --git a/Ted/lint.xml b/Ted/lint.xml
new file mode 100644
index 0000000..ee0eead
--- /dev/null
+++ b/Ted/lint.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+</lint>
\ No newline at end of file
diff --git a/Ted/res/layout/layout_save_as.xml b/Ted/res/layout/layout_save_as.xml
index 8fa327e..9f5d989 100755
--- a/Ted/res/layout/layout_save_as.xml
+++ b/Ted/res/layout/layout_save_as.xml
@@ -4,21 +4,28 @@
     android:layout_height="match_parent"
     android:orientation="vertical" >
 
+    <EditText
+        android:id="@+id/editFileName"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawableLeft="@drawable/folder_rw"
+        android:drawablePadding="8dp"
+        android:ems="10"
+        android:hint="@string/ui_hint_file_name"
+        android:inputType="text" />
+
+    <RadioButton
+        android:id="@+id/readonly"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Read-Only" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:orientation="horizontal" >
 
-        <EditText
-            android:id="@+id/editFileName"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:drawableLeft="@drawable/folder_rw"
-            android:drawablePadding="8dp"
-            android:hint="@string/ui_hint_file_name"
-            android:inputType="text" >
-        </EditText>
     </LinearLayout>
 
     <ListView
diff --git a/Ted/res/layout/mail.xml b/Ted/res/layout/mail.xml
new file mode 100644
index 0000000..622be8c
--- /dev/null
+++ b/Ted/res/layout/mail.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/linearLayout1"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/textViewPhoneNo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="To : "
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <EditText
+        android:id="@+id/editTextTo"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:inputType="textEmailAddress" >
+
+        <requestFocus />
+    </EditText>
+
+    <TextView
+        android:id="@+id/textViewSubject"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Subject : "
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <EditText
+        android:id="@+id/editTextSubject"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+    </EditText>
+
+    <TextView
+        android:id="@+id/textViewMessage"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Message : "
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <EditText
+        android:id="@+id/editTextMessage"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.64"
+        android:gravity="top"
+        android:inputType="textMultiLine"
+        android:lines="5" />
+
+    <Button
+        android:id="@+id/buttonSend"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="Send" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Ted/res/layout/rating.xml b/Ted/res/layout/rating.xml
new file mode 100644
index 0000000..19896eb
--- /dev/null
+++ b/Ted/res/layout/rating.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+ 
+    <TextView
+        android:id="@+id/lblRateMe"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Rate Me"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+ 
+    <RatingBar
+        android:id="@+id/ratingBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:numStars="5"
+        android:stepSize="1.0"
+        android:rating="2.0" />
+ 
+    <Button
+        android:id="@+id/btnSubmit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Submit" />
+ 
+    <LinearLayout
+        android:id="@+id/linearLayout1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+ 
+        <TextView
+            android:id="@+id/lblResult"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Result : "
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+ 
+        <TextView
+            android:id="@+id/txtRatingValue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+ 
+    </LinearLayout>
+ 
+</LinearLayout>
\ No newline at end of file
diff --git a/Ted/res/layout/sms.xml b/Ted/res/layout/sms.xml
new file mode 100644
index 0000000..826c315
--- /dev/null
+++ b/Ted/res/layout/sms.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/linearLayout1"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/textViewPhoneNo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Enter Phone Number : "
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <EditText
+        android:id="@+id/editTextPhoneNo"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:phoneNumber="true" >
+    </EditText>
+
+    <TextView
+        android:id="@+id/textViewSMS"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Enter SMS Message : "
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <EditText
+        android:id="@+id/editTextSMS"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.94"
+        android:gravity="top"
+        android:inputType="textMultiLine"
+        android:lines="5" />
+
+    <Button
+        android:id="@+id/buttonSend"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="Send" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Ted/res/values/arrays.xml b/Ted/res/values/arrays.xml
index e5eacf0..51957ed 100755
--- a/Ted/res/values/arrays.xml
+++ b/Ted/res/values/arrays.xml
@@ -17,8 +17,7 @@
         <item>4</item>
     </string-array>
 
-    <!-- Text size -->
-    <string-array name="text_size_names">
+    <!-- Text size --><string-array name="text_size_names">
         <item>6 pt</item>
         <item>8 pt</item>
         <item>10 pt</item>
@@ -43,6 +42,20 @@
         <item>48</item>
     </string-array>
 
+    <!-- fontstyle --><string-array name="text_style_names">
+        <item>Normal</item>
+        <item>Bold</item>
+        <item>Italic</item>
+        <item>Bold_Italic</item>
+        
+         </string-array>
+    <string-array name="text_style_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+    
     <!-- End of lines -->
     <string-array name="eol_names">
         <item>Android / Linux / Unix</item>
@@ -96,5 +109,7 @@
         <item>ISO-8859-1</item>
         <item>UTF-8</item>
     </string-array>
+    
+    
 
 </resources>
\ No newline at end of file
diff --git a/Ted/res/values/strings.xml b/Ted/res/values/strings.xml
index 0b7e14a..e6a9cc0 100755
--- a/Ted/res/values/strings.xml
+++ b/Ted/res/values/strings.xml
@@ -16,6 +16,9 @@
     <string name="title_settings">Ted - Settings </string>
     <string name="title_about">Ted - About ... </string>
     <string name="title_font">Ted - Text Font </string>
+    <string name="title_mail">Ted - Email </string>
+    <string name="title_sms">Ted - SMS </string>
+    <string name="title_rating">Ted - Rating </string>    
 
     <!-- Config screen strings -->
     <string name="config_cat_display">Display</string>
@@ -48,7 +51,9 @@
     <string name="config_summary_use_home_page">Select a file to open when you launch Ted from your home screen</string>
     <string name="config_summary_auto_save_overwrite_on">Auto save will overwrite existing files</string>
     <string name="config_summary_auto_save_overwrite_off">Auto save will only work with new files</string>
-
+	<string name="config_title_text_font">Text Font</string>
+	<string name="config_title_text_style">Text style</string>
+	
     <!-- Options Menu in TED -->
     <string name="menu_new">New</string>
     <string name="menu_open">Open</string>
@@ -60,7 +65,10 @@
     <string name="menu_search">Search</string>
     <string name="menu_undo">Undo</string>
     <string name="menu_quit">Quit</string>
-
+    <string name="menu_email">Email</string>
+    <string name="menu_sms">SMS</string>
+    <string name="menu_rating">Rating</string>
+    
     <!-- Misc UI strings -->
     <string name="ui_save_text">"Do you want to save your document? \nAny unsaved changes will be lost. "</string>
     <string name="ui_save">Save</string>
@@ -77,4 +85,5 @@
     <string name="lorem_ipsum">"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas porttitor neque semper sem fermentum pretium. Sed pharetra dui faucibus massa malesuada in condimentum mi gravida."</string>
     <string name="art_licence">"All icons for this app were created and belong to the author of the app : Xavier Gouchet (android@xgouchet.fr)."</string>
 
+
 </resources>
\ No newline at end of file
diff --git a/Ted/res/values/toasts.xml b/Ted/res/values/toasts.xml
index 3c301fa..da5b297 100755
--- a/Ted/res/values/toasts.xml
+++ b/Ted/res/values/toasts.xml
@@ -11,6 +11,9 @@
     <string name="toast_activity_save_as">Unable to load the file browser</string>
     <string name="toast_activity_settings">Unable to load the settings page</string>
     <string name="toast_activity_about">Unable to load the about page</string>
+    <string name="toast_activity_email">Unable to load emailing page</string>
+    <string name="toast_activity_sms">Unable to load SMS page</string>
+    <string name="toast_activity_rating">Unable to load Rating page</string>
     <string name="toast_memory_open">Unable to open the file, not enough memory</string>
     <string name="toast_open_error">Unable to open the file (maybe the file is too big, or corrupted)</string>
     <string name="toast_save_null">Unable to save, path is null</string>
@@ -32,5 +35,6 @@
     <string name="toast_open_select">Select a file to open</string>
     <string name="toast_home_page_select">Select a file to open when you launch Ted from your home screen</string>
     <string name="toast_file_saved_auto">"The opened file was saved automatically, and will be opened at next startup"</string>
+    
 
 </resources>
\ No newline at end of file
diff --git a/Ted/res/xml/ted_prefs.xml b/Ted/res/xml/ted_prefs.xml
index 39cb1aa..9b38fde 100755
--- a/Ted/res/xml/ted_prefs.xml
+++ b/Ted/res/xml/ted_prefs.xml
@@ -26,6 +26,12 @@
             android:entryValues="@array/text_size_values"
             android:key="text_size"
             android:title="@string/config_title_text_size" />
+        <ListPreference
+            android:defaultValue="normal"
+            android:entries="@array/text_style_names"
+            android:entryValues="@array/text_style_values"
+            android:key="text_style"
+            android:title="@string/config_title_text_style" />
 
         <Preference
             android:key="select_font"
diff --git a/Ted/src/fr/xgouchet/texteditor/RatingActivity.java b/Ted/src/fr/xgouchet/texteditor/RatingActivity.java
new file mode 100644
index 0000000..cc01acd
--- /dev/null
+++ b/Ted/src/fr/xgouchet/texteditor/RatingActivity.java
@@ -0,0 +1,236 @@
+package fr.xgouchet.texteditor;
+
+
+
+import java.util.Locale;
+
+import fr.xgouchet.texteditor.common.Constants;
+
+import android.app.Activity;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.RatingBar;
+import android.widget.RatingBar.OnRatingBarChangeListener;
+import android.widget.TextView;
+import android.widget.Toast;
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+public class RatingActivity extends Activity {
+
+  private RatingBar ratingBar;
+  private TextView txtRatingValue;
+  private Button btnSubmit;
+
+  //
+  private String path=TedActivity.mCurrentFilePath;
+
+
+
+  SQLiteDatabase db;
+
+
+=======
+=======
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+ 
+public class RatingActivity extends Activity {
+ 
+  private RatingBar ratingBar;
+  private TextView txtRatingValue;
+  private Button btnSubmit;
+  
+  //
+  private String path=TedActivity.mCurrentFilePath; 
+
+  
+  
+  SQLiteDatabase db;
+
+  
+<<<<<<< HEAD
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+=======
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+	super.onCreate(savedInstanceState);
+	setContentView(R.layout.rating);
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+=======
+	
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+=======
+	
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+	//create database
+	db = openOrCreateDatabase("tedratingdata.db", SQLiteDatabase.CREATE_IF_NECESSARY, null);
+	db.setVersion(1);
+	db.setLocale(Locale.getDefault());
+	db.setLockingEnabled(true);
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+=======
+	
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+=======
+	
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+	//create table
+	final String CREATE_TABLE_FILES ="CREATE TABLE IF NOT EXISTS ted (ID integer primary key autoincrement,NAME text,RATING integer);";
+	db.execSQL(CREATE_TABLE_FILES);
+	db.execSQL("SELECT * FROM ted ORDER BY ID desc;");
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+=======
+	
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+=======
+	
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+	//find last rating given to the file using its path
+	int rating=2;
+	if (path != null ) {
+		Cursor c = db.rawQuery("SELECT RATING FROM ted " +
+	           "where NAME='"+path+"' LIMIT 1;", null);
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+=======
+	
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+=======
+	
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+		if (c != null ) {
+			if  (c.moveToFirst()) {
+				do {
+					rating = c.getInt(c.getColumnIndex("RATING"));
+				}while (c.moveToNext());
+			}
+		}
+		c.close();
+	}
+
+	float rating2=(float) rating;
+	addListenerOnRatingBar(rating2);
+	addListenerOnButton();
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+  }
+
+  public void addListenerOnRatingBar(float rating2) {
+
+=======
+=======
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+	
+  }
+ 
+  public void addListenerOnRatingBar(float rating2) {
+ 
+<<<<<<< HEAD
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+=======
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+	ratingBar = (RatingBar) findViewById(R.id.ratingBar);
+	txtRatingValue = (TextView) findViewById(R.id.txtRatingValue);
+	ratingBar.setRating(rating2);
+
+	//if rating value is changed,
+	//display the current rating value in the result (textview) automatically
+	ratingBar.setOnRatingBarChangeListener(new OnRatingBarChangeListener() {
+		public void onRatingChanged(RatingBar ratingBar, float rating,
+			boolean fromUser) {
+			txtRatingValue.setText(String.valueOf(rating));
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+		}
+	});
+  }
+
+  public void addListenerOnButton() {
+
+=======
+=======
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+ 
+		}
+	});
+  }
+ 
+  public void addListenerOnButton() {
+ 
+<<<<<<< HEAD
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+=======
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+	ratingBar = (RatingBar) findViewById(R.id.ratingBar);
+	btnSubmit = (Button) findViewById(R.id.btnSubmit);
+
+	//if click on me, then display the current rating value.
+	btnSubmit.setOnClickListener(new OnClickListener() {
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+		@Override
+		public void onClick(View v) {
+
+=======
+=======
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+ 
+		@Override
+		public void onClick(View v) {
+ 
+<<<<<<< HEAD
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+=======
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+			Toast.makeText(RatingActivity.this,
+				String.valueOf(ratingBar.getRating()),
+					Toast.LENGTH_SHORT).show();
+			int ratinginsert=(int) ratingBar.getRating();
+<<<<<<< HEAD
+<<<<<<< HEAD
+			db.execSQL("INSERT INTO ted (NAME, RATING) VALUES ('"+path+"'," + ratinginsert  +");");
+
+
+
+		}
+
+	});
+
+  }
+
+}
+=======
+=======
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+			db.execSQL("INSERT INTO ted (NAME, RATING) VALUES ('"+path+"'," + ratinginsert  +");");			
+
+			
+			
+		}
+ 
+	});
+ 
+  }
+
+<<<<<<< HEAD
+}
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+=======
+}
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
diff --git a/Ted/src/fr/xgouchet/texteditor/SendEmailActivity.java b/Ted/src/fr/xgouchet/texteditor/SendEmailActivity.java
new file mode 100644
index 0000000..146cf3b
--- /dev/null
+++ b/Ted/src/fr/xgouchet/texteditor/SendEmailActivity.java
@@ -0,0 +1,131 @@
+package fr.xgouchet.texteditor;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+public class SendEmailActivity extends Activity {
+
+=======
+ 
+public class SendEmailActivity extends Activity {
+ 
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+=======
+ 
+public class SendEmailActivity extends Activity {
+ 
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+	Button buttonSend;
+	EditText textTo;
+	EditText textSubject;
+	EditText textMessage;
+	String message="";
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.mail);
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+		//add the text of the Ted editor in the mail
+=======
+		
+		//add the text of the Ted editor in the mail	
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+=======
+		
+		//add the text of the Ted editor in the mail	
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+		Bundle extras = getIntent().getExtras();
+		message="";
+		if(extras !=null)
+		{
+		     message = extras.getString("textofmail");
+		}
+		buttonSend = (Button) findViewById(R.id.buttonSend);
+		textTo = (EditText) findViewById(R.id.editTextTo);
+		textSubject = (EditText) findViewById(R.id.editTextSubject);
+		textMessage = (EditText) findViewById(R.id.editTextMessage);
+		int start = textMessage.getSelectionStart();
+		int end = textMessage.getSelectionEnd();
+		textMessage.getText().replace(Math.min(start, end), Math.max(start, end),
+		        message, 0, message.length());
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+
+		//send email button
+		buttonSend.setOnClickListener(new OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+
+=======
+=======
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+		
+		
+		//send email button
+		buttonSend.setOnClickListener(new OnClickListener() {
+ 
+			@Override
+			public void onClick(View v) {
+ 
+<<<<<<< HEAD
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+=======
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+
+			  String to = textTo.getText().toString();
+			  String subject = textSubject.getText().toString();
+			  String messagetext=textMessage.getText().toString();
+			  Intent email = new Intent(Intent.ACTION_SEND);
+			  email.putExtra(Intent.EXTRA_EMAIL, new String[]{ to});
+			  //email.putExtra(Intent.EXTRA_CC, new String[]{ to});
+			  //email.putExtra(Intent.EXTRA_BCC, new String[]{to});
+			  email.putExtra(Intent.EXTRA_SUBJECT, subject);
+			  email.putExtra(Intent.EXTRA_TEXT, messagetext);
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+			  //need this to prompts email client only
+			  email.setType("message/rfc822");
+
+			  startActivity(Intent.createChooser(email, "Choose an Email client :"));
+
+=======
+=======
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+ 
+			  //need this to prompts email client only
+			  email.setType("message/rfc822");
+ 
+			  startActivity(Intent.createChooser(email, "Choose an Email client :"));
+ 
+<<<<<<< HEAD
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+=======
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+			}
+		});
+	}
+	protected void onResume() {
+		super.onResume();
+
+	}
+<<<<<<< HEAD
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+=======
+}
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
diff --git a/Ted/src/fr/xgouchet/texteditor/SendSMSActivity.java b/Ted/src/fr/xgouchet/texteditor/SendSMSActivity.java
new file mode 100644
index 0000000..7e0d442
--- /dev/null
+++ b/Ted/src/fr/xgouchet/texteditor/SendSMSActivity.java
@@ -0,0 +1,124 @@
+package fr.xgouchet.texteditor;
+
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.telephony.SmsManager;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+public class SendSMSActivity extends Activity {
+
+=======
+ 
+public class SendSMSActivity extends Activity {
+ 
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+=======
+ 
+public class SendSMSActivity extends Activity {
+ 
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+	Button buttonSend;
+	EditText textPhoneNo;
+	EditText textSMS;
+	String message;
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.sms);
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+		buttonSend = (Button) findViewById(R.id.buttonSend);
+		textPhoneNo = (EditText) findViewById(R.id.editTextPhoneNo);
+		textSMS = (EditText) findViewById(R.id.editTextSMS);
+
+=======
+=======
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+ 
+		buttonSend = (Button) findViewById(R.id.buttonSend);
+		textPhoneNo = (EditText) findViewById(R.id.editTextPhoneNo);
+		textSMS = (EditText) findViewById(R.id.editTextSMS);
+		
+<<<<<<< HEAD
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+=======
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+		//add the text of the Ted editor in the sms
+		Bundle extras = getIntent().getExtras();
+		message="";
+		if(extras !=null)
+		{
+		     message = extras.getString("textofsms");
+		}
+		int start = textSMS.getSelectionStart();
+		int end = textSMS.getSelectionEnd();
+		textSMS.getText().replace(Math.min(start, end), Math.max(start, end),
+		        message, 0, message.length());
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+		//send button
+		buttonSend.setOnClickListener(new OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+
+			  String phoneNo = textPhoneNo.getText().toString();
+			  String sms = textSMS.getText().toString();
+
+=======
+=======
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+		
+		//send button
+		buttonSend.setOnClickListener(new OnClickListener() {
+ 
+			@Override
+			public void onClick(View v) {
+ 
+			  String phoneNo = textPhoneNo.getText().toString();
+			  String sms = textSMS.getText().toString();
+ 
+<<<<<<< HEAD
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+=======
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+			  try {
+				SmsManager smsManager = SmsManager.getDefault();
+				smsManager.sendTextMessage(phoneNo, null, sms, null, null);
+				Toast.makeText(getApplicationContext(), "SMS Sent!",
+							Toast.LENGTH_LONG).show();
+			  } catch (Exception e) {
+				Toast.makeText(getApplicationContext(),
+					"SMS faild, please try again later!",
+					Toast.LENGTH_LONG).show();
+				e.printStackTrace();
+			  }
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+			}
+		});
+	}
+}
+=======
+=======
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+ 
+			}
+		});
+	}
+<<<<<<< HEAD
+}
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+=======
+}
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
diff --git a/Ted/src/fr/xgouchet/texteditor/TedActivity.java b/Ted/src/fr/xgouchet/texteditor/TedActivity.java
index 9363a71..d5f1742 100755
--- a/Ted/src/fr/xgouchet/texteditor/TedActivity.java
+++ b/Ted/src/fr/xgouchet/texteditor/TedActivity.java
@@ -258,8 +258,16 @@ public boolean onPrepareOptionsMenu(Menu menu) {
 
 		addMenuItem(menu, MENU_ID_SETTINGS, R.string.menu_settings, 0);
 
+		addMenuItem(menu, MENU_ID_EMAIL,R.string.menu_email,0);
+		
+		addMenuItem(menu, MENU_ID_SMS,R.string.menu_sms,0);
+
+		addMenuItem(menu, MENU_ID_RATING, R.string.menu_rating, 0);
+
 		addMenuItem(menu, MENU_ID_ABOUT, R.string.menu_about, 0);
 
+	
+
 		if (Settings.BACK_BTN_AS_UNDO && Settings.UNDO)
 			addMenuItem(menu, MENU_ID_QUIT, R.string.menu_quit, 0);
 
@@ -305,6 +313,15 @@ public boolean onOptionsItemSelected(MenuItem item) {
 		case MENU_ID_QUIT:
 			quit();
 			return true;
+		case MENU_ID_EMAIL:
+			email();
+			return true;
+		case MENU_ID_SMS:
+			sms();
+			return true;			
+		case MENU_ID_RATING:
+			rating();			
+			return true;			
 		case MENU_ID_UNDO:
 			if (!undo()) {
 				Crouton.showText(this, R.string.toast_warn_no_undo, Style.INFO);
@@ -956,6 +973,40 @@ protected void aboutActivity() {
 		}
 	}
 
+	protected void email() {
+		Intent mail = new Intent();
+		mail.setClass(this, SendEmailActivity.class);
+		try {
+			mail.putExtra("textofmail", mEditor.getText().toString());
+			startActivity(mail);
+		} catch (ActivityNotFoundException e) {
+			Crouton.showText(this, R.string.toast_activity_email, Style.ALERT);
+
+		}
+	}	
+	protected void sms() {
+		Intent sms = new Intent();
+		sms.setClass(this, SendSMSActivity.class);
+		try {
+			sms.putExtra("textofsms", mEditor.getText().toString());
+			startActivity(sms);
+		} catch (ActivityNotFoundException e) {
+			Crouton.showText(this, R.string.toast_activity_sms, Style.ALERT);
+
+		}
+	}	
+	
+	protected void rating() {
+		Intent rating = new Intent();
+		rating.setClass(this, RatingActivity.class);
+		try {
+			startActivity(rating);
+		} catch (ActivityNotFoundException e) {
+			Crouton.showText(this, R.string.toast_activity_rating, Style.ALERT);
+
+		}
+	}	
+	
 	/**
 	 * Opens the settings activity
 	 */
@@ -1005,7 +1056,7 @@ else if (mDirty)
 	/** the text editor */
 	protected AdvancedEditText mEditor;
 	/** the path of the file currently opened */
-	protected String mCurrentFilePath;
+	protected static String mCurrentFilePath;
 	/** the name of the file currently opened */
 	protected String mCurrentFileName;
 	/** the runable to run after a save */
diff --git a/Ted/src/fr/xgouchet/texteditor/TedSaveAsActivity.java b/Ted/src/fr/xgouchet/texteditor/TedSaveAsActivity.java
index eb6b167..1a7c466 100755
--- a/Ted/src/fr/xgouchet/texteditor/TedSaveAsActivity.java
+++ b/Ted/src/fr/xgouchet/texteditor/TedSaveAsActivity.java
@@ -3,6 +3,9 @@
 import static fr.xgouchet.androidlib.ui.Toaster.showToast;
 
 import java.io.File;
+import java.util.regex.Pattern;
+import java.util.Arrays;
+import java.util.List; 
 
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
@@ -11,6 +14,7 @@
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.RadioButton;
 import fr.xgouchet.androidlib.ui.activity.AbstractBrowsingActivity;
 import fr.xgouchet.texteditor.common.Constants;
 
@@ -96,20 +100,46 @@ protected boolean setSaveResult() {
 			return false;
 		}
 
+
 		fileName = mFileName.getText().toString();
 		if (fileName.length() == 0) {
 			showToast(this, R.string.toast_filename_empty, true);
 			return false;
 		}
-
+		
+		//automatically add txt as extension if the application doesn't find a known extension
+		String extension="";
+	     int dotposition= fileName.lastIndexOf(".");
+	     extension = fileName.substring(dotposition + 1, fileName.length());
+	 
+		List<String> list = Arrays.asList("doc", "docx", "log", "ascii", "txt", "html", "htm", "lst", "odt", "upd", "readme", "awp", "awt", "bean","php","ini","sh","js","db","conf","cfg");
+		
+		if (!(list.contains(extension)))
+		{
+		   fileName+=".txt";
+		}
+		
+		//save result
 		result = new Intent();
 		result.putExtra("path", mCurrentFolder.getAbsolutePath()
 				+ File.separator + fileName);
-
+		
 		setResult(RESULT_OK, result);
+		
+		//make file read-only if the radio button is checked
+		File file = new File(mCurrentFolder.getAbsolutePath()
+				+ File.separator + fileName);
+		RadioButton readOnly;
+
+		readOnly = (RadioButton) findViewById(R.id.readonly);
+	
+		if (readOnly.isChecked()) {
+			file.setWritable(false);
+		}
 		return true;
 	}
 
+
 	/** the edit text input */
 	protected EditText mFileName;
 
diff --git a/Ted/src/fr/xgouchet/texteditor/TedSettingsActivity.java b/Ted/src/fr/xgouchet/texteditor/TedSettingsActivity.java
index 8404d66..0426848 100755
--- a/Ted/src/fr/xgouchet/texteditor/TedSettingsActivity.java
+++ b/Ted/src/fr/xgouchet/texteditor/TedSettingsActivity.java
@@ -155,6 +155,9 @@ protected void updateSummaries() {
 
 		listPref = (ListPreference) findPreference(PREFERENCE_TEXT_SIZE);
 		listPref.setSummary(listPref.getEntry());
+		
+		listPref = (ListPreference) findPreference(PREFERENCE_BOLD_ITALIC);
+		listPref.setSummary(listPref.getEntry());
 
 		listPref = (ListPreference) findPreference(PREFERENCE_END_OF_LINES);
 		listPref.setSummary(listPref.getEntry());
diff --git a/Ted/src/fr/xgouchet/texteditor/common/Constants.java b/Ted/src/fr/xgouchet/texteditor/common/Constants.java
index 406f4d9..93bc75f 100755
--- a/Ted/src/fr/xgouchet/texteditor/common/Constants.java
+++ b/Ted/src/fr/xgouchet/texteditor/common/Constants.java
@@ -40,6 +40,12 @@ public interface Constants {
 	public static final int MENU_ID_UNDO = 8;
 	/** redo last change ( = {@value} ) */
 	public static final int MENU_ID_REDO = 9;
+	/** send mail ( = {@value} ) */
+	public static final int MENU_ID_EMAIL = 10;
+	/** send sms ( = {@value} ) */
+	public static final int MENU_ID_SMS = 11;
+	/** add rating ( = {@value} ) */
+	public static final int MENU_ID_RATING = 12;		
 	/** Quit the app ( = {@value} ) */
 	public static final int MENU_ID_QUIT = 666;
 
@@ -69,6 +75,8 @@ public interface Constants {
 	public static final String PREFERENCE_HIGHLIGHT = "highlight_syntax";
 	/** Preference tag to retrieve the Text Size ( = {@value} ) */
 	public static final String PREFERENCE_TEXT_SIZE = "text_size";
+	/** Preference tag to retrieve the BOLD_ITALIC ( = {@value} ) */
+	public static final String PREFERENCE_BOLD_ITALIC = "text_style";
 	/** Preference tag to retrieve the End of lines pref ( = {@value} ) */
 	public static final String PREFERENCE_END_OF_LINES = "end_of_lines";
 	/** Preference tag to retrieve the Encoding pref ( = {@value} ) */
@@ -126,6 +134,20 @@ public interface Constants {
 	/** color theme dracula : red on black ( = {@value} ) */
 	public static final int COLOR_DRACULA = 4;
 
+	
+	/** by default */
+	public static final int NORMAL = 0;
+	/** bold italic */
+	public static final int BOLD_ITALIC = 3;
+	/** bold */
+	public static final int BOLD = 1;
+	/** italic */
+	public static final int ITALIC = 2;
+	
+	
+	
+
+	
 	/** Request code for Save As Activity */
 	public static final int REQUEST_SAVE_AS = 107;
 	/** Request code for Open Activity */
diff --git a/Ted/src/fr/xgouchet/texteditor/common/Settings.java b/Ted/src/fr/xgouchet/texteditor/common/Settings.java
index 3f64595..98fbc72 100755
--- a/Ted/src/fr/xgouchet/texteditor/common/Settings.java
+++ b/Ted/src/fr/xgouchet/texteditor/common/Settings.java
@@ -26,6 +26,9 @@ public class Settings implements Constants {
 
 	/** Text size setting */
 	public static int TEXT_SIZE = 12;
+	
+	/** Text change */
+	public static int NORMAL = 0; 
 
 	/** Default end of line */
 	public static int DEFAULT_END_OF_LINE = EOL_LINUX;
@@ -83,6 +86,8 @@ public static void updateFromPreferences(SharedPreferences settings) {
 		WORDWRAP = settings.getBoolean(PREFERENCE_WORDWRAP, false);
 		TEXT_SIZE = getStringPreferenceAsInteger(settings,
 				PREFERENCE_TEXT_SIZE, "12");
+		NORMAL = getStringPreferenceAsInteger(settings, 
+				PREFERENCE_BOLD_ITALIC,("" + NORMAL));
 		DEFAULT_END_OF_LINE = getStringPreferenceAsInteger(settings,
 				PREFERENCE_END_OF_LINES, ("" + EOL_LINUX));
 		FORCE_AUTO_SAVE = settings.getBoolean(PREFERENCE_AUTO_SAVE, false);
@@ -167,3 +172,4 @@ public static Typeface getTypeface(Context ctx) {
 		return res;
 	}
 }
+
diff --git a/Ted/src/fr/xgouchet/texteditor/common/TextFileUtils.java b/Ted/src/fr/xgouchet/texteditor/common/TextFileUtils.java
index c565405..66d124c 100755
--- a/Ted/src/fr/xgouchet/texteditor/common/TextFileUtils.java
+++ b/Ted/src/fr/xgouchet/texteditor/common/TextFileUtils.java
@@ -11,7 +11,6 @@
 import java.io.OutputStreamWriter;
 
 import fr.xgouchet.texteditor.BuildConfig;
-import org.mozilla.universalchardet.UniversalDetector;
 
 import android.content.Context;
 import android.util.Log;
@@ -67,7 +66,7 @@ public static String readTextFile(File file) {
 		int c;
 		try {
 			reader = new InputStreamReader(new FileInputStream(file),
-					detectCharSet(file.getAbsolutePath()));
+					Settings.ENCODING);
 			in = new BufferedReader(reader);
 			do {
 				c = in.read();
@@ -166,30 +165,4 @@ public static String readInternal(Context context) {
 	public static void clearInternal(Context context) {
 		writeInternal(context, "");
 	}
-	
-	/**
-	 * Detect charset
-	 * @see    https://code.google.com/p/juniversalchardet/
-	 * @param  fileName
-	 *             the absolute path of the file to open
-	 * @return charset name
-	 *         
-	 * */
-	public static String detectCharSet(String fileName) throws IOException {
-	    byte[] buf = new byte[4096];
-	    FileInputStream fis = new FileInputStream(fileName);
-
-	    UniversalDetector detector = new UniversalDetector(null);
-
-	    int nread;
-	    while ((nread = fis.read(buf)) > 0 && !detector.isDone()) {
-	      detector.handleData(buf, 0, nread);
-	    }
-	    detector.dataEnd();
-
-	    String encoding = detector.getDetectedCharset();
-
-	    detector.reset();
-	    return encoding;
-	  }
 }
diff --git a/Ted/src/fr/xgouchet/texteditor/ui/view/AdvancedEditText.java b/Ted/src/fr/xgouchet/texteditor/ui/view/AdvancedEditText.java
index 19807a8..b4551fa 100644
--- a/Ted/src/fr/xgouchet/texteditor/ui/view/AdvancedEditText.java
+++ b/Ted/src/fr/xgouchet/texteditor/ui/view/AdvancedEditText.java
@@ -228,7 +228,7 @@ public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
 
 	/**
 	 * Update view settings from the app preferences
-	 * 
+	 *
 	 * @category Custom
 	 */
 	public void updateFromSettings() {
@@ -236,12 +236,54 @@ public void updateFromSettings() {
 		if (isInEditMode()) {
 			return;
 		}
-
 		setTypeface(Settings.getTypeface(getContext()));
 
 		// wordwrap
 		setHorizontallyScrolling(!Settings.WORDWRAP);
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+//bold_italic_underline
+		switch (Settings.NORMAL) {
+
+=======
+=======
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+		
+//bold_italic_underline
+		switch (Settings.NORMAL) {
+		
+<<<<<<< HEAD
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+=======
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+		case BOLD:
+			//setTypeface(Settings.getTypeface(getContext()));
+			setTypeface(null, Typeface.BOLD);
+			break;
+		case ITALIC:
+			//setTypeface(Settings.getTypeface(getContext()));
+			setTypeface(null, Typeface.ITALIC);
+			break;
+		case BOLD_ITALIC:
+			//setTypeface(Settings.getTypeface(getContext()));
+			setTypeface(null, Typeface.BOLD_ITALIC);
+			break;
+		default:
+			setTypeface(null, Typeface.NORMAL);
+			break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+		}
 
+=======
+		}	
+			
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+=======
+		}	
+			
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
 		// color Theme
 		switch (Settings.COLOR) {
 		case COLOR_NEGATIVE:
@@ -282,6 +324,15 @@ public void updateFromSettings() {
 		setTextSize(Settings.TEXT_SIZE);
 		mPaintNumbers.setTextSize(Settings.TEXT_SIZE * mScale * 0.85f);
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+=======
+		
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
+=======
+		
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361
 		// refresh view
 		postInvalidate();
 		refreshDrawableState();
@@ -363,4 +414,8 @@ protected void computeLineHighlight() {
 	protected int mHighlightStart;
 
 	protected Rect mDrawingRect, mLineBounds;
-}
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> 2c6f4c24e20f894028726ec87f4c3191b0fd7361