diff --git a/.linux_bintray.json b/.linux_bintray.json index 240f9a0e..1a9947f6 100644 --- a/.linux_bintray.json +++ b/.linux_bintray.json @@ -16,10 +16,10 @@ }, "version": { - "name": "1.0", - "desc": "VNote v1.0", - "released": "2017-01-25", - "vcs_tag": "1.0", + "name": "1.1", + "desc": "VNote v1.1", + "released": "2017-03-22", + "vcs_tag": "1.1", "gpgSign": false }, diff --git a/.macos_bintray.json b/.macos_bintray.json index 0456da7f..2cca9ade 100644 --- a/.macos_bintray.json +++ b/.macos_bintray.json @@ -16,10 +16,10 @@ }, "version": { - "name": "1.0", - "desc": "VNote v1.0", - "released": "2017-01-25", - "vcs_tag": "1.0", + "name": "1.1", + "desc": "VNote v1.1", + "released": "2017-03-22", + "vcs_tag": "1.1", "gpgSign": false }, diff --git a/.travis.yml b/.travis.yml index 167b86e8..6e621400 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ branches: before_install: - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo apt-get -qq update ; fi -- export version="1.0" +- export version="1.1" install: - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install p7zip-full ; fi diff --git a/appveyor.yml b/appveyor.yml index 2cd6291d..b2a90b7a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ image: Visual Studio 2015 -version: 1.0.{build} +version: 1.1.{build} branches: only: @@ -60,6 +60,6 @@ deploy: subject: tamlok repo: vnote package: vnote - version: 1.0 + version: 1.1 publish: true override: true diff --git a/src/translations/vnote_zh_CN.qm b/src/translations/vnote_zh_CN.qm index e57fae39..32c85bec 100644 Binary files a/src/translations/vnote_zh_CN.qm and b/src/translations/vnote_zh_CN.qm differ diff --git a/src/translations/vnote_zh_CN.ts b/src/translations/vnote_zh_CN.ts index 9c0b34af..169aa215 100644 --- a/src/translations/vnote_zh_CN.ts +++ b/src/translations/vnote_zh_CN.ts @@ -661,7 +661,7 @@ - + &Edit 编辑 (&E) @@ -741,168 +741,188 @@ 使用Hoedown对Markdown进行HTML渲染 (需要重新打开当前标签页) - + + Markdown-it + Markdown-it + + + + Use Markdown-it to convert Markdown to HTML (re-open current tabs to make it work) + 使用Markdown-it对Markdown进行HTML渲染 (需要重新打开当前标签页) + + + + &Mermaid Diagram + Mermaid图表 (&M) + + + + Enable Mermaid for graph and diagram + 启用Mermaid渲染图像图表 + + + &View 查看 (&V) - + &File 文件 (&F) - + &Import Notes From Files 导入文件 (&I) - + Import notes from files into current directory 从文件中导入笔记到当前目录 - + Settings 设置 - + View and change settings for VNote 查看并更改VNote的配置 - + Insert &Image 插入图片 (&I) - - + + Find/Replace 查找/替换 - + Open Find/Replace dialog to search in current note 打开查找/替换对话框以在当前笔记中查找 - + Find Next 查找下一个 - + Find next occurence 查找下一处出现 - + Find Previous 查找上一个 - + Find previous occurence 查找上一处出现 - + Replace 替换 - + Replace current occurence 替换当前出现 - + Replace && Find 替换并查找 - + Replace current occurence and find the next one 替换当前出现并查找下一个 - + Replace All 全部替换 - + Replace all occurences in current note 替换当前笔记中的所有出现 - + Highlight Searched Pattern 高亮查找模式 - + Highlight all occurences of searched pattern 高亮查找模式的所有出现 - + &Expand Tab 扩展Tab (&E) - + Expand entered Tab to spaces 将输入的Tab扩展为空格 - + Expand Tab to 2 spaces 扩展Tab为2个空格 - + Expand Tab to 4 spaces 扩展Tab为4个空格 - + Expand Tab to 8 spaces 扩展Tab为8个空格 - + Highlight Selected Words 高亮选定字词 - + Highlight all occurences of selected words 高亮选定字词的所有出现 - + Import Notes From File 导入文件 - + Imported notes: %1 succeed, %2 failed. 已导入笔记: %1 成功， %2 失败。 - + Use system's background color configuration for Markdown rendering 使用系统的背景色设置对Markdown进行渲染 - + Set as the background color for Markdown rendering 使用该背景色对Markdown进行渲染 - + 2 Spaces 2个空格 @@ -932,114 +952,141 @@ 查看Qt的信息 - + Insert an image from file into current note 从文件中插入图片到当前笔记 - + 4 Spaces 4个空格 - + 8 Spaces 8个空格 - + Highlight Cursor Line 高亮光标所在行 - + Highlight current cursor line 高亮当前光标所在行 - + Tab Stop Width Tab Stop宽度 - + Tools 工具 - + Outline 大纲 - + Select Files(HTML or Markdown) To Import 选择要导入的文件 (HTML或Markdown) - + Fail to import files maybe due to name conflicts. 导入文件失败 (可能是因为名字冲突)。 - + + v%1 + v %1 + + + + VNote is a Vim-inspired note-taking application for Markdown. + VNote是一个受Vim启发而开发的专注于Markdown的笔记软件。 + + + + Visit https://github.com/tamlok/vnote.git for more information. + 更多信息请访问 https://github.com/tamlok/vnote.git。 + + + About VNote 关于VNote - - VNote is a Vim-inspired note taking application for Markdown. -Visit https://github.com/tamlok/vnote.git for more information. - VNote是一个受Vim启发而开发的一个Markdown笔记软件。更多信息请访问 https://github.com/tamlok/vnote.git。 - - - + &Rendering Background 渲染背景 (&R) - - + + System 默认 - + &Background Color 背景颜色 (&B) - + Use system's background color configuration for editor 为编辑器使用系统的背景色设置 - + Set as the background color for editor 使用该背景色设置编辑器 + + VMdEdit + + + Insert From Clipboard + 粘贴选项 + + + + Insert As Image + 作为图像插入 + + + + Insert As Text + 作为文本插入 + + VMdEditOperations - + Insert Image From Clipboard 从剪切板中插入图片 - - + + Warning 警告 - - + + Fail to save image %1. 保存图片失败: %1。 - + Insert Image From File 从文件中插入图片 @@ -1139,6 +1186,14 @@ Visit https://github.com/tamlok/vnote.git for more information. 笔记本信息 + + VSelectDialog + + + Cancel + 取消 + + VSettingsDialog diff --git a/src/vconfigmanager.cpp b/src/vconfigmanager.cpp index 41f9fe3f..32960fe6 100644 --- a/src/vconfigmanager.cpp +++ b/src/vconfigmanager.cpp @@ -12,6 +12,7 @@ const QString VConfigManager::orgName = QString("tamlok"); const QString VConfigManager::appName = QString("vnote"); +const QString VConfigManager::c_version = QString("1.1"); const QString VConfigManager::dirConfigFileName = QString(".vnote.json"); const QString VConfigManager::defaultConfigFilePath = QString(":/resources/vnote.ini"); diff --git a/src/vconfigmanager.h b/src/vconfigmanager.h index 8d8c3978..71ad23c6 100644 --- a/src/vconfigmanager.h +++ b/src/vconfigmanager.h @@ -43,6 +43,7 @@ public: // Constants static const QString orgName; static const QString appName; + static const QString c_version; inline QFont getMdEditFont() const; diff --git a/src/vmainwindow.cpp b/src/vmainwindow.cpp index 5dcb81f1..029d3731 100644 --- a/src/vmainwindow.cpp +++ b/src/vmainwindow.cpp @@ -589,9 +589,12 @@ void VMainWindow::changeMarkdownConverter(QAction *action) void VMainWindow::aboutMessage() { - QMessageBox::about(this, tr("About VNote"), - tr("VNote is a Vim-inspired note taking application for Markdown.\n" - "Visit https://github.com/tamlok/vnote.git for more information.")); + QString info = tr("v%1").arg(VConfigManager::c_version); + info += "\n\n"; + info += tr("VNote is a Vim-inspired note-taking application for Markdown."); + info += "\n"; + info += tr("Visit https://github.com/tamlok/vnote.git for more information."); + QMessageBox::about(this, tr("About VNote"), info); } void VMainWindow::changeExpandTab(bool checked)