example/example_en_US.ts

@@ -1930,6 +1930,26 @@ Some contents...</source>
         <source>StatusLayout</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="qml/page/T_StatusLayout.qml" line="63"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_StatusLayout.qml" line="64"/>
+        <source>Empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_StatusLayout.qml" line="65"/>
+        <source>The page went wrong...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_StatusLayout.qml" line="66"/>
+        <source>Reload</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>T_TabView</name>

example/example_zh_CN.ts

@@ -2053,20 +2053,24 @@ Some contents...</source>
         <translation type="unfinished">状态布局</translation>
     </message>
     <message>
+        <location filename="qml/page/T_StatusLayout.qml" line="63"/>
         <source>Loading...</source>
-        <translation type="obsolete">正在加载...</translation>
+        <translation type="unfinished">正在加载...</translation>
     </message>
     <message>
+        <location filename="qml/page/T_StatusLayout.qml" line="64"/>
         <source>Empty</source>
-        <translation type="obsolete">空空如也</translation>
+        <translation type="unfinished">空空如也</translation>
     </message>
     <message>
+        <location filename="qml/page/T_StatusLayout.qml" line="65"/>
         <source>The page went wrong...</source>
-        <translation type="obsolete">页面出错了...</translation>
+        <translation type="unfinished">页面出错了...</translation>
     </message>
     <message>
+        <location filename="qml/page/T_StatusLayout.qml" line="66"/>
         <source>Reload</source>
-        <translation type="obsolete">重新加载</translation>
+        <translation type="unfinished">重新加载</translation>
     </message>
 </context>
 <context>

example/qml/page/T_StatusLayout.qml

