auto-py-to-exe.json

@@ -1,65 +0,0 @@
-{
- "version": "auto-py-to-exe-configuration_v1",
- "pyinstallerOptions": [
-  {
-   "optionDest": "noconfirm",
-   "value": true
-  },
-  {
-   "optionDest": "filenames",
-   "value": "J:/Projects/LuckyDraw/main.py"
-  },
-  {
-   "optionDest": "onefile",
-   "value": true
-  },
-  {
-   "optionDest": "console",
-   "value": false
-  },
-  {
-   "optionDest": "icon_file",
-   "value": "J:/Projects/LuckyDraw/icon.ico"
-  },
-  {
-   "optionDest": "clean_build",
-   "value": false
-  },
-  {
-   "optionDest": "strip",
-   "value": false
-  },
-  {
-   "optionDest": "noupx",
-   "value": false
-  },
-  {
-   "optionDest": "disable_windowed_traceback",
-   "value": false
-  },
-  {
-   "optionDest": "uac_admin",
-   "value": false
-  },
-  {
-   "optionDest": "uac_uiaccess",
-   "value": false
-  },
-  {
-   "optionDest": "argv_emulation",
-   "value": false
-  },
-  {
-   "optionDest": "bootloader_ignore_signals",
-   "value": false
-  },
-  {
-   "optionDest": "datas",
-   "value": "J:/Projects/LuckyDraw/icon.png;."
-  }
- ],
- "nonPyinstallerOptions": {
-  "increaseRecursionLimit": true,
-  "manualArguments": ""
- }
-}

main.py

@@ -4,8 +4,6 @@ import random
 import winreg
 from datetime import datetime
 import os
-import pkg_resources
-import base64
 
 # 注册表路径
 REGISTRY_PATH = r"Software\StudentIDDraw"
@@ -14,13 +12,13 @@ REGISTRY_PATH = r"Software\StudentIDDraw"
 DEFAULT_ALLOW_REPEAT = False
 DEFAULT_MIN_ID = 1
 DEFAULT_MAX_ID = 45
-PASSWORD = "admin000"
+PASSWORD = "Admin@123"
 
 selected_ids = []
-temp_selected_ids = []
 is_running = False
 job = None
 
+
 # 注册表工具函数
 def set_registry_value(value_name, value, value_type=winreg.REG_SZ):
     try:
@@ -29,6 +27,7 @@ def set_registry_value(value_name, value, value_type=winreg.REG_SZ):
     except WindowsError as e:
         print(f"Error setting registry value: {e}")
 
