je-editor 0.0.220__py3-none-any.whl → 0.0.222__py3-none-any.whl

je_editor/pyside_ui/browser/browser_widget.py

@@ -8,53 +8,82 @@ from je_editor.utils.multi_language.multi_language_wrapper import language_wrapp
 
 
 class BrowserWidget(QWidget):
+    """
+    A composite browser widget with navigation buttons, search bar, and embedded BrowserView.
+    瀏覽器元件：包含導覽按鈕、搜尋列，以及內嵌的 BrowserView。
+    """
 
     def __init__(self, start_url: str = "https://www.google.com/",
                  search_prefix: str = "https://www.google.com.tw/search?q="):
+        """
+        Initialize the browser widget with a start URL and a search prefix.
+        使用起始網址與搜尋前綴字串初始化瀏覽器元件。
+        """
         super().__init__()
         jeditor_logger.info("Init BrowserWidget "
                             f"start_url: {start_url} "
                             f"search_prefix: {search_prefix}")
-        # Browser setting
-        self.browser = BrowserView(start_url)
-        self.search_prefix = search_prefix
+
+        # --- Browser setting / 瀏覽器設定 ---
+        self.browser = BrowserView(start_url)   # 內嵌的瀏覽器視圖
+        self.search_prefix = search_prefix      # 搜尋引擎前綴字串
         self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose)
-        # Top bar
+
+        # --- Top bar buttons / 上方工具列按鈕 ---
         self.back_button = QPushButton(language_wrapper.language_word_dict.get("browser_back_button"))
-        self.back_button.clicked.connect(self.browser.back)
+        self.back_button.clicked.connect(self.browser.back)   # 返回上一頁
+
         self.forward_button = QPushButton(language_wrapper.language_word_dict.get("browser_forward_button"))
-        self.forward_button.clicked.connect(self.browser.forward)
+        self.forward_button.clicked.connect(self.browser.forward)  # 前往下一頁
+
         self.reload_button = QPushButton(language_wrapper.language_word_dict.get("browser_reload_button"))
-        self.reload_button.clicked.connect(self.browser.reload)
+        self.reload_button.clicked.connect(self.browser.reload)    # 重新整理
+
         self.search_button = QPushButton(language_wrapper.language_word_dict.get("browser_search_button"))
-        self.search_button.clicked.connect(self.search)
+        self.search_button.clicked.connect(self.search)            # 搜尋按鈕
+
+        # URL / Search input line (custom QLineEdit)
         self.url_input = BrowserLineSearch(self)
-        # Action
+
+        # --- Action: Ctrl+F to find text / 快捷鍵 Ctrl+F 搜尋文字 ---
         self.find_action = QAction()
         self.find_action.setShortcut("Ctrl+f")
         self.find_action.triggered.connect(self.find_text)
         self.addAction(self.find_action)
-        # Layout
+
+        # --- Layout / 版面配置 ---
         self.grid_layout = QGridLayout()
         self.grid_layout.addWidget(self.back_button, 0, 0)
         self.grid_layout.addWidget(self.forward_button, 0, 1)
         self.grid_layout.addWidget(self.reload_button, 0, 2)
         self.grid_layout.addWidget(self.url_input, 0, 3)
         self.grid_layout.addWidget(self.search_button, 0, 4)
-        self.grid_layout.addWidget(self.browser, 1, 0, -1, -1)
+        self.grid_layout.addWidget(self.browser, 1, 0, -1, -1)  # 瀏覽器視圖佔滿下方
         self.setLayout(self.grid_layout)
 
     def search(self):
+        """
+        Perform a search using the text in the input line.
+        使用輸入框的文字進行搜尋，將字串附加到 search_prefix 後送出。
+        """
         jeditor_logger.info("BrowserWidget Search")
         self.browser.setUrl(f"{self.search_prefix}{self.url_input.text()}")
 
     def find_text(self):
