- added new model

- the config files for games have changed to use xml
  added reading and writing of the config files
- adopted the ui to use the model
- adopted the dbus methods to send the new grid when a game changes
- fixed some buddy left issues
- cleaned the misc folder

6 files changed, 146 insertions, 84 deletions

diff --git a/games/addition/addition.mem b/games/addition/addition.mem
index 9e41bcc..8d1f0eb 100755..100644
--- a/games/addition/addition.mem
+++ b/games/addition/addition.mem
@@ -1,24 +1,23 @@
-game_name=addition
-score_sound=score.wav
-win_sound=score.wav
-divided=false
-face= 
-# Cards
-,,,,,,1+1,,,,,2,,,,
-,,,,,,1+2,,,,,3,,,,
-,,,,,,2+2,,,,,4,,,,
-,,,,,,2+3,,,,,5,,,,
-,,,,,,3+3,,,,,6,,,,
-,,,,,,3+4,,,,,7,,,,
-,,,,,,4+4,,,,,8,,,,
-,,,,,,4+5,,,,,9,,,,
-,,,,,,5+5,,,,,10,,,,
-,,,,,,5+6,,,,,11,,,,
-,,,,,,6+6,,,,,12,,,,
-,,,,,,6+7,,,,,13,,,,
-,,,,,,7+7,,,,,14,,,,
-,,,,,,7+8,,,,,15,,,,
-,,,,,,8+8,,,,,16,,,,
-,,,,,,8+9,,,,,17,,,,
-,,,,,,9+9,,,,,18,,,,
-,,,,,,10+9,,,,,19,,,,
\ No newline at end of file
+<?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" />
+
+</memorize>
diff --git a/games/drumgit/drumgit.mem b/games/drumgit/drumgit.mem
index 482005a..a563341 100755..100644
--- a/games/drumgit/drumgit.mem
+++ b/games/drumgit/drumgit.mem
@@ -1,3 +1,29 @@
+<?xml version="1.0"?>
+<memorize name="drumgit" scoresnd="score.wav" winsnd="win.wav" divided="0" >
+
+ <pair aimg="drumkit1_b.jpg" asnd="beat1_a.aiff" bimg="drumkit1_b.jpg" bsnd="beat1_a.aiff" color="100" />
+ <pair aimg="drumkit2_b.jpg" asnd="beat1_b.aiff" bimg="drumkit2_b.jpg" bsnd="beat1_b.aiff" color="100" />
+ <pair aimg="drumkit3_b.jpg" asnd="beat1_c.aiff" bimg="drumkit3_b.jpg" bsnd="beat1_c.aiff" color="100" />
+ <pair aimg="drumkit4_b.jpg" asnd="beat8.aiff" bimg="drumkit4_b.jpg" bsnd="beat8.aiff" color="100" />
+
+ <pair aimg="drumkit6_b.jpg" asnd="beat3.aiff" bimg="drumkit6_b.jpg" bsnd="beat3.aiff" color="100" />
+ <pair aimg="drumkit7_b.jpg" asnd="beat4.aiff" bimg="drumkit7_b.jpg" bsnd="beat4.aiff" color="100" />
+ <pair aimg="drumkit8_b.jpg" asnd="beat14.aiff" bimg="drumkit8_b.jpg" bsnd="beat14.aiff" color="100" />
+ <pair aimg="drumkit9_b.jpg" asnd="beat6_2.aiff" bimg="drumkit9_b.jpg" bsnd="beat6_2.aiff" color="100" />
+
+ <pair aimg="guitar1_2.jpg" asnd="bending_a.aiff" bimg="guitar1_2.jpg" bsnd="bending_a.aiff" color="100" />
+ <pair aimg="guitar2_2.jpg" asnd="bending_b.aiff" bimg="guitar2_2.jpg" bsnd="bending_b.aiff" color="100" />
+ <pair aimg="guitar3_2.jpg" asnd="flashcomp2a.aiff" bimg="guitar3_2.jpg" bsnd="flashcomp2a.aiff" color="100" />
+ <pair aimg="guitar4_2.jpg" asnd="flashcomp2b.aiff" bimg="guitar4_2.jpg" bsnd="flashcomp2b.aiff" color="100" />
+
+ <pair aimg="guitar5_2.jpg" asnd="gedaempft.aiff" bimg="guitar5_2.jpg" bsnd="gedaempft.aiff" color="100" />
+ <pair aimg="guitar6_2.jpg" asnd="gedaempft.aiff" bimg="guitar6_2.jpg" bsnd="gedaempft.aiff" color="100" />
+ <pair aimg="guitar7_2.jpg" asnd="ungedaempft.aiff" bimg="guitar7_2.jpg" bsnd="ungedaempft.aiff" color="100" />
+ <pair aimg="guitar8_2.jpg" asnd="jimi4.aiff" bimg="guitar8_2.jpg" bsnd="jimi4.aiff" color="100" />
+
+</memorize>
+
+<!--
 game_name=drumgit
 score_sound=score.wav
 win_sound=score.wav
