Skip to content

Commit 03d9463

Browse files
committed
Driver and Navigator Specified
1 parent 2d1184f commit 03d9463

File tree

3 files changed

+34
-13
lines changed

3 files changed

+34
-13
lines changed

.idea/MobTimer.iml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forms/ScreenBlockerMenu.py

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ def __init__(self, master, time_options_manager, mobber_manager, **kwargs):
1818

1919
def mobber_list_change_callback(self, mobber_list):
2020
self.names_list.delete(0, END)
21-
for name in mobber_list:
21+
for index in range(0, mobber_list.__len__()):
22+
name = mobber_list[index]
23+
if index == 0:
24+
name += " <= Driver"
25+
if index == 1:
26+
name += " <= Navigator"
2227
self.names_list.insert(END, name)
2328

2429
def time_change_callback(self, time, minutes, seconds):
@@ -77,23 +82,24 @@ def build_window_content(self, master):
7782
self.label_seconds.bind("<Button-3>", lambda event: self.time_options_manager.decrement_seconds())
7883
row_index += 1
7984

80-
label_up_next = Label(center_frame, text="Mobber Sit At the Keyboard", font="Helvetica 50 bold")
81-
label_up_next.grid(row=row_index, columnspan=3, padx=30, pady=0, sticky=N)
85+
self.label_current_mobber = Label(center_frame, text="Mobber Sit At the Keyboard", font="Helvetica 50 bold")
86+
self.label_current_mobber.grid(row=row_index, columnspan=3, padx=30, pady=0, sticky=N)
8287
row_index += 1
8388

84-
label_up_next = Label(center_frame, text="Next Mobber get ready!", font="Helvetica 16 bold")
85-
label_up_next.grid(row=row_index, columnspan=3, padx=30, pady=0, sticky=N)
89+
self.label_next_mobber = Label(center_frame, text="Next Mobber get ready!", font="Helvetica 16 bold")
90+
self.label_next_mobber.grid(row=row_index, columnspan=3, padx=30, pady=0, sticky=N)
8691
row_index += 1
8792

88-
add_mobber_entry = Entry(center_frame, text="Add Mobber")
89-
add_mobber_entry.grid(row=row_index, columnspan=2, sticky=N + E + W, padx=10, pady=10)
93+
self.add_mobber_entry = Entry(center_frame, text="Add Mobber",font="Helvetica 16 bold")
94+
self.add_mobber_entry.grid(row=row_index, columnspan=2, sticky=N + E + W, padx=10, pady=10)
95+
self.add_mobber_entry.bind("<Return>", self.add_mobber_left_click)
9096

9197
add_mobber_button = Button(center_frame, text="Add Mobber")
9298
add_mobber_button.grid(row=row_index, column=2, sticky=N + E + W, padx=10, pady=10)
93-
add_mobber_button.bind("<Button-1>", lambda event: self.mobber_manager.add_mobber(add_mobber_entry.get()))
99+
add_mobber_button.bind("<Button-1>", self.add_mobber_left_click)
94100
row_index += 1
95101

96-
self.names_list = Listbox(center_frame)
102+
self.names_list = Listbox(center_frame, font="Helvetica 16 bold")
97103
self.names_list.grid(row=row_index, rowspan=4, columnspan=2, column=0, padx=10, pady=10, sticky=N + E + W)
98104

99105
remove_mobber_button = Button(center_frame, text="Remove Mobber")
@@ -103,12 +109,12 @@ def build_window_content(self, master):
103109

104110
move_mobber_up_button = Button(center_frame, text="Move Mobber Up")
105111
move_mobber_up_button.grid(row=row_index, column=2, sticky=N + E + W, padx=10, pady=10)
106-
move_mobber_up_button.bind("<Button-1>", lambda event: self.mobber_manager.move_mobber_up(int(self.names_list.curselection()[0])))
112+
move_mobber_up_button.bind("<Button-1>", self.move_mobber_up_left_click)
107113
row_index += 1
108114

109115
move_mobber_down_button = Button(center_frame, text="Move Mobber Down")
110116
move_mobber_down_button.grid(row=row_index, column=2, sticky=N + E + W, padx=10, pady=10)
111-
move_mobber_down_button.bind("<Button-1>", lambda event: self.mobber_manager.move_mobber_down(int(self.names_list.curselection()[0])))
117+
move_mobber_down_button.bind("<Button-1>", self.move_mobber_down_left_click)
112118
row_index += 1
113119

114120
clear_mobbers_button = Button(center_frame, text="Clear Mobbers")
@@ -121,3 +127,18 @@ def build_window_content(self, master):
121127
row_index += 1
122128

123129
center_frame.pack(anchor=CENTER, pady=60)
130+
131+
def move_mobber_down_left_click(self,event):
132+
selected_index = int(self.names_list.curselection()[0])
133+
self.mobber_manager.move_mobber_down(selected_index)
134+
self.names_list.select_set((selected_index + 1)% self.mobber_manager.mobber_count())
135+
136+
def move_mobber_up_left_click(self,event):
137+
selected_index = int(self.names_list.curselection()[0])
138+
self.mobber_manager.move_mobber_up(selected_index)
139+
count = self.mobber_manager.mobber_count()
140+
self.names_list.select_set((count + selected_index - 1) % count)
141+
142+
def add_mobber_left_click(self, event):
143+
self.mobber_manager.add_mobber(self.add_mobber_entry.get())
144+
self.add_mobber_entry.delete(0,END)

0 commit comments

Comments
 (0)