From 73ff97c0fcbd142b9f99d9e803f48464c52cc7f0 Mon Sep 17 00:00:00 2001
From: sunkang <sunkang@uniontech.com>
Date: Wed, 30 Dec 2020 13:46:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dexample=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E7=9A=84=E4=B8=B4=E6=97=B6desktop=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=88=A0=E9=99=A4=E5=AF=BC=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=99=A8=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复example生成的临时desktop文件没有删除导致的启动器显示问题

Log:

Change-Id: Iae77bed7fa3ab15ddfb76a95318e11e527d0ea7e
---
 debian/api.json                             | 2 +-
 examples/test-taskbar/main.cpp              | 5 +++++
 examples/test-taskbar/testtaskbarwindow.cpp | 7 +++++++
 examples/test-taskbar/testtaskbarwindow.h   | 6 ++++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/debian/api.json b/debian/api.json
index 3392318a..90d14b3c 100755
--- a/debian/api.json
+++ b/debian/api.json
@@ -1,4 +1,4 @@
-{"Filepath":"examples/test-taskbar/testtaskbarwindow.h","Functions":[{"Uniquefunname":" ~TestTaskbarWindow()","Funname":"~TestTaskbarWindow","Returntype":"","Args":""}],"Records":[{"Name":"macro","Fields":["TESTTASKBARWINDOW_H"]}]}
+{"Filepath":"examples/test-taskbar/testtaskbarwindow.h","Functions":[{"Uniquefunname":"protected closeEvent(QCloseEvent * event)","Funname":"closeEvent","Returntype":"protected","Args":"QCloseEvent * event"},{"Uniquefunname":"Q_SIGNALS closeWindow()","Funname":"closeWindow","Returntype":"Q_SIGNALS","Args":""},{"Uniquefunname":" ~TestTaskbarWindow()","Funname":"~TestTaskbarWindow","Returntype":"","Args":""}],"Records":[{"Name":"macro","Fields":["TESTTASKBARWINDOW_H"]}]}
 {"Filepath":"src/dfiledrag.h","Functions":[{"Uniquefunname":"Q_OBJECT public DFileDrag(QObject * source,DFileDragServer * server)","Funname":"DFileDrag","Returntype":"Q_OBJECT public","Args":"QObject * source,DFileDragServer * server"},{"Uniquefunname":"void setMimeData(QMimeData * data)","Funname":"setMimeData","Returntype":"void","Args":"QMimeData * data"},{"Uniquefunname":"QUrl targetUrl()","Funname":"targetUrl","Returntype":"QUrl","Args":""},{"Uniquefunname":"Q_SIGNALS targetUrlChanged(QUrl url)","Funname":"targetUrlChanged","Returntype":"Q_SIGNALS","Args":"QUrl url"}],"Records":[{"Name":"macro","Fields":["DFILEDRAG_H"]}]}
 {"Filepath":"src/dfiledragclient.h","Functions":[{"Uniquefunname":"public checkMimeData(const QMimeData * data)","Funname":"checkMimeData","Returntype":"public","Args":"const QMimeData * data"},{"Uniquefunname":"int progress()","Funname":"progress","Returntype":"int","Args":""},{"Uniquefunname":"Q_SIGNALS progressChanged(int progress)","Funname":"progressChanged","Returntype":"Q_SIGNALS","Args":"int progress"},{"Uniquefunname":"void serverDestroyed()","Funname":"serverDestroyed","Returntype":"void","Args":""},{"Uniquefunname":"void setTargetData(const QMimeData * data,QString key,QVariant value)","Funname":"setTargetData","Returntype":"void","Args":"const QMimeData * data,QString key,QVariant value"},{"Uniquefunname":"void setTargetUrl(const QMimeData * data,QUrl url)","Funname":"setTargetUrl","Returntype":"void","Args":"const QMimeData * data,QUrl url"},{"Uniquefunname":"DFileDragState state()","Funname":"state","Returntype":"DFileDragState","Args":""},{"Uniquefunname":"void stateChanged(DFileDragState state)","Funname":"stateChanged","Returntype":"void","Args":"DFileDragState state"}],"Records":[{"Name":"macro","Fields":["DFILEDRAGCLIENT_H"]}]}
 {"Filepath":"src/dfiledragcommon.h","Functions":null,"Records":[{"Name":"enum:DFileDragState","Fields":["CustomState","Failed","Finished","Paused","Running","Stalled"]},{"Name":"macro","Fields":["DFILEDRAGCOMMON_H"]}]}
diff --git a/examples/test-taskbar/main.cpp b/examples/test-taskbar/main.cpp
index 6dfef629..fcc0bfb8 100644
--- a/examples/test-taskbar/main.cpp
+++ b/examples/test-taskbar/main.cpp
@@ -24,5 +24,10 @@ int main(int argc, char *argv[])
     TestTaskbarWindow *pTaskbarWindow = new TestTaskbarWindow;
     pTaskbarWindow->showMaximized();
 
+    //这里删除用于测试的desktop文件
+    QObject::connect(pTaskbarWindow, &TestTaskbarWindow::closeWindow, [&desktopFile] {
+        QFile::remove(desktopFile.fileName());
+    });
+
     return a.exec();
 }
diff --git a/examples/test-taskbar/testtaskbarwindow.cpp b/examples/test-taskbar/testtaskbarwindow.cpp
index db4dff04..1b273694 100644
--- a/examples/test-taskbar/testtaskbarwindow.cpp
+++ b/examples/test-taskbar/testtaskbarwindow.cpp
@@ -23,6 +23,7 @@
 
 #include <QIntValidator>
 #include <QApplication>
+#include <QCloseEvent>
 
 TestTaskbarWindow::TestTaskbarWindow(QWidget *parent)
     : QWidget(parent)
@@ -86,3 +87,9 @@ TestTaskbarWindow::~TestTaskbarWindow()
 {
 
 }
+
+void TestTaskbarWindow::closeEvent(QCloseEvent *event)
+{
+    Q_EMIT closeWindow();
+    event->accept();
+}
diff --git a/examples/test-taskbar/testtaskbarwindow.h b/examples/test-taskbar/testtaskbarwindow.h
index d6a4a24d..63e6dbe0 100644
--- a/examples/test-taskbar/testtaskbarwindow.h
+++ b/examples/test-taskbar/testtaskbarwindow.h
@@ -48,6 +48,12 @@ class TestTaskbarWindow : public QWidget
     TestTaskbarWindow(QWidget *parent = nullptr);
     ~TestTaskbarWindow();
 
+protected:
+    void closeEvent(QCloseEvent *event);
+
+Q_SIGNALS:
+    void closeWindow();
+
 private:
     DTaskbarControl *m_pTaskbarControl;
     QCheckBox *m_pProgressBox;