Fixed Spacing Issues on screen blocker and added mouse wheel time set

DeadlyApps · DeadlyApps · commit 3083175124db · 2016-01-05T22:46:07.000-08:00
diff --git a/Frames/MinimalScreenBlockerFrame.py b/Frames/MinimalScreenBlockerFrame.py
@@ -3,7 +3,7 @@
 
 class MinimalScreenBlockerFrame(ttk.Frame):
     def __init__(self, master, controller, time_options_manager, mobber_manager, countdown_manager, settings_manager,
-                 tips_manager,
+                 tips_manager,theme_manager,
                  **kwargs):
         super().__init__(master, **kwargs)
 
@@ -41,14 +41,15 @@ def build_window_content(self):
         self.next_mobber_label.grid(row=row_index, columnspan=5, padx=30, pady=10)
         row_index += 1
 
-        start_button = ttk.Button(center_frame, text="Start Mobbing!", style="StartButton.TButton", )
+        start_button = ttk.Button(center_frame, text="Continue Mobbing!", style="StartButton.TButton", )
         start_button.grid(row=row_index, column=1, columnspan=3, sticky=N + E + W, padx=10, pady=10)
         start_button.bind("<Button-1>", lambda event: self.controller.show_transparent_countdown_frame())
         row_index += 1
 
-        self.tip_text = ttk.Label(center_frame, text="", font="Helvetica 15 bold", wraplength=500)
-        self.tip_text.grid(row=row_index, columnspan=3, padx=30, pady=10)
-        row_index += 1
+        if self.settings_manager.get_general_enable_tips():
+            self.tip_text = ttk.Label(center_frame, text="", font="Helvetica 15 bold", wraplength=500)
+            self.tip_text.grid(row=row_index, columnspan=3, padx=30, pady=10)
+            row_index += 1
 
         start_button = ttk.Button(center_frame, text="Mob Setup & Time")
         start_button.grid(row=row_index, column=2, columnspan=3, sticky=N + E + W, padx=90, pady=10)
@@ -69,4 +70,5 @@ def mobber_list_change_callback(self, mobber_list, driver_index, navigator_index
                 self.current_mobber_label['text'] = "{}, time to drive!".format(name)
             if index == navigator_index:
                 self.next_mobber_label['text'] = "{}, up next!".format(name)
-        self.tip_text['text'] = self.tips_manager.get_random_tip()
+        if self.settings_manager.get_general_enable_tips():
+            self.tip_text['text'] = self.tips_manager.get_random_tip()
diff --git a/Frames/MobTimerController.py b/Frames/MobTimerController.py
@@ -62,7 +62,7 @@ def __init__(self, *args, **kwargs):
             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.settings_manager, self.tips_manager)
+                                            self.countdown_manager, self.settings_manager, self.tips_manager, self.theme_manager)
                 self.frames[frame_type].append(frame_instance)
                 frame_instance.grid(row=0, column=0, sticky=(N, S, E, W))
                 frame_instance.grid_rowconfigure(0, weight=1)
diff --git a/Frames/ScreenBlockerFrame.py b/Frames/ScreenBlockerFrame.py
@@ -1,14 +1,18 @@
 from tkinter import *
 from tkinter import ttk
 
+TAGNAME_CURRENT_MOBBER = 'current_mobber'
+
 
 class ScreenBlockerFrame(ttk.Frame):
