diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a9d2221..8a8f4e0f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16) +cmake_minimum_required(VERSION 3.16) project(FluentUI VERSION 0.1 LANGUAGES CXX) diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 2d992d38..40370a96 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16) +cmake_minimum_required(VERSION 3.16) project(example VERSION 0.1 LANGUAGES CXX) diff --git a/example/example.rc b/example/example.rc index ed991b87..8d7a9ef4 100644 --- a/example/example.rc +++ b/example/example.rc @@ -39,4 +39,4 @@ BEGIN BEGIN VALUE "Translation", 0x409, 1200 END -END \ No newline at end of file +END diff --git a/example/qml/App.qml b/example/qml/App.qml index f1781b6c..42b7ad5a 100644 --- a/example/qml/App.qml +++ b/example/qml/App.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Window import QtQuick.Controls import QtQuick.Layouts diff --git a/example/qml/TestWindow.qml b/example/qml/TestWindow.qml index e5c1ff3f..b8d65357 100644 --- a/example/qml/TestWindow.qml +++ b/example/qml/TestWindow.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Window import QtQuick.Controls import QtQuick.Layouts diff --git a/example/qml/component/CodeExpander.qml b/example/qml/component/CodeExpander.qml index 0fdc5436..3f673a68 100644 --- a/example/qml/component/CodeExpander.qml +++ b/example/qml/component/CodeExpander.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls diff --git a/example/qml/component/CustomWindow.qml b/example/qml/component/CustomWindow.qml index 6ea394af..7a49a930 100644 --- a/example/qml/component/CustomWindow.qml +++ b/example/qml/component/CustomWindow.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import FluentUI import org.wangwenx190.FramelessHelper diff --git a/example/qml/global/ItemsFooter.qml b/example/qml/global/ItemsFooter.qml index a5b48efa..c6742d06 100644 --- a/example/qml/global/ItemsFooter.qml +++ b/example/qml/global/ItemsFooter.qml @@ -1,4 +1,4 @@ -pragma Singleton +pragma Singleton import QtQuick import FluentUI diff --git a/example/qml/global/ItemsOriginal.qml b/example/qml/global/ItemsOriginal.qml index a7cffad2..dd22104e 100644 --- a/example/qml/global/ItemsOriginal.qml +++ b/example/qml/global/ItemsOriginal.qml @@ -1,4 +1,4 @@ -pragma Singleton +pragma Singleton import QtQuick import FluentUI diff --git a/example/qml/global/MainEvent.qml b/example/qml/global/MainEvent.qml index d4a72c44..9246e9da 100644 --- a/example/qml/global/MainEvent.qml +++ b/example/qml/global/MainEvent.qml @@ -1,4 +1,4 @@ -pragma Singleton +pragma Singleton import QtQuick import QtQuick.Controls diff --git a/example/qml/page/T_Acrylic.qml b/example/qml/page/T_Acrylic.qml index c634868e..37ff39bb 100644 --- a/example/qml/page/T_Acrylic.qml +++ b/example/qml/page/T_Acrylic.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls diff --git a/example/qml/page/T_Awesome.qml b/example/qml/page/T_Awesome.qml index 26caa39f..e607af36 100644 --- a/example/qml/page/T_Awesome.qml +++ b/example/qml/page/T_Awesome.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window diff --git a/example/qml/page/T_Badge.qml b/example/qml/page/T_Badge.qml index 11b9b64f..7b183b7c 100644 --- a/example/qml/page/T_Badge.qml +++ b/example/qml/page/T_Badge.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls diff --git a/example/qml/page/T_BreadcrumbBar.qml b/example/qml/page/T_BreadcrumbBar.qml index 30d6809a..28d21e24 100644 --- a/example/qml/page/T_BreadcrumbBar.qml +++ b/example/qml/page/T_BreadcrumbBar.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window diff --git a/example/qml/page/T_Buttons.qml b/example/qml/page/T_Buttons.qml index 7b962807..5ca0632e 100644 --- a/example/qml/page/T_Buttons.qml +++ b/example/qml/page/T_Buttons.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls diff --git a/example/qml/page/T_CalendarPicker.qml b/example/qml/page/T_CalendarPicker.qml index b7b38148..865e95a7 100644 --- a/example/qml/page/T_CalendarPicker.qml +++ b/example/qml/page/T_CalendarPicker.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window diff --git a/example/qml/page/T_Carousel.qml b/example/qml/page/T_Carousel.qml index 83c2ed35..8dad6a21 100644 --- a/example/qml/page/T_Carousel.qml +++ b/example/qml/page/T_Carousel.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls diff --git a/example/qml/page/T_CheckBox.qml b/example/qml/page/T_CheckBox.qml index 8603bb45..fa0d7e6d 100644 --- a/example/qml/page/T_CheckBox.qml +++ b/example/qml/page/T_CheckBox.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls diff --git a/example/qml/page/T_ColorPicker.qml b/example/qml/page/T_ColorPicker.qml index 03195f4d..05fce39c 100644 --- a/example/qml/page/T_ColorPicker.qml +++ b/example/qml/page/T_ColorPicker.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window diff --git a/example/qml/page/T_DatePicker.qml b/example/qml/page/T_DatePicker.qml index 7930bcc8..3c9aeebf 100644 --- a/example/qml/page/T_DatePicker.qml +++ b/example/qml/page/T_DatePicker.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window diff --git a/example/qml/page/T_Dialog.qml b/example/qml/page/T_Dialog.qml index ff561c8b..bee679e4 100644 --- a/example/qml/page/T_Dialog.qml +++ b/example/qml/page/T_Dialog.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls diff --git a/example/qml/page/T_Expander.qml b/example/qml/page/T_Expander.qml index 21e10aa2..bb7a6730 100644 --- a/example/qml/page/T_Expander.qml +++ b/example/qml/page/T_Expander.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window diff --git a/example/qml/page/T_FlipView.qml b/example/qml/page/T_FlipView.qml index ba7fa49f..7493c069 100644 --- a/example/qml/page/T_FlipView.qml +++ b/example/qml/page/T_FlipView.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window diff --git a/example/qml/page/T_Home.qml b/example/qml/page/T_Home.qml index 706743ee..d3c84446 100644 --- a/example/qml/page/T_Home.qml +++ b/example/qml/page/T_Home.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls diff --git a/example/qml/page/T_InfoBar.qml b/example/qml/page/T_InfoBar.qml index 31621767..0c974fa9 100644 --- a/example/qml/page/T_InfoBar.qml +++ b/example/qml/page/T_InfoBar.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls diff --git a/example/qml/page/T_MediaPlayer.qml b/example/qml/page/T_MediaPlayer.qml index 2508da8d..cd74434b 100644 --- a/example/qml/page/T_MediaPlayer.qml +++ b/example/qml/page/T_MediaPlayer.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window diff --git a/example/qml/page/T_Menu.qml b/example/qml/page/T_Menu.qml index 186c96dd..1445f461 100644 --- a/example/qml/page/T_Menu.qml +++ b/example/qml/page/T_Menu.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls diff --git a/example/qml/page/T_MultiWindow.qml b/example/qml/page/T_MultiWindow.qml index 819904dc..c3c5fb34 100644 --- a/example/qml/page/T_MultiWindow.qml +++ b/example/qml/page/T_MultiWindow.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls diff --git a/example/qml/page/T_Pivot.qml b/example/qml/page/T_Pivot.qml index b0ba4e3f..d171a1e1 100644 --- a/example/qml/page/T_Pivot.qml +++ b/example/qml/page/T_Pivot.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window diff --git a/example/qml/page/T_Progress.qml b/example/qml/page/T_Progress.qml index dc0de532..336f2a68 100644 --- a/example/qml/page/T_Progress.qml +++ b/example/qml/page/T_Progress.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls diff --git a/example/qml/page/T_RatingControl.qml b/example/qml/page/T_RatingControl.qml index fd334207..505394a6 100644 --- a/example/qml/page/T_RatingControl.qml +++ b/example/qml/page/T_RatingControl.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls diff --git a/example/qml/page/T_Rectangle.qml b/example/qml/page/T_Rectangle.qml index 5c6eb3f3..4c41da03 100644 --- a/example/qml/page/T_Rectangle.qml +++ b/example/qml/page/T_Rectangle.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Controls import QtQuick.Window diff --git a/example/qml/page/T_Settings.qml b/example/qml/page/T_Settings.qml index 2207e5f2..fce3a204 100644 --- a/example/qml/page/T_Settings.qml +++ b/example/qml/page/T_Settings.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls diff --git a/example/qml/page/T_Slider.qml b/example/qml/page/T_Slider.qml index 45138adb..a09a6d34 100644 --- a/example/qml/page/T_Slider.qml +++ b/example/qml/page/T_Slider.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls diff --git a/example/qml/page/T_StatusView.qml b/example/qml/page/T_StatusView.qml index 6ba5d59c..db397802 100644 --- a/example/qml/page/T_StatusView.qml +++ b/example/qml/page/T_StatusView.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Controls import QtQuick.Window diff --git a/example/qml/page/T_TabView.qml b/example/qml/page/T_TabView.qml index 40f8d4f0..b0ddece3 100644 --- a/example/qml/page/T_TabView.qml +++ b/example/qml/page/T_TabView.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window diff --git a/example/qml/page/T_TableView.qml b/example/qml/page/T_TableView.qml index bd83b5ff..f14dce57 100644 --- a/example/qml/page/T_TableView.qml +++ b/example/qml/page/T_TableView.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window diff --git a/example/qml/page/T_Text.qml b/example/qml/page/T_Text.qml index 0540032e..a2306069 100644 --- a/example/qml/page/T_Text.qml +++ b/example/qml/page/T_Text.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window diff --git a/example/qml/page/T_TextBox.qml b/example/qml/page/T_TextBox.qml index 622feb7f..91ac54b1 100644 --- a/example/qml/page/T_TextBox.qml +++ b/example/qml/page/T_TextBox.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window diff --git a/example/qml/page/T_Theme.qml b/example/qml/page/T_Theme.qml index f4a77042..7785d51f 100644 --- a/example/qml/page/T_Theme.qml +++ b/example/qml/page/T_Theme.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls diff --git a/example/qml/page/T_TimePicker.qml b/example/qml/page/T_TimePicker.qml index 672c3633..9890ed8d 100644 --- a/example/qml/page/T_TimePicker.qml +++ b/example/qml/page/T_TimePicker.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window diff --git a/example/qml/page/T_ToggleSwitch.qml b/example/qml/page/T_ToggleSwitch.qml index 06788518..1fe993e8 100644 --- a/example/qml/page/T_ToggleSwitch.qml +++ b/example/qml/page/T_ToggleSwitch.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls diff --git a/example/qml/page/T_Tooltip.qml b/example/qml/page/T_Tooltip.qml index 2ad2d8ac..97315197 100644 --- a/example/qml/page/T_Tooltip.qml +++ b/example/qml/page/T_Tooltip.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window diff --git a/example/qml/page/T_TreeView.qml b/example/qml/page/T_TreeView.qml index 8763eb23..a56a0857 100644 --- a/example/qml/page/T_TreeView.qml +++ b/example/qml/page/T_TreeView.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls diff --git a/example/qml/page/T_Typography.qml b/example/qml/page/T_Typography.qml index bf70909c..9431baca 100644 --- a/example/qml/page/T_Typography.qml +++ b/example/qml/page/T_Typography.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Controls import FluentUI diff --git a/example/qml/window/AboutWindow.qml b/example/qml/window/AboutWindow.qml index 475333c3..fb8fde9f 100644 --- a/example/qml/window/AboutWindow.qml +++ b/example/qml/window/AboutWindow.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import FluentUI diff --git a/example/qml/window/LoginWindow.qml b/example/qml/window/LoginWindow.qml index 25d8bada..30ac67f9 100644 --- a/example/qml/window/LoginWindow.qml +++ b/example/qml/window/LoginWindow.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Controls import FluentUI diff --git a/example/qml/window/MainWindow.qml b/example/qml/window/MainWindow.qml index a0db491b..1e028711 100644 --- a/example/qml/window/MainWindow.qml +++ b/example/qml/window/MainWindow.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Window import QtQuick.Controls import QtQuick.Layouts diff --git a/example/qml/window/MediaWindow.qml b/example/qml/window/MediaWindow.qml index 1f2d9942..1264ed09 100644 --- a/example/qml/window/MediaWindow.qml +++ b/example/qml/window/MediaWindow.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import FluentUI diff --git a/example/qml/window/SingleInstanceWindow.qml b/example/qml/window/SingleInstanceWindow.qml index f5d13873..9a23c2ba 100644 --- a/example/qml/window/SingleInstanceWindow.qml +++ b/example/qml/window/SingleInstanceWindow.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import FluentUI diff --git a/example/qml/window/SingleTaskWindow.qml b/example/qml/window/SingleTaskWindow.qml index 1e6f69ea..a5bb073f 100644 --- a/example/qml/window/SingleTaskWindow.qml +++ b/example/qml/window/SingleTaskWindow.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import FluentUI diff --git a/example/qml/window/StandardWindow.qml b/example/qml/window/StandardWindow.qml index 6724753d..cf38c395 100644 --- a/example/qml/window/StandardWindow.qml +++ b/example/qml/window/StandardWindow.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import FluentUI diff --git a/example/src/AppInfo.cpp b/example/src/AppInfo.cpp index 90a985dd..91a2d08f 100644 --- a/example/src/AppInfo.cpp +++ b/example/src/AppInfo.cpp @@ -1,4 +1,4 @@ -#include "AppInfo.h" +#include "AppInfo.h" #include "lang/En.h" #include "lang/Zh.h" #include @@ -26,5 +26,4 @@ void AppInfo::changeLang(const QString& locale){ }else { lang(new En()); } - } diff --git a/example/src/AppInfo.h b/example/src/AppInfo.h index 64f27fa5..828152b0 100644 --- a/example/src/AppInfo.h +++ b/example/src/AppInfo.h @@ -1,4 +1,4 @@ -#ifndef APPINFO_H +#ifndef APPINFO_H #define APPINFO_H #include diff --git a/example/src/lang/En.cpp b/example/src/lang/En.cpp index be00cd6a..67f754dd 100644 --- a/example/src/lang/En.cpp +++ b/example/src/lang/En.cpp @@ -1,4 +1,4 @@ -#include "En.h" +#include "En.h" En::En(QObject *parent) : Lang{parent} diff --git a/example/src/lang/En.h b/example/src/lang/En.h index f59e685e..9f79cd91 100644 --- a/example/src/lang/En.h +++ b/example/src/lang/En.h @@ -1,4 +1,4 @@ -#ifndef EN_H +#ifndef EN_H #define EN_H #include diff --git a/example/src/lang/Lang.h b/example/src/lang/Lang.h index 37dab7cf..1cfe0af4 100644 --- a/example/src/lang/Lang.h +++ b/example/src/lang/Lang.h @@ -1,4 +1,4 @@ -#ifndef LANG_H +#ifndef LANG_H #define LANG_H #include diff --git a/example/src/lang/Zh.cpp b/example/src/lang/Zh.cpp index 16fa00df..09be06b3 100644 --- a/example/src/lang/Zh.cpp +++ b/example/src/lang/Zh.cpp @@ -1,4 +1,4 @@ -#include "Zh.h" +#include "Zh.h" Zh::Zh(QObject *parent) : Lang{parent} diff --git a/example/src/lang/Zh.h b/example/src/lang/Zh.h index 106c4e13..0074bc98 100644 --- a/example/src/lang/Zh.h +++ b/example/src/lang/Zh.h @@ -1,4 +1,4 @@ -#ifndef ZH_H +#ifndef ZH_H #define ZH_H #include diff --git a/example/src/main.cpp b/example/src/main.cpp index ab655259..3032bccb 100644 --- a/example/src/main.cpp +++ b/example/src/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/example/src/stdafx.h b/example/src/stdafx.h index 375822ed..0fe92d6d 100644 --- a/example/src/stdafx.h +++ b/example/src/stdafx.h @@ -1,4 +1,4 @@ -#if defined(_MSC_VER) && (_MSC_VER >= 1600) +#if defined(_MSC_VER) && (_MSC_VER >= 1600) #pragma execution_character_set("utf-8") #endif diff --git a/example/src/tool/IPC.cpp b/example/src/tool/IPC.cpp index 49d3978a..a654fcc6 100644 --- a/example/src/tool/IPC.cpp +++ b/example/src/tool/IPC.cpp @@ -1,4 +1,4 @@ -#include "IPC.h" +#include "IPC.h" #include #include diff --git a/example/src/tool/IPC.h b/example/src/tool/IPC.h index 5f0077c6..d4bedfa7 100644 --- a/example/src/tool/IPC.h +++ b/example/src/tool/IPC.h @@ -1,4 +1,4 @@ -#ifndef IPC_H +#ifndef IPC_H #define IPC_H #include diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 140db143..73c9b787 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16) +cmake_minimum_required(VERSION 3.16) project(fluentuiplugin LANGUAGES CXX) diff --git a/src/Def.cpp b/src/Def.cpp index 47f2bf08..7d0fc38e 100644 --- a/src/Def.cpp +++ b/src/Def.cpp @@ -1,3 +1 @@ -#include "Def.h" - - +#include "Def.h" diff --git a/src/Def.h b/src/Def.h index 8a2bf595..3d24f635 100644 --- a/src/Def.h +++ b/src/Def.h @@ -1,4 +1,4 @@ -#ifndef DEF_H +#ifndef DEF_H #define DEF_H #include diff --git a/src/FluApp.cpp b/src/FluApp.cpp index c585af1d..5e4e0676 100644 --- a/src/FluApp.cpp +++ b/src/FluApp.cpp @@ -1,4 +1,4 @@ -#include "FluApp.h" +#include "FluApp.h" #include #include diff --git a/src/FluApp.h b/src/FluApp.h index b03961af..ecdbcbfa 100644 --- a/src/FluApp.h +++ b/src/FluApp.h @@ -1,4 +1,4 @@ -#ifndef FLUAPP_H +#ifndef FLUAPP_H #define FLUAPP_H #include diff --git a/src/FluColorSet.h b/src/FluColorSet.h index 08cb3dfd..364f6b9d 100644 --- a/src/FluColorSet.h +++ b/src/FluColorSet.h @@ -1,4 +1,4 @@ -#ifndef FLUCOLORSET_H +#ifndef FLUCOLORSET_H #define FLUCOLORSET_H #include diff --git a/src/FluColors.cpp b/src/FluColors.cpp index 46e7536d..e7475a52 100644 --- a/src/FluColors.cpp +++ b/src/FluColors.cpp @@ -1,4 +1,4 @@ -#include "FluColors.h" +#include "FluColors.h" FluColors* FluColors::m_instance = nullptr; diff --git a/src/FluColors.h b/src/FluColors.h index 9b0ac95a..92ce68af 100644 --- a/src/FluColors.h +++ b/src/FluColors.h @@ -1,4 +1,4 @@ -#ifndef FLUCOLORS_H +#ifndef FLUCOLORS_H #define FLUCOLORS_H #include diff --git a/src/FluRegister.cpp b/src/FluRegister.cpp index 4cc8c6da..888cc9a4 100644 --- a/src/FluRegister.cpp +++ b/src/FluRegister.cpp @@ -1,4 +1,4 @@ -#include "FluRegister.h" +#include "FluRegister.h" #include "FluApp.h" #include diff --git a/src/FluRegister.h b/src/FluRegister.h index 7bf68522..a1628d26 100644 --- a/src/FluRegister.h +++ b/src/FluRegister.h @@ -1,4 +1,4 @@ -#ifndef FLUREGISTER_H +#ifndef FLUREGISTER_H #define FLUREGISTER_H #include diff --git a/src/FluTextStyle.cpp b/src/FluTextStyle.cpp index 5d2aeb1a..c187a7a2 100644 --- a/src/FluTextStyle.cpp +++ b/src/FluTextStyle.cpp @@ -1,4 +1,4 @@ -#include "FluTextStyle.h" +#include "FluTextStyle.h" FluTextStyle::FluTextStyle(QObject *parent) : QObject{parent} diff --git a/src/FluTextStyle.h b/src/FluTextStyle.h index 07f4458f..de10fa4f 100644 --- a/src/FluTextStyle.h +++ b/src/FluTextStyle.h @@ -1,4 +1,4 @@ -#ifndef FLUTEXTSTYLE_H +#ifndef FLUTEXTSTYLE_H #define FLUTEXTSTYLE_H #include diff --git a/src/FluTheme.h b/src/FluTheme.h index 2f9092ca..18bfddc2 100644 --- a/src/FluTheme.h +++ b/src/FluTheme.h @@ -1,4 +1,4 @@ -#ifndef FLUTHEME_H +#ifndef FLUTHEME_H #define FLUTHEME_H #include diff --git a/src/FluTools.cpp b/src/FluTools.cpp index 580afe3a..af633ea9 100644 --- a/src/FluTools.cpp +++ b/src/FluTools.cpp @@ -1,4 +1,4 @@ -#include "FluTools.h" +#include "FluTools.h" #include #include #include diff --git a/src/FluTools.h b/src/FluTools.h index 80a5f782..80ed1877 100644 --- a/src/FluTools.h +++ b/src/FluTools.h @@ -1,4 +1,4 @@ -#ifndef FLUTOOLS_H +#ifndef FLUTOOLS_H #define FLUTOOLS_H #include diff --git a/src/WindowHelper.cpp b/src/WindowHelper.cpp index 6e1f7ee3..40730e39 100644 --- a/src/WindowHelper.cpp +++ b/src/WindowHelper.cpp @@ -1,4 +1,4 @@ -#include "WindowHelper.h" +#include "WindowHelper.h" #include "FluRegister.h" #include "FluApp.h" diff --git a/src/WindowHelper.h b/src/WindowHelper.h index 075a9b35..cf798de4 100644 --- a/src/WindowHelper.h +++ b/src/WindowHelper.h @@ -1,4 +1,4 @@ -#ifndef WINDOWHELPER_H +#ifndef WINDOWHELPER_H #define WINDOWHELPER_H #include diff --git a/src/fluentui.rc b/src/fluentui.rc index bd0cd5ef..9c3ea4aa 100644 --- a/src/fluentui.rc +++ b/src/fluentui.rc @@ -37,4 +37,4 @@ BEGIN BEGIN VALUE "Translation", 0x409, 1200 END -END \ No newline at end of file +END diff --git a/src/imports/FluentUI/Controls/ColorPicker/ColorPicker.qml b/src/imports/FluentUI/Controls/ColorPicker/ColorPicker.qml index 5c0e82d7..737776c8 100644 --- a/src/imports/FluentUI/Controls/ColorPicker/ColorPicker.qml +++ b/src/imports/FluentUI/Controls/ColorPicker/ColorPicker.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Controls import "Content" @@ -21,7 +21,6 @@ Rectangle { color: "#00000000" clip: true - RowLayout { id: picker anchors.top: parent.top diff --git a/src/imports/FluentUI/Controls/ColorPicker/Content/Checkerboard.qml b/src/imports/FluentUI/Controls/ColorPicker/Content/Checkerboard.qml index 10627344..6d2089b0 100644 --- a/src/imports/FluentUI/Controls/ColorPicker/Content/Checkerboard.qml +++ b/src/imports/FluentUI/Controls/ColorPicker/Content/Checkerboard.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick Grid { id: root property int cellSide: 5 diff --git a/src/imports/FluentUI/Controls/ColorPicker/Content/ColorSlider.qml b/src/imports/FluentUI/Controls/ColorPicker/Content/ColorSlider.qml index 404041a8..8eb976b7 100644 --- a/src/imports/FluentUI/Controls/ColorPicker/Content/ColorSlider.qml +++ b/src/imports/FluentUI/Controls/ColorPicker/Content/ColorSlider.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick Item { property int cursorHeight: 7 diff --git a/src/imports/FluentUI/Controls/ColorPicker/Content/NumberBox.qml b/src/imports/FluentUI/Controls/ColorPicker/Content/NumberBox.qml index 82fc780e..1fb93b95 100644 --- a/src/imports/FluentUI/Controls/ColorPicker/Content/NumberBox.qml +++ b/src/imports/FluentUI/Controls/ColorPicker/Content/NumberBox.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick Row { property alias caption: captionBox.text diff --git a/src/imports/FluentUI/Controls/ColorPicker/Content/PanelBorder.qml b/src/imports/FluentUI/Controls/ColorPicker/Content/PanelBorder.qml index 00316151..88a5a369 100644 --- a/src/imports/FluentUI/Controls/ColorPicker/Content/PanelBorder.qml +++ b/src/imports/FluentUI/Controls/ColorPicker/Content/PanelBorder.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick Rectangle { width : 40; height : 15; radius: 2 @@ -14,5 +14,3 @@ Rectangle { color: "transparent" } } - - diff --git a/src/imports/FluentUI/Controls/ColorPicker/Content/SBPicker.qml b/src/imports/FluentUI/Controls/ColorPicker/Content/SBPicker.qml index 86a24ce3..92ee79a9 100644 --- a/src/imports/FluentUI/Controls/ColorPicker/Content/SBPicker.qml +++ b/src/imports/FluentUI/Controls/ColorPicker/Content/SBPicker.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick Item { id: root diff --git a/src/imports/FluentUI/Controls/FluAcrylic.qml b/src/imports/FluentUI/Controls/FluAcrylic.qml index 0d8e05f0..ff8f79ee 100644 --- a/src/imports/FluentUI/Controls/FluAcrylic.qml +++ b/src/imports/FluentUI/Controls/FluAcrylic.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import Qt5Compat.GraphicalEffects import FluentUI diff --git a/src/imports/FluentUI/Controls/FluAppBar.qml b/src/imports/FluentUI/Controls/FluAppBar.qml index 27fb70a5..0e61017b 100644 --- a/src/imports/FluentUI/Controls/FluAppBar.qml +++ b/src/imports/FluentUI/Controls/FluAppBar.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Window import QtQuick.Layouts diff --git a/src/imports/FluentUI/Controls/FluArea.qml b/src/imports/FluentUI/Controls/FluArea.qml index 0118ea78..d18c818d 100644 --- a/src/imports/FluentUI/Controls/FluArea.qml +++ b/src/imports/FluentUI/Controls/FluArea.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Window import FluentUI diff --git a/src/imports/FluentUI/Controls/FluAutoSuggestBox.qml b/src/imports/FluentUI/Controls/FluAutoSuggestBox.qml index d6feea2a..2bf2949f 100644 --- a/src/imports/FluentUI/Controls/FluAutoSuggestBox.qml +++ b/src/imports/FluentUI/Controls/FluAutoSuggestBox.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluBadge.qml b/src/imports/FluentUI/Controls/FluBadge.qml index e89e8f66..ee466967 100644 --- a/src/imports/FluentUI/Controls/FluBadge.qml +++ b/src/imports/FluentUI/Controls/FluBadge.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluBreadcrumbBar.qml b/src/imports/FluentUI/Controls/FluBreadcrumbBar.qml index 27f9f5ab..93565ebe 100644 --- a/src/imports/FluentUI/Controls/FluBreadcrumbBar.qml +++ b/src/imports/FluentUI/Controls/FluBreadcrumbBar.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import FluentUI diff --git a/src/imports/FluentUI/Controls/FluButton.qml b/src/imports/FluentUI/Controls/FluButton.qml index 50919fd1..b069ef18 100644 --- a/src/imports/FluentUI/Controls/FluButton.qml +++ b/src/imports/FluentUI/Controls/FluButton.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic import FluentUI diff --git a/src/imports/FluentUI/Controls/FluCalendarPicker.qml b/src/imports/FluentUI/Controls/FluCalendarPicker.qml index dc4db692..f439919f 100644 --- a/src/imports/FluentUI/Controls/FluCalendarPicker.qml +++ b/src/imports/FluentUI/Controls/FluCalendarPicker.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window diff --git a/src/imports/FluentUI/Controls/FluCalendarView.qml b/src/imports/FluentUI/Controls/FluCalendarView.qml index 1a41e7e6..a477722a 100644 --- a/src/imports/FluentUI/Controls/FluCalendarView.qml +++ b/src/imports/FluentUI/Controls/FluCalendarView.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluCarousel.qml b/src/imports/FluentUI/Controls/FluCarousel.qml index 3de2c4cc..d6ce01ae 100644 --- a/src/imports/FluentUI/Controls/FluCarousel.qml +++ b/src/imports/FluentUI/Controls/FluCarousel.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluCheckBox.qml b/src/imports/FluentUI/Controls/FluCheckBox.qml index 49262db1..3c6fe0ad 100644 --- a/src/imports/FluentUI/Controls/FluCheckBox.qml +++ b/src/imports/FluentUI/Controls/FluCheckBox.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic import QtQuick.Layouts diff --git a/src/imports/FluentUI/Controls/FluColorPicker.qml b/src/imports/FluentUI/Controls/FluColorPicker.qml index c7e612dc..b16ac747 100644 --- a/src/imports/FluentUI/Controls/FluColorPicker.qml +++ b/src/imports/FluentUI/Controls/FluColorPicker.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic import QtQuick.Layouts diff --git a/src/imports/FluentUI/Controls/FluColorView.qml b/src/imports/FluentUI/Controls/FluColorView.qml index e2514c11..daa45030 100644 --- a/src/imports/FluentUI/Controls/FluColorView.qml +++ b/src/imports/FluentUI/Controls/FluColorView.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI import "ColorPicker" diff --git a/src/imports/FluentUI/Controls/FluComboBox.qml b/src/imports/FluentUI/Controls/FluComboBox.qml index 151097f7..303638a6 100644 --- a/src/imports/FluentUI/Controls/FluComboBox.qml +++ b/src/imports/FluentUI/Controls/FluComboBox.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluContentDialog.qml b/src/imports/FluentUI/Controls/FluContentDialog.qml index c716ae41..42b6695a 100644 --- a/src/imports/FluentUI/Controls/FluContentDialog.qml +++ b/src/imports/FluentUI/Controls/FluContentDialog.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Controls import QtQuick.Window diff --git a/src/imports/FluentUI/Controls/FluContentPage.qml b/src/imports/FluentUI/Controls/FluContentPage.qml index e6ef856b..8a56b3dc 100644 --- a/src/imports/FluentUI/Controls/FluContentPage.qml +++ b/src/imports/FluentUI/Controls/FluContentPage.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls diff --git a/src/imports/FluentUI/Controls/FluCopyableText.qml b/src/imports/FluentUI/Controls/FluCopyableText.qml index 63303bd8..b5069cf8 100644 --- a/src/imports/FluentUI/Controls/FluCopyableText.qml +++ b/src/imports/FluentUI/Controls/FluCopyableText.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluDatePicker.qml b/src/imports/FluentUI/Controls/FluDatePicker.qml index fd94e180..81cec1f0 100644 --- a/src/imports/FluentUI/Controls/FluDatePicker.qml +++ b/src/imports/FluentUI/Controls/FluDatePicker.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window diff --git a/src/imports/FluentUI/Controls/FluDivider.qml b/src/imports/FluentUI/Controls/FluDivider.qml index b1fd5aa5..3efaa46b 100644 --- a/src/imports/FluentUI/Controls/FluDivider.qml +++ b/src/imports/FluentUI/Controls/FluDivider.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Window import FluentUI diff --git a/src/imports/FluentUI/Controls/FluDropDownButton.qml b/src/imports/FluentUI/Controls/FluDropDownButton.qml index 1a7e3ccd..79aebf40 100644 --- a/src/imports/FluentUI/Controls/FluDropDownButton.qml +++ b/src/imports/FluentUI/Controls/FluDropDownButton.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic import QtQuick.Window diff --git a/src/imports/FluentUI/Controls/FluExpander.qml b/src/imports/FluentUI/Controls/FluExpander.qml index b9fbef2b..33a5476b 100644 --- a/src/imports/FluentUI/Controls/FluExpander.qml +++ b/src/imports/FluentUI/Controls/FluExpander.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Window import FluentUI diff --git a/src/imports/FluentUI/Controls/FluFilledButton.qml b/src/imports/FluentUI/Controls/FluFilledButton.qml index aad2d65b..b2212765 100644 --- a/src/imports/FluentUI/Controls/FluFilledButton.qml +++ b/src/imports/FluentUI/Controls/FluFilledButton.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic import FluentUI diff --git a/src/imports/FluentUI/Controls/FluFlipView.qml b/src/imports/FluentUI/Controls/FluFlipView.qml index b2197277..1f3012a8 100644 --- a/src/imports/FluentUI/Controls/FluFlipView.qml +++ b/src/imports/FluentUI/Controls/FluFlipView.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic import FluentUI diff --git a/src/imports/FluentUI/Controls/FluFocusRectangle.qml b/src/imports/FluentUI/Controls/FluFocusRectangle.qml index bc17eeef..95b7ef31 100644 --- a/src/imports/FluentUI/Controls/FluFocusRectangle.qml +++ b/src/imports/FluentUI/Controls/FluFocusRectangle.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluIcon.qml b/src/imports/FluentUI/Controls/FluIcon.qml index 136f7b4e..156990aa 100644 --- a/src/imports/FluentUI/Controls/FluIcon.qml +++ b/src/imports/FluentUI/Controls/FluIcon.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluIconButton.qml b/src/imports/FluentUI/Controls/FluIconButton.qml index bdbe4e08..cdd28aed 100644 --- a/src/imports/FluentUI/Controls/FluIconButton.qml +++ b/src/imports/FluentUI/Controls/FluIconButton.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic import FluentUI diff --git a/src/imports/FluentUI/Controls/FluInfoBar.qml b/src/imports/FluentUI/Controls/FluInfoBar.qml index 023e0249..e2087803 100644 --- a/src/imports/FluentUI/Controls/FluInfoBar.qml +++ b/src/imports/FluentUI/Controls/FluInfoBar.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluItem.qml b/src/imports/FluentUI/Controls/FluItem.qml index baa157ef..a3a15afe 100644 --- a/src/imports/FluentUI/Controls/FluItem.qml +++ b/src/imports/FluentUI/Controls/FluItem.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import Qt5Compat.GraphicalEffects diff --git a/src/imports/FluentUI/Controls/FluMediaPlayer.qml b/src/imports/FluentUI/Controls/FluMediaPlayer.qml index 2362933d..38f05433 100644 --- a/src/imports/FluentUI/Controls/FluMediaPlayer.qml +++ b/src/imports/FluentUI/Controls/FluMediaPlayer.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtMultimedia import FluentUI diff --git a/src/imports/FluentUI/Controls/FluMenu.qml b/src/imports/FluentUI/Controls/FluMenu.qml index a51fc2e7..f7d5e5fc 100644 --- a/src/imports/FluentUI/Controls/FluMenu.qml +++ b/src/imports/FluentUI/Controls/FluMenu.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluMenuItem.qml b/src/imports/FluentUI/Controls/FluMenuItem.qml index 84f68df7..bf574add 100644 --- a/src/imports/FluentUI/Controls/FluMenuItem.qml +++ b/src/imports/FluentUI/Controls/FluMenuItem.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluMultilineTextBox.qml b/src/imports/FluentUI/Controls/FluMultilineTextBox.qml index ccf55b2d..aca64d00 100644 --- a/src/imports/FluentUI/Controls/FluMultilineTextBox.qml +++ b/src/imports/FluentUI/Controls/FluMultilineTextBox.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic import FluentUI diff --git a/src/imports/FluentUI/Controls/FluNavigationView.qml b/src/imports/FluentUI/Controls/FluNavigationView.qml index e1c62558..9ea72951 100644 --- a/src/imports/FluentUI/Controls/FluNavigationView.qml +++ b/src/imports/FluentUI/Controls/FluNavigationView.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Window import QtQuick.Controls import QtQuick.Controls.Basic diff --git a/src/imports/FluentUI/Controls/FluNavigationView2.qml b/src/imports/FluentUI/Controls/FluNavigationView2.qml index 68041eb4..7bdd3623 100644 --- a/src/imports/FluentUI/Controls/FluNavigationView2.qml +++ b/src/imports/FluentUI/Controls/FluNavigationView2.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Window import QtQuick.Controls import QtQuick.Controls.Basic diff --git a/src/imports/FluentUI/Controls/FluObject.qml b/src/imports/FluentUI/Controls/FluObject.qml index bc79b7a2..e7939d79 100644 --- a/src/imports/FluentUI/Controls/FluObject.qml +++ b/src/imports/FluentUI/Controls/FluObject.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluPagination.qml b/src/imports/FluentUI/Controls/FluPagination.qml index 20039feb..f40c9b3e 100644 --- a/src/imports/FluentUI/Controls/FluPagination.qml +++ b/src/imports/FluentUI/Controls/FluPagination.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import FluentUI diff --git a/src/imports/FluentUI/Controls/FluPaneItem.qml b/src/imports/FluentUI/Controls/FluPaneItem.qml index 3eb35557..971f5dc2 100644 --- a/src/imports/FluentUI/Controls/FluPaneItem.qml +++ b/src/imports/FluentUI/Controls/FluPaneItem.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluPaneItemEmpty.qml b/src/imports/FluentUI/Controls/FluPaneItemEmpty.qml index 7fa9a09a..de0581df 100644 --- a/src/imports/FluentUI/Controls/FluPaneItemEmpty.qml +++ b/src/imports/FluentUI/Controls/FluPaneItemEmpty.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluPaneItemExpander.qml b/src/imports/FluentUI/Controls/FluPaneItemExpander.qml index 1d616cd1..4cf7c03d 100644 --- a/src/imports/FluentUI/Controls/FluPaneItemExpander.qml +++ b/src/imports/FluentUI/Controls/FluPaneItemExpander.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluPaneItemHeader.qml b/src/imports/FluentUI/Controls/FluPaneItemHeader.qml index aa7aec61..a1cc05dd 100644 --- a/src/imports/FluentUI/Controls/FluPaneItemHeader.qml +++ b/src/imports/FluentUI/Controls/FluPaneItemHeader.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluPaneItemSeparator.qml b/src/imports/FluentUI/Controls/FluPaneItemSeparator.qml index 7fa9a09a..de0581df 100644 --- a/src/imports/FluentUI/Controls/FluPaneItemSeparator.qml +++ b/src/imports/FluentUI/Controls/FluPaneItemSeparator.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluPasswordBox.qml b/src/imports/FluentUI/Controls/FluPasswordBox.qml index 2da02c86..efe29c63 100644 --- a/src/imports/FluentUI/Controls/FluPasswordBox.qml +++ b/src/imports/FluentUI/Controls/FluPasswordBox.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic import FluentUI diff --git a/src/imports/FluentUI/Controls/FluPivot.qml b/src/imports/FluentUI/Controls/FluPivot.qml index 88e4014d..04f5c127 100644 --- a/src/imports/FluentUI/Controls/FluPivot.qml +++ b/src/imports/FluentUI/Controls/FluPivot.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluPivotItem.qml b/src/imports/FluentUI/Controls/FluPivotItem.qml index 27444ba9..b241dc44 100644 --- a/src/imports/FluentUI/Controls/FluPivotItem.qml +++ b/src/imports/FluentUI/Controls/FluPivotItem.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluProgressBar.qml b/src/imports/FluentUI/Controls/FluProgressBar.qml index bb339c49..319a51b0 100644 --- a/src/imports/FluentUI/Controls/FluProgressBar.qml +++ b/src/imports/FluentUI/Controls/FluProgressBar.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluProgressRing.qml b/src/imports/FluentUI/Controls/FluProgressRing.qml index 31621b96..5f7b9a24 100644 --- a/src/imports/FluentUI/Controls/FluProgressRing.qml +++ b/src/imports/FluentUI/Controls/FluProgressRing.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluRadioButton.qml b/src/imports/FluentUI/Controls/FluRadioButton.qml index d7252a8f..b14ac03d 100644 --- a/src/imports/FluentUI/Controls/FluRadioButton.qml +++ b/src/imports/FluentUI/Controls/FluRadioButton.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic import QtQuick.Layouts diff --git a/src/imports/FluentUI/Controls/FluRatingControl.qml b/src/imports/FluentUI/Controls/FluRatingControl.qml index 4c24e176..fdfcd859 100644 --- a/src/imports/FluentUI/Controls/FluRatingControl.qml +++ b/src/imports/FluentUI/Controls/FluRatingControl.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluRectangle.qml b/src/imports/FluentUI/Controls/FluRectangle.qml index 50a3a1e7..6493cec5 100644 --- a/src/imports/FluentUI/Controls/FluRectangle.qml +++ b/src/imports/FluentUI/Controls/FluRectangle.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import Qt5Compat.GraphicalEffects import FluentUI diff --git a/src/imports/FluentUI/Controls/FluScrollBar.qml b/src/imports/FluentUI/Controls/FluScrollBar.qml index b7cc3610..9c3a982d 100644 --- a/src/imports/FluentUI/Controls/FluScrollBar.qml +++ b/src/imports/FluentUI/Controls/FluScrollBar.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls.Basic import FluentUI diff --git a/src/imports/FluentUI/Controls/FluScrollablePage.qml b/src/imports/FluentUI/Controls/FluScrollablePage.qml index 53546182..09cf226d 100644 --- a/src/imports/FluentUI/Controls/FluScrollablePage.qml +++ b/src/imports/FluentUI/Controls/FluScrollablePage.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls diff --git a/src/imports/FluentUI/Controls/FluShadow.qml b/src/imports/FluentUI/Controls/FluShadow.qml index 07b46748..280ed107 100644 --- a/src/imports/FluentUI/Controls/FluShadow.qml +++ b/src/imports/FluentUI/Controls/FluShadow.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluSlider.qml b/src/imports/FluentUI/Controls/FluSlider.qml index f20f1b9e..59b42e9b 100644 --- a/src/imports/FluentUI/Controls/FluSlider.qml +++ b/src/imports/FluentUI/Controls/FluSlider.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import Qt5Compat.GraphicalEffects import FluentUI diff --git a/src/imports/FluentUI/Controls/FluStatusView.qml b/src/imports/FluentUI/Controls/FluStatusView.qml index c56a83d6..fbd10f73 100644 --- a/src/imports/FluentUI/Controls/FluStatusView.qml +++ b/src/imports/FluentUI/Controls/FluStatusView.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import FluentUI diff --git a/src/imports/FluentUI/Controls/FluTabView.qml b/src/imports/FluentUI/Controls/FluTabView.qml index b55caf53..7f12ab3c 100644 --- a/src/imports/FluentUI/Controls/FluTabView.qml +++ b/src/imports/FluentUI/Controls/FluTabView.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import FluentUI diff --git a/src/imports/FluentUI/Controls/FluTableView.qml b/src/imports/FluentUI/Controls/FluTableView.qml index 6ad923e0..f2512bd4 100644 --- a/src/imports/FluentUI/Controls/FluTableView.qml +++ b/src/imports/FluentUI/Controls/FluTableView.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic import QtQuick.Layouts diff --git a/src/imports/FluentUI/Controls/FluText.qml b/src/imports/FluentUI/Controls/FluText.qml index 4f9b9b5c..86dfa5b7 100644 --- a/src/imports/FluentUI/Controls/FluText.qml +++ b/src/imports/FluentUI/Controls/FluText.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluTextBox.qml b/src/imports/FluentUI/Controls/FluTextBox.qml index 6b25d52d..afea2250 100644 --- a/src/imports/FluentUI/Controls/FluTextBox.qml +++ b/src/imports/FluentUI/Controls/FluTextBox.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic import FluentUI diff --git a/src/imports/FluentUI/Controls/FluTextBoxBackground.qml b/src/imports/FluentUI/Controls/FluTextBoxBackground.qml index caf9160c..41fd95da 100644 --- a/src/imports/FluentUI/Controls/FluTextBoxBackground.qml +++ b/src/imports/FluentUI/Controls/FluTextBoxBackground.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import Qt5Compat.GraphicalEffects import FluentUI diff --git a/src/imports/FluentUI/Controls/FluTextBoxMenu.qml b/src/imports/FluentUI/Controls/FluTextBoxMenu.qml index d92ac693..3c93fcb7 100644 --- a/src/imports/FluentUI/Controls/FluTextBoxMenu.qml +++ b/src/imports/FluentUI/Controls/FluTextBoxMenu.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluTextButton.qml b/src/imports/FluentUI/Controls/FluTextButton.qml index 30b806b7..df25fc19 100644 --- a/src/imports/FluentUI/Controls/FluTextButton.qml +++ b/src/imports/FluentUI/Controls/FluTextButton.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic import FluentUI diff --git a/src/imports/FluentUI/Controls/FluTimePicker.qml b/src/imports/FluentUI/Controls/FluTimePicker.qml index 542e8f19..edfd5ae1 100644 --- a/src/imports/FluentUI/Controls/FluTimePicker.qml +++ b/src/imports/FluentUI/Controls/FluTimePicker.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window diff --git a/src/imports/FluentUI/Controls/FluToggleButton.qml b/src/imports/FluentUI/Controls/FluToggleButton.qml index 72b29e3d..a1f7df20 100644 --- a/src/imports/FluentUI/Controls/FluToggleButton.qml +++ b/src/imports/FluentUI/Controls/FluToggleButton.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic import FluentUI diff --git a/src/imports/FluentUI/Controls/FluToggleSwitch.qml b/src/imports/FluentUI/Controls/FluToggleSwitch.qml index 7f2e2d9a..52039aaf 100644 --- a/src/imports/FluentUI/Controls/FluToggleSwitch.qml +++ b/src/imports/FluentUI/Controls/FluToggleSwitch.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic import QtQuick.Layouts diff --git a/src/imports/FluentUI/Controls/FluTooltip.qml b/src/imports/FluentUI/Controls/FluTooltip.qml index 7ea981d6..5e4227fa 100644 --- a/src/imports/FluentUI/Controls/FluTooltip.qml +++ b/src/imports/FluentUI/Controls/FluTooltip.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import FluentUI diff --git a/src/imports/FluentUI/Controls/FluTreeView.qml b/src/imports/FluentUI/Controls/FluTreeView.qml index 84ded7ad..11ef6062 100644 --- a/src/imports/FluentUI/Controls/FluTreeView.qml +++ b/src/imports/FluentUI/Controls/FluTreeView.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Window import QtQuick.Layouts import QtQuick.Controls diff --git a/src/imports/FluentUI/Controls/FluWindow.qml b/src/imports/FluentUI/Controls/FluWindow.qml index 284507bf..f525844c 100644 --- a/src/imports/FluentUI/Controls/FluWindow.qml +++ b/src/imports/FluentUI/Controls/FluWindow.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Window import QtQuick.Controls import QtQuick.Layouts diff --git a/src/imports/FluentUI/Controls/FluWindowResize.qml b/src/imports/FluentUI/Controls/FluWindowResize.qml index 9df5831e..e2a0f85b 100644 --- a/src/imports/FluentUI/Controls/FluWindowResize.qml +++ b/src/imports/FluentUI/Controls/FluWindowResize.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Controls import QtQuick.Window import FluentUI diff --git a/src/stdafx.h b/src/stdafx.h index 89199411..b0fd29a0 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -1,4 +1,4 @@ -#ifndef STDAFX_H +#ifndef STDAFX_H #define STDAFX_H #define Q_PROPERTY_AUTO(TYPE, M) \