linuxdeepin · Johnson-zs · Jul 3, 2024 · Jul 1, 2024
diff --git a/include/dfm-gui/appletfactory.h b/include/dfm-gui/appletfactory.h
@@ -24,6 +24,8 @@ class AppletFactory
     bool regCreator(const QString &id, CreateFunc creator, QString *errorString = nullptr);
     Applet *create(const QString &id, Containment *parent = nullptr, QString *errorString = nullptr);
 
+    QUrl pluginComponent(const QString &plugin, const QString &qmlFile, QString *errorString = nullptr) const;
+
 private:
     explicit AppletFactory();
     QScopedPointer<AppletFactoryData> d;

diff --git a/src/dfm-gui/appletfactory.cpp b/src/dfm-gui/appletfactory.cpp
@@ -86,6 +86,32 @@ Applet *AppletFactory::create(const QString &id, Containment *parent, QString *e
     return info;
 }
 
+QUrl AppletFactory::pluginComponent(const QString &plugin, const QString &qmlFile, QString *errorString) const
+{
+    QString error;
+    dfmbase::FinallyUtil finally([&]() {
+        if (errorString)
+            *errorString = error;
+    });
+
+    // 根据插件路径 + 文件名查找
+    dpf::PluginMetaObjectPointer info = dpf::LifeCycle::pluginMetaObj(plugin);
+    if (!info) {
+        error = QStringLiteral("Plugin not found");
+        return QUrl();
+    }
+
+    QString pluginPath = QFileInfo(info->fileName()).absolutePath();
+    QString fullPath = pluginPath + QDir::separator() + info->name() + QDir::separator() + qmlFile;
+    if (!QFile::exists(fullPath)) {
+        error = QStringLiteral("Qml file not exists");
+        return QUrl();
+    }
+
+    finally.dismiss();
+    return QUrl::fromLocalFile(fullPath);
+}
+
 class ViewAppletFacotryData
 {
 public:
@@ -125,36 +151,18 @@ ViewAppletFactory *ViewAppletFactory::instance()
 bool ViewAppletFactory::regCreator(const QString &plugin, const QString &qmlFile, const QString &scheme,
                                    CreateFunc creator, QString *errorString)
 {
-    QString error;
-    dfmbase::FinallyUtil finally([&]() {
-        if (errorString)
-            *errorString = error;
-    });
-
-    // 根据插件路径 + 文件名查找
-    dpf::PluginMetaObjectPointer info = dpf::LifeCycle::pluginMetaObj(plugin);
-    if (!info) {
-        error = QStringLiteral("Plugin not found");
-        return false;
-    }
-
-    QString pluginPath = QFileInfo(info->fileName()).absolutePath();
-    QString fullPath = pluginPath + QDir::separator() + info->name() + QDir::separator() + qmlFile;
-    if (!QFile::exists(fullPath)) {
-        error = QStringLiteral("Qml file not exists");
+    QUrl qmlUrl = AppletFactory::instance()->pluginComponent(plugin, qmlFile, errorString);
+    if (!qmlUrl.isValid())
         return false;
-    }
-
-    QUrl qmlUrl = QUrl::fromLocalFile(fullPath);
 
     if (d->constructList.contains(scheme)) {
-        error = "The current url has registered "
-                "the associated construction class";
+        if (errorString)
+            *errorString = "The current url has registered "
+                           "the associated construction class";
         return false;
     }
 
     d->constructList.insert(scheme, { qmlUrl, creator });
-    finally.dismiss();
     return true;
 }
 

diff --git a/src/dfm-gui/windowmanager.cpp b/src/dfm-gui/windowmanager.cpp
@@ -355,7 +355,7 @@ WindowManager::Handle WindowManager::createWindow(const QUrl &url, const QString
     Handle handle = d->createQuickWindow(pluginName, quickId, var);
     if (handle) {
         handle->loadState();
-        handle->setCurrentUrl(url);
+        handle->setCurrentUrl(showedUrl);
         d->connectWindowHandle(handle);
 
         if (1 == d->windows.size()) {

diff --git a/src/plugins/filemanager/core/dfmplugin-core/FileWindow.qml b/src/plugins/filemanager/core/dfmplugin-core/FileWindow.qml
@@ -16,8 +16,8 @@ ApplicationWindow {
     DWindow.enabled: true
     flags: Qt.Window | Qt.WindowMinMaxButtonsHint | Qt.WindowCloseButtonHint | Qt.WindowTitleHint
     height: 600
-    minimumHeight: 380
-    minimumWidth: 600
+    minimumHeight: 600
+    minimumWidth: 800
     width: 800
 
     // TODO: 待评估方案
@@ -51,15 +51,13 @@ ApplicationWindow {
     // For local module test
     ActionMenu {
     }
-
     Connections {
         function onWidthChanged(width) {
         }
 
         enabled: Window.window !== null
         target: Window.window
     }
-
     RowLayout {
         anchors.fill: parent
 
@@ -81,14 +79,12 @@ ApplicationWindow {
                     Layout.preferredWidth: parent.width
                     color: "lightyellow"
                 }
-
                 LayoutItemProxy {
                     id: sidebar
 
                     Layout.fillHeight: true
                 }
             }
-
             AnimationHSpliter {
                 id: spliter
 
@@ -107,7 +103,6 @@ ApplicationWindow {
                 }
             }
         }
-
         ColumnLayout {
             Layout.fillHeight: true
             Layout.fillWidth: true
@@ -117,7 +112,6 @@ ApplicationWindow {
 
                 onTargetChanged: target => {}
             }
-
             RowLayout {
                 Layout.fillHeight: true
                 Layout.fillWidth: true
@@ -127,7 +121,6 @@ ApplicationWindow {
                     id: workspace
 
                 }
-
                 LayoutItemProxy {
                     id: detailspace
 

diff --git a/src/plugins/filemanager/core/dfmplugin-sidebar/Sidebar.qml b/src/plugins/filemanager/core/dfmplugin-sidebar/Sidebar.qml
@@ -37,9 +37,9 @@ AppletItem {
             showDirsFirst: true
         }
     }
-    Text {
-        color: "lightgray"
-        font.pointSize: 36
-        text: "sidebar"
-    }
+    // Text {
+    //     color: "lightgray"
+    //     font.pointSize: 36
+    //     text: "sidebar"
+    // }
 }
diff --git a/src/plugins/filemanager/core/dfmplugin-workspace/CMakeLists.txt b/src/plugins/filemanager/core/dfmplugin-workspace/CMakeLists.txt
@@ -27,6 +27,7 @@ target_include_directories(${PROJECT_NAME}
 
 target_link_libraries(${PROJECT_NAME}
     DFM::base
+    DFM::gui
     DFM::framework
     ${DtkWidget_LIBRARIES}
 )

diff --git a/src/plugins/filemanager/core/dfmplugin-workspace/Workspace.qml b/src/plugins/filemanager/core/dfmplugin-workspace/Workspace.qml
diff --git a/src/plugins/filemanager/core/dfmplugin-workspace/dfmplugin_workspace_global.h b/src/plugins/filemanager/core/dfmplugin-workspace/dfmplugin_workspace_global.h
@@ -31,7 +31,7 @@ enum class DirOpenMode : uint8_t {
     kOpenInCurrentWindow,
     kOpenNewWindow,
     kAwaysInCurrentWindow,
-    //kForceOpenNewWindow // Todo(yanghao): ???
+    // kForceOpenNewWindow // Todo(yanghao): ???
 };
 
 // view defines
@@ -89,6 +89,8 @@ inline constexpr int kMaxTabCount { 8 };
 // view select box
 inline constexpr int kSelectBoxLineWidth { 2 };
 
+inline char kWorkspaceUri[] { "org.deepin.filemanager.workspace" };
+
 namespace PropertyKey {
 inline constexpr char kScheme[] { "Property_Key_Scheme" };
 inline constexpr char kKeepShow[] { "Property_Key_KeepShow" };

diff --git a/src/plugins/filemanager/core/dfmplugin-workspace/fileviewcontainment.cpp b/src/plugins/filemanager/core/dfmplugin-workspace/fileviewcontainment.cpp
@@ -0,0 +1,26 @@
+// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include "fileviewcontainment.h"
+
+#include <dfm-gui/panel.h>
+#include <dfm-gui/applet.h>
+#include <dfm-gui/appletitem.h>
+#include <dfm-gui/appletfactory.h>
+
+#include <dfm-framework/dpf.h>
+#include <dfm-base/dfm_event_defines.h>
+
+using namespace dfmgui;
+using namespace dfmplugin_workspace;
+
+FileViewContainment::FileViewContainment(QObject *parent)
+    : Containment(parent)
+{
+}
+
+quint64 FileViewContainment::getWinId()
+{
+    return this->panel()->windId();
+}
diff --git a/src/plugins/filemanager/core/dfmplugin-workspace/fileviewcontainment.h b/src/plugins/filemanager/core/dfmplugin-workspace/fileviewcontainment.h
@@ -0,0 +1,29 @@
+// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#ifndef FILEVIEWCONTAINMENT_H
+#define FILEVIEWCONTAINMENT_H
+
+#include <dfm-gui/containment.h>
+
+#include <QObject>
+
+DFMGUI_BEGIN_NAMESPACE
+class AppletItem;
+DFMGUI_END_NAMESPACE
+
+namespace dfmplugin_workspace {
+
+class FileViewContainment : public dfmgui::Containment
+{
+    Q_OBJECT
+public:
+    explicit FileViewContainment(QObject *parent = nullptr);
+
+    Q_INVOKABLE quint64 getWinId();
+};
+
+}   // namespace dfmplugin_workspace
+
+#endif   // FILEVIEWCONTAINMENT_H
diff --git a/src/plugins/filemanager/core/dfmplugin-workspace/models/fileitemdata.cpp b/src/plugins/filemanager/core/dfmplugin-workspace/models/fileitemdata.cpp
@@ -29,6 +29,7 @@ FileItemData::FileItemData(const SortInfoPointer &info, FileItemData *parent)
       url(info->fileUrl()),
       sortInfo(info)
 {
+    const_cast<FileItemData *>(this)->info = InfoFactory::create<FileInfo>(url);
 }
 
 void FileItemData::setParentData(FileItemData *p)
@@ -111,7 +112,12 @@ QVariant FileItemData::data(int role) const
         return "-";
     }
     case kItemIconRole:
-        return fileIcon();
+        // return fileIcon();
+        if (info->isFile())
+            // return "file:///usr/share/icons/bloom/mimetypes/32/application-json.svg";
+            return "application-json";
+        // return "file:///usr/share/icons/bloom/places/32/folder.svg";
+        return "folder";
     case kItemFileSizeRole:
         if (info)
             return info->displayOf(DisPlayInfoType::kSizeDisplayName);