www

commit df1b86dab520e2203af9f1b91adf90c3cda54abc
parent d2681336e4e585389904d97648df6b50c7cdfb72
Author: Georges Dupéron <jahvascriptmaniac+github@free.fr>
Date:   Mon, 31 Jan 2011 22:08:55 +0100

Merge branch 'master' of github:jsmaniac/2011-m1s2-ter

Diffstat:
M
code/PtiClic/res/layout/main.xml
 | 
3
++-
M
code/PtiClic/res/values/strings.xml
 | 
8
++++----
M
code/PtiClic/src/org/pticlic/Score.java
 | 
3
+--

3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/code/PtiClic/res/layout/main.xml b/code/PtiClic/res/layout/main.xml
@@ -11,7 +11,8 @@
 		android:id="@+id/RelativeLayout01" android:layout_width="wrap_content"
 		android:layout_gravity="bottom|center_horizontal">
 
-		<Button android:layout_height="wrap_content" android:text="@string/play_label" android:layout_width="wrap_content"
+		<Button android:layout_height="wrap_content" android:text="@string/play_label" 
+		android:layout_width="wrap_content"
 			android:paddingLeft="60px" android:paddingRight="60px"
 			android:id="@+id/play"/>
 
diff --git a/code/PtiClic/res/values/strings.xml b/code/PtiClic/res/values/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">PtiClic</string>
-    <string name="prefs_name">Préférences</string>
-    <string name="play_label">Jouer</string>
-    <string name="textInfo">Ce projet a été réalisé l</string>
-    <color name="background">#FF0000</color>
+	<string name="prefs_name">Préférences</string>
+	<string name="play_label">Jouer</string>
+	<string name="textInfo">Ce projet a été réalisé l</string>
+	<color name="background">#FF0000</color>
 </resources>
diff --git a/code/PtiClic/src/org/pticlic/Score.java b/code/PtiClic/src/org/pticlic/Score.java
@@ -10,7 +10,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 
 public class Score extends Activity implements OnClickListener{
-
 	private GamePlayed gamePlayed;
 	
 	
@@ -38,7 +37,7 @@ public class Score extends Activity implements OnClickListener{
 
 	protected double calculateTotal(){
 		throw new UnsupportedOperationException();
-		//return this.corrects - this.manquants - this.mauvais; 
+		//return this.corrects - this.manquants - this.mauvais;
 	}
 
 	@Override