+        """
+        Open a dialog to find text in the current page.
+        開啟輸入對話框，在當前頁面中搜尋文字。
+        - 如果按下 OK，搜尋輸入的文字
+        - 如果取消，清除搜尋
+        """
         jeditor_logger.info("BrowserWidget Find Text")
         search_box = QInputDialog(self)
         search_text, press_ok = search_box.getText(
-            self, language_wrapper.language_word_dict.get("browser_find_text"),
-            language_wrapper.language_word_dict.get("browser_find_text_input"))
+            self,
+            language_wrapper.language_word_dict.get("browser_find_text"),
+            language_wrapper.language_word_dict.get("browser_find_text_input")
+        )
         if press_ok:
             self.browser.findText(search_text)
         else:
-            self.browser.findText("")
+            self.browser.findText("")

je_editor/pyside_ui/git_ui/code_diff_compare/code_diff_viewer_widget.py

@@ -0,0 +1,90 @@
+from PySide6.QtGui import QAction, QActionGroup
+from PySide6.QtWidgets import (
+    QWidget, QVBoxLayout, QMenuBar, QFileDialog, QMessageBox
+)
+from git import Repo
+
+from je_editor.pyside_ui.git_ui.code_diff_compare.multi_file_diff_viewer import MultiFileDiffViewer
+
+
+class DiffViewerWidget(QWidget):
+    """
+    Git Diff Viewer Application
+    Git 差異檢視器應用程式
+    """
+
+    def __init__(self):
+        super().__init__()
+        self.setWindowTitle("Git Diff Viewer")
+
+        # === Main diff viewer widget / 主要的差異檢視元件 ===
+        self.viewer = MultiFileDiffViewer()
+
+        # === Menu bar / 選單列 ===
+        self.menubar = QMenuBar(self)
+        file_menu = self.menubar.addMenu("File")  # File 選單
+        view_menu = self.menubar.addMenu("View")  # View 選單
+
+        # --- File → Open Git Repo ---
+        # Action to open a Git repository
+        # 開啟 Git 專案的動作
+        open_repo_action = QAction("Open Git Repo", self)
+        open_repo_action.triggered.connect(self.open_repo)
+        file_menu.addAction(open_repo_action)
+
+        # === View → Theme switching (exclusive) / 主題切換（單選模式） ===
+        theme_group = QActionGroup(self)
+        theme_group.setExclusive(True)  # 確保只能選擇一個主題
+
+        dark_action = QAction("Dark Mode", self, checkable=True)  # 深色模式
+        light_action = QAction("Light Mode", self, checkable=True)  # 淺色模式
+
+        theme_group.addAction(dark_action)
+        theme_group.addAction(light_action)
+
+        # Default to dark mode / 預設為深色模式
+        dark_action.setChecked(True)
+        self.viewer.set_dark_theme()
+
+        # Connect theme actions / 綁定主題切換事件
+        dark_action.triggered.connect(lambda: self.set_theme("dark"))
+        light_action.triggered.connect(lambda: self.set_theme("light"))
+
+        view_menu.addAction(dark_action)
+        view_menu.addAction(light_action)
+
+        # === Layout / 版面配置 ===
+        layout = QVBoxLayout(self)
+        layout.setMenuBar(self.menubar)  # 把選單列放在上方
+        layout.addWidget(self.viewer)  # 把差異檢視器放在主要區域
+
+    def open_repo(self):
+        """
+        Open a Git repository and display its diff.
+        開啟一個 Git 專案並顯示差異。
+        """
+        path = QFileDialog.getExistingDirectory(self, "Select Git Repository")
+        if not path:
+            return
+        try:
+            repo = Repo(path)  # 嘗試載入 Git 專案
+            diff_text = repo.git.diff()  # 取得差異文字
+            if not diff_text.strip():
+                # 如果沒有差異，顯示提示訊息
+                QMessageBox.information(self, "Info", "No changes in repo.")
+            else:
+                # 如果有差異，顯示在 viewer 中
+                self.viewer.set_diff_text(diff_text)
+        except Exception as e:
+            # 如果開啟失敗，顯示錯誤訊息
+            QMessageBox.critical(self, "Error", f"Failed to open repo:\n{e}")
+
+    def set_theme(self, mode: str):
+        """
+        Switch between dark and light themes.
+        切換深色與淺色主題。
+        """
+        if mode == "dark":
+            self.viewer.set_dark_theme()
+        else:
+            self.viewer.set_light_theme()