-    def __init__(self, master, controller, time_options_manager, mobber_manager, countdown_manager, settings_manager,tips_manager,
+    def __init__(self, master, controller, time_options_manager, mobber_manager, countdown_manager, settings_manager,
+                 tips_manager, theme_manager,
                  **kwargs):
         super().__init__(master, **kwargs)
 
         self.master = master
         self.controller = controller
+        self.theme_manager = theme_manager
         self.countdown_manager = countdown_manager
         self.time_options_manager = time_options_manager
         self.mobber_manager = mobber_manager
@@ -18,17 +22,18 @@ def __init__(self, master, controller, time_options_manager, mobber_manager, cou
         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.current_dev['text'] = ""
         for i in self.names_list.get_children():
             self.names_list.delete(i)
         for index in range(0, mobber_list.__len__()):
+            tags = ()
             name = mobber_list[index]
             if index == driver_index:
-                self.current_dev['text'] = "{} time to drive!".format(name)
+                tags = (TAGNAME_CURRENT_MOBBER)
                 name += " <= Current"
             if index == navigator_index:
                 name += " <= Next"
-            self.names_list.insert('', END, text=name)
+
+            self.names_list.insert('', END, text=name, tags=tags)
 
     def time_change_callback(self, time, minutes, seconds):
         self.label_minutes['text'] = "{0:0>2}".format(minutes)
@@ -40,6 +45,18 @@ def toggle_geometry(self, event):
         self.controller.geometry(self._geom)
         self._geom = geom
 
+    def mouse_wheel_minutes(self, event):
+        if event.delta > 0:
+            self.time_options_manager.increment_minutes()
+        else:
+            self.time_options_manager.decrement_minutes()
+
+    def mouse_wheel_seconds(self, event):
+        if event.delta > 0:
+            self.time_options_manager.increment_seconds()
+        else:
+            self.time_options_manager.decrement_seconds()
+
     def build_window_content(self):
         center_frame = ttk.Frame(self)
         center_frame.grid(row=0, column=0)
@@ -50,19 +67,20 @@ def build_window_content(self):
         center_frame.grid_columnconfigure(4, weight=1)
 
         row_index = 0
-        title = ttk.Label(center_frame, text="Mobbing Timer", font="Helvetica 40 bold italic")
-        title.grid(row=row_index, columnspan=5, padx=30, pady=50)
+        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
 
-        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)
+        title = ttk.Label(center_frame, text="Left Click to Increase, Right Click to Decrease, or mouse wheel",
+                          font="Helvetica 12 bold")
+        title.grid(row=row_index, columnspan=5, padx=30, pady=10)
         row_index += 1
 
         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())
+        self.label_minutes.bind("<MouseWheel>", self.mouse_wheel_minutes)
 
         label_colon = ttk.Label(center_frame, text=":", font="Helvetica 180 bold")
         label_colon.grid(row=row_index, column=2, sticky=N)
@@ -71,66 +89,66 @@ def build_window_content(self):
         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.current_dev = ttk.Label(center_frame, text="", font="Helvetica 70 bold italic")
-        self.current_dev.grid(row=row_index, columnspan=5)
+        self.label_seconds.bind("<MouseWheel>", self.mouse_wheel_seconds)
         row_index += 1
 
         self.add_mobber_entry = ttk.Entry(center_frame, style="EntryStyle.TEntry", 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.grid(row=row_index, column=1, columnspan=2, sticky=N + E + W, padx=10)
         self.add_mobber_entry.bind("<Return>", self.add_mobber_left_click)
-        self.add_mobber_entry.bind("<Control-Return>", lambda event: self.controller.show_transparent_countdown_frame()
-                                   )
+        self.add_mobber_entry.bind("<Control-Return>", lambda event: self.controller.show_transparent_countdown_frame())
+
+        button_pad = (15, 0)
 
         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.grid(row=row_index, column=3, sticky=N + E + W, padx=10, pady=0)
         add_mobber_button.bind("<Button-1>", self.add_mobber_left_click)
         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['show'] = 'tree'
-        self.names_list.grid(row=row_index, rowspan=6, columnspan=2, column=1, padx=10, pady=10, sticky=N + E + W + S)
+        self.names_list.grid(row=row_index, rowspan=6, columnspan=2, column=1, padx=10, pady=button_pad,
+                             sticky=N + E + W + S)
 
         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.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()))))
         row_index += 1
 
         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.grid(row=row_index, column=3, sticky=N + E + W, padx=10, pady=button_pad)
         move_mobber_up_button.bind("<Button-1>", self.move_mobber_up_left_click)
         row_index += 1
 
         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.grid(row=row_index, column=3, sticky=N + E + W, padx=10, pady=button_pad)
         move_mobber_down_button.bind("<Button-1>", self.move_mobber_down_left_click)
         row_index += 1
 
         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.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.clear())
         row_index += 1
 
         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.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())
         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=10)
+        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
 
         start_button = ttk.Button(center_frame, text="Start Mobbing!", style="StartButton.TButton", )
-        start_button.grid(row=row_index, column=1, columnspan=3, sticky=N + E + W, padx=10, pady=10)
+        start_button.grid(row=row_index, column=1, columnspan=3, sticky=N + E + W, padx=10, pady=button_pad)
         start_button.bind("<Button-1>", lambda event: self.controller.show_transparent_countdown_frame())
         row_index += 1
 
         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.grid(row=row_index, column=1, columnspan=3, sticky=N + E + W, padx=50, pady=button_pad)
         start_button.bind("<Button-1>", lambda event: self.controller.quit_and_destroy_session())
         row_index += 1
 
