diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index ef47efe7..3e62e855 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -10,7 +10,7 @@ on: workflow_dispatch: env: - VNOTE_VER: 3.0.0-beta.9 + VNOTE_VER: 3.0.0-beta.10 jobs: build-linux: diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index 60764819..0bd908dd 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -10,7 +10,7 @@ on: workflow_dispatch: env: - VNOTE_VER: 3.0.0-beta.9 + VNOTE_VER: 3.0.0-beta.10 jobs: build-linux: diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml index 30229f8f..17599c09 100644 --- a/.github/workflows/ci-win.yml +++ b/.github/workflows/ci-win.yml @@ -10,7 +10,7 @@ on: workflow_dispatch: env: - VNOTE_VER: 3.0.0-beta.9 + VNOTE_VER: 3.0.0-beta.10 jobs: build: diff --git a/changes.md b/changes.md index 4e89fe6b..9262917a 100644 --- a/changes.md +++ b/changes.md @@ -1,4 +1,12 @@ # Changes +## v3.0.0-beta.10 +* Show more tips +* Add exclude patterns for external nodes +* Add command line parser and support opening files from command line +* Update Mermaid.js to 8.9.1 +* Support exporting current note +* Add ExpandAll to node explorer + ## v3.0.0-beta.9 * Fix crash when exporting external files * Support manual sorting folders and notes diff --git a/src/data/core/translations/vnote_zh_CN.qm b/src/data/core/translations/vnote_zh_CN.qm index 89db9032..9ae791e1 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 d3b7d3fa..0ccc61b8 100644 --- a/src/data/core/translations/vnote_zh_CN.ts +++ b/src/data/core/translations/vnote_zh_CN.ts @@ -253,226 +253,231 @@ vnotex::ExportDialog - - + + Export 导出 - + Source 源 - + Current Buffer (%1) 当前缓冲区 (%1) - + + Current Note (%1) + 当前笔记 (%1) + + + Current Folder (%1) 当前文件夹 (%1) - + Current Notebook (%1) 当前笔记本 (%1) - + Source: 源: - + vnote_exports vnote导出 - + Target 目标 - + Markdown Markdown - + HTML HTML网页 - + PDF PDF - + Custom 自定义 - + Format: 格式: - + Use transparent background 使用透明背景 - + Rendering style: 渲染样式: - + Syntax highlighting style: 语法高亮样式: - - + + Browse 浏览 - + Select Export Output Directory 选择导出输出目录 - + Output directory: 输出目录: - + Advanced 高级 - + Process sub-folders 处理子文件夹 - + Export attachments 导出附件 - + Open Directory 打开目录 - + Copy Content 复制内容 - + Copy exported file content 复制已导出文件的内容 - + %n file(s) exported 已导出 %n 个文件 - + Cancelling the export. 正在取消导出。 - + Please specify a valid wkhtmltopdf executable file (%1) 请指定一个有效的 wkhtmltopdf 可执行文件 (%1) - + Embed styles 嵌入样式 - + Embed images 嵌入图片 - + Complete page 完整页面 - + Export the whole page along with images which may change the links structure 导出包括图像的完整页面，可能改变链接结构 - + Mime HTML format Mime HTML 格式 - + Add outline panel 添加大纲面板 - + Settings 设置 - + Page layout: 页面布局: - + Add Table-Of-Contents 添加内容导航表格 - + Use wkhtmltopdf 使用 wkhtmltopdf - + Download 下载 - + Select wkhtmltopdf Executable 选择 wkhtmltopdf 可执行文件 - + Wkhtmltopdf path: Wkhtmltopdf 路径: - + Wkhtmltopdf arguments: Wkhtmltopdf 参数: - + Portrait 纵向 - + Landscape 横向 @@ -487,8 +492,9 @@ - - + + + Failed to create output folder %1. 无法创建输出文件夹 %1。 @@ -498,37 +504,37 @@ 格式 %1 不支持导出为 Markdown。 - + Unknown target format %1. 未知的目标格式 %1。 - + File (%1) exported to (%2) 文件 (%1) 已导出为 (%2) - + Failed to export file (%1) 无法导出文件 (%1) - + notebook_%1 笔记本_%1 - + Format %1 is not supported to export as HTML. 格式 %1 不支持导出为 HTML。 - + Asked to stop. Aborting. 用户取消。 正在终止。 - + Format %1 is not supported to export as PDF. 格式 %1 不支持导出为 PDF。 @@ -991,38 +997,38 @@ vnotex::MainWindow - + Navigation 导航 - + Outline 大纲 - + Notebooks 笔记本 - + Do you want to minimize %1 to system tray instead of quitting when closed? 关闭时，是否将 %1 最小化到系统托盘而非退出？ - + You could change the option in Settings later. 稍后可以在设置里面更改。 - + %1 is still running here. %1 仍然在此运行。 - - + + Global 全局 @@ -1033,7 +1039,7 @@ - + Quit 退出 @@ -1111,8 +1117,8 @@ - - + + Settings 设置 @@ -1122,88 +1128,93 @@ 扩展内容区 - + + Press %1 To Exit Full Screen + 按 %1 退出全屏 + + + Stay On Top 置顶 - + Windows 窗口 - + Open User Configuration Folder 打开用户配置文件夹 - + Open Default Configuration Folder 打开默认配置文件夹 - + Edit User Configuration 编辑用户配置 - + Open Default Configuration 打开默认配置 - + Reset Main Window Layout 重置主窗口布局 - + Restart 重启 - + Help 帮助 - + What's This? 这是什么？ - + Enter WhatsThis mode and click somewhere to show help information 进入 WhatsThis 模式，点击某处以显示帮助信息 - + Shortcuts Help 快捷键帮助 - + Markdown Guide Markdown 指南 - + View Logs 查看日志 - + Feedback And Discussions 反馈和讨论 - - + + About 关于 - + <h3>%1</h3> <span>%2</span> @@ -1212,17 +1223,17 @@ - + About Qt 关于 Qt - + %1 failed to start. %1 无法启动。 - + Failed to initialize configuration manager. Please check if all the files are intact or reinstall the application. 无法初始化配置管理器。请检查全部文件的完整性或者重新安装应用。 @@ -1230,58 +1241,80 @@ vnotex::ManageNotebooksDialog - + Close 关闭 - Delete - 删除 + 删除 - + Manage Notebooks 管理笔记本 - Close notebook %1? - 关闭笔记本 %1？ + 关闭笔记本 %1？ - + + Delete (DANGER) + 删除(危险) + + + + Close notebook (%1)? + 关闭笔记本 (%1)？ + + + The notebook could be imported again later. 稍后可以重新导入该笔记本。 - - + Notebook location: %1 笔记本路径: %1 - + Failed to close notebook (%1) 无法关闭笔记本 (%1) - + + Delete notebook (%1) from disk? + 从磁盘中删除笔记本 (%1)? + + + + CALM DOWN! CALM DOWN! CALM DOWN! It will delete all files belonging to this notebook from disk. It is dangerous since it will bypass system's recycle bin! + 冷静！冷静！冷静！这会从磁盘中删除该笔记本相关的全部文件。该操作会跳过系统的回收站，危险！ + + + + Notebook location: %1 +Use the "Close" button if you just want to remove it from %2. + 笔记本位置: %1 +如果仅要从 %2 中移除该该笔记本，请使用“关闭”按钮。 + + + Failed to delete notebook (%1) 无法删除笔记本 (%1) - Delete notebook %1 from disk? - 从磁盘中删除笔记本 %1? + 从磁盘中删除笔记本 %1? - It will delete all files belonging to this notebook from disk. It is dangerous since it will bypass system's recycle bin! - 这会从磁盘中删除该笔记本相关的全部文件。该操作会跳过系统的回收站，危险！ + 这会从磁盘中删除该笔记本相关的全部文件。该操作会跳过系统的回收站，危险！ - + There are unsaved changes to current notebook. 当前笔记本有尚未保存的更改。 @@ -1289,124 +1322,129 @@ 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) @@ -1862,106 +1900,106 @@ 从全部笔记本中选择一个作为当前笔记本。<br/>移动鼠标到某个项目上查看详情。 - + Notebook 笔记本 - + This title bar contains buttons and menu to manage notebooks and notes. 该标题栏包含管理笔记本和笔记的按钮和菜单。 - + View 查看 - + Toggle Recycle Bin Node 显示/隐藏回收站节点 - + &Manage Notebooks 管理笔记本(&M) - + External Files 外部文件 - + Show External Files 显示外部文件 - + Import External Files When Activated 激活时自动导入外部文件 - - + + Could not create folder within Recycle Bin. 无法在回收站内创建文件夹。 - - + + Could not create note within Recycle Bin. 无法在回收站内创建笔记。 - + Please first create a notebook to hold your data. 请先创建一个笔记本来保存数据。 - + Select Files To Import 选择文件导入 - + Failed to add file (%1) as node (%2). 无法添加文件 (%1) 为节点 (%2)。 - + View By Configuration 按配置查看 - + View By Name 按名字查看 - + View By Name (Reversed) 按名字倒序查看 - + View By Created Time 按创建时间查看 - + View By Created Time (Reversed) 按创建时间倒序查看 - + View By Modified Time 按修改时间查看 - + View By Modified Time (Reversed) 按修改时间倒序查看 @@ -2125,147 +2163,156 @@ [外部] %1 - + New N&ote 新建笔记(&O) - + New &Folder 新建文件夹(&F) - + &Properties 属性(&P) - + Open &Location 打开路径(&L) - + Cop&y Path 复制路径(&Y) - + Copied path: %1 已复制路径: %1 - + &Copy 复制(&C) - + C&ut 剪切(&U) - + &Paste 粘贴(&P) - + &Empty 清空(&E) - + Empty the recycle bin of this notebook? 清空该笔记本的回收站？ - + All files in recycle bin will be deleted permanently. 回收站中的全部文件都会被永久删除。 - + Location of recycle bin: %1 回收站路径: %1 - + Failed to empty recycle bin (%1) (%2). 无法清空回收站 (%1) (%2)。 - + &Sort 排序(&S) - + Re&load 重新加载(&L) - + Re&load Index From Disk + 从磁盘重新加载索引(&L) + + + &Import To Index 导入到索引（&I） - + &Open 打开(&O) - + + &Expand All * + 逐层展开(&E) * + + + Failed to copy source (%1) to destination (%2) (%3). 无法复制源 (%1) 至 目标 (%2) (%3)。 - + Sort Folders 排序文件夹 - + Sort Notes 排序笔记 - + Sort nodes under %1 (%2) in the configuration file. 在配置文件中对%1 (%2) 下的节点进行排序。 - + notebook 笔记本 - + folder 文件夹 - + Name 名字 - + Created Time 创建时间 - + Modified Time 修改时间 - + Invalid node (%1). 无效的节点 (%1)。 - + Please check if the node exists on the disk. 请检查该节点在磁盘上是否存在。 @@ -2274,93 +2321,98 @@ 无法删除或移除项目 %1 (%2) (%3)。 - + &Delete 删除(&D) - + &Delete From Recycle Bin 从回收站中删除(&D) - + &Remove From Index 从索引中移除(&R) + + + Relo&ad Index From Disk + 从磁盘重新加载索引(&A) + - + Copied %n item(s) 已复制 %n 项 - + Invalid clipboard data to paste. 无效的剪切板数据用于粘贴。 - + Destination is detected in sources (%1). Operation is cancelled. 目标包含在源 (%1) 中。操作取消。 - + Pasted %n item(s) 已粘贴 %n 项 - + Delete these folders and notes permanently? 永久删除这些文件夹和笔记？ - + Files will be deleted permanently and could not be found even in operating system's recycle bin. 文件将会被永久删除，即使在操作系统的回收站中也无法找回。 - + Delete these folders and notes? 删除这些文件夹和笔记？ - + Deleted files could be found in the recycle bin of notebook. 被删除的文件可以在笔记本回收站中找回。 - + Confirm Deletion 确认删除 - + Failed to delete/remove item (%1) (%2) (%3). 无法删除或移除项目 (%1) (%2) (%3)。 - + Deleted/Removed %n item(s) 删除或移除 %n 项 - + Confirm Removal 确认移除 - + Remove these folders and notes from index? 从索引中移除这些文件夹和笔记？ - + Files are not touched but just removed from notebook index. 文件不会被改动，仅仅是从笔记本索引中移除。 diff --git a/src/data/core/vnotex.json b/src/data/core/vnotex.json index db9e78ac..f45b65f2 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.0.0-beta.9" + "version" : "3.0.0-beta.10" }, "core" : { "theme" : "pure", diff --git a/src/widgets/notebooknodeexplorer.cpp b/src/widgets/notebooknodeexplorer.cpp index 87c8c3ea..8744549d 100644 --- a/src/widgets/notebooknodeexplorer.cpp +++ b/src/widgets/notebooknodeexplorer.cpp @@ -1118,7 +1118,7 @@ QAction *NotebookNodeExplorer::createAction(Action p_act, QObject *p_parent) break; case Action::ReloadIndex: - act = new QAction(tr("Re&load Index From Disk"), p_parent); + act = new QAction(tr("Relo&ad Index From Disk"), p_parent); connect(act, &QAction::triggered, this, [this]() { if (!m_notebook) {