added pausing to night and moved reset tool after other tools

[tabakrolletjie.git] / tabakrolletjie / widgets.py

diff --git a/tabakrolletjie/widgets.py b/tabakrolletjie/widgets.py
index b1917e5abaf013f0bddef7c1391a99f15a40674a..3d12a30840b20cf49c40390a6be5707b8801342b 100644 (file)
--- a/tabakrolletjie/widgets.py
+++ b/tabakrolletjie/widgets.py
@@ -66,7 +66,9 @@ class ImageButton(Button):
 
     def __init__(self, *imgparts, **kwargs):
         transform = kwargs.pop("transform", NullTransform())
-        self._img = loader.load_image(*imgparts, transform=transform)
+        self._img = kwargs.pop("image", None)
+        if self._img is None:
+            self._img = loader.load_image(*imgparts, transform=transform)
         name = kwargs.get('name')
         pos = kwargs.get('pos')
         padding = kwargs.get('padding', 0)
@@ -74,7 +76,7 @@ class ImageButton(Button):
                                           pos, padding)
 
     def update_image(self, *imgparts, **kwargs):
-        transform=kwargs.pop("transform", NullTransform())
+        transform = kwargs.pop("transform", NullTransform())
         self._img = loader.load_image(*imgparts, transform=transform)
         
     def render(self, surface):