Mentalflow
/
RibbonUI
mirror of https://github.com/mentalfl0w/RibbonUI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Project Version: Bump to V1.0.2.

This commit is contained in:
Mentalflow 2024-03-03 18:31:16 +08:00
parent aa3604579b
commit 43240eab1f
Signed by: Mentalflow
GPG Key ID: 5AE68D4401A2EE71
4 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16)
project(RibbonUI_Project VERSION 1.0 LANGUAGES CXX) project(RibbonUI_Project VERSION 1.0.2 LANGUAGES CXX)
option(RIBBONUI_BUILD_EXAMPLES "Build RibbonUI APP." ON) option(RIBBONUI_BUILD_EXAMPLES "Build RibbonUI APP." ON)
option(RIBBONUI_BUILD_FRAMELESSHEPLER "Build FramelessHelper." ON) option(RIBBONUI_BUILD_FRAMELESSHEPLER "Build FramelessHelper." ON)

10
example/CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.21) cmake_minimum_required(VERSION 3.21)
project(RibbonUIAPP VERSION 1.0.1 LANGUAGES CXX) project(RibbonUIAPP VERSION ${CMAKE_PROJECT_VERSION} LANGUAGES CXX)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
@ -10,11 +10,12 @@ if(APPLE)
endif() endif()
set(PROJECT_COMPANY "Mentalflow's Lab") set(PROJECT_COMPANY "Mentalflow's Lab")
set(PROJECT_COPYRIGHT "Copyright (c) 2023 Mentalflow's Lab. All rights reserved.") set(PROJECT_COPYRIGHT "Copyright (c) 2024 Mentalflow's Lab. All rights reserved.")
set(PROJECT_DOMAIN "dev.ourdocs.cn.ribbonuiapp") set(PROJECT_DOMAIN "dev.ourdocs.cn.ribbonuiapp")
set(PROJECT_BUNDLE_NAME RibbonUI-APP) set(PROJECT_BUNDLE_NAME RibbonUI-APP)
add_definitions(-DRIBBONUIAPP_VERSION=1,0,1) set(version_str "${CMAKE_PROJECT_VERSION_MAJOR},${CMAKE_PROJECT_VERSION_MINOR},${CMAKE_PROJECT_VERSION_PATCH}")
add_definitions(-DRIBBONUIAPP_VERSION=${version_str})
find_package(Qt6 COMPONENTS Quick REQUIRED) find_package(Qt6 COMPONENTS Quick REQUIRED)
@ -61,7 +62,8 @@ endif ()
qt_add_qml_module(${PROJECT_NAME} qt_add_qml_module(${PROJECT_NAME}
URI ${PROJECT_NAME} URI ${PROJECT_NAME}
VERSION 1.0 VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}
RESOURCE_PREFIX "/qt/qml/"
QML_FILES example.qml components/RibbonWindow.qml QML_FILES example.qml components/RibbonWindow.qml
RESOURCES resources/imgs/heart.png resources/imgs/search.png resources/icon.rc RESOURCES resources/imgs/heart.png resources/imgs/search.png resources/icon.rc
) )

2
example/example.cpp
View File

