Browse Source

try fix win ci (#2202)

* try fix win ci

* add 5.15 for win

* fix

* refine README
Le Tan 3 years ago
parent
commit
05e8648d25

+ 15 - 7
.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/[email protected]
         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

+ 2 - 0
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.
 

+ 2 - 0
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)。
 

BIN
pics/main2.png


+ 1 - 1
src/data/core/icons/read_editor.svg

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"><rect x="6" y="22" width="36" height="22" rx="2" fill="none" stroke="#000000" stroke-width="4" stroke-linejoin="round"/><path d="M14 22V14C14 8.47715 18.4772 4 24 4C29.5228 4 34 8.47715 34 14V22" stroke="#000000" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path d="M24 30V36" stroke="#000000" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></svg>
+<?xml version="1.0" encoding="UTF-8"?><svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M22 44L21 36" stroke="#000000" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path d="M42 44V12H26L27 20L28 28L29 36L22 44H42Z" fill="none" stroke="#000000" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path d="M28 28H33" stroke="#000000" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path d="M27 20H33" stroke="#000000" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path d="M6 4H25L26 12L27 20L28 28L29 36H21H6V4Z" fill="none" stroke="#000000" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path d="M12 12H19" stroke="#000000" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path d="M12 20H20" stroke="#000000" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path d="M12 28H21" stroke="#000000" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></svg>

+ 1 - 0
src/data/extra/themes/pure/palette.json

@@ -649,6 +649,7 @@
                     }
                 },
                 "hover" : {
+                    "fg" : "@widgets#mainwindow#side_bar#fg",
                     "bg" : "@palette#layer3"
                 },
                 "widget" : {