Update to Qt 6 branch and bug fixed.

This commit is contained in:
Mentalflow 2023-07-21 13:44:20 +08:00
parent 151b1ec011
commit 3ff570b585
Signed by untrusted user: Mentalflow
GPG Key ID: 5AE68D4401A2EE71
7 changed files with 35 additions and 11 deletions

View File

@ -174,5 +174,6 @@
<file>qml/page/T_Pagination.qml</file> <file>qml/page/T_Pagination.qml</file>
<file>qml/page/T_RadioButton.qml</file> <file>qml/page/T_RadioButton.qml</file>
<file>qml/page/T_RemoteLoader.qml</file> <file>qml/page/T_RemoteLoader.qml</file>
<file>qml/page/T_Http.qml</file>
</qresource> </qresource>
</RCC> </RCC>

View File

@ -51,6 +51,16 @@ FluWindow {
} }
} }
Connections{
target: FluTheme
function onDarkChanged(){
if (FluTheme.dark)
FramelessUtils.systemTheme = FramelessHelperConstants.Dark
else
FramelessUtils.systemTheme = FramelessHelperConstants.Light
}
}
function setHitTestVisible(com){ function setHitTestVisible(com){
framless_helper.setHitTestVisible(com) framless_helper.setHitTestVisible(com)
} }

View File

@ -1,10 +1,10 @@
import QtQuick import QtQuick 2.15
import QtCore import Qt.labs.platform 1.0
import QtQuick.Layouts import QtQuick.Layouts 1.15
import QtQuick.Window import QtQuick.Window 2.15
import QtQuick.Controls import QtQuick.Controls 2.15
import QtQuick.Dialogs import QtQuick.Dialogs 1.3
import FluentUI import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
FluScrollablePage{ FluScrollablePage{
@ -112,7 +112,7 @@ FluScrollablePage{
id: file_dialog id: file_dialog
currentFolder: StandardPaths.standardLocations(StandardPaths.DownloadLocation)[0] currentFolder: StandardPaths.standardLocations(StandardPaths.DownloadLocation)[0]
onAccepted: { onAccepted: {
var path = selectedFolder.toString().replace("file:///","") + "/big_buck_bunny.mp4" var path = currentFolder.toString().replace(FluTools.isMacos() ? "file://" : "file:///","") + "/big_buck_bunny.mp4"
http_download.download(path) http_download.download(path)
} }
} }

View File

@ -32,6 +32,7 @@ int main(int argc, char *argv[])
FramelessConfig::instance()->set(Global::Option::EnableBlurBehindWindow,false); FramelessConfig::instance()->set(Global::Option::EnableBlurBehindWindow,false);
#ifdef Q_OS_MACOS #ifdef Q_OS_MACOS
FramelessConfig::instance()->set(Global::Option::ForceNonNativeBackgroundBlur,false); FramelessConfig::instance()->set(Global::Option::ForceNonNativeBackgroundBlur,false);
FramelessConfig::instance()->set(Global::Option::EnableBlurBehindWindow,true);
#endif #endif
AppInfo* appInfo = new AppInfo(); AppInfo* appInfo = new AppInfo();
QQmlApplicationEngine engine; QQmlApplicationEngine engine;

View File

@ -11,7 +11,6 @@ class FluHttp : public QObject
Q_OBJECT Q_OBJECT
Q_PROPERTY_AUTO(QString,url); Q_PROPERTY_AUTO(QString,url);
Q_PROPERTY_AUTO(bool,enabledBreakpointDownload) Q_PROPERTY_AUTO(bool,enabledBreakpointDownload)
QML_NAMED_ELEMENT(FluHttp)
private: private:
QVariant invokeIntercept(const QVariant& params,const QVariant& headers,const QString& method); QVariant invokeIntercept(const QVariant& params,const QVariant& headers,const QString& method);
public: public:

View File

@ -7,7 +7,6 @@
class FluHttpInterceptor : public QObject class FluHttpInterceptor : public QObject
{ {
Q_OBJECT Q_OBJECT
QML_NAMED_ELEMENT(FluHttpInterceptor)
public: public:
explicit FluHttpInterceptor(QObject *parent = nullptr); explicit FluHttpInterceptor(QObject *parent = nullptr);

View File

@ -9,6 +9,9 @@
#include "FluTheme.h" #include "FluTheme.h"
#include "FluTools.h" #include "FluTools.h"
#include "FluTextStyle.h" #include "FluTextStyle.h"
#include "FluHttp.h"
#include "FluHttpInterceptor.h"
int major = 1; int major = 1;
int minor = 0; int minor = 0;
static FluentUIPlugin instance; static FluentUIPlugin instance;
@ -24,8 +27,19 @@ void FluentUIPlugin::registerTypes(const char *uri)
{ {
qmlRegisterType<WindowHelper>(uri,major,minor,"WindowHelper"); qmlRegisterType<WindowHelper>(uri,major,minor,"WindowHelper");
qmlRegisterType<FluColorSet>(uri,major,minor,"FluColorSet"); qmlRegisterType<FluColorSet>(uri,major,minor,"FluColorSet");
qmlRegisterType<FluHttpInterceptor>(uri,major,minor,"FluHttpInterceptor");
qmlRegisterType<FluHttp>(uri,major,minor,"FluHttp");
qmlRegisterUncreatableMetaObject(Fluent_Awesome::staticMetaObject, uri,major,minor,"FluentIcons", "Access to enums & flags only"); qmlRegisterUncreatableMetaObject(Fluent_Awesome::staticMetaObject, uri,major,minor,"FluentIcons", "Access to enums & flags only");
qmlRegisterUncreatableMetaObject(Fluent_DarkMode::staticMetaObject, uri,major,minor,"FluDarkMode", "Access to enums & flags only"); qmlRegisterUncreatableMetaObject(FluThemeType::staticMetaObject, uri,major,minor,"FluThemeType", "Access to enums & flags only");
qmlRegisterUncreatableMetaObject(FluPageType::staticMetaObject, uri,major,minor,"FluPageType", "Access to enums & flags only");
qmlRegisterUncreatableMetaObject(FluWindowType::staticMetaObject, uri,major,minor,"FluWindowType", "Access to enums & flags only");
qmlRegisterUncreatableMetaObject(FluTreeViewType::staticMetaObject, uri,major,minor,"FluTreeViewType", "Access to enums & flags only");
qmlRegisterUncreatableMetaObject(FluStatusViewType::staticMetaObject, uri,major,minor,"FluStatusViewType", "Access to enums & flags only");
qmlRegisterUncreatableMetaObject(FluContentDialogType::staticMetaObject, uri,major,minor,"FluContentDialogType", "Access to enums & flags only");
qmlRegisterUncreatableMetaObject(FluTimePickerType::staticMetaObject, uri,major,minor,"FluTimePickerType", "Access to enums & flags only");
qmlRegisterUncreatableMetaObject(FluCalendarViewType::staticMetaObject, uri,major,minor,"FluCalendarViewType", "Access to enums & flags only");
qmlRegisterUncreatableMetaObject(FluTabViewType::staticMetaObject, uri,major,minor,"FluTabViewType", "Access to enums & flags only");
qmlRegisterUncreatableMetaObject(FluNavigationViewType::staticMetaObject, uri,major,minor,"FluNavigationViewType", "Access to enums & flags only");
} }
#ifdef FLUENTUI_BUILD_STATIC_LIB #ifdef FLUENTUI_BUILD_STATIC_LIB