From 36d7c714a5452ae017602f3b33fc524489f805e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Sat, 25 Mar 2023 12:41:56 +0800 Subject: [PATCH] update --- example/App.qml | 12 +++++++----- example/T_Awesome.qml | 10 +++++----- example/T_Badge.qml | 10 +++++----- example/T_Buttons.qml | 10 +++++----- example/T_CalendarPicker.qml | 10 +++++----- example/T_Carousel.qml | 10 +++++----- example/T_ColorPicker.qml | 10 +++++----- example/T_DatePicker.qml | 10 +++++----- example/T_Dialog.qml | 10 +++++----- example/T_Expander.qml | 10 +++++----- example/T_InfoBar.qml | 10 +++++----- example/T_MediaPlayer.qml | 10 +++++----- example/T_Menu.qml | 10 +++++----- example/T_MultiWindow.qml | 10 +++++----- example/T_Progress.qml | 10 +++++----- example/T_Rectangle.qml | 10 +++++----- example/T_Slider.qml | 10 +++++----- example/T_TextBox.qml | 10 +++++----- example/T_Theme.qml | 10 +++++----- example/T_TimePicker.qml | 10 +++++----- example/T_ToggleSwitch.qml | 10 +++++----- example/T_Tooltip.qml | 10 +++++----- example/T_TreeView.qml | 10 +++++----- example/T_Typography.qml | 8 ++++---- example/example.pro | 4 ++-- example/page/AboutPage.qml | 8 ++++---- example/page/LoginPage.qml | 7 ++++--- example/page/MainPage.qml | 10 +++++----- src/FluentUI.pro | 2 +- src/controls/FluTextButton.qml | 6 +++--- 30 files changed, 140 insertions(+), 137 deletions(-) diff --git a/example/App.qml b/example/App.qml index 6e3f4be2..f474c033 100644 --- a/example/App.qml +++ b/example/App.qml @@ -1,8 +1,10 @@ -import QtQuick 2.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Window +import QtQuick.Controls +import QtQuick.Layouts +import Qt5Compat.GraphicalEffects +import QtMultimedia +import FluentUI Window { id:app diff --git a/example/T_Awesome.qml b/example/T_Awesome.qml index e3e23faa..c9295434 100644 --- a/example/T_Awesome.qml +++ b/example/T_Awesome.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window +import FluentUI FluContentPage { diff --git a/example/T_Badge.qml b/example/T_Badge.qml index cdf7e577..9832ce2d 100644 --- a/example/T_Badge.qml +++ b/example/T_Badge.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ diff --git a/example/T_Buttons.qml b/example/T_Buttons.qml index 8fd2093e..5dbfc577 100644 --- a/example/T_Buttons.qml +++ b/example/T_Buttons.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ title:"Buttons" diff --git a/example/T_CalendarPicker.qml b/example/T_CalendarPicker.qml index 3b858066..4af84036 100644 --- a/example/T_CalendarPicker.qml +++ b/example/T_CalendarPicker.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window +import FluentUI FluScrollablePage{ diff --git a/example/T_Carousel.qml b/example/T_Carousel.qml index 05211cd4..ffb29056 100644 --- a/example/T_Carousel.qml +++ b/example/T_Carousel.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ diff --git a/example/T_ColorPicker.qml b/example/T_ColorPicker.qml index a110172f..b2378a85 100644 --- a/example/T_ColorPicker.qml +++ b/example/T_ColorPicker.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window +import FluentUI FluScrollablePage{ diff --git a/example/T_DatePicker.qml b/example/T_DatePicker.qml index 2e2db6bd..d25e98cb 100644 --- a/example/T_DatePicker.qml +++ b/example/T_DatePicker.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window +import FluentUI FluScrollablePage{ diff --git a/example/T_Dialog.qml b/example/T_Dialog.qml index 8737bd6b..7a544302 100644 --- a/example/T_Dialog.qml +++ b/example/T_Dialog.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ title:"Dialog" diff --git a/example/T_Expander.qml b/example/T_Expander.qml index 1b285e12..b694a49f 100644 --- a/example/T_Expander.qml +++ b/example/T_Expander.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window +import FluentUI FluScrollablePage{ title:"Expander" diff --git a/example/T_InfoBar.qml b/example/T_InfoBar.qml index d7137cb9..f6226d24 100644 --- a/example/T_InfoBar.qml +++ b/example/T_InfoBar.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ title:"InfoBar" diff --git a/example/T_MediaPlayer.qml b/example/T_MediaPlayer.qml index 853e4b26..d7bd23e9 100644 --- a/example/T_MediaPlayer.qml +++ b/example/T_MediaPlayer.qml @@ -1,9 +1,9 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window import Qt5Compat.GraphicalEffects -import FluentUI 1.0 +import FluentUI FluScrollablePage{ diff --git a/example/T_Menu.qml b/example/T_Menu.qml index 33fcfa23..927f9808 100644 --- a/example/T_Menu.qml +++ b/example/T_Menu.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ diff --git a/example/T_MultiWindow.qml b/example/T_MultiWindow.qml index f63f9d4d..de5e2c38 100644 --- a/example/T_MultiWindow.qml +++ b/example/T_MultiWindow.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ diff --git a/example/T_Progress.qml b/example/T_Progress.qml index 98442016..150bfd59 100644 --- a/example/T_Progress.qml +++ b/example/T_Progress.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ title:"Progress" diff --git a/example/T_Rectangle.qml b/example/T_Rectangle.qml index daa817fe..6f59c95e 100644 --- a/example/T_Rectangle.qml +++ b/example/T_Rectangle.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 -import QtQuick.Window 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import QtQuick.Window +import FluentUI FluScrollablePage{ title:"Rectangle" diff --git a/example/T_Slider.qml b/example/T_Slider.qml index 9ff659a1..557c63de 100644 --- a/example/T_Slider.qml +++ b/example/T_Slider.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ diff --git a/example/T_TextBox.qml b/example/T_TextBox.qml index 85235aff..bd74d10b 100644 --- a/example/T_TextBox.qml +++ b/example/T_TextBox.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window +import FluentUI FluScrollablePage{ diff --git a/example/T_Theme.qml b/example/T_Theme.qml index a3e3c867..c7f6232f 100644 --- a/example/T_Theme.qml +++ b/example/T_Theme.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ diff --git a/example/T_TimePicker.qml b/example/T_TimePicker.qml index 05a2684b..aec1bbce 100644 --- a/example/T_TimePicker.qml +++ b/example/T_TimePicker.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window +import FluentUI FluScrollablePage{ diff --git a/example/T_ToggleSwitch.qml b/example/T_ToggleSwitch.qml index afbd3292..9b8cbc45 100644 --- a/example/T_ToggleSwitch.qml +++ b/example/T_ToggleSwitch.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ diff --git a/example/T_Tooltip.qml b/example/T_Tooltip.qml index 885df12c..ebb526c8 100644 --- a/example/T_Tooltip.qml +++ b/example/T_Tooltip.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window +import FluentUI FluScrollablePage{ diff --git a/example/T_TreeView.qml b/example/T_TreeView.qml index d39f0c73..f75faad8 100644 --- a/example/T_TreeView.qml +++ b/example/T_TreeView.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluContentPage { diff --git a/example/T_Typography.qml b/example/T_Typography.qml index 1f2eb2c6..5636a2c8 100644 --- a/example/T_Typography.qml +++ b/example/T_Typography.qml @@ -1,7 +1,7 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import FluentUI FluContentPage { diff --git a/example/example.pro b/example/example.pro index 451817a0..da5a8758 100644 --- a/example/example.pro +++ b/example/example.pro @@ -1,5 +1,5 @@ -QT += quick quickcontrols2 concurrent network -CONFIG += c++11 +QT += quick quickcontrols2 concurrent network multimedia core5compat +CONFIG += c++17 DEFINES += QT_DEPRECATED_WARNINGS QT_NO_WARNING_OUTPUT diff --git a/example/page/AboutPage.qml b/example/page/AboutPage.qml index 9b23f2ee..56586ed0 100644 --- a/example/page/AboutPage.qml +++ b/example/page/AboutPage.qml @@ -1,7 +1,7 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import FluentUI FluWindow { diff --git a/example/page/LoginPage.qml b/example/page/LoginPage.qml index 15a7da4f..76e069c7 100644 --- a/example/page/LoginPage.qml +++ b/example/page/LoginPage.qml @@ -1,6 +1,7 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import FluentUI FluWindow { diff --git a/example/page/MainPage.qml b/example/page/MainPage.qml index bf3a1fd2..776afd9f 100644 --- a/example/page/MainPage.qml +++ b/example/page/MainPage.qml @@ -1,9 +1,9 @@ -import QtQuick 2.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Window +import QtQuick.Controls +import QtQuick.Layouts -import FluentUI 1.0 +import FluentUI FluWindow { id:rootwindow diff --git a/src/FluentUI.pro b/src/FluentUI.pro index ffe10367..06e1a290 100644 --- a/src/FluentUI.pro +++ b/src/FluentUI.pro @@ -1,5 +1,5 @@ QT += qml quick svg -CONFIG += plugin c++11 +CONFIG += plugin c++17 TEMPLATE = lib TARGET = FluentUI TARGET = $$qtLibraryTarget($$TARGET) diff --git a/src/controls/FluTextButton.qml b/src/controls/FluTextButton.qml index 5b4b0343..a196524e 100644 --- a/src/controls/FluTextButton.qml +++ b/src/controls/FluTextButton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import FluentUI Button {