feat: 增加AI断句居中、字体缩放、Gemini/OpenAI断句支持等功能 (v1.6.5)

Author: hgmzhn

VERSION

@@ -1 +1 @@
-1.6.0
+1.6.5

desktop_qt_ui/app_logic.py

@@ -121,10 +121,17 @@ def on_file_completed(self, result):
             os.makedirs(final_output_folder, exist_ok=True)
 
             save_kwargs = {}
-            if final_output_path.lower().endswith(('.jpg', '.jpeg', '.webp')):
+            image_to_save = result['image_data']
+
+            # Convert RGBA to RGB for JPEG format
+            if final_output_path.lower().endswith(('.jpg', '.jpeg')):
+                if image_to_save.mode == 'RGBA':
+                    image_to_save = image_to_save.convert('RGB')
+                save_kwargs['quality'] = save_quality
+            elif final_output_path.lower().endswith('.webp'):
                 save_kwargs['quality'] = save_quality
 
-            result['image_data'].save(final_output_path, **save_kwargs)
+            image_to_save.save(final_output_path, **save_kwargs)
 
             # 更新translation_map.json
             self._update_translation_map(original_path, final_output_path)
@@ -335,10 +342,10 @@ def get_display_mapping(self, key: str) -> Optional[Dict[str, str]]:
                 },
                 "translator": {
                     "youdao": "有道翻译", "baidu": "百度翻译", "deepl": "DeepL", "papago": "Papago",
-                    "caiyun": "彩云小译", "chatgpt": "ChatGPT", "chatgpt_2stage": "ChatGPT (2-Stage)",
-                    "none": "无", "original": "原文", "sakura": "Sakura", "deepseek": "DeepSeek",
-                    "groq": "Groq", "gemini": "Google Gemini", "gemini_2stage": "Gemini (2-Stage)",
-                    "openai_hq": "高质量翻译 OpenAI", "gemini_hq": "高质量翻译 Gemini", "custom_openai": "自定义 OpenAI",
+                    "caiyun": "彩云小译", "openai": "OpenAI",
+                    "none": "无", "original": "原文", "sakura": "Sakura",
+                    "groq": "Groq", "gemini": "Google Gemini",
+                    "openai_hq": "高质量翻译 OpenAI", "gemini_hq": "高质量翻译 Gemini",
                     "offline": "离线翻译", "nllb": "NLLB", "nllb_big": "NLLB (Big)", "sugoi": "Sugoi",
                     "jparacrawl": "JParaCrawl", "jparacrawl_big": "JParaCrawl (Big)", "m2m100": "M2M100",
                     "m2m100_big": "M2M100 (Big)", "mbart50": "mBART50", "qwen2": "Qwen2", "qwen2_big": "Qwen2 (Big)",
@@ -357,6 +364,8 @@ def get_display_mapping(self, key: str) -> Optional[Dict[str, str]]:
                     "inpainter": "修复模型", "inpainting_size": "修复大小", "inpainting_precision": "修复精度",
                     "renderer": "渲染器", "alignment": "对齐方式", "disable_font_border": "禁用字体边框",
                     "disable_auto_wrap": "AI断句", "font_size_offset": "字体大小偏移量", "font_size_minimum": "最小字体大小",
+                    "max_font_size": "最大字体大小", "font_scale_ratio": "字体缩放比例",
+                    "center_text_in_bubble": "AI断句时文本居中",
                     "direction": "文本方向", "uppercase": "大写", "lowercase": "小写", "gimp_font": "GIMP字体",
                     "font_path": "字体路径", "no_hyphenation": "禁用连字符", "font_color": "字体颜色",
                     "auto_rotate_symbols": "竖排内横排", "rtl": "从右到左", "layout_mode": "排版模式",
@@ -572,10 +581,17 @@ def on_task_finished(self, results):
                                     os.makedirs(output_folder, exist_ok=True)
 
                                     save_kwargs = {}
-                                    if file_extension in ['.jpg', '.jpeg', '.webp']:
+                                    image_to_save = result['image_data']
+
+                                    # Convert RGBA to RGB for JPEG format
+                                    if file_extension in ['.jpg', '.jpeg']:
+                                        if image_to_save.mode == 'RGBA':
+                                            image_to_save = image_to_save.convert('RGB')
                                         save_kwargs['quality'] = save_quality
-                                    
-                                    result['image_data'].save(final_output_path, **save_kwargs)
+                                    elif file_extension == '.webp':
+                                        save_kwargs['quality'] = save_quality
+
+                                    image_to_save.save(final_output_path, **save_kwargs)
                                     saved_files.append(final_output_path)
                                     self.logger.info(f"成功保存文件: {final_output_path}")
                                 except Exception as e:

desktop_qt_ui/core/config_models.py

@@ -57,6 +57,9 @@ class RenderSettings(BaseModel):
     auto_rotate_symbols: bool = True
     rtl: bool = False
     layout_mode: str = "smart_scaling"
+    max_font_size: int = 0
+    font_scale_ratio: float = 1.0
+    center_text_in_bubble: bool = False
 
 class UpscaleSettings(BaseModel):
     upscaler: str = "esrgan"

desktop_qt_ui/editor/commands.py

@@ -37,7 +37,6 @@ def __init__(self, model: EditorModel, region_index: int, old_data: Dict[str, An
     def _apply_data(self, data_to_apply: Dict[str, Any]):
         """将给定的数据字典应用到模型中的区域。"""
         if not (0 <= self._index < len(self._model._regions)):
-            print(f"DEBUG: Invalid index {self._index} for model with {len(self._model._regions)} regions")
             return
 
         # 检查 center 是否改变
@@ -46,16 +45,11 @@ def _apply_data(self, data_to_apply: Dict[str, Any]):
         center_changed = old_center != new_center
 
         # 直接更新模型中的区域字典
-        old_angle = self._model._regions[self._index].get('angle', 0.0)
-        new_angle = data_to_apply.get('angle', 0.0)
-        print(f"DEBUG: Applying data to region {self._index}: angle {old_angle:.2f} -> {new_angle:.2f}, center_changed={center_changed}")
-
         self._model._regions[self._index] = data_to_apply
 
         # 如果 center 改变了,需要触发完全更新,重新创建 item
         # 否则只触发单个 item 更新
         if center_changed:
-            print(f"DEBUG: Center changed, triggering full update")
             # 保存当前选择状态
             old_selection = self._model.get_selection()
             # 触发完全更新

desktop_qt_ui/editor/graphics_items.py

@@ -619,6 +619,35 @@ def mouseMoveEvent(self, event: QGraphicsSceneMouseEvent):
         event.accept()
 
     def mouseReleaseEvent(self, event: QGraphicsSceneMouseEvent):
+        # CRITICAL FIX: 即使 _interaction_mode 是 'none'，也要检查位置是否变化
+        # Qt 的 ItemIsMovable 会自动移动 item，但不会触发我们的 move 逻辑
+        current_pos = self.pos()
+        if current_pos != self.visual_center:
+            # 位置发生了变化，需要更新模型
+            delta_x = current_pos.x() - self.visual_center.x()
+            delta_y = current_pos.y() - self.visual_center.y()
+
+            if abs(delta_x) >= 0.1 or abs(delta_y) >= 0.1:
+                # 更新 lines：所有点都加上偏移量
+                new_lines = []
+                for poly in self.desktop_geometry.lines:
+                    new_poly = [[p[0] + delta_x, p[1] + delta_y] for p in poly]
+                    new_lines.append(new_poly)
+
+                # 更新内部状态
+                self.visual_center = current_pos
+                self.desktop_geometry.center = [current_pos.x(), current_pos.y()]
+                self.desktop_geometry.lines = new_lines
+
+                import copy
+                new_region_data = copy.deepcopy(self.region_data)
+                new_region_data['center'] = [current_pos.x(), current_pos.y()]
+                new_region_data['lines'] = new_lines
+
+                # 更新模型
+                self.geometry_callback(self.region_index, new_region_data)
+                self.region_data.update(new_region_data)
+
         if self._interaction_mode != 'none':
             self.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsMovable, True)
 
@@ -653,8 +682,6 @@ def mouseReleaseEvent(self, event: QGraphicsSceneMouseEvent):
                 new_region_data['center'] = [new_center.x(), new_center.y()]
                 new_region_data['lines'] = new_lines
 
-                print(f"[MOVE DEBUG] Region {self.region_index}: old_center=({old_center.x():.1f}, {old_center.y():.1f}), new_center=({new_center.x():.1f}, {new_center.y():.1f})")
-
                 # Update the model via callback
                 self.geometry_callback(self.region_index, new_region_data)
                 self.region_data.update(new_region_data)

desktop_qt_ui/editor/graphics_view.py

@@ -558,6 +558,9 @@ def _update_text_visuals(self):
                 render_params.get('hyphenate'),
                 render_params.get('font_size_offset'),
                 render_params.get('font_size_minimum'),
+                render_params.get('max_font_size'),
+                render_params.get('font_scale_ratio'),
+                render_params.get('center_text_in_bubble'),
                 render_params.get('text_stroke_width'),
                 render_params.get('shadow_radius'),
                 render_params.get('shadow_strength'),

desktop_qt_ui/editor/text_renderer_backend.py

@@ -113,30 +113,45 @@ def render_text_for_region(text_block: TextBlock, dst_points: np.ndarray, transf
                 h_ext = int((w_temp / r_orig - h_temp) // 2) if r_orig > 0 else 0
                 if h_ext >= 0:
                     box = np.zeros((h_temp + h_ext * 2, w_temp, 4), dtype=np.uint8)
-                    box[h_ext:h_ext+h_temp, 0:w_temp] = rendered_surface
+                    # Center vertically when enabled
+                    if config_obj and config_obj.render.center_text_in_bubble and config_obj.render.disable_auto_wrap:
+                        box[h_ext:h_ext+h_temp, 0:w_temp] = rendered_surface
+                    else:
+                        box[0:h_temp, 0:w_temp] = rendered_surface
                 else:
                     box = rendered_surface.copy()
             else:
                 w_ext = int((h_temp * r_orig - w_temp) // 2)
                 if w_ext >= 0:
                     box = np.zeros((h_temp, w_temp + w_ext * 2, 4), dtype=np.uint8)
-                    # 完全匹配后端逻辑：文字放在左侧而不是居中
-                    box[0:h_temp, 0:w_temp] = rendered_surface 
+                    # Center horizontally when enabled
+                    if config_obj and config_obj.render.center_text_in_bubble and config_obj.render.disable_auto_wrap:
+                        box[0:h_temp, w_ext:w_ext+w_temp] = rendered_surface
+                    else:
+                        box[0:h_temp, 0:w_temp] = rendered_surface
                 else:
                     box = rendered_surface.copy()
         else: # Vertical
             if r_temp > r_orig:
                 h_ext = int(w_temp / (2 * r_orig) - h_temp / 2) if r_orig > 0 else 0
                 if h_ext >= 0:
                     box = np.zeros((h_temp + h_ext * 2, w_temp, 4), dtype=np.uint8)
-                    box[0:h_temp, 0:w_temp] = rendered_surface
+                    # Center vertically when enabled
+                    if config_obj and config_obj.render.center_text_in_bubble and config_obj.render.disable_auto_wrap:
+                        box[h_ext:h_ext+h_temp, 0:w_temp] = rendered_surface
+                    else:
+                        box[0:h_temp, 0:w_temp] = rendered_surface
                 else:
                     box = rendered_surface.copy()
             else:
                 w_ext = int((h_temp * r_orig - w_temp) / 2)
                 if w_ext >= 0:
                     box = np.zeros((h_temp, w_temp + w_ext * 2, 4), dtype=np.uint8)
-                    box[0:h_temp, w_ext:w_ext+w_temp] = rendered_surface
+                    # Center horizontally when enabled
+                    if config_obj and config_obj.render.center_text_in_bubble and config_obj.render.disable_auto_wrap:
+                        box[0:h_temp, w_ext:w_ext+w_temp] = rendered_surface
+                    else:
+                        box[0:h_temp, 0:w_temp] = rendered_surface
                 else:
                     box = rendered_surface.copy()
 

desktop_qt_ui/main_window.py

@@ -100,7 +100,7 @@ def _connect_signals(self):
 
         # --- View Switching Connections ---
         self.main_view_action.triggered.connect(lambda: self.stacked_widget.setCurrentWidget(self.main_view))
-        self.editor_view_action.triggered.connect(self.enter_editor_mode)
+        self.editor_view_action.triggered.connect(self.switch_to_editor_view)
 
         # --- 撤销/重做连接到编辑器controller ---
         self.undo_action.triggered.connect(self.editor_controller.undo)
@@ -133,6 +133,13 @@ def on_task_completed(self, saved_files: list):
             self.logger.info("User chose to open results in editor.")
             self.enter_editor_mode(files_to_load=saved_files)
 
+    def switch_to_editor_view(self):
+        """
+        Simply switches to the editor view without reloading file lists.
+        Used when user manually switches views.
+        """
+        self.stacked_widget.setCurrentWidget(self.editor_view)
+
     def enter_editor_mode(self, file_to_load: str = None, files_to_load: list = None):
         """
         Switches to the editor view and loads the necessary files.

desktop_qt_ui/services/config_service.py

@@ -10,7 +10,7 @@
 from dataclasses import dataclass, field
 from typing import Any, Dict, List, Optional
 
-from dotenv import dotenv_values, set_key
+from dotenv import dotenv_values, set_key, load_dotenv
 
 from core.config_models import AppSettings
 
@@ -237,11 +237,13 @@ def save_env_var(self, key: str, value: str) -> bool:
                 os.makedirs(os.path.dirname(self.env_path), exist_ok=True)
                 with open(self.env_path, 'w'):
                     pass
-                    
+
             set_key(self.env_path, key, value)
+            # 重新加载环境变量到os.environ，使其立即生效
+            load_dotenv(self.env_path, override=True)
             self.logger.info(f"保存环境变量: {key}")
             return True
-            
+
         except Exception as e:
             self.logger.error(f"保存环境变量失败: {e}")
             return False