feat: 增加课程时间显示模式和灵活的预览触发器

- **功能: 当前课程时间显示模式**
  - 新增三种显示模式，用于正在进行的课程：
    - **默认模式**: 显示课程开始时间。
    - **结束时间模式**: 显示课程的结束时间。
    - **倒计时模式**: 实时显示距离课程结束的倒计时。
  - 在设置窗口中添加了相应的选项，允许用户自由切换。

- **功能: "明日课表预览"触发器**
  - 新增设置项，允许用户指定在第N节课结束后触发明日课表预览。
  - 当设置为0时，将保持原有逻辑，即在当天所有课程结束后触发。
  - 增强了应用的自动化和用户自定义能力。

- **优化: 更新确认对话框**
  - 使用一个全新的自定义对话框替代了标准的 `askyesno` 弹窗。
  - 新对话框会清晰地展示新版本的更新日志，帮助用户在更新前了解详细变更。

- **其他改进:**
  - 增加下载器线程数以提升更新速度。
  - 优化了课程时间解析的错误处理逻辑。

Author: dongkid

app.py

@@ -460,12 +460,12 @@ def _update_schedule_display(self, weekday_to_show: int) -> None:
             color = self._get_course_color(now, course)
             if i < len(self.course_labels):
                 # 强制更新标签颜色状态
-                self._update_existing_label(i, course, color, force_update=True)
+                self._update_existing_label(i, course, color, now, force_update=True)
                 # 调整grid行号
                 self.course_labels[i].master.grid(row=i)
             else:
                 # 创建新标签并指定grid行号
-                self._create_new_label(course, color, row=i)
+                self._create_new_label(course, color, now, row=i)
 
         # 移除多余的标签
         self._remove_extra_labels(schedule_for_day)
@@ -492,12 +492,19 @@ def _get_course_color(self, now: datetime, course: Dict[str, str]) -> str:
 
         # 从缓存获取或计算
         if cache_key not in self._course_time_cache:
-            self._course_time_cache[cache_key] = (
-                datetime.strptime(course["start_time"], "%H:%M").time(),
-                datetime.strptime(course["end_time"], "%H:%M").time()
-            )
+            try:
+                self._course_time_cache[cache_key] = (
+                    datetime.strptime(course["start_time"], "%H:%M").time(),
+                    datetime.strptime(course["end_time"], "%H:%M").time()
+                )
+            except (KeyError, ValueError):
+                # 如果时间格式错误或键不存在，缓存一个无效标志并返回红色
+                self._course_time_cache[cache_key] = (None, None)
+                return "red"
 
         start_time, end_time = self._course_time_cache[cache_key]
+        if not start_time: # 检查无效标志
+            return "red"
         current_time = now.time()
 
         if start_time <= current_time <= end_time:
@@ -506,10 +513,42 @@ def _get_course_color(self, now: datetime, course: Dict[str, str]) -> str:
             return "green"   # 已上完的课程为绿色
         return "red"     # 未上过的课程为红色
 