@ -30,7 +30,7 @@ int main(int argc, char *argv[])
#ifdef RIBBONUI_BUILD_STATIC_LIB #ifdef RIBBONUI_BUILD_STATIC_LIB
engine.addImportPath("qrc:/"); engine.addImportPath("qrc:/");
#endif #endif
const QUrl url(u"qrc:/RibbonUIAPP/example.qml"_qs); const QUrl url(u"qrc:/qt/qml/RibbonUIAPP/example.qml"_qs);
QObject::connect(&engine, &QQmlApplicationEngine::objectCreated, QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
&app, [url](QObject *obj, const QUrl &objUrl) { &app, [url](QObject *obj, const QUrl &objUrl) {
if (!obj && url == objUrl) if (!obj && url == objUrl)

30
lib_source/CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.21) cmake_minimum_required(VERSION 3.21)
project(RibbonUI VERSION 1.0.1 LANGUAGES CXX) project(RibbonUI VERSION ${CMAKE_PROJECT_VERSION} LANGUAGES CXX)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
@ -9,9 +9,10 @@ if(APPLE)
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE) set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
endif() endif()
find_package(Qt6 6.2 COMPONENTS Core Quick Qml ShaderTools REQUIRED) find_package(Qt6 COMPONENTS Core Quick Qml ShaderTools REQUIRED)
add_definitions(-DRIBBONUI_VERSION=1,0,1) set(version_str "${CMAKE_PROJECT_VERSION_MAJOR},${CMAKE_PROJECT_VERSION_MINOR},${CMAKE_PROJECT_VERSION_PATCH}")
add_definitions(-DRIBBONUI_VERSION=${version_str})
if (RIBBONUI_BUILD_STATIC_LIB) if (RIBBONUI_BUILD_STATIC_LIB)
set(LIB_TYPE "STATIC") set(LIB_TYPE "STATIC")
@ -22,13 +23,8 @@ else()
set(PLUGIN_TARGET_NAME ${PROJECT_NAME}) set(PLUGIN_TARGET_NAME ${PROJECT_NAME})
endif() endif()
qt_add_library(${PROJECT_NAME} ${LIB_TYPE}) set(
qt_add_qml_module(${PROJECT_NAME} qml_files qml/RibbonTabBar.qml qml/RibbonTabButton.qml qml/RibbonView.qml
PLUGIN_TARGET ${PLUGIN_TARGET_NAME}
OUTPUT_DIRECTORY ${CMAKE_PREFIX_PATH}/qml/RibbonUI
URI RibbonUI
VERSION 1.0
QML_FILES qml/RibbonTabBar.qml qml/RibbonTabButton.qml qml/RibbonView.qml
qml/RibbonTabPage.qml qml/RibbonTabGroup.qml qml/RibbonButton.qml qml/RibbonTabPage.qml qml/RibbonTabGroup.qml qml/RibbonButton.qml
qml/RibbonBottomBar.qml qml/RibbonIcon.qml qml/RibbonToolTip.qml qml/RibbonBottomBar.qml qml/RibbonIcon.qml qml/RibbonToolTip.qml
qml/RibbonTitleBar.qml qml/RibbonSlider.qml qml/RibbonSwitchButton.qml qml/RibbonTitleBar.qml qml/RibbonSlider.qml qml/RibbonSwitchButton.qml
@ -38,6 +34,20 @@ qt_add_qml_module(${PROJECT_NAME}
qml/RibbonText.qml qml/RibbonTextBoxMenu.qml qml/RibbonPopup.qml qml/RibbonText.qml qml/RibbonTextBoxMenu.qml qml/RibbonPopup.qml
qml/RibbonPopupDialog.qml qml/RibbonLineEdit.qml qml/RibbonTextEdit.qml qml/RibbonPopupDialog.qml qml/RibbonLineEdit.qml qml/RibbonTextEdit.qml
qml/RibbonComboBox.qml qml/RibbonSpinBox.qml qml/RibbonComboBox.qml qml/RibbonSpinBox.qml
)
foreach(qmlfile ${qml_files})
string(REPLACE "qml/" "" fixedfile ${qmlfile})
set_source_files_properties(${qmlfile} PROPERTIES QT_RESOURCE_ALIAS ${fixedfile})
endforeach(qmlfile)
qt_add_library(${PROJECT_NAME} ${LIB_TYPE})
qt_add_qml_module(${PROJECT_NAME}
PLUGIN_TARGET ${PLUGIN_TARGET_NAME}
OUTPUT_DIRECTORY ${CMAKE_PREFIX_PATH}/qml/RibbonUI
URI ${PROJECT_NAME}
VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}
QML_FILES ${qml_files}
SOURCES ribbonui.cpp ribbonui.h definitions.h ribbontheme.h ribbontheme.cpp SOURCES ribbonui.cpp ribbonui.h definitions.h ribbontheme.h ribbontheme.cpp
RESOURCES resources/FluentSystemIcons-Resizable.ttf resources/imgs/icon.png RESOURCES resources/FluentSystemIcons-Resizable.ttf resources/imgs/icon.png
) )