diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index 7c1cf90355..b1e2c734c5 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -10,7 +10,7 @@ on: workflow_dispatch: env: - VNOTE_VER: 3.16.0 + VNOTE_VER: 3.17.0 jobs: build-linux: diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index 028dfc34ab..e55ffaf80f 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -10,7 +10,7 @@ on: workflow_dispatch: env: - VNOTE_VER: 3.16.0 + VNOTE_VER: 3.17.0 jobs: build: diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml index e32ea299ed..53b9d612c2 100644 --- a/.github/workflows/ci-win.yml +++ b/.github/workflows/ci-win.yml @@ -10,7 +10,7 @@ on: workflow_dispatch: env: - VNOTE_VER: 3.16.0 + VNOTE_VER: 3.17.0 jobs: build: diff --git a/changes.md b/changes.md index 144c96605e..dff3b21f45 100644 --- a/changes.md +++ b/changes.md @@ -1,4 +1,10 @@ # Changes +## v3.17.0 +* Quick note: create note in given scheme (@feloxx) +* MarkdownEditor: support inserting multiple images (@feloxx) +* Mermaid: upgrade and fix preview issue (@ygcaicn) +* Flowchart.js: upgrade + ## v3.16.0 * Support reading PDF format * Support Ming Map editor in suffix `*.emind` diff --git a/src/core/coreconfig.h b/src/core/coreconfig.h index 7e13f365de..2a297c3f5c 100644 --- a/src/core/coreconfig.h +++ b/src/core/coreconfig.h @@ -22,6 +22,7 @@ namespace vnotex ExpandContentArea, Settings, NewNote, + NewQuickNote, NewFolder, CloseTab, CloseAllTabs, diff --git a/src/data/core/Info.plist b/src/data/core/Info.plist index c0ae975aaa..d8e6ca65dd 100644 --- a/src/data/core/Info.plist +++ b/src/data/core/Info.plist @@ -21,9 +21,9 @@ CFBundleExecutable vnote CFBundleShortVersionString - 3.16.0 + 3.17.0 CFBundleVersion - 3.16.0.1 + 3.17.0.1 NSHumanReadableCopyright Created by VNoteX CFBundleIconFile diff --git a/src/data/core/translations/vnote_ja.ts b/src/data/core/translations/vnote_ja.ts index 8efdc5f5c6..4654de081b 100644 --- a/src/data/core/translations/vnote_ja.ts +++ b/src/data/core/translations/vnote_ja.ts @@ -821,23 +821,23 @@ - + File Associations - - + + Suffixes separated by ; - + List of suffixes for this file type - + List of suffixes to open with external program (or system default program) @@ -1350,53 +1350,53 @@ vnotex::HistoryPanel - + Clear クリア - + &Open 開く(&O) - + &Locate Node - + Clear all the history? - + Older - + Today - + Yesterday - + Last 7 Days - + %1 %2 - + [%1] %2 %3 @@ -1423,82 +1423,82 @@ - + General 一般 - + Default image host: - + Clear obsolete images - + Clear unused images at image host (based on current file only) - + Local - + Failed to rename image host (%1) to (%2). - + Image Host - + Test - + Delete - + Type: 種類: - + Name: 名前: - + %1: - + Delete image host (%1)? - + Test %1. - + succeeded - + failed @@ -1832,12 +1832,12 @@ 設定マネージャの初期化に失敗しました。すべてのファイルが正常かどうかを確認するか、アプリケーションを再インストールしてください。 - + Failed to check for updates (%1) - + Updates available: %1 @@ -1847,40 +1847,40 @@ - + 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 グローバル - + There is one export dialog running. Please close it first. - + Failed to load %n notebook(s). - + These notebooks may be moved or deleted. It is recommended to remove them from configuration and open them with the correct root folder path later. Remove them from the configuration? @@ -1892,7 +1892,7 @@ Remove them from the configuration? - + Quit 終了 @@ -1923,23 +1923,23 @@ Remove them from the configuration? 新規ノート - + New Folder 新規フォルダ - - + + Open File ファイルを開く - + Import File ファイルをインポート - + Import Folder フォルダをインポート @@ -1954,114 +1954,119 @@ Remove them from the configuration? - + + New Quick Note + + + + Export (Convert Format) - - + + Quick Access クイックアクセス - + Flash Page - + Please set the Flash Page location in the Settings dialog first. - + Flash Page is a temporary page for a flash of inspiration. - + Please pin files to Quick Access first. - + Files could be pinned to Quick Access via context menu. - + Quick Access could be managed in the Settings dialog. - + Add Task - + Reload - + Task - + Menu メニュー - + Home Page - + Documentation - + Contributors - + Edit User Configuration File - + Edit Markdown User Styles - + Edit the user styles of Markdown editor read mode - + Quick Access Not Set - - + + Settings 設定 - + Expand Content Area コンテンツ領域の拡大 - + Press %1 To Exit Full Screen %1 を押して全画面表示を終了する @@ -2071,42 +2076,42 @@ Remove them from the configuration? ノートブックの管理 - + Import - + Stay on Top - + Windows ウインドウ - + Open User Configuration Folder ユーザー設定フォルダを開く - + Open Default Configuration Folder 既定の設定フォルダを開く - + Reset Main Window Layout メインウィンドウのレイアウトをリセット - + Restart 再起動 - + Help ヘルプ @@ -2119,38 +2124,38 @@ Remove them from the configuration? [これは何]モードに入り、ヘルプ情報を表示する場所をクリックします - + Shortcuts Help ショートカットヘルプ - + Markdown Guide Markdown ガイド - + View Logs ログの表示 - + Feedback and Discussions - + Check for Updates - - + + About バージョン情報 - + <h3>%1</h3> <span>%2</span> @@ -2159,7 +2164,7 @@ Remove them from the configuration? - + About Qt Qtについて @@ -2227,7 +2232,7 @@ Remove them from the configuration? vnotex::MarkdownEditor - + Insert Link リンクを挿入 @@ -2241,176 +2246,207 @@ Remove them from the configuration? Insert Table 表を挿入 + + + + Failed to read local image file (%1) (%2). + + + + + Failed to insert image from local file (%1) (%2). + + + + + Failed to insert image from data (%1). + + For advanced paste, try the "Rich Paste" and "Parse to Markdown and Paste" on the editor's context menu - - - + + + 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 From Clipboard (%n items) + + + + - + Insert Image From Clipboard クリップボードからイメージを挿入 - + Insert Image From URL URLからイメージを挿入 - + &Read 読み取り(&R) - + Rich Paste リッチ貼り付け - + Paste as Plain Text - + Parse to Markdown and Paste - + Insert Snippet - + + + Failed to upload image to image host (%1) as (%2). + + + + View Image - + Copy Image URL - + Copy Image - + Copy In-Place Preview - + Open Link - + Copy Link - + Fetching images to local... ローカルにイメージを取得しています... - - + + Abort 中止 - + Fetch Images To Local イメージをローカルに取得 - + Fetching image (%1) イメージ (%1) を取得しています - - + + Upload Images To Image Host - + None なし - + Uploading local images... - + Upload image (%1) @@ -2418,361 +2454,361 @@ Remove them from the configuration? vnotex::MarkdownEditorPage - + Markdown Editor Markdownエディタ - - + + Read 読み取り - + Constrain image width イメージの幅を制限する - + Constrain image width to the window イメージの幅をウィンドウに制限する - + Center image - + Center images - + 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 各段落の最初の行をインデントする - + Code block line number - + Add line number to code block - - + + Edit 編集 - + Insert file name as title ファイル名をタイトルとして挿入 - + Insert file name as title when creating note ノート作成時にファイル名をタイトルとして挿入 - + Constrain in-place preview width インプレイスプレビューの幅を制約する - + Constrain in-place preview width to the window インプレイスプレビューをウインドウ幅に制約する - + In-place preview sources: - + Image link - + Code block - + Math 数式 - + 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 - + Use Rich Paste by default - + Use Rich Paste by default when pasting text - + 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 Web service or local JAR file to render PlantUml graphs - - + + Web Service - + Override the Web service used to render PlantUml graphs - - + + Empty to use default one - + Override MathJax script: - + Use Web service or local executable file to render Graphviz graphs - + Local JAR - + PlantUml: - + Local JAR file to render PlantUml graphs - + Select PlantUml JAR File - - + + Test - + Test PlantUml JAR and Java Runtime Environment - + The JAR file (%1) specified does not exist. - - + + Test %1. - - + + succeeded - - + + failed - + PlantUml JAR file: - + Override PlantUml Web service: - + Local Executable - + Graphviz: - + Local executable file to render Graphviz graphs - + Select Graphviz Executable File - + Test Graphviz executable file - + The executable file (%1) specified does not exist. - + Graphviz executable file: - + Override the MathJax script used to render math formulas @@ -2966,49 +3002,38 @@ Remove them from the configuration? vnotex::NewNoteDialog - + New Note 新規ノート - + Template: - - Manage - - - - + Please specify a valid name for the note. - + Name conflicts with existing or built-in note. - + Failed to create note under (%1) in (%2) (%3). (%2)(%3)の(%1)の下にノートを作成できませんでした。 - + note ノート - None - なし - - - - Failed to load template (%1) (%2). - + なし @@ -3272,20 +3297,38 @@ Remove them from the configuration? ノート(%1)を(%2)(%3)に保存できませんでした。 + + vnotex::NoteTemplateSelector + + + Manage + + + + + None + なし + + + + Failed to load template (%1) (%2). + + + vnotex::NotebookExplorer - + Select one of all the notebooks as current notebook.<br/>Move mouse on one item to check its details. すべてのノートブックの1つを現在のノートブックとして選択します。<br/>1つの項目にマウスを移動して、その詳細を確認します。 - + Notebook ノートブック - + This title bar contains buttons and menu to manage notebooks and notes. このタイトルバーには、ノートブックとノートを管理するためのボタンとメニューが含まれています。 @@ -3294,211 +3337,231 @@ Remove them from the configuration? 表示 - + External Files 外部ファイル - + Show External Files 外部ファイルを表示 - + Scan and Import - + Please select one notebook first. - + Scan the whole notebook (%1) and import external files automatically? - + This operation helps importing external files that are added outside from VNote. It may import unexpected files. - + It is recommended to always manage files within VNote. - + Imported %n file(s). - + Manage Notebooks ノートブックの管理 - + Rebuild Notebook Database - + Import External Files when Activated - + Close File Before Open with External Program - + Recycle Bin ごみ箱 - + Notebooks - + Notes - + View By - + + Please set up quick note schemes in the Settings dialog first. + + + + + New Quick Note + + + + + The quick note should be created within a notebook. + + + + + Failed to create quick note from scheme (%1) (%2) + + + + 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) 変更日時順の表示(逆順) - + Open Recycle Bin - + Empty Recycle Bin - + Empty the recycle bin of notebook (%1)? - + CAUTION! All the files under the recycle bin folder will be deleted and unrecoverable! - + Recycle bin folder: %1 - + Explore Mode - + Combined - + Separate, Single Column - + Separate, Double Columns - + Rebuild the database of notebook (%1)? - + This operation will rebuild the notebook database from configuration files. It may take time. - + A notebook may use a database for cache, such as IDs of nodes and tags. - + Rebuilding notebook database... - + Notebook database has been rebuilt. - + Failed to rebuild notebook database. @@ -3969,41 +4032,116 @@ Description: %3 vnotex::QuickAccessPage - - + + Quick Access クイックアクセス - + Flash Page - + Flash Page location (user could copy the path of one note and paste it here) - + Flash Page: - + Select Flash Page File - + Edit the files pinned to Quick Access (one file per line) - + Quick Access: + + + Quick Note + + + + + No scheme to show + + + + + New + + + + + Delete + + + + + Scheme: + + + + + Folder: + フォルダ: + + + + Empty to use current explored folder dynamically + + + + + Select Quick Note Folder + + + + + Note name: + + + + + Note template: + + + + + Quick Note Scheme + + + + + Scheme name already exists! Try again: + + + + + Scheme name: + + + + + quick_note_%da%.md + + + + + Delete quick note scheme (%1)? + + vnotex::RenameTagDialog @@ -4337,7 +4475,7 @@ Description: %3 vnotex::SelectDialog - + Cancel キャンセル @@ -5038,12 +5176,11 @@ Description: %3 プレビューがありません - Style Override - 優先スタイル + 優先スタイル - + Theme テーマ @@ -5203,7 +5340,7 @@ Description: %3 vnotex::ViewArea - + No recently closed file @@ -5219,152 +5356,152 @@ Description: %3 ワークスペースと分割 - + Open Windows - + Menu メニュー - + 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 All Tabs - + Close Other Tabs 他のタブを閉じる - + Close Tabs To The Left - + Close Tabs To The Right 右側のタブを閉じる - + Auto Reload - + Reload file from disk automatically if it is changed outside - + Copy Path パスをコピー - + Copied path: %1 コピーされたファイルパス: %1 - + Open Location 場所を開く - + Locate Node ノードの検索 - + Pin To Quick Access - + Move One Split Left - + Move One Split Right - + Move One Split Up - + Move One Split Down diff --git a/src/data/core/translations/vnote_zh_CN.qm b/src/data/core/translations/vnote_zh_CN.qm index e61e8cdeda..b32336e02a 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 feb13aec26..b97fe20851 100644 --- a/src/data/core/translations/vnote_zh_CN.ts +++ b/src/data/core/translations/vnote_zh_CN.ts @@ -826,23 +826,23 @@ 外部程序 - + File Associations 文件关联 - - + + Suffixes separated by ; 由;分隔的后缀 - + List of suffixes for this file type 该文件类型的后缀列表 - + List of suffixes to open with external program (or system default program) 需要使用外部程序打开的后缀列表(或者系统默认程序) @@ -1367,54 +1367,54 @@ vnotex::HistoryPanel - + Clear 清空 - + &Open 打开(&O) - + &Locate Node 定位节点(&L) - + Clear all the history? 清空所有历史？ - + Older 更早 - + Today 今天 - + Yesterday 昨天 - + Last 7 Days 过去7天 - + %1 %2 %1 %2 - + [%1] %2 %3 [%1] %2 @@ -1442,82 +1442,82 @@ 新建图床 - + General 通用 - + Default image host: 默认图床: - + Clear obsolete images 清空无用图片 - + Clear unused images at image host (based on current file only) 清空图床中无用的图片（仅基于当前文件） - + Local 本地 - + Failed to rename image host (%1) to (%2). 无法重命名图床(%1)为(%2)。 - + Image Host 图床 - + Test 测试 - + Delete 删除 - + Type: 类型: - + Name: 名字: - + %1: %1: - + Delete image host (%1)? 删除图床(%1)？ - + Test %1. 测试%1。 - + succeeded 成功 - + failed 失败 @@ -1802,12 +1802,12 @@ vnotex::MainWindow - + Failed to check for updates (%1) 无法检查更新(%1) - + Updates available: %1 有可用更新: %1 @@ -1817,40 +1817,40 @@ 正在初始化核心组件... - + 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 全局 - + There is one export dialog running. Please close it first. 已有导出对话框运行。请先将其关闭。 - + Failed to load %n notebook(s). 无法加载 %n 个笔记本。 - + These notebooks may be moved or deleted. It is recommended to remove them from configuration and open them with the correct root folder path later. Remove them from the configuration? 这些笔记本可能已被移动或者删除。推荐将其从配置中移除并稍后使用正确的根文件夹路径重新打开。 @@ -1863,7 +1863,7 @@ Remove them from the configuration? - + Quit 退出 @@ -1894,23 +1894,23 @@ Remove them from the configuration? 新建笔记 - + New Folder 新建文件夹 - - + + Open File 打开文件 - + Import File 导入文件 - + Import Folder 导入文件夹 @@ -1925,73 +1925,78 @@ Remove them from the configuration? 打开VNote 2的遗留笔记本 - + + New Quick Note + 新建快速笔记 + + + Export (Convert Format) 导出(转换格式) - - + + Quick Access 快速访问 - + Flash Page 灵犀页 - + Please set the Flash Page location in the Settings dialog first. 请先在设置对话框中设置灵犀页位置。 - + Flash Page is a temporary page for a flash of inspiration. 灵犀页是一个用于记录一闪而过的灵感的临时页面。 - + Please pin files to Quick Access first. 请先将文件固定到快速访问。 - + Files could be pinned to Quick Access via context menu. 文件可以通过上下文菜单固定到快速访问。 - + Quick Access could be managed in the Settings dialog. 可以在设置对话框中管理快速访问。 - + Add Task 添加任务 - + Reload 重新加载 - + Task 任务 - + Menu 菜单 - + Documentation 文档 - + Contributors 贡献者 @@ -2000,38 +2005,38 @@ Remove them from the configuration? 配置 - + Edit User Configuration File 编辑用户配置文件 - + Edit Markdown User Styles 编辑Markdown用户样式 - + Edit the user styles of Markdown editor read mode 编辑Markdown编辑器阅读模式的用户样式 - + Quick Access Not Set 快速访问未设置 - - + + Settings 设置 - + Expand Content Area 扩展内容区 - + Press %1 To Exit Full Screen 按%1退出全屏 @@ -2041,42 +2046,42 @@ Remove them from the configuration? 管理笔记本 - + Import 导入 - + Stay on Top 置顶 - + Windows 窗口 - + Open User Configuration Folder 打开用户配置文件夹 - + Open Default Configuration Folder 打开默认配置文件夹 - + Reset Main Window Layout 重置主窗口布局 - + Restart 重启 - + Help 帮助 @@ -2089,43 +2094,43 @@ Remove them from the configuration? 进入WhatsThis模式，点击某处以显示帮助信息 - + Shortcuts Help 快捷键帮助 - + Markdown Guide Markdown指南 - + View Logs 查看日志 - + Home Page 主页 - + Feedback and Discussions 反馈和讨论 - + Check for Updates 检查更新 - - + + About 关于 - + <h3>%1</h3> <span>%2</span> @@ -2134,7 +2139,7 @@ Remove them from the configuration? - + About Qt 关于Qt @@ -2251,7 +2256,7 @@ Remove them from the configuration? vnotex::MarkdownEditor - + Insert Link 插入链接 @@ -2265,176 +2270,207 @@ Remove them from the configuration? Insert Table 插入表格 + + + + Failed to read local image file (%1) (%2). + 无法读取本地图片文件(%1)(%2)。 + + + + Failed to insert image from local file (%1) (%2). + 无法从本地文件(%1)插入图片(%2)。 + + + + Failed to insert image from data (%1). + 无法从数据插入图片(%1)。 + 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 From Clipboard (%n items) + + 从剪切板插入(%n项) + + - + Insert Image From Clipboard 从剪切板插入图片 - + Insert Image From URL 从URL插入图片 - + &Read 阅读(&R) - + Rich Paste 多功能粘贴 - + Paste as Plain Text 粘贴为纯文本 - + Parse to Markdown and Paste 解析为Markodwn并粘贴 - + Insert Snippet 插入片段 - + + + Failed to upload image to image host (%1) as (%2). + 无法上传图片为(%2)到图床(%1）中。 + + + View Image 查看图片 - + Copy Image URL 复制图片地址 - + Copy Image 复制图片 - + Copy In-Place Preview 复制原地预览 - + Open Link 打开链接 - + Copy Link 复制链接 - + Fetching images to local... 正在获取图片到本地... - - + + Abort 终止 - + Fetch Images To Local 获取图片到本地 - + Fetching image (%1) 正在获取图片(%1) - - + + Upload Images To Image Host 上传图片到图床 - + None 无 - + Uploading local images... 正在上传本地图片... - + Upload image (%1) 上传图片(%1) @@ -2442,252 +2478,252 @@ Remove them from the configuration? vnotex::MarkdownEditorPage - + Insert file name as title 将文件名作为标题 - + Insert file name as title when creating note 创建笔记时将文件名作为标题插入 - - + + Read 阅读 - + Constrain image width 限制图片宽度 - + Constrain image width to the window 将图片宽度限制在窗口内 - + Center image 图片居中 - + Center images 居中显示图片 - + 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 缩进每个段落的第一行 - + Code block line number 代码块行号 - + Add line number to code block 为代码块添加行号 - - + + Edit 编辑 - + Constrain in-place preview width 限制原地预览宽度 - + Constrain in-place preview width to the window 将原地预览宽度限制在窗口内 - + In-place preview sources: 原地预览源: - + Image link 图片链接 - + Code block 代码块 - + Math 数学公式 - + 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 覆盖主题中的编辑器字体 - + Use Rich Paste by default 默认使用多功能粘贴 - + Use Rich Paste by default when pasting text 当粘贴文本时默认使用多功能粘贴 - + 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 Web service or local JAR file to render PlantUml graphs 使用网页服务或者本地JAR文件来渲染PlantUml图表 - - + + Web Service 网页服务 - + Override the Web service used to render PlantUml graphs 覆盖用于渲染PlantUml图表的网页服务 - - + + Empty to use default one 留空则使用默认值 - + Override PlantUml Web service: 覆盖PlantUml网页服务: - + Override MathJax script: 覆盖MathJax脚本: @@ -2696,7 +2732,7 @@ Remove them from the configuration? PlantUml网页服务: - + Use Web service or local executable file to render Graphviz graphs 使用网页服务或者本地可执行文件来渲染Graphviz图表 @@ -2709,61 +2745,61 @@ Remove them from the configuration? 在线服务 - + 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文件: @@ -2772,42 +2808,42 @@ Remove them from the configuration? 使用在线服务或者本地可执行文件来渲染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可执行文件: - + Override the MathJax script used to render math formulas 覆盖用于渲染数学公式的MathJax脚本 @@ -2816,7 +2852,7 @@ Remove them from the configuration? MathJax脚本: - + Markdown Editor Markdown编辑器 @@ -3010,49 +3046,46 @@ Remove them from the configuration? vnotex::NewNoteDialog - + New Note 新建笔记 - + Template: 模板: - Manage - 管理 + 管理 - + Please specify a valid name for the note. 请为笔记指定一个有效名字。 - + Name conflicts with existing or built-in note. 名字和已有或内建笔记冲突。 - + Failed to create note under (%1) in (%2) (%3). 无法在笔记本(%2)中文件夹(%1)下创建笔记(%3)。 - + note 笔记 - None - 无 + 无 - Failed to load template (%1) (%2). - 无法加载模板(%1)(%2)。 + 无法加载模板(%1)(%2)。 @@ -3316,20 +3349,38 @@ Remove them from the configuration? 无法保存笔记本(%2)中的笔记(%1)(%3)。 + + vnotex::NoteTemplateSelector + + + Manage + 管理 + + + + None + 无 + + + + Failed to load template (%1) (%2). + 无法加载模板(%1)(%2)。 + + vnotex::NotebookExplorer - + Select one of all the notebooks as current notebook.<br/>Move mouse on one item to check its details. 从全部笔记本中选择一个作为当前笔记本。<br/>移动鼠标到某个项目上查看详情。 - + Notebook 笔记本 - + This title bar contains buttons and menu to manage notebooks and notes. 该标题栏包含管理笔记本和笔记的按钮和菜单。 @@ -3338,211 +3389,231 @@ Remove them from the configuration? 查看 - + External Files 外部文件 - + Show External Files 显示外部文件 - + Scan and Import 扫描并导入 - + Please select one notebook first. 请先选择一个笔记本。 - + Scan the whole notebook (%1) and import external files automatically? 扫描整个笔记本(%1)并自动导入外部文件？ - + This operation helps importing external files that are added outside from VNote. It may import unexpected files. 该操作帮助导入在VNote外添加的外部文件。可能会导入不想要的文件。 - + It is recommended to always manage files within VNote. 推荐总是在VNote中管理文件。 - + Imported %n file(s). 已导入 %n 个文件。 - + Manage Notebooks 管理笔记本 - + Rebuild Notebook Database 重建笔记本数据库 - + Import External Files when Activated 激活时自动导入外部文件 - + Close File Before Open with External Program 以外部程序打开前关闭文件 - + Recycle Bin 回收站 - + Notebooks 笔记本 - + Notes 笔记 - + View By 查看方式 - + + Please set up quick note schemes in the Settings dialog first. + 请先在设置对话框中设置快速笔记方案。 + + + + New Quick Note + 新建快速笔记 + + + + The quick note should be created within a notebook. + 快速笔记应该在一个笔记本内进行创建。 + + + + Failed to create quick note from scheme (%1) (%2) + 无法从方案(%1)中新建快速笔记(%2) + + + 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) 按修改时间倒序查看 - + Open Recycle Bin 打开回收站 - + Empty Recycle Bin 清空回收站 - + Empty the recycle bin of notebook (%1)? 清空笔记本(%1)的回收站？ - + CAUTION! All the files under the recycle bin folder will be deleted and unrecoverable! 注意！回收站文件夹下面的所有文件都会被删除且不可恢复！ - + Recycle bin folder: %1 回收站文件夹: %1 - + Explore Mode 浏览模式 - + Combined 合并 - + Separate, Single Column 独立，单列 - + Separate, Double Columns 独立，双列 - + Rebuild the database of notebook (%1)? 重建笔记本(%1)的数据库？ - + This operation will rebuild the notebook database from configuration files. It may take time. 该操作会根据配置文件重建笔记本数据库。可能会需要一定时间。 - + A notebook may use a database for cache, such as IDs of nodes and tags. 一个笔记本可能会使用一个数据库作为缓存，例如节点的标识号和标签。 - + Rebuilding notebook database... 正在重建笔记本数据库... - + Notebook database has been rebuilt. 笔记本数据库已重建。 - + Failed to rebuild notebook database. 无法重建笔记本数据库。 @@ -4033,41 +4104,120 @@ Description: %3 vnotex::QuickAccessPage - - + + Quick Access 快速访问 - + Flash Page 灵犀页 - + Flash Page location (user could copy the path of one note and paste it here) 灵犀页位置（用户可以复制笔记的路径并粘贴在此） - + Flash Page: 灵犀页: - + Select Flash Page File 选择灵犀页文件 - + Edit the files pinned to Quick Access (one file per line) 编辑固定到快速访问的文件（一行一个文件） - + Quick Access: 快速访问: + + + Quick Note + 快速笔记 + + + + No scheme to show + 没有可以展示的方案 + + + + New + 新建 + + + + Delete + 删除 + + + + Scheme: + 方案: + + + + Folder: + 文件夹: + + + Folder path: + 文件夹路径 + + + + Empty to use current explored folder dynamically + 如为空则动态使用创建笔记时当前浏览文件夹 + + + + Select Quick Note Folder + 选择快速笔记文件夹 + + + + Note name: + 文件名: + + + + Note template: + 笔记模板: + + + + Quick Note Scheme + 快速笔记方案 + + + + Scheme name already exists! Try again: + 方案名字已存在！请重试: + + + + Scheme name: + 方案名字: + + + + quick_note_%da%.md + 快速笔记_%da%.md + + + + Delete quick note scheme (%1)? + 删除快速笔记方案(%1)? + vnotex::RenameTagDialog @@ -4401,7 +4551,7 @@ Description: %3 vnotex::SelectDialog - + Cancel 取消 @@ -5106,12 +5256,11 @@ Description: %3 没有可用预览 - Style Override - 样式覆盖 + 样式覆盖 - + Theme 主题 @@ -5287,7 +5436,7 @@ Description: %3 vnotex::ViewArea - + No recently closed file 没有最近关闭文件 @@ -5303,152 +5452,152 @@ Description: %3 工作空间和拆分 - + Open Windows 已打开窗口 - + Menu 菜单 - + 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 All Tabs 关闭所有标签页 - + Close Other Tabs 关闭其他标签页 - + Close Tabs To The Left 关闭左侧标签页 - + Close Tabs To The Right 关闭右侧标签页 - + Auto Reload 自动重新加载 - + Reload file from disk automatically if it is changed outside 当发生外部修改时，自动从磁盘重新加载文件 - + Copy Path 复制路径 - + Copied path: %1 已复制路径: %1 - + Open Location 打开路径 - + Locate Node 定位节点 - + Pin To Quick Access 固定到快速访问 - + Move One Split Left 向左移动一个拆分 - + Move One Split Right 向右移动一个拆分 - + Move One Split Up 向上移动一个拆分 - + Move One Split Down 向下移动一个拆分 diff --git a/src/data/core/vnotex.json b/src/data/core/vnotex.json index 5e9ea2494d..29300e95b0 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.16.0" + "version" : "3.17.0" }, "core" : { "theme" : "pure", @@ -14,6 +14,7 @@ "ExpandContentArea" : "Ctrl+G, E", "Settings" : "Ctrl+Alt+P", "NewNote" : "Ctrl+Alt+N", + "NewQuickNote" : "Ctrl+Alt+Q", "NewFolder" : "Ctrl+Alt+S", "CloseTab" : "Ctrl+G, X", "CloseAllTabs": "", diff --git a/src/widgets/dialogs/settings/quickaccesspage.cpp b/src/widgets/dialogs/settings/quickaccesspage.cpp index c7bf55f6c8..d97cacbc22 100644 --- a/src/widgets/dialogs/settings/quickaccesspage.cpp +++ b/src/widgets/dialogs/settings/quickaccesspage.cpp @@ -214,7 +214,7 @@ QGroupBox *QuickAccessPage::setupQuickNoteGroup() auto infoLayout = WidgetsFactory::createFormLayout(m_quickNoteInfoGroupBox); { - const QString label(tr("Folder path:")); + const QString label(tr("Folder:")); m_quickNoteFolderPathInput = new LocationInputWithBrowseButton(m_quickNoteInfoGroupBox); m_quickNoteFolderPathInput->setPlaceholderText(tr("Empty to use current explored folder dynamically")); infoLayout->addRow(label, m_quickNoteFolderPathInput); diff --git a/src/widgets/notebookexplorer.cpp b/src/widgets/notebookexplorer.cpp index 387e7778aa..18c7b9f5fa 100644 --- a/src/widgets/notebookexplorer.cpp +++ b/src/widgets/notebookexplorer.cpp @@ -343,7 +343,10 @@ void NotebookExplorer::newQuickNote() return; } - m_nodeExplorer->setCurrentNode(newNode.data()); + if (notebook == m_currentNotebook.data()) { + m_nodeExplorer->setCurrentNode(newNode.data()); + } + // Open it right now. auto paras = QSharedPointer::create(); paras->m_mode = ViewWindowMode::Edit; diff --git a/src/widgets/toolbarhelper.cpp b/src/widgets/toolbarhelper.cpp index cf444765a0..747149e9a4 100644 --- a/src/widgets/toolbarhelper.cpp +++ b/src/widgets/toolbarhelper.cpp @@ -128,6 +128,16 @@ QToolBar *ToolBarHelper::setupFileToolBar(MainWindow *p_win, QToolBar *p_toolBar // To hide the shortcut text shown in button. newBtn->setText(MainWindow::tr("New Note")); + // New quick note. + auto newQuickNoteAct = newMenu->addAction(generateIcon("new_note.svg"), + MainWindow::tr("New Quick Note"), + newMenu, + []() { + emit VNoteX::getInst().newQuickNoteRequested(); + }); + WidgetUtils::addActionShortcut(newQuickNoteAct, + coreConfig.getShortcut(CoreConfig::Shortcut::NewQuickNote)); + // New folder. auto newFolderAct = newMenu->addAction(generateIcon("new_folder.svg"), MainWindow::tr("New Folder"),