17
README.md
@ -137,7 +137,7 @@ VNote also supports many other features, like:
|
|||||||
- Auto indent and auto list;
|
- Auto indent and auto list;
|
||||||
|
|
||||||
# Build & Development
|
# Build & Development
|
||||||
VNote needs Qt 5.7 or above to build.
|
VNote needs Qt 5.9.1 or above to build.
|
||||||
|
|
||||||
1. Clone & Init
|
1. Clone & Init
|
||||||
```
|
```
|
||||||
@ -146,15 +146,15 @@ VNote needs Qt 5.7 or above to build.
|
|||||||
git submodule update --init
|
git submodule update --init
|
||||||
```
|
```
|
||||||
2. Download Qt & Have Fun
|
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
|
## 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 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
|
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.
|
If you prefer command line on macOS, you could follow these steps.
|
||||||
|
|
||||||
1. Install Xcode and Homebrew;
|
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:
|
3. In the project directory, create `build_macos.sh` like this:
|
||||||
```sh
|
```sh
|
||||||
QTDIR="/usr/local/opt/qt@5.7"
|
QTDIR="/usr/local/opt/qt@5.9.1"
|
||||||
PATH="$QTDIR/bin:$PATH"
|
PATH="$QTDIR/bin:$PATH"
|
||||||
LDFLAGS=-L$QTDIR/lib
|
LDFLAGS=-L$QTDIR/lib
|
||||||
CPPFLAGS=-I$QTDIR/include
|
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)
|
- [MathJax](https://www.mathjax.org/) (Apache-2.0)
|
||||||
- [showdown](https://github.com/showdownjs/showdown) (Unknown)
|
- [showdown](https://github.com/showdownjs/showdown) (Unknown)
|
||||||
- [flowchart.js](https://github.com/adrai/flowchart.js) (MIT License)
|
- [flowchart.js](https://github.com/adrai/flowchart.js) (MIT License)
|
||||||
|
- Icons made by a326703305@qq.com
|
||||||
|
|
||||||
# License
|
# License
|
||||||
VNote is licensed under the [MIT license](http://opensource.org/licenses/MIT).
|
VNote is licensed under the [MIT license](http://opensource.org/licenses/MIT).
|
||||||
|
17
README_zh.md
@ -138,7 +138,7 @@ VNote还支持其他很多的功能,比如:
|
|||||||
- 自动缩进和自动列表;
|
- 自动缩进和自动列表;
|
||||||
|
|
||||||
# 构建与开发
|
# 构建与开发
|
||||||
VNote需要5.7版本以上的Qt进行构建。
|
VNote需要5.9.1版本以上的Qt进行构建。
|
||||||
|
|
||||||
1. 克隆代码仓库
|
1. 克隆代码仓库
|
||||||
```
|
```
|
||||||
@ -147,15 +147,15 @@ VNote需要5.7版本以上的Qt进行构建。
|
|||||||
git submodule update --init
|
git submodule update --init
|
||||||
```
|
```
|
||||||
2. 下载Qt
|
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
|
||||||
如果您的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 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
|
source /opt/qt*/bin/qt*-env.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
@ -176,15 +176,15 @@ sudo make install
|
|||||||
在macOS下,您可以执行以下步骤来编译:
|
在macOS下,您可以执行以下步骤来编译:
|
||||||
|
|
||||||
1. 安装Xcode和Homebrew:
|
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`:
|
3. 在VNote源码根目录下,新建一个文件`build_macos.sh`:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
QTDIR="/usr/local/opt/qt@5.7"
|
QTDIR="/usr/local/opt/qt@5.9.1"
|
||||||
PATH="$QTDIR/bin:$PATH"
|
PATH="$QTDIR/bin:$PATH"
|
||||||
LDFLAGS=-L$QTDIR/lib
|
LDFLAGS=-L$QTDIR/lib
|
||||||
CPPFLAGS=-I$QTDIR/include
|
CPPFLAGS=-I$QTDIR/include
|
||||||
@ -217,6 +217,7 @@ sudo make install
|
|||||||
- [MathJax](https://www.mathjax.org/) (Apache-2.0)
|
- [MathJax](https://www.mathjax.org/) (Apache-2.0)
|
||||||
- [showdown](https://github.com/showdownjs/showdown) (Unknown)
|
- [showdown](https://github.com/showdownjs/showdown) (Unknown)
|
||||||
- [flowchart.js](https://github.com/adrai/flowchart.js) (MIT License)
|
- [flowchart.js](https://github.com/adrai/flowchart.js) (MIT License)
|
||||||
|
- 图标由九梦岛主(a326703305@qq.com)制作
|
||||||
|
|
||||||
# 代码许可
|
# 代码许可
|
||||||
VNote使用[MIT许可](http://opensource.org/licenses/MIT)。
|
VNote使用[MIT许可](http://opensource.org/licenses/MIT)。
|
||||||
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 597 B After Width: | Height: | Size: 662 B |
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 930 B After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 361 KiB After Width: | Height: | Size: 361 KiB |
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 5.8 KiB |
@ -1,17 +1 @@
|
|||||||
<?xml version="1.0"?>
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 82 82"><title>vnote</title><g id="图层_2" data-name="图层 2"><g id="图层_1-2" data-name="图层 1"><rect width="82" height="82" rx="11.76" ry="11.76" fill="#f2f2f2"/><path d="M50.29,12.74a1.52,1.52,0,0,1,1.52-1.52H62.73a.54.54,0,0,1,.38.92L51.21,24a.54.54,0,0,1-.92-.38Z" fill="#4d4d4d"/><path d="M19.23,28.27a1.52,1.52,0,0,1,1.52-1.52H31.66a.54.54,0,0,1,.38.92l-11.9,11.9a.54.54,0,0,1-.92-.38Z" fill="#4d4d4d"/><path d="M19.23,42.6a1.52,1.52,0,0,1,.45-1.08L32.79,28.41a.54.54,0,0,1,.92.38V40.9A1.52,1.52,0,0,1,33.26,42L20.15,55.1a.54.54,0,0,1-.92-.38Z" fill="#4d4d4d"/><rect x="19.23" y="11.21" width="14.48" height="14.48" rx="1.44" ry="1.44" fill="#c69c6d"/><path d="M34.76,43.8a1.52,1.52,0,0,1,1.52-1.52H62.73a.54.54,0,0,1,.38.92L35.68,70.63a.54.54,0,0,1-.92-.38Z" fill="#4d4d4d"/><path d="M36.8,41.23a.54.54,0,0,1-.38-.92L63.85,12.88a.54.54,0,0,1,.92.38V39.7a1.52,1.52,0,0,1-1.52,1.52Z" fill="#4d4d4d"/><path d="M20.52,58.36a1.52,1.52,0,0,1,0-2.16L32.79,43.94a.54.54,0,0,1,.92.38V70.25a.54.54,0,0,1-.92.38Z" fill="#4d4d4d"/></g></g></svg>
|
||||||
<svg width="704" height="704" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
|
|
||||||
<!-- Created with SVG-edit - http://svg-edit.googlecode.com/ -->
|
|
||||||
<title>vnote</title>
|
|
||||||
<g>
|
|
||||||
<title>Layer 3</title>
|
|
||||||
<rect stroke="#000000" id="svg_11" fill="#d6eace" stroke-width="5" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="-0.242409" y="-0.033089" width="704.290516" height="704.010575" stroke-opacity="0" rx="40" ry="40"/>
|
|
||||||
</g>
|
|
||||||
<g>
|
|
||||||
<title>Layer 1</title>
|
|
||||||
<path id="svg_7" d="m160.375009,100.656259l-0.250009,389.843741l129.9375,129.9375l260.15625,-260.4375l0,-259.875l-260.15625,259.875l0,-259.59375l-129.687491,0.250009z" stroke-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="null" stroke="#000000" fill="#15ae67"/>
|
|
||||||
</g>
|
|
||||||
<g>
|
|
||||||
<title>Layer 2</title>
|
|
||||||
<path id="svg_8" d="m550.43365,100.304726l-130.205135,-0.003944l0,130.042969" stroke-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="null" stroke="#000000" fill="#75c5b5"/>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
BIN
src/resources/icons/vnote_update.png
Normal file
After Width: | Height: | Size: 6.4 KiB |
@ -1,17 +1 @@
|
|||||||
<?xml version="1.0"?>
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 142 142"><title>vnote_cube</title><g id="图层_2" data-name="图层 2"><g id="图层_1-2" data-name="图层 1"><rect width="142" height="142" rx="11.76" ry="11.76" fill="#f2f2f2"/><path d="M12.6,13.8a1.88,1.88,0,0,1,1.88-1.87H64.66A1.87,1.87,0,0,1,66,15.12L15.8,65.31A1.88,1.88,0,0,1,12.6,64Z" fill="#4d4d4d"/><path d="M75.59,14.3a1.27,1.27,0,0,1,.9-2.18h48.42a1.27,1.27,0,0,1,.9,2.18L103.14,37a3.45,3.45,0,0,1-4.87,0Z" fill="#4d4d4d"/><path d="M42.1,46.41a1.27,1.27,0,0,1,2.18-.9L67,68.18a3.45,3.45,0,0,1,0,4.87L44.28,95.73a1.27,1.27,0,0,1-2.18-.9Z" fill="#4d4d4d"/><path d="M12.6,72.56a3.45,3.45,0,0,1,1-2.44L38.13,45.62a1.27,1.27,0,0,1,2.18.9V98.58a3.45,3.45,0,0,1-1,2.44L14.78,125.53a1.27,1.27,0,0,1-2.18-.9Z" fill="#4d4d4d"/><rect x="50.8" y="20.92" width="40" height="40" rx="3.45" ry="3.45" transform="translate(-8.2 62.05) rotate(-45)" fill="#c69c6d"/><path d="M17.09,128.92a1.27,1.27,0,0,1-.9-2.18L68.56,74.38a3.45,3.45,0,0,1,4.87,0l52.37,52.37a1.27,1.27,0,0,1-.9,2.18Z" fill="#4d4d4d"/><path d="M74.85,73a3.45,3.45,0,0,1,0-4.87l52.37-52.37a1.27,1.27,0,0,1,2.18.9V124.43a1.27,1.27,0,0,1-2.18.9Z" fill="#4d4d4d"/></g></g></svg>
|
||||||
<svg width="704" height="704" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
|
|
||||||
<!-- Created with SVG-edit - http://svg-edit.googlecode.com/ -->
|
|
||||||
<title>vnote</title>
|
|
||||||
<g>
|
|
||||||
<title>Layer 3</title>
|
|
||||||
<rect ry="40" rx="40" stroke-opacity="0" height="704.010575" width="704.290516" y="-0.033089" x="-0.242409" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="5" fill="#d6eace" id="svg_11" stroke="#000000"/>
|
|
||||||
</g>
|
|
||||||
<g>
|
|
||||||
<title>Layer 1</title>
|
|
||||||
<path fill="#15ae67" stroke="#000000" stroke-width="null" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" stroke-opacity="0" d="m160.37501,100.65626l-0.25001,389.84374l129.9375,129.9375l260.15625,-260.4375l0,-259.875l-260.15625,259.875l0,-259.59375l-129.68749,0.25001z" id="svg_7"/>
|
|
||||||
</g>
|
|
||||||
<g>
|
|
||||||
<title>Layer 2</title>
|
|
||||||
<path fill="#ffffff" stroke="#000000" stroke-width="null" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" stroke-opacity="0" d="m550.43365,100.30473l-130.20514,-0.00395l0,130.04297" id="svg_8"/>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.2 KiB |