refactor: [base/gui/sidebar] adpat windowmanager and sidebar

CMakeLists.txt

@@ -34,7 +34,7 @@ else()
 endif()
 
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED)
-find_package(DtkCMake REQUIRED)
+find_package(Dtk${DTK_VERSION_MAJOR}CMake REQUIRED)
 #if no debug, can't out in code define key '__FUNCTION__' and so on
 add_definitions(-DQT_MESSAGELOGCONTEXT)
 

include/dfm-gui/applet.h

@@ -15,6 +15,7 @@ class QQuickItem;
 DFMGUI_BEGIN_NAMESPACE
 
 class Containment;
+class Panel;
 
 class AppletPrivate;
 class Applet : public QObject
@@ -43,10 +44,11 @@ class Applet : public QObject
     Q_SIGNAL void rootObjectChanged(QObject *object);
 
     QUrl currentUrl() const;
-    void setCurrentUrl(const QUrl &url);
+    Q_SLOT void setCurrentUrl(const QUrl &url);
     Q_SIGNAL void currentUrlChanged(const QUrl &url);
 
     Containment *containment() const;
+    Panel *panel() const;
 
     QString plugin() const;
     QString id() const;

include/dfm-gui/appletfactory.h

@@ -11,6 +11,7 @@
 DFMGUI_BEGIN_NAMESPACE
 
 class Applet;
