Added Config File and Ctrl + Enter to Start Timermer

Author: DeadlyApps

Frames/MobTimerController.py

@@ -1,23 +1,24 @@
+import atexit
 import uuid
 from tkinter import *
+from tkinter import ttk
 
-import atexit
+from screeninfo import *
 
+from Frames.ScreenBlockerFrame import ScreenBlockerFrame
+from Frames.TransparentCountdownFrame import TransparentCountdownFrame
 from Infrastructure.CountdownManager import CountdownManager
 from Infrastructure.MobberManager import MobberManager
 from Infrastructure.SessionManager import SessionManager
+from Infrastructure.SettingsManager import SettingsManager
 from Infrastructure.TimeOptionsManager import TimeOptionsManager
-from Frames.ScreenBlockerFrame import ScreenBlockerFrame
-from Frames.TransparentCountdownFrame import TransparentCountdownFrame
-from screeninfo import *
 
 
 class MobTimerController(Tk):
     def __init__(self, *args, **kwargs):
         Tk.__init__(self, *args, **kwargs)
+        self.settings_manager = SettingsManager()
 
-        # self.iconbitmap(default='C:\\Users\\Chris\\OneDrive\\Git\\Pycharm\\MobTimer\\time-bomb.ico')
-        #TODO: iconbitmap needs to load the ico file as a string because of py2exe =/
         self.time_options_manager = TimeOptionsManager()
         self.mobber_manager = MobberManager()
         self.countdown_manager = CountdownManager(self)
@@ -30,6 +31,12 @@ def __init__(self, *args, **kwargs):
 
         self.countdown_manager.subscribe_to_time_changes(self.show_screen_blocker_when_session_interupted)
 
+        style = ttk.Style()
+        print(style.theme_names())
+        theme = self.settings_manager.get_general_theme()
+        if theme != "none":
+            style.theme_use(theme)
+
         monitors = get_monitors()
         num_monitors = monitors.__len__()
         self.containers = [self]
@@ -41,15 +48,21 @@ def __init__(self, *args, **kwargs):
         for frame_type in self.frame_types:
             self.frames[frame_type] = []
         for container in self.containers:
-            container_frame = Frame(container)
-            container_frame.grid(row=0, column=0, sticky=N + S + E + W)
+            container.grid_rowconfigure(0, weight=1)
+            container.grid_columnconfigure(0, weight=1)
+
+            container_frame = ttk.Frame(container)
+
+            container_frame.grid(row=0, column=0, sticky=(N , S , E , W))
             container_frame.grid_rowconfigure(0, weight=1)
             container_frame.grid_columnconfigure(0, weight=1)
             for frame_type in self.frame_types:
                 frame_instance = frame_type(container_frame, self, self.time_options_manager, self.mobber_manager,
-                                            self.countdown_manager)
+                                            self.countdown_manager, self.settings_manager)
                 self.frames[frame_type].append(frame_instance)
-                frame_instance.grid(row=0, column=0, sticky="nsew")
+                frame_instance.grid(row=0, column=0, sticky=(N , S , E , W))
+                frame_instance.grid_rowconfigure(0, weight=1)
+                frame_instance.grid_columnconfigure(0, weight=1)
         self.last_frame = None
         self.show_screen_blocker_frame()
         for frame_instance in self.frames[TransparentCountdownFrame]:
@@ -121,11 +134,14 @@ def set_partial_screen_transparent(self):
         for controller in self.containers:
             screenwidth = self.winfo_screenwidth()
             screenheight = self.winfo_screenheight()
-            window_width = int(screenwidth * 0.3)
-            window_height = int(screenheight * 0.3)
+
+            size_percentage = self.settings_manager.get_transparent_window_screen_size_percent()
+            alpha = self.settings_manager.get_transparent_window_alpha_percent()
+            window_width = int(screenwidth * size_percentage)
+            window_height = int(screenheight * size_percentage)
             window_size = "{0}x{1}+0+0".format(window_width, window_height)
             controller.geometry(window_size)
-            controller.attributes("-alpha", 0.3)
+            controller.attributes("-alpha", alpha)
         self.toggle_transparent_frame_position()
 
     def toggle_transparent_frame_position(self, e=None):
@@ -136,8 +152,10 @@ def toggle_transparent_frame_position(self, e=None):
         self.remove_title_bar()
         self.disable_resizing()
 
-        window_width = int(screenwidth * 0.3)
-        window_height = int(screenheight * 0.3)
+        size_percentage = self.settings_manager.get_transparent_window_screen_size_percent()
+
+        window_width = int(screenwidth * size_percentage)
+        window_height = int(screenheight * size_percentage)
 
         if self.transparent_frame_position == 0:
             self.transparent_frame_position = screenwidth - window_width

Frames/ScreenBlockerFrame.py

