Skip to content

Commit 1f3ab04

Browse files
committed
Centralize desktop Qt UI modules
1 parent ac316ce commit 1f3ab04

74 files changed

Lines changed: 3431 additions & 4340 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build-and-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ jobs:
190190
cp -r doc dist/manga-translator-cpu/_internal/
191191
mkdir -p dist/manga-translator-cpu/_internal/desktop_qt_ui
192192
cp -r desktop_qt_ui/locales dist/manga-translator-cpu/_internal/desktop_qt_ui/locales
193-
cp -r desktop_qt_ui/styles dist/manga-translator-cpu/_internal/desktop_qt_ui/styles
193+
cp -r desktop_qt_ui/ui dist/manga-translator-cpu/_internal/desktop_qt_ui/ui
194194
printf '%s\n' "$APP_VERSION" > dist/manga-translator-cpu/_internal/VERSION
195195
196196
cp -r examples dist/manga-translator-gpu/_internal/
@@ -200,7 +200,7 @@ jobs:
200200
cp -r doc dist/manga-translator-gpu/_internal/
201201
mkdir -p dist/manga-translator-gpu/_internal/desktop_qt_ui
202202
cp -r desktop_qt_ui/locales dist/manga-translator-gpu/_internal/desktop_qt_ui/locales
203-
cp -r desktop_qt_ui/styles dist/manga-translator-gpu/_internal/desktop_qt_ui/styles
203+
cp -r desktop_qt_ui/ui dist/manga-translator-gpu/_internal/desktop_qt_ui/ui
204204
printf '%s\n' "$APP_VERSION" > dist/manga-translator-gpu/_internal/VERSION
205205
206206
- name: Create Release Archives using 7-Zip with Splitting

desktop_qt_ui/app_logic.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1725,7 +1725,7 @@ def add_folder(self):
17251725
last_dir = self.get_last_open_dir()
17261726

17271727
# 使用自定义的现代化文件夹选择器
1728-
from widgets.folder_dialog import select_folders
1728+
from ui.secondary_pages.folder_dialog import select_folders
17291729

17301730
folders = select_folders(
17311731
parent=None,
@@ -2449,7 +2449,7 @@ def shutdown(self):
24492449

24502450
# 关闭缩略图加载线程池
24512451
try:
2452-
from desktop_qt_ui.widgets.file_list_view import (
2452+
from ui.widgets.file_list_view import (
24532453
shutdown_thumbnail_executor,
24542454
)
24552455
shutdown_thumbnail_executor()

desktop_qt_ui/editor/alignment_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from typing import TYPE_CHECKING
99

1010
if TYPE_CHECKING:
11-
from .graphics_items import RegionTextItem
11+
from ui.editor.graphics_items import RegionTextItem
1212

1313

1414
def _get_white_frame_world_ref(item: "RegionTextItem", ref_key: str) -> float | None:

desktop_qt_ui/editor/controller_document_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from PyQt6.QtWidgets import QMessageBox
88
from services import get_render_parameter_service
9-
from widgets.themed_message_box import apply_message_box_style
9+
from ui.secondary_pages.themed_message_box import apply_message_box_style
1010

1111
from .document_load_worker import DocumentLoadWorker
1212
from .session import DocumentLoadFailure, DocumentSnapshot

desktop_qt_ui/editor/editor_controller.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ def set_view(self, view):
417417
if graphics_view is not None:
418418
graphics_view.set_controller(self)
419419
# 初始化Toast管理器
420-
from desktop_qt_ui.widgets.toast_notification import ToastManager
420+
from ui.widgets.toast_notification import ToastManager
421421
self.toast_manager = ToastManager(view)
422422
# 连接Toast信号到主线程槽函数
423423
self._show_toast_signal.connect(self._show_toast_in_main_thread)

desktop_qt_ui/editor/editor_logic.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
from PyQt6.QtCore import QObject, pyqtSignal, pyqtSlot
66
from PyQt6.QtWidgets import QFileDialog
77
from services import get_config_service, get_logger
8-
from widgets.folder_dialog import select_folders
9-
from widgets.file_list_view import natural_sort_key
8+
from ui.secondary_pages.folder_dialog import select_folders
9+
from ui.widgets.file_list_view import natural_sort_key
1010

1111

1212
class EditorLogic(QObject):

desktop_qt_ui/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
3939
except ImportError:
4040
pass
4141

42-
from main_window import MainWindow
42+
from ui.main_window import MainWindow
4343
from PyQt6.QtWidgets import QApplication
4444
from services import init_services
4545
from utils.app_version import get_app_version
4646
from utils.resource_helper import iter_existing_resource_paths, load_icon_from_resources
47-
from widgets.themed_message_box import install_themed_message_boxes
47+
from ui.secondary_pages.themed_message_box import install_themed_message_boxes
4848

4949

5050
# 全局异常处理器,捕获未处理的异常并记录到日志

desktop_qt_ui/main_view_parts/__init__.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)