Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Simmons <jim@olpc2.simmons>2010-03-03 00:24:34 (GMT)
committer James Simmons <jim@olpc2.simmons>2010-03-03 00:24:34 (GMT)
commit3132c80ba4c17fa66470bcbd1865ae1a893025e9 (patch)
treec2c366770726e2b5d4c44836c5452ccbc6d98a80
parentf0c7362bb786c6b47b0d9cb31b1804dee07f266e (diff)
Correct DemoiselleActivity.py
-rw-r--r--DemoiselleActivity.py20
-rwxr-xr-xdemoiselle2.py6
2 files changed, 9 insertions, 17 deletions
diff --git a/DemoiselleActivity.py b/DemoiselleActivity.py
index 4cfcc9f..2c6c99f 100644
--- a/DemoiselleActivity.py
+++ b/DemoiselleActivity.py
@@ -22,7 +22,6 @@ from gettext import gettext as _
import gtk
import pygame
from sugar.activity import activity
-from sugar.graphics.alert import NotifyAlert
from sugar.graphics.toolbutton import ToolButton
import gobject
import sugargame.canvas
@@ -42,6 +41,7 @@ class DemoiselleActivity(activity.Activity):
self._pygamecanvas = sugargame.canvas.PygameCanvas(self)
# Note that set_canvas implicitly calls read_file when resuming from the Journal.
self.set_canvas(self._pygamecanvas)
+ self.score = ''
# Start the game running.
self._pygamecanvas.run_pygame(self.game.run)
@@ -67,30 +67,18 @@ class DemoiselleActivity(activity.Activity):
def read_file(self, file_path):
score_file = open(file_path, "r")
while score_file:
- line = score_file.readline()
- alert(_('Previous Score'), _('Your score last time was ') + line)
+ self.score = score_file.readline()
+ self.game.set_score(int(self.score))
score_file.close()
def write_file(self, file_path):
score = self.game.get_score()
f = open(file_path, 'wb')
try:
- f.write(score)
+ f.write(str(score))
finally:
f.close
- def alert(self, title, text=None):
- alert = NotifyAlert(timeout=20)
- alert.props.title = title
- alert.props.msg = text
- self.add_alert(alert)
- alert.connect('response', self.alert_cancel_cb)
- alert.show()
-
- def alert_cancel_cb(self, alert, response_id):
- self.remove_alert(alert)
- self.textview.grab_focus()
-
class ViewToolbar(gtk.Toolbar):
__gtype_name__ = 'ViewToolbar'
diff --git a/demoiselle2.py b/demoiselle2.py
index c942819..46656ca 100755
--- a/demoiselle2.py
+++ b/demoiselle2.py
@@ -36,10 +36,14 @@ class Demoiselle:
self.clock = pygame.time.Clock()
self.running = True
self.background = pygame.image.load('sky.jpg')
+ self.score = 99
def get_score(self):
- return '99'
+ return self.score
+ def set_score(self, score):
+ self.score = score
+
def run(self):
"This method processes PyGame messages"