je_editor/pyside_ui/git_ui/code_diff_compare/line_number_code_viewer.py

@@ -0,0 +1,141 @@
+from PySide6.QtCore import QRect, QSize, Qt
+from PySide6.QtGui import QPainter, QColor
+from PySide6.QtWidgets import QPlainTextEdit, QWidget, QTextEdit
+
+
+class LineNumberArea(QWidget):
+    """
+    Side widget for displaying line numbers.
+    用來顯示行號的側邊元件。
+    """
+
+    def __init__(self, editor):
+        super().__init__(editor)
+        self.code_editor = editor  # 綁定主要的編輯器 / Bind to main editor
+
+    def sizeHint(self):
+        """
+        Suggest width for line number area.
+        建議行號區域的寬度。
+        """
+        return QSize(self.code_editor.line_number_area_width(), 0)
+
+    def paintEvent(self, event):
+        """
+        Delegate paint event to the main editor.
+        將繪製事件交給主要編輯器處理。
+        """
+        self.code_editor.line_number_area_paint_event(event)
+
+
+class LineNumberedCodeViewer(QPlainTextEdit):
+    """
+    QPlainTextEdit with line numbers.
+    帶有行號顯示的文字編輯器。
+    """
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.lineNumberArea = LineNumberArea(self)
+
+        # === 信號連接 / Signal connections ===
+        self.blockCountChanged.connect(self.update_line_number_area_width)  # 當行數改變時更新行號區寬度
+        self.updateRequest.connect(self.update_line_number_area)  # 當需要重繪時更新行號區
+        self.cursorPositionChanged.connect(self.highlight_current_line)  # 當游標移動時高亮當前行
+
+        # 初始化行號區寬度與高亮
+        self.update_line_number_area_width(0)
+        self.highlight_current_line()
+
+    def line_number_area_width(self):
+        """
+        Calculate width of line number area based on digit count.
+        根據行數位數計算行號區寬度。
+        """
+        digits = len(str(max(1, self.blockCount())))
+        space = 3 + self.fontMetrics().horizontalAdvance('9') * digits
+        return space
+
+    def update_line_number_area_width(self, _):
+        """
+        Adjust viewport margins to fit line number area.
+        調整視口邊界以容納行號區。
+        """
+        self.setViewportMargins(self.line_number_area_width(), 0, 0, 0)
+
+    def update_line_number_area(self, rect, dy):
+        """
+        Update/redraw line number area when scrolling or editing.
+        當滾動或編輯時更新行號區。
+        """
+        if dy:
+            self.lineNumberArea.scroll(0, dy)
+        else:
+            self.lineNumberArea.update(0, rect.y(), self.lineNumberArea.width(), rect.height())
+        if rect.contains(self.viewport().rect()):
+            self.update_line_number_area_width(0)
+
+    def resizeEvent(self, event):
+        """
+        Resize line number area when editor resizes.
+        編輯器大小改變時調整行號區。
+        """
+        super().resizeEvent(event)
+        cr = self.contentsRect()
+        self.lineNumberArea.setGeometry(QRect(cr.left(), cr.top(), self.line_number_area_width(), cr.height()))
+
+    def line_number_area_paint_event(self, event):
+        """
+        Paint line numbers.
+        繪製行號。
+        """
+        painter = QPainter(self.lineNumberArea)
+        # 背景顏色依主題切換 / Background color depends on theme
+        painter.fillRect(event.rect(), QColor(40, 40, 40) if getattr(self, "is_dark", False) else QColor(230, 230, 230))
+
+        block = self.firstVisibleBlock()
+        blockNumber = block.blockNumber()
+        top = int(self.blockBoundingGeometry(block).translated(self.contentOffset()).top())
+        bottom = top + int(self.blockBoundingRect(block).height())
+
+        while block.isValid() and top <= event.rect().bottom():
+            if block.isVisible() and bottom >= event.rect().top():
+                number = str(blockNumber + 1)
+                # 行號顏色依主題切換 / Line number color depends on theme
+                painter.setPen(QColor("#d4d4d4") if getattr(self, "is_dark", False) else Qt.GlobalColor.black)
+                painter.drawText(
+                    0, top, self.lineNumberArea.width() - 2, self.fontMetrics().height(),
+                    Qt.AlignmentFlag.AlignRight, number
+                )
+            block = block.next()
+            top = bottom
+            bottom = top + int(self.blockBoundingRect(block).height())
+            blockNumber += 1
+
+    def highlight_current_line(self):
+        """
+        Highlight the current line where the cursor is.
+        高亮顯示游標所在的行。
+        """
+        selection = QTextEdit.ExtraSelection()
+        lineColor = QColor(50, 50, 50) if getattr(self, "is_dark", False) else QColor(232, 232, 255)
+        selection.format.setBackground(lineColor)
+        selection.cursor = self.textCursor()
+        selection.cursor.clearSelection()
+
+        # Keep current-line extras for merging
+        self._current_line_extras = [selection]
+
+        # Merge with diff extras if present
+        if hasattr(self, "_diff_extras"):
+            merged = self._diff_extras + self._current_line_extras
+        else:
+            merged = self._current_line_extras
+
+        self.setExtraSelections(merged)
+
+    def apply_theme_to_editor(self, dark: bool):
+        self.setStyleSheet("QPlainTextEdit { background-color: #1e1e1e; color: #d4d4d4; }" if dark
+                           else "QPlainTextEdit { background-color: white; color: black; }")
+        # Re-trigger current line highlight with the new color
+        self.highlight_current_line()