+class Containment;
 class AppletFactory
 {
     explicit AppletFactory();
@@ -19,12 +20,12 @@ class AppletFactory
 public:
     using AppletPtr = Applet *;
     using Key = QString;
-    using CreateFunc = std::function<AppletPtr(const Key &url)>;
+    using CreateFunc = std::function<AppletPtr(const Key &url, Containment *parent, QString *error)>;
 
     static AppletFactory *instance();
 
     bool regCreator(const Key &url, CreateFunc creator, QString *errorString = nullptr);
-    AppletPtr create(const Key &url, QString *errorString = nullptr);
+    AppletPtr create(const Key &url, Containment *parent = nullptr, QString *errorString = nullptr);
 
 private:
     dfmbase::DThreadMap<Key, CreateFunc> constructList {};

include/dfm-gui/appletmanager.h

@@ -36,12 +36,13 @@ class AppletManager : public QObject
     Panel *createPanel(const QString &pluginName, const QString &quickId);
 
     QList<QString> allAppletTemplateIdList() const;
-    Applet *createApplet(const QString &templateId, QObject *parent = nullptr);
-    Applet *createApplet(const QString &pluginName, const QString &quickId, QObject *parent = nullptr);
+    Applet *createApplet(const QString &templateId, Containment *parent = nullptr);
+    Applet *createApplet(const QString &pluginName, const QString &quickId, Containment *parent = nullptr);
 
     QString lastError() const;
 
-    static Applet *createAppletFromInfo(const dpf::PluginQuickMetaPtr &metaPtr, QObject *parent = nullptr, QString *errorString = nullptr);
+    static Applet *createAppletFromInfo(
+            const dpf::PluginQuickMetaPtr &metaPtr, Containment *parent = nullptr, QString *errorString = nullptr);
 
 private:
     QScopedPointer<AppletManagerPrivate> dptr;

include/dfm-gui/panel.h

@@ -23,6 +23,14 @@ class Panel : public Containment
     explicit Panel(QObject *parent = nullptr);
 
     QQuickWindow *window() const;
+    quint64 windId() const;
+
+    virtual void loadState();
+    virtual void saveState();
+
+Q_SIGNALS:
+    void aboutToOpen();
+    void aboutToClose();
 
 private:
     Q_DECLARE_PRIVATE_D(dptr, Panel);

include/dfm-gui/sharedqmlengine.h

@@ -28,7 +28,6 @@ class SharedQmlEngine : public QObject
     QObject *rootObject() const;
     QQmlContext *rootContext() const;
     QQmlComponent *mainComponent() const;
-    static QSharedPointer<QQmlEngine> globalEngine();
 
     bool create(Applet *applet, bool async = false);
     bool completeCreation(const QVariantMap &args = {});

include/dfm-gui/windowmanager.h

@@ -6,14 +6,16 @@
 #define WINDOWMANAGER_H
 
 #include <dfm-gui/dfm_gui_global.h>
-#include <dfm-gui/windowhandle.h>
+#include <dfm-gui/panel.h>
+
 #include <QObject>
 
 class QQuickWindow;
 class QQmlEngine;
 
 DFMGUI_BEGIN_NAMESPACE
 
+class Applet;
 class WindowManagerPrivate;
 class WindowManager : public QObject
 {
@@ -23,21 +25,45 @@ class WindowManager : public QObject
     ~WindowManager() override;
 
 public:
+    using Handle = QPointer<Panel>;
+
     static WindowManager *instance();
     QSharedPointer<QQmlEngine> engine() const;
 
-    WindowHandlePtr createWindow(const QString &pluginName, const QString &quickId,
-                                 const QVariantMap &var = {});
-    void showWindow(const WindowHandlePtr &handle);
+    Handle createWindow(const QUrl &url, const QString &pluginName,
+                                 const QString &quickId, const QVariantMap &var = {});
+    void showWindow(const Handle &handle) const;
+    bool activeExistsWindowByUrl(const QUrl &url) const;
+
+    quint64 findWindowId(const QObject *itemObject) const;
+    quint64 findWindowIdFromApplet(Applet *applet) const;
+    Handle findWindowByUrl(const QUrl &url) const;
+    Handle findWindowById(quint64 windId) const;
+    QList<quint64> windowIdList() const;
+
+    void resetPreviousActivedWindowId();
+    quint64 previousActivedWindowId() const;
+    bool containsCurrentUrl(const QUrl &url, const QQuickWindow *window = nullptr) const;
+
+    QString lastError() const;
+
+Q_SIGNALS:
+    void windowCreated(quint64 windId);
+    void windowOpened(quint64 windId);
+    void windowClosed(quint64 windId);
+    void lastWindowClosed(quint64 windId);
+    void currentUrlChanged(quint64 windId, const QUrl &url);
 
 private:
     QScopedPointer<WindowManagerPrivate> dptr;
     Q_DECLARE_PRIVATE_D(dptr, WindowManager);
     Q_DISABLE_COPY(WindowManager)
 };
 
+using WindowHandle = WindowManager::Handle;
+
 DFMGUI_END_NAMESPACE
 
-#define FMQuickWindowIns DFMGUI_NAMESPACE::WindowManager::instance();
+#define FMQuickWindowIns (DFMGUI_NAMESPACE::WindowManager::instance())
 
 #endif   // WINDOWMANAGER_H

src/dfm-base/dialogs/basedialog/basedialog.cpp

@@ -4,7 +4,7 @@
 
 #include "basedialog.h"
 
-#include "utils/windowutils.h"
+#include <dfm-base/utils/windowutils.h>
 
 #include <dtitlebar.h>
 

src/dfm-base/utils/fileinfoasycworker.cpp

@@ -3,10 +3,11 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "fileinfoasycworker.h"
-#include "fileutils.h"
 #include "networkutils.h"
 #include "mimetype/dmimedatabase.h"
 
+#include <dfm-base/utils/fileutils.h>
+
 namespace dfmbase {
 FileInfoAsycWorker::FileInfoAsycWorker(QObject *parent)
     : QObject(parent)

src/dfm-base/utils/filestatisticsjob.h

@@ -6,7 +6,7 @@
 #define FILESTATISTICSJOB_H
 
 #include <dfm-base/dfm_base_global.h>
-#include "fileutils.h"
+#include <dfm-base/utils/fileutils.h>
 
 #include <QThread>
 

src/dfm-base/utils/universalutils.cpp

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#include "universalutils.h"
+#include <dfm-base/utils/universalutils.h>
 
 #include <dfm-base/dfm_event_defines.h>
 #include <dfm-base/base/schemefactory.h>

src/dfm-base/utils/windowutils.cpp

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#include "windowutils.h"
+#include <dfm-base/utils/windowutils.h>
 
 #include <QApplication>
 #include <QScreen>

src/dfm-base/widgets/dfmstatusbar/basicstatusbar.cpp

@@ -4,8 +4,8 @@
 
 #include "basicstatusbar.h"
 #include "private/basicstatusbar_p.h"
-#include "utils/fileutils.h"
 
+#include <dfm-base/utils/fileutils.h>
 #include <dfm-base/base/application/application.h>
 
 #include <DAnchors>

src/dfm-gui/applet.cpp

@@ -4,6 +4,7 @@
 
 #include <dfm-gui/applet.h>
 #include <dfm-gui/containment.h>
+#include <dfm-gui/panel.h>
 #include "applet_p.h"
 #include "containment_p.h"
 
@@ -21,6 +22,8 @@ AppletPrivate::~AppletPrivate()
     // 释放关联的 QQuickItem
     if (rootObject && QJSEngine::CppOwnership == QJSEngine::objectOwnership(rootObject)) {
         Q_ASSERT_X(rootObject->parent() == q_ptr, "AppletItem memory management", "Undefined behaviour, unmanaged QQuickItem");
+
+        QObject::disconnect(rootObject, nullptr, q_ptr, nullptr);
         rootObject->deleteLater();
     }
 }
@@ -119,18 +122,32 @@ QObject *Applet::rootObject() const
  */
 Containment *Applet::containment() const
 {
-    Containment *contain = nullptr;
     QObject *parent = this->parent();
+    while (parent) {
+        if (Containment *contain = qobject_cast<Containment *>(parent)) {
+            return contain;
+        }
+        parent = parent->parent();
+    }
 
+    return nullptr;
+}
+
+/*!
+ * \brief 返回当前 Applet 的顶层 Panel , 会递归向上查找
+ * \return Panel 指针，若没有被 Panel 管理，返回 nullptr
+ */
+Panel *Applet::panel() const
+{
+    QObject *parent = this->parent();
     while (parent) {
-        if (Containment *tmp = qobject_cast<Containment *>(parent)) {
-            contain = tmp;
-            break;
+        if (Panel *panel = qobject_cast<Panel *>(parent)) {
+            return panel;
         }
         parent = parent->parent();
     }
 
-    return contain;
+    return nullptr;
 }
 
 /*!

src/dfm-gui/applet_p.h

@@ -22,7 +22,7 @@ class AppletPrivate
     explicit AppletPrivate(Applet *q);
     virtual ~AppletPrivate();
 
-    void setRootObject(QObject *item);
+    virtual void setRootObject(QObject *item);
     void dumpAppletTreeImpl(int level = 0);
 
     Applet *q_ptr;

src/dfm-gui/appletfactory.cpp

@@ -46,7 +46,7 @@ bool AppletFactory::regCreator(const AppletFactory::Key &url, CreateFunc creator
     return true;
 }
 
-AppletFactory::AppletPtr AppletFactory::create(const AppletFactory::Key &url, QString *errorString)
+AppletFactory::AppletPtr AppletFactory::create(const AppletFactory::Key &url, Containment *parent, QString *errorString)
 {
     QString error;
     dfmbase::FinallyUtil finally([&]() {
@@ -60,9 +60,8 @@ AppletFactory::AppletPtr AppletFactory::create(const AppletFactory::Key &url, QS
                 "before create function";
         return nullptr;
     }
-    finally.dismiss();
-    AppletPtr info = constantFunc(url);
 
+    AppletPtr info = constantFunc(url, parent, &error);
     return info;
 }