Time Options and Image Utility

Author: DeadlyApps

Frames/MinimalScreenBlockerFrame.py

@@ -1,5 +1,5 @@
-from tkinter import ttk, N, E, W
-
+from tkinter import ttk, N, E, W, S
+from datetime import datetime
 
 
 from Infrastructure.ImageUtility import ImageUtility
@@ -21,35 +21,35 @@ def __init__(self, master, controller, time_options_manager, mobber_manager, cou
         self.tips_manager = tips_manager
         self.build_window_content()
         self.mobber_manager.subscribe_to_mobber_list_change(self.mobber_list_change_callback)
+        if self.settings_manager.get_continue_screen_blocker_show_current_time():
+            self.countdown_manager.subscribe_to_time_changes(self.update_current_time)
+
+    def update_current_time(self, days, minutes, seconds):
+        self.current_time_label["text"] = datetime.now().strftime('%Y-%m-%d     %I:%M %p')
 
     def build_window_content(self):
         center_frame = ttk.Frame(self)
         center_frame.grid()
-        # center_frame.grid_columnconfigure(0, weight=0)
-        # center_frame.grid_columnconfigure(1, weight=0)
-        # center_frame.grid_columnconfigure(2, weight=0)
-        # center_frame.grid_columnconfigure(3, weight=0)
-        # center_frame.grid_columnconfigure(4, weight=1)
-        # center_frame.grid_columnconfigure(5, weight=1)
-        # center_frame.grid_columnconfigure(6, weight=0)
-        # center_frame.grid_columnconfigure(7, weight=0)
-        # center_frame.grid_columnconfigure(8, weight=0)
-        # center_frame.grid_columnconfigure(9, weight=0)
 
         row_index = 0
 
 
         image_utility = ImageUtility(self.theme_manager)
 
+
+
         self.invisible_icon = image_utility.load('images\\invisible.png')
         self.fade_label = ttk.Label(center_frame, image=self.invisible_icon)
         self.fade_label.grid(row=0, column=0, sticky=(N,W))
         self.fade_label.bind("<Enter>", lambda event: self.controller.fade_app())
         self.fade_label.bind("<Leave>", lambda event: self.controller.unfade_app())
 
-        #   0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9
-
-        title = ttk.Label(center_frame, text="Mobbing Timer", font="Helvetica 60 bold italic")
+        if self.settings_manager.get_general_use_logo_image():
+            self.image_utility = ImageUtility(self.theme_manager)
+            self.background_image = self.image_utility.load(self.settings_manager.get_general_logo_image_name(),800,200,self.settings_manager.get_general_auto_theme_logo())
+            title = ttk.Label(center_frame, image=self.background_image)
+        else:
+            title = ttk.Label(center_frame, text="Mobbing Timer", font="Helvetica 60 bold italic")
         title.grid(row=row_index,  column = 0, columnspan=6 ,padx=150, pady=10)
         row_index += 1
 
@@ -70,7 +70,7 @@ def build_window_content(self):
         self.next_mobber_label = ttk.Label(center_frame, text="", font="Helvetica 50")
         self.next_mobber_label.grid(row=row_index, column=4, columnspan=1,sticky=(N,W))
         row_index += 1
-        #   0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9
+
         start_button = ttk.Button(center_frame, text="Continue Mobbing!", style="StartButton.TButton", )
         start_button.grid(row=row_index, column=1, columnspan=4, sticky=N + E + W, padx=10, pady=10)
         start_button.bind("<Button-1>", lambda event: self.controller.show_transparent_countdown_frame())
@@ -81,6 +81,12 @@ def build_window_content(self):
             self.tip_text.grid(row=row_index, column=1, columnspan=4, padx=30, pady=10, sticky=(N))
             row_index += 1
 
+        if self.settings_manager.get_continue_screen_blocker_show_current_time():
+            self.current_time_label = ttk.Label(center_frame, text="current time",font="Helvetica 15")
+            self.current_time_label.grid(row=row_index, column=1, columnspan=4, padx=30, pady=10, sticky=(N))
+            row_index += 1
+
+
         start_button = ttk.Button(center_frame, text="Mob Setup & Time")
         start_button.grid(row=row_index, column=1, columnspan=4, sticky=N + E + W, padx=90, pady=10)
         start_button.bind("<Button-1>", lambda event: self.controller.show_screen_blocker_frame())
@@ -90,16 +96,13 @@ def build_window_content(self):
         start_button.grid(row=row_index, column=1, columnspan=4, sticky=N + E + W, padx=90, pady=10)
         start_button.bind("<Button-1>", lambda event: self.controller.quit_and_destroy_session())
         row_index += 1
-
-        #   0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9
-
     def mobber_list_change_callback(self, mobber_list, driver_index, navigator_index):
         self.current_mobber_label['text'] = ""
         self.next_mobber_label['text'] = ""
         for index in range(0, mobber_list.__len__()):
             name = mobber_list[index]
             if index == driver_index:
-                self.current_mobber_label['text'] = "{}".format(name)
+                self.current_mobber_label['text'] = "{} ".format(name)
             if index == navigator_index:
                 self.next_mobber_label['text'] = "{}".format(name)
         if self.settings_manager.get_general_enable_tips():

Frames/MobTimerController.py

@@ -25,7 +25,7 @@ def __init__(self, *args, **kwargs):
         self.settings_manager = SettingsManager()
         self.tips_manager = TipsManager()
         self.time_options_manager = TimeOptionsManager()
-        self.mobber_manager = MobberManager()
+        self.mobber_manager = MobberManager(self.settings_manager.get_randomize_randomize_next_driver())
         self.countdown_manager = CountdownManager(self)
         self.session_manager = SessionManager(uuid)
         atexit.register(self.session_manager.clear_sessions)
@@ -88,7 +88,7 @@ def frame_is_screen_blocking(self):
     def show_minimal_screen_blocker_frame(self):
         if self.last_frame != MinimalScreenBlockerFrame:
             self.launch_blocking_Frame(MinimalScreenBlockerFrame)
-            self.mobber_manager.switch_navigator_driver()
+            self.mobber_manager.switch_next_driver()
 
     def quit_and_destroy_session(self):
         self.session_manager.clear_sessions()

Frames/ScreenBlockerFrame.py

@@ -1,5 +1,9 @@
+import random
 from tkinter import *
 from tkinter import ttk
+from Infrastructure.ImageUtility import ImageUtility
+from PIL import Image
+from PIL import ImageTk
 
 TAGNAME_CURRENT_MOBBER = 'current_mobber'
 
@@ -17,6 +21,9 @@ def __init__(self, master, controller, time_options_manager, mobber_manager, cou
         self.time_options_manager = time_options_manager
         self.mobber_manager = mobber_manager
         self.settings_manager = settings_manager
+        self.mouse_wheel_seconds_delta = self.settings_manager.get_screen_blocker_mouse_wheel_seconds_delta()
+        self.click_seconds_delta = self.settings_manager.get_screen_blocker_click_seconds_delta()
+
         self.build_window_content()
         self.time_options_manager.subscribe_to_timechange(self.time_change_callback)
         self.mobber_manager.subscribe_to_mobber_list_change(self.mobber_list_change_callback)
@@ -52,22 +59,35 @@ def mouse_wheel_minutes(self, event):
             self.time_options_manager.decrement_minutes()
 
     def mouse_wheel_seconds(self, event):
+
         if event.delta > 0:
-            self.time_options_manager.increment_seconds()
+            self.time_options_manager.increment_seconds(self.mouse_wheel_seconds_delta)
         else:
-            self.time_options_manager.decrement_seconds()
+            self.time_options_manager.decrement_seconds(self.mouse_wheel_seconds_delta)
 
     def build_window_content(self):
+
+
+
         center_frame = ttk.Frame(self)
+
         center_frame.grid(row=0, column=0)
         center_frame.grid_columnconfigure(0, weight=1)
         center_frame.grid_columnconfigure(1, weight=0)
         center_frame.grid_columnconfigure(2, weight=0)
         center_frame.grid_columnconfigure(3, weight=0)
         center_frame.grid_columnconfigure(4, weight=1)
 
+
+
         row_index = 0
-        title = ttk.Label(center_frame, text="Mobbing Timer", font="Helvetica 60 bold italic")
+
+        if self.settings_manager.get_general_use_logo_image():
+            self.image_utility = ImageUtility(self.theme_manager)
+            self.background_image = self.image_utility.load(self.settings_manager.get_general_logo_image_name(),800,200,self.settings_manager.get_general_auto_theme_logo())
+            title = ttk.Label(center_frame, image=self.background_image)
+        else:
+            title = ttk.Label(center_frame, text="Mobbing Timer", font="Helvetica 60 bold italic")
         title.grid(row=row_index, columnspan=5, padx=30, pady=(70, 10))
         row_index += 1
 
@@ -87,8 +107,10 @@ def build_window_content(self):
 
         self.label_seconds = ttk.Label(center_frame, text="30", font="Helvetica 180 bold")
         self.label_seconds.grid(row=row_index, column=3, sticky=W)
-        self.label_seconds.bind("<Button-1>", lambda event: self.time_options_manager.increment_seconds())
-        self.label_seconds.bind("<Button-3>", lambda event: self.time_options_manager.decrement_seconds())
+        self.label_seconds.bind("<Button-1>",
+                                lambda event: self.time_options_manager.increment_seconds(self.click_seconds_delta))
+        self.label_seconds.bind("<Button-3>",
+                                lambda event: self.time_options_manager.decrement_seconds(self.click_seconds_delta))
         self.label_seconds.bind("<MouseWheel>", self.mouse_wheel_seconds)
         row_index += 1
 
@@ -106,7 +128,8 @@ def build_window_content(self):
         row_index += 1
 
         self.names_list = ttk.Treeview(center_frame)
-        self.names_list.tag_configure(TAGNAME_CURRENT_MOBBER, background=self.theme_manager.highlight_color, foreground=self.theme_manager.background_color)
+        self.names_list.tag_configure(TAGNAME_CURRENT_MOBBER, background=self.theme_manager.highlight_color,
+                                      foreground=self.theme_manager.background_color)
         self.names_list['show'] = 'tree'
         self.names_list.grid(row=row_index, rowspan=7, columnspan=2, column=1, padx=10, pady=button_pad,
                              sticky=N + E + W + S)
@@ -115,6 +138,7 @@ def build_window_content(self):
         remove_mobber_button.grid(row=row_index, column=3, sticky=N + E + W, padx=10, pady=button_pad)
         remove_mobber_button.bind("<Button-1>", lambda event: self.mobber_manager.remove_mobber(
             int(self.names_list.index(self.names_list.selection()))))
+        self.controller.bind("<Delete>", self.remove_mobber_if_screen_blocking)
         row_index += 1
 
         move_mobber_up_button = ttk.Button(center_frame, text="Move Mobber Up")
@@ -134,12 +158,13 @@ def build_window_content(self):
 
         clear_mobbers_button = ttk.Button(center_frame, text="Skip Driver")
         clear_mobbers_button.grid(row=row_index, column=3, sticky=N + E + W, padx=10, pady=button_pad)
-        clear_mobbers_button.bind("<Button-1>", lambda event: self.mobber_manager.switch_navigator_driver())
+        clear_mobbers_button.bind("<Button-1>", lambda event: self.mobber_manager.switch_next_driver())
         row_index += 1
 
-        clear_mobbers_button = ttk.Button(center_frame, text="Rewind Driver")
-        clear_mobbers_button.grid(row=row_index, column=3, sticky=N + E + W, padx=10, pady=button_pad)
-        clear_mobbers_button.bind("<Button-1>", lambda event: self.mobber_manager.rewind_driver())
+        if not self.settings_manager.get_randomize_randomize_next_driver():
+            clear_mobbers_button = ttk.Button(center_frame, text="Rewind Driver")
+            clear_mobbers_button.grid(row=row_index, column=3, sticky=N + E + W, padx=10, pady=button_pad)
+            clear_mobbers_button.bind("<Button-1>", lambda event: self.mobber_manager.rewind_driver())
         row_index += 1
 
         clear_mobbers_button = ttk.Button(center_frame, text="Add Team")
@@ -161,9 +186,16 @@ def build_window_content(self):
 
         self.focus_mobber_entry()
 
-    def add_default_team(self,event):
+    def remove_mobber_if_screen_blocking(self,event):
+        if self.controller.last_frame == ScreenBlockerFrame:
+            self.mobber_manager.remove_mobber(int(self.names_list.index(self.names_list.selection())))
+
+    def add_default_team(self, event):
         team = self.settings_manager.get_general_team().split(',')
+        randomize_team = self.settings_manager.get_randomize_team()
         self.mobber_manager.clear()
+        if randomize_team:
+            random.shuffle(team)
         for member in team:
             self.mobber_manager.add_mobber(member)
 

Infrastructure/ImageUtility.py

@@ -1,6 +1,7 @@
 from PIL import Image
 from PIL import ImageTk
 
+
 class ImageUtility(object):
     def __init__(self, theme_manager):
         self.theme_manager = theme_manager
@@ -11,23 +12,24 @@ def hex_to_rgb(value):
         lv = len(value)
         return tuple(int(value[i:i + lv // 3], 16) for i in range(0, lv, lv // 3))
 
-    def load(self, image_path, width=50, height=50):
+    def load(self, image_path, width=50, height=50, normalize_color=True):
         background_color = ImageUtility.hex_to_rgb(self.theme_manager.background_color)
         highlight_color = ImageUtility.hex_to_rgb(self.theme_manager.highlight_color)
         original = Image.open(image_path)
         resized = original.resize((width, height), Image.ANTIALIAS)
-        pixel_access = resized.load()
 
-        for y in range(resized.size[1]):
-            for x in range(resized.size[0]):
-                pixel = pixel_access[x, y]
-                if pixel[0] < 50:
-                    pixel_access[x, y] = (background_color[0] + pixel_access[x, y][0],
-                                            background_color[1] + pixel_access[x, y][1],
-                                            background_color[2] + pixel_access[x, y][2])
-                elif pixel[0] > 50:
-                    pixel_access[x, y] = (int(highlight_color[0] * pixel_access[x, y][0]/255),
-                                            int(highlight_color[1] * pixel_access[x, y][1]/255),
-                                            int(highlight_color[2] * pixel_access[x, y][2]/255))
+        if normalize_color:
+            pixel_access = resized.load()
+            for y in range(resized.size[1]):
+                for x in range(resized.size[0]):
+                    pixel = pixel_access[x, y]
+                    if pixel[0] < 50:
+                        pixel_access[x, y] = (background_color[0] + pixel_access[x, y][0],
+                                              background_color[1] + pixel_access[x, y][1],
+                                              background_color[2] + pixel_access[x, y][2])
+                    elif pixel[0] > 50:
+                        pixel_access[x, y] = (int(highlight_color[0] * pixel_access[x, y][0] / 255),
+                                              int(highlight_color[1] * pixel_access[x, y][1] / 255),
+                                              int(highlight_color[2] * pixel_access[x, y][2] / 255))
 
-        return ImageTk.PhotoImage(resized)
+        return ImageTk.PhotoImage(resized)

Infrastructure/MobberManager.py

@@ -1,9 +1,13 @@
+import random
+
+
 class MobberManager(object):
-    def __init__(self):
+    def __init__(self, randomize=False):
         self.driver_index = 0
-        self.navigator_index = 1
+        self.next_driver_index = 1
         self.mobber_list = []
         self.mobber_list_change_callbacks = []
+        self.randomize = randomize
 
     def mobber_count(self):
         return self.mobber_list.__len__()
@@ -40,36 +44,43 @@ def subscribe_to_mobber_list_change(self, mobber_list_change_callback):
         self.fire_time_change_callbacks()
 
     def fire_time_change_callbacks(self):
-        self.update_navigator_driver_index()
+        self.update_next_driver_index()
         for mobber_list_change_callback in self.mobber_list_change_callbacks:
             if mobber_list_change_callback:
-                mobber_list_change_callback(self.mobber_list, self.driver_index, self.navigator_index)
+                mobber_list_change_callback(self.mobber_list, self.driver_index, self.next_driver_index)
 
     def clear(self):
         self.mobber_list = []
         self.fire_time_change_callbacks()
 
-    def switch_navigator_driver(self):
+    def switch_next_driver(self):
         mobber_count = self.mobber_list.__len__()
         if mobber_count > 0:
-            self.driver_index = (self.driver_index + 1) % mobber_count
-        self.update_navigator_driver_index()
+            if self.randomize and mobber_count > 2:
+                self.driver_index = self.next_driver_index
+            else:
+                self.driver_index = (self.driver_index + 1) % mobber_count
         self.fire_time_change_callbacks()
 
-    def update_navigator_driver_index(self):
+    def update_next_driver_index(self):
         mobber_count = self.mobber_list.__len__()
         if mobber_count > 0:
-            self.driver_index = self.driver_index % mobber_count
-            self.navigator_index = (self.driver_index + 1) % mobber_count
+            if self.randomize and mobber_count > 2:
+                self.next_driver_index = int(random.uniform(0, mobber_count))
+                while self.driver_index == self.next_driver_index:
+                    self.next_driver_index = int(random.uniform(0, mobber_count))
+            else:
+                self.driver_index = self.driver_index % mobber_count
+                self.next_driver_index = (self.driver_index + 1) % mobber_count
         else:
             self.driver_index = 0
-            self.navigator_index = 1
+            self.next_driver_index = 1
 
     def rewind_driver(self):
         mobber_count = self.mobber_list.__len__()
         if mobber_count > 0:
             self.driver_index = (self.driver_index - 1)
             if self.driver_index < 0:
                 self.driver_index = mobber_count - 1
-        self.update_navigator_driver_index()
-        self.fire_time_change_callbacks()
+        self.update_next_driver_index()
+        self.fire_time_change_callbacks()