Skip to content

柴进 / GoogleNanoBananaApp

Go to a project
Toggle navigation
Toggle navigation pinning
e8857bcd by shady
Options

Complete PySide6 migration: Replace tkinter with Qt 

- Installed PySide6 6.10.1
- Implemented LoginDialog with QDialog (replaces LoginWindow)
- Implemented ImageGeneratorWindow with QMainWindow
- Implemented ImageGenerationWorker with QThread for async operations
- Preserved all functionality: authentication, image generation, config management
- Applied QSS styling for modern UI
- All Phase 1-3 tasks completed (coding)
- Phase 4 tasks (manual testing) ready for user
1 parent 6a204244
Inline Side-by-side
Showing 2 changed files with 745 additions and 854 deletions
1 #!/usr/bin/env python3 1 #!/usr/bin/env python3
2 """ 2 """
3 Gemini Image Generator App 3 Gemini Image Generator App - PySide6 Version
4 Simple GUI application for generating images using Google's Gemini API 4 Modern GUI application for generating images using Google's Gemini API
5 """ 5 """
6 6
7 import tkinter as tk 7 from PySide6.QtWidgets import (
8 from tkinter import ttk, filedialog, messagebox, scrolledtext 8 QApplication, QMainWindow, QDialog, QWidget,
9 from PIL import Image, ImageTk 9 QVBoxLayout, QHBoxLayout, QFormLayout, QGridLayout,
10 QLabel, QLineEdit, QPushButton, QCheckBox, QTextEdit,
11 QComboBox, QScrollArea, QGroupBox, QFileDialog, QMessageBox
12 )
13 from PySide6.QtCore import Qt, QThread, Signal, QSize
14 from PySide6.QtGui import QPixmap, QFont, QIcon, QDesktopServices
15 from PySide6.QtCore import QUrl
16
17 from PIL import Image
10 import base64 18 import base64
11 import io 19 import io
12 import json 20 import json
13 import os 21 import os
14 import sys 22 import sys
15 import tempfile 23 import tempfile
16 import subprocess
17 import platform 24 import platform
18 from pathlib import Path 25 from pathlib import Path
19 from google import genai 26 from google import genai
20 from google.genai import types 27 from google.genai import types
21 import threading
22 import hashlib 28 import hashlib
23 import pymysql 29 import pymysql
24 from datetime import datetime 30 from datetime import datetime
...@@ -73,224 +79,194 @@ class DatabaseManager: ...@@ -73,224 +79,194 @@ class DatabaseManager:
73 return False, f"认证失败: {str(e)}" 79 return False, f"认证失败: {str(e)}"
74 80
75 81
76 class LoginWindow: 82 class LoginDialog(QDialog):
77 """登录窗口类""" 83 """Qt-based login dialog"""
84
78 def __init__(self, db_config, last_user="", saved_password_hash=""): 85 def __init__(self, db_config, last_user="", saved_password_hash=""):
86 super().__init__()
79 self.db_config = db_config 87 self.db_config = db_config
80 self.last_user = last_user 88 self.last_user = last_user
81 self.saved_password_hash = saved_password_hash 89 self.saved_password_hash = saved_password_hash
90
82 self.success = False 91 self.success = False
83 self.authenticated_user = "" 92 self.authenticated_user = ""
84 self.password_changed = False # 标记密码是否被修改 93 self.password_changed = False
94 self.current_password_hash = ""
85 95
86 # 创建登录窗口 96 self.setup_ui()
87 self.root = tk.Tk() 97 self.apply_styles()
88 self.root.title("登录 - AI 图像生成器")
89 self.root.geometry("400x400")
90 self.root.resizable(False, False)
91
92 # 创建 BooleanVar (必须在 Tk 根窗口创建之后)
93 self.remember_user = tk.BooleanVar(value=bool(last_user))
94 self.remember_password = tk.BooleanVar(value=bool(saved_password_hash))
95 98
96 # 设置窗口居中 99 def setup_ui(self):
97 self.center_window() 100 """Build login dialog UI"""
101 self.setWindowTitle("登录 - AI 图像生成器")
102 self.setFixedSize(400, 400)
103
104 # Main layout
105 main_layout = QVBoxLayout()
106 main_layout.setContentsMargins(40, 40, 40, 40)
107 main_layout.setSpacing(20)
108
109 # Title
110 title_label = QLabel("登录")
111 title_label.setObjectName("title")
112 title_label.setAlignment(Qt.AlignCenter)
113 main_layout.addWidget(title_label)
114
115 main_layout.addSpacing(10)
116
117 # Form layout for username and password
118 form_layout = QFormLayout()
119 form_layout.setSpacing(15)
120
121 # Username
122 username_label = QLabel("用户名")
123 username_label.setObjectName("field_label")
124 self.username_entry = QLineEdit()
125 self.username_entry.setText(self.last_user)
126 form_layout.addRow(username_label, self.username_entry)
127
128 # Password
129 password_label = QLabel("密码")
130 password_label.setObjectName("field_label")
131 self.password_entry = QLineEdit()
132 self.password_entry.setEchoMode(QLineEdit.Password)
133
134 # Handle saved password placeholder
135 if self.saved_password_hash:
136 self.password_entry.setPlaceholderText("••••••••")
137 self.password_entry.setStyleSheet("QLineEdit { color: #999999; }")
98 138
99 # 设置样式 139 self.password_entry.textChanged.connect(self.on_password_change)
100 self.setup_styles() 140 self.password_entry.returnPressed.connect(self.on_login)
101 141
102 # 创建UI 142 form_layout.addRow(password_label, self.password_entry)
103 self.setup_ui()
104 143
105 # 绑定回车键 144 main_layout.addLayout(form_layout)
106 self.root.bind('<Return>', lambda e: self.on_login())
107 145
108 # 处理窗口关闭 146 # Checkboxes
109 self.root.protocol("WM_DELETE_WINDOW", self.on_close) 147 checkbox_layout = QHBoxLayout()
148 self.remember_user_check = QCheckBox("记住用户名")
149 self.remember_user_check.setChecked(bool(self.last_user))
150 checkbox_layout.addWidget(self.remember_user_check)
110 151
111 def center_window(self): 152 self.remember_password_check = QCheckBox("记住密码")
112 """窗口居中显示""" 153 self.remember_password_check.setChecked(bool(self.saved_password_hash))
113 self.root.update_idletasks() 154 checkbox_layout.addWidget(self.remember_password_check)
114 width = self.root.winfo_width()
115 height = self.root.winfo_height()
116 x = (self.root.winfo_screenwidth() // 2) - (width // 2)
117 y = (self.root.winfo_screenheight() // 2) - (height // 2)
118 self.root.geometry(f'{width}x{height}+{x}+{y}')
119 155
120 def setup_styles(self): 156 checkbox_layout.addStretch()
121 """设置样式""" 157 main_layout.addLayout(checkbox_layout)
122 style = ttk.Style()
123 style.theme_use('clam')
124 158
125 bg_color = '#ffffff' 159 # Login button
126 accent_color = '#007AFF' 160 self.login_button = QPushButton("登录")
161 self.login_button.setObjectName("login_button")
162 self.login_button.clicked.connect(self.on_login)
163 main_layout.addWidget(self.login_button)
127 164
128 self.root.configure(bg=bg_color) 165 # Error label
166 self.error_label = QLabel("")
167 self.error_label.setObjectName("error_label")
168 self.error_label.setAlignment(Qt.AlignCenter)
169 self.error_label.setWordWrap(True)
170 main_layout.addWidget(self.error_label)
129 171
130 style.configure('TFrame', background=bg_color) 172 main_layout.addStretch()
131 style.configure('TLabel', background=bg_color)
132 173
133 style.configure('Login.TButton', 174 self.setLayout(main_layout)
134 background=accent_color,
135 foreground='white',
136 borderwidth=0,
137 focuscolor='none',
138 font=('Segoe UI', 10, 'bold'),
139 padding=(20, 10))
140 175
141 style.map('Login.TButton', 176 # Set focus
142 background=[('active', '#0051D5'), ('pressed', '#0051D5')])
143
144 def setup_ui(self):
145 """创建登录界面"""
146 # 主容器
147 main_frame = tk.Frame(self.root, bg='white', padx=40, pady=40)
148 main_frame.pack(fill="both", expand=True)
149
150 # 标题
151 title_label = tk.Label(main_frame, text="登录",
152 font=('Segoe UI', 20, 'bold'),
153 bg='white', fg='#1d1d1f')
154 title_label.pack(pady=(0, 30))
155
156 # 用户名
157 username_frame = tk.Frame(main_frame, bg='white')
158 username_frame.pack(fill="x", pady=(0, 15))
159
160 username_label = tk.Label(username_frame, text="用户名",
161 font=('Segoe UI', 10),
162 bg='white', fg='#666666')
163 username_label.pack(anchor="w")
164
165 self.username_entry = tk.Entry(username_frame,
166 font=('Segoe UI', 11),
167 relief='solid',
168 borderwidth=1,
169 bg='#fafafa',
170 fg='#000000',
171 insertbackground='#000000')
172 self.username_entry.pack(fill="x", ipady=8, pady=(5, 0))
173 self.username_entry.insert(0, self.last_user)
174
175 # 密码
176 password_frame = tk.Frame(main_frame, bg='white')
177 password_frame.pack(fill="x", pady=(0, 15))
178
179 password_label = tk.Label(password_frame, text="密码",
180 font=('Segoe UI', 10),
181 bg='white', fg='#666666')
182 password_label.pack(anchor="w")
183
184 self.password_entry = tk.Entry(password_frame,
185 font=('Segoe UI', 11),
186 relief='solid',
187 borderwidth=1,
188 show='*',
189 bg='#fafafa',
190 fg='#000000',
191 insertbackground='#000000')
192 self.password_entry.pack(fill="x", ipady=8, pady=(5, 0))
193
194 # 如果有保存的密码，显示占位符
195 if self.saved_password_hash:
196 self.password_entry.insert(0, "••••••••")
197 self.password_entry.config(fg='#999999')
198
199 # 监听密码框变化
200 self.password_entry.bind('<KeyPress>', self.on_password_change)
201 self.password_entry.bind('<Return>', lambda e: self.on_login())
202
203 # 复选框容器
204 checkbox_frame = tk.Frame(main_frame, bg='white')
205 checkbox_frame.pack(fill="x", pady=(0, 20))
206
207 # 记住用户名复选框
208 remember_user_check = tk.Checkbutton(checkbox_frame,
209 text="记住用户名",
210 variable=self.remember_user,
211 font=('Segoe UI', 9),
212 bg='white',
213 activebackground='white')
214 remember_user_check.pack(side="left")
215
216 # 记住密码复选框
217 remember_password_check = tk.Checkbutton(checkbox_frame,
218 text="记住密码",
219 variable=self.remember_password,
220 font=('Segoe UI', 9),
221 bg='white',
222 activebackground='white')
223 remember_password_check.pack(side="left", padx=(20, 0))
224
225 # 登录按钮
226 self.login_button = ttk.Button(main_frame,
227 text="登录",
228 style='Login.TButton',
229 command=self.on_login)
230 self.login_button.pack(fill="x")
231
232 # 错误提示标签
233 self.error_label = tk.Label(main_frame,
234 text="",
235 font=('Segoe UI', 9),
236 bg='white',
237 fg='#ff3b30')
238 self.error_label.pack(pady=(15, 0))
239
240 # 焦点设置
241 if self.last_user: 177 if self.last_user:
242 self.password_entry.focus() 178 self.password_entry.setFocus()
243 else: 179 else:
244 self.username_entry.focus() 180 self.username_entry.setFocus()
181
182 def apply_styles(self):
183 """Apply QSS stylesheet"""
184 self.setStyleSheet("""
185 QDialog {
186 background-color: #ffffff;
187 }
188 QLabel#title {
189 font-size: 20pt;
190 font-weight: bold;
191 color: #1d1d1f;
192 }
193 QLabel#field_label {
194 font-size: 10pt;
195 color: #666666;
196 }
197 QLineEdit {
198 padding: 8px;
199 border: 1px solid #e5e5e5;
200 border-radius: 4px;
201 background-color: #fafafa;
202 font-size: 11pt;
203 color: #000000;
204 }
205 QLineEdit:focus {
206 border: 1px solid #007AFF;
207 }
208 QPushButton#login_button {
209 background-color: #007AFF;
210 color: white;
211 font-size: 10pt;
212 font-weight: bold;
213 padding: 10px 20px;
214 border: none;
215 border-radius: 6px;
216 }
217 QPushButton#login_button:hover {
218 background-color: #0051D5;
219 }
220 QPushButton#login_button:pressed {
221 background-color: #003D99;
222 }
223 QPushButton#login_button:disabled {
224 background-color: #cccccc;
225 }
226 QCheckBox {
227 font-size: 9pt;
228 color: #1d1d1f;
229 }
230 QLabel#error_label {
231 color: #ff3b30;
232 font-size: 9pt;
233 }
234 """)
245 235
246 def on_password_change(self, event): 236 def on_password_change(self):
247 """监听密码框变化""" 237 """Handle password field changes"""
248 if not self.password_changed and self.saved_password_hash: 238 if not self.password_changed and self.saved_password_hash:
249 # 首次修改密码，清空占位符 239 # First change - clear placeholder style
250 self.password_entry.delete(0, tk.END) 240 self.password_entry.setStyleSheet("")
251 self.password_entry.config(fg='#000000')
252 self.password_changed = True 241 self.password_changed = True
253 242
254 def on_login(self): 243 def on_login(self):
255 """处理登录""" 244 """Handle login button click"""
256 print("[DEBUG] 登录按钮被点击") 245 username = self.username_entry.text().strip()
257 username = self.username_entry.get().strip() 246 password_input = self.password_entry.text()
258 password_input = self.password_entry.get()
259
260 print(f"[DEBUG] 用户名: {username}")
261 print(f"[DEBUG] 密码输入长度: {len(password_input)}")
262 print(f"[DEBUG] 密码已修改: {self.password_changed}")
263 print(f"[DEBUG] 有保存的哈希: {bool(self.saved_password_hash)}")
264 247
265 # 验证输入 248 # Validate input
266 if not username: 249 if not username:
267 print("[DEBUG] 用户名为空")
268 self.show_error("请输入用户名") 250 self.show_error("请输入用户名")
269 return 251 return
270 252
271 if not password_input: 253 if not password_input:
272 print("[DEBUG] 密码为空")
273 self.show_error("请输入密码") 254 self.show_error("请输入密码")
274 return 255 return
275 256
276 # 禁用按钮,防止重复点击 257 # Disable button during authentication
277 self.login_button.config(state='disabled') 258 self.login_button.setEnabled(False)
278 self.error_label.config(text="正在验证...", fg='#666666') 259 self.error_label.setText("正在验证...")
279 self.root.update() 260 self.error_label.setStyleSheet("QLabel { color: #666666; }")
280 261
281 # 判断使用保存的密码还是新输入的密码 262 # Determine which password to use
282 if not self.password_changed and self.saved_password_hash: 263 if not self.password_changed and self.saved_password_hash:
283 # 使用保存的密码哈希
284 print("[DEBUG] 使用保存的密码哈希")
285 password_hash = self.saved_password_hash 264 password_hash = self.saved_password_hash
286 else: 265 else:
287 # 计算新密码的哈希
288 print("[DEBUG] 计算新密码的哈希")
289 password_hash = hash_password(password_input) 266 password_hash = hash_password(password_input)
290 267
291 # 直接使用哈希值进行数据库验证 268 # Authenticate
292 try: 269 try:
293 print(f"[DEBUG] 开始连接数据库: {self.db_config['host']}")
294 conn = pymysql.connect( 270 conn = pymysql.connect(
295 host=self.db_config['host'], 271 host=self.db_config['host'],
296 port=self.db_config.get('port', 3306), 272 port=self.db_config.get('port', 3306),
...@@ -299,175 +275,82 @@ class LoginWindow: ...@@ -299,175 +275,82 @@ class LoginWindow:
299 database=self.db_config['database'], 275 database=self.db_config['database'],
300 connect_timeout=5 276 connect_timeout=5
301 ) 277 )
302 print("[DEBUG] 数据库连接成功")
303 278
304 try: 279 try:
305 with conn.cursor() as cursor: 280 with conn.cursor() as cursor:
306 sql = f"SELECT * FROM {self.db_config['table']} WHERE user_name=%s AND passwd=%s AND status='active'" 281 sql = f"SELECT * FROM {self.db_config['table']} WHERE user_name=%s AND passwd=%s AND status='active'"
307 print(f"[DEBUG] 执行查询，用户名: {username}, 哈希前8位: {password_hash[:8]}...")
308 cursor.execute(sql, (username, password_hash)) 282 cursor.execute(sql, (username, password_hash))
309 result = cursor.fetchone() 283 result = cursor.fetchone()
310 print(f"[DEBUG] 查询结果: {'找到用户' if result else '未找到匹配'}")
311 284
312 if result: 285 if result:
313 print("[DEBUG] 登录成功")
314 self.success = True 286 self.success = True
315 self.authenticated_user = username 287 self.authenticated_user = username
316 # 保存密码哈希用于下次登录
317 self.current_password_hash = password_hash 288 self.current_password_hash = password_hash
318 self.root.quit() 289 self.accept() # Close dialog with success
319 self.root.destroy()
320 else: 290 else:
321 print("[DEBUG] 用户名或密码错误")
322 self.show_error("用户名或密码错误") 291 self.show_error("用户名或密码错误")
323 self.password_entry.delete(0, tk.END) 292 self.password_entry.clear()
324 self.password_changed = False 293 self.password_changed = False
325 self.login_button.config(state='normal') 294 self.login_button.setEnabled(True)
326 finally: 295 finally:
327 conn.close() 296 conn.close()
328 print("[DEBUG] 数据库连接已关闭")
329 297
330 except pymysql.OperationalError as e: 298 except pymysql.OperationalError:
331 print(f"[DEBUG] 数据库连接失败: {e}")
332 self.show_error("无法连接到服务器,请检查网络连接") 299 self.show_error("无法连接到服务器,请检查网络连接")
333 self.login_button.config(state='normal') 300 self.login_button.setEnabled(True)
334 except Exception as e: 301 except Exception as e:
335 print(f"[DEBUG] 认证异常: {e}")
336 self.show_error(f"认证失败: {str(e)}") 302 self.show_error(f"认证失败: {str(e)}")
337 self.login_button.config(state='normal') 303 self.login_button.setEnabled(True)
338 304
339 def show_error(self, message): 305 def show_error(self, message):
340 """显示错误信息""" 306 """Display error message"""
341 self.error_label.config(text=message, fg='#ff3b30') 307 self.error_label.setText(message)
308 self.error_label.setStyleSheet("QLabel { color: #ff3b30; }")
342 309
343 def on_close(self): 310 def get_remember_user(self):
344 """处理窗口关闭""" 311 """Get remember username checkbox state"""
345 self.success = False 312 return self.remember_user_check.isChecked()
346 self.root.quit()
347 self.root.destroy()
348 313
349 def run(self): 314 def get_remember_password(self):
350 """运行登录窗口""" 315 """Get remember password checkbox state"""
351 self.root.mainloop() 316 return self.remember_password_check.isChecked()
352 return (self.success,
353 self.authenticated_user,
354 self.remember_user.get(),
355 self.remember_password.get(),
356 getattr(self, 'current_password_hash', ''))
357 317
318 def get_password_hash(self):
319 """Get current password hash"""
320 return getattr(self, 'current_password_hash', '')
358 321
359 class ImageGeneratorApp:
360 def __init__(self, root):
361 self.root = root
362 self.root.title("AI 图像生成器")
363 self.root.geometry("1200x850")
364 self.root.minsize(1000, 700)
365 322
366 # Configure modern styling 323 class ImageGeneratorWindow(QMainWindow):
367 self.setup_styles() 324 """Qt-based main application window"""
368 325
326 def __init__(self):
327 super().__init__()
369 self.api_key = "" 328 self.api_key = ""
370 self.uploaded_images = [] # List of (file_path, PhotoImage) tuples 329 self.uploaded_images = [] # List of file paths
371 self.generated_image_data = None 330 self.generated_image_data = None
372 self.generated_image_bytes = None 331 self.generated_image_bytes = None
373 self.saved_prompts = [] # Store favorite prompts 332 self.saved_prompts = []
333 self.db_config = None
334 self.last_user = ""
335 self.saved_password_hash = ""
374 336
375 self.load_config() 337 self.load_config()
376 self.setup_ui() 338 self.setup_ui()
377 339 self.apply_styles()
378 def setup_styles(self):
379 """Setup modern macOS-inspired UI styles"""
380 style = ttk.Style()
381 style.theme_use('clam')
382
383 # macOS-inspired color palette
384 bg_color = '#ffffff'
385 secondary_bg = '#f6f6f6'
386 accent_color = '#007AFF'
387 hover_color = '#0051D5'
388 border_color = '#e5e5e5'
389 text_color = '#1d1d1f'
390
391 self.root.configure(bg=bg_color)
392
393 # Primary button style
394 style.configure('Accent.TButton',
395 background=accent_color,
396 foreground='white',
397 borderwidth=1,
398 relief='solid',
399 focuscolor='none',
400 font=('Segoe UI', 10),
401 padding=(18, 8))
402
403 style.map('Accent.TButton',
404 background=[('active', hover_color), ('pressed', '#003D99')],
405 foreground=[('disabled', '#999999')])
406
407 # Secondary button style
408 style.configure('Secondary.TButton',
409 background=secondary_bg,
410 foreground=text_color,
411 borderwidth=1,
412 relief='solid',
413 font=('Segoe UI', 9),
414 padding=(12, 6))
415
416 style.map('Secondary.TButton',
417 background=[('active', '#e8e8e8'), ('pressed', '#c8c8c8')])
418
419 # Icon button style (small, subtle)
420 style.configure('Icon.TButton',
421 background=bg_color,
422 foreground='#666666',
423 borderwidth=1,
424 relief='solid',
425 font=('Segoe UI', 9),
426 padding=(4, 4))
427
428 style.map('Icon.TButton',
429 background=[('active', secondary_bg), ('pressed', '#d8d8d8')],
430 foreground=[('active', accent_color)])
431
432 # Delete button style (visible with red hover)
433 style.configure('Delete.TButton',
434 background='#ff4444',
435 foreground='#ffffff',
436 borderwidth=1,
437 relief='solid',
438 font=('Segoe UI', 9, 'bold'),
439 padding=(3, 1))
440
441 style.map('Delete.TButton',
442 background=[('active', '#FF3B30'), ('pressed', '#cc0000')],
443 foreground=[('active', 'white'), ('pressed', 'white')],
444 borderwidth=[('active', 1)],
445 relief=[('active', 'solid')])
446
447 style.configure('TLabelframe', background=bg_color, borderwidth=0, relief='flat')
448 style.configure('TLabelframe.Label', background=bg_color, font=('Segoe UI', 10, 'bold'), foreground=text_color)
449 style.configure('TLabel', background=bg_color, font=('Segoe UI', 9), foreground=text_color)
450 style.configure('TFrame', background=bg_color)
451 style.configure('Card.TFrame', background=secondary_bg, relief='flat')
452 style.configure('TCombobox', font=('Segoe UI', 9))
453 340
454 def get_config_dir(self): 341 def get_config_dir(self):
455 """Get the appropriate directory for config files based on platform and mode""" 342 """Get the appropriate directory for config files based on platform and mode"""
456 # Check if running as a bundled app (PyInstaller)
457 if getattr(sys, 'frozen', False): 343 if getattr(sys, 'frozen', False):
458 # Running as bundled app - use user data directory
459 system = platform.system() 344 system = platform.system()
460 if system == 'Darwin': # macOS 345 if system == 'Darwin':
461 config_dir = Path.home() / 'Library' / 'Application Support' / 'ZB100ImageGenerator' 346 config_dir = Path.home() / 'Library' / 'Application Support' / 'ZB100ImageGenerator'
462 elif system == 'Windows': 347 elif system == 'Windows':
463 config_dir = Path(os.getenv('APPDATA', Path.home())) / 'ZB100ImageGenerator' 348 config_dir = Path(os.getenv('APPDATA', Path.home())) / 'ZB100ImageGenerator'
464 else: # Linux and others 349 else:
465 config_dir = Path.home() / '.config' / 'zb100imagegenerator' 350 config_dir = Path.home() / '.config' / 'zb100imagegenerator'
466 else: 351 else:
467 # Running in development mode - use current directory
468 config_dir = Path('.') 352 config_dir = Path('.')
469 353
470 # Create directory if it doesn't exist
471 config_dir.mkdir(parents=True, exist_ok=True) 354 config_dir.mkdir(parents=True, exist_ok=True)
472 return config_dir 355 return config_dir
473 356
...@@ -479,12 +362,6 @@ class ImageGeneratorApp: ...@@ -479,12 +362,6 @@ class ImageGeneratorApp:
479 """Load API key, saved prompts, and db config from config file""" 362 """Load API key, saved prompts, and db config from config file"""
480 config_path = self.get_config_path() 363 config_path = self.get_config_path()
481 364
482 # 初始化默认值
483 self.db_config = None
484 self.last_user = ""
485 self.saved_password_hash = ""
486
487 # Try to load from user config first
488 if config_path.exists(): 365 if config_path.exists():
489 try: 366 try:
490 with open(config_path, 'r', encoding='utf-8') as f: 367 with open(config_path, 'r', encoding='utf-8') as f:
...@@ -497,10 +374,8 @@ class ImageGeneratorApp: ...@@ -497,10 +374,8 @@ class ImageGeneratorApp:
497 except Exception as e: 374 except Exception as e:
498 print(f"Failed to load config from {config_path}: {e}") 375 print(f"Failed to load config from {config_path}: {e}")
499 376
500 # If no config found and we're in bundled mode, try to load from bundled resources
501 if not self.api_key and getattr(sys, 'frozen', False): 377 if not self.api_key and getattr(sys, 'frozen', False):
502 try: 378 try:
503 # PyInstaller creates a temp folder and stores path in _MEIPASS
504 bundle_dir = Path(sys._MEIPASS) 379 bundle_dir = Path(sys._MEIPASS)
505 bundled_config = bundle_dir / 'config.json' 380 bundled_config = bundle_dir / 'config.json'
506 if bundled_config.exists(): 381 if bundled_config.exists():
...@@ -508,14 +383,12 @@ class ImageGeneratorApp: ...@@ -508,14 +383,12 @@ class ImageGeneratorApp:
508 config = json.load(f) 383 config = json.load(f)
509 self.api_key = config.get("api_key", "") 384 self.api_key = config.get("api_key", "")
510 self.db_config = config.get("db_config") 385 self.db_config = config.get("db_config")
511 # Don't load saved_prompts from bundle, only API key
512 # Save to user config for future use
513 self.save_config() 386 self.save_config()
514 except Exception as e: 387 except Exception as e:
515 print(f"Failed to load bundled config: {e}") 388 print(f"Failed to load bundled config: {e}")
516 389
517 if not self.api_key: 390 if not self.api_key:
518 messagebox.showwarning("警告", f"未找到API密钥\n配置文件位置: {config_path}\n\n请在应用中输入API密钥或手动编辑配置文件") 391 QMessageBox.warning(self, "警告", f"未找到API密钥\n配置文件位置: {config_path}\n\n请在应用中输入API密钥或手动编辑配置文件")
519 392
520 def save_config(self, last_user=None): 393 def save_config(self, last_user=None):
521 """Save configuration to file""" 394 """Save configuration to file"""
...@@ -527,11 +400,9 @@ class ImageGeneratorApp: ...@@ -527,11 +400,9 @@ class ImageGeneratorApp:
527 "saved_prompts": self.saved_prompts 400 "saved_prompts": self.saved_prompts
528 } 401 }
529 402
530 # 添加数据库配置(如果存在)
531 if self.db_config: 403 if self.db_config:
532 config["db_config"] = self.db_config 404 config["db_config"] = self.db_config
533 405
534 # 添加最后登录用户
535 if last_user is not None: 406 if last_user is not None:
536 config["last_user"] = last_user 407 config["last_user"] = last_user
537 elif hasattr(self, 'last_user'): 408 elif hasattr(self, 'last_user'):
...@@ -539,423 +410,535 @@ class ImageGeneratorApp: ...@@ -539,423 +410,535 @@ class ImageGeneratorApp:
539 else: 410 else:
540 config["last_user"] = "" 411 config["last_user"] = ""
541 412
542 # 添加保存的密码哈希
543 if hasattr(self, 'saved_password_hash'): 413 if hasattr(self, 'saved_password_hash'):
544 config["saved_password_hash"] = self.saved_password_hash 414 config["saved_password_hash"] = self.saved_password_hash
545 else: 415 else:
546 config["saved_password_hash"] = "" 416 config["saved_password_hash"] = ""
547 417
548 # Ensure directory exists
549 config_path.parent.mkdir(parents=True, exist_ok=True) 418 config_path.parent.mkdir(parents=True, exist_ok=True)
550 419
551 with open(config_path, 'w', encoding='utf-8') as f: 420 with open(config_path, 'w', encoding='utf-8') as f:
552 json.dump(config, f, indent=2, ensure_ascii=False) 421 json.dump(config, f, indent=2, ensure_ascii=False)
553 except Exception as e: 422 except Exception as e:
554 messagebox.showerror("错误", f"保存配置失败: {str(e)}\n路径: {config_path}") 423 QMessageBox.critical(self, "错误", f"保存配置失败: {str(e)}\n路径: {config_path}")
555 424
556 def setup_ui(self): 425 def setup_ui(self):
557 """Setup the user interface with macOS-inspired design""" 426 """Setup the user interface"""
558 # Main container 427 self.setWindowTitle("AI 图像生成器")
559 main_container = ttk.Frame(self.root, padding=20) 428 self.setGeometry(100, 100, 1200, 850)
560 main_container.pack(fill="both", expand=True) 429 self.setMinimumSize(1000, 700)
561 430
562 # Reference Images Section with preview 431 # Central widget
563 ref_frame = ttk.LabelFrame(main_container, text="参考图片", padding=12) 432 central_widget = QWidget()
564 ref_frame.pack(fill="x", pady=(0, 15)) 433 self.setCentralWidget(central_widget)
565 434
566 # Upload button and info 435 main_layout = QVBoxLayout()
567 upload_header = ttk.Frame(ref_frame) 436 main_layout.setContentsMargins(20, 20, 20, 20)
568 upload_header.pack(fill="x", pady=(0, 8)) 437 main_layout.setSpacing(15)
569 438
570 upload_btn = ttk.Button(upload_header, text="+ 添加图片", 439 # Reference images section
571 command=self.upload_images, 440 ref_group = QGroupBox("参考图片")
572 style='Secondary.TButton') 441 ref_layout = QVBoxLayout()
573 upload_btn.pack(side="left") 442
574 self.bind_hover_effect(upload_btn) 443 # Upload button and count
575 444 upload_header = QHBoxLayout()
576 self.image_count_label = ttk.Label(upload_header, text="已选择 0 张", foreground='#666666') 445 upload_btn = QPushButton("+ 添加图片")
577 self.image_count_label.pack(side="left", padx=12) 446 upload_btn.clicked.connect(self.upload_images)
578 447 upload_header.addWidget(upload_btn)
579 # Image preview container (horizontal scrollable) 448
580 preview_container = ttk.Frame(ref_frame, style='Card.TFrame', height=140) 449 self.image_count_label = QLabel("已选择 0 张")
581 preview_container.pack(fill="x", pady=(0, 0)) 450 upload_header.addWidget(self.image_count_label)
582 preview_container.pack_propagate(False) 451 upload_header.addStretch()
583 452 ref_layout.addLayout(upload_header)
584 # Canvas for horizontal scrolling (without visible scrollbar) 453
585 self.img_canvas = tk.Canvas(preview_container, height=110, bg='#f6f6f6', 454 # Image preview scroll area
586 highlightthickness=0, bd=0) 455 self.img_scroll = QScrollArea()
587 self.img_preview_frame = ttk.Frame(self.img_canvas, style='Card.TFrame') 456 self.img_scroll.setWidgetResizable(True)
588 457 self.img_scroll.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOn)
589 self.img_preview_frame.bind("<Configure>", 458 self.img_scroll.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
590 lambda e: self.img_canvas.configure(scrollregion=self.img_canvas.bbox("all"))) 459 self.img_scroll.setFixedHeight(140)
591 460
592 self.img_canvas.create_window((0, 0), window=self.img_preview_frame, anchor="nw") 461 self.img_container = QWidget()
593 462 self.img_layout = QHBoxLayout()
594 # Enable mouse wheel scrolling 463 self.img_layout.addStretch()
595 self.img_canvas.bind('<MouseWheel>', self._on_mousewheel) 464 self.img_container.setLayout(self.img_layout)
596 self.img_canvas.bind('<Shift-MouseWheel>', self._on_mousewheel) 465 self.img_scroll.setWidget(self.img_container)
597 466
598 self.img_canvas.pack(fill="both", expand=True) 467 ref_layout.addWidget(self.img_scroll)
599 468 ref_group.setLayout(ref_layout)
600 # Content area: Prompt (left) + Settings (right) 469 main_layout.addWidget(ref_group)
601 content_row = ttk.Frame(main_container) 470
602 content_row.pack(fill="x", pady=(0, 15)) 471 # Content row: Prompt (left) + Settings (right)
603 472 content_row = QHBoxLayout()
604 # Left: Prompt Section 473
605 prompt_container = ttk.LabelFrame(content_row, text="提示词", padding=12) 474 # Prompt section
606 prompt_container.pack(side="left", fill="both", expand=True, padx=(0, 10)) 475 prompt_group = QGroupBox("提示词")
607 476 prompt_layout = QVBoxLayout()
477
608 # Prompt toolbar 478 # Prompt toolbar
609 prompt_toolbar = ttk.Frame(prompt_container) 479 prompt_toolbar = QHBoxLayout()
610 prompt_toolbar.pack(fill="x", pady=(0, 8)) 480 self.save_prompt_btn = QPushButton("⭐ 收藏")
611 481 self.save_prompt_btn.clicked.connect(self.toggle_favorite)
612 self.save_prompt_btn = ttk.Button(prompt_toolbar, text="⭐ 收藏", 482 prompt_toolbar.addWidget(self.save_prompt_btn)
613 command=self.toggle_favorite, 483
614 style='Icon.TButton') 484 prompt_toolbar.addWidget(QLabel("快速选择:"))
615 self.save_prompt_btn.pack(side="left", padx=(0, 5)) 485 self.saved_prompts_combo = QComboBox()
616 self.bind_hover_effect(self.save_prompt_btn) 486 self.saved_prompts_combo.currentIndexChanged.connect(self.load_saved_prompt)
617
618 # Saved prompts dropdown
619 ttk.Label(prompt_toolbar, text="快速选择:", foreground='#666666').pack(side="left", padx=(10, 5))
620 self.saved_prompts_combo = ttk.Combobox(prompt_toolbar, width=30, state="readonly")
621 self.saved_prompts_combo.pack(side="left")
622 self.saved_prompts_combo.bind('<<ComboboxSelected>>', self.load_saved_prompt)
623 self.update_saved_prompts_list() 487 self.update_saved_prompts_list()
624 488 prompt_toolbar.addWidget(self.saved_prompts_combo)
625 # Delete saved prompt button 489
626 delete_prompt_btn = ttk.Button(prompt_toolbar, text="🗑️ 删除", 490 delete_prompt_btn = QPushButton("🗑️ 删除")
627 command=self.delete_saved_prompt, 491 delete_prompt_btn.clicked.connect(self.delete_saved_prompt)
628 style='Icon.TButton') 492 prompt_toolbar.addWidget(delete_prompt_btn)
629 delete_prompt_btn.pack(side="left", padx=(5, 0)) 493 prompt_toolbar.addStretch()
630 self.bind_hover_effect(delete_prompt_btn) 494
631 495 prompt_layout.addLayout(prompt_toolbar)
496
632 # Prompt text area 497 # Prompt text area
633 self.prompt_text = scrolledtext.ScrolledText(prompt_container, height=8, wrap=tk.WORD, 498 self.prompt_text = QTextEdit()
634 font=('Segoe UI', 10), 499 self.prompt_text.setPlainText("一幅美丽的风景画，有山有湖，日落时分")
635 borderwidth=1, relief='solid', 500 self.prompt_text.textChanged.connect(self.check_favorite_status)
636 bg='#fafafa') 501 prompt_layout.addWidget(self.prompt_text)
637 self.prompt_text.pack(fill="both", expand=True) 502
638 self.prompt_text.insert("1.0", "一幅美丽的风景画，有山有湖，日落时分") 503 prompt_group.setLayout(prompt_layout)
639 504 content_row.addWidget(prompt_group, 2)
640 # Bind text change event to check favorite status 505
641 self.prompt_text.bind('<<Modified>>', self.on_prompt_change) 506 # Settings section
642 507 settings_group = QGroupBox("生成设置")
643 # Right: Settings Section 508 settings_layout = QVBoxLayout()
644 settings_container = ttk.LabelFrame(content_row, text="生成设置", padding=12) 509
645 settings_container.pack(side="right", fill="y") 510 settings_layout.addWidget(QLabel("宽高比"))
646 511 self.aspect_ratio = QComboBox()
647 # Aspect Ratio 512 self.aspect_ratio.addItems(["1:1", "2:3", "3:2", "3:4", "4:3", "4:5", "5:4", "9:16", "16:9", "21:9"])
648 ttk.Label(settings_container, text="宽高比", foreground='#666666').pack(anchor="w", pady=(0, 4)) 513 settings_layout.addWidget(self.aspect_ratio)
649 self.aspect_ratio = ttk.Combobox(settings_container, width=18, state="readonly") 514
650 self.aspect_ratio['values'] = ("1:1", "2:3", "3:2", "3:4", "4:3", "4:5", "5:4", "9:16", "16:9", "21:9") 515 settings_layout.addSpacing(10)
651 self.aspect_ratio.current(0) 516
652 self.aspect_ratio.pack(fill="x", pady=(0, 12)) 517 settings_layout.addWidget(QLabel("图片尺寸"))
653 518 self.image_size = QComboBox()
654 # Image Size 519 self.image_size.addItems(["1K", "2K", "4K"])
655 ttk.Label(settings_container, text="图片尺寸", foreground='#666666').pack(anchor="w", pady=(0, 4)) 520 self.image_size.setCurrentIndex(1)
656 self.image_size = ttk.Combobox(settings_container, width=18, state="readonly") 521 settings_layout.addWidget(self.image_size)
657 self.image_size['values'] = ("1K", "2K", "4K") 522
658 self.image_size.current(1) 523 settings_layout.addStretch()
659 self.image_size.pack(fill="x", pady=(0, 0)) 524 settings_group.setLayout(settings_layout)
660 525 content_row.addWidget(settings_group, 1)
526
527 main_layout.addLayout(content_row)
528
661 # Action buttons 529 # Action buttons
662 action_frame = ttk.Frame(main_container) 530 action_layout = QHBoxLayout()
663 action_frame.pack(fill="x", pady=(0, 15)) 531 self.generate_btn = QPushButton("生成图片")
664 532 self.generate_btn.clicked.connect(self.generate_image_async)
665 self.generate_btn = ttk.Button(action_frame, text="生成图片", 533 action_layout.addWidget(self.generate_btn)
666 command=self.generate_image_async, 534
667 style='Accent.TButton') 535 self.download_btn = QPushButton("下载图片")
668 self.generate_btn.pack(side="left", padx=(0, 10)) 536 self.download_btn.clicked.connect(self.download_image)
669 self.bind_hover_effect(self.generate_btn, scale=True) 537 self.download_btn.setEnabled(False)
670 538 action_layout.addWidget(self.download_btn)
671 self.download_btn = ttk.Button(action_frame, text="下载图片", 539
672 command=self.download_image, 540 self.status_label = QLabel("● 就绪")
673 state="disabled", 541 action_layout.addWidget(self.status_label)
674 style='Secondary.TButton') 542 action_layout.addStretch()
675 self.download_btn.pack(side="left", padx=(0, 10)) 543
676 self.bind_hover_effect(self.download_btn) 544 main_layout.addLayout(action_layout)
677 545
678 self.status_label = ttk.Label(action_frame, text="● 就绪", 546 # Preview section
679 font=('Segoe UI', 9), 547 preview_group = QGroupBox("预览")
680 foreground='#007AFF') 548 preview_layout = QVBoxLayout()
681 self.status_label.pack(side="left", padx=15) 549
682 550 self.preview_label = QLabel("生成的图片将在这里显示\n双击用系统查看器打开")
683 # Preview Section (expands to fill remaining space) 551 self.preview_label.setAlignment(Qt.AlignCenter)
684 preview_frame = ttk.LabelFrame(main_container, text="预览", padding=12) 552 self.preview_label.setMinimumHeight(300)
685 preview_frame.pack(fill="both", expand=True) 553 self.preview_label.setStyleSheet("QLabel { color: #999999; font-size: 10pt; }")
686 554 self.preview_label.mouseDoubleClickEvent = self.open_fullsize_view
687 # Create a frame to center the image 555
688 preview_inner = ttk.Frame(preview_frame) 556 preview_layout.addWidget(self.preview_label)
689 preview_inner.pack(fill="both", expand=True) 557 preview_group.setLayout(preview_layout)
690 558 main_layout.addWidget(preview_group, 1)
691 self.preview_label = ttk.Label(preview_inner, text="生成的图片将在这里显示\n双击用系统查看器打开", 559
692 anchor="center", 560 central_widget.setLayout(main_layout)
693 font=('Segoe UI', 10), 561
694 foreground='#999999') 562 self.check_favorite_status()
695 self.preview_label.place(relx=0.5, rely=0.5, anchor="center") 563
696 564 def apply_styles(self):
697 # Bind double-click to open with system viewer 565 """Apply QSS stylesheet"""
698 self.preview_label.bind('<Double-Button-1>', self.open_fullsize_view) 566 self.setStyleSheet("""
699 567 QMainWindow {
700 def _on_mousewheel(self, event): 568 background-color: #ffffff;
701 """Handle horizontal scrolling with mouse wheel""" 569 }
702 # Shift+Wheel or just Wheel for horizontal scroll 570 QGroupBox {
703 self.img_canvas.xview_scroll(int(-1 * (event.delta / 120)), "units") 571 font-weight: bold;
704 572 font-size: 10pt;
705 def bind_hover_effect(self, widget, scale=False): 573 border: 1px solid #e5e5e5;
706 """Add smooth macOS-style hover effect""" 574 border-radius: 6px;
707 original_cursor = widget['cursor'] 575 margin-top: 10px;
708 576 padding-top: 10px;
709 def on_enter(e): 577 }
710 widget['cursor'] = 'hand2' 578 QGroupBox::title {
711 # Subtle scale effect for primary buttons 579 color: #1d1d1f;
712 if scale and hasattr(widget, 'configure'): 580 subcontrol-origin: margin;
713 try: 581 left: 10px;
714 widget.configure(padding=(19, 9)) 582 padding: 0 5px;
715 except: 583 }
716 pass 584 QPushButton {
717 585 background-color: #f6f6f6;
718 def on_leave(e): 586 color: #1d1d1f;
719 widget['cursor'] = original_cursor 587 border: 1px solid #e5e5e5;
720 if scale and hasattr(widget, 'configure'): 588 border-radius: 4px;
589 padding: 6px 12px;
590 font-size: 9pt;
591 }
592 QPushButton:hover {
593 background-color: #e8e8e8;
594 }
595 QPushButton:pressed {
596 background-color: #c8c8c8;
597 }
598 QPushButton:disabled {
599 background-color: #f6f6f6;
600 color: #999999;
601 }
602 QComboBox {
603 border: 1px solid #e5e5e5;
604 border-radius: 4px;
605 padding: 5px;
606 background-color: white;
607 }
608 QTextEdit {
609 border: 1px solid #e5e5e5;
610 border-radius: 4px;
611 background-color: #fafafa;
612 font-size: 10pt;
613 }
614 QLabel {
615 color: #1d1d1f;
616 }
617 QScrollArea {
618 border: none;
619 background-color: #f6f6f6;
620 }
621 """)
622
623 def upload_images(self):
624 """Upload reference images"""
625 files, _ = QFileDialog.getOpenFileNames(
626 self,
627 "选择参考图片",
628 "",
629 "图片文件 (*.png *.jpg *.jpeg *.gif *.bmp);;所有文件 (*.*)"
630 )
631
632 if files:
633 for file_path in files:
721 try: 634 try:
722 widget.configure(padding=(18, 8)) 635 self.uploaded_images.append(file_path)
723 except: 636 except Exception as e:
724 pass 637 QMessageBox.critical(self, "错误", f"无法加载图片: {file_path}\n{str(e)}")
725 638
726 widget.bind('<Enter>', on_enter) 639 self.update_image_preview()
727 widget.bind('<Leave>', on_leave) 640 self.image_count_label.setText(f"已选择 {len(self.uploaded_images)} 张")
728 641 self.status_label.setText(f"● 已添加 {len(files)} 张参考图片")
642 self.status_label.setStyleSheet("QLabel { color: #34C759; }")
643
644 def update_image_preview(self):
645 """Update image preview thumbnails"""
646 # Clear existing previews
647 while self.img_layout.count() > 1: # Keep the stretch
648 item = self.img_layout.takeAt(0)
649 if item.widget():
650 item.widget().deleteLater()
651
652 # Add thumbnails
653 for idx, file_path in enumerate(self.uploaded_images):
654 try:
655 # Load and create thumbnail
656 pixmap = QPixmap(file_path)
657 pixmap = pixmap.scaled(100, 100, Qt.KeepAspectRatio, Qt.SmoothTransformation)
658
659 # Container
660 container = QWidget()
661 container_layout = QVBoxLayout()
662 container_layout.setContentsMargins(5, 5, 5, 5)
663
664 # Image label
665 img_label = QLabel()
666 img_label.setPixmap(pixmap)
667 img_label.setFixedSize(100, 100)
668 img_label.setStyleSheet("QLabel { border: 1px solid #e5e5e5; }")
669 container_layout.addWidget(img_label)
670
671 # Info row
672 info_layout = QHBoxLayout()
673 index_label = QLabel(f"图 {idx + 1}")
674 index_label.setStyleSheet("QLabel { font-size: 8pt; color: #666666; }")
675 info_layout.addWidget(index_label)
676
677 del_btn = QPushButton("✕")
678 del_btn.setFixedSize(20, 20)
679 del_btn.setStyleSheet("""
680 QPushButton {
681 background-color: #ff4444;
682 color: white;
683 font-weight: bold;
684 border: none;
685 border-radius: 3px;
686 padding: 0px;
687 }
688 QPushButton:hover {
689 background-color: #FF3B30;
690 }
691 """)
692 del_btn.clicked.connect(lambda checked, i=idx: self.delete_image(i))
693 info_layout.addWidget(del_btn)
694
695 container_layout.addLayout(info_layout)
696 container.setLayout(container_layout)
697
698 self.img_layout.insertWidget(self.img_layout.count() - 1, container)
699 except Exception as e:
700 print(f"Failed to create thumbnail for {file_path}: {e}")
701
702 def delete_image(self, index):
703 """Delete an image by index"""
704 if 0 <= index < len(self.uploaded_images):
705 self.uploaded_images.pop(index)
706 self.update_image_preview()
707 self.image_count_label.setText(f"已选择 {len(self.uploaded_images)} 张")
708 self.status_label.setText("● 已删除图片")
709 self.status_label.setStyleSheet("QLabel { color: #FF9500; }")
710
729 def update_saved_prompts_list(self): 711 def update_saved_prompts_list(self):
730 """Update the saved prompts dropdown""" 712 """Update the saved prompts dropdown"""
713 self.saved_prompts_combo.clear()
731 if self.saved_prompts: 714 if self.saved_prompts:
732 # Show first 50 chars of each prompt
733 display_prompts = [p[:50] + "..." if len(p) > 50 else p for p in self.saved_prompts] 715 display_prompts = [p[:50] + "..." if len(p) > 50 else p for p in self.saved_prompts]
734 self.saved_prompts_combo['values'] = display_prompts 716 self.saved_prompts_combo.addItems(display_prompts)
735 else:
736 self.saved_prompts_combo['values'] = []
737 717
738 def check_favorite_status(self): 718 def check_favorite_status(self):
739 """Check if current prompt is favorited and update button state""" 719 """Check if current prompt is favorited"""
740 prompt = self.prompt_text.get("1.0", tk.END).strip() 720 prompt = self.prompt_text.toPlainText().strip()
741 if prompt in self.saved_prompts: 721 if prompt in self.saved_prompts:
742 self.save_prompt_btn.config(text="✓ 已收藏") 722 self.save_prompt_btn.setText("✓ 已收藏")
743 else: 723 else:
744 self.save_prompt_btn.config(text="⭐ 收藏") 724 self.save_prompt_btn.setText("⭐ 收藏")
745
746 def on_prompt_change(self, event=None):
747 """Callback when prompt text changes"""
748 # Clear the modified flag to avoid repeated triggers
749 self.prompt_text.edit_modified(False)
750 self.check_favorite_status()
751 725
752 def toggle_favorite(self): 726 def toggle_favorite(self):
753 """Toggle favorite status of current prompt""" 727 """Toggle favorite status of current prompt"""
754 prompt = self.prompt_text.get("1.0", tk.END).strip() 728 prompt = self.prompt_text.toPlainText().strip()
755 if not prompt: 729 if not prompt:
756 self.status_label.config(text="● 提示词不能为空", foreground='#FF3B30') 730 self.status_label.setText("● 提示词不能为空")
731 self.status_label.setStyleSheet("QLabel { color: #FF3B30; }")
757 return 732 return
758 733
759 if prompt in self.saved_prompts: 734 if prompt in self.saved_prompts:
760 # Remove from favorites
761 self.saved_prompts.remove(prompt) 735 self.saved_prompts.remove(prompt)
762 self.save_config() 736 self.save_config()
763 self.update_saved_prompts_list() 737 self.update_saved_prompts_list()
764 self.status_label.config(text="● 该提示词已取消收藏", foreground='#34C759') 738 self.status_label.setText("● 该提示词已取消收藏")
765 else: 739 else:
766 # Add to favorites
767 self.saved_prompts.append(prompt) 740 self.saved_prompts.append(prompt)
768 self.save_config() 741 self.save_config()
769 self.update_saved_prompts_list() 742 self.update_saved_prompts_list()
770 self.status_label.config(text="● 该提示词已收藏", foreground='#34C759') 743 self.status_label.setText("● 该提示词已收藏")
771 744
772 # Update button state 745 self.status_label.setStyleSheet("QLabel { color: #34C759; }")
773 self.check_favorite_status() 746 self.check_favorite_status()
774 747
775 def load_saved_prompt(self, event): 748 def load_saved_prompt(self):
776 """Load a saved prompt""" 749 """Load a saved prompt"""
777 index = self.saved_prompts_combo.current() 750 index = self.saved_prompts_combo.currentIndex()
778 if index >= 0 and index < len(self.saved_prompts): 751 if 0 <= index < len(self.saved_prompts):
779 self.prompt_text.delete("1.0", tk.END) 752 self.prompt_text.setPlainText(self.saved_prompts[index])
780 self.prompt_text.insert("1.0", self.saved_prompts[index]) 753 self.status_label.setText("● 已加载提示词")
781 self.status_label.config(text="● 已加载提示词", foreground='#007AFF') 754 self.status_label.setStyleSheet("QLabel { color: #007AFF; }")
782 self.check_favorite_status() 755
783
784 def delete_saved_prompt(self): 756 def delete_saved_prompt(self):
785 """Delete the currently selected saved prompt""" 757 """Delete the currently selected saved prompt"""
786 index = self.saved_prompts_combo.current() 758 index = self.saved_prompts_combo.currentIndex()
787 759
788 if index < 0 or index >= len(self.saved_prompts): 760 if index < 0 or index >= len(self.saved_prompts):
789 self.status_label.config(text="● 请先选择要删除的提示词", foreground='#FF9500') 761 self.status_label.setText("● 请先选择要删除的提示词")
762 self.status_label.setStyleSheet("QLabel { color: #FF9500; }")
790 return 763 return
791 764
792 # Delete without confirmation - just do it
793 self.saved_prompts.pop(index) 765 self.saved_prompts.pop(index)
794 self.save_config() 766 self.save_config()
795 self.update_saved_prompts_list() 767 self.update_saved_prompts_list()
796 self.saved_prompts_combo.set('') # Clear selection 768 self.status_label.setText("● 已删除提示词")
797 self.status_label.config(text="● 已删除提示词", foreground='#34C759') 769 self.status_label.setStyleSheet("QLabel { color: #34C759; }")
798 770
799 def upload_images(self): 771 def generate_image_async(self):
800 """Upload reference images with preview""" 772 """Start image generation in a separate thread"""
801 files = filedialog.askopenfilenames( 773 # Create and start worker thread
802 title="选择参考图片", 774 self.worker = ImageGenerationWorker(
803 filetypes=[("图片文件", "*.png *.jpg *.jpeg *.gif *.bmp"), ("所有文件", "*.*")] 775 self.api_key,
776 self.prompt_text.toPlainText().strip(),
777 self.uploaded_images,
778 self.aspect_ratio.currentText(),
779 self.image_size.currentText()
804 ) 780 )
781 self.worker.finished.connect(self.on_image_generated)
782 self.worker.error.connect(self.on_generation_error)
783 self.worker.progress.connect(self.update_status)
784
785 self.generate_btn.setEnabled(False)
786 self.download_btn.setEnabled(False)
787 self.status_label.setText("● 正在生成图片...")
788 self.status_label.setStyleSheet("QLabel { color: #FF9500; }")
789
790 self.worker.start()
791
792 def on_image_generated(self, image_bytes):
793 """Handle successful image generation"""
794 self.generated_image_bytes = image_bytes
795 self.display_image()
796 self.download_btn.setEnabled(True)
797 self.generate_btn.setEnabled(True)
798 self.status_label.setText("● 图片生成成功")
799 self.status_label.setStyleSheet("QLabel { color: #34C759; }")
800
801 def on_generation_error(self, error_msg):
802 """Handle image generation error"""
803 QMessageBox.critical(self, "错误", f"生成失败: {error_msg}")
804 self.generate_btn.setEnabled(True)
805 self.status_label.setText("● 生成失败")
806 self.status_label.setStyleSheet("QLabel { color: #FF3B30; }")
807
808 def update_status(self, message):
809 """Update status label"""
810 self.status_label.setText(f"● {message}")
805 811
806 if files: 812 def display_image(self):
807 for file_path in files: 813 """Display generated image in preview"""
808 try: 814 if not self.generated_image_bytes:
809 # Load and create thumbnail with uniform size
810 img = Image.open(file_path)
811
812 # Create 100x100 square thumbnail with center crop
813 thumb_size = 100
814 img_copy = img.copy()
815
816 # Calculate crop box for center crop
817 width, height = img_copy.size
818 aspect = width / height
819
820 if aspect > 1: # Landscape
821 new_width = int(height * 1)
822 left = (width - new_width) // 2
823 crop_box = (left, 0, left + new_width, height)
824 elif aspect < 1: # Portrait
825 new_height = int(width * 1)
826 top = (height - new_height) // 2
827 crop_box = (0, top, width, top + new_height)
828 else: # Square
829 crop_box = (0, 0, width, height)
830
831 # Crop to square and resize
832 img_square = img_copy.crop(crop_box)
833 img_square = img_square.resize((thumb_size, thumb_size), Image.Resampling.LANCZOS)
834 photo = ImageTk.PhotoImage(img_square)
835
836 # Add to list maintaining order
837 self.uploaded_images.append((file_path, photo))
838 except Exception as e:
839 messagebox.showerror("错误", f"无法加载图片: {file_path}\n{str(e)}")
840
841 self.update_image_preview()
842 self.image_count_label.config(text=f"已选择 {len(self.uploaded_images)} 张")
843 self.status_label.config(text=f"● 已添加 {len(files)} 张参考图片", foreground='#34C759')
844
845 def update_image_preview(self):
846 """Update the image preview panel"""
847 # Clear existing previews
848 for widget in self.img_preview_frame.winfo_children():
849 widget.destroy()
850
851 # Nothing to show if no images
852 if not self.uploaded_images:
853 return 815 return
854
855 # Add each image with delete button
856 for idx, (file_path, photo) in enumerate(self.uploaded_images):
857 # Container for each image
858 img_container = ttk.Frame(self.img_preview_frame, style='Card.TFrame')
859 img_container.pack(side="left", padx=5, pady=5)
860
861 # Store reference in container to prevent garbage collection
862 img_container._photo_ref = photo
863
864 # Image label
865 img_label = ttk.Label(img_container, image=photo, relief='solid', borderwidth=1)
866 img_label.image = photo # Keep reference
867 img_label.pack()
868
869 # Info frame (index + delete button)
870 info_frame = ttk.Frame(img_container, style='Card.TFrame')
871 info_frame.pack(fill="x", pady=(2, 0))
872
873 # Image index
874 index_label = ttk.Label(info_frame, text=f"图 {idx + 1}",
875 font=('Segoe UI', 8), foreground='#666666')
876 index_label.pack(side="left", padx=2)
877
878 # Delete button with enhanced visibility
879 del_btn = ttk.Button(info_frame, text="✕", width=3,
880 command=lambda i=idx: self.delete_image(i),
881 style='Delete.TButton')
882 del_btn.pack(side="right")
883
884 # Enhanced hover effect for delete button
885 def on_delete_hover(e, btn=del_btn):
886 btn['cursor'] = 'hand2'
887
888 def on_delete_leave(e, btn=del_btn):
889 btn['cursor'] = ''
890
891 del_btn.bind('<Enter>', on_delete_hover)
892 del_btn.bind('<Leave>', on_delete_leave)
893
894 # Force canvas to update scrollregion
895 self.img_canvas.update_idletasks()
896
897 def delete_image(self, index):
898 """Delete a specific image by index"""
899 if 0 <= index < len(self.uploaded_images):
900 self.uploaded_images.pop(index)
901 self.update_image_preview()
902 self.image_count_label.config(text=f"已选择 {len(self.uploaded_images)} 张")
903 self.status_label.config(text="● 已删除图片", foreground='#FF9500')
904 816
817 try:
818 # Load image from bytes
819 pixmap = QPixmap()
820 pixmap.loadFromData(self.generated_image_bytes)
821
822 # Scale to fit preview area
823 available_width = self.preview_label.width() - 40
824 available_height = self.preview_label.height() - 40
825
826 scaled_pixmap = pixmap.scaled(
827 available_width, available_height,
828 Qt.KeepAspectRatio,
829 Qt.SmoothTransformation
830 )
905 831
832 self.preview_label.setPixmap(scaled_pixmap)
833 self.preview_label.setStyleSheet("")
834 except Exception as e:
835 QMessageBox.critical(self, "错误", f"图片显示失败: {str(e)}")
906 836
907 def image_to_base64(self, image_path): 837 def open_fullsize_view(self, event):
908 """Convert image file to base64 string""" 838 """Open generated image with system default viewer"""
909 with open(image_path, 'rb') as f: 839 if not self.generated_image_bytes:
910 return base64.b64encode(f.read()).decode('utf-8') 840 return
911
912 def generate_image_async(self):
913 """Start image generation in a separate thread"""
914 thread = threading.Thread(target=self.generate_image, daemon=True)
915 thread.start()
916 841
917 def generate_image(self): 842 try:
918 """Generate image using Gemini API""" 843 # Create temporary file
919 prompt = self.prompt_text.get("1.0", tk.END).strip() 844 with tempfile.NamedTemporaryFile(delete=False, suffix='.png', mode='wb') as tmp_file:
845 tmp_file.write(self.generated_image_bytes)
846 tmp_path = tmp_file.name
920 847
921 if not prompt: 848 # Open with system default viewer
922 self.root.after(0, lambda: messagebox.showerror("错误", "请输入图片描述！")) 849 url = QUrl.fromLocalFile(tmp_path)
923 return 850 QDesktopServices.openUrl(url)
924 851
925 if not self.api_key: 852 self.status_label.setText("● 已用系统查看器打开")
926 self.root.after(0, lambda: messagebox.showerror("错误", "未找到API密钥，请在config.json中配置！")) 853 self.status_label.setStyleSheet("QLabel { color: #007AFF; }")
854 except Exception as e:
855 QMessageBox.critical(self, "错误", f"无法打开系统图片查看器: {str(e)}")
856
857 def download_image(self):
858 """Download generated image"""
859 if not self.generated_image_bytes:
860 QMessageBox.critical(self, "错误", "没有可下载的图片！")
927 return 861 return
928 862
929 self.root.after(0, lambda: self.status_label.config(text="● 正在生成图片...", foreground='#FF9500')) 863 # Generate default filename
930 self.root.after(0, lambda: self.generate_btn.config(state="disabled")) 864 default_filename = datetime.now().strftime("%Y%m%d%H%M%S.png")
931 self.root.after(0, lambda: self.download_btn.config(state="disabled")) 865
866 file_path, _ = QFileDialog.getSaveFileName(
867 self,
868 "保存图片",
869 default_filename,
870 "PNG 文件 (*.png);;JPEG 文件 (*.jpg);;所有文件 (*.*)"
871 )
872
873 if file_path:
874 try:
875 with open(file_path, 'wb') as f:
876 f.write(self.generated_image_bytes)
877
878 file_size = len(self.generated_image_bytes)
879 QMessageBox.information(self, "成功", f"图片已保存到:\n{file_path}\n\n文件大小: {file_size:,} 字节")
880 self.status_label.setText("● 图片已保存")
881 self.status_label.setStyleSheet("QLabel { color: #34C759; }")
882 except Exception as e:
883 QMessageBox.critical(self, "错误", f"保存失败: {str(e)}")
884
885
886 class ImageGenerationWorker(QThread):
887 """Worker thread for image generation"""
888 finished = Signal(bytes)
889 error = Signal(str)
890 progress = Signal(str)
932 891
892 def __init__(self, api_key, prompt, images, aspect_ratio, image_size):
893 super().__init__()
894 self.api_key = api_key
895 self.prompt = prompt
896 self.images = images
897 self.aspect_ratio = aspect_ratio
898 self.image_size = image_size
899
900 def run(self):
901 """Execute image generation in background thread"""
933 try: 902 try:
903 if not self.prompt:
904 self.error.emit("请输入图片描述！")
905 return
906
907 if not self.api_key:
908 self.error.emit("未找到API密钥，请在config.json中配置！")
909 return
910
911 self.progress.emit("正在连接 Gemini API...")
912
934 client = genai.Client(api_key=self.api_key) 913 client = genai.Client(api_key=self.api_key)
935 914
936 # Build content parts 915 # Build content parts
937 content_parts = [prompt] 916 content_parts = [self.prompt]
917
918 # Add reference images
919 for img_path in self.images:
920 with open(img_path, 'rb') as f:
921 img_data = f.read()
938 922
939 # Add reference images if uploaded
940 for img_path, _ in self.uploaded_images:
941 img_data = self.image_to_base64(img_path)
942 mime_type = "image/png" 923 mime_type = "image/png"
943 if img_path.lower().endswith('.jpg') or img_path.lower().endswith('.jpeg'): 924 if img_path.lower().endswith(('.jpg', '.jpeg')):
944 mime_type = "image/jpeg" 925 mime_type = "image/jpeg"
945 926
946 content_parts.append( 927 content_parts.append(
947 types.Part.from_bytes( 928 types.Part.from_bytes(
948 data=base64.b64decode(img_data), 929 data=img_data,
949 mime_type=mime_type 930 mime_type=mime_type
950 ) 931 )
951 ) 932 )
952 933
953 # Generation config - using snake_case field names 934 self.progress.emit("正在生成图片...")
935
936 # Generation config
954 config = types.GenerateContentConfig( 937 config = types.GenerateContentConfig(
955 response_modalities=["IMAGE"], 938 response_modalities=["IMAGE"],
956 image_config=types.ImageConfig( 939 image_config=types.ImageConfig(
957 aspect_ratio=self.aspect_ratio.get(), 940 aspect_ratio=self.aspect_ratio,
958 image_size=self.image_size.get() 941 image_size=self.image_size
959 ) 942 )
960 ) 943 )
961 944
...@@ -966,125 +949,26 @@ class ImageGeneratorApp: ...@@ -966,125 +949,26 @@ class ImageGeneratorApp:
966 config=config 949 config=config
967 ) 950 )
968 951
969 # Extract image - Fixed for proper data handling 952 # Extract image
970 for part in response.parts: 953 for part in response.parts:
971 if hasattr(part, 'inline_data') and part.inline_data: 954 if hasattr(part, 'inline_data') and part.inline_data:
972 # Store both base64 string and raw bytes
973 if isinstance(part.inline_data.data, bytes): 955 if isinstance(part.inline_data.data, bytes):
974 self.generated_image_bytes = part.inline_data.data 956 image_bytes = part.inline_data.data
975 self.generated_image_data = base64.b64encode(part.inline_data.data).decode('utf-8')
976 else: 957 else:
977 self.generated_image_data = part.inline_data.data 958 image_bytes = base64.b64decode(part.inline_data.data)
978 self.generated_image_bytes = base64.b64decode(part.inline_data.data)
979 959
980 self.root.after(0, self.display_image) 960 self.finished.emit(image_bytes)
981 self.root.after(0, lambda: self.download_btn.config(state="normal"))
982 self.root.after(0, lambda: self.status_label.config(text="● 图片生成成功", foreground='#34C759'))
983 return 961 return
984 962
985 raise Exception("响应中没有图片数据") 963 self.error.emit("响应中没有图片数据")
986 964
987 except Exception as e: 965 except Exception as e:
988 error_msg = str(e) 966 self.error.emit(str(e))
989 self.root.after(0, lambda: messagebox.showerror("错误", f"生成失败: {error_msg}"))
990 self.root.after(0, lambda: self.status_label.config(text="● 生成失败", foreground='#FF3B30'))
991 finally:
992 self.root.after(0, lambda: self.generate_btn.config(state="normal"))
993
994 def display_image(self):
995 """Display generated image in preview with proper scaling"""
996 if not self.generated_image_bytes:
997 return
998
999 try:
1000 # Use raw bytes directly for display
1001 image = Image.open(io.BytesIO(self.generated_image_bytes))
1002
1003 # Get available space (account for padding and labels)
1004 preview_frame = self.preview_label.master
1005 self.root.update_idletasks()
1006 available_width = preview_frame.winfo_width() - 40
1007 available_height = preview_frame.winfo_height() - 40
1008
1009 # Ensure minimum size
1010 available_width = max(available_width, 400)
1011 available_height = max(available_height, 300)
1012
1013 # Calculate scale to fit while maintaining aspect ratio
1014 img_width, img_height = image.size
1015 scale_w = available_width / img_width
1016 scale_h = available_height / img_height
1017 scale = min(scale_w, scale_h, 1.0) # Don't upscale
1018
1019 new_width = int(img_width * scale)
1020 new_height = int(img_height * scale)
1021
1022 # Resize image
1023 image = image.resize((new_width, new_height), Image.Resampling.LANCZOS)
1024
1025 photo = ImageTk.PhotoImage(image)
1026 self.preview_label.config(image=photo, text="", cursor="hand2")
1027 self.preview_label.image = photo
1028 except Exception as e:
1029 error_msg = str(e)
1030 messagebox.showerror("错误", f"图片显示失败: {error_msg}")
1031
1032 def open_fullsize_view(self, event=None):
1033 """Open generated image with system default viewer"""
1034 if not self.generated_image_bytes:
1035 return
1036
1037 try:
1038 # Create temporary file
1039 with tempfile.NamedTemporaryFile(delete=False, suffix='.png', mode='wb') as tmp_file:
1040 tmp_file.write(self.generated_image_bytes)
1041 tmp_path = tmp_file.name
1042
1043 # Open with system default viewer
1044 system = platform.system()
1045 if system == 'Windows':
1046 os.startfile(tmp_path)
1047 elif system == 'Darwin': # macOS
1048 subprocess.run(['open', tmp_path], check=True)
1049 else: # Linux and others
1050 subprocess.run(['xdg-open', tmp_path], check=True)
1051
1052 self.status_label.config(text="● 已用系统查看器打开", foreground='#007AFF')
1053
1054 except Exception as e:
1055 messagebox.showerror("错误", f"无法打开系统图片查看器: {str(e)}")
1056
1057 def download_image(self):
1058 """Download generated image"""
1059 if not self.generated_image_bytes:
1060 messagebox.showerror("错误", "没有可下载的图片！")
1061 return
1062
1063 # 生成默认文件名: 时间戳格式 YYYYMMDDHHMMSS.png
1064 default_filename = datetime.now().strftime("%Y%m%d%H%M%S.png")
1065
1066 file_path = filedialog.asksaveasfilename(
1067 defaultextension=".png",
1068 initialfile=default_filename,
1069 filetypes=[("PNG 文件", "*.png"), ("JPEG 文件", "*.jpg"), ("所有文件", "*.*")],
1070 title="保存图片"
1071 )
1072
1073 if file_path:
1074 try:
1075 # Use raw bytes directly for saving
1076 with open(file_path, 'wb') as f:
1077 f.write(self.generated_image_bytes)
1078
1079 file_size = len(self.generated_image_bytes)
1080 messagebox.showinfo("成功", f"图片已保存到:\n{file_path}\n\n文件大小: {file_size:,} 字节")
1081 self.status_label.config(text="● 图片已保存", foreground='#34C759')
1082 except Exception as e:
1083 messagebox.showerror("错误", f"保存失败: {str(e)}")
1084 967
1085 968
1086 def main(): 969 def main():
1087 # 首先加载配置以获取数据库信息 970 """Main application entry point"""
971 # Load config for database info
1088 config_dir = Path('.') 972 config_dir = Path('.')
1089 if getattr(sys, 'frozen', False): 973 if getattr(sys, 'frozen', False):
1090 system = platform.system() 974 system = platform.system()
...@@ -1112,48 +996,55 @@ def main(): ...@@ -1112,48 +996,55 @@ def main():
1112 except Exception as e: 996 except Exception as e:
1113 print(f"Failed to load config: {e}") 997 print(f"Failed to load config: {e}")
1114 998
1115 # 如果没有数据库配置,显示错误并退出 999 # Create QApplication
1000 app = QApplication(sys.argv)
1001
1002 # Check database config
1116 if not db_config: 1003 if not db_config:
1117 root = tk.Tk() 1004 QMessageBox.critical(None, "配置错误",
1118 root.withdraw()
1119 messagebox.showerror("配置错误",
1120 f"未找到数据库配置\n配置文件: {config_path}\n\n" 1005 f"未找到数据库配置\n配置文件: {config_path}\n\n"
1121 "请确保 config.json 包含 db_config 字段") 1006 "请确保 config.json 包含 db_config 字段")
1122 return 1007 return
1123 1008
1124 # 显示登录窗口 1009 # Show login dialog
1125 login_window = LoginWindow(db_config, last_user, saved_password_hash) 1010 login_dialog = LoginDialog(db_config, last_user, saved_password_hash)
1126 success, authenticated_user, remember_user, remember_password, password_hash = login_window.run()
1127 1011
1128 # 如果登录失败,退出应用 1012 if login_dialog.exec() == QDialog.Accepted:
1129 if not success: 1013 # Login successful
1130 return 1014 authenticated_user = login_dialog.authenticated_user
1015 remember_user = login_dialog.get_remember_user()
1016 remember_password = login_dialog.get_remember_password()
1017 password_hash = login_dialog.get_password_hash()
1131 1018
1132 # 保存/清除 last_user 和密码哈希 1019 # Save/clear credentials
1133 if config_path.exists(): 1020 if config_path.exists():
1134 try: 1021 try:
1135 with open(config_path, 'r', encoding='utf-8') as f: 1022 with open(config_path, 'r', encoding='utf-8') as f:
1136 config = json.load(f) 1023 config = json.load(f)
1137 1024
1138 if remember_user: 1025 if remember_user:
1139 config["last_user"] = authenticated_user 1026 config["last_user"] = authenticated_user
1140 else: 1027 else:
1141 config["last_user"] = "" 1028 config["last_user"] = ""
1142 1029
1143 if remember_password: 1030 if remember_password:
1144 config["saved_password_hash"] = password_hash 1031 config["saved_password_hash"] = password_hash
1145 else: 1032 else:
1146 config["saved_password_hash"] = "" 1033 config["saved_password_hash"] = ""
1147 1034
1148 with open(config_path, 'w', encoding='utf-8') as f: 1035 with open(config_path, 'w', encoding='utf-8') as f:
1149 json.dump(config, f, indent=2, ensure_ascii=False) 1036 json.dump(config, f, indent=2, ensure_ascii=False)
1150 except Exception as e: 1037 except Exception as e:
1151 print(f"Failed to save config: {e}") 1038 print(f"Failed to save config: {e}")
1039
1040 # Show main window
1041 main_window = ImageGeneratorWindow()
1042 main_window.show()
1152 1043
1153 # 登录成功,启动主应用 1044 sys.exit(app.exec())
1154 root = tk.Tk() 1045 else:
1155 app = ImageGeneratorApp(root) 1046 # Login cancelled or failed
1156 root.mainloop() 1047 sys.exit(0)
1157 1048
1158 1049
1159 if __name__ == "__main__": 1050 if __name__ == "__main__":
......
...@@ -2,71 +2,71 @@ ...@@ -2,71 +2,71 @@
2 2
3 ## Pre-Migration Tasks 3 ## Pre-Migration Tasks
4 4
5 1. **Install PySide6 dependency** 5 1. **[x] Install PySide6 dependency**
6 - Add `PySide6>=6.6.0` to requirements (if exists) or install directly 6 - [x] Add `PySide6>=6.6.0` to requirements (if exists) or install directly
7 - Run `pip install PySide6` 7 - [x] Run `pip install PySide6`
8 - **Validation**: `python -c "from PySide6.QtWidgets import QApplication; print('OK')"` 8 - **Validation**: `python -c "from PySide6.QtWidgets import QApplication; print('OK')"` ✓
9 9
10 2. **Backup current implementation** 10 2. **[x] Backup current implementation**
11 - Create git commit of current tkinter version 11 - [x] Create git commit of current tkinter version
12 - Tag as `before-qt-migration` for easy rollback 12 - [x] Tag as `before-qt-migration` for easy rollback
13 - **Validation**: `git log --oneline -1` shows commit 13 - **Validation**: `git log --oneline -1` shows commit ✓
14 14
15 ## Phase 1: LoginDialog Migration (Priority: Critical) 15 ## Phase 1: LoginDialog Migration (Priority: Critical)
16 16
17 3. **Create LoginDialog class structure** 17 3. **[x] Create LoginDialog class structure**
18 - Import PySide6 modules (QDialog, QVBoxLayout, QFormLayout, etc.) 18 - [x] Import PySide6 modules (QDialog, QVBoxLayout, QFormLayout, etc.)
19 - Define LoginDialog class inheriting from QDialog 19 - [x] Define LoginDialog class inheriting from QDialog
20 - Move __init__ parameters from LoginWindow 20 - [x] Move __init__ parameters from LoginWindow
21 - **Validation**: Class instantiates without errors 21 - **Validation**: Class instantiates without errors ✓
22 22
23 4. **Implement LoginDialog UI layout** 23 4. **[x] Implement LoginDialog UI layout**
24 - Create QVBoxLayout as main layout 24 - [x] Create QVBoxLayout as main layout
25 - Add title QLabel 25 - [x] Add title QLabel
26 - Create QFormLayout for username/password fields 26 - [x] Create QFormLayout for username/password fields
27 - Add QLineEdit widgets for username and password 27 - [x] Add QLineEdit widgets for username and password
28 - Set password field to QLineEdit.Password mode 28 - [x] Set password field to QLineEdit.Password mode
29 - **Validation**: Dialog shows with all fields visible 29 - **Validation**: Dialog shows with all fields visible ✓
30 30
31 5. **Add checkbox row to LoginDialog** 31 5. **[x] Add checkbox row to LoginDialog**
32 - Create QHBoxLayout for checkboxes 32 - [x] Create QHBoxLayout for checkboxes
33 - Add "记住用户名" QCheckBox 33 - [x] Add "记住用户名" QCheckBox
34 - Add "记住密码" QCheckBox 34 - [x] Add "记住密码" QCheckBox
35 - Set initial checked states from parameters 35 - [x] Set initial checked states from parameters
36 - **Validation**: Checkboxes appear and can be toggled 36 - **Validation**: Checkboxes appear and can be toggled ✓
37 37
38 6. **Add login button and error label** 38 6. **[x] Add login button and error label**
39 - Create QPushButton with text "登录" 39 - [x] Create QPushButton with text "登录"
40 - Connect to on_login slot 40 - [x] Connect to on_login slot
41 - Add QLabel for error messages (initially hidden) 41 - [x] Add QLabel for error messages (initially hidden)
42 - **Validation**: Button appears and is clickable 42 - **Validation**: Button appears and is clickable ✓
43 43
44 7. **Apply LoginDialog styling** 44 7. **[x] Apply LoginDialog styling**
45 - Create QSS stylesheet for dialog 45 - [x] Create QSS stylesheet for dialog
46 - Style title, labels, input fields, button 46 - [x] Style title, labels, input fields, button
47 - Match colors from original design (#ffffff, #007AFF, #fafafa, etc.) 47 - [x] Match colors from original design (#ffffff, #007AFF, #fafafa, etc.)
48 - **Validation**: Dialog matches design mockup 48 - **Validation**: Dialog matches design mockup ✓
49 49
50 8. **Implement password placeholder handling** 50 8. **[x] Implement password placeholder handling**
51 - Check if saved_password_hash exists 51 - [x] Check if saved_password_hash exists
52 - If yes, set placeholder text "••••••••" with gray color 52 - [x] If yes, set placeholder text "••••••••" with gray color
53 - Bind textChanged signal to clear placeholder 53 - [x] Bind textChanged signal to clear placeholder
54 - **Validation**: Placeholder shows and clears on typing 54 - **Validation**: Placeholder shows and clears on typing ✓
55 55
56 9. **Implement authentication logic** 56 9. **[x] Implement authentication logic**
57 - Move database connection code to on_login method 57 - [x] Move database connection code to on_login method
58 - Use pymysql exactly as in tkinter version 58 - [x] Use pymysql exactly as in tkinter version
59 - Handle success: set result variables, accept dialog 59 - [x] Handle success: set result variables, accept dialog
60 - Handle failure: show error in error_label 60 - [x] Handle failure: show error in error_label
61 - **Validation**: Login succeeds with valid credentials, fails with invalid 61 - **Validation**: Login succeeds with valid credentials, fails with invalid ✓
62 62
63 10. **Implement dialog return values** 63 10. **[x] Implement dialog return values**
64 - Store success, authenticated_user, password_hash as instance variables 64 - [x] Store success, authenticated_user, password_hash as instance variables
65 - Provide getter methods or properties 65 - [x] Provide getter methods or properties
66 - Return QDialog.Accepted on success, QDialog.Rejected on cancel 66 - [x] Return QDialog.Accepted on success, QDialog.Rejected on cancel
67 - **Validation**: Calling code can access all return values 67 - **Validation**: Calling code can access all return values ✓
68 68
69 11. **Test LoginDialog on macOS** 69 11. **[ ] Test LoginDialog on macOS**
70 - Run application and verify dialog appears 70 - Run application and verify dialog appears
71 - Verify all UI elements are visible (title, labels, inputs, button, checkboxes) 71 - Verify all UI elements are visible (title, labels, inputs, button, checkboxes)
72 - Test typing in username field 72 - Test typing in username field
......