From 372f0929193e60d87ceb63e8e0f5c37b8eb9e6f0 Mon Sep 17 00:00:00 2001 From: Le Tan Date: Fri, 19 Mar 2021 20:35:54 +0800 Subject: [PATCH] release v3.0.0-beta.10 --- .github/workflows/ci-linux.yml | 2 +- .github/workflows/ci-macos.yml | 2 +- .github/workflows/ci-win.yml | 2 +- changes.md | 8 + src/data/core/translations/vnote_zh_CN.qm | Bin 52423 -> 53343 bytes src/data/core/translations/vnote_zh_CN.ts | 454 ++++++++++++---------- src/data/core/vnotex.json | 2 +- src/widgets/notebooknodeexplorer.cpp | 2 +- 8 files changed, 266 insertions(+), 206 deletions(-) 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 89db9032ee5c9e38bb04b79fefb71c4daaf5c6d0..9ae791e16d2ccf3b2f4b1c601a6fbb1c45c1e494 100644 GIT binary patch delta 5503 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 ONpn8!Qnah9$A1A)-d!*N delta 4827 zcmYjVd00+)8-Cuiy~{c0eUXMjWyuyLRMspNDw49~rBKQeF)31b8%4_Qt<;o?lq96I z5QZ6_tv=hxFxFwrU}mft%UHgq!5_hn*7xa0mq;-)_$is?aI z@M)rN{w6N73sFfUaYaQ$d*g|#mf@N)pyKGN1v>$Od+Y^~un27tc4=$LAceqBB z8Ap5{U!p^~#1B{xtOu45Rd^FWWD?O%TjIyK5Uu}?_{m;Gx>X8xYfvyKNx{r=1#>)! zUmrshRI6Z>AMqPt&`7K^OUXprqlwS@7f}^nRMteK8A$x4vqVcuNIe-Igs~(K$|G{B zAqz_wAZ;S6FIu9uM(PrNf@qT~^(-bg*0Jq}(<4iUKDeusjI8gghh z#QQZl6sIFny~yF*2NThNKpHuJ3{iCnjn2dkA1B~xqJd@PWF$&)A(X*qUHC<->s3Td?@*kLWFkyMiZ0Lh}sn^82Pn=@u4)a z!Sp@Rw>K#03_PuBPeGp$fy`gY*a8omcGle#JZX)VEn9TJ(@!lNT zZj*_F_ui-Nxggru4OI3_PjvV&9iN#%UyFHt5s2! zcy3U&DtXE~qQpkkj>1kv>}yqC=tQEHPO6>Xn~B=Us)H}EHZ8VNeSZp+boExy{i&+{ zmJQLY1*&WJ`w|^(uevqu7E!#F>ei2uh{qh&{pck`i>9c4PkDud2dSQ1{EW;mQ@sku z^^q%8@AVsqL^H#^Lp(wS1sAqqbYGt!T6>AnrClW&(ZsZ9ybFrt8UnLRoRTB%{?RFx9NePZVP0!C#IWagd4^^~_v zwCqUa#xTn&bVPZv%(lO=PrI1OjQW$vFN7(~4@87pGR2-Xh|~{E+2|vns41E`l=h6M zV>DBpR)moGFtw^1L;+RI(MzDZe4xzHIqqXed96 zJ!EdwKiYD-lsU`3?jm~ak9@=qA`0oi?Ek4(7>6x+Z{zU zaORw&{g7)ru75Wi*ri;-Su8iy3kBIDoAclNBMPkt7x%{xC}XoZvj@o6tD}PML%1yO zV?^eUTy|6j%9vikj-M5b3*~Z+CMJpKbR>64405!Udl<9=og#QmKxh{)2Jdw)Phv^9wP^cP+fvXR%VevOV2$y+|Y41*=!`Zdtg zif!iYoIiRBBu$RyPxW+x{wLV*XG##-g6I7CMNfzh;!$gWth6S3}fMz9-EMKtxA&}qV4qRG{Qef|J= zRwZgD@Zr6-n1w@RWT}x!Vdp zliwhuSA~FvK%y-!g3;zP*jp|va43Z#HA0NamMH0?5TAnmJz@oO1g>XA2$}7^5RK|1 zY;Q3Vk;xNsl49UcD`DT(X7!XRxHwVRXU2N#eWCn-2?sA5C7e0{9cR}I^?fW+LVXq7 zR;*y-ppNwTOSs+>?A}@^JZRq6{+5D?8-+*C zNQFK{t)NZH(f0sC zzD&Ki5+3qy>gYBgXMCn*P^?t)m5F&5f#o;Hzd15Hr47& z-=N^wg{p6~9!}&QuYOXe!@%aEesRPK;|i~Cs<9!OHde#yftvjqJ_e)}y);@E6ddy` z%~uaP6Gca8y7qz$4}H*#%xHy_?KNpU`aDG!%hSyKc{bQur3tUT57La#M7!dkuh(i~ z?p0uYTeH%o3(>|hP0}xjNKGqEvJ-N+Y^x^qvmR`|p-FoZ26BDSY_&)S%PloqD?v{6 z6$M*7)1=?cg?g+s`EOpq!G)RvYe#fJlclC~Ode66&I-;+*VG(~#GDkSIodp6rEbz3 z-+)LI1ZvK9Lx}CVYA%!@mmd8!_oPWg!+L6d9RmjzeXDsf$_4Y#LCuTfA()#kYjvM) zLq(*uS+xhM=%MYN<4%+|MeCg4j8gx*wqF<=u@0}%_D}UfNExlmvh}FxsapSC;b=Ca z%qzth+Jh~RLo3U) zhb{V{dOX!0w&u}{4{Pgef57CNuRZ1sch|ks9#27hyh+>O2y>mBwYPT+#k4U)*KIeX zFq(ATd)Y(8yF2O}$`LrTh0YJ76;-Uz`Hx4&gDZ4_JpA=vpbIL|qh;OE8Asb-EPJL4 zJ8i_6H%zx6^=Fi!Pr8L#P|{eZTQb-S9ps_T^a}eoHt7=c`a+ab6`X6OOMSQs`@Yhx zPl2OThw3uxR-!zm=jgJdsvxfZx?K++pu4}*mGxQ!aRn>5>XPozCd@mk)N4O$du16}4%n>awBcz%)Vh2Cqk=tUoZhJWm-`6q;yTf-UlGb#kT@|FWy~;7oZ38T7G;UXpeS^Pzs0cTdb#gAamD(nM6u_@ zB&+u*YZl_Vy+~EoV{s#EdIN2!#4R%sn&=8~$45uxE?Ug5LJQe&PuvxMm#FrdSa=+v zA53E5ZHTnfF>zmpCFZ5;Vp;pom;ehDT)0ZCN`Pm@+r`uWP3Zyg+&HYoo8pD$DT1bn z4HI3Eg1O?wkXa~WlK7h`1-Y8diyxD%(VBuJ?prU2=9r{TI|$3|B#YOjxLze$YS5B= zYNbxK*zanVx>sReZfnV*0-kjHAh~ES;+!)I&P|X!hKCS2`br)@0sHKcMsGu8%SK7Q z852OhxzboyoFk2pOaZrXP(U9kaGE;`XR@@QnunySrI@{AQ8yE%WxZyjVE-<~J=p{? zb(L0ZjzuWfNNdhjf%Q&O3XA=|wNhG{8lt@+ZS?yE-x9B-^!jk5_Pvx5_y{6?q+n=- zl#yzI)Qp$%C&6G}qe%NH=Hut09hz9H&xSnlbThgsPyk6czy zXQzwK}GjfaQ|j~uJ=oXI8$F!4pJRBt3O(Z$jme8ua1Ht~xFnC}TQNp)|q0^Ux8!HXN zCgQ>M%MHWtht9I2(%6dASC-nX>|eQJ(r=8}qo%F7 zU}|TlRuh(F{FTspefgYTWJmVo{KZxS29kikRvrr$EeW@aS`-r=x@b|PoxSrg^Q@`e zTL;)>&i>yf!83e8cuY8MbaS)zyBK$B=?%Z$%{%`8P#X5X{T-D3|9@)bUZYB-8e@(P lnxI;4ejHR_E}d3XX%}3}R9=|*sb8g4#z{lv;G!-L{{iHAll}kz 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) {