DrawType changes implemented

Author: intendednull

src/front.py

@@ -24,7 +24,7 @@ class Front(widget.PrimaryFrame):
     _last = None
 
     def __next(self, direction: Direction = None):
-        if self.window.active:
+        if self.window.active:  # Spam protection
             return
         if self.cache.ready():
             data: dict = self.cache.next()
@@ -43,13 +43,13 @@ def __next(self, direction: Direction = None):
                 width=self.window.winfo_width(),
                 height=self.window.winfo_height()
             )
-            self.window.change_view(View(self.loadscreen, 'widget'), direction)
-            self.loadscreen.waitfor(self.cache.ready, self.__next, ('up',))
+            self.window.change_view(View(self.window, window=self.loadscreen), direction)
+            self.loadscreen.waitfor(self.cache.ready, cmd=self.__next, args=('up',))
 
     def __load(self, name, image, data):
         self.title.config(text=name)
-        self.image = View(image, 'image')
-        self.bio = View(Bio(self.window), 'widget')
+        self.image = View(self.window, image=image)
+        self.bio = View(self.window, window=Bio(self.window))
 
         self._last = self.image
         self.bio.data.load(data)

src/main.py

@@ -23,10 +23,10 @@ def __init__(self, *args, **kwds):
         self.minsize(400, 500)
         self.maxsize(400, 500)
 
-        self.splash = Splash(self)
-        self.splash.pack(expand=True, fill='both')
-        # self.front = Front(self)
-        # self.front.pack(fill='both', expand=True)
+        # self.splash = Splash(self)
+        # self.splash.pack(expand=True, fill='both')
+        self.front = Front(self)
+        self.front.pack(fill='both', expand=True)
 
     def cleanup(self):
         with suppress(Exception):

src/view.py

@@ -85,25 +85,24 @@ def origin(self):
 
 
 class DrawType(Enum):
-    IMAGE = 'create_image'
-    WIDGET = 'create_window'
-    TEXT = 'create_text'
+    image = 'create_image'
+    window = 'create_window'
+    text = 'create_text'
 
 
 class View:
 
-    def __init__(self, window: Window, **kwds):
-        self.window = window
+    def __init__(self, master: Window, **kwds):
+        self.master = master
         self.kwds = kwds
         self.drawtype = self.data = None
         for k, v in self.kwds.items():
-            k = k.upper()
             if hasattr(DrawType, k):
                 self.drawtype = DrawType[k]
                 self.data = v
         if self.drawtype is None:
             raise NotImplementedError
 
     def draw(self, *args, **kwds):
-        fn = getattr(self.window, self.drawtype.value)
+        fn = getattr(self.master, self.drawtype.value)
         return fn(*args, **{**self.kwds, **kwds})