Extend time now supports seconds and defaults to 0 minutes 30 seconds

Author: DeadlyApps

Frames/MinimalScreenBlockerFrame.py

@@ -87,10 +87,12 @@ def build_window_content(self):
 
         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()
+            seconds = self.settings_manager.get_timer_extension_seconds()
             self.extend_time_button = ttk.Button(center_frame, text=self.get_extend_time_button_text())
             self.extend_time_button.grid(row=row_index, column=1, columnspan=4, sticky=N + E + W, padx=90, pady=10)
             self.showing_extend_time_button = True
-            self.extend_time_button.bind("<Button-1>", lambda event: self.controller.rewind_and_extend(minutes))
+            self.extend_time_button.bind("<Button-1>",
+                                         lambda event: self.controller.rewind_and_extend(minutes, seconds))
             row_index += 1
 
         setup_button = ttk.Button(center_frame, text="Mob Setup & Time")
@@ -105,7 +107,8 @@ def build_window_content(self):
 
     def get_extend_time_button_text(self):
         minutes = self.settings_manager.get_timer_extension_minutes()
-        return "Extend Time By {} Minutes ({})".format(minutes,
+        seconds = self.settings_manager.get_timer_extension_seconds()
+        return "Extend Time By {:0>2}:{:0>2} ({})".format(minutes, seconds,
                                                        self.controller.timer_extension_count - self.controller.extensions_used)
 
     def mobber_list_change_callback(self, mobber_list, driver_index, navigator_index):

Frames/MobTimerController.py

@@ -128,16 +128,16 @@ def launch_blocking_Frame(self, frame):
         if self.show_frame(frame):
             self.set_full_screen_always_on_top()
 
-    def show_transparent_countdown_frame(self, extend_amount=None):
+    def show_transparent_countdown_frame(self, extend_minutes=None, extend_seconds=None):
         if self.show_frame(TransparentCountdownFrame):
-            if extend_amount is None:
+            if extend_minutes is None and extend_seconds is None:
                 self.extensions_used = 0
                 self.countdown_manager.set_countdown_duration(self.time_options_manager.minutes,
                                                               self.time_options_manager.seconds)
                 for minimal_frame in self.frames[MinimalScreenBlockerFrame]:
                     minimal_frame.show_extend_time_button()
             else:
-                self.countdown_manager.set_countdown_duration(extend_amount, 0)
+                self.countdown_manager.set_countdown_duration(extend_minutes, extend_seconds)
             self.set_partial_screen_transparent()
 
     def get_current_window_geometry(self):
@@ -230,10 +230,10 @@ def toggle_transparent_frame_position(self, e=None):
                                                   screenheight - window_height)
         self.geometry(bottom_left_screen)
 
-    def rewind_and_extend(self,minutes):
+    def rewind_and_extend(self,minutes, seconds):
         self.extensions_used += 1
         self.mobber_manager.rewind_driver()
-        result = self.show_transparent_countdown_frame(minutes)
+        result = self.show_transparent_countdown_frame(minutes, seconds)
         for minimal_frame in self.frames[MinimalScreenBlockerFrame]:
             minimal_frame.show_extend_time_button()
         return result

Infrastructure/SettingsManager.py

@@ -75,7 +75,10 @@ def get_timer_extension_enabled(self):
         return self.timer_settings_.getboolean("extension enabled", False)
 
     def get_timer_extension_minutes(self):
-        return self.timer_settings_.getint("extension minutes", 2)
+        return self.timer_settings_.getint("extension minutes", 0)
+
+    def get_timer_extension_seconds(self):
+        return self.timer_settings_.getint("extension seconds", 30)
 
     def get_timer_extension_count(self):
         return self.timer_settings_.getint("extension count", 2)

MobTimer.cfg

@@ -27,6 +27,7 @@ auto theme logo = False
 [TIMER SETTINGS]
 minutes = 5
 seconds = 0
-extension enabled = True
+extension enabled = False
 extension minutes = 0
-extension count = 2
+extension seconds = 30
+extension count = 1