v0.3.0 Resolve #8

Author: cup113

src/class_form.py

@@ -106,13 +106,23 @@ def handle_event(self, event: Message) -> None:
                     lesson.delay,
                     next_lesson.prepare - lesson.finish
                 )
+            self.main_window.class_advance_label['text'] = "下课"
         elif event[0] == MessageEnum.ClassAdvance:
-            self.set_windows_topmost(False)
-            self.state.lesson_state = LessonState.AtClass
-            if self.state.current_lesson > 0:
-                self.main_window.class_labels[
-                    self.state.current_lesson - 1]['fg'] = self.state.color_theme.fg
-            self.main_window.class_labels[self.state.current_lesson]['fg'] = self.state.color_theme.hint
+            if event[1] == 'on':
+                self.set_windows_topmost(False)
+                self.state.lesson_state = LessonState.AtClass
+                if self.state.current_lesson > 0:
+                    self.main_window.class_labels[
+                        self.state.current_lesson - 1]['fg'] = self.state.color_theme.fg
+                self.main_window.class_labels[self.state.current_lesson]['fg'] = self.state.color_theme.hint
+                self.main_window.class_advance_label['text'] = "下课"
+            else:
+                self.state.current_lesson += 1
+                if self.state.current_lesson < len(self.state.lessons):
+                    self.state.lesson_state = LessonState.Break
+                else:
+                    self.state.lesson_state = LessonState.AfterSchool
+                self.main_window.class_advance_label['text'] = "上课"
 
         else:
             assert False, event  # unreachable
@@ -126,8 +136,10 @@ def handle_poll(self, event: PollResult, update: bool) -> bool:
             return True
         elif event[0] == PollEnum.ClassBegin:
             self.set_windows_topmost(False)
+            self.main_window.class_advance_label['text'] = "下课"
         elif event[0] == PollEnum.ClassFinish:
             self.set_windows_topmost(True)
+            self.main_window.class_advance_label['text'] = "上课"
         elif event[0] == PollEnum.ClassPrepare:
             if update:
                 self.main_window.bell()
@@ -171,11 +183,12 @@ def poll_update(self):
                 self.format_minutes(last, min(MIN_POINT, total / 2)), total
             )
             current_lesson = self.state.current_lesson
+            pass_ratio = max(min(last / total, 1), 0)
             if current_lesson > 0:
                 self.main_window.class_labels[current_lesson]['fg'] = self.state.color_theme.gradient(
-                    last / total / 2)
+                    pass_ratio / 2)
             self.main_window.class_labels[
-                current_lesson - 1]['fg'] = self.state.color_theme.gradient(1 - last / total / 2)
+                current_lesson - 1]['fg'] = self.state.color_theme.gradient(1 - pass_ratio / 2)
         elif self.state.lesson_state == LessonState.BeforeSchool:
             first_lesson = self.state.i_lesson(0)
             text = "{}".format(self.format_minutes(self.minute(

src/states.py

@@ -28,7 +28,7 @@ class MessageEnum(Enum):
 
 Message = Union[
     tuple[Literal[MessageEnum.ShutDown]],
-    tuple[Literal[MessageEnum.ClassAdvance]],
+    tuple[Literal[MessageEnum.ClassAdvance], Union[Literal['on'], Literal['off']]],
     tuple[Literal[MessageEnum.HideTemporarily]],
     tuple[Literal[MessageEnum.Resize], int]
 ]

src/windows.py

@@ -128,6 +128,7 @@ def __init__(self, state: State) -> None:
         self.weekday_label = ClickableLabel(
             self, "", self.st.font, self.change_weekday, state)
         self.class_labels: list[Label] = []
+        self.class_advance_label: Label = Label(self)
 
     def load(self):
         """(Re)Load the window. Generate and place labels and buttons on the window."""
@@ -179,6 +180,8 @@ def place(w: Widget):
             text, func, color = btn
             button = ClickableLabel(self, text, small_font, func, self.st)
             button['fg'] = color
+            if text == "上课":
+                self.class_advance_label = button
             if i % 2 == 0:
                 button.place(x=x, y=padding_y)
             else:
@@ -218,7 +221,12 @@ def class_advance(self, _: Any) -> None:
             name = self.st.i_lesson(current_lesson).name
             hint = f"此操作将会提前进入下一节课: {name}。确定吗？"
             if messagebox.askokcancel("操作确认", hint):  # type: ignore
-                self.st.queue.put((MessageEnum.ClassAdvance, ))
+                self.st.queue.put((MessageEnum.ClassAdvance, 'on'))
+        elif lesson_state in [LessonState.AtClass]:
+            name = self.st.i_lesson(current_lesson).name
+            hint = f"此操作会提前下课 (本节为 {name})。确定吗？"
+            if messagebox.askokcancel("操作确认", hint): # type: ignore
+                self.st.queue.put((MessageEnum.ClassAdvance, 'off'))
         else:
             messagebox.showinfo("提示", HINT)  # type: ignore