From 01d70a77d88ffd8ca02e2f3070db510c5b811362 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Mon, 16 Jul 2007 10:01:48 +0000
Subject:  - Fix for handling equations in the addition game.

---
diff --git a/activity/activity.info b/activity/activity.info
index 10dab42..dab2086 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -3,5 +3,5 @@ name = Memorize
 service_name = org.laptop.Memorize
 class = activity.MemorizeActivity
 icon = activity-memorize
-activity_version = 11
+activity_version = 12
 show_launcher = yes
diff --git a/cardtable.py b/cardtable.py
index dbde177..ed49852 100755
--- a/cardtable.py
+++ b/cardtable.py
@@ -84,8 +84,11 @@ class CardTable(gtk.EventBox):
             props = {}
             props['front_border'] = {'opacity':'1'}
             props['front_h_border'] ={'opacity':'1'}
-            props['front_text']= {'card_text':card.get('char', ''), 'card_line1':'', 'card_line2':'', 'card_line3':'', 'card_line4':''}
-            
+            if card['charalign'] == '3': 
+                props['front_text']= {'card_text':'', 'card_line1':'', 'card_line2':'', 'card_line3':card.get('char', ''), 'card_line4':''}
+            else:
+                props['front_text']= {'card_text':card.get('char', ''), 'card_line1':'', 'card_line2':'', 'card_line3':'', 'card_line4':''}
+                    
             if card['ab']== 'a':
                 buffer_card = buffer_card_1
             elif card['ab']== 'b':
diff --git a/games/addition/addition.mem b/games/addition/addition.mem
index 8d1f0eb..9a7e2fb 100644
--- a/games/addition/addition.mem
+++ b/games/addition/addition.mem
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <memorize name="addition" scoresnd="score.wav" winsnd="win.wav" divided="0" >
 
- <pair achar="1+1" bchar="2" bcharalign="2" />
- <pair achar="1+2" bchar="3" />
- <pair achar="2+2" bchar="4" />
- <pair achar="2+3" bchar="5" />
- <pair achar="3+3" bchar="6" />
- <pair achar="3+4" bchar="7" />
- <pair achar="4+4" acharalign="4" bchar="8" />
- <pair achar="4+5" bchar="9" />
- <pair achar="5+5" bchar="10" />
- <pair achar="5+6" bchar="11" />
- <pair achar="6+6" bchar="12" bcharalign="3"/>
- <pair achar="6+7" bchar="13" />
- <pair achar="7+7" bchar="14" />
- <pair achar="7+8" bchar="15" />
- <pair achar="8+8" bchar="16" />
- <pair achar="8+9" bchar="17" />
- <pair achar="9+9" bchar="18" />
- <pair achar="10+9" bchar="19" />
+ <pair achar="1+1" acharalign="3" bchar="2"/>
+ <pair achar="1+2" acharalign="3" bchar="3" />
+ <pair achar="2+2" acharalign="3" bchar="4" />
+ <pair achar="2+3" acharalign="3" bchar="5" />
+ <pair achar="3+3" acharalign="3" bchar="6" />
+ <pair achar="3+4" acharalign="3" bchar="7" />
+ <pair achar="4+4" acharalign="3" bchar="8"/>
+ <pair achar="4+5" acharalign="3" bchar="9" />
+ <pair achar="5+5" acharalign="3" bchar="10" />
+ <pair achar="5+6" acharalign="3" bchar="11" />
+ <pair achar="6+6" acharalign="3" bchar="12" />
+ <pair achar="6+7" acharalign="3" bchar="13" />
+ <pair achar="7+7" acharalign="3" bchar="14" />
+ <pair achar="7+8" acharalign="3" bchar="15" />
+ <pair achar="8+8" acharalign="3" bchar="16" />
+ <pair achar="8+9" acharalign="3" bchar="17" />
+ <pair achar="9+9" acharalign="3" bchar="18" />
+ <pair achar="10+9" acharalign="3" bchar="19" />
 
 </memorize>
diff --git a/model.py b/model.py
index 7f0b1d0..1023776 100644
--- a/model.py
+++ b/model.py
@@ -217,6 +217,7 @@ class Model(object):
                 elem['pairkey'] = key
                 elem['state'] = '0'
                 elem['ab'] = 'a'
+                elem['charalign'] = '0'
                 if self.pairs[key].props.aimg != None:
                     elem['img'] = os.path.join(self.data['pathimg'], self.pairs[key].props.aimg)
                 if self.pairs[key].props.asnd != None:
@@ -230,6 +231,7 @@ class Model(object):
                 elem['pairkey'] = key
                 elem['state'] = '0'
                 elem['ab'] = 'b'
+                elem['charalign'] = '0'
                 if self.pairs[key].props.bimg != None:
                     elem['img'] = os.path.join(self.data['pathimg'], self.pairs[key].props.bimg)
                 if self.pairs[key].props.bsnd != None:
--
cgit v0.9.1