@@ -27,4 +53,5 @@ face=
 ,guitar9_2.jpg,git_hit4.wav,,,,,,,guitar9_2.jpg,git_hit4.wav,,,,,
 ,guitar10_2.jpg,guitcello.wav,,,,,,,guitar10_2.jpg,guitcello.wav,,,,,
 ,guitar11_2.jpg,flasholet4.wav,,,,,,,guitar11_2.jpg,flasholet4.wav,,,,,
-,guitar12_2.jpg,jimi1.wav,,,,,,,guitar12_2.jpg,jimi1.wav,,,,,
\ No newline at end of file
+,guitar12_2.jpg,jimi1.wav,,,,,,,guitar12_2.jpg,jimi1.wav,,,,,
+-->
\ No newline at end of file
diff --git a/games/letters1/letters1.mem b/games/letters1/letters1.mem
index cda6e27..f8b7c66 100755
--- a/games/letters1/letters1.mem
+++ b/games/letters1/letters1.mem
@@ -1,25 +1,23 @@
-game_name=letters1
-score_sound=score.wav
-win_sound=score.wav
-divided=True
-face1=1
-face2=2
-# Cards
-1,,,A,,,,,2,,,a,,,,
-1,,,E,,,,,2,,,e,,,,
-1,,,I,,,,,2,,,i,,,,
-1,,,O,,,,,2,,,o,,,,
-1,,,U,,,,,2,,,u,,,,
-1,,,B,,,,,2,,,b,,,,
-1,,,C,,,,,2,,,c,,,,
-1,,,D,,,,,2,,,d,,,,
-1,,,F,,,,,2,,,f,,,,
-1,,,G,,,,,2,,,g,,,,
-1,,,H,,,,,2,,,h,,,,
-1,,,J,,,,,2,,,j,,,,
-1,,,K,,,,,2,,,k,,,,
-1,,,L,,,,,2,,,l,,,,
-1,,,M,,,,,2,,,m,,,,
-1,,,N,,,,,2,,,n,,,,
-1,,,P,,,,,2,,,p,,,,
-1,,,Q,,,,,2,,,q,,,,
\ No newline at end of file
+<?xml version="1.0"?>
+<memorize name="letters1" scoresnd="score.wav" winsnd="win.wav" divided="1" face1="1" face2="2" >
+
+ <pair achar="A" bchar="a" />
+ <pair achar="E" bchar="e" />
+ <pair achar="I" bchar="i" />
+ <pair achar="O" bchar="o" />
+ <pair achar="U" bchar="u" />
+ <pair achar="B" bchar="b" />
+ <pair achar="C" bchar="c" />
+ <pair achar="D" bchar="d" />
+ <pair achar="F" bchar="f" />
+ <pair achar="G" bchar="g" />
+ <pair achar="H" bchar="h" />
+ <pair achar="J" bchar="j" />
+ <pair achar="K" bchar="k" />
+ <pair achar="L" bchar="l" />
+ <pair achar="M" bchar="m" />
+ <pair achar="N" bchar="n" />
+ <pair achar="P" bchar="p" />
+ <pair achar="Q" bchar="q" />
+
+</memorize>
diff --git a/games/letters2/letters2.mem b/games/letters2/letters2.mem
index ff806a9..793696a 100755
--- a/games/letters2/letters2.mem
+++ b/games/letters2/letters2.mem
@@ -1,25 +1,24 @@
-game_name=letters2
-score_sound=score.wav
-win_sound=score.wav
-divided=True
-face1=1
-face2=2
-# Cards
-1,,,A,,,,,2,,,a,,,,
-1,,,E,,,,,2,,,e,,,,
-1,,,I,,,,,2,,,i,,,,
-1,,,O,,,,,2,,,o,,,,
-1,,,U,,,,,2,,,u,,,,
-1,,,L,,,,,2,,,l,,,,
-1,,,M,,,,,2,,,m,,,,
-1,,,N,,,,,2,,,n,,,,
-1,,,P,,,,,2,,,p,,,,
-1,,,Q,,,,,2,,,q,,,,
-1,,,R,,,,,2,,,r,,,,
-1,,,S,,,,,2,,,s,,,,
-1,,,T,,,,,2,,,t,,,,
-1,,,V,,,,,2,,,v,,,,
-1,,,W,,,,,2,,,w,,,,
-1,,,X,,,,,2,,,x,,,,
-1,,,Y,,,,,2,,,y,,,,
-1,,,Z,,,,,2,,,z,,,,
\ No newline at end of file
+<?xml version="1.0"?>
+<memorize name="letters2" scoresnd="score.wav" winsnd="win.wav" divided="1" face1="1" face2="2" >
+
+ <pair achar="A" bchar="a" />
+ <pair achar="E" bchar="e" />
+ <pair achar="I" bchar="i" />
+ <pair achar="O" bchar="o" />
+ <pair achar="U" bchar="u" />
+
+ <pair achar="L" bchar="l" />
+ <pair achar="M" bchar="m" />
+ <pair achar="N" bchar="n" />
+ <pair achar="P" bchar="p" />
+ <pair achar="Q" bchar="q" />
+ <pair achar="R" bchar="r" />
+ <pair achar="S" bchar="s" />
+ <pair achar="T" bchar="t" />
+ <pair achar="V" bchar="v" />
+ <pair achar="W" bchar="w" />
+ <pair achar="X" bchar="x" />
+ <pair achar="Y" bchar="y" />
+ <pair achar="Z" bchar="z" />
+
+</memorize>
\ No newline at end of file
diff --git a/games/numbers/numbers.mem b/games/numbers/numbers.mem
index b1a3839..ba7fa05 100755
--- a/games/numbers/numbers.mem
+++ b/games/numbers/numbers.mem
@@ -1,3 +1,25 @@
+<?xml version="1.0"?>
+<memorize name="numbers" scoresnd="score.wav" winsnd="win.wav" divided="1" face1="1" face2="2" >
+
+ <pair achar="1" asnd="01.wav" bimg="01x.jpg" bsnd="01.wav" />
+ <pair achar="2" asnd="02.wav" bimg="02x.jpg" bsnd="02.wav" />
+ <pair achar="3" asnd="03.wav" bimg="03x.jpg" bsnd="03.wav" />
+ <pair achar="4" asnd="04.wav" bimg="04x.jpg" bsnd="04.wav" />
+ <pair achar="5" asnd="05.wav" bimg="05x.jpg" bsnd="05.wav" />
+ <pair achar="6" asnd="06.wav" bimg="06x.jpg" bsnd="06.wav" />
+ <pair achar="7" asnd="07.wav" bimg="07x.jpg" bsnd="07.wav" />
+ <pair achar="8" asnd="08.wav" bimg="08x.jpg" bsnd="08.wav" />
+ <pair achar="9" asnd="09.wav" bimg="09x.jpg" bsnd="09.wav" />
+ <pair achar="10" asnd="10.wav" bimg="10x.jpg" bsnd="10.wav" />
+ <pair achar="11" asnd="11.wav" bimg="11x.jpg" bsnd="11.wav" />
+ <pair achar="12" asnd="12.wav" bimg="12x.jpg" bsnd="12.wav" />
+ <pair achar="13" asnd="13.wav" bimg="13x.jpg" bsnd="13.wav" />
+ <pair achar="14" asnd="14.wav" bimg="14x.jpg" bsnd="14.wav" />
+ <pair achar="15" asnd="15.wav" bimg="15x.jpg" bsnd="15.wav" />
+
+</memorize>
+
+<!--
 game_name=numbers
 score_sound=score.wav
 win_sound=score.wav
