diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml index 250e46a1..9340c957 100644 --- a/.github/workflows/ci-win.yml +++ b/.github/workflows/ci-win.yml @@ -22,14 +22,22 @@ jobs: matrix: config: - { - name: "Build On Win64", + name: "Build On Win64 Qt 5.12", arch: win64_msvc2017_64, - platform: x64 + platform: x64, + qt: 5.12.11 } - { - name: "Build On Win32", + name: "Build On Win32 Qt 5.12", arch: win32_msvc2017, - platform: x86 + platform: x86, + qt: 5.12.11 + } + - { + name: "Build On Win64 Qt 5.15", + arch: win64_msvc2019_64, + platform: x64, + qt: 5.15.2 } steps: @@ -55,7 +63,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: 5.12.11 + version: ${{matrix.config.qt}} target: desktop arch: ${{matrix.config.arch}} modules: qtwebengine @@ -108,7 +116,7 @@ jobs: - name: Archive Artifacts uses: actions/upload-artifact@v2 with: - name: vnote-win-${{matrix.config.platform}}_v${{env.VNOTE_VER}} + name: vnote-win-${{matrix.config.platform}}-qt${{matrix.config.qt}}_v${{env.VNOTE_VER}} path: ${{env.DISTRIB_PATH}} env: DISTRIB_PATH: ${{runner.workspace}}/build/distrib/vnote @@ -125,6 +133,6 @@ jobs: uses: johnwbyrd/update-release@v1.0.0 with: token: ${{ secrets.GITHUB_TOKEN }} - files: ${{runner.workspace}}/build/vnote-win-${{matrix.config.platform}}.zip + files: ${{runner.workspace}}/build/vnote-win-${{matrix.config.platform}}-qt${{matrix.config.qt}}.zip release: Continuous Build tag: continuous-build diff --git a/README.md b/README.md index 4e6b53b9..507b9fbb 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,8 @@ Utilizing Qt, VNote could run on **Linux**, **Windows**, and **macOS**. ![Main](pics/main.png) +![Main2](pics/main2.png) + ## Downloads Continuous builds on `master` branch could be found at the [Continuous Build](https://github.com/vnotex/vnote/releases/tag/continuous-build) release. diff --git a/README_zh_CN.md b/README_zh_CN.md index 19aabb10..aa113a47 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -18,6 +18,8 @@ VNote不是一个简单的Markdown编辑器。通过提供强大的笔记管理 ![主界面](pics/main.png) +![主界面2](pics/main2.png) + ## 下载 基于`master`分支的[持续构建版本发布](https://github.com/vnotex/vnote/releases/tag/continuous-build)。 diff --git a/pics/main2.png b/pics/main2.png new file mode 100644 index 00000000..e8c4f89d Binary files /dev/null and b/pics/main2.png differ diff --git a/src/data/core/icons/read_editor.svg b/src/data/core/icons/read_editor.svg index 51c57fea..f4665fad 100644 --- a/src/data/core/icons/read_editor.svg +++ b/src/data/core/icons/read_editor.svg @@ -1 +1 @@ - + diff --git a/src/data/extra/themes/pure/palette.json b/src/data/extra/themes/pure/palette.json index 7c01f35b..64a86b02 100644 --- a/src/data/extra/themes/pure/palette.json +++ b/src/data/extra/themes/pure/palette.json @@ -649,6 +649,7 @@ } }, "hover" : { + "fg" : "@widgets#mainwindow#side_bar#fg", "bg" : "@palette#layer3" }, "widget" : {