diff --git a/dde-dock/dde-dock.pro b/dde-dock/dde-dock.pro index e0be30f48..ddd0f5af4 100644 --- a/dde-dock/dde-dock.pro +++ b/dde-dock/dde-dock.pro @@ -24,7 +24,6 @@ SOURCES += \ src/Widgets/appitem.cpp \ src/Panel/panelmenu.cpp \ src/Controller/dockmodedata.cpp \ - src/Controller/dockconstants.cpp \ src/Controller/appmanager.cpp \ src/DBus/dbusentrymanager.cpp \ src/DBus/dbusentryproxyer.cpp \ @@ -52,7 +51,6 @@ HEADERS += \ src/Widgets/appitem.h \ src/Panel/panelmenu.h \ src/Controller/dockmodedata.h \ - src/Controller/dockconstants.h \ src/Controller/appmanager.h \ src/DBus/dbusentrymanager.h \ src/DBus/dbusentryproxyer.h \ @@ -64,9 +62,10 @@ HEADERS += \ src/Widgets/arrowrectangle.h\ src/dockpluginproxyinterface.h \ src/dockpluginproxy.h \ - src/dockpluginmanager.h\ src/DBus/dbusmenumanager.h \ - src/DBus/dbusmenu.h + src/DBus/dbusmenu.h \ + src/dockpluginmanager.h \ + src/dockconstants.h RESOURCES += \ images.qrc \ diff --git a/dde-dock/src/Controller/dockconstants.cpp b/dde-dock/src/Controller/dockconstants.cpp deleted file mode 100644 index d4b23f0bf..000000000 --- a/dde-dock/src/Controller/dockconstants.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "dockconstants.h" - -DockConstants::DockConstants(QObject *parent) : QObject(parent) -{ - -} - diff --git a/dde-dock/src/Controller/dockconstants.h b/dde-dock/src/Controller/dockconstants.h deleted file mode 100644 index 4f23a4527..000000000 --- a/dde-dock/src/Controller/dockconstants.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef DOCKCONSTANTS_H -#define DOCKCONSTANTS_H - -#include - -class DockConstants : public QObject -{ - Q_OBJECT -public: - explicit DockConstants(QObject *parent = 0); - - enum DockMode { - FashionMode, - EfficientMode, - ClassicMode - }; - -signals: - -public slots: -}; - -#endif // DOCKCONSTANTS_H diff --git a/dde-dock/src/Controller/dockmodedata.cpp b/dde-dock/src/Controller/dockmodedata.cpp index cbcfb2ebf..9bee6cb57 100644 --- a/dde-dock/src/Controller/dockmodedata.cpp +++ b/dde-dock/src/Controller/dockmodedata.cpp @@ -14,14 +14,14 @@ DockModeData * DockModeData::getInstants() return dockModeData; } -DockConstants::DockMode DockModeData::getDockMode() +Dock::DockMode DockModeData::getDockMode() { return m_currentMode; } -void DockModeData::setDockMode(DockConstants::DockMode value) +void DockModeData::setDockMode(Dock::DockMode value) { - DockConstants::DockMode tmpValue = m_currentMode; + Dock::DockMode tmpValue = m_currentMode; m_currentMode = value; emit dockModeChanged(value, tmpValue); @@ -31,11 +31,11 @@ int DockModeData::getDockHeight() { switch (m_currentMode) { - case DockConstants::FashionMode: + case Dock::FashionMode: return 60; - case DockConstants::EfficientMode: + case Dock::EfficientMode: return 50; - case DockConstants::ClassicMode: + case Dock::ClassicMode: return 40; default: return 40; @@ -46,11 +46,11 @@ int DockModeData::getItemHeight() { switch (m_currentMode) { - case DockConstants::FashionMode: + case Dock::FashionMode: return 60; - case DockConstants::EfficientMode: + case Dock::EfficientMode: return 50; - case DockConstants::ClassicMode: + case Dock::ClassicMode: return 40; default: return 40; @@ -61,11 +61,11 @@ int DockModeData::getNormalItemWidth() { switch (m_currentMode) { - case DockConstants::FashionMode: + case Dock::FashionMode: return 60; - case DockConstants::EfficientMode: + case Dock::EfficientMode: return 60; - case DockConstants::ClassicMode: + case Dock::ClassicMode: return 40; default: return 40; @@ -76,11 +76,11 @@ int DockModeData::getActivedItemWidth() { switch (m_currentMode) { - case DockConstants::FashionMode: + case Dock::FashionMode: return 60; - case DockConstants::EfficientMode: + case Dock::EfficientMode: return 60; - case DockConstants::ClassicMode: + case Dock::ClassicMode: return 150; default: return 60; @@ -91,11 +91,11 @@ int DockModeData::getAppItemSpacing() { switch (m_currentMode) { - case DockConstants::FashionMode: + case Dock::FashionMode: return 10; - case DockConstants::EfficientMode: + case Dock::EfficientMode: return 15; - case DockConstants::ClassicMode: + case Dock::ClassicMode: return 8; default: return 8; @@ -106,11 +106,11 @@ int DockModeData::getAppIconSize() { switch (m_currentMode) { - case DockConstants::FashionMode: + case Dock::FashionMode: return 48; - case DockConstants::EfficientMode: + case Dock::EfficientMode: return 48; - case DockConstants::ClassicMode: + case Dock::ClassicMode: return 32; default: return 32; @@ -121,11 +121,11 @@ int DockModeData::getAppletsItemHeight() { switch (m_currentMode) { - case DockConstants::FashionMode: + case Dock::FashionMode: return 60; - case DockConstants::EfficientMode: + case Dock::EfficientMode: return 50; - case DockConstants::ClassicMode: + case Dock::ClassicMode: return 40; default: return 40; @@ -136,11 +136,11 @@ int DockModeData::getAppletsItemWidth() { switch (m_currentMode) { - case DockConstants::FashionMode: + case Dock::FashionMode: return 60; - case DockConstants::EfficientMode: + case Dock::EfficientMode: return 50; - case DockConstants::ClassicMode: + case Dock::ClassicMode: return 50; default: return 50; @@ -151,11 +151,11 @@ int DockModeData::getAppletsItemSpacing() { switch (m_currentMode) { - case DockConstants::FashionMode: + case Dock::FashionMode: return 10; - case DockConstants::EfficientMode: + case Dock::EfficientMode: return 10; - case DockConstants::ClassicMode: + case Dock::ClassicMode: return 10; default: return 10; @@ -166,11 +166,11 @@ int DockModeData::getAppletsIconSize() { switch (m_currentMode) { - case DockConstants::FashionMode: + case Dock::FashionMode: return 48; - case DockConstants::EfficientMode: + case Dock::EfficientMode: return 24; - case DockConstants::ClassicMode: + case Dock::ClassicMode: return 24; default: return 24; diff --git a/dde-dock/src/Controller/dockmodedata.h b/dde-dock/src/Controller/dockmodedata.h index 8f6250273..70ef7c0e0 100644 --- a/dde-dock/src/Controller/dockmodedata.h +++ b/dde-dock/src/Controller/dockmodedata.h @@ -11,8 +11,8 @@ class DockModeData : public QObject public: static DockModeData * getInstants(); - DockConstants::DockMode getDockMode(); - void setDockMode(DockConstants::DockMode value); + Dock::DockMode getDockMode(); + void setDockMode(Dock::DockMode value); int getDockHeight(); int getItemHeight(); @@ -26,7 +26,7 @@ public: int getAppletsIconSize(); signals: - void dockModeChanged(DockConstants::DockMode newMode,DockConstants::DockMode oldMode); + void dockModeChanged(Dock::DockMode newMode,Dock::DockMode oldMode); private: explicit DockModeData(QObject *parent = 0); @@ -34,7 +34,7 @@ private: private: static DockModeData * dockModeData; - DockConstants::DockMode m_currentMode = DockConstants::EfficientMode; + Dock::DockMode m_currentMode = Dock::EfficientMode; }; diff --git a/dde-dock/src/Panel/panel.cpp b/dde-dock/src/Panel/panel.cpp index 003934a33..6df49c51a 100644 --- a/dde-dock/src/Panel/panel.cpp +++ b/dde-dock/src/Panel/panel.cpp @@ -23,8 +23,8 @@ Panel::Panel(QWidget *parent) connect(leftLayout, SIGNAL(contentsWidthChange()),this, SLOT(slotLayoutContentsWidthChanged())); connect(rightLayout, SIGNAL(contentsWidthChange()), this, SLOT(slotLayoutContentsWidthChanged())); - connect(dockCons, SIGNAL(dockModeChanged(DockConstants::DockMode,DockConstants::DockMode)), - this, SLOT(slotDockModeChanged(DockConstants::DockMode,DockConstants::DockMode))); + connect(dockCons, SIGNAL(dockModeChanged(Dock::DockMode,Dock::DockMode)), + this, SLOT(slotDockModeChanged(Dock::DockMode,Dock::DockMode))); DockPluginManager *pluginManager = new DockPluginManager(this); QList proxies = pluginManager->getAll(); @@ -99,7 +99,7 @@ void Panel::slotExitedMask() // leftLayout->relayout(); } -void Panel::slotDockModeChanged(DockConstants::DockMode newMode, DockConstants::DockMode oldMode) +void Panel::slotDockModeChanged(Dock::DockMode newMode, Dock::DockMode oldMode) { leftLayout->relayout(); rightLayout->relayout(); @@ -115,7 +115,7 @@ void Panel::slotLayoutContentsWidthChanged() { reanchorsLayout(dockCons->getDockMode()); - if (dockCons->getDockMode() == DockConstants::FashionMode) + if (dockCons->getDockMode() == Dock::FashionMode) { this->resize(leftLayout->getContentsWidth() + rightLayout->getContentsWidth(),dockCons->getDockHeight()); this->move((parentWidget->width() - leftLayout->getContentsWidth() - rightLayout->getContentsWidth()) / 2,0); @@ -158,9 +158,9 @@ void Panel::mouseReleaseEvent(QMouseEvent *event) } -void Panel::reanchorsLayout(DockConstants::DockMode mode) +void Panel::reanchorsLayout(Dock::DockMode mode) { - if (mode == DockConstants::FashionMode) + if (mode == Dock::FashionMode) { leftLayout->resize(leftLayout->getContentsWidth() + dockCons->getAppItemSpacing(),dockCons->getDockHeight()); diff --git a/dde-dock/src/Panel/panel.h b/dde-dock/src/Panel/panel.h index c3ce5d0d8..b039898a3 100644 --- a/dde-dock/src/Panel/panel.h +++ b/dde-dock/src/Panel/panel.h @@ -32,7 +32,7 @@ public slots: void slotExitedMask(); private slots: - void slotDockModeChanged(DockConstants::DockMode newMode,DockConstants::DockMode oldMode); + void slotDockModeChanged(Dock::DockMode newMode,Dock::DockMode oldMode); void slotLayoutContentsWidthChanged(); void slotAddAppItem(AppItem *item); @@ -43,7 +43,7 @@ protected: void mouseReleaseEvent(QMouseEvent *event); private: - void reanchorsLayout(DockConstants::DockMode mode); + void reanchorsLayout(Dock::DockMode mode); void showMenu(); void hideMenu(); diff --git a/dde-dock/src/Panel/panelmenu.cpp b/dde-dock/src/Panel/panelmenu.cpp index d06aa233b..7c974b840 100644 --- a/dde-dock/src/Panel/panelmenu.cpp +++ b/dde-dock/src/Panel/panelmenu.cpp @@ -44,20 +44,20 @@ PanelMenu::PanelMenu(QWidget *parent) : QWidget(parent) void PanelMenu::changeToFashionMode() { qWarning() << "Change to fashion mode..."; - dockCons->setDockMode(DockConstants::FashionMode); + dockCons->setDockMode(Dock::FashionMode); this->hide(); } void PanelMenu::changeToEfficientMode() { qWarning() << "Change to efficient mode..."; - dockCons->setDockMode(DockConstants::EfficientMode); + dockCons->setDockMode(Dock::EfficientMode); this->hide(); } void PanelMenu::changeToClassicMode() { qWarning() << "Change to classic mode..."; - dockCons->setDockMode(DockConstants::ClassicMode); + dockCons->setDockMode(Dock::ClassicMode); this->hide(); } diff --git a/dde-dock/src/Widgets/appitem.cpp b/dde-dock/src/Widgets/appitem.cpp index 66715eefa..ca6bfd5aa 100644 --- a/dde-dock/src/Widgets/appitem.cpp +++ b/dde-dock/src/Widgets/appitem.cpp @@ -36,9 +36,9 @@ AppItemData AppItem::itemData() const return m_itemData; } -void AppItem::slotDockModeChanged(DockConstants::DockMode newMode, DockConstants::DockMode oldMode) +void AppItem::slotDockModeChanged(Dock::DockMode newMode, Dock::DockMode oldMode) { - if (newMode == DockConstants::FashionMode) + if (newMode == Dock::FashionMode) { appBackground->setVisible(false); } @@ -54,13 +54,13 @@ void AppItem::slotDockModeChanged(DockConstants::DockMode newMode, DockConstants void AppItem::reanchorIcon() { switch (dockCons->getDockMode()) { - case DockConstants::FashionMode: + case Dock::FashionMode: m_appIcon->move((width() - m_appIcon->width()) / 2, 0); break; - case DockConstants::EfficientMode: + case Dock::EfficientMode: m_appIcon->move((width() - m_appIcon->width()) / 2, (height() - m_appIcon->height()) / 2); break; - case DockConstants::ClassicMode: + case Dock::ClassicMode: m_appIcon->move((height() - m_appIcon->height()) / 2, (height() - m_appIcon->height()) / 2); default: break; diff --git a/dde-dock/src/Widgets/appitem.h b/dde-dock/src/Widgets/appitem.h index 853236839..0d3ba5ce2 100644 --- a/dde-dock/src/Widgets/appitem.h +++ b/dde-dock/src/Widgets/appitem.h @@ -60,7 +60,7 @@ protected: void dropEvent(QDropEvent * event); private slots: - void slotDockModeChanged(DockConstants::DockMode newMode,DockConstants::DockMode oldMode); + void slotDockModeChanged(Dock::DockMode newMode,Dock::DockMode oldMode); void reanchorIcon(); void resizeBackground(); void dbusDataChanged(const QString &key, const QString &value); diff --git a/dde-dock/src/dockconstants.h b/dde-dock/src/dockconstants.h new file mode 100644 index 000000000..bd614ee75 --- /dev/null +++ b/dde-dock/src/dockconstants.h @@ -0,0 +1,14 @@ +#ifndef DOCKCONSTANTS_H +#define DOCKCONSTANTS_H + +namespace Dock { + +enum DockMode { + FashionMode, + EfficientMode, + ClassicMode +}; + +} + +#endif // DOCKCONSTANTS_H diff --git a/dde-dock/src/mainwidget.cpp b/dde-dock/src/mainwidget.cpp index d2369ef47..cb0143e67 100644 --- a/dde-dock/src/mainwidget.cpp +++ b/dde-dock/src/mainwidget.cpp @@ -13,11 +13,11 @@ MainWidget::MainWidget(QWidget *parent) this->setAttribute(Qt::WA_TranslucentBackground); this->move(0,rec.height()); - connect(DockModeData::getInstants(), SIGNAL(dockModeChanged(DockConstants::DockMode,DockConstants::DockMode)), - this, SLOT(slotDockModeChanged(DockConstants::DockMode,DockConstants::DockMode))); + connect(DockModeData::getInstants(), SIGNAL(dockModeChanged(Dock::DockMode,Dock::DockMode)), + this, SLOT(slotDockModeChanged(Dock::DockMode,Dock::DockMode))); } -void MainWidget::slotDockModeChanged(DockConstants::DockMode newMode, DockConstants::DockMode oldMode) +void MainWidget::slotDockModeChanged(Dock::DockMode newMode, Dock::DockMode oldMode) { QRect rec = QApplication::desktop()->screenGeometry(); this->resize(rec.width(),DockModeData::getInstants()->getDockHeight()); diff --git a/dde-dock/src/mainwidget.h b/dde-dock/src/mainwidget.h index 5a2d86abb..93be19a19 100644 --- a/dde-dock/src/mainwidget.h +++ b/dde-dock/src/mainwidget.h @@ -18,7 +18,7 @@ public: ~MainWidget(); public slots: - void slotDockModeChanged(DockConstants::DockMode newMode,DockConstants::DockMode oldMode); + void slotDockModeChanged(Dock::DockMode newMode,Dock::DockMode oldMode); private: Panel *mainPanel = NULL;