First atempt at mac build. Many issues with a mac deployment

Author: DeadlyApps

Frames/MinimalScreenBlockerFrame.py

@@ -1,8 +1,8 @@
-from tkinter import ttk, N, E, W, S
 from datetime import datetime
-
+from tkinter import ttk, N, E, W
 
 from Infrastructure.ImageUtility import ImageUtility
+from Infrastructure.PathUtility import PathUtility
 
 
 class MinimalScreenBlockerFrame(ttk.Frame):
@@ -33,42 +33,38 @@ def build_window_content(self):
 
         row_index = 0
 
-
         image_utility = ImageUtility(self.theme_manager)
 
-
-
-        self.invisible_icon = image_utility.load('images\\invisible.png')
+        invisible_path = PathUtility.normalize_path('images\\invisible.png')
+        self.invisible_icon = image_utility.load(invisible_path)
         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.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())
 
         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())
+            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)
+        title.grid(row=row_index, column=0, columnspan=6, padx=150, pady=10)
         row_index += 1
 
-        self.keyboard_icon = image_utility.load('images\\keyboard.png',75,75)
+        self.keyboard_icon = image_utility.load(PathUtility.normalize_path('images\\keyboard.png'), 75, 75)
         self.keyboard_label = ttk.Label(center_frame, image=self.keyboard_icon)
-        self.keyboard_label.grid(row=row_index, column=1, sticky=(N,E))
+        self.keyboard_label.grid(row=row_index, column=1, sticky=(N, E))
 
         self.current_mobber_label = ttk.Label(center_frame, text="", font="Helvetica 50 bold italic",
                                               style="Highlight.TLabel")
-        self.current_mobber_label.grid(row=row_index, column=2, columnspan=1,  sticky=(N,W))
-
+        self.current_mobber_label.grid(row=row_index, column=2, columnspan=1, sticky=(N, W))
 
-
-        self.minions_icon = image_utility.load('images\\minions.png',75,75)
+        self.minions_icon = image_utility.load(PathUtility.normalize_path('images\\minions.png'), 75, 75)
         self.minions_label = ttk.Label(center_frame, image=self.minions_icon)
-        self.minions_label.grid(row=row_index, column=3, sticky=(N,E))
+        self.minions_label.grid(row=row_index, column=3, sticky=(N, E))
 
         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))
+        self.next_mobber_label.grid(row=row_index, column=4, columnspan=1, sticky=(N, W))
         row_index += 1
 
         start_button = ttk.Button(center_frame, text="Continue Mobbing!", style="StartButton.TButton", )
@@ -82,20 +78,31 @@ def build_window_content(self):
             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 = 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
 
+        if self.settings_manager.get_timer_extension_enabled() and not self.settings_manager.get_randomize_randomize_next_driver():
+            minutes = self.settings_manager.get_timer_extension_minutes()
+            extend_time_button = ttk.Button(center_frame, text="Extend Time By {} Minutes".format(minutes))
+            extend_time_button.grid(row=row_index, column=1, columnspan=4, sticky=N + E + W, padx=90, pady=10)
+            extend_time_button.bind("<Button-1>", lambda event: self.rewind_and_extend(minutes))
+            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())
+        setup_button = ttk.Button(center_frame, text="Mob Setup & Time")
+        setup_button.grid(row=row_index, column=1, columnspan=4, sticky=N + E + W, padx=90, pady=10)
+        setup_button.bind("<Button-1>", lambda event: self.controller.show_screen_blocker_frame())
         row_index += 1
 
-        start_button = ttk.Button(center_frame, text="Quit Mobbing")
-        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())
+        quit_button = ttk.Button(center_frame, text="Quit Mobbing")
+        quit_button.grid(row=row_index, column=1, columnspan=4, sticky=N + E + W, padx=90, pady=10)
+        quit_button.bind("<Button-1>", lambda event: self.controller.quit_and_destroy_session())
         row_index += 1
+
+    def rewind_and_extend(self,minutes):
+        self.mobber_manager.rewind_driver()
+        return self.controller.show_transparent_countdown_frame(minutes)
+
     def mobber_list_change_callback(self, mobber_list, driver_index, navigator_index):
         self.current_mobber_label['text'] = ""
         self.next_mobber_label['text'] = ""

Frames/MobTimerController.py

@@ -1,15 +1,16 @@
 import atexit
+import os
 import uuid
 from tkinter import *
 from tkinter import ttk
 
