diff --git a/QtScrcpy/device/ui/ui.pri b/QtScrcpy/device/ui/ui.pri index d67a3f9..b9854b3 100644 --- a/QtScrcpy/device/ui/ui.pri +++ b/QtScrcpy/device/ui/ui.pri @@ -9,9 +9,3 @@ HEADERS += \ FORMS += \ $$PWD/videoform.ui \ $$PWD/toolform.ui - -#DEFINES += USE_QTQUICK - -contains(DEFINES, USE_QTQUICK) { - QT += quickwidgets -} diff --git a/QtScrcpy/device/ui/videoform.cpp b/QtScrcpy/device/ui/videoform.cpp index 9e13fb5..57a8465 100644 --- a/QtScrcpy/device/ui/videoform.cpp +++ b/QtScrcpy/device/ui/videoform.cpp @@ -4,9 +4,6 @@ #include #include #include -#ifdef USE_QTQUICK -#include -#endif #include #include #include @@ -48,35 +45,6 @@ void VideoForm::initUI() m_widthHeightRatio = 1.0f * phone.width() / phone.height(); } -#ifdef USE_QTQUICK - // qml animation - QWidget *loadingWidget; - QHBoxLayout *horizontalLayout; - QQuickWidget *quickWidget; - loadingWidget = new QWidget(this); - loadingWidget->setObjectName(QStringLiteral("loadingWidget")); - loadingWidget->setAutoFillBackground(false); - loadingWidget->setStyleSheet(QStringLiteral("")); - loadingWidget->setAttribute(Qt::WA_DeleteOnClose); - m_loadingWidget = loadingWidget; - horizontalLayout = new QHBoxLayout(loadingWidget); - horizontalLayout->setSpacing(0); - horizontalLayout->setObjectName(QStringLiteral("horizontalLayout")); - horizontalLayout->setContentsMargins(0, 0, 0, 0); - quickWidget = new QQuickWidget(loadingWidget); - quickWidget->setObjectName(QStringLiteral("quickWidget")); - quickWidget->setAutoFillBackground(false); - quickWidget->setStyleSheet(QStringLiteral("")); - quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView); - quickWidget->setSource(QUrl(QStringLiteral("qrc:/qml/pinwheel.qml"))); - // 最后绘制,不设置最后绘制会影响父窗体异形异常(quickWidget的透明通道会形成穿透) - quickWidget->setAttribute(Qt::WA_AlwaysStackOnTop); - // 背景透明 - quickWidget->setClearColor(QColor(Qt::transparent)); - horizontalLayout->addWidget(quickWidget); - ui->verticalLayout->addWidget(loadingWidget); -#endif - // mac下去掉标题栏影响showfullscreen #ifndef Q_OS_OSX // 去掉标题栏 diff --git a/QtScrcpy/res/qml/images/pinwheel.png b/QtScrcpy/res/qml/images/pinwheel.png deleted file mode 100644 index e70b977..0000000 Binary files a/QtScrcpy/res/qml/images/pinwheel.png and /dev/null differ diff --git a/QtScrcpy/res/qml/pinwheel.qml b/QtScrcpy/res/qml/pinwheel.qml deleted file mode 100644 index 8893b99..0000000 --- a/QtScrcpy/res/qml/pinwheel.qml +++ /dev/null @@ -1,20 +0,0 @@ -import QtQuick 2.5 -import QtGraphicalEffects 1.0 -Image { - Image { - id: wheel - anchors.centerIn: parent - source: "images/pinwheel.png" - - RotationAnimation { - id:rotationAnimation - target: wheel - to:360 - direction: RotationAnimation.Clockwise - duration: 800 - loops:Animation.Infinite - } - - onStatusChanged: if (wheel.status == Image.Ready) rotationAnimation.start() - } -} diff --git a/QtScrcpy/res/res.qrc b/QtScrcpy/res/res.qrc index 834014b..840268d 100644 --- a/QtScrcpy/res/res.qrc +++ b/QtScrcpy/res/res.qrc @@ -2,9 +2,7 @@ font/fontawesome-webfont.ttf image/videoform/phone-h.png - image/videoform/phone-v.png - qml/pinwheel.qml - qml/images/pinwheel.png + image/videoform/phone-v.png qss/psblack.css qss/psblack/add_bottom.png qss/psblack/add_left.png