update

example/example_en_US.ts

@@ -87,29 +87,21 @@
 <context>
     <name>InitializrHelper</name>
     <message>
-        <location filename="bin/Debug/source/helper/InitializrHelper.cpp" line="69"/>
-        <location filename="bin/Release/source/helper/InitializrHelper.cpp" line="69"/>
         <location filename="src/helper/InitializrHelper.cpp" line="69"/>
         <source>The name cannot be empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="bin/Debug/source/helper/InitializrHelper.cpp" line="73"/>
-        <location filename="bin/Release/source/helper/InitializrHelper.cpp" line="73"/>
         <location filename="src/helper/InitializrHelper.cpp" line="73"/>
         <source>The creation path cannot be empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="bin/Debug/source/helper/InitializrHelper.cpp" line="78"/>
-        <location filename="bin/Release/source/helper/InitializrHelper.cpp" line="78"/>
         <location filename="src/helper/InitializrHelper.cpp" line="78"/>
         <source>The path does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="bin/Debug/source/helper/InitializrHelper.cpp" line="84"/>
-        <location filename="bin/Release/source/helper/InitializrHelper.cpp" line="84"/>
         <location filename="src/helper/InitializrHelper.cpp" line="84"/>
         <source>%1 folder already exists</source>
         <translation type="unfinished"></translation>

example/example_zh_CN.ts

@@ -87,29 +87,21 @@
 <context>
     <name>InitializrHelper</name>
     <message>
-        <location filename="bin/Debug/source/helper/InitializrHelper.cpp" line="69"/>
-        <location filename="bin/Release/source/helper/InitializrHelper.cpp" line="69"/>
         <location filename="src/helper/InitializrHelper.cpp" line="69"/>
         <source>The name cannot be empty</source>
         <translation type="unfinished">名称不能为空</translation>
     </message>
     <message>
-        <location filename="bin/Debug/source/helper/InitializrHelper.cpp" line="73"/>
-        <location filename="bin/Release/source/helper/InitializrHelper.cpp" line="73"/>
         <location filename="src/helper/InitializrHelper.cpp" line="73"/>
         <source>The creation path cannot be empty</source>
         <translation type="unfinished">创建路径不能为空</translation>
     </message>
     <message>
-        <location filename="bin/Debug/source/helper/InitializrHelper.cpp" line="78"/>
-        <location filename="bin/Release/source/helper/InitializrHelper.cpp" line="78"/>
         <location filename="src/helper/InitializrHelper.cpp" line="78"/>
         <source>The path does not exist</source>
         <translation type="unfinished">路径不存在</translation>
     </message>
     <message>
-        <location filename="bin/Debug/source/helper/InitializrHelper.cpp" line="84"/>
-        <location filename="bin/Release/source/helper/InitializrHelper.cpp" line="84"/>
         <location filename="src/helper/InitializrHelper.cpp" line="84"/>
         <source>%1 folder already exists</source>
         <translation type="unfinished">%1 文件夹已经存在</translation>

example/src/singleton.h

@@ -21,4 +21,4 @@ private:                                        \
     public:                                     \
     static Class* getInstance() {               \
         return Singleton<Class>::getInstance(); \
-}
+}                                               \

src/CMakeLists.txt

@@ -13,7 +13,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 #设置版本号
-add_definitions(-DFLUENTUI_VERSION=1,7,4,0)
+add_definitions(-DFLUENTUI_VERSION=1,7,5,0)
 
 if (FLUENTUI_BUILD_STATIC_LIB)
     add_definitions(-DFLUENTUI_BUILD_STATIC_LIB)

src/FluApp.cpp

@@ -8,6 +8,7 @@
 #include <QFontDatabase>
 #include <QClipboard>
 #include <QTranslator>
+#include <utility>
 
 FluApp::FluApp(QObject *parent) : QObject{parent} {
     _useSystemAppBar = false;
@@ -16,10 +17,10 @@ FluApp::FluApp(QObject *parent) : QObject{parent} {
 FluApp::~FluApp() = default;
 
 void FluApp::init(QObject *target, QLocale locale) {
-    _locale = locale;
+    _locale = std::move(locale);
     _engine = qmlEngine(target);
     _translator = new QTranslator(this);
-    qApp->installTranslator(_translator);
+    QGuiApplication::installTranslator(_translator);
     const QStringList uiLanguages = _locale.uiLanguages();
     for (const QString &name: uiLanguages) {
         const QString baseName = "fluentui_" + QLocale(name).name();

src/FluCaptcha.cpp

@@ -11,6 +11,9 @@ int generaNumber(int number) {
 FluCaptcha::FluCaptcha(QQuickItem *parent) : QQuickPaintedItem(parent) {
     _ignoreCase = false;
     QFont fontStyle;
+#ifdef Q_OS_WIN
+    fontStyle.setFamily("微软雅黑");
+#endif
     fontStyle.setPixelSize(28);
     fontStyle.setBold(true);
     font(fontStyle);

src/FluColors.cpp

@@ -109,7 +109,7 @@ FluColors::FluColors(QObject *parent) : QObject{parent} {
     _Green = green;
 }
 
-[[maybe_unused]] FluAccentColor *FluColors::createAccentColor(QColor primaryColor) {
+[[maybe_unused]] FluAccentColor *FluColors::createAccentColor(const QColor& primaryColor) {
     auto accentColor = new FluAccentColor(this);
     accentColor->normal(primaryColor);
     accentColor->dark(FluTools::getInstance()->withOpacity(primaryColor, 0.9));

src/FluColors.h

@@ -55,7 +55,7 @@ private:
 public:
 SINGLETON(FluColors)
 
-    [[maybe_unused]] Q_INVOKABLE FluAccentColor *createAccentColor(QColor primaryColor);
+    [[maybe_unused]] Q_INVOKABLE FluAccentColor *createAccentColor(const QColor& primaryColor);
 
     static FluColors *create(QQmlEngine *, QJSEngine *) { return getInstance(); }
 };

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

@@ -21,6 +21,7 @@ T.SpinBox {
         bottom: Math.min(control.from, control.to)
         top: Math.max(control.from, control.to)
     }
+    font: FluTextStyle.Body
 
     contentItem: TextInput {
         property color normalColor: FluTheme.dark ?  Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)

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

@@ -22,6 +22,7 @@ T.SpinBox {
         bottom: Math.min(control.from, control.to)
         top: Math.max(control.from, control.to)
     }
+    font: FluTextStyle.Body
 
     contentItem: TextInput {
         property color normalColor: FluTheme.dark ?  Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)

src/singleton.h

@@ -21,4 +21,4 @@ private:                                        \
     public:                                     \
     static Class* getInstance() {               \
         return Singleton<Class>::getInstance(); \
-}
+}                                               \