-    def _update_existing_label(self, index: int, course: Dict[str, str], color: str, force_update: bool = False) -> None:
+    def _get_course_display_text(self, course: Dict[str, str], color: str, now: datetime) -> str:
+        """根据课程状态和设置生成显示文本"""
+        mode = self.config_handler.current_course_time_display_mode
+        
+        # 仅当课程正在进行中 ("yellow") 且模式不是 "default" 时，才应用特殊显示
+        if color == "yellow" and mode != "default":
+            end_time_str = course.get("end_time", "00:00")
+
+            if mode == "end_time":
+                return f"{end_time_str} {course['name']}"
+            
+            if mode == "countdown":
+                try:
+                    end_time_obj = datetime.strptime(end_time_str, "%H:%M").time()
+                    end_datetime = now.replace(hour=end_time_obj.hour, minute=end_time_obj.minute, second=0, microsecond=0)
+                    
+                    # 如果结束时间在当前时间之前（例如，刚好过了一秒），则显示为0
+                    if end_datetime < now:
+                        remaining_seconds = 0
+                    else:
+                        remaining_seconds = (end_datetime - now).total_seconds()
+
+                    minutes = int(remaining_seconds // 60)
+                    seconds = int(remaining_seconds % 60)
+                    return f"{minutes:02d}:{seconds:02d} {course['name']}"
+                except (ValueError, KeyError):
+                    # 如果时间格式错误或键不存在，回退到默认显示
+                    return f"{course['start_time']} {course['name']}"
+
+        # 默认显示开始时间
+        return f"{course['start_time']} {course['name']}"
+
+    def _update_existing_label(self, index: int, course: Dict[str, str], color: str, now: datetime, force_update: bool = False) -> None:
         """更新现有课程标签"""
         label = self.course_labels[index]
-        new_text = f"{course['start_time']} {course['name']}"
+        new_text = self._get_course_display_text(course, color, now)
 
         # 始终更新文本和颜色状态
         label.config(text=new_text)
@@ -591,14 +630,14 @@ def _adjust_ui_layout(self) -> None:
         # 强制更新所有部件
         self.root.update_idletasks()
 
-    def _create_new_label(self, course: Dict[str, str], color: str, row: int) -> None:
+    def _create_new_label(self, course: Dict[str, str], color: str, now: datetime, row: int) -> None:
         """创建新课程标签"""
         course_frame = tk.Frame(self.schedule_frame)
         course_frame.grid(row=row, column=0, sticky="ew", pady=2)  # 使用指定的行号
 
         label = tk.Label(
             course_frame,
-            text=f"{course['start_time']} {course['name']}",
+            text=self._get_course_display_text(course, color, now),
             font=("微软雅黑", self.config_handler.schedule_size, "bold"),
             fg=self.config_handler.font_color,
             anchor='w'
@@ -848,30 +887,45 @@ def _check_and_show_tomorrow_preview(self, now: datetime):
         if self.week_preview_window and self.week_preview_window.winfo_exists():
             return
 
-        # 检查当天的所有课程是否都已结束
         today_weekday_str = str(now.weekday())
         current_schedule_name = self.schedule.get("current_schedule", "default")
         schedule_data = self.schedule.get("schedules", {}).get(current_schedule_name, {})
         courses_today = schedule_data.get(today_weekday_str, [])
 
         if not courses_today:
-            return # 今天没课，不触发
+            return  # 今天没课，不触发
 
+        trigger_count = self.config_handler.preview_tomorrow_trigger_count
+        
+        finished_courses_count = 0
         all_courses_finished = True
         last_course_end_time = None
+
         for course in courses_today:
             try:
                 end_time = datetime.strptime(course['end_time'], "%H:%M").time()
                 if last_course_end_time is None or end_time > last_course_end_time:
                     last_course_end_time = end_time
-                if now.time() <= end_time:
+                
+                if now.time() > end_time:
+                    finished_courses_count += 1
+                else:
                     all_courses_finished = False
-                    break
             except (ValueError, KeyError):
                 continue # 忽略格式错误的课程
 
-        # 如果所有课程都结束了，且当前时间在最后一节课结束后，则触发
-        if all_courses_finished and now.time() > last_course_end_time:
+        should_trigger = False
+        # 检查触发条件
+        if trigger_count > 0:
+            # 按第N节课触发
+            if finished_courses_count >= trigger_count:
+                should_trigger = True
+        else:
+            # 按全部课程结束后触发 (旧逻辑)
+            if all_courses_finished and last_course_end_time and now.time() > last_course_end_time:
+                should_trigger = True
+
+        if should_trigger:
             from tools.week_preview import WeekPreviewWindow
             self.week_preview_window = WeekPreviewWindow(self.root, self, day_offset=1)
             self.week_preview_window.show()

config_handler.py

@@ -27,21 +27,23 @@ def _set_default_attributes(self):
         self.font_color = "#000000"
         self.horizontal_padding = 10
         self.vertical_padding = 5
-        self.time_display_size = 16
-        self.countdown_size = 14
-        self.schedule_size = 12
-        self.transparent_background = False
+        self.time_display_size = 20
+        self.countdown_size = 18
+        self.schedule_size = 18
+        self.transparent_background = True
         self.fullscreen_subtitle = "祝考生考试顺利"
         self.debug_mode = False
         self.auto_update_check_enabled = False
         self.log_retention_days = 7
         self.check_prerelease = False
         self.auto_preview_tomorrow_enabled = False
+        self.preview_tomorrow_trigger_count = 0
         self.schedule_rotation_enabled = False
         self.rotation_schedule1 = ""
         self.rotation_schedule2 = ""
         self.rotation_start_date = datetime.now()
         self.last_weather_location = ""
+        self.current_course_time_display_mode = "default"
 
     def check_registry_auto_start(self):
         """检查注册表中是否存在开机自启动项"""
@@ -105,21 +107,23 @@ def _create_default_config_file(self):
             "font_color": "#000000",
             "horizontal_padding": 10,
             "vertical_padding": 5,
-            "time_display_size": 16,
-            "countdown_size": 14,
-            "schedule_size": 12,
-            "transparent_background": False,
+            "time_display_size": 20,
+            "countdown_size": 18,
+            "schedule_size": 18,
+            "transparent_background": True,
             "fullscreen_subtitle": "祝考生考试顺利",
             "debug_mode": False,
             "auto_update_check_enabled": False,
             "log_retention_days": 7,
             "check_prerelease": False,
             "auto_preview_tomorrow_enabled": False,
+            "preview_tomorrow_trigger_count": 0,
             "schedule_rotation_enabled": False,
             "rotation_schedule1": "",
             "rotation_schedule2": "",
             "rotation_start_date": datetime.now().strftime("%Y-%m-%d"),
-            "last_weather_location": ""
+            "last_weather_location": "",
+            "current_course_time_display_mode": "default"
         }
         self.config = {
             "config_version": CONFIG_VERSION,
@@ -189,11 +193,13 @@ def get_date(key, default_date_str):
         self.log_retention_days = get_int("log_retention_days", 7)
         self.check_prerelease = get_bool("check_prerelease", False)
         self.auto_preview_tomorrow_enabled = get_bool("auto_preview_tomorrow_enabled", False)
+        self.preview_tomorrow_trigger_count = get_int("preview_tomorrow_trigger_count", 0)
         self.schedule_rotation_enabled = get_bool("schedule_rotation_enabled", False)
         self.rotation_schedule1 = get_str("rotation_schedule1", "")
         self.rotation_schedule2 = get_str("rotation_schedule2", "")
         self.rotation_start_date = get_date("rotation_start_date", datetime.now().strftime("%Y-%m-%d"))
         self.last_weather_location = get_str("last_weather_location", "")
+        self.current_course_time_display_mode = get_str("current_course_time_display_mode", "default")
 
     def save_config(self):
         """将当前实例属性保存到文件中对应的配置方案下"""
@@ -240,11 +246,13 @@ def save_config(self):
             "log_retention_days": self.log_retention_days,
             "check_prerelease": self.check_prerelease,
             "auto_preview_tomorrow_enabled": self.auto_preview_tomorrow_enabled,
+            "preview_tomorrow_trigger_count": self.preview_tomorrow_trigger_count,
             "schedule_rotation_enabled": self.schedule_rotation_enabled,
             "rotation_schedule1": self.rotation_schedule1,
             "rotation_schedule2": self.rotation_schedule2,
             "rotation_start_date": self.rotation_start_date.strftime("%Y-%m-%d"),
-            "last_weather_location": self.last_weather_location
+            "last_weather_location": self.last_weather_location,
+            "current_course_time_display_mode": self.current_course_time_display_mode
         })
 
         # 更新到主配置字典中

