Workflows: Update.

.github/workflows/macos-shared.yml

@@ -63,7 +63,7 @@ jobs:
           
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}_shared.zip
+          name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}_shared
           path: /Users/runner/work/RibbonUI/RibbonUI/build/app/release/${{ env.targetName }}.dmg
           
       - name: uploadRelease

.github/workflows/macos-static.yml

@@ -63,7 +63,7 @@ jobs:
           
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}_static.zip
+          name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}_static
           path: /Users/runner/work/RibbonUI/RibbonUI/build/app/release/${{ env.targetName }}.dmg
           
       - name: uploadRelease

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "lib_source/3rdparty/qwindowkit"]
-	path = lib_source/3rdparty/qwindowkit
+[submodule "3rdparty/qwindowkit"]
+	path = 3rdparty/qwindowkit
 	url = https://github.com/stdware/qwindowkit.git

3rdparty/qwindowkit

@@ -0,0 +1 @@
+Subproject commit 357532958f2e806c69c96f018333a45e65e35201

CMakeLists.txt

@@ -9,11 +9,26 @@ cmake_path(SET QT_SDK_DIR NORMALIZE ${QT_SDK_DIR})
 option(RIBBONUI_BUILD_EXAMPLES "Build RibbonUI APP." ON)
 option(RIBBONUI_BUILD_QWINDOWKIT "Build QWindowKit." ON)
 option(RIBBONUI_BUILD_STATIC_LIB "Build RibbonUI static library." OFF)
+option(RIBBONUI_UNIVERSAL_BUILD_MACOS "Universal build RibbonUI for macOS." ON)
+
+if(APPLE AND RIBBONUI_UNIVERSAL_BUILD_MACOS)
+    set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
+endif()
 
 if(NOT RIBBONUI_QML_PLUGIN_DIRECTORY)
     set(RIBBONUI_QML_PLUGIN_DIRECTORY ${QT_SDK_DIR}/qml/RibbonUI CACHE PATH "RibbonUI Plugin Path")
 endif()
 
+if (RIBBONUI_BUILD_QWINDOWKIT)
+    set(QWINDOWKIT_BUILD_STATIC ON)
+    set(QWINDOWKIT_BUILD_EXAMPLES OFF)
+    set(QWINDOWKIT_BUILD_QUICK ON)
+    set(QWINDOWKIT_BUILD_WIDGETS OFF)
+    set(QWINDOWKIT_ENABLE_STYLE_AGENT ON)
+    set(QWINDOWKIT_INSTALL OFF)
+    add_subdirectory(3rdparty/qwindowkit)
+endif()
+
 add_subdirectory(lib_source)
 
 if (RIBBONUI_BUILD_EXAMPLES)
@@ -24,5 +39,6 @@ message("---------------------------- RibbonUI ----------------------------")
 message("Build RibbonUI APP: ${RIBBONUI_BUILD_EXAMPLES}")
 message("Build RibbonUI static library: ${RIBBONUI_BUILD_STATIC_LIB}")
 message("Build QWindowKit: ${RIBBONUI_BUILD_QWINDOWKIT}")
+message("Universal build RibbonUI for macOS: ${RIBBONUI_UNIVERSAL_BUILD_MACOS}")
 message("RibbonUI QML Plugin Path: ${RIBBONUI_QML_PLUGIN_DIRECTORY}")
 message("------------------------------------------------------------------")

example/CMakeLists.txt

@@ -15,10 +15,6 @@ else()
     set(CMAKE_AUTOUIC ON)
 endif()
 
-if(APPLE)
-    set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
-endif()
-
 string(TIMESTAMP TIME_YEAR %Y)
 set(PROJECT_COMPANY "Mentalflow's Lab")
 set(PROJECT_COPYRIGHT "Copyright (c) ${TIME_YEAR} Mentalflow's Lab. All rights reserved.")

example/example.qml

@@ -17,7 +17,11 @@ RibbonWindow {
             {
                 title: qsTr("Tab Bar"),
                 text: qsTr("A tab bar for window, let user choose the controllers."),
-                target: tab_bar
+                target: tab_bar,
+                enter_func: ()=>{
+                    tab_bar.folded = false
+                    tour.refresh(300) // Use it if has animation
+                }
             },
             {
                 title: qsTr("Tab Bar Buttons"),
@@ -107,6 +111,7 @@ RibbonWindow {
             id: basic_page
             title: qsTr("Basic")
             RibbonTabGroup{
+                showOpenExternal: true
                 width: slider_layout.width + 20
                 text: qsTr("Slider")
                 RowLayout{
@@ -149,6 +154,7 @@ RibbonWindow {
             RibbonTabGroup{
                 width: switch_layout.width + 30
                 text: qsTr("Switch Button")
+                showOpenExternal: true
                 RowLayout{
                     id: switch_layout
                     anchors.centerIn: parent
@@ -197,6 +203,7 @@ RibbonWindow {
             RibbonTabGroup{
                 width: checkbox_layout.width + 30
                 text: qsTr("CheckBox")
+                showOpenExternal: true
                 RowLayout{
                     id: checkbox_layout
                     anchors.centerIn: parent
@@ -232,6 +239,7 @@ RibbonWindow {
             RibbonTabGroup{
                 width: button_layout.width + 30
                 text: qsTr("Button")
+                showOpenExternal: true
                 RowLayout{
                     id: button_layout
                     anchors.centerIn: parent

lib_source/3rdparty/qwindowkit

@@ -1 +0,0 @@
-Subproject commit 0177eedd03bd9a75dafea296f77b8a6bdad9c3cb

lib_source/CMakeLists.txt

@@ -16,20 +16,6 @@ else()
     set(CMAKE_AUTOUIC ON)
 endif()
 
-if(APPLE)
-    set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
-endif()
-
-if (RIBBONUI_BUILD_QWINDOWKIT)
-    set(QWINDOWKIT_BUILD_STATIC ON)
-    set(QWINDOWKIT_BUILD_EXAMPLES OFF)
-    set(QWINDOWKIT_BUILD_QUICK ON)
-    set(QWINDOWKIT_BUILD_WIDGETS OFF)
-    set(QWINDOWKIT_ENABLE_STYLE_AGENT ON)
-    set(QWINDOWKIT_INSTALL OFF)
-    add_subdirectory(3rdparty/qwindowkit)
-endif()
-
 find_package(Qt6 COMPONENTS Core Quick Qml REQUIRED)
 
 set(version_str "${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH}")