Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWalter Bender <walter@walter-laptop.(none)>2009-11-26 18:20:38 (GMT)
committer Walter Bender <walter@walter-laptop.(none)>2009-11-26 18:20:38 (GMT)
commit798f88d435aaa61c99a0c9d4f62b87fce3942fef (patch)
treee52c1653b12c84304dc5c90cfbea1f90481ca612
parent56ef70d8eaf8b36d703326aeefc6525d3285f23c (diff)
adding feedback to toolbar label
-rw-r--r--VisualMatchActivity.py2
-rw-r--r--window.py19
2 files changed, 11 insertions, 10 deletions
diff --git a/VisualMatchActivity.py b/VisualMatchActivity.py
index 7bfefff..b76c674 100644
--- a/VisualMatchActivity.py
+++ b/VisualMatchActivity.py
@@ -88,7 +88,7 @@ class VisualMatchActivity(activity.Activity):
toolbar_box.toolbar.insert(separator, -1)
# Label for showing status
- self.results_label = gtk.Label(_("say something here"))
+ self.results_label = gtk.Label(_("look for a set"))
self.results_label.show()
results_toolitem = gtk.ToolItem()
results_toolitem.add(self.results_label)
diff --git a/window.py b/window.py
index d57dfa9..1f0cd7f 100644
--- a/window.py
+++ b/window.py
@@ -142,9 +142,7 @@ def _button_release_cb(win, event, tw):
else:
print "selected card not found"
i = tw.clicked.index(a)
- print "filling slot " + str(i)
tw.clicked[i] = spr
- print "using selection mask " + str(i)
tw.selected[i].spr.x = spr.x
tw.selected[i].spr.y = spr.y
tw.selected[i].draw_card()
@@ -159,12 +157,16 @@ def _button_release_cb(win, event, tw):
if set_check([tw.deck.spr_to_card(tw.clicked[0]),
tw.deck.spr_to_card(tw.clicked[1]),
tw.deck.spr_to_card(tw.clicked[2])]):
- print "found a set"
+ tw.activity.results_label.set_text(_("found a set"))
+ # remove the set
+
+ # draw three new cards from the deck
+
else:
- print "not a set"
+ tw.activity.results_label.set_text(_("not a set"))
+
print "reseting board"
- for a in tw.clicked:
- a = None
+ tw.clicked = [None, None, None]
for a in tw.selected:
a.hide_card()
return True
@@ -191,11 +193,10 @@ def _destroy_cb(win, event, tw):
#
# Check whether three cards are a set based on the criteria that
-# in all characteristics, either all cards are the same of all cards are different
+# in all characteristics:
+# either all cards are the same of all cards are different
#
-
def set_check(cardarray):
- print cardarray
for a in cardarray:
if a is None:
return False