je_editor/pyside_ui/git_ui/code_diff_compare/multi_file_diff_viewer.py

@@ -0,0 +1,88 @@
+from PySide6.QtWidgets import QTabWidget, QVBoxLayout, QWidget
+
+from je_editor.pyside_ui.git_ui.code_diff_compare.side_by_side_diff_widget import SideBySideDiffWidget
+
+
+class MultiFileDiffViewer(QWidget):
+    """
+    Multi-file diff viewer using tabs to display each file.
+    多檔案差異檢視器，使用分頁 (tab) 來顯示每個檔案的差異。
+    """
+
+    def __init__(self, parent=None):
+        """
+        Initialize the multi-file diff viewer.
+        初始化多檔案差異檢視器。
+        """
+        super().__init__(parent)
+        # Tab widget to hold each file's diff
+        # 用來存放每個檔案差異的分頁元件
+        self.tabs = QTabWidget()
+
+        # Layout: vertical box with only the tab widget
+        # 版面配置：垂直佈局，僅包含分頁元件
+        layout = QVBoxLayout(self)
+        layout.addWidget(self.tabs)
+
+    def set_diff_text(self, diff_text: str):
+        """
+        Set the diff text and split it into per-file tabs.
+        設定差異文字，並依檔案拆分成多個分頁。
+        """
+        self.tabs.clear()
+        file_diffs = self._split_by_file(diff_text)
+        for file_name, ftext in file_diffs:
+            viewer = SideBySideDiffWidget()   # 每個檔案使用 side-by-side viewer
+            viewer.set_diff_text(ftext)
+            self.tabs.addTab(viewer, file_name)  # 新增分頁，標題為檔名
+
+    def _split_by_file(self, diff_text: str):
+        """
+        Split a unified diff text into chunks per file.
+        將 unified diff 文字依檔案切分。
+        """
+        chunks = []
+        current = []
+        file_name = None
+
+        for line in diff_text.splitlines():
+            if line.startswith("diff --git"):
+                # 如果遇到新的檔案 diff，先把前一個檔案的內容存起來
+                if current and file_name:
+                    chunks.append((file_name, "\n".join(current)))
+                    current = []
+                # 解析檔名，格式通常為 "diff --git a/file b/file"
+                parts = line.split()
+                if len(parts) >= 4:
+                    file_name = parts[2][2:]  # 去掉 "a/"
+                else:
+                    file_name = "unknown"
+                current.append(line)
+            else:
+                current.append(line)
+
+        # 最後一個檔案也要加入結果
+        if current and file_name:
+            chunks.append((file_name, "\n".join(current)))
+
+        return chunks
+
+    def set_dark_theme(self):
+        """
+        Apply dark theme to all tabs.
+        對所有分頁套用深色主題。
+        """
+        for i in range(self.tabs.count()):
+            w = self.tabs.widget(i)
+            if isinstance(w, SideBySideDiffWidget):
+                w.set_dark_theme()
+
+    def set_light_theme(self):
+        """
+        Apply light theme to all tabs.
+        對所有分頁套用淺色主題。
+        """
+        for i in range(self.tabs.count()):
+            w = self.tabs.widget(i)
+            if isinstance(w, SideBySideDiffWidget):
+                w.set_light_theme()

