[2039] 统计信息弹窗用qml重写 (#4040)

Author: Yuki-Nagori

TeXmacs/progs/texmacs/texmacs/tm-tools.scm

@@ -139,44 +139,48 @@
   (if (selection-active-any?) (selection-tree) (buffer-tree))
 ) ;define
 
-(tm-widget ((show-counts-widget lines) done)
-  (resize "600guipx"
-    "300guipx"
-    (vlist (hlist (glue #t #f 0 0)
-             (vlist (glue #f #t 120 6)
-               (bold (text "Stats information"))
-               (glue #f #t 120 6)
-               (for (l lines) === (text l))
-             ) ;vlist
-             (glue #t #f 0 0)
-           ) ;hlist
-      (glue #f #t 120 6)
-      (hlist (glue #t #f 120 3) (bottom-buttons ("Close" (done))))
-    ) ;vlist
-  ) ;resize
-) ;tm-widget
-
-(tm-define (show-counts)
-  (:interactive #t)
-  (let* ((doc (selection-or-document))
-         (chars (count-characters doc))
+(define (compute-stats-data doc page-str)
+  (let* ((chars (count-characters doc))
          (chars-ns (count-chars-no-space doc))
          (lines (count-lines doc))
          (p (count-chinese-and-words doc))
          (chinese (car p))
          (words (count-words doc))
-         (pages (get-page-count))
-         (lst (list (string-append "Page count: " (number->string pages))
-                (string-append "Word count: " (number->string (+ words chinese)))
-                (string-append "Character count (with spaces): " (number->string chars))
-                (string-append "Character count (without spaces): " (number->string chars-ns))
-                (string-append "Paragraph count: " (number->string lines))
-                (string-append "Non-Chinese word: " (number->string words))
-                (string-append "Chinese character: " (number->string chinese))
-              ) ;list
-         ) ;lst
         ) ;
-    (dialogue-window (show-counts-widget lst) noop "Document statistics")
+    (list (list (translate "Page count") page-str)
+      (list (translate "Word count") (number->string (+ words chinese)))
+      (list (translate "Character count (with spaces)") (number->string chars))
+      (list (translate "Character count (without spaces)") (number->string chars-ns))
+      (list (translate "Paragraph count") (number->string lines))
+      (list (translate "Non-Chinese word") (number->string words))
+      (list (translate "Chinese character") (number->string chinese))
+    ) ;list
+  ) ;let*
+) ;define
+
+(tm-define (get-statistics-data)
+  (:synopsis "Return ((label value) ...) for current document or selection.")
+  (let* ((doc (selection-or-document)) (pages (number->string (get-page-count))))
+    (compute-stats-data doc pages)
+  ) ;let*
+) ;tm-define
+
+(tm-define (get-statistics-data-from-doc doc)
+  (:synopsis "Return ((label value) ...) for given doc tree. Page count is 0.")
+  (compute-stats-data doc "0")
+) ;tm-define
+
+(define (statistics-data->stree data)
+  ;; (stats (item <label> <value>) ...)
+  (cons 'stats
+    (map (lambda (pair) (cons 'item (list (car pair) (cadr pair)))) data)
+  ) ;cons
+) ;define
+
+(tm-define (show-counts)
+  (:interactive #t)
+  (let* ((data (get-statistics-data)) (stree (statistics-data->stree data)))
+    (cpp-statistics-dialog (translate "Document statistics") (stree->tree stree))
   ) ;let*
 ) ;tm-define
 

TeXmacs/tests/202_53.scm

@@ -10,23 +10,25 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules
-  (data tmu)
-  (texmacs texmacs tm-tools))
+(use-modules (data tmu) (texmacs texmacs tm-tools))
 
-(import (liii check)
-        (liii path))
+(import (liii check) (liii path))
 
 (tm-define (test_202_53)
-  (let* ((test-doc (tmu->texmacs ((path (url->system (get-texmacs-path))) :/ "tests" :/ "tmu" :/ "202_53.tmu" :read-text)))
+  (let* ((tmu-path "TeXmacs/tests/tmu/202_53.tmu")
+         (test-doc (tmu->texmacs (path-read-text tmu-path)))
          (non-chinese (count-words test-doc))
          (chars-no-space (count-chars-no-space test-doc))
          (chinese (count-chinese-and-words test-doc))
          (line-count (count-lines test-doc))
-         (char-count (count-characters test-doc)))
-
-    ;; 测试页数 - 预期: 2
+         (char-count (count-characters test-doc))
+         ;; 测试 get-statistics-data-from-doc 数据组装
+         (data (get-statistics-data-from-doc test-doc))
+         (data-labels (map car data))
+         (data-values (map cadr data))
+        ) ;
 
+    ;; --- 计数函数 ---
     ;; 测试字数 - 预期: 16 (10个中文字符 + 6个非中文单词)
     (check (+ (car chinese) non-chinese) => 16)
 
@@ -40,8 +42,29 @@
     (check line-count => 3)
 
     ;; 测试非中文单词数 - 预期: 6
-    (check non-chinese => 6)  ; 非中文单词
+    (check non-chinese => 6)
+
+    ;; 测试中文字符数 - 预期: 10
+    (check (car chinese) => 10)
+
+    ;; --- get-statistics-data-from-doc 数据格式 ---
+    ;; 验证标签顺序与内容（需与 get-statistics-data-from-doc 使用相同的 translate）
+    (check data-labels
+      =>
+      (list (translate "Page count")
+        (translate "Word count")
+        (translate "Character count (with spaces)")
+        (translate "Character count (without spaces)")
+        (translate "Paragraph count")
+        (translate "Non-Chinese word")
+        (translate "Chinese character")
+      ) ;list
+    ) ;check
+
+    ;; 验证 7 个统计项
+    (check (length data) => 7)
 
-    ;; 测试中文单词数 - 预期: 10
-    (check (car chinese) => 10)  ; 中文字符
-    ))
+    ;; 验证各项值
+    (check data-values => '("0" "16" "28" "23" "3" "6" "10"))
+  ) ;let*
+) ;tm-define

ai-docs/qml/README.md

@@ -120,6 +120,14 @@ API 速查（`utils/library/dialog-value-table`，entry-key 由调用方自定
   同一 Rectangle 既 `border` 又 `clip:true` 会把外侧半像素 border 自身裁掉、几乎不可见
   （叠加 `radius` 的抗锯齿偏移更甚）。要带边框的裁剪容器，拆**双层 Rectangle**：外层只画
   border（不 clip），内层 `clip:true` 容纳子项。下拉浮层（DialogShell overlay）即此结构。
+- **scm 侧传给 QML 的用户可见文本一律走 `(translate "key")`**：标签、标题、按钮文案等
+   在 scm 构造数据时即用 `translate` 包裹，不要硬编码英文。值（数字、内部 key）不翻译。
+  字典条目按最小粒度登记（如 `"character count"` / `"with spaces"`），系统自动拼接
+  （`"Character count (with spaces)"` → `"字符数（计空格）"`），不要为每种组合加整条字典。
+- **跨弹窗复用的布局常量收进 `Theme.qml`**：行高、间距等可能被多个弹窗共用的数字，统一加在
+  `atoms/Theme.qml` 的结构尺寸/间距阶梯段。优先用已有常量组合（如 `Theme.btnH + Theme.padS * 2`
+  表示按钮区高度），避免为单一用途加新常量。成品弹窗只保留本弹窗专属的布局参数（如列宽比
+  `labelW`），引用 Theme 常量（`Theme.pad`/`Theme.gapS`/`Theme.inlineGap`/`Theme.textRowH` 等）。
 - **跨 parent 链查找的 property 不能喂给 binding**：如 EnumCombo 的 `dialogShell`（沿
   parent 链按 objectName 查找）是命令式 property，parent 变化不触发其重算，binding 会在
   创建瞬间读到 null 永久卡住。依赖它的几何（comboX/Y/W）须在展开时用 `updateGeometry()`

ai-docs/qml/qml-dialog.html

@@ -258,6 +258,38 @@
       margin: 0 4px;
     }
 
+    .stats-table {
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+    }
+
+    .stats-row {
+      display: flex;
+      justify-content: space-between;
+      align-items: baseline;
+      padding: 6px 0;
+      border-bottom: 1px solid #eef3f3;
+    }
+
+    .stats-row:last-child {
+      border-bottom: 0;
+    }
+
+    .stats-label {
+      font-size: 14px;
+      color: #355059;
+    }
+
+    .stats-value {
+      font-size: 14px;
+      font-weight: 700;
+      color: #1d2629;
+      font-family: var(--mono);
+      min-width: 40px;
+      text-align: right;
+    }
+
     .form-shell {
       width: min(540px, 100%);
       background: #ffffff;
@@ -716,6 +748,7 @@ <h1>QML 组件模拟器</h1>
       <button class="nav-btn" data-target="form">FormDialog.qml</button>
       <button class="nav-btn" data-target="font">FontSelector.qml</button>
       <button class="nav-btn" data-target="paragraph">ParagraphFormat.qml</button>
+      <button class="nav-btn" data-target="statistics">Statistics.qml</button>
       <div class="sidebar-foot">模拟目标: DialogShell / DialogButtons / EnumCombo / SelectableList / PreviewPane 组合逻辑。</div>
     </aside>
 
@@ -999,6 +1032,51 @@ <h4>字号</h4>
           Cancel/重置走快照撤销（initial-snapshot + revert-to-snapshot）
         </p>
       </section>
+
+      <section class="panel" id="panel-statistics">
+        <article class="dialog" style="max-width: 380px;">
+          <h3>Document statistics</h3>
+          <div class="stats-table">
+            <div class="stats-row">
+              <span class="stats-label">Page count</span>
+              <span class="stats-value">1</span>
+            </div>
+            <div class="stats-row">
+              <span class="stats-label">Word count</span>
+              <span class="stats-value">42</span>
+            </div>
+            <div class="stats-row">
+              <span class="stats-label">Character count (with spaces)</span>
+              <span class="stats-value">256</span>
+            </div>
+            <div class="stats-row">
+              <span class="stats-label">Character count (without spaces)</span>
+              <span class="stats-value">230</span>
+            </div>
+            <div class="stats-row">
+              <span class="stats-label">Paragraph count</span>
+              <span class="stats-value">5</span>
+            </div>
+            <div class="stats-row">
+              <span class="stats-label">Non-Chinese word</span>
+              <span class="stats-value">30</span>
+            </div>
+            <div class="stats-row">
+              <span class="stats-label">Chinese character</span>
+              <span class="stats-value">120</span>
+            </div>
+          </div>
+          <div class="btn-row" style="margin-top: 20px;">
+            <button class="btn primary" data-log="Statistics: closeBridge.choose(0) 关闭">关闭</button>
+          </div>
+        </article>
+        <p class="legend">
+          对应 QML: <code>statsModel: [{label, value}, ...]</code>
+          <code>statsTitle: dialogTitle</code>
+          <code>buttonLabels: dialogButtons</code>
+          <code>onClicked -> closeBridge.choose(0)</code>
+        </p>
+      </section>
     </main>
   </div>
 
@@ -1009,21 +1087,24 @@ <h4>字号</h4>
         confirm: document.getElementById('panel-confirm'),
         form: document.getElementById('panel-form'),
         font: document.getElementById('panel-font'),
-        paragraph: document.getElementById('panel-paragraph')
+        paragraph: document.getElementById('panel-paragraph'),
+        statistics: document.getElementById('panel-statistics')
       };
 
       const titleMap = {
         confirm: 'ConfirmClose.qml 模拟',
         form: 'FormDialog.qml 模拟',
         font: 'FontSelector.qml 模拟',
-        paragraph: 'ParagraphFormat.qml 模拟'
+        paragraph: 'ParagraphFormat.qml 模拟',
+        statistics: 'Statistics.qml 模拟'
       };
 
       const codeMap = {
         confirm: 'dialogMessage + dialogButtons + closeBridge.choose()',
         form: 'formFields + values 收集 + closeBridge.submit(values)',
         font: 'fontBridge 联动: family/style/filter/customize/preview',
-        paragraph: 'EnumCombo x N + tabs(基础/高级) + make-multi-line-with 写回'
+        paragraph: 'EnumCombo x N + tabs(基础/高级) + make-multi-line-with 写回',
+        statistics: 'statsModel: [{label, value}, ...] + closeBridge.choose(0) 关闭'
       };
 
       const viewTitle = document.getElementById('view-title');

devel/2039.md

@@ -0,0 +1,83 @@
+# [2039] 将 tools->Statistics 更换为 QML 实现
+
+## 1 相关文档
+- [dddd.md](dddd.md) - 任务文档模板
+- [ai-docs/qml/README.md](../ai-docs/qml/README.md) - QML 对话框开发规范
+
+## 2 任务相关的代码文件
+- `TeXmacs/progs/texmacs/texmacs/tm-tools.scm` — 统计数据计算与 `show-counts` 入口
+- `TeXmacs/tests/202_53.scm` — 统计数据 SCM 测试
+- `src/Plugins/Qt/qml/Statistics.qml` — 新建 QML 统计对话框
+- `src/Plugins/Qt/qml/atoms/Theme.qml` — 新增布局常量
+- `src/Plugins/Qt/QTMQmlDialog.cpp` / `.hpp` — 新增 `cpp_statistics_dialog` glue 入口
+- `src/Plugins/Qt/qml/qmldir` / `moganqml.qrc` — 注册 Statistics.qml
+- `src/Scheme/L5/glue_qt.lua` — glue 声明
+- `tests/Plugins/Qt/qml_load_test.cpp` — QML 加载测试
+- `ai-docs/qml/qml-dialog.html` — 设计稿新增 Statistics 面板
+- `ai-docs/qml/README.md` — 补充三条 QML 开发规则
+
+## 3 如何测试
+
+### 3.1 确定性测试（单元测试）
+```bash
+xmake b stem && xmake r 202_53          # SCM 数据契约测试（9 项 check）
+xmake b qml_load_test && xmake r qml_load_test  # QML 加载测试（含 test_statistics_loads）
+```
+
+### 3.2 非确定性测试（文档验证）
+```bash
+xmake b stem && xmake r stem
+# 打开 Tools -> Statistics，确认弹窗显示 7 项统计、Close 按钮关闭
+# 切换语言确认标签翻译生效（中文走 translate，字典自动拼接）
+```
+
+## 4 如何提交
+
+提交前执行以下最少步骤：
+
+```bash
+gf fmt --changed-since=main
+xmake b stem && xmake r 202_53
+xmake b qml_load_test && xmake r qml_load_test
+```
+
+## 5 What
+
+将文档统计信息对话框从旧 `tm-widget` / `dialogue-window` 体系迁移到项目 QML 弹窗体系。
+
+1. 新建 `Statistics.qml`（DialogShell + Column Repeater + DialogButtons），纯展示、一次性提交
+2. 新增 C++ glue 入口 `cpp_statistics_dialog`，走 `run_qml_dialog`（exec 阻塞模态）
+3. 抽取 `get-statistics-data` / `get-statistics-data-from-doc` 数据层，`show-counts` 改用 QML
+4. 扩展 SCM 测试覆盖数据组装层，新增 QML 加载测试
+5. 设计稿 `qml-dialog.html` 补 Statistics 面板，README 补三条开发规则
+
+## 6 Why
+
+旧实现用 TeXmacs 遗留的 `tm-widget`（`show-counts-widget`），与项目已有 QML 弹窗体系（ConfirmClose / FormDialog / FontSelector / ParagraphFormat）不统一。迁移后：
+- UI 风格统一（DialogShell + DialogButtons + Theme）
+- 统计项 label/value 分离，支持差异化样式
+- 移除 `tm-widget` 依赖，简化代码
+
+## 7 How
+
+### 7.1 数据层（scm）
+- `compute-stats-data doc page-str`：共享实现，返回 `((label value) ...)`
+- `get-statistics-data`：`show-counts` 调用，从 editor 取文档树和页数
+- `get-statistics-data-from-doc doc`：测试调用，无 editor，页数写死 `"0"`
+- `statistics-data->stree data`：转 `(stats (item <label> <value>) ...)`，label/value 作 compound 子节点（原子 string），避免 `get_label(compound)` 对中文加引号
+
+### 7.2 C++ glue
+- `cpp_statistics_dialog(title, items)`：遍历 tree children 解析 `(item label value)`，组装 `QVariantList` 注入 QML context property `statsItems`
+- 走 `run_qml_dialog`（exec 阻塞模态），无需 live 写回
+- 用户可见文本（label、标题）在 scm 侧用 `(translate ...)` 翻译，cpp/QML 纯透传
+
+### 7.3 QML 界面
+- `Statistics.qml`：`DialogShell` 根，Column 内含标题 + Repeater（统计行）+ DialogButtons（Close）
+- context property：`statsTitle` / `statsItems` / `dialogButtons` / `dpScale` / `isDark` / `closeBridge`
+- 布局尺寸全引用 Theme 常量（`Theme.margin` / `titleH` / `textRowH` / `btnH` / `padS` / `pad` / `gapS` / `inlineGap` / `fontBody`），只保留本弹窗专属的 `labelW`（列宽比 0.62）
+- 按钮区高度 = `Theme.btnH + Theme.padS * 2`（按钮高 + 上下小留白）
+
+### 7.4 新增 Theme 常量
+- `textRowH: 24` — 纯文本行高（区别于 `rowH: 44` EnumCombo 行）
+- `titleH: 28` — 弹窗标题区高度
+- `inlineGap: 12` — 行内 label↔value 间隙