update

.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

.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

.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: 6.4.3          
-          - qt_ver: 5.15.2
-            qt_arch: win32_msvc2019
-            msvc_arch: x86
-            qt_arch_install: msvc2019
-          - qt_ver: 5.15.2          
             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

example/App.qml

@@ -1,9 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtGraphicalEffects 1.15
+import FluentUI
-import FluentUI 1.0
 
 Window {
     id:app

example/T_Awesome.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import FluentUI 1.0
+import FluentUI
 
 FluContentPage {
 

example/T_Badge.qml

@@ -1,9 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtGraphicalEffects 1.15
+import FluentUI
-import FluentUI 1.0
 
 FluScrollablePage{
 

example/T_Buttons.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import FluentUI 1.0
+import FluentUI
 
 FluScrollablePage{
     title:"Buttons"

example/T_CalendarPicker.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import FluentUI 1.0
+import FluentUI
 
 FluScrollablePage{
 

example/T_Carousel.qml

@@ -1,9 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtGraphicalEffects 1.15
+import FluentUI
-import FluentUI 1.0
 
 FluScrollablePage{
 

example/T_CheckBox.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import FluentUI 1.0
+import FluentUI
 
 FluScrollablePage{
 

example/T_ColorPicker.qml

@@ -1,9 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtGraphicalEffects 1.15
+import FluentUI
-import FluentUI 1.0
 
 FluScrollablePage{
 

example/T_DatePicker.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import FluentUI 1.0
+import FluentUI
 
 FluScrollablePage{
 

example/T_Dialog.qml

@@ -1,9 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtGraphicalEffects 1.15
+import FluentUI
-import FluentUI 1.0
 
 FluScrollablePage{
 

example/T_Expander.qml

@@ -1,9 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtGraphicalEffects 1.15
+import FluentUI
-import FluentUI 1.0
 
 FluScrollablePage{
 

example/T_Home.qml

@@ -1,9 +1,9 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Controls 2.15
+import QtQuick.Controls
 import "qrc:///global/"
-import FluentUI 1.0
+import FluentUI
 
 FluScrollablePage{
 

example/T_InfoBar.qml

@@ -1,9 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtGraphicalEffects 1.15
+import FluentUI
-import FluentUI 1.0
 
 FluScrollablePage{
 

example/T_MediaPlayer.qml

@@ -1,9 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtGraphicalEffects 1.15
+import FluentUI
-import FluentUI 1.0
 
 FluScrollablePage{
 

example/T_Menu.qml

@@ -1,9 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtGraphicalEffects 1.15
+import FluentUI
-import FluentUI 1.0
 
 FluScrollablePage{
 

example/T_MultiWindow.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import FluentUI 1.0
+import FluentUI
 
 FluScrollablePage{
 

example/T_Progress.qml

@@ -1,9 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtGraphicalEffects 1.15
+import FluentUI
-import FluentUI 1.0
 
 FluScrollablePage{
 

example/T_Rectangle.qml

@@ -1,9 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtGraphicalEffects 1.15
+import FluentUI
-import FluentUI 1.0
 
 FluScrollablePage{
 

example/T_Slider.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import FluentUI 1.0
+import FluentUI
 
 FluScrollablePage{
 

example/T_TabView.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import FluentUI 1.0
+import FluentUI
 
 FluScrollablePage{
 

example/T_TextBox.qml

@@ -1,9 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtGraphicalEffects 1.15
+import FluentUI
-import FluentUI 1.0
 
 FluScrollablePage{
 

example/T_Theme.qml

@@ -1,9 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtGraphicalEffects 1.15
+import FluentUI
-import FluentUI 1.0
 
 FluScrollablePage{
 

example/T_TimePicker.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import FluentUI 1.0
+import FluentUI
 
 FluScrollablePage{
 

example/T_ToggleSwitch.qml

@@ -1,9 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtGraphicalEffects 1.15
+import FluentUI
-import FluentUI 1.0
 
 FluScrollablePage{
 

example/T_Tooltip.qml

@@ -1,9 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtGraphicalEffects 1.15
+import FluentUI
-import FluentUI 1.0
 
 FluScrollablePage{
 

example/T_TreeView.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import FluentUI 1.0
+import FluentUI
 
 FluContentPage {
 

example/T_Typography.qml

@@ -1,7 +1,7 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import FluentUI 1.0
+import FluentUI
 
 FluContentPage {
 

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
 

example/global/ItemsFooter.qml

@@ -1,7 +1,7 @@
 pragma Singleton
 
-import QtQuick 2.15
+import QtQuick
-import FluentUI 1.0
+import FluentUI
 
 FluObject{
     id:footer_items

example/global/ItemsOriginal.qml

@@ -1,7 +1,7 @@
 pragma Singleton
 
-import QtQuick 2.15
+import QtQuick
-import FluentUI 1.0
+import FluentUI
 
 
 FluObject{

example/main.cpp

@@ -3,12 +3,13 @@
 #include <QQmlContext>
 #include <QDir>
 #include <QQuickWindow>
+#include <QQuickStyle>
 #include <QProcess>
 #include "ChatController.h"
 
 QMap<QString, QVariant> properties(){
     QMap<QString, QVariant> 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;
 

example/page/AboutPage.qml

@@ -1,7 +1,7 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import FluentUI 1.0
+import FluentUI
 
 FluWindow {
 
@@ -17,6 +17,7 @@ FluWindow {
     FluAppBar{
         id:appbar
         title:"关于"
+        width:parent.width
     }
 
     ColumnLayout{

example/page/ChatPage.qml

@@ -1,9 +1,9 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import FluentUI 1.0
+import FluentUI
-import Controller 1.0
+import Controller
-import QtQuick.Dialogs 1.3
+import QtQuick.Dialogs
 
 FluWindow {
 
@@ -43,6 +43,7 @@ FluWindow {
     FluAppBar{
         id:appbar
         title:"ChatGPT"
+        width:parent.width
     }
 
     Component{

example/page/LoginPage.qml

@@ -1,6 +1,6 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import FluentUI 1.0
+import FluentUI
 
 FluWindow {
 
@@ -24,6 +24,7 @@ FluWindow {
     FluAppBar{
         id:appbar
         title:"登录"
+        width:parent.width
     }
 
     ColumnLayout{

example/page/MainPage.qml

@@ -1,9 +1,9 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+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
     }
 
 

src/colorpicker/ColorPicker.qml

@@ -1,6 +1,6 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Controls 2.15
+import QtQuick.Controls
 import "content"
 
 Rectangle {

src/colorpicker/content/Checkerboard.qml

@@ -1,4 +1,4 @@
-import QtQuick 2.15
+import QtQuick
 Grid {
     id: root
     property int cellSide: 5

src/colorpicker/content/ColorSlider.qml

@@ -1,4 +1,4 @@
-import QtQuick 2.15
+import QtQuick
 
 Item {
     property int cursorHeight: 7

src/colorpicker/content/NumberBox.qml

@@ -1,4 +1,4 @@
-import QtQuick 2.15
+import QtQuick
 
 Row {
     property alias  caption: captionBox.text

src/colorpicker/content/PanelBorder.qml

@@ -1,4 +1,4 @@
-import QtQuick 2.15
+import QtQuick
 
 Rectangle {
     width : 40; height : 15; radius: 2

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)
+        onPositionChanged:(mouse)=> handleMouse(mouse)
-        onPressed: handleMouse(mouse)
+        onPressed:(mouse)=> handleMouse(mouse)
     }
 }
 

src/controls/FluAppBar.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import FluentUI 1.0
+import FluentUI
 
 Rectangle{
 
@@ -23,11 +23,7 @@ Rectangle{
     color: Qt.rgba(0,0,0,0)
     visible: FluTheme.frameless
     height: visible ? 30 : 0
-    width: {
+    clip: true
-        if(parent==null)
-            return 200
-        return parent.width
-    }
     z: 65535
 
     TapHandler {

src/controls/FluArea.qml

@@ -1,5 +1,5 @@
-import QtQuick 2.15
+import QtQuick
-import FluentUI 1.0
+import FluentUI
 
 Rectangle {
 

src/controls/FluAutoSuggestBox.qml

@@ -1,6 +1,6 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import FluentUI 1.0
+import FluentUI
 
 TextField{
 

src/controls/FluBadge.qml

@@ -1,4 +1,4 @@
-import QtQuick 2.15
+import QtQuick
 
 Rectangle{
 

src/controls/FluButton.qml

@@ -1,6 +1,6 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import FluentUI 1.0
+import FluentUI
 
 Button {
 

src/controls/FluCalendarPicker.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import FluentUI 1.0
+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{
+        contentItem: Item{
-            id:container
+            anchors.fill: parent
-            onDateClicked:
+            FluCalendarView{
-                (date)=>{
+                id:container
-                    popup.close()
+                onDateClicked:
-                    var year = date.getFullYear()
+                    (date)=>{
-                    var month = date.getMonth()
+                        popup.close()
-                    var day =  date.getDate()
+                        var year = date.getFullYear()
-                    text_date.text = year+"-"+(month+1)+"-"+day
+                        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){

src/controls/FluCalendarView.qml

@@ -1,6 +1,6 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import FluentUI 1.0
+import FluentUI
 
 Item {
 

src/controls/FluCarousel.qml

@@ -1,6 +1,6 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import FluentUI 1.0
+import FluentUI
 
 Item {
 

src/controls/FluCheckBox.qml

@@ -1,7 +1,7 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import FluentUI 1.0
+import FluentUI
 
 Button {
 

src/controls/FluColorPicker.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import FluentUI 1.0
+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{
+        contentItem: Item{
-            id:container
+            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){

src/controls/FluColorView.qml

@@ -1,4 +1,4 @@
-import QtQuick 2.15
+import QtQuick
 import "../colorpicker"
 
 Item {

src/controls/FluComboBox.qml

@@ -1,5 +1,5 @@
-import QtQuick 2.15
+import QtQuick
-import FluentUI 1.0
+import FluentUI
 
 Item {
 

src/controls/FluContentDialog.qml

@@ -1,7 +1,7 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Window 2.15
+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

src/controls/FluContentPage.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import FluentUI 1.0
+import FluentUI
 
 Item {
 

src/controls/FluDatePicker.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import FluentUI 1.0
+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() {

src/controls/FluDivider.qml

@@ -1,5 +1,5 @@
-import QtQuick 2.15
+import QtQuick
-import FluentUI 1.0
+import FluentUI
 
 Rectangle {
 

src/controls/FluDropDownButton.qml

@@ -1,7 +1,7 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Window 2.15
+import QtQuick.Window
-import FluentUI 1.0
+import FluentUI
 
 Button {
 

src/controls/FluExpander.qml

@@ -1,6 +1,6 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import FluentUI 1.0
+import FluentUI
 
 Item {
 

src/controls/FluFilledButton.qml

@@ -1,6 +1,6 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import FluentUI 1.0
+import FluentUI
 
 Button {
 

src/controls/FluFocusRectangle.qml

@@ -1,5 +1,5 @@
-import QtQuick 2.15
+import QtQuick
-import FluentUI 1.0
+import FluentUI
 
 Item {
 

src/controls/FluIcon.qml

@@ -1,4 +1,4 @@
-import QtQuick 2.15
+import QtQuick
 
 Text {
 

src/controls/FluIconButton.qml

@@ -1,6 +1,6 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import FluentUI 1.0
+import FluentUI
 
 Button {
 

src/controls/FluInfoBar.qml

@@ -1,5 +1,5 @@
-import QtQuick 2.15
+import QtQuick
-import FluentUI 1.0
+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);
     }
 

src/controls/FluItem.qml

@@ -1,6 +1,6 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtGraphicalEffects 1.15
+import Qt5Compat.GraphicalEffects
 
 Item{
     id:control

src/controls/FluMediaPlayer.qml

@@ -1,7 +1,7 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtMultimedia 5.15
+import QtMultimedia
-import FluentUI 1.0
+import FluentUI
 
 Rectangle {
 
@@ -26,22 +26,26 @@ Rectangle {
     MediaPlayer {
         id: mediaplayer
         property bool autoSeek:true
-        autoPlay: true
         source: control.source
-        onError: {
+        videoOutput: video_output
-            console.debug(error)
+        audioOutput: AudioOutput{}
-        }
+        onErrorChanged:(error)=> {
+                           console.debug(error)
+                       }
         onPositionChanged: {
             if(autoSeek){
                 slider.seek(mediaplayer.position*slider.maxValue/mediaplayer.duration)
             }
         }
-        onStatusChanged: {
+        onMediaStatusChanged:
-            if(status===6){
+            (status)=> {
-                slider.maxValue = mediaplayer.duration
+                if(status===2){
-                showControl = true
+                    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()

src/controls/FluMenu.qml

@@ -1,6 +1,6 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Controls 2.15
+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)

src/controls/FluMenuItem.qml

@@ -1,5 +1,5 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
 
 Item {
 

src/controls/FluMultiLineTextBox.qml

@@ -1,6 +1,6 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import FluentUI 1.0
+import FluentUI
 
 TextArea{
 

src/controls/FluNavigationView.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import FluentUI 1.0
+import FluentUI
 
 Item {
 

src/controls/FluObject.qml

@@ -1,4 +1,4 @@
-import QtQuick 2.15
+import QtQuick
 
 QtObject {
     id:flu_object;

src/controls/FluPaneItem.qml

@@ -1,5 +1,5 @@
-import QtQuick 2.15
+import QtQuick
-import FluentUI 1.0
+import FluentUI
 
 QtObject {
     readonly property string key : FluApp.uuid()

src/controls/FluPaneItemHeader.qml

@@ -1,4 +1,4 @@
-import QtQuick 2.15
+import QtQuick
 
 QtObject {
     readonly property string key : FluApp.uuid()

src/controls/FluPaneItemSeparator.qml

@@ -1,4 +1,4 @@
-import QtQuick 2.15
+import QtQuick
 
 QtObject {
     readonly property string key : FluApp.uuid()

src/controls/FluProgressBar.qml

@@ -1,5 +1,5 @@
-import QtQuick 2.12
+import QtQuick
-import QtQuick.Controls 2.12
+import QtQuick.Controls
 
 FluRectangle {
 

src/controls/FluProgressRing.qml

@@ -1,5 +1,5 @@
-import QtQuick 2.12
+import QtQuick
-import QtQuick.Controls 2.12
+import QtQuick.Controls
 
 Rectangle {
 

src/controls/FluRadioButton.qml

@@ -1,7 +1,7 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import FluentUI 1.0
+import FluentUI
 
 
 Button {

src/controls/FluRectangle.qml

@@ -1,6 +1,6 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtGraphicalEffects 1.15
+import Qt5Compat.GraphicalEffects
 
 Item{
     id:control

src/controls/FluScrollBar.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+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

src/controls/FluScrollablePage.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import FluentUI 1.0
+import FluentUI
 
 Item {
 

src/controls/FluShadow.qml

@@ -1,4 +1,4 @@
-import QtQuick 2.15
+import QtQuick
 
 Item {
 

src/controls/FluSlider.qml

@@ -1,6 +1,6 @@
-import QtQuick 2.12
+import QtQuick
-import QtQuick.Controls 2.12
+import QtQuick.Controls
-import QtGraphicalEffects 1.15
+import Qt5Compat.GraphicalEffects
 
 Item{
 

src/controls/FluTabView.qml

@@ -1,7 +1,7 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import FluentUI 1.0
+import FluentUI
 
 Item {
 

src/controls/FluText.qml

@@ -1,5 +1,5 @@
-import QtQuick 2.15
+import QtQuick
-import FluentUI 1.0
+import FluentUI
 
 Text {
 

src/controls/FluTextBox.qml

@@ -1,6 +1,6 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import FluentUI 1.0
+import FluentUI
 
 TextField{
 

src/controls/FluTextBoxBackground.qml

@@ -1,5 +1,5 @@
-import QtQuick 2.15
+import QtQuick
-import QtGraphicalEffects 1.15
+import Qt5Compat.GraphicalEffects
 
 Rectangle{
     id:content

src/controls/FluTextButton.qml

@@ -1,6 +1,6 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import FluentUI 1.0
+import FluentUI
 
 Button {
 

src/controls/FluTimePicker.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Window 2.15
+import QtQuick.Window
-import FluentUI 1.0
+import FluentUI
 
 Rectangle {
 
@@ -101,9 +101,8 @@ Rectangle {
 
     Popup{
         id:popup
-        width: container.width
+        width: 300
-        height: container.height
+        height: 340
-        contentItem: Item{}
         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
             }

src/controls/FluToggleSwitch.qml

@@ -1,7 +1,7 @@
 import QtQuick 2.0
 import QtQuick.Controls 2.0
-import FluentUI 1.0
+import FluentUI
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
 
 Button {
 

src/controls/FluTooltip.qml

@@ -1,7 +1,6 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtGraphicalEffects 1.15
+import FluentUI
-import FluentUI 1.0
 
 ToolTip {
     id:tool_tip

src/controls/FluTreeView.qml

@@ -1,9 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import FluentUI 1.0
+import FluentUI
-import QtGraphicalEffects 1.15
 
 Item {
 

src/controls/FluWindow.qml

@@ -1,8 +1,7 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Window 2.15
+import QtQuick.Window
-import QtQuick.Layouts 1.15
+import QtQuick.Layouts
-import FluentUI 1.0
+import FluentUI
-import QtGraphicalEffects 1.15
 
 Item {
 

src/controls/FluWindowResize.qml

@@ -1,5 +1,5 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Window 2.15
+import QtQuick.Window
 
 MouseArea {
 

src/controls/TFpsMonitor.qml

@@ -1,5 +1,5 @@
-import QtQuick 2.15
+import QtQuick
-import FluentUI 1.0
+import FluentUI
 
 Item {