diff options
| author | dmazzone <mazzone.diego@gmail.com> | 2010-10-04 16:40:33 (GMT) |
|---|---|---|
| committer | dmazzone <mazzone.diego@gmail.com> | 2010-10-04 16:40:33 (GMT) |
| commit | 64e6d0971cefa7a950e89ebf2be89187abeb2609 (patch) | |
| tree | 35244bb0b1fc6fbae2d287bbb63ff3f158e8a218 /Saludame.activity/window.py | |
| parent | 424219209396598fe9068824a0f35e073891f3ca (diff) | |
| parent | 73f0d4ce24750887870a439c77676d1efa9d84a4 (diff) | |
Merge branch 'master' of git://git.sugarlabs.org/saludame/mainline into windows_controller
Conflicts <FIXED>:
Saludame.activity/window.py
Si bien tendría que haber hecho el merge del windows_controller al master, eran tantos los cambios en el windows_controller y tan pocos en el master que convenía hacerlo así.
Ahora veo como hacer un merge con el master.
Diffstat (limited to 'Saludame.activity/window.py')
| -rwxr-xr-x | Saludame.activity/window.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Saludame.activity/window.py b/Saludame.activity/window.py index 3350810..299a304 100755 --- a/Saludame.activity/window.py +++ b/Saludame.activity/window.py @@ -146,9 +146,14 @@ class MainWindow(Window): self.windows = [] # Lista de ventanas que 'componen' la ventana principal +<<<<<<< HEAD #temporal para probar ActionWindow (se cargará el diccionario en un módulo aparte). self.animations_dic = {'eat_apple': (animation.Apple(pygame.Rect((210, 20), (150, 172)), 10), "Eating an apple!") } self.action_win = ActionWindow(container, pygame.Rect((0, 505), (600, 20)), 10, pygame.Surface((600, 200)), screen, windows_controller, self.animations_dic) +======= + self.status_bars = status_bars.BarsWindow((0, 0), 1, pygame.Color("gray")) + self.windows.append(self.status_bars) +>>>>>>> 73f0d4ce24750887870a439c77676d1efa9d84a4 self.windows.append(KidWindow(container, pygame.Rect((0, 0), (600, 500)), 1, screen, windows_controller)) #self.windows.append(animation.Apple(pygame.Rect((700, 90), (150, 172)), 10)) |