33
44
55class ScreenBlockerFrame (ttk .Frame ):
6- def __init__ (self , master , controller , time_options_manager , mobber_manager , countdown_manager , settings_manager ,
6+ def __init__ (self , master , controller , time_options_manager , mobber_manager , countdown_manager , settings_manager ,tips_manager ,
77 ** kwargs ):
88 super ().__init__ (master , ** kwargs )
99
@@ -18,6 +18,7 @@ def __init__(self, master, controller, time_options_manager, mobber_manager, cou
1818 self .mobber_manager .subscribe_to_mobber_list_change (self .mobber_list_change_callback )
1919
2020 def mobber_list_change_callback (self , mobber_list , driver_index , navigator_index ):
21+ self .current_dev ['text' ] = ""
2122 for i in self .names_list .get_children ():
2223 self .names_list .delete (i )
2324 for index in range (0 , mobber_list .__len__ ()):
@@ -58,8 +59,6 @@ def build_window_content(self):
5859 title .grid (row = row_index , columnspan = 5 , padx = 30 , pady = 0 )
5960 row_index += 1
6061
61-
62-
6362 self .label_minutes = ttk .Label (center_frame , text = "10" , font = "Helvetica 180 bold" )
6463 self .label_minutes .grid (row = row_index , column = 1 , sticky = E )
6564 self .label_minutes .bind ("<Button-1>" , lambda event : self .time_options_manager .increment_minutes ())
@@ -78,10 +77,12 @@ def build_window_content(self):
7877 self .current_dev .grid (row = row_index , columnspan = 5 )
7978 row_index += 1
8079
81- self .add_mobber_entry = ttk .Entry (center_frame , style = "EntryStyle.TEntry" , text = "Add Mobber" , font = "Helvetica 16 bold" )
82- self .add_mobber_entry .grid (row = row_index , column = 1 , columnspan = 2 , sticky = N + E + W , padx = 10 , pady = 10 )
80+ self .add_mobber_entry = ttk .Entry (center_frame , style = "EntryStyle.TEntry" , text = "Add Mobber" ,
81+ font = "Helvetica 16 bold" )
82+ self .add_mobber_entry .grid (row = row_index , column = 1 , columnspan = 2 , sticky = N + E + W , padx = 10 , pady = 10 )
8383 self .add_mobber_entry .bind ("<Return>" , self .add_mobber_left_click )
84- self .add_mobber_entry .bind ("<Control-Return>" , self .launch_transparent_countdown )
84+ self .add_mobber_entry .bind ("<Control-Return>" , lambda event : self .controller .show_transparent_countdown_frame ()
85+ )
8586
8687 add_mobber_button = ttk .Button (center_frame , text = "Add Mobber" )
8788 add_mobber_button .grid (row = row_index , column = 3 , sticky = N + E + W , padx = 10 , pady = 10 )
@@ -123,9 +124,9 @@ def build_window_content(self):
123124 clear_mobbers_button .bind ("<Button-1>" , lambda event : self .mobber_manager .rewind_driver ())
124125 row_index += 1
125126
126- start_button = ttk .Button (center_frame , text = "Start Mobbing!" , style = "StartButton.TButton" ,)
127- start_button .grid (row = row_index , column = 1 ,columnspan = 3 , sticky = N + E + W , padx = 10 , pady = 10 )
128- start_button .bind ("<Button-1>" , self .launch_transparent_countdown )
127+ start_button = ttk .Button (center_frame , text = "Start Mobbing!" , style = "StartButton.TButton" , )
128+ start_button .grid (row = row_index , column = 1 , columnspan = 3 , sticky = N + E + W , padx = 10 , pady = 10 )
129+ start_button .bind ("<Button-1>" , lambda event : self .controller . show_transparent_countdown_frame () )
129130 row_index += 1
130131
131132 start_button = ttk .Button (center_frame , text = "Quit Mobbing!" )
@@ -135,12 +136,10 @@ def build_window_content(self):
135136
136137 center_frame .grid (row = 0 , column = 0 , sticky = "nsew" )
137138
138- self .add_mobber_entry . focus_set ()
139+ self .focus_mobber_entry ()
139140
140- def launch_transparent_countdown (self , event ):
141- self .countdown_manager .set_countdown_duration (self .time_options_manager .minutes ,
142- self .time_options_manager .seconds )
143- self .controller .show_transparent_countdown_frame ()
141+ def focus_mobber_entry (self ):
142+ self .add_mobber_entry .focus_set ()
144143
145144 def move_mobber_down_left_click (self , event ):
146145 selected_items = self .names_list .selection ()
0 commit comments