constants.py

@@ -12,7 +12,7 @@
 # 程序信息
 APP_NAME = "桌面课程表 - Course Scheduler"
 AUTHOR = "dong"
-VERSION = "0.1.16-preview2"
+VERSION = "0.1.16-preview3"
 CONFIG_VERSION = "2"
 PROJECT_URL = "https://github.com/dongkid/course_scheduler"
 

settings.py

@@ -380,7 +380,46 @@ def _create_course_tab(self) -> None:
             preview_frame, text="结束后自动预览明天课表",
             variable=self.auto_preview_tomorrow_var,
             style="White.TCheckbutton")
-        self.auto_preview_tomorrow_check.grid(row=0, column=0, columnspan=2, padx=5, pady=5, sticky=tk.W)
+        self.auto_preview_tomorrow_check.grid(row=0, column=0, columnspan=4, padx=5, pady=5, sticky=tk.W)
+
+        # 第N节课后预览
+        ttk.Label(preview_frame, text="第N节课后预览 (0为全结束后):").grid(row=1, column=0, padx=5, pady=5, sticky=tk.W)
+        
+        self.preview_trigger_count_var = tk.StringVar(value=self.main_app.config_handler.preview_tomorrow_trigger_count)
+        self.preview_trigger_count_entry = ttk.Entry(preview_frame, width=5, textvariable=self.preview_trigger_count_var)
+        self.preview_trigger_count_entry.grid(row=1, column=1, padx=5, pady=5)
+
+        # 减按钮
+        ttk.Button(
+            preview_frame,
+            text="-",
+            style="PMSmall.TButton",
+            command=lambda: self.preview_trigger_count_var.set(max(0, int(self.preview_trigger_count_var.get() or 0) - 1))
+        ).grid(row=1, column=2, padx=(5,0), pady=5)
+        
+        # 加按钮
+        ttk.Button(
+            preview_frame,
+            text="+",
+            style="PMSmall.TButton",
+            command=lambda: self.preview_trigger_count_var.set(int(self.preview_trigger_count_var.get() or 0) + 1)
+        ).grid(row=1, column=3, padx=(0,5), pady=5)
+
+        # 当前课程时间显示设置
+        display_mode_frame = ttk.LabelFrame(course_frame, text="当前课程时间显示设置", style="TFrame")
+        display_mode_frame.pack(fill=tk.X, padx=10, pady=5)
+
+        self.course_time_display_mode_var = tk.StringVar(value=self.main_app.config_handler.current_course_time_display_mode)
+        
+        modes = [("默认", "default"), ("结束时间", "end_time"), ("倒计时", "countdown")]
+        for i, (text, mode) in enumerate(modes):
+            ttk.Radiobutton(
+                display_mode_frame,
+                text=text,
+                variable=self.course_time_display_mode_var,
+                value=mode,
+                style="White.TRadiobutton"
+            ).grid(row=0, column=i, padx=5, pady=5, sticky=tk.W)
 
         # 课表轮换设置
         rotation_frame = ttk.LabelFrame(course_frame, text="课表轮换设置", style="TFrame")
