From b5894158d23f54d6664eb405ff2cff7c7cbbc1ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Thu, 30 Mar 2023 21:52:55 +0800 Subject: [PATCH] update --- .github/workflows/macos.yml | 3 +- .github/workflows/ubuntu.yml | 3 +- .github/workflows/windows.yml | 10 ++----- example/App.qml | 11 ++++--- example/T_Awesome.qml | 10 +++---- example/T_Badge.qml | 11 ++++--- example/T_Buttons.qml | 10 +++---- example/T_CalendarPicker.qml | 10 +++---- example/T_Carousel.qml | 11 ++++--- example/T_CheckBox.qml | 10 +++---- example/T_ColorPicker.qml | 11 ++++--- example/T_DatePicker.qml | 10 +++---- example/T_Dialog.qml | 11 ++++--- example/T_Expander.qml | 11 ++++--- example/T_Home.qml | 10 +++---- example/T_InfoBar.qml | 11 ++++--- example/T_MediaPlayer.qml | 11 ++++--- example/T_Menu.qml | 11 ++++--- example/T_MultiWindow.qml | 10 +++---- example/T_Progress.qml | 11 ++++--- example/T_Rectangle.qml | 11 ++++--- example/T_Slider.qml | 10 +++---- example/T_TabView.qml | 10 +++---- example/T_TextBox.qml | 11 ++++--- example/T_Theme.qml | 11 ++++--- example/T_TimePicker.qml | 10 +++---- example/T_ToggleSwitch.qml | 11 ++++--- example/T_Tooltip.qml | 11 ++++--- example/T_TreeView.qml | 10 +++---- example/T_Typography.qml | 8 ++--- example/example.pro | 2 +- example/global/ItemsFooter.qml | 4 +-- example/global/ItemsOriginal.qml | 4 +-- example/main.cpp | 7 +++-- example/page/AboutPage.qml | 9 +++--- example/page/ChatPage.qml | 13 +++++---- example/page/LoginPage.qml | 7 +++-- example/page/MainPage.qml | 11 +++---- src/colorpicker/ColorPicker.qml | 6 ++-- src/colorpicker/content/Checkerboard.qml | 2 +- src/colorpicker/content/ColorSlider.qml | 2 +- src/colorpicker/content/NumberBox.qml | 2 +- src/colorpicker/content/PanelBorder.qml | 2 +- src/colorpicker/content/SBPicker.qml | 14 ++------- src/controls/FluAppBar.qml | 16 ++++------ src/controls/FluArea.qml | 4 +-- src/controls/FluAutoSuggestBox.qml | 6 ++-- src/controls/FluBadge.qml | 2 +- src/controls/FluButton.qml | 6 ++-- src/controls/FluCalendarPicker.qml | 37 +++++++++++++----------- src/controls/FluCalendarView.qml | 6 ++-- src/controls/FluCarousel.qml | 6 ++-- src/controls/FluCheckBox.qml | 8 ++--- src/controls/FluColorPicker.qml | 21 ++++++++------ src/controls/FluColorView.qml | 2 +- src/controls/FluComboBox.qml | 4 +-- src/controls/FluContentDialog.qml | 12 ++++---- src/controls/FluContentPage.qml | 10 +++---- src/controls/FluDatePicker.qml | 25 +++++++--------- src/controls/FluDivider.qml | 4 +-- src/controls/FluDropDownButton.qml | 8 ++--- src/controls/FluExpander.qml | 6 ++-- src/controls/FluFilledButton.qml | 6 ++-- src/controls/FluFocusRectangle.qml | 4 +-- src/controls/FluIcon.qml | 2 +- src/controls/FluIconButton.qml | 6 ++-- src/controls/FluInfoBar.qml | 14 ++++----- src/controls/FluItem.qml | 6 ++-- src/controls/FluMediaPlayer.qml | 36 +++++++++++++---------- src/controls/FluMenu.qml | 14 ++++----- src/controls/FluMenuItem.qml | 4 +-- src/controls/FluMultiLineTextBox.qml | 6 ++-- src/controls/FluNavigationView.qml | 10 +++---- src/controls/FluObject.qml | 2 +- src/controls/FluPaneItem.qml | 4 +-- src/controls/FluPaneItemHeader.qml | 2 +- src/controls/FluPaneItemSeparator.qml | 2 +- src/controls/FluProgressBar.qml | 4 +-- src/controls/FluProgressRing.qml | 4 +-- src/controls/FluRadioButton.qml | 8 ++--- src/controls/FluRectangle.qml | 6 ++-- src/controls/FluScrollBar.qml | 6 ++-- src/controls/FluScrollablePage.qml | 10 +++---- src/controls/FluShadow.qml | 2 +- src/controls/FluSlider.qml | 6 ++-- src/controls/FluTabView.qml | 8 ++--- src/controls/FluText.qml | 4 +-- src/controls/FluTextBox.qml | 6 ++-- src/controls/FluTextBoxBackground.qml | 4 +-- src/controls/FluTextButton.qml | 6 ++-- src/controls/FluTimePicker.qml | 21 +++++++------- src/controls/FluToggleSwitch.qml | 4 +-- src/controls/FluTooltip.qml | 7 ++--- src/controls/FluTreeView.qml | 11 ++++--- src/controls/FluWindow.qml | 9 +++--- src/controls/FluWindowResize.qml | 4 +-- src/controls/TFpsMonitor.qml | 4 +-- 97 files changed, 398 insertions(+), 421 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 79a5af3..e7d8ad8 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: os: [macos-11.0] - qt_ver: [5.15.2] + qt_ver: [6.4.3] qt_arch: [clang_64] env: targetName: example @@ -34,6 +34,7 @@ jobs: with: version: ${{ matrix.qt_ver }} cached: 'false' + modules: 'all' - uses: actions/checkout@v2 with: fetch-depth: 1 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 362c5e4..79afdc9 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - qt_ver: [5.15.2] + qt_ver: [6.4.3] qt_arch: [gcc_64] env: targetName: example @@ -29,6 +29,7 @@ jobs: with: version: ${{ matrix.qt_ver }} cached: 'false' + modules: 'all' - name: ubuntu install GL library run: sudo apt-get install -y libglew-dev libglfw3-dev qml-module-qtquick-controls qml-module-qtquick-controls2 - uses: actions/checkout@v2 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 43ce294..1909625 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -21,12 +21,7 @@ jobs: # 矩阵配置 matrix: include: - # 5.15.2 参考 https://mirrors.cloud.tencent.com/qt/online/qtsdkrepository/windows_x86/desktop/qt5_5152/ - - qt_ver: 5.15.2 - qt_arch: win32_msvc2019 - msvc_arch: x86 - qt_arch_install: msvc2019 - - qt_ver: 5.15.2 + - qt_ver: 6.4.3 qt_arch: win64_msvc2019_64 msvc_arch: x64 qt_arch_install: msvc2019_64 @@ -38,7 +33,7 @@ jobs: # 安装Qt - name: Install Qt # 使用外部action。这个action专门用来安装Qt - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v3 with: # Version of Qt to install version: ${{ matrix.qt_ver }} @@ -46,6 +41,7 @@ jobs: # target: ${{ matrix.qt_target }} arch: ${{ matrix.qt_arch }} cached: 'false' + modules: 'all' aqtversion: '==2.0.5' # 拉取代码 - uses: actions/checkout@v2 diff --git a/example/App.qml b/example/App.qml index 342e06b..3dd8813 100644 --- a/example/App.qml +++ b/example/App.qml @@ -1,9 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtGraphicalEffects 1.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Window +import QtQuick.Controls +import QtQuick.Layouts +import FluentUI Window { id:app diff --git a/example/T_Awesome.qml b/example/T_Awesome.qml index ae7cafa..8df9007 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 352adc9..864b95e 100644 --- a/example/T_Badge.qml +++ b/example/T_Badge.qml @@ -1,9 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import QtGraphicalEffects 1.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 b9b29f5..782abea 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 b268aad..9eac1b7 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 906be63..1d2d9ea 100644 --- a/example/T_Carousel.qml +++ b/example/T_Carousel.qml @@ -1,9 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import QtGraphicalEffects 1.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ diff --git a/example/T_CheckBox.qml b/example/T_CheckBox.qml index 7a45fd3..417d232 100644 --- a/example/T_CheckBox.qml +++ b/example/T_CheckBox.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 4f49b3a..29bcd87 100644 --- a/example/T_ColorPicker.qml +++ b/example/T_ColorPicker.qml @@ -1,9 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtGraphicalEffects 1.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 b8f39f9..7ba234e 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 82c8a82..d3f1f27 100644 --- a/example/T_Dialog.qml +++ b/example/T_Dialog.qml @@ -1,9 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import QtGraphicalEffects 1.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ diff --git a/example/T_Expander.qml b/example/T_Expander.qml index 87fbb68..fd12310 100644 --- a/example/T_Expander.qml +++ b/example/T_Expander.qml @@ -1,9 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtGraphicalEffects 1.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window +import FluentUI FluScrollablePage{ diff --git a/example/T_Home.qml b/example/T_Home.qml index 3171bf3..58bfe30 100644 --- a/example/T_Home.qml +++ b/example/T_Home.qml @@ -1,9 +1,9 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls import "qrc:///global/" -import FluentUI 1.0 +import FluentUI FluScrollablePage{ diff --git a/example/T_InfoBar.qml b/example/T_InfoBar.qml index 9e89aa5..0645305 100644 --- a/example/T_InfoBar.qml +++ b/example/T_InfoBar.qml @@ -1,9 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import QtGraphicalEffects 1.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ diff --git a/example/T_MediaPlayer.qml b/example/T_MediaPlayer.qml index e519f0a..e3c480d 100644 --- a/example/T_MediaPlayer.qml +++ b/example/T_MediaPlayer.qml @@ -1,9 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtGraphicalEffects 1.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window +import FluentUI FluScrollablePage{ diff --git a/example/T_Menu.qml b/example/T_Menu.qml index 33f1050..cb19734 100644 --- a/example/T_Menu.qml +++ b/example/T_Menu.qml @@ -1,9 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import QtGraphicalEffects 1.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 054a5a5..af6219e 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 e8de5a5..506b95f 100644 --- a/example/T_Progress.qml +++ b/example/T_Progress.qml @@ -1,9 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import QtGraphicalEffects 1.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI FluScrollablePage{ diff --git a/example/T_Rectangle.qml b/example/T_Rectangle.qml index 63d120c..eebab12 100644 --- a/example/T_Rectangle.qml +++ b/example/T_Rectangle.qml @@ -1,9 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 -import QtQuick.Window 2.15 -import QtGraphicalEffects 1.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import QtQuick.Window +import FluentUI FluScrollablePage{ diff --git a/example/T_Slider.qml b/example/T_Slider.qml index fcad4ea..fa56cdf 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_TabView.qml b/example/T_TabView.qml index cdceb48..6779734 100644 --- a/example/T_TabView.qml +++ b/example/T_TabView.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_TextBox.qml b/example/T_TextBox.qml index ee475e2..278d672 100644 --- a/example/T_TextBox.qml +++ b/example/T_TextBox.qml @@ -1,9 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtGraphicalEffects 1.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 dac1b22..a450677 100644 --- a/example/T_Theme.qml +++ b/example/T_Theme.qml @@ -1,9 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import QtGraphicalEffects 1.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 34e0f6a..71c1b0c 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 85158c0..3a73ef4 100644 --- a/example/T_ToggleSwitch.qml +++ b/example/T_ToggleSwitch.qml @@ -1,9 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import QtGraphicalEffects 1.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 72f7e0c..b28212c 100644 --- a/example/T_Tooltip.qml +++ b/example/T_Tooltip.qml @@ -1,9 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtGraphicalEffects 1.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 59c1344..a5a3518 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 89c029b..478ede1 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 73d8ab6..007595f 100644 --- a/example/example.pro +++ b/example/example.pro @@ -1,4 +1,4 @@ -QT += quick concurrent network multimedia +QT += quick quickcontrols2 concurrent network multimedia CONFIG += c++11 DEFINES += QT_DEPRECATED_WARNINGS QT_NO_WARNING_OUTPUT diff --git a/example/global/ItemsFooter.qml b/example/global/ItemsFooter.qml index 5d8ed3f..363a9a9 100644 --- a/example/global/ItemsFooter.qml +++ b/example/global/ItemsFooter.qml @@ -1,7 +1,7 @@ pragma Singleton -import QtQuick 2.15 -import FluentUI 1.0 +import QtQuick +import FluentUI FluObject{ id:footer_items diff --git a/example/global/ItemsOriginal.qml b/example/global/ItemsOriginal.qml index 035acfd..c3d4261 100644 --- a/example/global/ItemsOriginal.qml +++ b/example/global/ItemsOriginal.qml @@ -1,7 +1,7 @@ pragma Singleton -import QtQuick 2.15 -import FluentUI 1.0 +import QtQuick +import FluentUI FluObject{ diff --git a/example/main.cpp b/example/main.cpp index d020b00..9ff1750 100644 --- a/example/main.cpp +++ b/example/main.cpp @@ -3,12 +3,13 @@ #include #include #include +#include #include #include "ChatController.h" QMap properties(){ QMap map; -// map["installHelper"] = QVariant::fromValue(QVariant::fromValue(InstallHelper::getInstance())); + // map["installHelper"] = QVariant::fromValue(QVariant::fromValue(InstallHelper::getInstance())); return map; } @@ -17,8 +18,8 @@ int main(int argc, char *argv[]) QCoreApplication::setOrganizationName("ZhuZiChu"); QCoreApplication::setOrganizationDomain("https://zhuzichu520.github.io"); QCoreApplication::setApplicationName("FluentUI"); - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -// QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Software); + // QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Software); + QQuickStyle::setStyle("Basic"); QGuiApplication app(argc, argv); QQmlApplicationEngine engine; diff --git a/example/page/AboutPage.qml b/example/page/AboutPage.qml index 85d0c87..9af092c 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 { @@ -17,6 +17,7 @@ FluWindow { FluAppBar{ id:appbar title:"关于" + width:parent.width } ColumnLayout{ diff --git a/example/page/ChatPage.qml b/example/page/ChatPage.qml index 40e863a..58797e3 100644 --- a/example/page/ChatPage.qml +++ b/example/page/ChatPage.qml @@ -1,9 +1,9 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 -import Controller 1.0 -import QtQuick.Dialogs 1.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import FluentUI +import Controller +import QtQuick.Dialogs FluWindow { @@ -43,6 +43,7 @@ FluWindow { FluAppBar{ id:appbar title:"ChatGPT" + width:parent.width } Component{ diff --git a/example/page/LoginPage.qml b/example/page/LoginPage.qml index 03d7b78..6a44683 100644 --- a/example/page/LoginPage.qml +++ b/example/page/LoginPage.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Layouts +import FluentUI FluWindow { @@ -24,6 +24,7 @@ FluWindow { FluAppBar{ id:appbar title:"登录" + width:parent.width } ColumnLayout{ diff --git a/example/page/MainPage.qml b/example/page/MainPage.qml index 05caf91..ac8a867 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 "qrc:///global/" -import FluentUI 1.0 +import FluentUI FluWindow { id:rootwindow @@ -17,6 +17,7 @@ FluWindow { id:appbar z:10 showDark: true + width:parent.width } diff --git a/src/colorpicker/ColorPicker.qml b/src/colorpicker/ColorPicker.qml index b86308e..96dc336 100644 --- a/src/colorpicker/ColorPicker.qml +++ b/src/colorpicker/ColorPicker.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls import "content" Rectangle { diff --git a/src/colorpicker/content/Checkerboard.qml b/src/colorpicker/content/Checkerboard.qml index 81f713a..1062734 100644 --- a/src/colorpicker/content/Checkerboard.qml +++ b/src/colorpicker/content/Checkerboard.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick Grid { id: root property int cellSide: 5 diff --git a/src/colorpicker/content/ColorSlider.qml b/src/colorpicker/content/ColorSlider.qml index c7262f1..de43acd 100644 --- a/src/colorpicker/content/ColorSlider.qml +++ b/src/colorpicker/content/ColorSlider.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick Item { property int cursorHeight: 7 diff --git a/src/colorpicker/content/NumberBox.qml b/src/colorpicker/content/NumberBox.qml index fc2205b..82fc780 100644 --- a/src/colorpicker/content/NumberBox.qml +++ b/src/colorpicker/content/NumberBox.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick Row { property alias caption: captionBox.text diff --git a/src/colorpicker/content/PanelBorder.qml b/src/colorpicker/content/PanelBorder.qml index 69dc4c5..0031615 100644 --- a/src/colorpicker/content/PanelBorder.qml +++ b/src/colorpicker/content/PanelBorder.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick Rectangle { width : 40; height : 15; radius: 2 diff --git a/src/colorpicker/content/SBPicker.qml b/src/colorpicker/content/SBPicker.qml index c0b3fb5..86a24ce 100644 --- a/src/colorpicker/content/SBPicker.qml +++ b/src/colorpicker/content/SBPicker.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick Item { id: root @@ -51,20 +51,12 @@ Item { preventStealing: true function handleMouse(mouse) { if (mouse.buttons & Qt.LeftButton) { - pickerCursor.x = Math.max(0,Math.min(mouse.x - r,width-2*r)); pickerCursor.y = Math.max(0,Math.min(mouse.y - r,height-2*r)); - - -// pickerCursor.x = Math.max(-r,Math.min(mouse.x - r,width+r)); -// pickerCursor.y = Math.max(-r,Math.min(mouse.y - r,height+r)); - -// pickerCursor.x = Math.max(0, Math.min(width, mouse.x) - 2 * r); -// pickerCursor.y = Math.max(0, Math.min(height, mouse.y) - 2 * r); } } - onPositionChanged: handleMouse(mouse) - onPressed: handleMouse(mouse) + onPositionChanged:(mouse)=> handleMouse(mouse) + onPressed:(mouse)=> handleMouse(mouse) } } diff --git a/src/controls/FluAppBar.qml b/src/controls/FluAppBar.qml index 0439ee2..62861f5 100644 --- a/src/controls/FluAppBar.qml +++ b/src/controls/FluAppBar.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Window 2.15 -import QtQuick.Layouts 1.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Window +import QtQuick.Layouts +import FluentUI Rectangle{ @@ -23,11 +23,7 @@ Rectangle{ color: Qt.rgba(0,0,0,0) visible: FluTheme.frameless height: visible ? 30 : 0 - width: { - if(parent==null) - return 200 - return parent.width - } + clip: true z: 65535 TapHandler { diff --git a/src/controls/FluArea.qml b/src/controls/FluArea.qml index 9e878a8..653f229 100644 --- a/src/controls/FluArea.qml +++ b/src/controls/FluArea.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import FluentUI 1.0 +import QtQuick +import FluentUI Rectangle { diff --git a/src/controls/FluAutoSuggestBox.qml b/src/controls/FluAutoSuggestBox.qml index 010781b..d94b9d2 100644 --- a/src/controls/FluAutoSuggestBox.qml +++ b/src/controls/FluAutoSuggestBox.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 TextField{ diff --git a/src/controls/FluBadge.qml b/src/controls/FluBadge.qml index cfc47b1..e37a8c6 100644 --- a/src/controls/FluBadge.qml +++ b/src/controls/FluBadge.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick Rectangle{ diff --git a/src/controls/FluButton.qml b/src/controls/FluButton.qml index 676bde9..2b4c197 100644 --- a/src/controls/FluButton.qml +++ b/src/controls/FluButton.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 { diff --git a/src/controls/FluCalendarPicker.qml b/src/controls/FluCalendarPicker.qml index c06a409..d1b1d19 100644 --- a/src/controls/FluCalendarPicker.qml +++ b/src/controls/FluCalendarPicker.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 Rectangle { @@ -59,7 +59,7 @@ Rectangle { } - Popup{ + Menu{ id:popup height: container.height width: container.width @@ -79,18 +79,21 @@ Rectangle { duration: 150 } } - background: FluCalendarView{ - id:container - onDateClicked: - (date)=>{ - popup.close() - var year = date.getFullYear() - var month = date.getMonth() - var day = date.getDate() - text_date.text = year+"-"+(month+1)+"-"+day - } + contentItem: Item{ + anchors.fill: parent + FluCalendarView{ + id:container + onDateClicked: + (date)=>{ + popup.close() + var year = date.getFullYear() + var month = date.getMonth() + var day = date.getDate() + text_date.text = year+"-"+(month+1)+"-"+day + } + } } - contentItem: Item{} + background: Item{} function showPopup() { var pos = root.mapToItem(null, 0, 0) if(window.height>pos.y+root.height+popup.height){ diff --git a/src/controls/FluCalendarView.qml b/src/controls/FluCalendarView.qml index bd8b72f..dbff7d9 100644 --- a/src/controls/FluCalendarView.qml +++ b/src/controls/FluCalendarView.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 Item { diff --git a/src/controls/FluCarousel.qml b/src/controls/FluCarousel.qml index b691f56..e60cd11 100644 --- a/src/controls/FluCarousel.qml +++ b/src/controls/FluCarousel.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 Item { diff --git a/src/controls/FluCheckBox.qml b/src/controls/FluCheckBox.qml index f8f6a35..e98fb45 100644 --- a/src/controls/FluCheckBox.qml +++ b/src/controls/FluCheckBox.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 Button { diff --git a/src/controls/FluColorPicker.qml b/src/controls/FluColorPicker.qml index 78f8c13..4c81d18 100644 --- a/src/controls/FluColorPicker.qml +++ b/src/controls/FluColorPicker.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 Button{ @@ -27,15 +27,19 @@ Button{ onClicked: { popup.showPopup() } - Popup{ + Menu{ id:popup modal: true dim:false height: container.height width: container.width - background: FluColorView{ - id:container + contentItem: Item{ + anchors.fill: parent + FluColorView{ + id:container + } } + background:Item{} enter: Transition { NumberAnimation { property: "y" @@ -50,7 +54,6 @@ Button{ duration: 150 } } - contentItem: Item{} function showPopup() { var pos = control.mapToItem(null, 0, 0) if(window.height>pos.y+control.height+popup.height){ diff --git a/src/controls/FluColorView.qml b/src/controls/FluColorView.qml index 00b69e4..2bf8bf0 100644 --- a/src/controls/FluColorView.qml +++ b/src/controls/FluColorView.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick import "../colorpicker" Item { diff --git a/src/controls/FluComboBox.qml b/src/controls/FluComboBox.qml index 17454a4..3dd03fb 100644 --- a/src/controls/FluComboBox.qml +++ b/src/controls/FluComboBox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import FluentUI 1.0 +import QtQuick +import FluentUI Item { diff --git a/src/controls/FluContentDialog.qml b/src/controls/FluContentDialog.qml index 9613e23..778a618 100644 --- a/src/controls/FluContentDialog.qml +++ b/src/controls/FluContentDialog.qml @@ -1,7 +1,7 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 -import QtQuick.Window 2.15 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import QtQuick.Window Popup { id: popup @@ -17,11 +17,11 @@ Popup { return 400 return Math.min(Window.window.width,400) } - modal:true anchors.centerIn: Overlay.overlay closePolicy: Popup.CloseOnEscape - background: Rectangle { + background:Item{} + contentItem: Rectangle { id:layout_content implicitWidth:minWidth implicitHeight: text_title.height + text_message.height + layout_actions.height diff --git a/src/controls/FluContentPage.qml b/src/controls/FluContentPage.qml index de918d3..691c037 100644 --- a/src/controls/FluContentPage.qml +++ b/src/controls/FluContentPage.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 Item { diff --git a/src/controls/FluDatePicker.qml b/src/controls/FluDatePicker.qml index 9d5273d..0376666 100644 --- a/src/controls/FluDatePicker.qml +++ b/src/controls/FluDatePicker.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 Rectangle { @@ -97,12 +97,11 @@ Rectangle { text:"日" } - Popup{ + Menu{ id:popup - width: container.width - height: container.height - contentItem: Item{} modal: true + width: 300 + height: 340 dim:false enter: Transition { NumberAnimation { @@ -118,12 +117,12 @@ Rectangle { duration: 150 } } - background: Rectangle{ + background:Item{} + contentItem: Rectangle{ id:container - width: 300 radius: 4 + anchors.fill: parent color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1) - height: 340 MouseArea{ anchors.fill: parent } @@ -337,9 +336,7 @@ Rectangle { popup.close() } } - } - } y:35 function showPopup() { diff --git a/src/controls/FluDivider.qml b/src/controls/FluDivider.qml index 8abba71..429505b 100644 --- a/src/controls/FluDivider.qml +++ b/src/controls/FluDivider.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import FluentUI 1.0 +import QtQuick +import FluentUI Rectangle { diff --git a/src/controls/FluDropDownButton.qml b/src/controls/FluDropDownButton.qml index 094eb35..89ac80d 100644 --- a/src/controls/FluDropDownButton.qml +++ b/src/controls/FluDropDownButton.qml @@ -1,7 +1,7 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Window 2.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Window +import FluentUI Button { diff --git a/src/controls/FluExpander.qml b/src/controls/FluExpander.qml index 89b84a7..bcce701 100644 --- a/src/controls/FluExpander.qml +++ b/src/controls/FluExpander.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 Item { diff --git a/src/controls/FluFilledButton.qml b/src/controls/FluFilledButton.qml index 95d2620..1e06cef 100644 --- a/src/controls/FluFilledButton.qml +++ b/src/controls/FluFilledButton.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 { diff --git a/src/controls/FluFocusRectangle.qml b/src/controls/FluFocusRectangle.qml index b10fee4..c59ab9a 100644 --- a/src/controls/FluFocusRectangle.qml +++ b/src/controls/FluFocusRectangle.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import FluentUI 1.0 +import QtQuick +import FluentUI Item { diff --git a/src/controls/FluIcon.qml b/src/controls/FluIcon.qml index 320d739..110c075 100644 --- a/src/controls/FluIcon.qml +++ b/src/controls/FluIcon.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick Text { diff --git a/src/controls/FluIconButton.qml b/src/controls/FluIconButton.qml index 36eb39a..aa02405 100644 --- a/src/controls/FluIconButton.qml +++ b/src/controls/FluIconButton.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 { diff --git a/src/controls/FluInfoBar.qml b/src/controls/FluInfoBar.qml index 8eff87d..e1020cf 100644 --- a/src/controls/FluInfoBar.qml +++ b/src/controls/FluInfoBar.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import FluentUI 1.0 +import QtQuick +import FluentUI FluObject { id:infoBar @@ -208,23 +208,23 @@ FluObject { } } - function showSuccess(text,duration,moremsg){ + function showSuccess(text,duration=1000,moremsg){ mcontrol.create(mcontrol.const_success,text,duration,moremsg ? moremsg : ""); } - function showInfo(text,duration,moremsg){ + function showInfo(text,duration=1000,moremsg){ mcontrol.create(mcontrol.const_info,text,duration,moremsg ? moremsg : ""); } - function showWarning(text,duration,moremsg){ + function showWarning(text,duration=1000,moremsg){ mcontrol.create(mcontrol.const_warning,text,duration,moremsg ? moremsg : ""); } - function showError(text,duration,moremsg){ + function showError(text,duration=1000,moremsg){ mcontrol.create(mcontrol.const_error,text,duration,moremsg ? moremsg : ""); } - function showCustom(itemcomponent,duration){ + function showCustom(itemcomponent,duration=1000){ mcontrol.createCustom(itemcomponent,duration); } diff --git a/src/controls/FluItem.qml b/src/controls/FluItem.qml index 872866f..45e30bc 100644 --- a/src/controls/FluItem.qml +++ b/src/controls/FluItem.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtGraphicalEffects 1.15 +import QtQuick +import QtQuick.Controls +import Qt5Compat.GraphicalEffects Item{ id:control diff --git a/src/controls/FluMediaPlayer.qml b/src/controls/FluMediaPlayer.qml index 9eced0a..763a937 100644 --- a/src/controls/FluMediaPlayer.qml +++ b/src/controls/FluMediaPlayer.qml @@ -1,7 +1,7 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtMultimedia 5.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import QtMultimedia +import FluentUI Rectangle { @@ -26,22 +26,26 @@ Rectangle { MediaPlayer { id: mediaplayer property bool autoSeek:true - autoPlay: true source: control.source - onError: { - console.debug(error) - } + videoOutput: video_output + audioOutput: AudioOutput{} + onErrorChanged:(error)=> { + console.debug(error) + } onPositionChanged: { if(autoSeek){ slider.seek(mediaplayer.position*slider.maxValue/mediaplayer.duration) } } - onStatusChanged: { - if(status===6){ - slider.maxValue = mediaplayer.duration - showControl = true + onMediaStatusChanged: + (status)=> { + if(status===2){ + mediaplayer.play() + }else if(status===5){ + slider.maxValue = mediaplayer.duration + showControl = true + } } - } } onSourceChanged: { @@ -49,8 +53,8 @@ Rectangle { } VideoOutput { + id:video_output anchors.fill: parent - source: mediaplayer } Item{ @@ -143,9 +147,9 @@ Rectangle { } FluIconButton{ iconSize: 15 - iconSource: mediaplayer.playbackState === Audio.PlayingState ? FluentIcons.Pause : FluentIcons.Play + iconSource: mediaplayer.playbackState === MediaPlayer.PlayingState ? FluentIcons.Pause : FluentIcons.Play onClicked: { - if(mediaplayer.playbackState === Audio.PlayingState){ + if(mediaplayer.playbackState === MediaPlayer.PlayingState){ mediaplayer.pause() }else{ mediaplayer.play() diff --git a/src/controls/FluMenu.qml b/src/controls/FluMenu.qml index 2854f8b..f8b0e32 100644 --- a/src/controls/FluMenu.qml +++ b/src/controls/FluMenu.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls Menu { @@ -9,10 +9,8 @@ Menu { id: popup width: 140 height: container.height - modal: true + modal:true dim:false - contentItem: Item{} - enter: Transition { NumberAnimation { property: "y" @@ -27,8 +25,8 @@ Menu { duration: animEnabled ? 150 : 0 } } - - background: Item { + background:Item{} + contentItem: Item { Rectangle{ anchors.fill: parent color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,0.97) : Qt.rgba(237/255,237/255,237/255,0.97) diff --git a/src/controls/FluMenuItem.qml b/src/controls/FluMenuItem.qml index 17ddf6e..3358857 100644 --- a/src/controls/FluMenuItem.qml +++ b/src/controls/FluMenuItem.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls Item { diff --git a/src/controls/FluMultiLineTextBox.qml b/src/controls/FluMultiLineTextBox.qml index ea3b5b7..9db0226 100644 --- a/src/controls/FluMultiLineTextBox.qml +++ b/src/controls/FluMultiLineTextBox.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 TextArea{ diff --git a/src/controls/FluNavigationView.qml b/src/controls/FluNavigationView.qml index 8ba225c..1ab93f8 100644 --- a/src/controls/FluNavigationView.qml +++ b/src/controls/FluNavigationView.qml @@ -1,8 +1,8 @@ -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 FluentUI Item { diff --git a/src/controls/FluObject.qml b/src/controls/FluObject.qml index 4889470..b78c19b 100644 --- a/src/controls/FluObject.qml +++ b/src/controls/FluObject.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick QtObject { id:flu_object; diff --git a/src/controls/FluPaneItem.qml b/src/controls/FluPaneItem.qml index c26816e..fec0982 100644 --- a/src/controls/FluPaneItem.qml +++ b/src/controls/FluPaneItem.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import FluentUI 1.0 +import QtQuick +import FluentUI QtObject { readonly property string key : FluApp.uuid() diff --git a/src/controls/FluPaneItemHeader.qml b/src/controls/FluPaneItemHeader.qml index c9bf979..64fb158 100644 --- a/src/controls/FluPaneItemHeader.qml +++ b/src/controls/FluPaneItemHeader.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick QtObject { readonly property string key : FluApp.uuid() diff --git a/src/controls/FluPaneItemSeparator.qml b/src/controls/FluPaneItemSeparator.qml index f392535..1dca329 100644 --- a/src/controls/FluPaneItemSeparator.qml +++ b/src/controls/FluPaneItemSeparator.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick QtObject { readonly property string key : FluApp.uuid() diff --git a/src/controls/FluProgressBar.qml b/src/controls/FluProgressBar.qml index 00723cb..dffda48 100644 --- a/src/controls/FluProgressBar.qml +++ b/src/controls/FluProgressBar.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls FluRectangle { diff --git a/src/controls/FluProgressRing.qml b/src/controls/FluProgressRing.qml index c63bc15..f1d3c80 100644 --- a/src/controls/FluProgressRing.qml +++ b/src/controls/FluProgressRing.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Rectangle { diff --git a/src/controls/FluRadioButton.qml b/src/controls/FluRadioButton.qml index b1a561b..f17334a 100644 --- a/src/controls/FluRadioButton.qml +++ b/src/controls/FluRadioButton.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 Button { diff --git a/src/controls/FluRectangle.qml b/src/controls/FluRectangle.qml index 38bab89..2293b33 100644 --- a/src/controls/FluRectangle.qml +++ b/src/controls/FluRectangle.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtGraphicalEffects 1.15 +import QtQuick +import QtQuick.Controls +import Qt5Compat.GraphicalEffects Item{ id:control diff --git a/src/controls/FluScrollBar.qml b/src/controls/FluScrollBar.qml index 23b85f3..176710d 100644 --- a/src/controls/FluScrollBar.qml +++ b/src/controls/FluScrollBar.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls import QtQuick.Controls.impl 2.15 import QtQuick.Templates 2.15 as T -import FluentUI 1.0 +import FluentUI T.ScrollBar { id: control diff --git a/src/controls/FluScrollablePage.qml b/src/controls/FluScrollablePage.qml index 125257f..f4c3fa2 100644 --- a/src/controls/FluScrollablePage.qml +++ b/src/controls/FluScrollablePage.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 Item { diff --git a/src/controls/FluShadow.qml b/src/controls/FluShadow.qml index fd7d56e..9e89023 100644 --- a/src/controls/FluShadow.qml +++ b/src/controls/FluShadow.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick Item { diff --git a/src/controls/FluSlider.qml b/src/controls/FluSlider.qml index c8cb006..9631f1f 100644 --- a/src/controls/FluSlider.qml +++ b/src/controls/FluSlider.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtGraphicalEffects 1.15 +import QtQuick +import QtQuick.Controls +import Qt5Compat.GraphicalEffects Item{ diff --git a/src/controls/FluTabView.qml b/src/controls/FluTabView.qml index 2e15cc7..043d3c3 100644 --- a/src/controls/FluTabView.qml +++ b/src/controls/FluTabView.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 Item { diff --git a/src/controls/FluText.qml b/src/controls/FluText.qml index 42ba3f4..577a087 100644 --- a/src/controls/FluText.qml +++ b/src/controls/FluText.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import FluentUI 1.0 +import QtQuick +import FluentUI Text { diff --git a/src/controls/FluTextBox.qml b/src/controls/FluTextBox.qml index f84715a..5cd395f 100644 --- a/src/controls/FluTextBox.qml +++ b/src/controls/FluTextBox.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 TextField{ diff --git a/src/controls/FluTextBoxBackground.qml b/src/controls/FluTextBoxBackground.qml index 449d05b..cddeef9 100644 --- a/src/controls/FluTextBoxBackground.qml +++ b/src/controls/FluTextBoxBackground.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtGraphicalEffects 1.15 +import QtQuick +import Qt5Compat.GraphicalEffects Rectangle{ id:content diff --git a/src/controls/FluTextButton.qml b/src/controls/FluTextButton.qml index de794d3..4b91140 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 { diff --git a/src/controls/FluTimePicker.qml b/src/controls/FluTimePicker.qml index 76fbc0a..54f55b6 100644 --- a/src/controls/FluTimePicker.qml +++ b/src/controls/FluTimePicker.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 Rectangle { @@ -101,9 +101,8 @@ Rectangle { Popup{ id:popup - width: container.width - height: container.height - contentItem: Item{} + width: 300 + height: 340 modal: true dim:false enter: Transition { @@ -120,12 +119,12 @@ Rectangle { duration: 150 } } - background: Rectangle{ + background:Item{} + contentItem: Rectangle{ id:container - width: 300 + anchors.fill: parent radius: 4 color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1) - height: 340 MouseArea{ anchors.fill: parent } diff --git a/src/controls/FluToggleSwitch.qml b/src/controls/FluToggleSwitch.qml index 2f19c50..5704293 100644 --- a/src/controls/FluToggleSwitch.qml +++ b/src/controls/FluToggleSwitch.qml @@ -1,7 +1,7 @@ import QtQuick 2.0 import QtQuick.Controls 2.0 -import FluentUI 1.0 -import QtQuick.Layouts 1.15 +import FluentUI +import QtQuick.Layouts Button { diff --git a/src/controls/FluTooltip.qml b/src/controls/FluTooltip.qml index 5f2b740..f10b3e0 100644 --- a/src/controls/FluTooltip.qml +++ b/src/controls/FluTooltip.qml @@ -1,7 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtGraphicalEffects 1.15 -import FluentUI 1.0 +import QtQuick +import QtQuick.Controls +import FluentUI ToolTip { id:tool_tip diff --git a/src/controls/FluTreeView.qml b/src/controls/FluTreeView.qml index 32a1eef..ded9f6e 100644 --- a/src/controls/FluTreeView.qml +++ b/src/controls/FluTreeView.qml @@ -1,9 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Window 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 -import FluentUI 1.0 -import QtGraphicalEffects 1.15 +import QtQuick +import QtQuick.Window +import QtQuick.Layouts +import QtQuick.Controls +import FluentUI Item { diff --git a/src/controls/FluWindow.qml b/src/controls/FluWindow.qml index 31b2282..32f0633 100644 --- a/src/controls/FluWindow.qml +++ b/src/controls/FluWindow.qml @@ -1,8 +1,7 @@ -import QtQuick 2.15 -import QtQuick.Window 2.15 -import QtQuick.Layouts 1.15 -import FluentUI 1.0 -import QtGraphicalEffects 1.15 +import QtQuick +import QtQuick.Window +import QtQuick.Layouts +import FluentUI Item { diff --git a/src/controls/FluWindowResize.qml b/src/controls/FluWindowResize.qml index 37b3319..ab43562 100644 --- a/src/controls/FluWindowResize.qml +++ b/src/controls/FluWindowResize.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Window 2.15 +import QtQuick +import QtQuick.Window MouseArea { diff --git a/src/controls/TFpsMonitor.qml b/src/controls/TFpsMonitor.qml index 671d96e..4bc939c 100644 --- a/src/controls/TFpsMonitor.qml +++ b/src/controls/TFpsMonitor.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import FluentUI 1.0 +import QtQuick +import FluentUI Item {