X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=erdslangetjie%2Feditor%2Feditor.py;h=4cfe183e213391bc42e5218c86b2cdf2f7ba3902;hb=20dd9168a45c3bf566e47604418d7d432854946b;hp=45545a2830aba42fbbacbe9f99cc88fb22c3d692;hpb=21f0e6625d077cafe3134c215c6202d5d32509f8;p=erdslangetjie.git

diff --git a/erdslangetjie/editor/editor.py b/erdslangetjie/editor/editor.py
index 45545a2..4cfe183 100644
--- a/erdslangetjie/editor/editor.py
+++ b/erdslangetjie/editor/editor.py
@@ -1,11 +1,9 @@
 import sys
 import os
-import kivy
 
-kivy.require('1.6.0')
+from erdslangetjie.constants import TILE_SIZE
 
 from kivy.app import App
-from kivy.logger import Logger, LoggerHistory
 from kivy.uix.widget import Widget
 from kivy.uix.floatlayout import FloatLayout
 from kivy.graphics import Color, Rectangle
@@ -17,7 +15,7 @@ from erdslangetjie.level import Level
 class EditorWindow(FloatLayout):
 
     def __init__(self, level):
-        super(EditorWindow, self).__init__(size=(648, 480))
+        super(EditorWindow, self).__init__(size=(800, 600))
         if os.path.exists(filepath(level)):
             level_data = load(level)
             self.level = level
@@ -31,27 +29,25 @@ class EditorWindow(FloatLayout):
                 self.level = level
             else:
                 self.level = 'levels/' + level
-        self.level_obj = Level()
-        self.level_obj.load(level_data)
+        self.level_obj = Level(level_data)
         level_data.close()
         self.level_obj.load_tiles()
 
     def build(self):
         self.clear_widgets()
         tiles = self.level_obj.get_tiles()
-        tile_size = 24
         bx, by = 0, 0
         for tile_line in tiles:
             bx = 0
             for tile in tile_line:
-                node = Widget(size=(tile_size, tile_size), pos=(bx, by))
+                node = Widget(size=(TILE_SIZE, TILE_SIZE), pos=(bx, by))
                 with node.canvas:
                     Color(1, 1, 1)
                     Rectangle(pos=node.pos, size=node.size,
                             texture=tile.texture)
                 self.add_widget(node)
-                bx += tile_size
-            by += tile_size
+                bx += TILE_SIZE
+            by += TILE_SIZE
 
 
 class EditorApp(App):
@@ -71,10 +67,6 @@ def main():
         level = sys.argv[1]
     else:
         level = 'level1.txt'
-    # Uncomment to silence excessive logging
-    #for hdlr in Logger.handlers[:]:
-    #    if not isinstance(hdlr, LoggerHistory):
-    #        Logger.removeHandler(hdlr)
     EditorApp(level).run()