@@ -1,28 +1,32 @@
 from tkinter import *
+from tkinter import ttk
 
 
-class ScreenBlockerFrame(Frame):
-    def __init__(self, master, controller, time_options_manager, mobber_manager, countdown_manager, **kwargs):
+class ScreenBlockerFrame(ttk.Frame):
+    def __init__(self, master, controller, time_options_manager, mobber_manager, countdown_manager, settings_manager,
+                 **kwargs):
         super().__init__(master, **kwargs)
+
         self.master = master
         self.controller = controller
         self.countdown_manager = countdown_manager
         self.time_options_manager = time_options_manager
         self.mobber_manager = mobber_manager
+        self.settings_manager = settings_manager
         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)
 
-
-    def mobber_list_change_callback(self, mobber_list, driver_index, navigator_index ):
-        self.names_list.delete(0, END)
+    def mobber_list_change_callback(self, mobber_list, driver_index, navigator_index):
+        for i in self.names_list.get_children():
+            self.names_list.delete(i)
         for index in range(0, mobber_list.__len__()):
             name = mobber_list[index]
             if index == driver_index:
-                name += " <= Current Driver"
+                name += " <= Current"
             if index == navigator_index:
-                name += " <= Next Driver"
-            self.names_list.insert(END, name)
+                name += " <= Next"
+            self.names_list.insert('', END, text=name)
 
     def time_change_callback(self, time, minutes, seconds):
         self.label_minutes['text'] = "{0:0>2}".format(minutes)
@@ -35,100 +39,113 @@ def toggle_geometry(self, event):
         self._geom = geom
 
     def build_window_content(self):
-        center_frame = self
+        center_frame = 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 = Label(center_frame, text="Mobbing Timer", font="Helvetica 40 bold italic")
-        title.grid(row=row_index, columnspan=3, padx=30, pady=30, sticky=N + W + E)
+        title = ttk.Label(center_frame, text="Mobbing Timer", font="Helvetica 40 bold italic")
+        title.grid(row=row_index, columnspan=5, padx=30, pady=50)
         row_index += 1
 
-        title = Label(center_frame, text="Left Click to Increase, Right Click to Decrease", font="Helvetica 16 bold")
-        title.grid(row=row_index, columnspan=3, padx=30, pady=0, sticky=N)
+        title = ttk.Label(center_frame, text="Left Click to Increase, Right Click to Decrease",
+                          font="Helvetica 16 bold")
+        title.grid(row=row_index, columnspan=5, padx=30, pady=0)
         row_index += 1
 
-        self.label_minutes = Label(center_frame, text="10", font="Helvetica 180 bold")
-        self.label_minutes.grid(row=row_index, column=0, sticky=E)
+
+
+        self.label_minutes = ttk.Label(center_frame, text="10", font="Helvetica 180 bold")
+        self.label_minutes.grid(row=row_index, column=1, sticky=E)
         self.label_minutes.bind("<Button-1>", lambda event: self.time_options_manager.increment_minutes())
         self.label_minutes.bind("<Button-3>", lambda event: self.time_options_manager.decrement_minutes())
 
-        label_colon = Label(center_frame, text=":", font="Helvetica 180 bold")
-        label_colon.grid(row=row_index, column=1, sticky=N)
+        label_colon = ttk.Label(center_frame, text=":", font="Helvetica 180 bold")
+        label_colon.grid(row=row_index, column=2, sticky=N)
 
-        self.label_seconds = Label(center_frame, text="30", font="Helvetica 180 bold")
-        self.label_seconds.grid(row=row_index, column=2, sticky=W)
+        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())
         row_index += 1
 
-        self.add_mobber_entry = Entry(center_frame, text="Add Mobber", font="Helvetica 16 bold")
-        self.add_mobber_entry.grid(row=row_index, columnspan=2, sticky=N + E + W, padx=10, pady=10)
+        self.add_mobber_entry = ttk.Entry(center_frame, text="Add Mobber", font="Helvetica 16 bold")
+        self.add_mobber_entry.grid(row=row_index, column = 1, columnspan=2, sticky=N + E + W, padx=10, pady=10)
         self.add_mobber_entry.bind("<Return>", self.add_mobber_left_click)
+        self.add_mobber_entry.bind("<Control-Return>", self.launch_transparent_countdown)
 
-        add_mobber_button = Button(center_frame, text="Add Mobber")
-        add_mobber_button.grid(row=row_index, column=2, sticky=N + E + W, padx=10, pady=10)
+        add_mobber_button = ttk.Button(center_frame, text="Add Mobber")
+        add_mobber_button.grid(row=row_index, column=3, sticky=N + E + W, padx=10, pady=10)
         add_mobber_button.bind("<Button-1>", self.add_mobber_left_click)
         row_index += 1
 
