From 7c7db3fbb87fcc94318ca35d9f15fa9b8a563ab1 Mon Sep 17 00:00:00 2001 From: Le Tan Date: Wed, 22 Mar 2017 21:58:08 +0800 Subject: [PATCH] release v1.1 --- .linux_bintray.json | 8 +- .macos_bintray.json | 8 +- .travis.yml | 2 +- appveyor.yml | 4 +- src/translations/vnote_zh_CN.qm | Bin 18919 -> 19728 bytes src/translations/vnote_zh_CN.ts | 183 +++++++++++++++++++++----------- src/vconfigmanager.cpp | 1 + src/vconfigmanager.h | 1 + src/vmainwindow.cpp | 9 +- 9 files changed, 138 insertions(+), 78 deletions(-) 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 e57fae39b1159b02e29629446a9b212eda548af4..32c85bec8f284687f1286988faf753aa81df55f7 100644 GIT binary patch delta 2000 zcmZuxdsLKl8h*Z+?>2Xon;;Ei2!cQZC>OcTfP+`i1)aP^IWgbD9OpvAfR-ld>e^aX z>=%2`^^&2Ik|s{a%DkLY;w2PXYqt(o>z-0E(>h(~a*o(bQ&hYA$DC(=@AtmX`@EOm z@0!d!vz4hSeAPMbtGea@nrqAC>|_GO%(jQ1}hlno|JxPzWP7fwS)cGCly; z-UCcI46gqSkpCuxW({D`AZB3-`QJk9+10?Lb*&4_$67BTb;N680IC0e0w|r|dcdg2 zIox_7rf$dgIv}|TL3smUUWeD$odeis@#)ekVA?@ulJkBbs+_5@Ob5oaF?G>(WH&Ot zK`&5rnt9q+2}B=fZkAr5bVlap0g^ZME`{%OAE0YctUeJ*GUvz@OmRzTgkmV0su??5 z@$E3Vo68h;lBN>PW+nUDFrfcTSyna;$g5Q@>!P!!K-s*4XqfrRb!%)SGf%m`>Rq6C zobuqe`+(dn$~O+&1`;G?Uo=&%4QDymZc5+B^42UM`vjY{eHGRF2|H~?2U-wuly&s> zl3@=kF<%3dhu8+41Qgt2n|JAf=^NPgS;q($v&Xbn0B6|Kr6+)U{>k>&Q~k;Bu^;-2 zfwFz<^?o&Ayv>c9QxD`caCxmS(^!(ZIror%%r_w{n88&HB~asYxz&ti^nDA$Ap!gQe z-Naqr)k=jFa9_@#b4(R)yi5fp`g!v<5)}6ZU$B-0r(Nd@FW2k31(j9zq&~NhAsTpo$mmV=LPd& zAK6)9#>yZi*drGyjV<{%gr3)^v0;Nk|5`1O)g)Ywokw)F!r&0mYHy1v5j3fsOX9ut zi9mXnc;Asq(%&Mw+r|QSPZ51vsj(#|LujoQ8*Gbd03LDm?i&EVT-`gT{gxVbT( z{F*{&6~)aL1;_)+*qAP{N83j!UlPwu>Y*7GgfMH2tYhP?ZdK~t)S!$ds@yOqtxmVf zncYS!vqn|_F$pwyRI8321r$$)P<%x7{JR@SfLZl&H?d{CAbVJ&I-^Y;|Cvns=g4hr zQcLlmdY|oKTI^2szQfsc4PELN(9415j0I{@P1%aA|hlX#`TX6H@vV6=4wLky5SM z-!u%UD>dEcPtdzjtT|SGiWa+5wsG;yRaxTVt?z3$Dv7+vq-}fj3J`u?8~l8LcI~qE zb%scDVnb;2Y0p=$r%OAa?K2)Ektel7v*}VKd?z30Dwh<$qWjDIXu!5p*ZvQp$@J>F zI;fVio4QkH3(0QLohzZ$E4o*A+fLup;`Gz^(q)Yk^p8zF2aH>+Z`~SBPt;!hOZ&a_ z{Q>=>pP;by1;6B72|017fCN80 zaKHtpefaTun2?MlvZsjDXz=t4ORA9k9*4_mn(lJc`5m&OFe& zth#sX!}I$`xJDT!+Psbj-ID1SoBcypLAIf@t^q-r^w@L>hK zNGElHQ8rD5!@u0=Tj5QYyVIkC=A4Iw@r&lQ{G{an#L3-7Gs3DCHd6Xu;#`5?%%VsI zQ!d|Mk~lNmJy`kFf9GsozbfL1L-ecfKk#xI}#>stV{b{nEuzW1=7mE|3rza z+c!^rM%DiCXrjmoKZlh2eI8Sp+tu)(&*69eHZrI#ZRaPk)&KH5J{rcCIlQ%!d&Es= Uua?|WZGcw8?W+rJpE;ZP5xn9fk^lez delta 1485 zcmX9;X;4#F6#icFmh7P{B2)rG*$hGiBZMH3V6;_1OBJiQF_J@4a)+J@-4``R@I?j(H$5 z%Ts>JpL*ljk=mc9PwQNNyyKn~;O~H4(*>w%A%J+wuy~j7l>yOu(FG>H5?3uQW?bw^12p zskExxMqQ6ecV-U)<|1joKdGVeVL8W1I_^HpTjGJ)18n@!G9W#XHEpX0d|TPPzCP0B zU)Ih%2WGs>7OU;3K=O6A^tcAFoMGEl768}S9_tk%63Gq}QlnAP?7c0-H~l61Xg~qz zCb_AL3Q539E~(}cjmg9^fUps+Mz15m?s_o2ifi1yfd(fhf77CfZ`vw7W+ z9SD!$8-sf9Q zMha+nzGtH^5gFn83^XCb1V470HfX=)pP%{_@VhC*U35|0PgwAY8_-XPo20r5Q;*Qy zLP~l)6b33)z^q-uP~Z|Ow?TL~PGwb-vS?qLjB!-9qA;9zP0ChZ&LaM|WE*R}fzSk* ztBwSn>+QkRMp?0KB`~v7w&Nr@lP{9(c|?K*8D;xRl7W<752ohI_TLsDD%ik)b+T?1 znL=|;b}h1-W@Gl?tWa?-8*B-Y>qAMPxFUI?S3XU|F3&gCl0^>43;!g7+D-DZ)>c5W z&x5k<@)LvAM4(cB=>k=o)gm5cb&9w~MewLd{Ev#=Y(zzhS8t<4g`7%d%QMv4|V}Lwc z`Ar|?!=e2CbqV?I86h1Tl}kvfM>Qy$KYj%z6j{pl`CUMAl~~OMGf83t7i`+6s{L#j z@VTjSKf6m_8d9|}RK%$Fp!JaI<_A0J@{Oqabw3c9PSyCrc9P_b$nja(DGK$MOZ@?B zkNWT}Dr2ZnpROm)mUMMjZwkc=)RQ?B*E==y8k@*!g68wt^f*jisi~>+p+}}sbFSG* z>lZZVZ;*q`SH!ct|H?YeV=ppVc#Br({+$L`rd4KARrx7xLYj@p_-mJ3rz`Ha)q~;d zv^mLgA{Vdy(1$vXHfdMwz5~2ns?EJj3e8-st!GZsTr$NVAxvU@;kF8nF!#iaF4i4n z@Dkk4#La@cDXoKH>cj#|co4E?AQO4mf+FO@g>7(_`R+YW&(yd - + &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)