gbrainy r189 - trunk/src

[jmas svn gnome org]

Author: jmas
Date: Wed Jan 30 16:57:10 2008
New Revision: 189
URL: http://svn.gnome.org/viewvc/gbrainy?rev=189&view=rev

Log:
2008-01-28 Jordi Mas <jmas softcatala org>

	* MathWhichNumber.cs: Removes not needed space at the end of question
	* MemoryWords.cs: More space between words for longer languages
	* MemoryColouredText.cs: More space between words for longer languages



Modified:
   trunk/src/ChangeLog
   trunk/src/MathWhichNumber.cs
   trunk/src/MemoryColouredText.cs
   trunk/src/MemoryWords.cs

Modified: trunk/src/MathWhichNumber.cs
==============================================================================
--- trunk/src/MathWhichNumber.cs	(original)
+++ trunk/src/MathWhichNumber.cs	Wed Jan 30 16:57:10 2008
@@ -39,7 +39,7 @@
 	}
 
 	public override string Question {
-		get {return String.Format (Catalog.GetString ("Which of the following numbers is closer to {0:###.###} (option A, B, C or D)? "), question_num);} 
+		get {return String.Format (Catalog.GetString ("Which of the following numbers is closer to {0:###.###} (option A, B, C or D)?"), question_num);} 
 	}
 
 	public override string Answer {

Modified: trunk/src/MemoryColouredText.cs
==============================================================================
--- trunk/src/MemoryColouredText.cs	(original)
+++ trunk/src/MemoryColouredText.cs	Wed Jan 30 16:57:10 2008
@@ -61,11 +61,11 @@
 		DrawObject (gr, area_width, area_height);
 	}
 
-	public void DrawObject (Cairo.Context gr, int area_width, int area_height)
+	private void DrawObject (Cairo.Context gr, int area_width, int area_height)
 	{
 		palette.Alpha=alpha;
 
-		double x= DrawAreaX + 0.2, y = DrawAreaY + 0.2;
+		double x= DrawAreaX + 0.125, y = DrawAreaY + 0.2;
 
 		for (int i = 0; i < palette.Count ; i++)
 		{
@@ -76,13 +76,12 @@
 			
 			if (i == 2) {
 				y += 0.2;
-				x = DrawAreaX + 0.2;
+				x = DrawAreaX + 0.125;
 			} else {
-				x+= 0.2;
+				x+= 0.25;
 			}
 		}
 	}
-
 }
 
 

Modified: trunk/src/MemoryWords.cs
==============================================================================
--- trunk/src/MemoryWords.cs	(original)
+++ trunk/src/MemoryWords.cs	Wed Jan 30 16:57:10 2008
@@ -109,7 +109,7 @@
 	
 	public override void DrawPossibleAnswers (Cairo.Context gr, int area_width, int area_height)
 	{
-		double x= DrawAreaX + 0.1, y = DrawAreaY + 0.1;
+		double x= DrawAreaX + 0.125, y = DrawAreaY + 0.2;
 		int cnt = 0;
 
 		for (int i = 0; i < showed; i++)
@@ -123,13 +123,12 @@
 
 			if (cnt  == 2 || cnt == 5) {
 				y += 0.2;
-				x = DrawAreaX + 0.1;
+				x = DrawAreaX + 0.125;
 			} else {
-				x+= 0.2;
+				x+= 0.25;
 			}
 			cnt++;
 		}
-		
 	}
 	
 	public override void DrawObjectToMemorize (Cairo.Context gr, int area_width, int area_height)
@@ -138,9 +137,9 @@
 		DrawObject (gr, area_width, area_height);
 	}
 	
-	public void DrawObject (Cairo.Context gr, int area_width, int area_height)
+	private void DrawObject (Cairo.Context gr, int area_width, int area_height)
 	{
-		double x= DrawAreaX + 0.2, y = DrawAreaY + 0.2;
+		double x= DrawAreaX + 0.125, y = DrawAreaY + 0.2;
 		for (int i = 0; i < showed; i++)
 		{
 			gr.MoveTo (x, y);
@@ -149,9 +148,9 @@
 			
 			if (i  == 2 || i == 5) {
 				y += 0.2;
-				x = DrawAreaX + 0.2;
+				x = DrawAreaX + 0.125;
 			} else {
-				x+= 0.2;
+				x+= 0.25;
 			}
 		}
 	}