diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index 55adc1fc8c..9709850590 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -10,7 +10,7 @@ on: workflow_dispatch: env: - VNOTE_VER: 3.1.0 + VNOTE_VER: 3.2.0 jobs: build-linux: diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index a7a6219b4d..b673aa8bc9 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -10,7 +10,7 @@ on: workflow_dispatch: env: - VNOTE_VER: 3.1.0 + VNOTE_VER: 3.2.0 jobs: build-linux: diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml index 4f3d36ba3b..52dce7fa5e 100644 --- a/.github/workflows/ci-win.yml +++ b/.github/workflows/ci-win.yml @@ -10,7 +10,7 @@ on: workflow_dispatch: env: - VNOTE_VER: 3.1.0 + VNOTE_VER: 3.2.0 jobs: build: diff --git a/changes.md b/changes.md index 1068c62688..da82d6a876 100644 --- a/changes.md +++ b/changes.md @@ -1,4 +1,9 @@ # Changes +## v3.2.0 +* Support local PlantUml and Graphviz rendering +* Add shortcuts to tab navigation in ViewSplit +* Editor: support auto bracket and overridding font family + ## v3.1.0 * Support Japanese translation (Thanks @miurahr) * MarkdownEditor: guess image suffix when fetching to local diff --git a/src/data/core/translations/vnote_zh_CN.qm b/src/data/core/translations/vnote_zh_CN.qm index e19ba826ce..95994890d6 100644 Binary files a/src/data/core/translations/vnote_zh_CN.qm and b/src/data/core/translations/vnote_zh_CN.qm differ diff --git a/src/data/core/translations/vnote_zh_CN.ts b/src/data/core/translations/vnote_zh_CN.ts index 723bd2fe48..7a2f30d3f2 100644 --- a/src/data/core/translations/vnote_zh_CN.ts +++ b/src/data/core/translations/vnote_zh_CN.ts @@ -644,7 +644,12 @@ 查找替换 - + + Close + 关闭 + + + Find: 查找: @@ -653,62 +658,62 @@ 输入以开始查找 - + Search 查找 - + Find &Next 查找下一个(&N) - + Find &Previous 查找上一个(&P) - + Replace with: 替换为: - + \1, \2 for back reference in regular expression 在正则表达式中使用 \1, \2 来后向引用 - + Replace 替换 - + Replace And Find 替换并查找 - + Replace All 替换全部 - + &Case sensitive 大小写敏感(&C) - + &Whole word only 匹配完整词(&W) - + Re&gular expression 正则表达式(&G) - + &Incremental search 增量查找(&I) @@ -1053,7 +1058,7 @@ vnotex::LocationInputWithBrowseButton - + Browse 浏览 @@ -1487,129 +1492,129 @@ Use the "Close" button if you just want to remove it from %2. vnotex::MarkdownEditor - - + + Insert Link 插入链接 - + Insert Image 插入图片 - + Insert Table 插入表格 - + For advanced paste, try the "Rich Paste" and "Parse To Markdown And Paste" on the editor's context menu 更多高级粘贴，请尝试编辑器上下文菜单中的“多功能粘贴”和“解析为 Markdown 并粘贴”功能 - - - + + + Insert From Clipboard 从剪切板插入 - + Insert From URL 从URL插入 - + Insert From Image Data 从图片数据插入 - - - + + + Insert As Image Link 插入为图片链接 - - + + Insert As Image 插入为图片 - - + + Insert As Text 插入为文本 - + Insert As Relative Image Link 插入为相对图片链接 - + Insert As Link 插入为链接 - + Insert As Relative Link 插入为相对链接 - + Attach And Insert Link 添加为附件并插入链接 - + Insert File Content 插入文件内容 - + Insert Image From Clipboard 从剪切板插入图片 - + Insert Image From URL 从URL插入图片 - + &Read 阅读(&R) - + Rich Paste 多功能粘贴 - + Parse To Markdown And Paste 解析为 Markodwn 并粘贴 - + Fetching images to local... 正在获取图片到本地... - + Abort 终止 - + Fetch Images To Local 获取图片到本地 - + Fetching image (%1) 正在获取图片 (%1) @@ -1617,12 +1622,12 @@ Use the "Close" button if you just want to remove it from %2. vnotex::MarkdownEditorPage - + Insert file name as title 将文件名作为标题 - + Insert file name as title when creating note 创建笔记时将文件名作为标题插入 @@ -1635,155 +1640,275 @@ Use the "Close" button if you just want to remove it from %2. 在阅读模式中为标题显示小节序号 - - + + Read 阅读 - + Constrain image width 限制图片宽度 - + Constrain image width to the window 将图片宽度限制在窗口内 - + Zoom factor in read mode 阅读模式缩放 - + Zoom factor: 缩放: - + HTML tag HTML 标签 - + Allow HTML tags in source 源文件中允许 HTML 标签 - + Auto break 自动换行 - + Automatically break a line with '\n' 遇到 '\n' 则自动换行 - + Linkify 链接化 - + Convert URL-like text to links 转换类 URL 的文本为链接 - + Indent first line 首行缩进 - + Indent the first line of each paragraph 缩进每个段落的第一行 - - + + Edit 编辑 - + Constrain in-place preview width 限制原地预览宽度 - + Constrain in-place preview width to the window 将原地预览宽度限制在窗口内 - + Fetch images to local in Parse And Paste 在解析并粘贴时，获取图片到本地 - + Fetch images to local in Parse To Markdown And Paste 在解析为 Markdown 并粘贴时，获取图片到本地 - + Smart table 智能表格 - + Smart table formation 智能表格格式化 - - + + Spell check 拼写检查 - + + Override font + 覆盖字体 + + + + Override editor font family of theme + 覆盖主题编辑器的字体 + + + General 通用 - + Section number mode 小节序号模式 - + None 无 - + Base level to start section numbering in edit mode 编辑模式中开始小节序号计数的基础层级 - + Section number style 小节序号样式 - + 1.1. 1.1. - + 1.1 1.1 - + Section number: 小节序号: - + + Use online service or local JAR file to render PlantUml graphs + 使用在线服务或者本地 JAR 文件来渲染 PlantUml 图表 + + + + + Online Service + 在线服务 + + + + Local JAR + 本地 JAR + + + + PlantUml: + PlantUml: + + + + Local JAR file to render PlantUml graphs + 用于渲染 PlantUml 图表的本地 JAR 文件 + + + + Select PlantUml JAR File + 选择 PlantUml JAR 文件 + + + + + Test + 测试 + + + + Test PlantUml JAR and Java Runtime Environment + 测试 PlantUml JAR 以及 Java 运行时环境 + + + + The JAR file (%1) specified does not exist. + 指定的 JAR 文件 (%1) 不存在。 + + + + + Test %1. + 测试 %1。 + + + + + succeeded + 成功 + + + + + failed + 失败 + + + + PlantUml JAR file: + PlantUml JAR 文件: + + + + Use online service or local executable file to render Graphviz graphs + 使用在线服务或者本地可执行文件来渲染 Graphviz 图表 + + + + Local Executable + 本地可执行文件 + + + + Graphviz: + Graphviz: + + + + Local executable file to render Graphviz graphs + 用于渲染 Graphviz 图表的本地可执行文件 + + + + Select Graphviz Executable File + 选择 Graphviz 可执行文件 + + + + Test Graphviz executable file + 测试 Graphviz 可执行文件 + + + + The executable file (%1) specified does not exist. + 指定的可执行文件 (%1) 不存在。 + + + + Graphviz executable file: + Graphviz 可执行文件: + + + Markdown Editor Markdown 编辑器 @@ -1795,28 +1920,28 @@ Use the "Close" button if you just want to remove it from %2. Markdown 查看器 - + Markdown Viewer Markdown 查看器 - + Clear Obsolete Images 清空无用图片 - + These images seems not in use anymore. Please confirm the deletion of them. 这些图片似乎已经不再使用。请确认并删除。 - + Deleted images could be found in the recycle bin of notebook if it is from a bundle notebook. 如果这是一个自包含笔记本，已删除的图片可以在笔记本回收站中找回。 - - + + Replace is not supported in read mode 阅读模式不支持替换 @@ -1837,32 +1962,32 @@ Use the "Close" button if you just want to remove it from %2. vnotex::MarkdownViewerAdapter - + No Background 无背景 - + Evernote 印象笔记 - + OneNote OneNote - + Microsoft Word Microsoft Word - + WeChat Public Account Editor 微信公众号编辑器 - + Raw HTML 原始HTML @@ -3282,107 +3407,111 @@ Description: %3 vnotex::ViewSplit - + Windows List 窗口列表 - + Workspaces and Splits 工作空间和拆分 - No window to show here - 没有窗口可以展示 + 没有窗口可以展示 + + + + No Window To Show + 没有可以展示的窗口 - + Workspaces 工作空间 - + Workspace %1 工作空间 %1 - + New Workspace 新建工作空间 - + Remove Workspace 移除工作空间 - + Split 拆分 - + Vertical Split 竖直拆分 - + Horizontal Split 水平拆分 - + Maximize Split 最大化拆分 - + Distribute Splits 平均分配拆分 - + Remove Split 移除拆分 - + Remove Split And Workspace 移除拆分和工作空间 - + Close Tab 关闭标签页 - + Close Other Tabs 关闭其他标签页 - + Close Tabs To The Right 关闭右侧标签页 - + Copy Path 复制路径 - + Copied path: %1 已复制路径: %1 - + Open Location 打开路径 - + Locate Node 定位节点 @@ -3397,39 +3526,39 @@ Description: %3 - - + + [No Buffer] [无缓冲区] - + Save changes before closing note (%1)? 关闭笔记 (%1) 前是否保存更改？ - - + + Note path (%1). 笔记路径 (%1)。 - + Discard changes to note (%1)? 放弃对笔记 (%1) 的更改？ - + Found backup file (%1) of file (%2). Do you want to recover from backup file? 发现文件 (%2) 的备份文件 (%1)。是否要从备份文件中恢复？ - + 'Yes' to recover from backup file, 'No' to discard it, and 'Cancel' to exit. “是” 以从备份文件中恢复，“否” 以放弃该备份文件，“取消” 以退出。 - + It may be caused by crash while editing this file before. File last modified time: %1 @@ -3440,32 +3569,32 @@ Backup file last modified time: %2 备份文件最后修改时间: %2 - + Drag And Drop Files To Attach 拖拽文件以添加为附件 - + File is missing on disk (%1). 文件在磁盘中丢失 (%1)。 - + Do you want to force to save the buffer to the file? 是否强制保存缓冲区内容到文件？ - + The file may be deleted from outside. Please choose to save the buffer to a new file or just discard it. 该文件可能已经被删除。请选择将缓冲区的内容保存为新文件或者放弃缓冲区。 - + File is changed from outside (%1). 文件被更改 (%1)。 - + Do you want to save the buffer to the file to override, or discard the buffer? 是否保存缓冲区覆盖到文件，或者放弃缓冲区？ @@ -3474,58 +3603,58 @@ Backup file last modified time: %2 是否用缓冲区的内容覆盖该文件？ - + The file is changed from outside. Please choose to save the buffer to the file or just discard the buffer and reload the file. 该文件已经被更改。请选择保存缓冲区到该文件或者放弃缓冲区并重新加载文件。 - + This is a read-only note (%1), on which modification is not allowed. 这是一个只读笔记 (%1)，不支持修改。 - + Please save your changes to another note. 请保存更改到另一个笔记。 - + Failed to save note (%1). 无法保存笔记 (%1)。 - + Please check the file (%1) and try it again. 请检查文件 (%1) 并重试。 - + Maybe the file is occupied by another service temporarily. 可能该文件正在被第三方应用临时占用。 - + Zoomed: %1% 缩放: %1% - + Zoomed: %1%2 缩放: %1%2 - - + + Pattern not found: %1 无法找到模式: %1 - + Match found: %1/%2 找到匹配: %1/%2 - + Replaced %n match(es) 替换 %n 处匹配 diff --git a/src/data/core/vnotex.json b/src/data/core/vnotex.json index 12b94637d8..7f83661601 100644 --- a/src/data/core/vnotex.json +++ b/src/data/core/vnotex.json @@ -3,7 +3,7 @@ "metadata" : { "//comment": "When releasing new version, please go through the following configs to check if override is needed.", "//Comment": "markdown_editor#override_viewer_resource", - "version" : "3.1.0" + "version" : "3.2.0" }, "core" : { "theme" : "pure", diff --git a/src/widgets/dialogs/settings/markdowneditorpage.cpp b/src/widgets/dialogs/settings/markdowneditorpage.cpp index 93ebef6542..9fe654bdc8 100644 --- a/src/widgets/dialogs/settings/markdowneditorpage.cpp +++ b/src/widgets/dialogs/settings/markdowneditorpage.cpp @@ -394,7 +394,7 @@ QGroupBox *MarkdownEditorPage::setupGeneralGroup() jarLayout->setContentsMargins(0, 0, 0, 0); m_plantUmlJarFileInput = new LocationInputWithBrowseButton(box); - m_plantUmlJarFileInput->setToolTip(tr("Local JAR file to render PlantUML graphs")); + m_plantUmlJarFileInput->setToolTip(tr("Local JAR file to render PlantUml graphs")); connect(m_plantUmlJarFileInput, &LocationInputWithBrowseButton::clicked, this, [this]() { auto filePath = QFileDialog::getOpenFileName(this,