diff --git a/TeXmacs/misc/themes/liii-night.css b/TeXmacs/misc/themes/liii-night.css index cf604f27bc..c4a65fcff8 100644 --- a/TeXmacs/misc/themes/liii-night.css +++ b/TeXmacs/misc/themes/liii-night.css @@ -1252,28 +1252,3 @@ QLabel#login-update-title { border-color: #7a7a7a; background: rgba(255, 255, 255, 0.14); } - -/**************************************************************************** -* Settings Page Tab Widget 样式 -* 统一跨平台样式，类似模板中心分类按钮 -****************************************************************************/ -QTabWidget#settings-tab-widget::pane { - border: none; - background: transparent; -} - -QTabWidget#settings-tab-widget QTabBar::tab { - background: transparent; - color: #aaaaaa; - border: none; -} - -QTabWidget#settings-tab-widget QTabBar::tab:hover { - background: rgba(255, 255, 255, 0.1); - color: #ffffff; -} - -QTabWidget#settings-tab-widget QTabBar::tab:selected { - background: #2791ad; - color: white; -} diff --git a/TeXmacs/misc/themes/liii.css b/TeXmacs/misc/themes/liii.css index ffa8e214d8..517b0a52cc 100644 --- a/TeXmacs/misc/themes/liii.css +++ b/TeXmacs/misc/themes/liii.css @@ -1194,28 +1194,3 @@ QLabel#pdf-preview-page-indicator { QLabel#pdf-preview-label { border: 1px solid #dddddd; } - -/**************************************************************************** -* Settings Page Tab Widget 样式 -* 统一跨平台样式，类似模板中心分类按钮 -****************************************************************************/ -QTabWidget#settings-tab-widget::pane { - border: none; - background: transparent; -} - -QTabWidget#settings-tab-widget QTabBar::tab { - background: transparent; - color: #666666; - border: none; -} - -QTabWidget#settings-tab-widget QTabBar::tab:hover { - background: #F0F0F0; - color: #333333; -} - -QTabWidget#settings-tab-widget QTabBar::tab:selected { - background: #215a6a; - color: white; -} diff --git a/TeXmacs/progs/startup-tab/startup-tab-settings.scm b/TeXmacs/progs/startup-tab/startup-tab-settings.scm deleted file mode 100644 index 4fd580e37d..0000000000 --- a/TeXmacs/progs/startup-tab/startup-tab-settings.scm +++ /dev/null @@ -1,667 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; -;; MODULE : startup-tab-settings.scm -;; DESCRIPTION : Settings page for startup tab - Scheme rendered UI -;; COPYRIGHT : (C) 2026 Yuki Lu -;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(texmacs-module (startup-tab startup-tab-settings) - (:use (texmacs menus preferences-widgets) - (texmacs texmacs tm-files))) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Appearance preferences (from preferences-widgets.scm) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - - -(tm-define (startup-set-pretty-preference* which pretty-val) - (let* ((old (get-pretty-preference which))) - (when (!= old pretty-val) - (let ((msg (restart-required-message))) - (user-confirm msg #f - (lambda (answ) - (set-pretty-preference which pretty-val) - (when answ - (begin - (save-all-buffers) - (restart-TeXmacs))))))))) - -(define (startup-on-buffer-management-changed pretty-val) - (let ((can-use-tabbar? (== pretty-val "Multiple documents share window"))) - (begin - (set-boolean-preference "tab bar" can-use-tabbar?) - (show-icon-bar 4 can-use-tabbar?) - (set-pretty-preference "buffer management" pretty-val)))) - -(tm-widget (startup-general-preferences-widget) - (padded - (aligned - (item (text "Look and feel:") - (enum (startup-set-pretty-preference* "look and feel" answer) - (cond ((os-win32?) '("Default" "Emacs" "Windows")) - ((os-macos?) '("Default" "Emacs" "macOS" )) - (else '("Default" "Emacs" "Gnome" "KDE"))) - (get-pretty-preference "look and feel") - "18em")) - (item (text "User interface language:") - (enum (set-language-and-notify (language-name-to-language answer)) - (map language-to-language-name supported-languages) - (language-to-language-name (get-preference "language")) - "18em")) - (item (text "Complex actions:") - (enum (set-pretty-preference "complex actions" answer) - '("Through the menus" "Through popup windows") - (get-pretty-preference "complex actions") - "18em")) - (item (text "Interactive questions:") - (enum (set-pretty-preference "interactive questions" answer) - '("On the footer" "In popup windows") - (get-pretty-preference "interactive questions") - "18em")) - (item (text "Details in menus:") - (enum (set-pretty-preference "detailed menus" answer) - '("Simplified menus" "Detailed menus") - (get-pretty-preference "detailed menus") - "18em")) - (item (text "Buffer management:") - (enum (startup-on-buffer-management-changed answer) - '("Documents in separate windows" - "Multiple documents share window") - (get-pretty-preference "buffer management") - "18em")) - (item (text "User interface theme:") - (enum (startup-set-pretty-preference* "gui theme" answer) - '("Liii" "Liii Dark") - (get-pretty-preference "gui theme") - "18em")) - (item (text "Completion style:") - (enum (set-pretty-preference "completion style" answer) - '("Popup" "Inline") - (get-pretty-preference "completion style") - "18em")) - (item (text "Auto backup:") - (hlist - (enum (set-preference "autobackup" (string-downcase answer)) - '("On" "Off") - (tmstring-upcase-first (get-preference "autobackup")) - "12em") - // - (explicit-buttons - ((eval (auto-backup-button-label)) - (open-auto-backup-location)))))))) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Keyboard preferences (from preferences-widgets.scm) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - - -(tm-widget (startup-keyboard-preferences-widget) - (padded - (aligned - (item (text "Space bar in text mode:") - (enum (set-pretty-preference "text spacebar" answer) - '("Default" "No multiple spaces" - "Glue multiple spaces" "Allow multiple spaces") - (get-pretty-preference "text spacebar") - "15em")) - (item (text "Space bar in math mode:") - (enum (set-pretty-preference "math spacebar" answer) - '("Default" "No spurious spaces" - "Avoid spurious spaces" "Allow spurious spaces") - (get-pretty-preference "math spacebar") - "15em")) - (item (text "Automatic quotes:") - (enum (set-pretty-preference "automatic quotes" answer) - '("Default" "Disabled" "Dutch" "English" "French" "German" "Spanish" "Swiss") - (get-pretty-preference "automatic quotes") - "15em")) - (item (text "Automatic brackets:") - (enum (set-pretty-preference "automatic brackets" answer) - '("Disabled" "Enabled" "Inside mathematics") - (get-pretty-preference "automatic brackets") - "15em"))))) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Mathematics preferences (from preferences-widgets.scm) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(tm-widget (startup-math-keyboard-preferences-widget) - (bold (text "Keyboard")) - ====== - (aligned - (meti (text "Use extensible brackets") - (toggle (set-boolean-preference "use large brackets" answer) - (get-boolean-preference "use large brackets"))))) - -(tm-widget (startup-math-hints-preferences-widget) - (bold (text "Contextual hints")) - ====== - (refreshable "startup-math-pref-context" - (aligned - (meti (text "Show full context") - (toggle (set-boolean-preference "show full context" answer) - (get-boolean-preference "show full context"))) - (meti (text "Show table cells") - (toggle (set-boolean-preference "show table cells" answer) - (get-boolean-preference "show table cells"))) - (meti (text "Show current focus") - (toggle (set-boolean-preference "show focus" answer) - (get-boolean-preference "show focus"))) - (assuming (get-boolean-preference "semantic editing") - (meti (text "Only show semantic focus") - (toggle (set-boolean-preference "show only semantic focus" answer) - (get-boolean-preference "show only semantic focus"))))))) - -(tm-widget (startup-math-semantics-preferences-widget) - (bold (text "Semantics")) - ====== - (refreshable "startup-math-pref-semantic-selections" - (aligned - (meti (text "Semantic editing") - (toggle (and (set-boolean-preference "semantic editing" answer) - (refresh-now "startup-math-pref-semantic-selections") - (refresh-now "startup-math-pref-context")) - (get-boolean-preference "semantic editing"))) - (assuming (get-boolean-preference "semantic editing") - (meti (text "Semantic selections") - (toggle (set-boolean-preference "semantic selections" answer) - (get-boolean-preference "semantic selections")))) - (assuming #f - (meti (text "Semantic correctness") - (toggle (set-boolean-preference "semantic correctness" answer) - (get-boolean-preference "semantic correctness"))))))) - -(tm-widget (startup-math-correction-preferences-widget) - (bold (text "Correction")) - ====== - (aligned - (meti (text "Remove superfluous invisible operators") - (toggle (set-boolean-preference "manual remove superfluous invisible" answer) - (get-boolean-preference "manual remove superfluous invisible"))) - (meti (text "Insert missing invisible operators") - (toggle (set-boolean-preference "manual insert missing invisible" answer) - (get-boolean-preference "manual insert missing invisible"))) - (meti (text "Homoglyph substitutions") - (toggle (set-boolean-preference "manual homoglyph correct" answer) - (get-boolean-preference "manual homoglyph correct"))))) - -(tm-widget (startup-math-preferences-widget) - (padded - (hlist - (vlist - (dynamic (startup-math-keyboard-preferences-widget)) - ====== ====== - (dynamic (startup-math-hints-preferences-widget)) - (glue #f #t 0 1)) - (glue #f #f 30 0) - (vlist - (dynamic (startup-math-semantics-preferences-widget)) - ====== ====== - (dynamic (startup-math-correction-preferences-widget)) - (glue #f #t 0 1))))) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Conversion preferences (from preferences-widgets.scm) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;; Html ---------- - -(define (startup-export-formulas-as-mathjax on?) - (set-boolean-preference "texmacs->html:mathjax" on?) - (when on? - (set-boolean-preference "texmacs->html:mathml" #f) - (set-boolean-preference "texmacs->html:images" #f) - (refresh-now "startup-texmacs-to-html"))) - -(define (startup-export-formulas-as-mathml on?) - (set-boolean-preference "texmacs->html:mathml" on?) - (when on? - (set-boolean-preference "texmacs->html:mathjax" #f) - (set-boolean-preference "texmacs->html:images" #f) - (refresh-now "startup-texmacs-to-html"))) - -(define (startup-export-formulas-as-images on?) - (set-boolean-preference "texmacs->html:images" on?) - (when on? - (set-boolean-preference "texmacs->html:mathjax" #f) - (set-boolean-preference "texmacs->html:mathml" #f) - (refresh-now "startup-texmacs-to-html"))) - -(tm-widget (startup-html-preferences-widget) - ====== - (bold (text "TeXmacs -> Html")) - === - (refreshable "startup-texmacs-to-html" - (aligned - (meti (hlist // (text "Use CSS for more advanced formatting")) - (toggle (set-boolean-preference "texmacs->html:css" answer) - (get-boolean-preference "texmacs->html:css"))) - (meti (hlist // (text "Export mathematical formulas as MathJax")) - (toggle (startup-export-formulas-as-mathjax answer) - (get-boolean-preference "texmacs->html:mathjax"))) - (meti (hlist // (text "Export mathematical formulas as MathML")) - (toggle (startup-export-formulas-as-mathml answer) - (get-boolean-preference "texmacs->html:mathml"))) - (meti (hlist // (text "Export mathematical formulas as images")) - (toggle (startup-export-formulas-as-images answer) - (get-boolean-preference "texmacs->html:images")))) - === - (hlist - (text "CSS stylesheet:") // - (enum (set-preference "texmacs->html:css-stylesheet" answer) - '("---" - "https://www.texmacs.org/css/web-article.css" - "https://www.texmacs.org/css/web-article-dark.css" - "https://www.texmacs.org/css/web-article-colored.css" - "https://www.texmacs.org/css/web-article-dark-colored.css" - "") - (get-preference "texmacs->html:css-stylesheet") "18em"))) - ====== ====== - (bold (text "Html -> TeXmacs")) - === - (refreshable "startup-html-to-texmacs" - (aligned - (meti (hlist // (text "Try to import formulas using LaTeX annotations")) - (toggle (set-boolean-preference "mathml->texmacs:latex-annotations" answer) - (get-boolean-preference "mathml->texmacs:latex-annotations")))))) - -;; LaTeX ---------- - - -(define (startup-get-latex-source-tracking) - (or (get-boolean-preference "latex->texmacs:source-tracking") - (get-boolean-preference "texmacs->latex:source-tracking"))) - -(define (startup-set-latex-source-tracking on?) - (set-boolean-preference "latex->texmacs:source-tracking" on?) - (set-boolean-preference "texmacs->latex:source-tracking" on?) - (refresh-now "startup-source-tracking")) - -(define (startup-get-latex-conservative) - (and (get-boolean-preference "latex->texmacs:conservative") - (get-boolean-preference "texmacs->latex:conservative"))) - -(define (startup-set-latex-conservative on?) - (set-boolean-preference "latex->texmacs:conservative" on?) - (set-boolean-preference "texmacs->latex:conservative" on?) - (refresh-now "startup-source-tracking")) - -(define (startup-get-latex-transparent-source-tracking) - (or (get-boolean-preference "latex->texmacs:transparent-source-tracking") - (get-boolean-preference "texmacs->latex:transparent-source-tracking"))) - -(define (startup-set-latex-transparent-source-tracking on?) - (set-boolean-preference "latex->texmacs:transparent-source-tracking" on?) - (set-boolean-preference "texmacs->latex:transparent-source-tracking" on?)) - -(tm-widget (startup-latex-preferences-widget) - ====== - (bold (text "LaTeX -> TeXmacs")) - === - (aligned - (meti (hlist // (text "Import sophisticated objects as pictures")) - (toggle - (set-boolean-preference "latex->texmacs:fallback-on-pictures" answer) - (get-boolean-preference "latex->texmacs:fallback-on-pictures")))) - ====== ====== - (bold (text "TeXmacs -> LaTeX")) - === - (aligned - (meti (hlist // (text "Replace TeXmacs styles with no LaTeX equivalents")) - (toggle (set-boolean-preference "texmacs->latex:replace-style" answer) - (get-boolean-preference "texmacs->latex:replace-style"))) - (meti (hlist // (text "Expand TeXmacs macros with no LaTeX equivalents")) - (toggle (set-boolean-preference "texmacs->latex:expand-macros" answer) - (get-boolean-preference "texmacs->latex:expand-macros"))) - (meti (hlist // (text "Expand user-defined macros")) - (toggle (set-boolean-preference "texmacs->latex:expand-user-macros" answer) - (get-boolean-preference "texmacs->latex:expand-user-macros"))) - (meti (hlist // (text "Export bibliographies as links")) - (toggle (set-boolean-preference "texmacs->latex:indirect-bib" answer) - (get-boolean-preference "texmacs->latex:indirect-bib"))) - (meti (hlist // (text "Allow for macro definitions in preamble")) - (toggle (set-boolean-preference "texmacs->latex:use-macros" answer) - (get-boolean-preference "texmacs->latex:use-macros")))) - === - (aligned - (item (text "Character encoding:") - (enum (set-pretty-preference "texmacs->latex:encoding" answer) - '("Ascii" "Cork with catcodes" "Utf-8 with inputenc") - (get-pretty-preference "texmacs->latex:encoding") - "15em"))) - ====== ====== - (bold (text "Conservative conversion options")) - === - (refreshable "startup-source-tracking" - (aligned - (meti (hlist // (text "Keep track of source code")) - (toggle - (startup-set-latex-source-tracking answer) - (startup-get-latex-source-tracking))) - (meti (hlist // (text "Only convert changes with respect to tracked version")) - (toggle - (startup-set-latex-conservative answer) - (startup-get-latex-conservative))) - (meti (when (startup-get-latex-source-tracking) - (hlist // (text "Guarantee transparent source tracking"))) - (when (startup-get-latex-source-tracking) - (toggle - (startup-set-latex-transparent-source-tracking answer) - (startup-get-latex-transparent-source-tracking)))) - (meti (when (startup-get-latex-source-tracking) - (hlist // (text "Store tracking information in LaTeX files"))) - (when (startup-get-latex-source-tracking) - (toggle - (set-boolean-preference "texmacs->latex:attach-tracking-info" answer) - (get-boolean-preference "texmacs->latex:attach-tracking-info"))))))) - -;; BibTeX ---------- - -(define (startup-get-bibtm-conservative) - (get-boolean-preference "bibtex->texmacs:conservative")) - -(define (startup-set-bibtm-conservative on?) - (set-boolean-preference "bibtex->texmacs:conservative" on?)) - -(define (startup-get-tmbib-conservative) - (get-boolean-preference "texmacs->bibtex:conservative")) - -(define (startup-set-tmbib-conservative on?) - (set-boolean-preference "texmacs->bibtex:conservative" on?)) - - -(tm-widget (startup-bibtex-preferences-widget) - === - (bold (text "BibTeX -> TeXmacs")) - === - (aligned - (item (text "BibTeX command:") - (enum (set-pretty-preference "bibtex command" answer) - '("bibtex" "biber" "biblatex" "rubibtex") - (get-pretty-preference "bibtex command") - "15em"))) - === - (aligned - (meti (hlist // (text "Only convert changes when re-importing")) - (toggle (startup-set-bibtm-conservative answer) - (startup-get-bibtm-conservative)))) - ====== ====== - (bold (text "TeXmacs -> BibTeX")) - === - (aligned - (meti (hlist // (text "Only convert changes with respect to imported version")) - (toggle (startup-set-tmbib-conservative answer) - (startup-get-tmbib-conservative))))) - -;; Verbatim ---------- - - -(tm-widget (startup-verbatim-preferences-widget) - ====== - (bold (text "TeXmacs -> Verbatim")) - === - (aligned - (meti (hlist // (text "Use line wrapping for lines which are longer than 80 characters")) - (toggle (set-boolean-preference "texmacs->verbatim:wrap" answer) - (get-boolean-preference "texmacs->verbatim:wrap")))) - === - (aligned - (item (text "Character encoding:") - (enum (set-pretty-preference "texmacs->verbatim:encoding" answer) - '("Automatic" "Cork" "ISO-8859-1" "ISO-8859-2" "UTF-8") - (get-pretty-preference "texmacs->verbatim:encoding") - "12em"))) - ====== ====== - (bold (text "Verbatim -> TeXmacs")) - === - (aligned - (meti (hlist // (text "Merge lines into paragraphs unless separated by blank lines")) - (toggle (set-boolean-preference "verbatim->texmacs:wrap" answer) - (get-boolean-preference "verbatim->texmacs:wrap")))) - === - (aligned - (item (text "Character encoding:") - (enum (set-pretty-preference "verbatim->texmacs:encoding" answer) - '("UTF-8" "Automatic" "Cork" "ISO-8859-1" "ISO-8859-2") - (get-pretty-preference "verbatim->texmacs:encoding") - "12em")))) - -;; Pdf ---------- - - -(tm-widget (startup-pdf-preferences-widget) - ====== - (bold (text "TeXmacs -> Pdf/Postscript")) - === - (aligned - (meti (hlist // (text "Expand beamer slides")) - (toggle (set-boolean-preference "texmacs->pdf:expand slides" answer) - (get-boolean-preference "texmacs->pdf:expand slides")))) - (assuming (supports-native-pdf?) - (aligned - (item (text "Pdf version number:") - (enum (set-preference "texmacs->pdf:version" answer) - '("default" "1.4" "1.5" "1.6" "1.7") - (get-preference "texmacs->pdf:version") "12em"))))) - -;; Images ---------- - -(define (startup-pretty-format-list) - (let* ((desired-image-format-list '(("svg" "Svg") ("eps" "Eps") - ("png" "Png")("tif" "Tiff") ("jpg" "Jpeg") ("pdf" "Pdf"))) - (valid-image-format-list - (filter (lambda (x) (file-converter-exists? "x.pdf" (string-append "x." (car x)))) - desired-image-format-list))) - (eval `(define-preference-names "texmacs->image:format" ,@valid-image-format-list)) - (cadr (apply map list valid-image-format-list)))) - -(tm-widget (startup-image-preferences-widget) - ====== - (bold (text "TeXmacs -> Image")) - === - (aligned - (item (text "Bitmap export resolution (dpi):") - (enum (set-preference "texmacs->image:raster-resolution" answer) - '("1200" "600" "300" "150" "") - (get-preference "texmacs->image:raster-resolution") - "8em")) - (item (text "Clipboard image format:") - (enum (set-pretty-preference "texmacs->image:format" answer) - (startup-pretty-format-list) - (get-pretty-preference "texmacs->image:format") - "8em")))) - -;; Mogan Scheme ---------- - -(tm-widget (startup-mogan-scheme-preferences-widget) - ====== - (bold (text "TeXmacs -> Mogan Scheme")) - === - (aligned - (meti (hlist // (text "Use the Formatted Mogan Scheme")) - (toggle (set-boolean-preference "texmacs->mgs:formatted" answer) - (get-boolean-preference "texmacs->mgs:formatted"))))) - -;; All converters ---------- - -(tm-widget (startup-conversion-preferences-widget) - === - (padded - (tabs - (tab (text "Html") - (centered - (dynamic (startup-html-preferences-widget)))) - (tab (text "LaTeX") - (centered - (dynamic (startup-latex-preferences-widget)))) - (tab (text "BibTeX") - (centered - (dynamic (startup-bibtex-preferences-widget)))) - (tab (text "Verbatim") - (centered - (dynamic (startup-verbatim-preferences-widget)))) - (assuming (or (supports-native-pdf?) (supports-ghostscript?)) - (tab (text "Pdf") - (centered - (dynamic (startup-pdf-preferences-widget))))) - (tab (text "Image") - (centered - (dynamic (startup-image-preferences-widget)))) - (tab (text "Mogan Scheme") - (centered - (dynamic (startup-mogan-scheme-preferences-widget)))))) - ===) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Other preferences (from preferences-widgets.scm) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(define (startup-updater-last-check-formatted) - "Time since last update check formatted for use in the preferences dialog" - (with c (updater-last-check) - (if (<= c 0) - "Never" - (with h (ceiling (/ (- (current-time) c) 3600)) - (cond ((< h 24) (replace "Less than %1 hour(s) ago" h)) - ((< h 720) (replace "%1 days ago" (ceiling (/ h 24)))) - (else (translate "More than 1 month ago"))))))) - -(define (startup-last-check-string) - (if (use-plugin-updater?) - (startup-updater-last-check-formatted) - "Never (unsupported)")) - -(define (startup-automatic-checks-choices) - (if (use-plugin-updater?) - '("Never" "Once a day" "Once a week" "Once a month") - '("Unsupported"))) - -(tm-define (startup-scripts-preferences-list) - (lazy-plugin-force) - (with l (scripts-list) - (for (x l) (set-preference-name "scripting language" x (scripts-name x))) - (cons "None" (map scripts-name l)))) - -(tm-widget (startup-misc-preferences-widget) - (aligned - (item (text "Automatically save:") - (enum (set-preference "autosave" - (if (== answer "Off") "0" "120")) - '("On" "Off") - (if (== (get-preference "autosave") "0") - "Off" - "On") - "12em")) - (item (text "Security:") - (enum (set-pretty-preference "security" answer) - '("Accept no scripts" "Prompt on scripts" "Accept all scripts") - (get-pretty-preference "security") - "12em")) - (item (text "Scripting language:") - (enum (set-pretty-preference "scripting language" answer) - (startup-scripts-preferences-list) - (get-pretty-preference "scripting language") - "12em")) - (item (text "Document updates run:") - (enum (set-pretty-preference "document update times" answer) - '("Once" "Twice" "Three times") - (get-pretty-preference "document update times") - "12em")) - (assuming (use-plugin-updater?) - (item (text "Check for automatic updates:") - (enum (set-pretty-preference "updater:interval" answer) - (startup-automatic-checks-choices) - (get-pretty-preference "updater:interval") - "12em"))) - (assuming (use-plugin-updater?) - (item (text "Last check:") (text (startup-last-check-string)))))) - -(tm-widget (startup-experimental-preferences-widget) - (hlist - (aligned - (meti (hlist // (text "Fast environments")) - (toggle (set-boolean-preference "fast environments" answer) - (get-boolean-preference "fast environments"))) - (meti (hlist // (text "Alpha transparency")) - (toggle (set-boolean-preference "experimental alpha" answer) - (get-boolean-preference "experimental alpha"))) - (meti (hlist // (text "New style page breaking")) - (toggle (set-boolean-preference "new style page breaking" answer) - (get-boolean-preference "new style page breaking"))) - (meti (hlist // (text "Encryption")) - (toggle (set-boolean-preference "experimental encryption" answer) - (get-boolean-preference "experimental encryption"))) - (assuming (os-macos?) - (meti (hlist // (text "Use native menubar")) - (toggle (set-boolean-preference "use native menubar" answer) - (get-boolean-preference "use native menubar")))) - (assuming (os-macos?) - (meti (hlist // (text "Use unified toolbars")) - (toggle (set-boolean-preference "use unified toolbar" answer) - (get-boolean-preference "use unified toolbar"))))) - /// /// - (aligned - (meti (hlist // (text "Program bracket matching")) - (toggle (set-boolean-preference "prog:highlight brackets" answer) - (get-boolean-preference "prog:highlight brackets"))) - (meti (hlist // (text "Automatic program brackets")) - (toggle (set-boolean-preference "prog:automatic brackets" answer) - (get-boolean-preference "prog:automatic brackets"))) - (meti (hlist // (text "Program bracket selections")) - (toggle (set-boolean-preference "prog:select brackets" answer) - (get-boolean-preference "prog:select brackets"))) - (meti (hlist // (text "Case-insensitive search")) - (toggle (set-boolean-preference "case-insensitive-match" answer) - (get-boolean-preference "case-insensitive-match"))) - (assuming (qt-gui?) - (meti (hlist // (text "Use print dialogue")) - (toggle (set-boolean-preference "gui:print dialogue" answer) - (get-boolean-preference "gui:print dialogue")))) - (meti (hlist // (text "Use fonts in texlive")) - (toggle (set-boolean-preference "texlive:fonts" answer) - (get-boolean-preference "texlive:fonts")))))) - -(tm-widget (startup-other-preferences-widget) - (dynamic (startup-misc-preferences-widget)) - ====== - (bold (text "Experimental features (to be used with care)")) - ====== - (dynamic (startup-experimental-preferences-widget))) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Main settings widget with tabs -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(tm-widget (startup-settings-widget) - (padded - (icon-tabs - (icon-tab "tm_prefs_general.xpm" (text "General") - (padded - (vlist - (centered - (dynamic (startup-general-preferences-widget))) - (glue #f #t 0 1)))) - (icon-tab "tm_prefs_keyboard.xpm" (text "Keyboard") - (padded - (vlist - (centered - (dynamic (startup-keyboard-preferences-widget))) - (glue #f #t 0 1)))) - (icon-tab "tm_prefs_math.xpm" (text "Mathematics") - (padded - (vlist - (centered - (dynamic (startup-math-preferences-widget))) - (glue #f #t 0 1)))) - (icon-tab "tm_prefs_convert.xpm" (text "Convert") - (padded - (vlist - (dynamic (startup-conversion-preferences-widget)) - (glue #f #t 0 1)))) - (icon-tab "tm_prefs_other.xpm" (text "Other") - (padded - (vlist - (centered - (dynamic (startup-other-preferences-widget))) - (glue #f #t 0 1))))))) diff --git a/devel/216_36.md b/devel/216_36.md new file mode 100644 index 0000000000..009fa89779 --- /dev/null +++ b/devel/216_36.md @@ -0,0 +1,55 @@ +# 216_36 启动页移除 Settings 功能及相关代码清理 + +## 如何测试 + +1. 编译：`xmake b stem` +2. 启动 Mogan，打开启动页。 +3. 确认左侧导航栏仅显示 **3 个**按钮：File、Template、Open a Document、Quit（无 Settings 按钮）。 +4. 确认右侧内容区仅堆叠 **2 个**页面：File（index 0）、Template（index 1）。 +5. 点击 File / Template 导航按钮，确认页面切换正常。 +6. 分别验证亮色/暗色主题下导航栏样式正常，无残留 Settings 相关样式异常。 +7. 确认 `src/Plugins/Qt/qt_settings_page.cpp` 和 `qt_settings_page.hpp` 已删除。 +8. 确认 `TeXmacs/progs/startup-tab/startup-tab-settings.scm` 已删除。 + +## 2026/04/30 实现说明 + +### What + +从启动页（`QTStartupTabWidget`）完全移除 Settings 入口及其对应页面，同步删除 `QTSettingsPage` 实现、Scheme 侧 widget 定义以及 CSS 中 Settings 专属样式。 + +#### 修改文件 + +**src/Plugins/Qt/qt_startup_tab_widget.cpp** +- 移除 `#include "qt_settings_page.hpp"`。 +- 构造函数初始化列表移除 `settingsPage_` 和 `navSettingsBtn_`。 +- `setup_left_sidebar`：移除 Settings 导航按钮的创建、互斥按钮组注册、布局添加和信号连接；导航入口从 4 个减为 3 个。 +- `setup_right_content`：移除 `create_settings_page()` 调用及 `Entry::Settings` 分支映射；堆叠页面从 3 个减为 2 个。 +- 删除 `create_settings_page()` 函数。 + +**src/Plugins/Qt/qt_startup_tab_widget.hpp** +- 移除 `QTSettingsPage` 前向声明。 +- `Entry` 枚举移除 `Settings` 值。 +- 移除 `create_settings_page()` 声明。 +- 移除 `navSettingsBtn_` 和 `settingsPage_` 成员变量。 + +**TeXmacs/misc/themes/liii.css / liii-night.css** +- 移除 `QTabWidget#settings-tab-widget` 样式块（pane、tab、hover、selected 规则）。 + +#### 删除文件 + +- **src/Plugins/Qt/qt_settings_page.cpp** — `QTSettingsPage` Qt 容器页实现。 +- **src/Plugins/Qt/qt_settings_page.hpp** — `QTSettingsPage` 类声明。 +- **TeXmacs/progs/startup-tab/startup-tab-settings.scm** — Scheme 侧 `startup-settings-widget` 定义。 + +### Why + +1. **职责归位**：Settings 功能与首屏核心操作路径无关，用户更习惯通过菜单栏 `Edit -> Preferences` 或后续独立入口访问设置，启动页保留 File / Template 两个高频入口职责更清晰。 +2. **减少维护面**：`QTSettingsPage` 与 `startup-settings-widget` 构成 Qt + Scheme 混合渲染链路，代码量不小但使用频率低；移除后减少跨层维护成本。 +3. **首屏简化**：导航栏从 4 个入口减为 3 个，视觉和交互都更聚焦。 +4. **样式清理**：Settings 专属 CSS 规则（`settings-tab-widget`）不再被任何控件使用，移除避免主题文件膨胀。 + +### How + +- 从 `QTStartupTabWidget` 的侧边栏、堆叠控件、`Entry` 枚举三层彻底剥离 Settings。 +- 直接删除 `qt_settings_page.cpp/hpp` 和 `startup-tab-settings.scm`，不再保留未引用文件。 +- CSS 中搜索 `settings-tab-widget` 选择器并整段移除，确保主题文件无死代码。 diff --git a/src/Plugins/Qt/qt_settings_page.cpp b/src/Plugins/Qt/qt_settings_page.cpp deleted file mode 100644 index 787dfe318e..0000000000 --- a/src/Plugins/Qt/qt_settings_page.cpp +++ /dev/null @@ -1,83 +0,0 @@ -/****************************************************************************** - * MODULE : qt_settings_page.cpp - * DESCRIPTION: Settings page rendered entirely from Scheme - * COPYRIGHT : (C) 2026 Yuki Lu - ******************************************************************************/ - -#include "qt_settings_page.hpp" - -#include -#include - -#include "qt_dpi_utils.hpp" -#include "qt_widget.hpp" -#include "s7_tm.hpp" -#include "scheme.hpp" -#include "widget.hpp" - -#include "QTMMenuHelper.hpp" -#include "object.hpp" - -// External declaration from tm_window.cpp -widget make_menu_widget (object menu); - -namespace { -constexpr int kTabPaneTop = 0; -constexpr int kTabBorderRadius= 12; -constexpr int kTabPaddingY = 6; -constexpr int kTabPaddingX = 14; -constexpr int kTabMarginY = 4; -constexpr int kTabMarginX = 2; -} // namespace - -QTSettingsPage::QTSettingsPage (QWidget* parent) : QWidget (parent) { - QVBoxLayout* layout= new QVBoxLayout (this); - layout->setContentsMargins (0, 0, 0, 0); - layout->setSpacing (0); - - // Mark this window to disable tab auto-resize - this->setProperty ("tm_no_tab_auto_resize", true); - - // Load settings UI from Scheme - eval_scheme ("(use-modules (startup-tab startup-tab-settings))"); - - // Get widget definition and render it - object widget_def= eval ("(startup-settings-widget)"); - widget w = make_menu_widget (widget_def); - - // Embed the widget - if (!is_nil (w)) { - QWidget* qw= concrete (w)->as_qwidget (); - if (qw) { - qw->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Expanding); - layout->addWidget (qw, 1); - - // Find the inner QTabWidget and apply unified cross-platform styling - // to avoid platform-native differences (Windows/macOS/Linux) - QTabWidget* tabWidget= qw->findChild (); - if (tabWidget) { - tabWidget->setObjectName ("settings-tab-widget"); - // Structural stylesheet: pill-shaped category buttons. - // Colors are controlled by the theme CSS (liii.css, etc.) - // so that light/dark themes work correctly. - tabWidget->setStyleSheet ( - QString ("QTabWidget#settings-tab-widget::pane {" - " top: %1px;" - "}" - "QTabWidget#settings-tab-widget QTabBar::tab {" - " border-radius: %2px;" - " padding: %3px %4px;" - " margin: %5px %6px;" - "}") - .arg (DpiUtils::scaled (kTabPaneTop)) - .arg (DpiUtils::scaled (kTabBorderRadius)) - .arg (DpiUtils::scaled (kTabPaddingY)) - .arg (DpiUtils::scaled (kTabPaddingX)) - .arg (DpiUtils::scaled (kTabMarginY)) - .arg (DpiUtils::scaled (kTabMarginX))); - } - } - } -} - -QTSettingsPage::~QTSettingsPage ()= default; diff --git a/src/Plugins/Qt/qt_settings_page.hpp b/src/Plugins/Qt/qt_settings_page.hpp deleted file mode 100644 index cb533ca0b4..0000000000 --- a/src/Plugins/Qt/qt_settings_page.hpp +++ /dev/null @@ -1,26 +0,0 @@ -/****************************************************************************** - * MODULE : qt_settings_page.hpp - * DESCRIPTION: Settings page rendered entirely from Scheme - * COPYRIGHT : (C) 2026 Yuki Lu - ******************************************************************************/ - -#ifndef QT_SETTINGS_PAGE_HPP -#define QT_SETTINGS_PAGE_HPP - -#include - -/** - * @brief Settings page that renders UI entirely from Scheme - * - * All UI structure is defined in Scheme (startup-tab-settings.scm) - * and rendered via make_menu_widget. - */ -class QTSettingsPage : public QWidget { - Q_OBJECT - -public: - explicit QTSettingsPage (QWidget* parent= nullptr); - ~QTSettingsPage (); -}; - -#endif // QT_SETTINGS_PAGE_HPP diff --git a/src/Plugins/Qt/qt_startup_tab_widget.cpp b/src/Plugins/Qt/qt_startup_tab_widget.cpp index 6c01d21f33..95201bcbea 100644 --- a/src/Plugins/Qt/qt_startup_tab_widget.cpp +++ b/src/Plugins/Qt/qt_startup_tab_widget.cpp @@ -12,7 +12,6 @@ #include "qt_startup_tab_widget.hpp" #include "qt_dpi_utils.hpp" #include "qt_file_page.hpp" -#include "qt_settings_page.hpp" #include "qt_template_page.hpp" #include "qt_utilities.hpp" @@ -58,8 +57,7 @@ constexpr int kQuitButtonFontPx= 13; // Quit 按钮字号 QTStartupTabWidget::QTStartupTabWidget (QWidget* parent) : QWidget (parent), currentEntry_ (Entry::File), navFileBtn_ (nullptr), navTemplateBtn_ (nullptr), navOpenDocBtn_ (nullptr), - navSettingsBtn_ (nullptr), navQuitBtn_ (nullptr), - navButtonGroup_ (nullptr), filePage_ (nullptr), settingsPage_ (nullptr), + navQuitBtn_ (nullptr), navButtonGroup_ (nullptr), filePage_ (nullptr), templatePage_ (nullptr) { setMinimumSize (DpiUtils::scaled (kMinWidth), DpiUtils::scaled (kMinHeight)); @@ -147,23 +145,19 @@ QTStartupTabWidget::setup_left_sidebar (QVBoxLayout* sidebarLayout) { navButtonGroup_= new QButtonGroup (this); navButtonGroup_->setExclusive (true); - // 导航按钮（4个入口） + // 导航按钮（3个入口） navFileBtn_ = create_nav_button (qt_translate ("File")); navTemplateBtn_= create_nav_button (qt_translate ("Template")); navOpenDocBtn_ = create_nav_button (qt_translate ("Open a Document")); - navSettingsBtn_= create_nav_button (qt_translate ("Settings")); // 添加到按钮组和布局（Open a Document 不在互斥组中，因为它没有对应页面） navButtonGroup_->addButton (navFileBtn_, static_cast (Entry::File)); navButtonGroup_->addButton (navTemplateBtn_, static_cast (Entry::Template)); - navButtonGroup_->addButton (navSettingsBtn_, - static_cast (Entry::Settings)); sidebarLayout->addWidget (navFileBtn_); sidebarLayout->addWidget (navTemplateBtn_); sidebarLayout->addWidget (navOpenDocBtn_); - sidebarLayout->addWidget (navSettingsBtn_); // 导航按钮点击事件：切换到对应页面 connect (navFileBtn_, &QPushButton::clicked, this, @@ -172,8 +166,6 @@ QTStartupTabWidget::setup_left_sidebar (QVBoxLayout* sidebarLayout) { [this] () { set_current_entry (Entry::Template); }); connect (navOpenDocBtn_, &QPushButton::clicked, this, &QTStartupTabWidget::on_file_open); - connect (navSettingsBtn_, &QPushButton::clicked, this, - [this] () { set_current_entry (Entry::Settings); }); // Open a Document 不是 checkable 按钮（没有对应页面） navOpenDocBtn_->setCheckable (false); @@ -227,10 +219,9 @@ QTStartupTabWidget::create_nav_button (const QString& text) { */ void QTStartupTabWidget::setup_right_content (QStackedWidget* stackedWidget) { - // 添加3个页面到堆叠控件（OpenDocument没有页面，直接触发操作） + // 添加2个页面到堆叠控件（OpenDocument没有页面，直接触发操作） stackedWidget->addWidget (create_file_page ()); // index 0 - File stackedWidget->addWidget (create_template_page ()); // index 1 - Template - stackedWidget->addWidget (create_settings_page ()); // index 2 - Settings // 入口切换时，同步切换堆叠控件的当前页面 // 注意：OpenDocument 没有对应页面，需要调整索引映射 @@ -244,9 +235,6 @@ QTStartupTabWidget::setup_right_content (QStackedWidget* stackedWidget) { case QTStartupTabWidget::Entry::Template: index= 1; break; - case QTStartupTabWidget::Entry::Settings: - index= 2; - break; default: index= 0; break; @@ -290,15 +278,6 @@ QTStartupTabWidget::create_template_page () { return templatePage_; } -/** - * @brief 创建 Settings 页面 - */ -QWidget* -QTStartupTabWidget::create_settings_page () { - settingsPage_= new QTSettingsPage (this); - return settingsPage_; -} - /** * @brief 更新导航按钮的选中状态 * @param entry 当前选中的入口 diff --git a/src/Plugins/Qt/qt_startup_tab_widget.hpp b/src/Plugins/Qt/qt_startup_tab_widget.hpp index 073ca075ce..f60109f973 100644 --- a/src/Plugins/Qt/qt_startup_tab_widget.hpp +++ b/src/Plugins/Qt/qt_startup_tab_widget.hpp @@ -21,14 +21,13 @@ class QPushButton; class QStackedWidget; class QButtonGroup; class QtFilePage; -class QTSettingsPage; class QTTemplatePage; class QTStartupTabWidget : public QWidget { Q_OBJECT public: - enum class Entry { File, Template, OpenDocument, Settings }; + enum class Entry { File, Template, OpenDocument }; public: explicit QTStartupTabWidget (QWidget* parent= nullptr); @@ -57,7 +56,6 @@ private slots: // 页面创建函数 QWidget* create_file_page (); QWidget* create_template_page (); - QWidget* create_settings_page (); // 导航按钮状态管理 void set_active_nav_button (Entry entry); @@ -70,7 +68,6 @@ private slots: QPushButton* navFileBtn_; QPushButton* navTemplateBtn_; QPushButton* navOpenDocBtn_; - QPushButton* navSettingsBtn_; QPushButton* navQuitBtn_; // 互斥按钮组 @@ -79,9 +76,6 @@ private slots: // 各页面实例 QtFilePage* filePage_; - // 各页面实例 - QTSettingsPage* settingsPage_; - // Template page (separate widget) QTTemplatePage* templatePage_; };