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 51c449f10aaf2e04025e9bb85b91dfec100c9f9e..3d12a30840b20cf49c40390a6be5707b8801342b 100644 (file)
--- a/tabakrolletjie/widgets.py
+++ b/tabakrolletjie/widgets.py
@@ -66,14 +66,17 @@ 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)
         super(ImageButton, self).__init__(self._img.get_size(), name,
                                           pos, padding)
 
-    def update_image(self, *imgparts, transform=NullTransform()):
+    def update_image(self, *imgparts, **kwargs):
+        transform = kwargs.pop("transform", NullTransform())
         self._img = loader.load_image(*imgparts, transform=transform)
         
     def render(self, surface):