@@ -843,8 +882,24 @@ def apply_settings(self):
             self.main_app.config_handler.rotation_schedule1 = self.schedule1_var.get()
             self.main_app.config_handler.rotation_schedule2 = self.schedule2_var.get()
 
+            # 保存课表轮换设置
+            self.main_app.config_handler.schedule_rotation_enabled = self.rotation_var.get()
+            self.main_app.config_handler.rotation_schedule1 = self.schedule1_var.get()
+            self.main_app.config_handler.rotation_schedule2 = self.schedule2_var.get()
+
+            # 应用当前课程时间显示模式设置
+            self.main_app.config_handler.current_course_time_display_mode = self.course_time_display_mode_var.get()
+
             # 应用预览设置
             self.main_app.config_handler.auto_preview_tomorrow_enabled = self.auto_preview_tomorrow_var.get()
+            try:
+                trigger_count = int(self.preview_trigger_count_var.get())
+                if trigger_count < 0:
+                    raise ValueError
+                self.main_app.config_handler.preview_tomorrow_trigger_count = trigger_count
+            except ValueError:
+                messagebox.showerror("错误", "请输入有效的预览触发课程数（非负整数）", parent=self.window)
+                return
 
             # 应用日志保留天数设置
             try:
@@ -972,7 +1027,9 @@ def _load_config_into_ui(self):
         self.break_duration_entry.delete(0, tk.END)
         self.break_duration_entry.insert(0, str(handler.break_duration))
         self.auto_preview_tomorrow_var.set(handler.auto_preview_tomorrow_enabled)
+        self.preview_trigger_count_var.set(str(handler.preview_tomorrow_trigger_count))
         self.rotation_var.set(handler.schedule_rotation_enabled)
+        self.course_time_display_mode_var.set(handler.current_course_time_display_mode)
         self.schedule1_var.set(handler.rotation_schedule1)
         self.schedule2_var.set(handler.rotation_schedule2)
         self.countdown_name_entry.delete(0, tk.END)