-        self.names_list = Listbox(center_frame, font="Helvetica 16 bold")
-        self.names_list.grid(row=row_index, rowspan=6, columnspan=2, column=0, padx=10, pady=10, sticky=N + E + W)
+        self.names_list = ttk.Treeview(center_frame)
+        self.names_list.grid(row=row_index, rowspan=6, columnspan=2, column=1, padx=10, pady=10, sticky=N + E + W)
 
-        remove_mobber_button = Button(center_frame, text="Remove Mobber")
-        remove_mobber_button.grid(row=row_index, column=2, sticky=N + E + W, padx=10, pady=10)
+        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=10)
         remove_mobber_button.bind("<Button-1>", lambda event: self.mobber_manager.remove_mobber(
-            int(self.names_list.curselection()[0])))
+            int(self.names_list.index(self.names_list.selection()))))
         row_index += 1
 
-        move_mobber_up_button = Button(center_frame, text="Move Mobber Up")
-        move_mobber_up_button.grid(row=row_index, column=2, sticky=N + E + W, padx=10, pady=10)
+        move_mobber_up_button = ttk.Button(center_frame, text="Move Mobber Up")
+        move_mobber_up_button.grid(row=row_index, column=3, sticky=N + E + W, padx=10, pady=10)
         move_mobber_up_button.bind("<Button-1>", self.move_mobber_up_left_click)
         row_index += 1
 
-        move_mobber_down_button = Button(center_frame, text="Move Mobber Down")
-        move_mobber_down_button.grid(row=row_index, column=2, sticky=N + E + W, padx=10, pady=10)
+        move_mobber_down_button = ttk.Button(center_frame, text="Move Mobber Down")
+        move_mobber_down_button.grid(row=row_index, column=3, sticky=N + E + W, padx=10, pady=10)
         move_mobber_down_button.bind("<Button-1>", self.move_mobber_down_left_click)
         row_index += 1
 
-        clear_mobbers_button = Button(center_frame, text="Clear Mobbers")
-        clear_mobbers_button.grid(row=row_index, column=2, sticky=N + E + W, padx=10, pady=10)
+        clear_mobbers_button = ttk.Button(center_frame, text="Clear Mobbers")
+        clear_mobbers_button.grid(row=row_index, column=3, sticky=N + E + W, padx=10, pady=10)
         clear_mobbers_button.bind("<Button-1>", lambda event: self.mobber_manager.clear())
         row_index += 1
 
-        clear_mobbers_button = Button(center_frame, text="Skip Driver")
-        clear_mobbers_button.grid(row=row_index, column=2, sticky=N + E + W, padx=10, pady=10)
+        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=10)
         clear_mobbers_button.bind("<Button-1>", lambda event: self.mobber_manager.switch_navigator_driver())
         row_index += 1
 
-        clear_mobbers_button = Button(center_frame, text="Rewind Driver")
-        clear_mobbers_button.grid(row=row_index, column=2, sticky=N + E + W, padx=10, pady=10)
+        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=10)
         clear_mobbers_button.bind("<Button-1>", lambda event: self.mobber_manager.rewind_driver())
         row_index += 1
 
-        start_button = Button(center_frame, text="Start Mobbing!", font="Helvetica 30 bold")
-        start_button.grid(row=row_index, columnspan=3, sticky=N + E + W, padx=10, pady=10)
+        start_button = ttk.Button(center_frame, text="Start Mobbing!")
+        start_button.grid(row=row_index, column=1,columnspan=3, sticky=N + E + W, padx=10, pady=10)
         start_button.bind("<Button-1>", self.launch_transparent_countdown)
         row_index += 1
 
-        start_button = Button(center_frame, text="Quit Mobbing!", font="Helvetica 10 bold")
-        start_button.grid(row=row_index, columnspan=3, sticky=N + E + W, padx=50, pady=10)
+        start_button = ttk.Button(center_frame, text="Quit Mobbing!")
+        start_button.grid(row=row_index, column=1, columnspan=3, sticky=N + E + W, padx=50, pady=10)
         start_button.bind("<Button-1>", lambda event: self.controller.quit_and_destroy_session())
         row_index += 1
 
         center_frame.grid(row=0, column=0, sticky="nsew")
 
     def launch_transparent_countdown(self, event):
-        self.countdown_manager.set_countdown_duration(self.time_options_manager.minutes, self.time_options_manager.seconds)
+        self.countdown_manager.set_countdown_duration(self.time_options_manager.minutes,
+                                                      self.time_options_manager.seconds)
         self.controller.show_transparent_countdown_frame()
 
     def move_mobber_down_left_click(self, event):
-        selected_index = int(self.names_list.curselection()[0])
+        selected_items = self.names_list.selection()
+        selected_index = int(int(self.names_list.index(selected_items)))
         self.mobber_manager.move_mobber_down(selected_index)