-from screeninfo import *
-
 from Frames.MinimalScreenBlockerFrame import MinimalScreenBlockerFrame
 from Frames.ScreenBlockerFrame import ScreenBlockerFrame
 from Frames.TransparentCountdownFrame import TransparentCountdownFrame
 from Infrastructure.CountdownManager import CountdownManager
 from Infrastructure.MobberManager import MobberManager
+from Infrastructure.PlatformUtility import PlatformUtility
+from Infrastructure.ScreenUtility import ScreenUtility
 from Infrastructure.SessionManager import SessionManager
 from Infrastructure.SettingsManager import SettingsManager
 from Infrastructure.ThemeManager import ThemeManager
@@ -33,16 +34,15 @@ def __init__(self, *args, **kwargs):
             self.quit_and_destroy_session()
 
         self.session_manager.create_session()
-        self.iconbitmap(default='time-bomb.ico')
+        # self.iconbitmap(default='time-bomb.ico')
         self.countdown_manager.subscribe_to_time_changes(self.show_screen_blocker_when_session_interupted)
 
         self.theme_manager = ThemeManager()
         theme = self.settings_manager.get_general_theme()
         if not theme == 'none':
             self.theme_manager.set_theme(theme)
 
-        monitors = get_monitors()
-        num_monitors = monitors.__len__()
+        num_monitors = ScreenUtility.get_monitors_or_default(self).__len__()
         self.containers = [self]
         for monitor_index in range(1, num_monitors):
             monitor_screen_blocker = Toplevel(self)
@@ -74,12 +74,10 @@ def __init__(self, *args, **kwargs):
         self.transparent_frame_position = 0
         self.title("Mob Timer")
         self.bind_all("<Control-Return>", self.launch_transparent_countdown_if_blocking)
-        self.time_options_manager.set_countdown_time(self.settings_manager.get_general_minutes(), self.settings_manager.get_general_seconds())
-
+        self.time_options_manager.set_countdown_time(self.settings_manager.get_timer_minutes(), self.settings_manager.get_timer_seconds())
 
     def launch_transparent_countdown_if_blocking(self, event):
         if self.frame_is_screen_blocking():
-
             self.show_transparent_countdown_frame()
 
     def frame_is_screen_blocking(self):
@@ -101,7 +99,6 @@ def show_screen_blocker_when_session_interupted(self, days, minutes, seconds):
             self.session_manager.create_session()
 
     def show_frame(self, frame_class):
-
         switched_frames = False
         if self.last_frame != frame_class:
             for frame_instances in self.frames[frame_class]:
@@ -129,40 +126,49 @@ def launch_blocking_Frame(self, frame):
         if self.show_frame(frame):
             self.set_full_screen_always_on_top()
 
-    def show_transparent_countdown_frame(self):
+    def show_transparent_countdown_frame(self, extend_amount=None):
         if self.show_frame(TransparentCountdownFrame):
-            self.countdown_manager.set_countdown_duration(self.time_options_manager.minutes,
-                                                          self.time_options_manager.seconds)
+            if extend_amount is None:
+                self.countdown_manager.set_countdown_duration(self.time_options_manager.minutes,
+                                                              self.time_options_manager.seconds)
+            else:
+                self.countdown_manager.set_countdown_duration(extend_amount, 0)
             self.set_partial_screen_transparent()
 
     def get_current_window_geometry(self):
         return "{0}x{1}+0+0".format(
-            self.winfo_screenwidth(), self.winfo_screenheight())
+                self.winfo_screenwidth(), self.winfo_screenheight())
 
     def disable_resizing(self):
         for container in self.containers:
             container.resizable(0, 0)
 
     def remove_title_bar(self):
+        if PlatformUtility.platform_is_mac():
+            return
         for container in self.containers:
             container.overrideredirect(1)
 
     def set_always_on_top(self):
         for container in self.containers:
-            container.wm_attributes("-topmost", 1)
+            container.wm_attributes("-topmost", True)
+            if PlatformUtility.platform_is_mac():
+                os.system('''/usr/bin/osascript -e 'tell app "Finder" to set frontmost of process "Python" to true' ''')
+                self.focus_force()
+                self.focus()
             container.focus_force()
 
     def set_full_screen_always_on_top(self):
         self.set_always_on_top()
         self.remove_title_bar()
         self.disable_resizing()
-        top_left_screen = "+0+0"
-        monitors = get_monitors()
+        monitors = ScreenUtility.get_monitors_or_default(self)
 
         for container, monitor in zip(self.containers, monitors):
             monitor_string = "{}x{}+{}+{}".format(monitor.width, monitor.height, monitor.x, monitor.y)
             container.geometry(monitor_string)