@@ -19,4 +41,5 @@ face2=2
 1,,12.wav,12,,,,,2,12x.jpg,12.wav,,,,,
 1,,13.wav,13,,,,,2,13x.jpg,13.wav,,,,,
 1,,14.wav,14,,,,,2,14x.jpg,14.wav,,,,,
-1,,15.wav,15,,,,,2,15x.jpg,15.wav,,,,,
\ No newline at end of file
+1,,15.wav,15,,,,,2,15x.jpg,15.wav,,,,,
+-->
\ No newline at end of file
diff --git a/games/phonemes/phonemes.mem b/games/phonemes/phonemes.mem
index a28d4ba..12b67d9 100755
--- a/games/phonemes/phonemes.mem
+++ b/games/phonemes/phonemes.mem
@@ -1,10 +1,25 @@
-game_name=phonemes
-score_sound=score.wav
-win_sound=score.wav
-divided=True
-face1=1
-face2=2
-# Cards
+<?xml version="1.0"?>
+<memorize name="phonemes" scoresnd="score.wav" winsnd="win.wav" divided="1" face1="1" face2="2" >
+
+ <pair aimg="agua1.jpg" asnd="agua1.wav" bimg="agua2.jpg" bsnd="agua2.wav" />
+ <pair aimg="bola1.jpg" asnd="bola1.wav" bimg="bola2.jpg" bsnd="bola2.wav" />
+ <pair aimg="casa1.jpg" asnd="casa1.wav" bimg="casa2.jpg" bsnd="casa2.wav" />
+ <pair aimg="ema1.jpg" asnd="ema1..wav" bimg="ema2.jpg" bsnd="ema2.wav" />
+ <pair aimg="frutas1.jpg" asnd="frutas1.wav" bimg="frutas2.jpg" bsnd="frutas2.wav" />
+ <pair aimg="homem1.jpg" asnd="homem1.wav" bimg="homem2.jpg" bsnd="homem2.wav" />
+ <pair aimg="ioio1.jpg" asnd="ioio1.wav" bimg="ioio2.jpg" bsnd="ioio2.wav" />
+ <pair aimg="kiwi1.jpg" asnd="kiwi1.wav" bimg="kiwi2.jpg" bsnd="kiwi2.wav" />
+ <pair aimg="ovo1.jpg" asnd="ovo1.wav" bimg="ovo2.jpg" bsnd="ovo2.wav" />
+ <pair aimg="peixe1.jpg" asnd="peixe1.wav" bimg="peixe2.jpg" bsnd="peixe2.wav" />
+ <pair aimg="queijo1.jpg" asnd="queijo1.wav" bimg="queijo2.jpg" bsnd="queijo2.wav" />
+ <pair aimg="roda1.jpg" asnd="roda1.wav" bimg="roda2.jpg" bsnd="roda2.wav" />
+ <pair aimg="sapo1.jpg" asnd="sapo1.wav" bimg="sapo2.jpg" bsnd="sapo2.wav" />
+ <pair aimg="uva1.jpg" asnd="uva1.wav" bimg="uva2.jpg" bsnd="uva2.wav" />
+ <pair aimg="zebra1.jpg" asnd="zebra1.wav" bimg="zebra2.jpg" bsnd="zebra2.wav" />
+
+</memorize>
+
+<!--
 1,agua1.jpg,agua1.wav,,,,,Á_ _ _,2,agua2.jpg,agua2.wav,,,,,_GUA
 1,bola1.jpg,bola1.wav,,,,,BO_ _,2,bola2.jpg,bola2.wav,,,,,_ _LA
 1,casa1.jpg,casa1.wav,,,,,CA_ _,2,casa2.jpg,casa2.wav,,,,,_ _SA
@@ -19,4 +34,5 @@ face2=2
 1,roda1.jpg,roda1.wav,,,,,RO_ _,2,roda2.jpg,roda2.wav,,,,,_ _DA
 1,sapo1.jpg,sapo1.wav,,,,,SA_ _,2,sapo2.jpg,sapo2.wav,,,,,_ _PO
 1,uva1.jpg,uva1.wav,,,,,U_ _,2,uva2.jpg,uva2.wav,,,,,_VA
-1,zebra1.jpg,zebra1.wav,,,,,ZE_ _ _,2,zebra2.jpg,zebra2.wav,,,,,_ _BRA
\ No newline at end of file
+1,zebra1.jpg,zebra1.wav,,,,,ZE_ _ _,2,zebra2.jpg,zebra2.wav,,,,,_ _BRA
+-->
\ No newline at end of file