minor changes - works now

4 files changed, 18 insertions, 27 deletions

diff --git a/activity.py b/activity.py
index 3089696..8cf5aba 100644
--- a/activity.py
+++ b/activity.py
@@ -33,6 +33,7 @@ import sugargame.canvas
 
 from gettext import gettext as _
 
+import gambiarra
 from gambiarra import Game
 
 
@@ -42,7 +43,7 @@ class GambiarraActivity(activity.Activity):
         activity.Activity.__init__(self, handle)
         self.max_participants = 1
         self.game = Game()
-        #self.build_toolbar()
+        self.build_toolbar()
         self._pygamecanvas = sugargame.canvas.PygameCanvas(self)
         self.set_canvas(self._pygamecanvas)
         self._pygamecanvas.grab_focus()
diff --git a/activity/activity.info b/activity/activity.info
index 5638b0d..ec48b1f 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -4,4 +4,4 @@ activity_version = 1
 bundle_id = org.laptop.community.Gambiarra
 icon = gambiarra
 exec = sugar-activity activity.GambiarraActivity
-
+summary = An interactive game
diff --git a/gambiarra.py b/gambiarra.py
index 2c23a36..6df486d 100755
--- a/gambiarra.py
+++ b/gambiarra.py
@@ -31,37 +31,30 @@ import levels as Levels
 
 from objects import Esteira, check_collision
 
-class Game(object):
-    # controle do jogo
-    fps = 30
-    playing = None
-    running = None
-    clock = None
-    level = 0
-    levels = []
-    selected_element = None
-    _showed_help = None
-    count = None
-    play_sounds = None
-
-    # elementos do jogo
-    screen = None
-    menu = None
-    congrats = None
-    congrats_snd = None
+class Game():
 
     def __init__(self, play_sounds=True, running_sugar=True):
         self.play_sounds = play_sounds
         self.running_sugar = running_sugar
+        # controle do jogo
+        self.fps = 30
         self.running = True
         self.playing = False
+        self.clock = None
+        self.level = 0
+        self.levels = []
+        self.selected_element = None
         self._showed_help = False
         self.count = 0
 
+        # elementos do jogo
+        self.screen = None
+        self.menu = None
+        self.congrats = None
+        self.congrats_snd = None
+
     def load_all(self):
         pygame.init()
-        if self.play_sounds:
-            pygame.mixer.init()
         self.screen = pygame.display.get_surface()
         if self.screen is None:
             self.screen = pygame.display.set_mode((1200, 900))
@@ -73,6 +66,7 @@ class Game(object):
         self.congrats = pygame.image.load(os.path.join("data","images",
                                                        "fim_fase.png"))
         if self.play_sounds:
+            pygame.mixer.init()
             snd_file = os.path.join("data", "snd", "Congrats.wav")
             self.congrats_snd = pygame.mixer.Sound(snd_file)
 
@@ -188,7 +182,6 @@ class Game(object):
                 self.clock.tick(self.fps)
                 self.update_screen(self.fps)
                 self.levels[self.level].draw()
-
                 if not self._showed_help:
                     self.levels[self.level].show_help(self.screen)
                     self._showed_help = True
diff --git a/levels.py b/levels.py
index 79bf675..77badae 100644
--- a/levels.py
+++ b/levels.py
@@ -19,14 +19,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+import gtk
 import pygame
-
 import os
-
 import simplejson as json
-
 from objects import *
-
 from command import Play, Help, Quit
 
 class SimulationView(object):