Skip to content

Commit 4bc7a0a

Browse files
committed
!444 [202_15] 修复插入->自动->参考文件失效的问题
1 parent 1e5da4a commit 4bc7a0a

File tree

6 files changed

+21
-13
lines changed

6 files changed

+21
-13
lines changed

TeXmacs/progs/generic/generic-kbd.scm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@
377377
("M-S-F2" (new-document*))
378378
;;("M-C-F2" (clone-window))
379379
("F3" (save-buffer))
380-
("S-F3" (choose-file save-buffer-as "Save TeXmacs file" "tmu/tm"))
380+
("S-F3" (choose-file save-buffer-as "Save TeXmacs file" "action_save_as"))
381381
("F4" (preview-buffer))
382382
("S-F4" (print-buffer))
383383
("C-F4" (interactive print-to-file))
@@ -796,7 +796,7 @@
796796
("std q" (safely-quit-TeXmacs))
797797
("std R" (update-document "all"))
798798
("std s" (save-buffer))
799-
("std S" (choose-file save-buffer-as "Save TeXmacs file" "tmu/tm"))
799+
("std S" (choose-file save-buffer-as "Save TeXmacs file" "action_save_as"))
800800
("std u" (toggle-underlined))
801801
("std v" (kbd-paste))
802802
("std V" (kbd-magic-paste))

TeXmacs/progs/texmacs/menus/file-menu.scm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180

181181
(menu-bind save-menu
182182
("Save" (save-buffer))
183-
("Save as" (choose-file save-buffer-as "Save TeXmacs file" "tmu/tm"))
183+
("Save as" (choose-file save-buffer-as "Save TeXmacs file" "action_save_as"))
184184
---
185185
(link export-top-menu)
186186
---
@@ -286,7 +286,7 @@
286286
("Clear menu" (forget-interactive "recent-buffer"))))
287287
---
288288
("Save" (save-buffer))
289-
("Save as" (choose-file save-buffer-as "Save TeXmacs file" "tmu/tm"))
289+
("Save as" (choose-file save-buffer-as "Save TeXmacs file" "action_save_as"))
290290
---
291291
(link print-menu)
292292
---

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@
594594

595595
(tm-define (open-buffer)
596596
(:synopsis "Open a new file")
597-
(choose-file load-buffer "Load file" "select"))
597+
(choose-file load-buffer "Load file" "action_open"))
598598

599599
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
600600
;; Reverting buffers
@@ -664,7 +664,7 @@
664664
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
665665

666666
(tm-define (open-in-window)
667-
(choose-file load-buffer-in-new-window "Load file" "select"))
667+
(choose-file load-buffer-in-new-window "Load file" "action_open"))
668668

669669
(tm-define (open-document)
670670
(if (window-per-buffer?) (open-in-window) (open-buffer)))

TeXmacs/progs/text/text-menu.scm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@
458458
(if (with-database-tool?)
459459
("Bibliography" (make-database-bib)))
460460
(if (not (with-database-tool?))
461-
("Bibliography" (choose-file make-bib "Bibliography file" "BibTeX"))))
461+
("Bibliography" (choose-file make-bib "Bibliography file" "tmbib"))))
462462
("Index" (make-aux "the-index" "index-prefix" "idx"))
463463
("Glossary" (make-aux "the-glossary" "glossary-prefix" "gly"))
464464
;;("List of figures" (make-aux* "the-glossary*" "figure-list-prefix" "figure" "List of figures"))

devel/202_15.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@
1010
- 点击文件->打开,选择非TMU、TM文件,能够正常打开
1111
- 点击文件->打开,选择TM文件,能够正常打开
1212

13+
## 2025/07/22
14+
### What
15+
1. 使用 action_open 和 action_save_as 表示明确表示打开和另存为这两种操作。
16+
2. 修复 `插入->自动->参考文件` 无法使用的问题
17+
18+
### Why
19+
qt_chooser_widget复用了大量代码,同时处理了打开和保存,在修改相关逻辑时容易出错。使用`action_xxx`可以明确相关的操作,避免后续代码更改带来问题。
20+
1321
## 2025/07/16
1422

1523
### What

src/Plugins/Qt/qt_chooser_widget.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,11 @@ qt_chooser_widget_rep::set_type (const string& _type) {
176176
else if (_type == "image") {
177177
mainNameFilter= to_qstring (translate ("Image file"));
178178
}
179-
else if (_type == "select") {
180-
mainNameFilter= to_qstring (translate ("Mogan files"));
179+
else if (_type == "action_open") {
180+
mainNameFilter= to_qstring (translate ("STEM files"));
181181
}
182-
else if (_type == "tmu/tm") {
183-
mainNameFilter= to_qstring (translate ("TMU files"));
182+
else if (_type == "action_save_as") {
183+
mainNameFilter= to_qstring (translate ("STEM files"));
184184
}
185185
else {
186186
if (DEBUG_STD)
@@ -203,7 +203,7 @@ qt_chooser_widget_rep::set_type (const string& _type) {
203203
nameFilters << to_qstring (translate ("Portable Document Format") *
204204
" (*.pdf)");
205205
}
206-
else if (_type == "select") {
206+
else if (_type == "action_open") {
207207
mainNameFilter+= " (*.tmu *.tm)";
208208
//" (*.scala *.sc *.sbt *.pants *.ltx *.sty *.cls *.tex *.bib *.rawbib *.jl
209209
//*.js *.java *.sld *.ss *.tmu *.txt *.py *.json *.html *.hh *.cpp *cc *hpp
@@ -227,7 +227,7 @@ qt_chooser_widget_rep::set_type (const string& _type) {
227227
nameFilters << to_qstring (translate ("Web files") *
228228
" (*.html *.xhtml *.htm)");
229229
}
230-
else if (_type == "tmu/tm") {
230+
else if (_type == "action_save_as") {
231231
mainNameFilter+= " (*.tmu)";
232232
nameFilters << mainNameFilter;
233233
nameFilters << to_qstring (translate ("TM files") * " (*.tm)");

0 commit comments

Comments
 (0)