Merge branch 'tmp' into dev

czyt1988 · Oct 12, 2023 · 38d05ae · 38d05ae
2 parents 77eb131 + ba41902
commit 38d05ae
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/.github/workflows/cmake-linux-qt5.yml b/.github/workflows/cmake-linux-qt5.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         ubuntu_version: [20.04, latest]
-        qt_version: [5.12.0,5.15.0,6.2.0,6.5.0]
+        qt_version: [5.14.2,5.15.0]
         shared: [ON]
 
     steps:

diff --git a/.github/workflows/cmake-mac-qt5.yml b/.github/workflows/cmake-mac-qt5.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         macos_version: [11, latest]
-        qt_version: [5.12.0,5.15.0]
+        qt_version: [5.14.2,5.15.0]
         shared: [ON]
 
     steps:

diff --git a/.github/workflows/cmake-win-qt5.yml b/.github/workflows/cmake-win-qt5.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         win_version: [2019, latest]
-        qt_version: [5.12.0,5.15.0]
+        qt_version: [5.14.2,5.15.0]
         shared: [ON]
 
     steps:

diff --git a/doc/screenshot/SARibbon-theme-style.gif b/doc/screenshot/SARibbon-theme-style.gif
diff --git a/readme-cn.md b/readme-cn.md
@@ -1,12 +1,11 @@
 [Click here for English](./readme.md)
 
-||Windows|Linux|Mac|
+||Windows(2019, latest)|Linux ubuntu(20.04, latest)|Mac(11-latest)|
 |:-|:-|:-|:-|
-|Qt5|[![cmake-win-qt5](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-win-qt5.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-win-qt5.yml)|[![CMake-Linux-Qt5](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-linux-qt5.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-linux-qt5.yml)|[![cmake-mac-qt5](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-mac-qt5.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-mac-qt5.yml)|
-|Qt6|[![cmake-win-qt6](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-win-qt6.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-win-qt6.yml)|[![CMake-Linux-Qt6](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-linux-qt6.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-linux-qt6.yml)|[![cmake-mac-qt6](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-mac-qt6.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-mac-qt6.yml)|
+|Qt5 (5.14.2-5.15.0)|[![cmake-win-qt5](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-win-qt5.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-win-qt5.yml)|[![CMake-Linux-Qt5](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-linux-qt5.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-linux-qt5.yml)|[![cmake-mac-qt5](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-mac-qt5.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-mac-qt5.yml)|
+|Qt6 (6.2.0-6.5.0)|[![cmake-win-qt6](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-win-qt6.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-win-qt6.yml)|[![CMake-Linux-Qt6](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-linux-qt6.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-linux-qt6.yml)|[![cmake-mac-qt6](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-mac-qt6.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-mac-qt6.yml)|
 
-
- 这是基于Qt（最低要求Qt5，支持C++11的编译器）开发的一个轻量级的Ribbon控件(Office样式UI)
+最低要求Qt5.14以上，c++17标准支持（由于使用了frameless库，此库最低要求c++17）,Qt5.14完善了高分辨率的支持，建议低于此版本的Qt都更新到Qt5.14以上
 
  界面截图：
 
@@ -18,6 +17,10 @@ MIT协议，欢迎大家使用并提出意见
 
 [github - https://github.com/czyt1988/SARibbon](https://github.com/czyt1988/SARibbon)
 
+SARibbon提供了几种布局方式，以及可以通过qss自由定义主题
+
+![](./doc/screenshot/SARibbon-theme-style.gif)
+
 # 编译
 
 ## 直接引入工程（静态）

diff --git a/readme.md b/readme.md
@@ -1,13 +1,12 @@
 
 [中文文档点击这里](./readme-cn.md)
 
-||Windows|Linux|Mac|
+||Windows(2019, latest)|Linux ubuntu(20.04, latest)|Mac(11-latest)|
 |:-|:-|:-|:-|
-|Qt5|[![cmake-win-qt5](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-win-qt5.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-win-qt5.yml)|[![CMake-Linux-Qt5](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-linux-qt5.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-linux-qt5.yml)|[![cmake-mac-qt5](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-mac-qt5.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-mac-qt5.yml)|
-|Qt6|[![cmake-win-qt6](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-win-qt6.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-win-qt6.yml)|[![CMake-Linux-Qt6](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-linux-qt6.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-linux-qt6.yml)|[![cmake-mac-qt6](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-mac-qt6.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-mac-qt6.yml)|
+|Qt5 (5.14.2-5.15.0)|[![cmake-win-qt5](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-win-qt5.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-win-qt5.yml)|[![CMake-Linux-Qt5](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-linux-qt5.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-linux-qt5.yml)|[![cmake-mac-qt5](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-mac-qt5.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-mac-qt5.yml)|
+|Qt6 (6.2.0-6.5.0)|[![cmake-win-qt6](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-win-qt6.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-win-qt6.yml)|[![CMake-Linux-Qt6](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-linux-qt6.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-linux-qt6.yml)|[![cmake-mac-qt6](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-mac-qt6.yml/badge.svg)](https://github.com/czyt1988/SARibbon/actions/workflows/cmake-mac-qt6.yml)|
 
-
-This is a lightweight Ribbon control (Officestyle UI) based on Qt (minimum Qt5, compiler supporting C++ 11). Screenshot of the interface:
+The minimum requirement is Qt5.14 or above, with c++17 standard support (due to the use of the frameless library, the minimum requirement for this library is c++17). Qt5.14 has improved high-dpi support, and it is recommended to update Qt below this version to Qt5.14 or above
 
 ![](./doc/screenshot/001.gif)
 
@@ -17,6 +16,10 @@ MIT protocol, welcome to use and make comments
 
 [github:https://github.com/czyt1988/SARibbon ] ( https://github.com/czyt1988/SARibbon )
 
+Several layout methods are provided, and themes can be freely defined through QSS
+
+![](./doc/screenshot/SARibbon-theme-style.gif)
+
 # Compile
 
 ## Import into project (static)