Store speak props in Memorize objects

1 files changed, 44 insertions, 20 deletions

diff --git a/cardlist.py b/cardlist.py
index c054165..406b02b 100644
--- a/cardlist.py
+++ b/cardlist.py
@@ -40,7 +40,7 @@ _logger = logging.getLogger('memorize-activity')
 class CardList(gtk.EventBox):
         
     __gsignals__ = {
-        'pair-selected': (SIGNAL_RUN_FIRST, None, 7 * [TYPE_PYOBJECT]), 
+        'pair-selected': (SIGNAL_RUN_FIRST, None, 9 * [TYPE_PYOBJECT]), 
         'update-create-toolbar': (SIGNAL_RUN_FIRST, None, 3 * [TYPE_PYOBJECT]), 
         'update-create-buttons': (SIGNAL_RUN_FIRST, None, 2 * [TYPE_PYOBJECT]), 
     }
@@ -94,7 +94,10 @@ class CardList(gtk.EventBox):
             else:
                 bsnd = None
                 
-            self.add_pair(None, game_pairs[key].props.achar, game_pairs[key].props.bchar, aimg, bimg, asnd, bsnd, False)
+            self.add_pair(None, game_pairs[key].props.achar,
+                    game_pairs[key].props.bchar, aimg, bimg, asnd, bsnd,
+                    game_pairs[key].props.aspeak, game_pairs[key].props.bspeak,
+                    False)
         
     def save_game(self, widget, game_name, equal_pairs, grouped):
         
@@ -118,16 +121,24 @@ class CardList(gtk.EventBox):
             achar = self.pairs[pair].get_text(1)
             if achar != '':
                 pair_card.set_property('achar', achar)
-            
+
             # bchar
             bchar = self.pairs[pair].get_text(2)
             if bchar != '':
                 pair_card.set_property('bchar', bchar)
 
+            # aspeak
+            aspeak = self.pairs[pair].get_speak(1)
+            pair_card.set_property('aspeak', aspeak)
+
+            # bspeak
+            bspeak = self.pairs[pair].get_speak(2)
+            pair_card.set_property('bspeak', bspeak)
+
             # aimg
             aimg = self.pairs[pair].get_pixbuf(1)
             if aimg != None:
-                
+
                 if equal_pairs:
                     aimgfile = 'img'+str(pair)+'.jpg'
                 else:
@@ -189,8 +200,9 @@ class CardList(gtk.EventBox):
                 os.rmdir(join(root, name))
         os.rmdir(path)
     
-    def add_pair(self, widget, achar, bchar, aimg, bimg, asnd, bsnd, show = True):
-        pair = Pair(achar, bchar, aimg, bimg, asnd, bsnd)
+    def add_pair(self, widget, achar, bchar, aimg, bimg, asnd, bsnd,
+            aspeak, bspeak, show = True):
+        pair = Pair(achar, bchar, aimg, bimg, asnd, bsnd, aspeak, bspeak)
         self.vbox.pack_end(pair, False, True)
         self.pairs.append(pair)
         pair.connect('pair-selected', self.set_selected)
@@ -204,7 +216,8 @@ class CardList(gtk.EventBox):
         self.pairs.remove(widget)
         del widget
         self.emit('update-create-buttons', True, True)
-        self.emit('pair-selected', False, None, None, None, None, None, None)
+        self.emit('pair-selected', False, None, None, None, None, None, None,
+                False, False)
             
     def set_selected(self, widget, event):
         if self.current_pair <> None:
@@ -215,12 +228,15 @@ class CardList(gtk.EventBox):
         self.emit('pair-selected', True,
                self.current_pair.get_text(1), self.current_pair.get_text(2),
                self.current_pair.get_pixbuf(1), self.current_pair.get_pixbuf(2),
-               self.current_pair.get_sound(1), self.current_pair.get_sound(2))
-        
-    def update_selected(self, widget, newtext1, newtext2, aimg, bimg, asnd, bsnd):
+               self.current_pair.get_sound(1), self.current_pair.get_sound(2),
+               self.current_pair.get_speak(1), self.current_pair.get_speak(2))
+
+    def update_selected(self, widget, newtext1, newtext2, aimg, bimg,
+            asnd, bsnd, aspeak, bspeak):
         self.current_pair.change_text(newtext1, newtext2)
         self.current_pair.change_pixbuf(aimg, bimg)
         self.current_pair.change_sound(asnd, bsnd)
+        self.current_pair.change_speak(aspeak, bspeak)
         
         self.emit('update-create-buttons', True, True)
         
@@ -231,14 +247,10 @@ class Pair(gtk.EventBox):
         'pair-closed': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]),
     }
 
-    def __init__(self, text1, text2 = None, aimg = None, bimg = None, asnd = None, bsnd = None):
+    def __init__(self, text1, text2 = None, aimg = None, bimg = None,
+            asnd = None, bsnd = None, aspeak=False, bspeak=False):
         gtk.EventBox.__init__(self)
         self.bg_color = '#000000'
-        if text2 == None:
-            self.text2 = text1
-        else:
-            self.text2 = text2
-        self.text1 = text1
 
         self.asnd = asnd
         self.bsnd = bsnd
@@ -251,6 +263,7 @@ class Pair(gtk.EventBox):
 
         self.bcard1 = svgcard.SvgCard(-1,
                 { 'front_text'  : { 'card_text'     : text1,
+                                    'speak'         : aspeak,
                                     'text_color'    : '#ffffff' },
                   'front'       : { 'fill_color'    : '#4c4d4f',
                                     'stroke_color'  : '#ffffff',
@@ -264,6 +277,7 @@ class Pair(gtk.EventBox):
 
         self.bcard2 = svgcard.SvgCard(-1,
                 { 'front_text'  : { 'card_text'     : text2,
+                                    'speak'         : bspeak,
                                     'text_color'    : '#ffffff' },
                   'front'       : { 'fill_color'    : '#4c4d4f',
                                     'stroke_color'  : '#ffffff',
@@ -321,19 +335,29 @@ class Pair(gtk.EventBox):
     def change_sound(self, asnd, bsnd):
         self.asnd = asnd
         self.bsnd = bsnd
-    
+
     def get_text(self, card):
         if card == 1:
             return self.bcard1.get_text()
         else:
-            return self.bcard2.get_text()        
-        
+            return self.bcard2.get_text()
+
+    def change_speak(self, aspeak, bspeak):
+        self.bcard1.change_speak(aspeak)
+        self.bcard2.change_speak(bspeak)
+
+    def get_speak(self, card):
+        if card == 1:
+            return self.bcard1.get_speak()
+        else:
+            return self.bcard2.get_speak()
+
     def get_pixbuf(self, card):
         if card == 1:
             return self.bcard1.get_pixbuf()
         else:
             return self.bcard2.get_pixbuf()
-        
+
     def get_sound(self, card):
         if card == 1:
             return self.asnd