update

.github/workflows/macos.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-10.15,macos-11.0]
-        qt_ver: [5.15.2]
+        qt_ver: [6.4.3]
         qt_arch: [clang_64]
     env:
       targetName: example

.github/workflows/ubuntu.yml

@@ -19,8 +19,13 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-18.04,ubuntu-20.04]
-        qt_ver: [5.15.2]
+        qt_ver: [6.4.3]
         qt_arch: [gcc_64]
+        exclude: 
+          # Qt6.2.2 need GLIBC_2.28, ubuntu 18.04 have not.
+          - os: ubuntu-18.04
+            qt_ver: 6.4.3
+            qt_arch: gcc_64
     env:
       targetName: example
     steps:

.github/workflows/windows-mingw.yml

@@ -17,14 +17,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - qt_arch: win32_mingw81
+          - qt_arch: win64_mingw
-            qt_ver: 5.15.2
+            qt_ver: 6.4.3
-            qt_tools: "tools_mingw,8.1.0-1-202004170606,qt.tools.win32_mingw810"
+            qt_tools: "tools_mingw,9.0.0-1-202111221309,qt.tools.win64_mingw900"
-            qt_tools_mingw_install: mingw810_32
+            qt_tools_mingw_install: mingw900_64
-          - qt_arch: win64_mingw81
-            qt_ver: 5.15.2
-            qt_tools: "tools_mingw,8.1.0-1-202004170606,qt.tools.win64_mingw810"
-            qt_tools_mingw_install: mingw810_64
     env:
       targetName: example.exe
       fileName: example

.github/workflows/windows.yml

@@ -22,14 +22,10 @@ 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_ver: 6.4.3
-            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          
+            qt_arch_install: msvc2019_64      
     env:
       targetName: example.exe
       fileName: example

example/App.qml

@@ -2,7 +2,6 @@
 import QtQuick.Window 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