@@ -60,8 +60,12 @@ FluScrollablePage{
         FluStatusLayout{
             id:status_view
             anchors.fill: parent
+            loadingText: qsTr("Loading...")
+            emptyText: qsTr("Empty")
+            errorText: qsTr("The page went wrong...")
+            errorButtonText: qsTr("Reload")
             onErrorClicked:{
-                status_view.statusMode = FluStatusLayoutType.Loading
+                showError("Click Reload")
             }
             Rectangle {
                 anchors.fill: parent

example/qml/window/FluentInitializrWindow.qml

@@ -20,7 +20,7 @@ FluWindowDialog {
                     showError(message)
                 }
                 function onSuccess(path){
-                    FluTools.showFileInFolder(path)
+                    FluTools.showFileInFolder(path+"/CMakeLists.txt")
                     window.close()
                 }
             }

example/src/helper/InitializrHelper.cpp

@@ -97,5 +97,5 @@ void InitializrHelper::copyFile(const QString &source, const QString &dest) {
     copyFile(":/example/res/template/src/qml.qrc.in", projectDir.filePath("src/qml.qrc"));
     copyFile(":/example/res/template/src/logo.ico.in", projectDir.filePath("src/logo.ico"));
     copyFile(":/example/res/template/src/README.md.in", projectDir.filePath("src/README.md"));
-    return this->success(projectPath+"/CMakeLists.txt");
+    return this->success(projectPath);
 }

example/src/main.cpp

@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
     QGuiApplication::setOrganizationName("ZhuZiChu");
     QGuiApplication::setOrganizationDomain("https://zhuzichu520.github.io");
     QGuiApplication::setApplicationName("FluentUI");
-    QGuiApplication::setApplicationDisplayName("FluentUI Example");
+    QGuiApplication::setApplicationDisplayName("FluentUI Exmaple");
     QGuiApplication::setApplicationVersion(APPLICATION_VERSION);
     QGuiApplication::setQuitOnLastWindowClosed(false);
     SettingsHelper::getInstance()->init(argv);

src/FluTheme.cpp

@@ -32,7 +32,6 @@ FluTheme::FluTheme(QObject *parent) : QObject{parent} {
     connect(&_watcher, &QFileSystemWatcher::fileChanged, this, [=](const QString &path){
         Q_EMIT desktopImagePathChanged();
     });
-    connect(this, &FluTheme::blurBehindWindowEnabledChanged, this, [=] {checkUpdateDesktopImage();});
     startTimer(1000);
 }
 
@@ -75,9 +74,6 @@ bool FluTheme::dark() const {
 }
 
 void FluTheme::checkUpdateDesktopImage(){
-    if(!_blurBehindWindowEnabled){
-        return;
-    }
     QThreadPool::globalInstance()->start([=]() {
         _mutex.lock();
         auto path = FluTools::getInstance()->getWallpaperFilePath();
@@ -94,5 +90,7 @@ void FluTheme::checkUpdateDesktopImage(){
 
 void FluTheme::timerEvent(QTimerEvent *event)
 {
+    if(_blurBehindWindowEnabled){
         checkUpdateDesktopImage();
+    }
 }

src/Qt5/imports/FluentUI/Controls/FluBreadcrumbBar.qml

@@ -57,12 +57,12 @@ Item {
                     Layout.alignment: Qt.AlignVCenter
                     color: {
                         if(item_mouse.pressed){
-                            return FluTheme.dark ? Qt.rgba(150/255,150/255,150/255,1) : Qt.rgba(134/255,134/255,134/255,1)
+                            return FluTheme.dark ? Qt.rgba(150/255,150/255,150/235,1) : Qt.rgba(134/255,134/255,134/235,1)
                         }
                         if(item_mouse.containsMouse){
-                            return FluTheme.dark ? Qt.rgba(204/255,204/255,204/255,1) : Qt.rgba(92/255,92/255,92/255,1)
+                            return FluTheme.dark ? Qt.rgba(204/255,204/255,204/235,1) : Qt.rgba(92/255,92/255,92/235,1)
                         }
-                        return FluTheme.dark ? Qt.rgba(255/255,255/255,255/255,1) :  Qt.rgba(26/255,26/255,26/255,1)
+                        return FluTheme.dark ? Qt.rgba(255/255,255/255,255/235,1) :  Qt.rgba(26/255,26/255,26/235,1)
                     }
                     MouseArea{
                         id:item_mouse

src/Qt5/imports/FluentUI/Controls/FluStatusLayout.qml

@@ -8,11 +8,11 @@ Item{
     id:control
     default property alias content: container.data
     property int statusMode: FluStatusLayoutType.Loading
-    property string loadingText: qsTr("Loading...")
+    property string loadingText:"正在加载..."
-    property string emptyText: qsTr("Empty")
+    property string emptyText: "空空如也"
-    property string errorText: qsTr("Error")
+    property string errorText: "页面出错了.."
-    property string errorButtonText: qsTr("Reload")
+    property string errorButtonText: "重新加载"
-    property color color: Qt.rgba(0,0,0,0)
+    property color color: FluTheme.dark ? Window.active ?  Qt.rgba(38/255,44/255,54/255,1) : Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
     signal errorClicked
     property Component loadingItem : com_loading
     property Component emptyItem : com_empty

src/Qt6/imports/FluentUI/Controls/FluBreadcrumbBar.qml

@@ -57,12 +57,12 @@ Item {
                     Layout.alignment: Qt.AlignVCenter
                     color: {
                         if(item_mouse.pressed){
-                            return FluTheme.dark ? Qt.rgba(150/255,150/255,150/255,1) : Qt.rgba(134/255,134/255,134/255,1)
+                            return FluTheme.dark ? Qt.rgba(150/255,150/255,150/235,1) : Qt.rgba(134/255,134/255,134/235,1)
                         }
                         if(item_mouse.containsMouse){
-                            return FluTheme.dark ? Qt.rgba(204/255,204/255,204/255,1) : Qt.rgba(92/255,92/255,92/255,1)
+                            return FluTheme.dark ? Qt.rgba(204/255,204/255,204/235,1) : Qt.rgba(92/255,92/255,92/235,1)
                         }
-                        return FluTheme.dark ? Qt.rgba(255/255,255/255,255/255,1) :  Qt.rgba(26/255,26/255,26/255,1)
+                        return FluTheme.dark ? Qt.rgba(255/255,255/255,255/235,1) :  Qt.rgba(26/255,26/255,26/235,1)
                     }
                     MouseArea{
                         id:item_mouse

src/Qt6/imports/FluentUI/Controls/FluStatusLayout.qml

@@ -7,11 +7,11 @@ Item{
     id:control
     default property alias content: container.data
     property int statusMode: FluStatusLayoutType.Loading
-    property string loadingText: qsTr("Loading...")
+    property string loadingText:"正在加载..."
-    property string emptyText: qsTr("Empty")
+    property string emptyText: "空空如也"
-    property string errorText: qsTr("Error")
+    property string errorText: "页面出错了.."
-    property string errorButtonText: qsTr("Reload")
+    property string errorButtonText: "重新加载"
-    property color color: Qt.rgba(0,0,0,0)
+    property color color: FluTheme.dark ? Window.active ?  Qt.rgba(38/255,44/255,54/255,1) : Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
     signal errorClicked
     property Component loadingItem : com_loading
     property Component emptyItem : com_empty

src/fluentui_en_US.ts

@@ -232,33 +232,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>FluStatusLayout</name>
-    <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluStatusLayout.qml" line="11"/>
-        <location filename="Qt6/imports/FluentUI/Controls/FluStatusLayout.qml" line="10"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluStatusLayout.qml" line="12"/>
-        <location filename="Qt6/imports/FluentUI/Controls/FluStatusLayout.qml" line="11"/>
-        <source>Empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluStatusLayout.qml" line="13"/>
-        <location filename="Qt6/imports/FluentUI/Controls/FluStatusLayout.qml" line="12"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluStatusLayout.qml" line="14"/>
-        <location filename="Qt6/imports/FluentUI/Controls/FluStatusLayout.qml" line="13"/>
-        <source>Reload</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FluTextBoxMenu</name>
     <message>

src/fluentui_zh_CN.ts

@@ -232,33 +232,6 @@
         <translation type="unfinished">重置</translation>
     </message>
 </context>
-<context>
-    <name>FluStatusLayout</name>
-    <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluStatusLayout.qml" line="11"/>
-        <location filename="Qt6/imports/FluentUI/Controls/FluStatusLayout.qml" line="10"/>
-        <source>Loading...</source>
-        <translation type="unfinished">加载中...</translation>
-    </message>
-    <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluStatusLayout.qml" line="12"/>
-        <location filename="Qt6/imports/FluentUI/Controls/FluStatusLayout.qml" line="11"/>
-        <source>Empty</source>
-        <translation type="unfinished">空空如也</translation>
-    </message>
-    <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluStatusLayout.qml" line="13"/>
-        <location filename="Qt6/imports/FluentUI/Controls/FluStatusLayout.qml" line="12"/>
-        <source>Error</source>
-        <translation type="unfinished">似乎出了点问题</translation>
-    </message>
-    <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluStatusLayout.qml" line="14"/>
-        <location filename="Qt6/imports/FluentUI/Controls/FluStatusLayout.qml" line="13"/>
-        <source>Reload</source>
-        <translation type="unfinished">重新加载</translation>
-    </message>
-</context>
 <context>
     <name>FluTextBoxMenu</name>
     <message>