From 63896af59901fa8445193a19d1590177093b8984 Mon Sep 17 00:00:00 2001
From: Kenny Meyer <knny.myer@gmail.com>
Date: Sat, 17 Sep 2011 00:53:44 +0000
Subject: [BUG] Arreglar mapa de Central

---
diff --git a/MANIFEST b/MANIFEST
index a238312..97601bc 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -82,6 +82,8 @@ recursos/4central/imagenes/fondo.png
 recursos/4central/imagenes/cuchillas.png
 recursos/4central/imagenes/riosDetectar.png
 recursos/4central/imagenes/rios.png
+recursos/4central/imagenes/rutasDetectar.png
+recursos/4central/imagenes/rutas.png
 recursos/4central/imagenes/deptos.png
 recursos/4central/imagenes/deptosLineas.png
 recursos/4central/imagenes/cuchillasDetectar.png
@@ -90,6 +92,7 @@ recursos/4central/datos/departamentos.txt
 recursos/4central/datos/niveles.txt
 recursos/4central/datos/ciudades.txt
 recursos/4central/datos/rios.txt
+recursos/4central/datos/rutas.txt
 recursos/4central/datos/cuchillas.txt
 recursos/0paraguay/nombre.txt
 recursos/0paraguay/imagenes/fondo.png
@@ -110,9 +113,3 @@ recursos/0paraguay/datos/.departamentos.txt.swp
 recursos/0paraguay/imagenes/rutasDetectar.png
 recursos/0paraguay/imagenes/rutas.png
 recursos/0paraguay/datos/rutas.txt
-paraguay.gif
-recursos/0paraguay/imagenes/riosDetectar.xcf
-recursos/0paraguay/imagenes/rutas.xcf
-recursos/0paraguay/imagenes/Rutas_Nacionales_del_Paraguay.PNG
-recursos/0paraguay/imagenes/rutasDetectar.xcf
-recursos/0paraguay/imagenes/rios.xcf
diff --git a/conozcopy.py b/conozcopy.py
index 1d6d5b9..5d8c6b6 100755
--- a/conozcopy.py
+++ b/conozcopy.py
@@ -19,11 +19,6 @@
 # Kenny Meyer <knny.myer@gmail.com>
 # Daniel Brassel Buss <dbrassel@gmail.com>
 
-# make sure we can run outside of Sugar for testing..
-try:
-	from sugar.activity import activity
-except:
-	pass
 
 import sys
 import random
@@ -41,20 +36,6 @@ import logging.config
 _logger = logging.getLogger('conozco-paraguay')
 _logger.setLevel(logging.DEBUG)
 _SOUND = True
-_NEW_TOOLBAR_SUPPORT = True
-try:
-    from sugar.graphics.toolbutton import ToolButton
-    from sugar.graphics.toolbarbox import ToolbarBox
-    from sugar.graphics.toolbarbox import ToolbarButton
-    from sugar.activity.widgets import StopButton
-    from toolbar import ViewToolbar
-    from mybutton import MyActivityToolbarButton
-    _logger.debug('NEW toolbar')
-except:
-    _logger.debug('old toolbar')
-    _NEW_TOOLBAR_SUPPORT = False
-
-
 
 # constantes
 RADIO = 10
@@ -893,8 +874,7 @@ class ConozcoPy():
         pygame.init()
         # crear pantalla
         self.anchoPantalla = gtk.gdk.screen_width()
-	TOOLBAR_HEIGHT = 75
-	self.altoPantalla = gtk.gdk.screen_height() - TOOLBAR_HEIGHT
+	self.altoPantalla = gtk.gdk.screen_height()
         self.pantalla = pygame.display.set_mode((self.anchoPantalla,
                                                  self.altoPantalla))
 	_logger.debug('altoPantalla'+ str(self.altoPantalla))
diff --git a/recursos/4central/datos/rutas.txt b/recursos/4central/datos/rutas.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/recursos/4central/datos/rutas.txt
diff --git a/recursos/4central/imagenes/rutas.png b/recursos/4central/imagenes/rutas.png
new file mode 100644
index 0000000..716a28e
--- /dev/null
+++ b/recursos/4central/imagenes/rutas.png
Binary files differ
diff --git a/recursos/4central/imagenes/rutasDetectar.png b/recursos/4central/imagenes/rutasDetectar.png
new file mode 100644
index 0000000..6cad143
--- /dev/null
+++ b/recursos/4central/imagenes/rutasDetectar.png
Binary files differ
--
cgit v0.9.1