55
66
77class TransparentCountdownFrame (ttk .Frame ):
8- def __init__ (self , master , controller , time_options_manager , mobber_manager , countdown_manager , settings_manager ,tips_manager ,
8+ def __init__ (self , master , controller , time_options_manager , mobber_manager , countdown_manager , settings_manager ,
9+ tips_manager ,
910 ** kwargs ):
1011 super ().__init__ (master , ** kwargs )
1112 self .master = master
@@ -15,13 +16,13 @@ def __init__(self, master, controller, time_options_manager, mobber_manager, cou
1516
1617 self .create_frame_content ()
1718 self .mobber_manager .subscribe_to_mobber_list_change (self .mobber_list_change_callback )
18- countdown_manager .subscribe_to_time_changes (self .update_time_change_callback )
19+ self .countdown_manager = countdown_manager
20+ self .countdown_manager .subscribe_to_time_changes (self .update_time_change_callback )
1921
2022 def update_time_change_callback (self , days , minutes , seconds ):
21- if days < 0 or minutes < 0 or seconds < 0 :
23+ if ( days < 0 or minutes < 0 or seconds < 0 ) and not self . controller . frame_is_screen_blocking () :
2224 self .controller .show_minimal_screen_blocker_frame ()
23- self .label_minutes ['text' ] = "{0:0>2}" .format (minutes )
24- self .label_seconds ['text' ] = "{0:0>2}" .format (seconds )
25+ self .label_time ['text' ] = "{0:0>2}:{1:0>2}" .format (minutes , seconds )
2526
2627 def mobber_list_change_callback (self , mobber_list , driver_index , navigator_index ):
2728 mobber_count = mobber_list .__len__ ()
@@ -35,28 +36,34 @@ def mobber_list_change_callback(self, mobber_list, driver_index, navigator_index
3536 self .label_driver ['text' ] = self .get_driver_text ("" )
3637
3738 def create_frame_content (self ):
39+ self .grid_rowconfigure (0 , weight = 0 )
40+ self .grid_rowconfigure (1 , weight = 0 )
41+ self .grid_rowconfigure (2 , weight = 0 )
42+ self .grid_rowconfigure (4 , weight = 1 )
43+
3844 row_index = 0
39- count_down_timer_font = "Helvetica {} bold" .format (self .settings_manager .get_transparent_window_count_down_timer_font_size ())
40- self .label_minutes = ttk .Label (self , text = "10" , font = count_down_timer_font )
41- self .label_minutes .grid (row = row_index , column = 0 , sticky = (N , E ))
42- label_colon = ttk .Label (self , text = ":" , font = count_down_timer_font )
43- label_colon .grid (row = row_index , column = 1 , sticky = N )
44- self .label_seconds = ttk .Label (self , text = "30" , font = count_down_timer_font )
45- self .label_seconds .grid (row = row_index , column = 2 , sticky = (N ,W ))
45+ count_down_timer_font = "Helvetica {} bold" .format (
46+ self .settings_manager .get_transparent_window_count_down_timer_font_size ())
47+ self .label_time = ttk .Label (self , text = "10:00" , font = count_down_timer_font )
48+ # self.label_time.grid(row=row_index, sticky=(N))
49+ self .label_time .pack ()
4650
4751 row_index += 1
48- next_driver_font = "Helvetica {} bold" .format (self .settings_manager .get_transparent_window_next_driver_font_size ())
52+ next_driver_font = "Helvetica {} bold" .format (
53+ self .settings_manager .get_transparent_window_next_driver_font_size ())
4954 self .label_navigator = ttk .Label (self , text = self .get_navigator_text ("" ), font = next_driver_font )
50- self .label_navigator .grid (row = row_index , columnspan = 3 , sticky = (N ,W ))
55+ # self.label_navigator.grid(row=row_index, sticky=(N))
56+ self .label_navigator .pack ()
5157
5258 row_index += 1
5359 driver_font = "Helvetica {} bold" .format (self .settings_manager .get_transparent_window_driver_font_size ())
5460 self .label_driver = ttk .Label (self , text = self .get_driver_text ("" ), font = driver_font )
55- self .label_driver .grid (row = row_index , columnspan = 3 , sticky = (N ,W ))
61+ # self.label_driver.grid(row=row_index, sticky=(N))
62+ self .label_driver .pack ()
5663 row_index += 1
5764
5865 def get_navigator_text (self , name ):
5966 return "Next: " + name
6067
6168 def get_driver_text (self , name ):
62- return "Current : " + name
69+ return "Driver : " + name
0 commit comments