[gcompris/gcomprisbraille] FIXED Clickable dots issue for alphabets and number

[Srishti Sethi <srishs src gnome org>]

commit 9434c5f4fa397fda0956e86db085c71b38bd92da
Author: Srishti Sethi <srishakatux gmail com>
Date:   Mon Jul 18 23:01:20 2011 +0530

    FIXED Clickable dots issue for alphabets and number

 src/braille_alphabets-activity/BrailleChar.py      |   18 +++++++++-------
 .../braille_alphabets.py                           |   22 ++++++++++++-------
 src/dicey_dicey-activity/dicey_dicey.py            |    2 +-
 3 files changed, 25 insertions(+), 17 deletions(-)
---
diff --git a/src/braille_alphabets-activity/BrailleChar.py b/src/braille_alphabets-activity/BrailleChar.py
index 6c8d7ce..9369c26 100644
--- a/src/braille_alphabets-activity/BrailleChar.py
+++ b/src/braille_alphabets-activity/BrailleChar.py
@@ -47,7 +47,7 @@ class BrailleChar:
   def __init__(self, rootitem,
                x, y, width, letter,DOT_ON,
                DOT_OFF,fill,stroke,display_letter, clickable,
-               rectangle,callback):
+               rectangle,callback, braille_letter = "alphabet"):
 
     self.letter = letter
     self.callback = callback
@@ -58,6 +58,7 @@ class BrailleChar:
     self.fill = fill
     self.stroke = stroke
     self.rectangle = rectangle
+    self.braille_letter = braille_letter
 
     height = width * 1.33
     cell_radius = (width / 7.5)
@@ -136,13 +137,14 @@ class BrailleChar:
 
       self.letter = ''
       for k,v in BRAILLE_LETTERS.items():
-          if v == cells:
-              self.letter = k
-
-      if isinstance(self.letter,int):
-          self.text.set_property("text",self.letter)
-      else :
-          self.text.set_property("text", str.upper(self.letter))
+          if (self.braille_letter == "alphabet") and (v == cells):
+              if isinstance(k, basestring):
+                  self.letter = k
+                  self.text.set_property("text", str.upper(self.letter))
+          if (self.braille_letter == "number") and (v == cells):
+              if isinstance(k, int):
+                  self.letter = k
+                  self.text.set_property("text",self.letter)
 
       if self.callback:
           self.callback(self.letter)
diff --git a/src/braille_alphabets-activity/braille_alphabets.py b/src/braille_alphabets-activity/braille_alphabets.py
index b611528..39bce78 100644
--- a/src/braille_alphabets-activity/braille_alphabets.py
+++ b/src/braille_alphabets-activity/braille_alphabets.py
@@ -215,7 +215,7 @@ class Gcompris_braille_alphabets:
         self.sublevel = range_upper - range_lower
         self.board_tile(range_lower,range_upper)
         self.random_letter = letter_arr_one[self.counter]
-        self.braille_cell()
+        self.braille_cell(level)
 
     elif(level == 3) :
         range_lower= 7
@@ -223,7 +223,7 @@ class Gcompris_braille_alphabets:
         self.sublevel = range_upper - range_lower
         self.board_tile(range_lower,range_upper)
         self.random_letter = letter_arr_two[self.counter]
-        self.braille_cell()
+        self.braille_cell(level)
 
     elif(level == 4):
         range_lower= 14
@@ -231,7 +231,7 @@ class Gcompris_braille_alphabets:
         self.sublevel = range_upper - range_lower
         self.board_tile(range_lower,range_upper)
         self.random_letter = letter_arr_three[self.counter]
-        self.braille_cell()
+        self.braille_cell(level)
 
     elif(level == 5):
         range_lower= 21
@@ -239,7 +239,7 @@ class Gcompris_braille_alphabets:
         self.sublevel = range_upper - range_lower
         self.board_tile(range_lower,range_upper)
         self.random_letter = letter_arr_four[self.counter]
-        self.braille_cell()
+        self.braille_cell(level)
 
     elif(level == 6):
         range_lower= 0
@@ -247,7 +247,8 @@ class Gcompris_braille_alphabets:
         self.sublevel = range_upper - range_lower
         self.board_number(range_lower,range_upper)
         self.random_letter = letter_arr_five[self.counter]
-        self.braille_cell()
+        self.braille_letter = "number"
+        self.braille_cell(level)
 
 
   def next_level(self,event,target,item):
@@ -275,14 +276,19 @@ class Gcompris_braille_alphabets:
                                  anchor=gtk.ANCHOR_CENTER,
                                  text=str(letter))
 
-  def braille_cell(self):
+  def braille_cell(self, level):
+      if (level == 6):
+          self.letter = "number"
+      else :
+          self.letter = "alphabet"
+
       gcompris.set_background(self.gcomprisBoard.canvas.get_root_item(),
                             "braille_alphabets/mosaic.svgz")
 
       goocanvas.Text(parent = self.rootitem,
                      x = 100,
                      y = 200,
-                     text="Click COLOR_ON the dots in braille cell area to produce letter"
+                     text="Click on the dots in braille cell area to produce letter"
                       + ' '+str(self.random_letter),
                      fill_color="blue",
                      font='SANS 15')
@@ -293,7 +299,7 @@ class Gcompris_braille_alphabets:
                      fill_color="blue",
                      font='Sans BOLD')
       BrailleChar(self.rootitem, 150, 270, 120, '',COLOR_ON ,COLOR_OFF,CIRCLE_FILL,CIRCLE_STROKE,
-                   False,True,False,callback = self.letter_change)
+                   False,True,False,callback = self.letter_change , braille_letter = self.letter)
       for i in range(2):
           for j in range(3):
                   goocanvas.Text(parent=self.rootitem,
diff --git a/src/dicey_dicey-activity/dicey_dicey.py b/src/dicey_dicey-activity/dicey_dicey.py
index e0ce251..06bc397 100644
--- a/src/dicey_dicey-activity/dicey_dicey.py
+++ b/src/dicey_dicey-activity/dicey_dicey.py
@@ -202,7 +202,7 @@ class Gcompris_dicey_dicey:
           BrailleChar(self.rootitem,600,160,70,'' ,
                       COLOR_ON, COLOR_OFF, CIRCLE_FILL,
                       CIRCLE_STROKE, False, True, False,
-                      callback = self.letter_change)
+                      callback = self.letter_change, braille_letter = "number")
 
 
   def dicey_dicey(self):