-        self.names_list.select_set((selected_index + 1) % self.mobber_manager.mobber_count())
+        self.names_list.selection_set(
+            self.names_list.get_children()[(selected_index + 1) % self.mobber_manager.mobber_count()])
 
     def move_mobber_up_left_click(self, event):
-        selected_index = int(self.names_list.curselection()[0])
+        selected_index = int(int(self.names_list.index(self.names_list.selection())))
         self.mobber_manager.move_mobber_up(selected_index)
         count = self.mobber_manager.mobber_count()
-        self.names_list.select_set((count + selected_index - 1) % count)
+        self.names_list.selection_set(self.names_list.get_children()[((count + selected_index - 1) % count)])
 
     def add_mobber_left_click(self, event):
         self.mobber_manager.add_mobber(self.add_mobber_entry.get())

Frames/TransparentCountdownFrame.py

@@ -1,20 +1,24 @@
 from tkinter import *
+from tkinter import ttk
 
+from Infrastructure.SettingsManager import SettingsManager
 
-class TransparentCountdownFrame(Frame):
-    def __init__(self, master, controller, time_options_manager, mobber_manager, countdown_manager, **kwargs):
+
+class TransparentCountdownFrame(ttk.Frame):
+    def __init__(self, master, controller, time_options_manager, mobber_manager, countdown_manager, settings_manager,
+                 **kwargs):
         super().__init__(master, **kwargs)
         self.master = master
         self.controller = controller
-        self.create_frame_content()
         self.mobber_manager = mobber_manager
+        self.settings_manager = settings_manager  # type: SettingsManager
+
+        self.create_frame_content()
         self.mobber_manager.subscribe_to_mobber_list_change(self.mobber_list_change_callback)
         countdown_manager.subscribe_to_time_changes(self.update_time_change_callback)
 
-
-
     def update_time_change_callback(self, days, minutes, seconds):
-        if days< 0 or minutes < 0 or seconds < 0:
+        if days < 0 or minutes < 0 or seconds < 0:
             self.controller.show_screen_blocker_frame()
         self.label_minutes['text'] = "{0:0>2}".format(minutes)
         self.label_seconds['text'] = "{0:0>2}".format(seconds)
@@ -32,22 +36,27 @@ def mobber_list_change_callback(self, mobber_list, driver_index, navigator_index
 
     def create_frame_content(self):
         row_index = 0
-        self.label_minutes = Label(self, text="10", font="Helvetica 120 bold")
-        self.label_minutes.grid(row=row_index, column=0, sticky=E)
-        label_colon = Label(self, text=":", font="Helvetica 120 bold")
+        count_down_timer_font = "Helvetica {} bold".format(self.settings_manager.get_transparent_window_count_down_timer_font_size())
+        self.label_minutes = ttk.Label(self, text="10", font=count_down_timer_font)
+        self.label_minutes.grid(row=row_index, column=0, sticky=(N, E))
+        label_colon = ttk.Label(self, text=":", font=count_down_timer_font)
         label_colon.grid(row=row_index, column=1, sticky=N)
-        self.label_seconds = Label(self, text="30", font="Helvetica 120 bold")
-        self.label_seconds.grid(row=row_index, column=2, sticky=W)
+        self.label_seconds = ttk.Label(self, text="30", font=count_down_timer_font)
+        self.label_seconds.grid(row=row_index, column=2, sticky=(N,W))
+
         row_index += 1
-        self.label_driver = Label(self, text=self.get_driver_text(""), font="Helvetica 20 bold")
-        self.label_driver.grid(row=row_index, columnspan=3, sticky=E)
+        next_driver_font = "Helvetica {} bold".format(self.settings_manager.get_transparent_window_next_driver_font_size())
+        self.label_navigator = ttk.Label(self, text=self.get_navigator_text(""), font=next_driver_font)
+        self.label_navigator.grid(row=row_index, columnspan=3, sticky=(N,W))
+
         row_index += 1
-        self.label_navigator = Label(self, text=self.get_navigator_text(""), font="Helvetica 20 bold")
-        self.label_navigator.grid(row=row_index, columnspan=3, sticky=E)
+        driver_font = "Helvetica {} bold".format(self.settings_manager.get_transparent_window_driver_font_size())
+        self.label_driver = ttk.Label(self, text=self.get_driver_text(""), font=driver_font)
+        self.label_driver.grid(row=row_index, columnspan=3, sticky=(N,W))
         row_index += 1
 
-    def get_navigator_text(self,name ):
-        return "Next Driver: " + name
+    def get_navigator_text(self, name):
+        return "Next: " + name
 
     def get_driver_text(self, name):
-        return "Current Driver: " + name
+        return "Current: " + name