diff --git a/README.md b/README.md index 6a5689e6..5242f992 100644 --- a/README.md +++ b/README.md @@ -137,7 +137,7 @@ VNote also supports many other features, like: - Auto indent and auto list; # Build & Development -VNote needs Qt 5.7 or above to build. +VNote needs Qt 5.9.1 or above to build. 1. Clone & Init ``` @@ -146,15 +146,15 @@ VNote needs Qt 5.7 or above to build. git submodule update --init ``` 2. Download Qt & Have Fun -Download [Qt 5.7.0](http://info.qt.io/download-qt-for-application-development) and open `VNote.pro` as a project. +Download [Qt 5.9.1](http://info.qt.io/download-qt-for-application-development) and open `VNote.pro` as a project. ## Linux -If your distribution does not have Qt 5.7 or above, you need to add it from other sources. In Ubuntu, you could do this: +If your distribution does not have Qt 5.9.1 or above, you need to add it from other sources. In Ubuntu, you could do this: ``` -sudo add-apt-repository ppa:beineri/opt-qt571-trusty -y +sudo add-apt-repository ppa:beineri/opt-qt591-trusty -y sudo apt-get update -qq -sudo apt-get -y install qt57base qt57webengine qt57webchannel qt57svg qt57location qt57tools qt57translations +sudo apt-get -y install qt59base qt59webengine qt59webchannel qt59svg qt59location qt59tools qt59translations source /opt/qt*/bin/qt*-env.sh ``` @@ -175,13 +175,13 @@ For details, you could reference [.travis_linux.sh](.travis_linux.sh) in the sou If you prefer command line on macOS, you could follow these steps. 1. Install Xcode and Homebrew; -2. Install Qt5.7 via Homebrew: +2. Install Qt 5.9.1 via Homebrew: ``` - brew install qt@5.7 + brew install qt@5.9.1 ``` 3. In the project directory, create `build_macos.sh` like this: ```sh - QTDIR="/usr/local/opt/qt@5.7" + QTDIR="/usr/local/opt/qt@5.9.1" PATH="$QTDIR/bin:$PATH" LDFLAGS=-L$QTDIR/lib CPPFLAGS=-I$QTDIR/include @@ -213,6 +213,7 @@ If you prefer command line on macOS, you could follow these steps. - [MathJax](https://www.mathjax.org/) (Apache-2.0) - [showdown](https://github.com/showdownjs/showdown) (Unknown) - [flowchart.js](https://github.com/adrai/flowchart.js) (MIT License) +- Icons made by a326703305@qq.com # License VNote is licensed under the [MIT license](http://opensource.org/licenses/MIT). diff --git a/README_zh.md b/README_zh.md index df101c69..33e46e56 100644 --- a/README_zh.md +++ b/README_zh.md @@ -138,7 +138,7 @@ VNote还支持其他很多的功能,比如: - 自动缩进和自动列表; # 构建与开发 -VNote需要5.7版本以上的Qt进行构建。 +VNote需要5.9.1版本以上的Qt进行构建。 1. 克隆代码仓库 ``` @@ -147,15 +147,15 @@ VNote需要5.7版本以上的Qt进行构建。 git submodule update --init ``` 2. 下载Qt -下载[Qt 5.7.0](http://info.qt.io/download-qt-for-application-development),导入`VNote.pro`创建一个工程。 +下载[Qt 5.9.1](http://info.qt.io/download-qt-for-application-development),导入`VNote.pro`创建一个工程。 ## Linux -如果您的Linux发行版不提供5.7以上版本的Qt,那么您需要从其他来源获取Qt。在Ubuntu中,您可以执行以下步骤: +如果您的Linux发行版不提供5.9.1以上版本的Qt,那么您需要从其他来源获取Qt。在Ubuntu中,您可以执行以下步骤: ``` -sudo add-apt-repository ppa:beineri/opt-qt571-trusty -y +sudo add-apt-repository ppa:beineri/opt-qt591-trusty -y sudo apt-get update -qq -sudo apt-get -y install qt57base qt57webengine qt57webchannel qt57svg qt57location qt57tools qt57translations +sudo apt-get -y install qt59base qt59webengine qt59webchannel qt59svg qt59location qt59tools qt59translations source /opt/qt*/bin/qt*-env.sh ``` @@ -176,15 +176,15 @@ sudo make install 在macOS下,您可以执行以下步骤来编译: 1. 安装Xcode和Homebrew: -2. 通过Homebrew安装Qt5.7: +2. 通过Homebrew安装Qt5.9.1: ``` - brew install qt@5.7 + brew install qt@5.9.1 ``` 3. 在VNote源码根目录下,新建一个文件`build_macos.sh`: ```sh - QTDIR="/usr/local/opt/qt@5.7" + QTDIR="/usr/local/opt/qt@5.9.1" PATH="$QTDIR/bin:$PATH" LDFLAGS=-L$QTDIR/lib CPPFLAGS=-I$QTDIR/include @@ -217,6 +217,7 @@ sudo make install - [MathJax](https://www.mathjax.org/) (Apache-2.0) - [showdown](https://github.com/showdownjs/showdown) (Unknown) - [flowchart.js](https://github.com/adrai/flowchart.js) (MIT License) +- 图标由九梦岛主(a326703305@qq.com)制作 # 代码许可 VNote使用[MIT许可](http://opensource.org/licenses/MIT)。 diff --git a/src/resources/icons/128x128/vnote.png b/src/resources/icons/128x128/vnote.png index 97d2d795..d325b223 100644 Binary files a/src/resources/icons/128x128/vnote.png and b/src/resources/icons/128x128/vnote.png differ diff --git a/src/resources/icons/16x16/vnote.png b/src/resources/icons/16x16/vnote.png index e3346ddb..184b5bf7 100644 Binary files a/src/resources/icons/16x16/vnote.png and b/src/resources/icons/16x16/vnote.png differ diff --git a/src/resources/icons/256x256/vnote.png b/src/resources/icons/256x256/vnote.png index a7bff7b1..69fee17d 100644 Binary files a/src/resources/icons/256x256/vnote.png and b/src/resources/icons/256x256/vnote.png differ diff --git a/src/resources/icons/32x32/vnote.png b/src/resources/icons/32x32/vnote.png index ed794c1e..155456b5 100644 Binary files a/src/resources/icons/32x32/vnote.png and b/src/resources/icons/32x32/vnote.png differ diff --git a/src/resources/icons/48x48/vnote.png b/src/resources/icons/48x48/vnote.png index 3716cb6c..d6d9a156 100644 Binary files a/src/resources/icons/48x48/vnote.png and b/src/resources/icons/48x48/vnote.png differ diff --git a/src/resources/icons/64x64/vnote.png b/src/resources/icons/64x64/vnote.png index a0c3eb01..e889ca0e 100644 Binary files a/src/resources/icons/64x64/vnote.png and b/src/resources/icons/64x64/vnote.png differ diff --git a/src/resources/icons/vnote.icns b/src/resources/icons/vnote.icns index 7411d59f..5635a216 100644 Binary files a/src/resources/icons/vnote.icns and b/src/resources/icons/vnote.icns differ diff --git a/src/resources/icons/vnote.ico b/src/resources/icons/vnote.ico index f1b8f90b..a196a1a6 100644 Binary files a/src/resources/icons/vnote.ico and b/src/resources/icons/vnote.ico differ diff --git a/src/resources/icons/vnote.png b/src/resources/icons/vnote.png index 573d58fe..2c1ecb69 100644 Binary files a/src/resources/icons/vnote.png and b/src/resources/icons/vnote.png differ diff --git a/src/resources/icons/vnote.svg b/src/resources/icons/vnote.svg index 38ce5a55..8cd2fb03 100644 --- a/src/resources/icons/vnote.svg +++ b/src/resources/icons/vnote.svg @@ -1,17 +1 @@ - - - - vnote - - Layer 3 - - - - Layer 1 - - - - Layer 2 - - - \ No newline at end of file +vnote diff --git a/src/resources/icons/vnote_update.png b/src/resources/icons/vnote_update.png new file mode 100644 index 00000000..8e7b3f9c Binary files /dev/null and b/src/resources/icons/vnote_update.png differ diff --git a/src/resources/icons/vnote_update.svg b/src/resources/icons/vnote_update.svg index 34d5b17c..54bc77cf 100644 --- a/src/resources/icons/vnote_update.svg +++ b/src/resources/icons/vnote_update.svg @@ -1,17 +1 @@ - - - - vnote - - Layer 3 - - - - Layer 1 - - - - Layer 2 - - - \ No newline at end of file +vnote_cube