Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcixosfia <cixosfia@localhost.(none)>2009-10-24 23:56:40 (GMT)
committer cixosfia <cixosfia@localhost.(none)>2009-10-24 23:56:40 (GMT)
commitbe3340e361367442fef085634a0941d054410240 (patch)
treedb3e20e837a3df4a69fd93aeba4ac3a8bff84bb6
parentcc4d5da5375e500a8b686ae9308cfc98f281dcf4 (diff)
chmod 666 images
-rw-r--r--[-rwxr-xr-x]images/Carta1.JPGbin1665 -> 1665 bytes
-rw-r--r--[-rwxr-xr-x]images/Carta2.JPGbin1771 -> 1771 bytes
-rw-r--r--[-rwxr-xr-x]images/Carta3.JPGbin1765 -> 1765 bytes
-rw-r--r--[-rwxr-xr-x]images/CartaChichen.JPGbin4121 -> 4121 bytes
-rw-r--r--[-rwxr-xr-x]images/CartaColiseo.JPGbin3841 -> 3841 bytes
-rw-r--r--[-rwxr-xr-x]images/CartaCristo.JPGbin3285 -> 3285 bytes
-rw-r--r--[-rwxr-xr-x]images/CartaGranMuralla.JPGbin4378 -> 4378 bytes
-rw-r--r--[-rwxr-xr-x]images/CartaMacchu.JPGbin4104 -> 4104 bytes
-rw-r--r--[-rwxr-xr-x]images/CartaPetra.JPGbin3837 -> 3837 bytes
-rw-r--r--[-rwxr-xr-x]images/CartaTaj.JPGbin3545 -> 3545 bytes
-rw-r--r--[-rwxr-xr-x]images/Cartavacia.JPGbin2430 -> 2430 bytes
-rw-r--r--[-rwxr-xr-x]images/Correcto.JPGbin3016 -> 3016 bytes
-rw-r--r--[-rwxr-xr-x]images/Cursor.JPGbin1616 -> 1616 bytes
-rw-r--r--[-rwxr-xr-x]images/Elige.JPGbin1856 -> 1856 bytes
-rw-r--r--[-rwxr-xr-x]images/Estrella.JPGbin946 -> 946 bytes
-rw-r--r--[-rwxr-xr-x]images/Ganaste2.JPGbin4856 -> 4856 bytes
-rw-r--r--[-rwxr-xr-x]images/Ganaste4.JPGbin4916 -> 4916 bytes
-rw-r--r--[-rwxr-xr-x]images/Intenta.JPGbin3248 -> 3248 bytes
-rw-r--r--[-rwxr-xr-x]images/Jugando.JPGbin7023 -> 7023 bytes
-rw-r--r--[-rwxr-xr-x]images/Niño pekeño.JPGbin1121 -> 1121 bytes
-rw-r--r--[-rwxr-xr-x]images/Niño.JPGbin3967 -> 3967 bytes
-rw-r--r--[-rwxr-xr-x]images/Perdiste.JPGbin3182 -> 3182 bytes
-rwxr-xr-ximages/Thumbs.dbbin75264 -> 0 bytes
-rw-r--r--[-rwxr-xr-x]images/Vidamas.JPGbin6308 -> 6308 bytes
-rw-r--r--[-rwxr-xr-x]images/Vidamax.JPGbin8029 -> 8029 bytes
-rw-r--r--[-rwxr-xr-x]images/azul.pngbin1650839 -> 1650839 bytes
-rw-r--r--[-rwxr-xr-x]images/check.JPGbin942 -> 942 bytes
-rw-r--r--[-rwxr-xr-x]images/diceVoid.pngbin265 -> 265 bytes
-rw-r--r--[-rwxr-xr-x]images/fondo.jpgbin55781 -> 55781 bytes
-rw-r--r--[-rwxr-xr-x]images/tux.pngbin411573 -> 411573 bytes
-rw-r--r--[-rwxr-xr-x]images/x1.JPGbin935 -> 935 bytes
-rw-r--r--[-rwxr-xr-x]images/x2.JPGbin911 -> 911 bytes
-rw-r--r--sprites.py2
-rw-r--r--window.py31
34 files changed, 17 insertions, 16 deletions
diff --git a/images/Carta1.JPG b/images/Carta1.JPG
index de918dd..de918dd 100755..100644
--- a/images/Carta1.JPG
+++ b/images/Carta1.JPG
Binary files differ
diff --git a/images/Carta2.JPG b/images/Carta2.JPG
index 7c9f40e..7c9f40e 100755..100644
--- a/images/Carta2.JPG
+++ b/images/Carta2.JPG
Binary files differ
diff --git a/images/Carta3.JPG b/images/Carta3.JPG
index 05bdf0d..05bdf0d 100755..100644
--- a/images/Carta3.JPG
+++ b/images/Carta3.JPG
Binary files differ
diff --git a/images/CartaChichen.JPG b/images/CartaChichen.JPG
index 83d2cf3..83d2cf3 100755..100644
--- a/images/CartaChichen.JPG
+++ b/images/CartaChichen.JPG
Binary files differ
diff --git a/images/CartaColiseo.JPG b/images/CartaColiseo.JPG
index 4e89624..4e89624 100755..100644
--- a/images/CartaColiseo.JPG
+++ b/images/CartaColiseo.JPG
Binary files differ
diff --git a/images/CartaCristo.JPG b/images/CartaCristo.JPG
index 8ba8655..8ba8655 100755..100644
--- a/images/CartaCristo.JPG
+++ b/images/CartaCristo.JPG
Binary files differ
diff --git a/images/CartaGranMuralla.JPG b/images/CartaGranMuralla.JPG
index 2ab325c..2ab325c 100755..100644
--- a/images/CartaGranMuralla.JPG
+++ b/images/CartaGranMuralla.JPG
Binary files differ
diff --git a/images/CartaMacchu.JPG b/images/CartaMacchu.JPG
index 574eec9..574eec9 100755..100644
--- a/images/CartaMacchu.JPG
+++ b/images/CartaMacchu.JPG
Binary files differ
diff --git a/images/CartaPetra.JPG b/images/CartaPetra.JPG
index c3bf0ac..c3bf0ac 100755..100644
--- a/images/CartaPetra.JPG
+++ b/images/CartaPetra.JPG
Binary files differ
diff --git a/images/CartaTaj.JPG b/images/CartaTaj.JPG
index 6fb6f44..6fb6f44 100755..100644
--- a/images/CartaTaj.JPG
+++ b/images/CartaTaj.JPG
Binary files differ
diff --git a/images/Cartavacia.JPG b/images/Cartavacia.JPG
index 67112d4..67112d4 100755..100644
--- a/images/Cartavacia.JPG
+++ b/images/Cartavacia.JPG
Binary files differ
diff --git a/images/Correcto.JPG b/images/Correcto.JPG
index 8acf1bf..8acf1bf 100755..100644
--- a/images/Correcto.JPG
+++ b/images/Correcto.JPG
Binary files differ
diff --git a/images/Cursor.JPG b/images/Cursor.JPG
index 8b77334..8b77334 100755..100644
--- a/images/Cursor.JPG
+++ b/images/Cursor.JPG
Binary files differ
diff --git a/images/Elige.JPG b/images/Elige.JPG
index e3de268..e3de268 100755..100644
--- a/images/Elige.JPG
+++ b/images/Elige.JPG
Binary files differ
diff --git a/images/Estrella.JPG b/images/Estrella.JPG
index 17a993c..17a993c 100755..100644
--- a/images/Estrella.JPG
+++ b/images/Estrella.JPG
Binary files differ
diff --git a/images/Ganaste2.JPG b/images/Ganaste2.JPG
index 3109592..3109592 100755..100644
--- a/images/Ganaste2.JPG
+++ b/images/Ganaste2.JPG
Binary files differ
diff --git a/images/Ganaste4.JPG b/images/Ganaste4.JPG
index 6421219..6421219 100755..100644
--- a/images/Ganaste4.JPG
+++ b/images/Ganaste4.JPG
Binary files differ
diff --git a/images/Intenta.JPG b/images/Intenta.JPG
index 7bdc1ff..7bdc1ff 100755..100644
--- a/images/Intenta.JPG
+++ b/images/Intenta.JPG
Binary files differ
diff --git a/images/Jugando.JPG b/images/Jugando.JPG
index b17fb12..b17fb12 100755..100644
--- a/images/Jugando.JPG
+++ b/images/Jugando.JPG
Binary files differ
diff --git a/images/Niño pekeño.JPG b/images/Niño pekeño.JPG
index ba2fcae..ba2fcae 100755..100644
--- a/images/Niño pekeño.JPG
+++ b/images/Niño pekeño.JPG
Binary files differ
diff --git a/images/Niño.JPG b/images/Niño.JPG
index 2e32aed..2e32aed 100755..100644
--- a/images/Niño.JPG
+++ b/images/Niño.JPG
Binary files differ
diff --git a/images/Perdiste.JPG b/images/Perdiste.JPG
index e35cd60..e35cd60 100755..100644
--- a/images/Perdiste.JPG
+++ b/images/Perdiste.JPG
Binary files differ
diff --git a/images/Thumbs.db b/images/Thumbs.db
deleted file mode 100755
index 8077544..0000000
--- a/images/Thumbs.db
+++ /dev/null
Binary files differ
diff --git a/images/Vidamas.JPG b/images/Vidamas.JPG
index 06751a2..06751a2 100755..100644
--- a/images/Vidamas.JPG
+++ b/images/Vidamas.JPG
Binary files differ
diff --git a/images/Vidamax.JPG b/images/Vidamax.JPG
index 3de152d..3de152d 100755..100644
--- a/images/Vidamax.JPG
+++ b/images/Vidamax.JPG
Binary files differ
diff --git a/images/azul.png b/images/azul.png
index b1308d2..b1308d2 100755..100644
--- a/images/azul.png
+++ b/images/azul.png
Binary files differ
diff --git a/images/check.JPG b/images/check.JPG
index 5998e2f..5998e2f 100755..100644
--- a/images/check.JPG
+++ b/images/check.JPG
Binary files differ
diff --git a/images/diceVoid.png b/images/diceVoid.png
index 74a4777..74a4777 100755..100644
--- a/images/diceVoid.png
+++ b/images/diceVoid.png
Binary files differ
diff --git a/images/fondo.jpg b/images/fondo.jpg
index 4d1e249..4d1e249 100755..100644
--- a/images/fondo.jpg
+++ b/images/fondo.jpg
Binary files differ
diff --git a/images/tux.png b/images/tux.png
index f9f633f..f9f633f 100755..100644
--- a/images/tux.png
+++ b/images/tux.png
Binary files differ
diff --git a/images/x1.JPG b/images/x1.JPG
index 7e316f8..7e316f8 100755..100644
--- a/images/x1.JPG
+++ b/images/x1.JPG
Binary files differ
diff --git a/images/x2.JPG b/images/x2.JPG
index f951b5e..f951b5e 100755..100644
--- a/images/x2.JPG
+++ b/images/x2.JPG
Binary files differ
diff --git a/sprites.py b/sprites.py
index 909ad3e..12f4042 100644
--- a/sprites.py
+++ b/sprites.py
@@ -143,7 +143,7 @@ def draw_label(spr, label, myscale, center_flag="False", vert_pos="middle"):
# used for sliders
def draw_label1(spr, label):
- draw_label(spr, label, 12, True, "middle")
+ draw_label(spr, label, 12, False, "middle")
def draw_label2(spr, label):
draw_label(spr, str(label), 14, True, "top")
diff --git a/window.py b/window.py
index 68754d3..6223f27 100644
--- a/window.py
+++ b/window.py
@@ -79,29 +79,30 @@ def new_window(canvas, path, parent=None):
tw.answers_on_top = False
# Open the sliders
- y = 50
+ tw.qa_block = Sprite(tw,"tab",0,0,tw.width,tw.height,False)
+
tw.deck = [Sprite(tw,"CartaCristo",100,100,100,198,False),\
Sprite(tw,"CartaGranMuralla",250,100,100,198,False),\
Sprite(tw,"CartaMacchu",400,100,100,198,False)]
tw.cards = [tw.deck[0],tw.deck[1],tw.deck[2]]
+
tw.numbers = [Sprite(tw,"Carta1",100,100,100,198,False),\
Sprite(tw,"Carta2",250,100,100,198,False),\
Sprite(tw,"Carta3",400,100,100,198,False)]
- tw.questions = [Sprite(tw,"tab",100,320,100,50,True),\
- Sprite(tw,"tab",250,320,100,50,True),\
- Sprite(tw,"tab",400,320,100,50,True)]
-
- tw.qa_block = Sprite(tw,"tab",0,0,tw.width,tw.height,False)
- tw.answers = [Sprite(tw,"tab",100,420,100,50,True),\
- Sprite(tw,"tab",100,520,100,50,True),\
- Sprite(tw,"tab",100,620,100,50,True),\
- Sprite(tw,"tab",250,420,100,50,True),\
- Sprite(tw,"tab",250,520,100,50,True),\
- Sprite(tw,"tab",250,620,100,50,True),\
- Sprite(tw,"tab",400,420,100,50,True),\
- Sprite(tw,"tab",400,520,100,50,True),\
- Sprite(tw,"tab",400,620,100,50,True)]
+ tw.questions = [Sprite(tw,"tab",100,320,150,50,True),\
+ Sprite(tw,"tab",250,320,150,50,True),\
+ Sprite(tw,"tab",400,320,150,50,True)]
+
+ tw.answers = [Sprite(tw,"tab",100,420,150,50,True),\
+ Sprite(tw,"tab",100,470,150,50,True),\
+ Sprite(tw,"tab",100,520,150,50,True),\
+ Sprite(tw,"tab",250,420,150,50,True),\
+ Sprite(tw,"tab",250,470,150,50,True),\
+ Sprite(tw,"tab",250,520,150,50,True),\
+ Sprite(tw,"tab",400,420,150,50,True),\
+ Sprite(tw,"tab",400,470,150,50,True),\
+ Sprite(tw,"tab",400,520,150,50,True)]
for i in tw.cards:
i.draw_slider_bottom()