je_editor/pyside_ui/git_ui/code_diff_compare/side_by_side_diff_widget.py

@@ -0,0 +1,271 @@
+from PySide6.QtGui import QColor, QTextCursor, QTextCharFormat, QFont
+from PySide6.QtWidgets import QPlainTextEdit, QTextEdit, QWidget, QHBoxLayout, QVBoxLayout, QLabel
+
+from je_editor.pyside_ui.git_ui.code_diff_compare.line_number_code_viewer import LineNumberedCodeViewer
+
+
+class SideBySideDiffWidget(QWidget):
+    """
+    Side-by-side diff viewer widget.
+    左右對照的差異檢視元件。
+    """
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+
+        # === 顏色設定 / Color configuration ===
+        self.is_dark = True
+        # 刪除行背景 / Deleted line background
+        self.color_del = QColor("#ffcccc")  # 淡紅色，深淺背景都清楚
+        # 新增行背景 / Added line background
+        self.color_add = QColor("#ccffcc")  # 淡綠色，對比度佳
+        # Hunk header 背景
+        self.color_hunk = QColor("#cce5ff")  # 淡藍色，醒目但不刺眼
+        # Diff header 背景
+        self.color_header = QColor("#e0e0e0")  # 淺灰，適合標題區塊
+
+        # === 左右檔名標籤 / File name labels ===
+        self.leftLabel = QLabel("Left: (old)")
+        self.rightLabel = QLabel("Right: (new)")
+        font = QFont()
+        font.setBold(True)
+        self.leftLabel.setFont(font)
+        self.rightLabel.setFont(font)
+
+        # === 左右文字編輯器 / Left and right code editors ===
+        self.leftEdit = LineNumberedCodeViewer()
+        self.rightEdit = LineNumberedCodeViewer()
+        for edit in (self.leftEdit, self.rightEdit):
+            edit.setReadOnly(True)  # 設為唯讀 / Read-only
+            edit.setLineWrapMode(QPlainTextEdit.LineWrapMode.NoWrap)  # 不自動換行 / Disable line wrap
+            mono = QFont("Consolas")  # 使用等寬字型 / Monospaced font
+            mono.setStyleHint(QFont.StyleHint.Monospace)
+            edit.setFont(mono)
+
+        # === 版面配置 / Layout ===
+        leftBox = QVBoxLayout()
+        leftBox.addWidget(self.leftLabel)
+        leftBox.addWidget(self.leftEdit)
+
+        rightBox = QVBoxLayout()
+        rightBox.addWidget(self.rightLabel)
+        rightBox.addWidget(self.rightEdit)
+
+        main = QHBoxLayout(self)
+        leftContainer = QWidget()
+        leftContainer.setLayout(leftBox)
+        rightContainer = QWidget()
+        rightContainer.setLayout(rightBox)
+        main.addWidget(leftContainer)
+        main.addWidget(rightContainer)
+
+        # 同步左右捲軸 / Sync scrollbars
+        self._sync_scrollbars()
+
+        # 預設深色模式 / Default to dark theme
+        self.set_dark_theme()
+
+    def _sync_scrollbars(self):
+        """
+        Synchronize scrollbars between left and right editors.
+        同步左右編輯器的捲軸。
+        """
+        self.leftEdit.verticalScrollBar().valueChanged.connect(
+            self.rightEdit.verticalScrollBar().setValue
+        )
+        self.rightEdit.verticalScrollBar().valueChanged.connect(
+            self.leftEdit.verticalScrollBar().setValue
+        )
+        self.leftEdit.horizontalScrollBar().valueChanged.connect(
+            self.rightEdit.horizontalScrollBar().setValue
+        )
+        self.rightEdit.horizontalScrollBar().valueChanged.connect(
+            self.leftEdit.horizontalScrollBar().setValue
+        )
+
+    def set_diff_text(self, diff_text: str):
+        """
+        Parse unified diff text and display it in side-by-side editors.
+        解析 unified diff 文字並顯示在左右編輯器。
+        """
+        left_lines, right_lines, left_marks, right_marks, left_name, right_name = \
+            self._parse_unified_diff(diff_text)
+
+        self.leftLabel.setText(f"Left: {left_name or '(old)'}")
+        self.rightLabel.setText(f"Right: {right_name or '(new)'}")
+
+        self._set_text_with_highlights(self.leftEdit, left_lines, left_marks)
+        self._set_text_with_highlights(self.rightEdit, right_lines, right_marks)
+
+        # 游標移到開頭 / Move cursor to start
+        self.leftEdit.moveCursor(QTextCursor.MoveOperation.Start)
+        self.rightEdit.moveCursor(QTextCursor.MoveOperation.Start)
+
+    def _set_text_with_highlights(self, edit: QPlainTextEdit, lines, marks):
+        """
+        Set text and apply syntax highlighting based on diff marks.
+        設定文字並依 diff 標記加上背景色。
+        """
+        edit.setPlainText("\n".join(lines))
+
+        diff_extras = []
+        for i, mark in enumerate(marks):
+            fmt = QTextCharFormat()
+            # Always set foreground so it won't fall back
+            # 永遠設定前景色，避免 fallback
+            fmt.setForeground(QColor("#d4d4d4") if self.is_dark else QColor("black"))
+
+            if mark == "DEL":
+                fmt.setBackground(self.color_del)
+            elif mark == "ADD":
+                fmt.setBackground(self.color_add)
+            elif mark == "HUNK":
+                fmt.setBackground(self.color_hunk)
+            elif mark == "HDR":
+                fmt.setBackground(self.color_header)
+            else:
+                continue
+
+            sel = self._line_selection(edit, i, fmt)
+            diff_extras.append(sel)
+
+        # 保留 diff selections，方便主題切換時重用
+        setattr(edit, "_diff_extras", diff_extras)
+
+        # 嘗試合併其他高亮（例如 LineNumberedCodeViewer 的當前行高亮）
+        if hasattr(edit, "_current_line_extras"):
+            merged = diff_extras + edit._current_line_extras
+        else:
+            merged = diff_extras
+
+        edit.setExtraSelections(merged)
+
+    def _line_selection(self, edit: QPlainTextEdit, line_index: int, fmt: QTextCharFormat):
+        """
+        Create a selection for a specific line with given format.
+        建立某一行的選取區並套用格式。
+        """
+        sel = QTextEdit.ExtraSelection()
+        sel.format = fmt
+        cursor = edit.textCursor()
+        cursor.movePosition(QTextCursor.MoveOperation.Start)
+        for _ in range(line_index):
+            cursor.movePosition(QTextCursor.MoveOperation.Down)
+        cursor.select(QTextCursor.SelectionType.LineUnderCursor)
+        sel.cursor = cursor
+        return sel
+
+    def _parse_unified_diff(self, diff_text: str):
+        """
+        Parse unified diff into left/right lines and marks.
+        將 unified diff 解析成左右行與標記。
+        """
+        left_lines, right_lines, left_marks, right_marks = [], [], [], []
+        left_name, right_name = None, None
+
+        def add_left(line, mark=None):
+            left_lines.append(line)
+            left_marks.append(mark or "CTX")
+
+        def add_right(line, mark=None):
+            right_lines.append(line)
+            right_marks.append(mark or "CTX")
+
+        def align():
+            # 對齊左右行數 / Align left and right line counts
+            if len(left_lines) < len(right_lines):
+                for _ in range(len(right_lines) - len(left_lines)):
+                    add_left("")
+            elif len(right_lines) < len(left_lines):
+                for _ in range(len(left_lines) - len(right_lines)):
+                    add_right("")
+
+        for raw in diff_text.splitlines():
+            if raw.startswith("diff "):
+                add_left(raw, "HDR"); add_right(raw, "HDR"); align()
+            elif raw.startswith("--- "):
+                left_name = raw[4:].strip()
+                add_left(raw, "HDR"); add_right("", "HDR"); align()
+            elif raw.startswith("+++ "):
+                right_name = raw[4:].strip()
+                add_left("", "HDR"); add_right(raw, "HDR"); align()
+            elif raw.startswith("@@"):
+                add_left(raw, "HUNK"); add_right(raw, "HUNK"); align()
+            elif raw.startswith("-"):
+                add_left(raw, "DEL"); add_right("", None); align()
+            elif raw.startswith("+"):
+                add_left("", None); add_right(raw, "ADD"); align()
+            else:
+                add_left(raw, None); add_right(raw, None); align()
+
+        return left_lines, right_lines, left_marks, right_marks, left_name, right_name
+
+    def _reapply_highlights_for_theme(self):
+        """
+        Reapply highlights when theme changes.
+        主題切換時重新套用高亮。
+        """
+        for edit in (self.leftEdit, self.rightEdit):
+            if hasattr(edit, "_diff_extras"):
+                updated = []
+                for sel in edit._diff_extras:
+                    fmt: QTextCharFormat = QTextCharFormat(sel.format)
+
+                    # 前景色依主題切換
+                    fmt.setForeground(QColor("#d4d4d4") if self.is_dark else QColor("black"))
+
+                    # 依照 mark 更新背景色
+                    cursor = sel.cursor
+                    cursor.select(QTextCursor.SelectionType.LineUnderCursor)
+                    text = cursor.selectedText()
+
+                    if text.startswith("-"):
+                        fmt.setBackground(self.color_del)
+                    elif text.startswith("+"):
+                        fmt.setBackground(self.color_add)
+                    elif text.startswith("@@"):
+                        fmt.setBackground(self.color_hunk)
+                    elif text.startswith("diff") or text.startswith("---") or text.startswith("+++"):
+                        fmt.setBackground(self.color_header)
+
+                    sel.format = fmt
+                    updated.append(sel)
+
+                edit._diff_extras = updated
+
+                if hasattr(edit, "_current_line_extras"):
+                    merged = updated + edit._current_line_extras
+                else:
+                    merged = updated
+                edit.setExtraSelections(merged)
+
+    def set_dark_theme(self):
+        """
+        Apply dark theme colors.
+        套用深色主題配色。
+        """
+        self.is_dark = True
+        self.color_del = QColor(60, 20, 20)
+        self.color_add = QColor(20, 60, 20)
+        self.color_hunk = QColor(25, 25, 60)
+        self.color_header = QColor(50, 50, 50)
+        self.setStyleSheet("""QWidget { background-color: #1e1e1e; color: #d4d4d4; }""")
+        self._reapply_highlights_for_theme()
+        self.leftEdit.apply_theme_to_editor(dark=self.is_dark)
+        self.rightEdit.apply_theme_to_editor(dark=self.is_dark)
+
+    def set_light_theme(self):
+        """
+        Apply light  theme colors.
+        套用淺色主題配色。
+        """
+        self.is_dark = False
+        self.color_del = QColor(255, 230, 230)
+        self.color_add = QColor(230, 255, 230)
+        self.color_hunk = QColor(230, 230, 255)
+        self.color_header = QColor(240, 240, 240)
+        self.setStyleSheet("""QWidget { background-color: white; color: black; }""")
+        self._reapply_highlights_for_theme()
+        self.leftEdit.apply_theme_to_editor(dark=self.is_dark)
+        self.rightEdit.apply_theme_to_editor(dark=self.is_dark)
+