+
 def get_registry_value(value_name, default_value):
     try:
         with winreg.OpenKey(
@@ -39,6 +38,7 @@ def get_registry_value(value_name, default_value):
     except WindowsError:
         return default_value
 
+
 def delete_registry_value(value_name):
     try:
         with winreg.OpenKey(
@@ -48,9 +48,10 @@ def delete_registry_value(value_name):
     except WindowsError as e:
         print(f"Error deleting registry value: {e}")
 
+
 # 加载已抽取的学号
 def load_selected_ids():
-    global selected_ids, temp_selected_ids
+    global selected_ids
     selected_ids_str = get_registry_value("SelectedIDs", "")
     if selected_ids_str:
         selected_ids = []
@@ -68,9 +69,9 @@ def load_selected_ids():
                 selected_ids = []
     else:
         selected_ids = []
-    temp_selected_ids = list(selected_ids)
     return selected_ids
 
+
 # 保存已抽取的学号
 def save_selected_ids():
     global selected_ids
@@ -82,6 +83,7 @@ def save_selected_ids():
     )
     set_registry_value("SelectedIDs", selected_ids_str)
 
+
 # 加载设置
 def load_settings():
     allow_repeat = (
@@ -91,12 +93,14 @@ def load_settings():
     max_id = int(get_registry_value("MaxID", str(DEFAULT_MAX_ID)))
     return allow_repeat, min_id, max_id
 
+
 # 保存设置
 def save_settings(allow_repeat, min_id, max_id):
     set_registry_value("AllowRepeat", str(allow_repeat))
     set_registry_value("MinID", str(min_id))
     set_registry_value("MaxID", str(max_id))
 
+
 # 生成随机的学号
 def generate_random_id(selected_ids, allow_repeat, min_id, max_id):
     if not allow_repeat:
@@ -114,20 +118,20 @@ def update_history_list():
     global history_list
     if history_list:
         history_list.delete(0, tk.END)
-        for id, timestamp in temp_selected_ids:
+        for id, timestamp in selected_ids:
             history_list.insert(tk.END, f"{id} ({timestamp})")
 
 # 每隔 5 毫秒更新一次显示的随机学号
 def update_number(allow_repeat, min_id, max_id):
     global job
     if is_running:
-        random_id = generate_random_id(temp_selected_ids, allow_repeat, min_id, max_id)
+        random_id = generate_random_id(selected_ids, allow_repeat, min_id, max_id)
         label.config(text=str(random_id))
         job = root.after(5, update_number, allow_repeat, min_id, max_id)
 
 # 抽取学号按钮点击事件处理函数
 def draw_student_id():
-    global is_running, job, selected_ids, temp_selected_ids
+    global is_running, job, selected_ids
     allow_repeat, min_id, max_id = load_settings()
 
     if is_running:
@@ -136,7 +140,6 @@ def draw_student_id():
         id = label.cget("text")
         timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         selected_ids.append((str(id), timestamp))
-        temp_selected_ids.append((str(id), timestamp))
         save_selected_ids()
         if settings_window:
             update_history_list()
@@ -148,6 +151,7 @@ def draw_student_id():
         button.config(text="停止")
         update_number(allow_repeat, min_id, max_id)
 
+
 # 设置按钮点击事件处理函数
 def open_settings():
     global settings_window
@@ -185,48 +189,46 @@ def open_settings():
     update_history_list()
 
     def add_id():
-        new_id = simpledialog.askstring("新增学号", "请输入新的学号:", parent=settings_window)
+        new_id = simpledialog.askstring("新增学号", "请输入新的学号:")
         if new_id:
             if new_id.isdigit():
                 new_id = int(new_id)
                 if min_id <= new_id <= max_id:
                     timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-                    temp_selected_ids.append((str(new_id), timestamp))
+                    selected_ids.append((str(new_id), timestamp))
                     update_history_list()
                 else:
                     messagebox.showerror("错误", f"学号必须在 {min_id} 和 {max_id} 之间")
             else:
                 messagebox.showerror("错误", "请输入有效的学号")
-            settings_window.focus_force()
 
     def delete_id():
         selected = history_list.curselection()
         if selected:
             index = selected[0]
-            temp_selected_ids.pop(index)
+            selected_ids.pop(index)
             update_history_list()
-            if index < len(temp_selected_ids):
+            if index < len(selected_ids):
                 history_list.select_set(index)
-            elif temp_selected_ids:
+            elif selected_ids:
                 history_list.select_set(index - 1)
         else:
             messagebox.showerror("错误", "请选择一个学号进行删除")
-        settings_window.focus_force()
 
     def edit_id():
         selected = history_list.curselection()
         if selected:
             index = selected[0]
-            current_id, _ = temp_selected_ids[index]
+            current_id, _ = selected_ids[index]
             new_id = simpledialog.askstring(
-                "修改学号", "请输入新的学号:", initialvalue=str(current_id), parent=settings_window
+                "修改学号", "请输入新的学号:", initialvalue=str(current_id)
             )
             if new_id:
                 if new_id.isdigit():
                     new_id = int(new_id)
                     if min_id <= new_id <= max_id:
                         timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-                        temp_selected_ids[index] = (str(new_id), timestamp)
+                        selected_ids[index] = (str(new_id), timestamp)
                         update_history_list()
                         history_list.select_set(index)
                     else:
@@ -235,11 +237,10 @@ def open_settings():
                     messagebox.showerror("错误", "请输入有效的学号")
         else:
             messagebox.showerror("错误", "请选择一个学号进行修改")
-        settings_window.focus_force()
 
     def clear_all_ids():
-        global temp_selected_ids
-        temp_selected_ids = []
+        global selected_ids
+        selected_ids = []
         update_history_list()
 
     tk.Button(settings_window, text="新增记录", font=("宋体", 10), command=add_id).grid(
@@ -273,10 +274,8 @@ def open_settings():
     )
 
     def save_changes():
-        entered_password = simpledialog.askstring("密码", "请输入密码:", parent=settings_window, show="*")
+        entered_password = simpledialog.askstring("密码", "请输入密码:", show="*")
         if entered_password == PASSWORD:
-            global selected_ids
-            selected_ids = list(temp_selected_ids)
             save_settings(
                 allow_repeat_var.get(), int(min_id_var.get()), int(max_id_var.get())
             )
@@ -285,7 +284,6 @@ def open_settings():
             close_settings_window()
         else:
             messagebox.showerror("错误", "密码错误")
-            settings_window.focus_force()
 
     tk.Button(settings_window, text="保存", font=("宋体", 10), command=save_changes).grid(
         row=8, column=0, columnspan=2, padx=5, pady=20, sticky="ew"
@@ -301,28 +299,24 @@ def open_settings():
 
     settings_window.protocol("WM_DELETE_WINDOW", close_settings_window)
 
+
 def close_settings_window():
     global settings_window
     settings_window.destroy()
     settings_window = None
 
-def get_icon_data():
-    icon_path = pkg_resources.resource_filename(__name__, 'icon.png')
-    with open(icon_path, 'rb') as icon_file:
-        return base64.b64encode(icon_file.read())
 
 # 初始化全局变量
 selected_ids = load_selected_ids()
 settings_window = None
 history_list = None
 
-icon_data = get_icon_data()
-
 # 创建主窗口
 root = tk.Tk()
 root.title("随机抽号机")
 root.attributes("-topmost", 1)
-icon_image = tk.PhotoImage(data=icon_data)
+icon_path = os.path.join("icon.png")
+icon_image = tk.PhotoImage(file=icon_path)
 root.iconphoto(True, icon_image)
 
 # 创建标签，用于显示抽取的学号
@@ -340,7 +334,7 @@ settings_button.pack(pady=10)
 # 创建多行标签，用于显示信息，内容居中显示
 info_label = tk.Label(
     root,
-    text="LuckyDraw v1.2 2024/06/22\nCopyright 2024 earthjasonlin\n保留所有权利。\n本程序仅作为交流学习使用",
+    text="LuckyDraw v1.1 2024/06/22\nCopyright 2024 earthjasonlin\n保留所有权利。\n本程序仅作为交流学习使用",
     font=("宋体", 10),
     justify="center",
     anchor="center",