From 4134d4f6bd845db2273d3f4646aaf75ccfa3d8ae Mon Sep 17 00:00:00 2001 From: Mouse Zhang Date: Sun, 12 Mar 2023 14:12:02 +0800 Subject: [PATCH] add preview.qml to qml.qrc --- plugin-taskbar/CMakeLists.txt | 3 ++- plugin-taskbar/qml.qrc | 5 +++++ plugin-taskbar/{ => qml}/preview.qml | 0 plugin-taskbar/ukuitaskwidget.cpp | 3 ++- 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 plugin-taskbar/qml.qrc rename plugin-taskbar/{ => qml}/preview.qml (100%) diff --git a/plugin-taskbar/CMakeLists.txt b/plugin-taskbar/CMakeLists.txt index 8ffb668..fad4453 100644 --- a/plugin-taskbar/CMakeLists.txt +++ b/plugin-taskbar/CMakeLists.txt @@ -20,6 +20,7 @@ set(SOURCES ukuitaskwidget.cpp ukuitaskclosebutton.cpp quicklaunchaction.cpp + qml.qrc ) find_package(X11 REQUIRED) @@ -68,7 +69,7 @@ install(FILES PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ GROUP_WRITE WORLD_READ WORLD_WRITE WORLD_EXECUTE GROUP_EXECUTE GROUP_READ ) -install(FILES ./preview.qml +install(FILES ./qml/preview.qml DESTINATION "/usr/share/ukui/ukui-panel/plugin-taskbar") include(../cmake/UkuiPluginTranslationTs.cmake) diff --git a/plugin-taskbar/qml.qrc b/plugin-taskbar/qml.qrc new file mode 100644 index 0000000..bcfd7b9 --- /dev/null +++ b/plugin-taskbar/qml.qrc @@ -0,0 +1,5 @@ + + + qml/preview.qml + + diff --git a/plugin-taskbar/preview.qml b/plugin-taskbar/qml/preview.qml similarity index 100% rename from plugin-taskbar/preview.qml rename to plugin-taskbar/qml/preview.qml diff --git a/plugin-taskbar/ukuitaskwidget.cpp b/plugin-taskbar/ukuitaskwidget.cpp index 6ec1375..2e5290c 100644 --- a/plugin-taskbar/ukuitaskwidget.cpp +++ b/plugin-taskbar/ukuitaskwidget.cpp @@ -62,6 +62,7 @@ UKUITaskWidget::UKUITaskWidget(const WindowId& window, UKUITaskBar * taskbar, QW m_DNDTimer(new QTimer(this)), m_timer(new QTimer(this)) { + Q_INIT_RESOURCE(qml); Q_ASSERT(taskbar); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); setMinimumWidth(1); @@ -120,7 +121,7 @@ UKUITaskWidget::UKUITaskWidget(const WindowId& window, UKUITaskBar * taskbar, QW //qml动态预览 getSysTransparency(); m_tempView = new QQuickView(); - m_tempView->setSource(QUrl("/usr/share/ukui/ukui-panel/plugin-taskbar/preview.qml")); + m_tempView->setSource(QUrl("qrc:/qml/preview.qml")); m_tempView->setResizeMode(QQuickView::SizeRootObjectToView); QSurfaceFormat surfaceFormat; surfaceFormat.setAlphaBufferSize(8);//设置透明通道位数