From b13a361031bb3012bf47d97a581036c13636b510 Mon Sep 17 00:00:00 2001 From: shaojun Date: Sat, 17 Aug 2019 17:33:36 +0800 Subject: [PATCH] feat:add DockItemManager --- frame/controller/dockitemmanager.cpp | 388 +++++++++++++++++++++++++++ frame/controller/dockitemmanager.h | 91 +++++++ 2 files changed, 479 insertions(+) create mode 100644 frame/controller/dockitemmanager.cpp create mode 100644 frame/controller/dockitemmanager.h diff --git a/frame/controller/dockitemmanager.cpp b/frame/controller/dockitemmanager.cpp new file mode 100644 index 000000000..5b822498e --- /dev/null +++ b/frame/controller/dockitemmanager.cpp @@ -0,0 +1,388 @@ +/* + * Copyright (C) 2019 ~ 2019 Deepin Technology Co., Ltd. + * + * Author: wangshaojun + * + * Maintainer: wangshaojun + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "dockitemmanager.h" +#include "item/appitem.h" +#include "item/stretchitem.h" +#include "item/launcheritem.h" +#include "item/pluginsitem.h" +#include "item/traypluginitem.h" +#include "util/docksettings.h" +#include "item/showdesktopitem.h" + +#include +#include + +DockItemManager *DockItemManager::INSTANCE = nullptr; + +DockItemManager::DockItemManager(QObject *parent) + : QObject(parent) + , m_updatePluginsOrderTimer(new QTimer(this)) + , m_appInter(new DBusDock("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this)) + , m_pluginsInter(new DockPluginsController(this)) + , m_containerItem(new ContainerItem) +{ + //固定区域：启动器、显示桌面、多任务视图 + m_itemList.append(new LauncherItem); + // TODO + // m_itemList.append(new ShowDesktopItem); + // m_itemList.append(new MutableTaskItem) + + // 应用区域 + for (auto entry : m_appInter->entries()) { + AppItem *it = new AppItem(entry); + + connect(it, &AppItem::requestActivateWindow, m_appInter, &DBusDock::ActivateWindow, Qt::QueuedConnection); + connect(it, &AppItem::requestPreviewWindow, m_appInter, &DBusDock::PreviewWindow); + connect(it, &AppItem::requestCancelPreview, m_appInter, &DBusDock::CancelPreviewWindow); + + m_itemList.append(it); + } + + // 托盘区域和插件区域 由DockPluginsController获取 + + // 更新插件顺序 + m_updatePluginsOrderTimer->setSingleShot(true); + m_updatePluginsOrderTimer->setInterval(1000); + connect(m_updatePluginsOrderTimer, &QTimer::timeout, this, &DockItemManager::updatePluginsItemOrderKey); + + // 应用信号 + connect(m_appInter, &DBusDock::EntryAdded, this, &DockItemManager::appItemAdded); + connect(m_appInter, &DBusDock::EntryRemoved, this, static_cast(&DockItemManager::appItemRemoved), Qt::QueuedConnection); + connect(m_appInter, &DBusDock::ServiceRestarted, this, &DockItemManager::reloadAppItems); + + // 插件信号 + connect(m_pluginsInter, &DockPluginsController::pluginItemInserted, this, &DockItemManager::pluginItemInserted, Qt::QueuedConnection); + connect(m_pluginsInter, &DockPluginsController::pluginItemRemoved, this, &DockItemManager::pluginItemRemoved, Qt::QueuedConnection); + connect(m_pluginsInter, &DockPluginsController::pluginItemUpdated, this, &DockItemManager::itemUpdated, Qt::QueuedConnection); + connect(m_pluginsInter, &DockPluginsController::fashionTraySizeChanged, this, &DockItemManager::fashionTraySizeChanged, Qt::QueuedConnection); + + // 刷新图标 + QMetaObject::invokeMethod(this, "refershItemsIcon", Qt::QueuedConnection); +} + + +DockItemManager *DockItemManager::instance(QObject *parent) +{ + if (!INSTANCE) + INSTANCE = new DockItemManager(parent); + + return INSTANCE; +} + +const QList> DockItemManager::itemList() const +{ + return m_itemList; +} + +const QList DockItemManager::pluginList() const +{ + return m_pluginsInter->pluginsMap().keys(); +} + +bool DockItemManager::appIsOnDock(const QString &appDesktop) const +{ + return m_appInter->IsOnDock(appDesktop); +} + +bool DockItemManager::itemIsInContainer(DockItem *const item) const +{ + return m_containerItem->contains(item); +} + +void DockItemManager::setDropping(const bool dropping) +{ + m_containerItem->setDropping(dropping); +} + +void DockItemManager::startLoadPlugins() const +{ + QGSettings gsetting("com.deepin.dde.dock", "/com/deepin/dde/dock/"); + + QTimer::singleShot(gsetting.get("delay-plugins-time").toUInt(), m_pluginsInter, &DockPluginsController::startLoader); +} + +void DockItemManager::refershItemsIcon() +{ + for (auto item : m_itemList) { + item->refershIcon(); + item->update(); + } +} + +void DockItemManager::updatePluginsItemOrderKey() +{ + Q_ASSERT(sender() == m_updatePluginsOrderTimer); + + int index = 0; + for (auto item : m_itemList) { + if (item.isNull() || item->itemType() != DockItem::TrayPlugin) + continue; + static_cast(item.data())->setItemSortKey(++index); + } +} + +void DockItemManager::itemMove(DockItem *const moveItem, DockItem *const replaceItem) +{ + Q_ASSERT(moveItem != replaceItem); + + const DockItem::ItemType moveType = moveItem->itemType(); + const DockItem::ItemType replaceType = replaceItem->itemType(); + + // app move + if (moveType == DockItem::App || moveType == DockItem::Placeholder) + if (replaceType != DockItem::App && replaceType != DockItem::Stretch) + return; + + // plugins move + if (moveType == DockItem::Plugins || moveType == DockItem::TrayPlugin) + if (replaceType != DockItem::Plugins && replaceType != DockItem::TrayPlugin) + return; + + const int moveIndex = m_itemList.indexOf(moveItem); + const int replaceIndex = replaceType == DockItem::Stretch ? + // disable insert after placeholder item + m_itemList.indexOf(replaceItem) - 1 : + m_itemList.indexOf(replaceItem); + + m_itemList.removeAt(moveIndex); + m_itemList.insert(replaceIndex, moveItem); + emit itemMoved(moveItem, replaceIndex); + + // update plugins sort key if order changed + if (moveType == DockItem::Plugins || replaceType == DockItem::Plugins + || moveType == DockItem::TrayPlugin || replaceType == DockItem::TrayPlugin) + m_updatePluginsOrderTimer->start(); + + // for app move, index 0 is launcher item, need to pass it. + if (moveType == DockItem::App && replaceType == DockItem::App) + m_appInter->MoveEntry(moveIndex - 1, replaceIndex - 1); + + refreshFSTItemSpliterVisible(); +} + +void DockItemManager::itemDroppedIntoContainer(DockItem *const item) +{ + Q_ASSERT(item->itemType() == DockItem::Plugins || item->itemType() == DockItem::TrayPlugin); + + PluginsItem *pi = static_cast(item); + + if (!pi->allowContainer()) + return; + if (m_containerItem->contains(item)) + return; + + // remove from main panel + emit itemRemoved(item); + m_itemList.removeOne(item); + + // add to container + pi->setInContainer(true); + m_containerItem->addItem(item); +} + +void DockItemManager::itemDragOutFromContainer(DockItem *const item) +{ +// qDebug() << "drag out from container" << item; + + // remove from container + m_containerItem->removeItem(item); + + // insert to panel + switch (item->itemType()) { + case DockItem::Plugins: + case DockItem::TrayPlugin: + static_cast(item)->setInContainer(false); + pluginItemInserted(static_cast(item)); + break; + default: Q_UNREACHABLE(); + } +} + +// refresh right spliter visible of fashion tray plugin item +void DockItemManager::refreshFSTItemSpliterVisible() +{ + if (DockSettings::Instance().displayMode() != Dock::DisplayMode::Fashion) { + return; + } + + for (int i = 0; i < m_itemList.size(); ++i) { + if (m_itemList.at(i)->itemType() == DockItem::ItemType::TrayPlugin) { + static_cast(m_itemList.at(i).data()) + ->setRightSplitVisible(i != (m_itemList.size() - 1)); + break; + } + } +} + +void DockItemManager::appItemAdded(const QDBusObjectPath &path, const int index) +{ + // the first index is launcher item + int insertIndex = 1; + + // -1 for append to app list end + if (index != -1) { + insertIndex += index; + } else { + for (auto item : m_itemList) + if (item->itemType() == DockItem::App) + ++insertIndex; + } + + AppItem *item = new AppItem(path); + + connect(item, &AppItem::requestActivateWindow, m_appInter, &DBusDock::ActivateWindow, Qt::QueuedConnection); + connect(item, &AppItem::requestPreviewWindow, m_appInter, &DBusDock::PreviewWindow); + connect(item, &AppItem::requestCancelPreview, m_appInter, &DBusDock::CancelPreviewWindow); + + m_itemList.insert(insertIndex, item); + emit itemInserted(insertIndex, item); +} + +void DockItemManager::appItemRemoved(const QString &appId) +{ + for (int i(0); i != m_itemList.size(); ++i) { + if (m_itemList[i]->itemType() != DockItem::App) + continue; + + AppItem *app = static_cast(m_itemList[i].data()); + if (!app) { + continue; + } + if (!app->isValid() || app->appId() == appId) { + appItemRemoved(app); + } + } +} + +void DockItemManager::appItemRemoved(AppItem *appItem) +{ + emit itemRemoved(appItem); + m_itemList.removeOne(appItem); + appItem->deleteLater(); +} + +void DockItemManager::pluginItemInserted(PluginsItem *item) +{ + // check item is in container + if (item->allowContainer() && item->isInContainer()) { + emit itemManaged(item); + return itemDroppedIntoContainer(item); + } + + // find first plugins item position + int firstPluginPosition = -1; + for (int i(0); i != m_itemList.size(); ++i) { + DockItem::ItemType type = m_itemList[i]->itemType(); + if (type != DockItem::Plugins && type != DockItem::TrayPlugin) + continue; + + firstPluginPosition = i; + break; + } + + if (firstPluginPosition == -1) + firstPluginPosition = m_itemList.size(); + + // find insert position + int insertIndex = 0; + const int itemSortKey = item->itemSortKey(); + if (itemSortKey == -1 || firstPluginPosition == -1) { + insertIndex = m_itemList.size(); + } else if (itemSortKey == 0) { + insertIndex = firstPluginPosition; + } else { + insertIndex = m_itemList.size(); + for (int i(firstPluginPosition + 1); i != m_itemList.size() + 1; ++i) { + PluginsItem *pItem = static_cast(m_itemList[i - 1].data()); + Q_ASSERT(pItem); + + const int sortKey = pItem->itemSortKey(); + if (sortKey != -1 && itemSortKey > sortKey) + continue; + insertIndex = i - 1; + break; + } + } + + m_itemList.insert(insertIndex, item); + emit itemInserted(insertIndex, item); + + refreshFSTItemSpliterVisible(); +} + +void DockItemManager::pluginItemRemoved(PluginsItem *item) +{ + item->hidePopup(); + + if (m_containerItem->contains(item)) + m_containerItem->removeItem(item); + else + emit itemRemoved(item); + + m_itemList.removeOne(item); +} + +void DockItemManager::reloadAppItems() +{ + // remove old item + for (auto item : m_itemList) + if (item->itemType() == DockItem::App) + appItemRemoved(static_cast(item.data())); + + // append new item + for (auto path : m_appInter->entries()) + appItemAdded(path, -1); +} + +void DockItemManager::sortPluginItems() +{ + int firstPluginIndex = -1; + for (int i(0); i != m_itemList.size(); ++i) { + DockItem::ItemType type = m_itemList[i]->itemType(); + if (type == DockItem::Plugins || type == DockItem::TrayPlugin) { + firstPluginIndex = i; + break; + } + } + + if (firstPluginIndex == -1) + return; + + std::sort(m_itemList.begin() + firstPluginIndex, m_itemList.end(), [](DockItem * a, DockItem * b) -> bool { + PluginsItem *pa = static_cast(a); + PluginsItem *pb = static_cast(b); + + const int aKey = pa->itemSortKey(); + const int bKey = pb->itemSortKey(); + + if (bKey == -1) + return true; + if (aKey == -1) + return false; + + return aKey < bKey; + }); + + // reset order + for (int i(firstPluginIndex); i != m_itemList.size(); ++i) + emit itemMoved(m_itemList[i], i); +} diff --git a/frame/controller/dockitemmanager.h b/frame/controller/dockitemmanager.h new file mode 100644 index 000000000..326a3dd8f --- /dev/null +++ b/frame/controller/dockitemmanager.h @@ -0,0 +1,91 @@ +/* + * Copyright (C) 2019 ~ 2019 Deepin Technology Co., Ltd. + * + * Author: wangshaojun + * + * Maintainer: wangshaojun + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef DOCKITEMMANAGER_H +#define DOCKITEMMANAGER_H + +#include "dockpluginscontroller.h" +#include "pluginsiteminterface.h" +#include "item/dockitem.h" +#include "item/stretchitem.h" +#include "item/appitem.h" +#include "item/placeholderitem.h" +#include "item/containeritem.h" + +#include + +#include + +using DBusDock = com::deepin::dde::daemon::Dock; + +class DockItemManager : public QObject +{ + Q_OBJECT + +public: + static DockItemManager *instance(QObject *parent = nullptr); + + const QList > itemList() const; + const QList pluginList() const; + bool appIsOnDock(const QString &appDesktop) const; + bool itemIsInContainer(DockItem *const item) const; + void setDropping(const bool dropping); + void startLoadPlugins() const; + +signals: + void itemInserted(const int index, DockItem *item) const; + void itemRemoved(DockItem *item) const; + void itemMoved(DockItem *item, const int index) const; + void itemManaged(DockItem *item) const; + void itemUpdated(DockItem *item) const; + void fashionTraySizeChanged(const QSize &traySize) const; + +public slots: + void refershItemsIcon(); + void sortPluginItems(); + void updatePluginsItemOrderKey(); + void itemMove(DockItem *const moveItem, DockItem *const replaceItem); + void itemDroppedIntoContainer(DockItem *const item); + void itemDragOutFromContainer(DockItem *const item); + void refreshFSTItemSpliterVisible(); + +private: + explicit DockItemManager(QObject *parent = nullptr); + void appItemAdded(const QDBusObjectPath &path, const int index); + void appItemRemoved(const QString &appId); + void appItemRemoved(AppItem *appItem); + void pluginItemInserted(PluginsItem *item); + void pluginItemRemoved(PluginsItem *item); + void reloadAppItems(); + +private: + QTimer *m_updatePluginsOrderTimer; + DBusDock *m_appInter; + DockPluginsController *m_pluginsInter; + StretchItem *m_placeholderItem; + ContainerItem *m_containerItem; + + static DockItemManager *INSTANCE; + + QList> m_itemList; +}; + +#endif // DOCKITEMMANAGER_H