-import QtGraphicalEffects 1.15
 import FluentUI 1.0
 
 Window {

example/T_Badge.qml

@@ -2,7 +2,6 @@
 import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15
 import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.15
 import FluentUI 1.0
 
 FluScrollablePage{

example/T_Carousel.qml

@@ -2,7 +2,6 @@
 import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15
 import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.15
 import FluentUI 1.0
 
 FluScrollablePage{

example/T_ColorPicker.qml

@@ -2,7 +2,6 @@
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15
-import QtGraphicalEffects 1.15
 import FluentUI 1.0
 
 FluScrollablePage{

example/T_Dialog.qml

@@ -2,7 +2,6 @@
 import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15
 import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.15
 import FluentUI 1.0
 
 FluScrollablePage{

example/T_Expander.qml

@@ -2,7 +2,6 @@
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15
-import QtGraphicalEffects 1.15
 import FluentUI 1.0
 
 FluScrollablePage{

example/T_InfoBar.qml

@@ -2,7 +2,6 @@
 import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15
 import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.15
 import FluentUI 1.0
 
 FluScrollablePage{

example/T_MediaPlayer.qml

@@ -2,7 +2,7 @@
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15
-import QtGraphicalEffects 1.15
+import Qt5Compat.GraphicalEffects
 import FluentUI 1.0
 
 FluScrollablePage{
@@ -21,10 +21,7 @@ FluScrollablePage{
             }
 
             FluMediaPlayer{
-                source:{
+                source:"http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4"
-                    console.debug("-------------->")
-                    return "http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4"
-                }
             }
 
         }

example/T_Menu.qml

@@ -2,7 +2,6 @@
 import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15
 import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.15
 import FluentUI 1.0
 
 FluScrollablePage{

example/T_Progress.qml

@@ -2,7 +2,6 @@
 import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15
 import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.15
 import FluentUI 1.0
 
 FluScrollablePage{

example/T_Rectangle.qml

@@ -2,7 +2,6 @@
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
 import QtQuick.Window 2.15
-import QtGraphicalEffects 1.15
 import FluentUI 1.0
 
 FluScrollablePage{

example/T_Slider.qml

@@ -2,7 +2,6 @@
 import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15
 import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.15
 import FluentUI 1.0
 
 FluScrollablePage{

example/T_TextBox.qml

@@ -2,7 +2,6 @@
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15
-import QtGraphicalEffects 1.15
 import FluentUI 1.0
 
 FluScrollablePage{

example/T_Theme.qml

@@ -2,7 +2,6 @@
 import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15
 import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.15
 import FluentUI 1.0
 
 FluScrollablePage{

example/T_ToggleSwitch.qml

@@ -2,7 +2,6 @@
 import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15
 import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.15
 import FluentUI 1.0
 
 FluScrollablePage{

example/T_Tooltip.qml

@@ -2,7 +2,6 @@
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15
-import QtGraphicalEffects 1.15
 import FluentUI 1.0
 
 FluScrollablePage{

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/main.cpp

@@ -3,6 +3,7 @@
 #include <QQmlContext>
 #include <QDir>
 #include <QQuickWindow>
+#include <QQuickStyle>
 #include <QProcess>
 #include "ChatController.h"
 
@@ -19,6 +20,7 @@ int main(int argc, char *argv[])
     QCoreApplication::setApplicationName("FluentUI");
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 //    QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Software);
+    QQuickStyle::setStyle("Basic");
     QGuiApplication app(argc, argv);
     QQmlApplicationEngine engine;
 

example/page/ChatPage.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 FluentUI 1.0
+import FluentUI
-import Controller 1.0
+import Controller
-import QtQuick.Dialogs 1.3
 
 FluWindow {
 

example/page/MainPage.qml

@@ -2,7 +2,6 @@
 import QtQuick.Window 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
-import QtGraphicalEffects 1.15
 
 import FluentUI 1.0
 

src/FramelessView_win.cpp

@@ -4,6 +4,8 @@
 #include <QScreen>
 #include <QWindow>
 #include <FluTheme.h>
+#pragma comment(lib, "User32.lib")
+#include <windows.h>
 
 class FramelessViewPrivate
 {

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
@@ -50,20 +50,12 @@ Item {
         y: r
         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,7 +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
 
 Rectangle{
 
@@ -15,11 +15,10 @@ Rectangle{
     }
     visible: FluTheme.isFrameless
     height: visible ? 34 : 0
-
     width: {
-        if(parent==null)
+        if(root.parent)
-            return 200
+            return root.parent.width
-        return parent.width
+        return 200
     }
     z: 65535
     clip: true

src/controls/FluArea.qml

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

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 {
 

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{

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

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 {
 

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,5 +1,5 @@
-import QtQuick 2.15
+import QtQuick
-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 {
     id: control

src/controls/FluFocusRectangle.qml

@@ -1,12 +1,12 @@
-import QtQuick 2.15
+import QtQuick
-import FluentUI 1.0
+import FluentUI
 
 Item {
     id:root
     anchors.fill: parent
     anchors.margins: -3
 
-    property var radius: 4
+    property int radius: 4
 
     Rectangle{
         width: root.width

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,6 @@
-import QtQuick 2.15
+import QtQuick
-import FluentUI 1.0
+import QtQuick.Controls
+import FluentUI
 
 FluObject {
     id:infoBar

src/controls/FluMediaPlayer.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Controls 2.15
+import QtQuick.Controls
-import QtMultimedia 5.15
+import QtMultimedia
-import QtGraphicalEffects 1.15
+import Qt5Compat.GraphicalEffects
-import FluentUI 1.0
+import FluentUI
 
 Item {
     id:control
@@ -20,30 +20,30 @@ Item {
     MediaPlayer {
         id: mediaplayer
         property bool autoSeek:true
-        autoPlay: true
         source: control.source
-        onError: {
+        videoOutput: video_output
-            console.debug(error)
+        onErrorOccurred: {
         }
         onPositionChanged: {
             if(autoSeek){
                 slider.seek(mediaplayer.position*slider.maxValue/mediaplayer.duration)
             }
         }
-        onStatusChanged: {
+        onMediaStatusChanged: {
-            if(status===6){
+            if(mediaStatus===6){
                 slider.maxValue = mediaplayer.duration
             }
         }
     }
 
     onSourceChanged: {
-       slider.seek(0)
+        slider.seek(0)
+        mediaplayer.play()
     }
 
     VideoOutput {
+        id:video_output
         anchors.fill: parent
-        source: mediaplayer
     }
 
     Item{
@@ -78,7 +78,7 @@ Item {
                 mediaplayer.autoSeek = false
             }
             onReleased: {
-                mediaplayer.seek(value*mediaplayer.duration/slider.maxValue)
+                mediaplayer.position = value*mediaplayer.duration/slider.maxValue
                 mediaplayer.autoSeek = true
             }
         }
@@ -106,14 +106,14 @@ Item {
 
         FluIconButton{
             iconSize: 15
-            iconSource: mediaplayer.playbackState === Audio.PlayingState ?   FluentIcons.Pause  : FluentIcons.Play
+            iconSource: mediaplayer.playbackState === MediaPlayer.PlayingState ?   FluentIcons.Pause  : FluentIcons.Play
             anchors{
                 horizontalCenter: parent.horizontalCenter
                 bottom: parent.bottom
                 bottomMargin: 10
             }
             onClicked: {
-                if(mediaplayer.playbackState === Audio.PlayingState){
+                if(mediaplayer.playbackState === MediaPlayer.PlayingState){
                     mediaplayer.pause()
                 }else{
                     mediaplayer.play()

src/controls/FluMenu.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 QtGraphicalEffects 1.15
+import Qt5Compat.GraphicalEffects
 
 Menu {
     id: popup

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,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 FluentUI
-import FluentUI 1.0
 
 Item {
 

src/controls/FluObject.qml

@@ -1,7 +1,7 @@
-import QtQuick 2.15
+import QtQuick
+import QtQuick.Controls
 
 QtObject {
     id:flu_object;
-
     default property list<QtObject> children;
 }

src/controls/FluPaneItem.qml

@@ -1,4 +1,5 @@
-import QtQuick 2.15
+import QtQuick
+import QtQuick.Controls
 
 QtObject {
     property string title

src/controls/FluPaneItemHeader.qml

@@ -1,4 +1,5 @@
-import QtQuick 2.15
+import QtQuick
+import QtQuick.Controls
 
 QtObject {
     property string title

src/controls/FluPaneItemSeparator.qml

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

src/controls/FluProgressBar.qml

@@ -1,12 +1,12 @@
-import QtQuick 2.12
+import QtQuick
-import QtQuick.Controls 2.12
+import QtQuick.Controls
 
 FluRectangle {
     id: control
 
     width: 150
     height: 5
-    radius: [3,3,3,3]
+    radius: [2.5,2.5,2.5,2.5]
     clip: true
     color:  FluTheme.isDark ? Qt.rgba(41/255,41/255,41/255,1) : Qt.rgba(214/255,214/255,214/255,1)
     property real progress: 0.5
@@ -24,7 +24,7 @@ FluRectangle {
 
     Rectangle{
         id:bar
-        radius: 3
+        radius: 2.5
         width: control.width*progress
         height:  control.height
         color:FluTheme.isDark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark

src/controls/FluProgressRing.qml

@@ -1,6 +1,5 @@
-import QtQuick 2.12
+import QtQuick
-import QtQuick.Controls 2.12
+import QtQuick.Controls
-
 Rectangle {
     id: control
 

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:root

src/controls/FluScrollBar.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
 
 ScrollBar {
 

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 {
     id:root

src/controls/FluSlider.qml

@@ -1,12 +1,10 @@
-import QtQuick 2.12
+import QtQuick
-import QtQuick.Controls 2.12
+import QtQuick.Controls
-import QtGraphicalEffects 1.15
 
 Item{
 
     id:root
 
-    property int lineSize: 4
     property int size: 180
     property int dotSize: 24
 
@@ -38,19 +36,18 @@ Item{
         seek(0)
     }
 
-    FluRectangle {
+    Rectangle {
         id: control
-        width: isHorizontal ? size : root.lineSize
+        width: isHorizontal ? size : 4
-        height:  isHorizontal ? root.lineSize : size
+        height:  isHorizontal ? 4 : size
-        radius: [3,3,3,3]
+        radius: 2
-        clip: true
         anchors.verticalCenter: parent.verticalCenter
         color:FluTheme.isDark ? Qt.rgba(162/255,162/255,162/255,1) : Qt.rgba(138/255,138/255,138/255,1)
         Rectangle{
             id:rect
-            radius: 3
+            radius: 2.5
-            width: isHorizontal ? control.width*(value/maxValue) : control.width
+            width: isHorizontal ? control.width*(value/maxValue) : 5
-            height: isHorizontal ?  control.height  : control.height*(value/maxValue)
+            height: isHorizontal ?  5  : control.height*(value/maxValue)
             color:FluTheme.isDark ? FluTheme.primaryColor.lighter :FluTheme.primaryColor.dark
         }
     }
@@ -112,7 +109,6 @@ Item{
     }
 
     function seek(position){
-        console.debug(position)
         if(isHorizontal){
             dot.x =position/maxValue*control.width - dotSize/2
             root.value = Qt.binding(function(){

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/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 {
 

src/controls/FluToggleSwitch.qml

@@ -1,7 +1,7 @@
-import QtQuick 2.0
+import QtQuick
-import QtQuick.Controls 2.0
+import QtQuick.Controls
-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 {
     id:root

src/controls/FluWindow.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
+import QtQuick
-import QtQuick.Window 2.15
+import QtQuick.Controls
-import QtQuick.Layouts 1.15
+import QtQuick.Window
-import FluentUI 1.0
+import QtQuick.Layouts
-import QtGraphicalEffects 1.15
+import FluentUI
 
 Item {
 
@@ -127,19 +127,19 @@ Item {
         root: root
     }
 
-    function showSuccess(text,duration,moremsg){
+    function showSuccess(text,duration=1000,moremsg){
         infoBar.showSuccess(text,duration,moremsg);
     }
 
-    function showInfo(text,duration,moremsg){
+    function showInfo(text,duration=1000,moremsg){
         infoBar.showInfo(text,duration,moremsg);
     }
 
-    function showWarning(text,duration,moremsg){
+    function showWarning(text,duration=1000,moremsg){
         infoBar.showWarning(text,duration,moremsg);
     }
 
-    function showError(text,duration,moremsg){
+    function showError(text,duration=1000,moremsg){
         infoBar.showError(text,duration,moremsg);
     }
 

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,8 +1,7 @@
-import QtQuick 2.15
+import QtQuick
-import FluentUI 1.0
+import QtQuick.Controls
+import FluentUI
 
-
-/*! TODO */
 Item {
     id: toou2d_fps
     width: contentItemLoader.width + 5;