-            container.wait_visibility(container)
+            if not PlatformUtility.platform_is_mac():
+                container.wait_visibility(container)  # Mac removing this prevented the issue with the continue screen visibility
             container.attributes("-alpha", 1)
 
     def set_partial_screen_transparent(self):
@@ -183,8 +189,8 @@ def set_partial_screen_transparent(self):
         self.toggle_transparent_frame_position()
 
     def fade_app(self):
-         for controller in self.containers:
-             controller.attributes("-alpha", self.settings_manager.get_continue_screen_blocker_window_alpha_percent())
+        for controller in self.containers:
+            controller.attributes("-alpha", self.settings_manager.get_continue_screen_blocker_window_alpha_percent())
 
     def unfade_app(self):
         for controller in self.containers:
@@ -194,9 +200,7 @@ def toggle_transparent_frame_position(self, e=None):
         if self.state() == "withdrawn":
             return
 
-
-
-        monitors = get_monitors()
+        monitors = ScreenUtility.get_monitors_or_default(self)
         monitor = monitors[self.transparent_frame_monitor_index]
 
         screenwidth = monitor.width
@@ -217,6 +221,6 @@ def toggle_transparent_frame_position(self, e=None):
             self.transparent_frame_position = monitor.x + 0
         self.transparent_frame_position_index = (self.transparent_frame_position_index + 1) % 2
 
-        bottom_left_screen = "{}x{}+{}+{}".format(window_width,window_height,self.transparent_frame_position, monitor.y +
+        bottom_left_screen = "{}x{}+{}+{}".format(window_width, window_height, self.transparent_frame_position, monitor.y +
                                                   screenheight - window_height)
         self.geometry(bottom_left_screen)

Frames/ScreenBlockerFrame.py

@@ -2,9 +2,6 @@
 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'
 
 
@@ -48,7 +45,6 @@ def time_change_callback(self, time, minutes, seconds):
 
     def toggle_geometry(self, event):
         geom = self.controller.winfo_geometry()
-        print(geom, self._geom)
         self.controller.geometry(self._geom)
         self._geom = geom
 
@@ -67,8 +63,6 @@ def mouse_wheel_seconds(self, event):
 
     def build_window_content(self):
 
-
-
         center_frame = ttk.Frame(self)
 
         center_frame.grid(row=0, column=0)
@@ -78,13 +72,11 @@ def build_window_content(self):
         center_frame.grid_columnconfigure(3, weight=0)
         center_frame.grid_columnconfigure(4, weight=1)
 
-
-
         row_index = 0
 
         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())
+            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")
@@ -137,7 +129,7 @@ def build_window_content(self):
         remove_mobber_button = ttk.Button(center_frame, text="Remove Mobber")
         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()))))
+                int(self.names_list.index(self.names_list.selection()))))
         self.controller.bind("<Delete>", self.remove_mobber_if_screen_blocking)
         row_index += 1
 
@@ -186,7 +178,7 @@ def build_window_content(self):
 
         self.focus_mobber_entry()
 
-    def remove_mobber_if_screen_blocking(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())))
 
@@ -207,7 +199,7 @@ def move_mobber_down_left_click(self, event):
         selected_index = int(int(self.names_list.index(selected_items)))
         self.mobber_manager.move_mobber_down(selected_index)
         self.names_list.selection_set(
-            self.names_list.get_children()[(selected_index + 1) % self.mobber_manager.mobber_count()])
+                self.names_list.get_children()[(selected_index + 1) % self.mobber_manager.mobber_count()])
 
     def move_mobber_up_left_click(self, event):
         selected_index = int(int(self.names_list.index(self.names_list.selection())))

Infrastructure/ImageUtility.py

@@ -1,5 +1,4 @@
-from PIL import Image
-from PIL import ImageTk
+
 
 
 class ImageUtility(object):
@@ -13,23 +12,30 @@ def hex_to_rgb(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, 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)
-
-        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))
+        import platform
 
-        return ImageTk.PhotoImage(resized)
+        if platform.system() == 'Darwin':
+            return None
+        #
+        # from PIL import Image
+        # from PIL import ImageTk
+        # 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)
+        #
+        # 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)

Infrastructure/PathUtility.py

@@ -0,0 +1,15 @@
+import os
+import sys
+
+
+class PathUtility(object):
+    @staticmethod
+    def normalize_path(path):
+
+        if not path.startswith("/"):
+            path = "/" + path
+        # if sys.frozen == 'macosx_app':
+        #     path = path + "/Resources/"
+        path = path.replace('\\','/')
+        result = os.path.dirname(sys.argv[0]) + path
+        return result