diff --git a/Frames/TransparentCountdownFrame.py b/Frames/TransparentCountdownFrame.py
@@ -6,7 +6,7 @@
 
 class TransparentCountdownFrame(ttk.Frame):
     def __init__(self, master, controller, time_options_manager, mobber_manager, countdown_manager, settings_manager,
-                 tips_manager,
+                 tips_manager,theme_manager,
                  **kwargs):
         super().__init__(master, **kwargs)
         self.master = master
diff --git a/Infrastructure/Sessions/d00fb052-b440-11e5-9824-20c9d042e8c0 b/Infrastructure/Sessions/d00fb052-b440-11e5-9824-20c9d042e8c0
diff --git a/Infrastructure/SettingsManager.py b/Infrastructure/SettingsManager.py
@@ -35,4 +35,7 @@ def get_general_minutes(self):
         return self.timer_settings_.getint("minutes", 10)
 
     def get_general_seconds(self):
-        return self.timer_settings_.getint("seconds", 0)
+        return self.timer_settings_.getint("seconds", 0)
+
+    def get_general_enable_tips(self):
+        return self.general_settings_.getboolean("enable tips", True)
diff --git a/Infrastructure/ThemeManager.py b/Infrastructure/ThemeManager.py
@@ -5,38 +5,45 @@
 class ThemeManager(object):
     THEME_SETTINGS = 'THEME SETTINGS'
 
+    def __init__(self):
+        self.background_color = "white"
+        self.button_color = "white"
+        self.text_color = "white"
+        self.highlight_color = "white"
+
     def set_theme(self, theme_name):
         cfg_file = "Themes/{}.cfg".format(theme_name)
         config = configparser.ConfigParser()
         config.read(cfg_file)
         theme_settings_ = config[ThemeManager.THEME_SETTINGS]
-        background_color = theme_settings_.get('background_color')
-        button_color = theme_settings_.get('button_color')
-        text_color = theme_settings_.get('text_color')
-        highlight_color = theme_settings_.get('highlight_color')
+        self.background_color = theme_settings_.get('background_color')
+        self.button_color = theme_settings_.get('button_color')
+        self.text_color = theme_settings_.get('text_color')
+        self.highlight_color = theme_settings_.get('highlight_color')
 
         style = ttk.Style()
         style.theme_use('default')
 
-        style.configure('TFrame', background=background_color)
+        style.configure('TFrame', background=self.background_color)
         style.configure('TButton',
-                        background=button_color,
-                        foreground=text_color)
+                        background=self.button_color,
+                        foreground=self.text_color)
         style.map('TButton',
-                  foreground=[('disabled', text_color),
-                              ('pressed', text_color),
-                              ('active', background_color)],
-                  background=[('disabled', button_color),
-                              ('pressed', '!focus', button_color),
-                              ('active', highlight_color)])
-
-        style.configure('TLabel', background=background_color, foreground=text_color)
-        style.configure('Highlight.TLabel', background=background_color, foreground=highlight_color)
-        style.configure("Treeview", background=background_color,
-                        foreground=text_color, fieldbackground=background_color, font="Helvetica 16 bold",  rowheight=30)
+                  foreground=[('disabled', self.text_color),
+                              ('pressed', self.text_color),
+                              ('active', self.background_color)],
+                  background=[('disabled', self.button_color),
+                              ('pressed', '!focus', self.button_color),
+                              ('active', self.highlight_color)])
+
+        style.configure('TLabel', background=self.background_color, foreground=self.text_color)
+        style.configure('Highlight.TLabel', background=self.background_color, foreground=self.highlight_color)
+        style.configure("Treeview", background=self.background_color,
+                        foreground=self.text_color, fieldbackground=self.background_color, font="Helvetica 16 bold",  rowheight=30
+                        )
         style.element_create("plain.field", "from", "clam")
         style.configure("StartButton.TButton",font="Helvetica 50 bold")
 
         style.configure("EntryStyle.TEntry",
-                        foreground=background_color,
-                        fieldbackground=highlight_color)
+                        foreground=self.background_color,
+                        fieldbackground=self.highlight_color)
diff --git a/MobTimer.cfg b/MobTimer.cfg
@@ -9,6 +9,7 @@ next driver font size = 15
 #Theme options either 'none' or a file form the Themes folder. e.g. 'Dark'
 [GENERAL SETTINGS]
 theme = Sky
+enable tips = True
 
 [TIMER SETTINGS]
 minutes = 5
