Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

make dockconstants simpler

Browse Source 
now we can use it in dockplugininterface.h
This commit is contained in:
Hualet Wang 2015-07-06 19:52:24 +08:00
parent 21c28ce2b1
commit 12e14d9d57
13 changed files with 75 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dde-dock/dde-dock.pro
View File

@ -24,7 +24,6 @@ SOURCES += \
src/Widgets/appitem.cpp \ src/Widgets/appitem.cpp \
src/Panel/panelmenu.cpp \ src/Panel/panelmenu.cpp \
src/Controller/dockmodedata.cpp \ src/Controller/dockmodedata.cpp \
src/Controller/dockconstants.cpp \
src/Controller/appmanager.cpp \ src/Controller/appmanager.cpp \
src/DBus/dbusentrymanager.cpp \ src/DBus/dbusentrymanager.cpp \
src/DBus/dbusentryproxyer.cpp \ src/DBus/dbusentryproxyer.cpp \
@ -52,7 +51,6 @@ HEADERS += \
src/Widgets/appitem.h \ src/Widgets/appitem.h \
src/Panel/panelmenu.h \ src/Panel/panelmenu.h \
src/Controller/dockmodedata.h \ src/Controller/dockmodedata.h \
src/Controller/dockconstants.h \
src/Controller/appmanager.h \ src/Controller/appmanager.h \
src/DBus/dbusentrymanager.h \ src/DBus/dbusentrymanager.h \
src/DBus/dbusentryproxyer.h \ src/DBus/dbusentryproxyer.h \
@ -64,9 +62,10 @@ HEADERS += \
src/Widgets/arrowrectangle.h\ src/Widgets/arrowrectangle.h\
src/dockpluginproxyinterface.h \ src/dockpluginproxyinterface.h \
src/dockpluginproxy.h \ src/dockpluginproxy.h \
src/dockpluginmanager.h\
src/DBus/dbusmenumanager.h \ src/DBus/dbusmenumanager.h \
src/DBus/dbusmenu.h src/DBus/dbusmenu.h \
src/dockpluginmanager.h \
src/dockconstants.h
RESOURCES += \ RESOURCES += \
images.qrc \ images.qrc \

7
dde-dock/src/Controller/dockconstants.cpp
View File

@ -1,7 +0,0 @@
#include "dockconstants.h"
DockConstants::DockConstants(QObject *parent) : QObject(parent)
{
}

23
dde-dock/src/Controller/dockconstants.h
View File

@ -1,23 +0,0 @@
#ifndef DOCKCONSTANTS_H
#define DOCKCONSTANTS_H
#include <QObject>
class DockConstants : public QObject
{
Q_OBJECT
public:
explicit DockConstants(QObject *parent = 0);
enum DockMode {
FashionMode,
EfficientMode,
ClassicMode
};
signals:
public slots:
};
#endif // DOCKCONSTANTS_H

66
dde-dock/src/Controller/dockmodedata.cpp
View File

@ -14,14 +14,14 @@ DockModeData * DockModeData::getInstants()
return dockModeData; return dockModeData;
} }
DockConstants::DockMode DockModeData::getDockMode() Dock::DockMode DockModeData::getDockMode()
{ {
return m_currentMode; 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; m_currentMode = value;
emit dockModeChanged(value, tmpValue); emit dockModeChanged(value, tmpValue);
@ -31,11 +31,11 @@ int DockModeData::getDockHeight()
{ {
switch (m_currentMode) switch (m_currentMode)
{ {
case DockConstants::FashionMode: case Dock::FashionMode:
return 60; return 60;
case DockConstants::EfficientMode: case Dock::EfficientMode:
return 50; return 50;
case DockConstants::ClassicMode: case Dock::ClassicMode:
return 40; return 40;
default: default:
return 40; return 40;
@ -46,11 +46,11 @@ int DockModeData::getItemHeight()
{ {
switch (m_currentMode) switch (m_currentMode)
{ {
case DockConstants::FashionMode: case Dock::FashionMode:
return 60; return 60;
case DockConstants::EfficientMode: case Dock::EfficientMode:
return 50; return 50;
case DockConstants::ClassicMode: case Dock::ClassicMode:
return 40; return 40;
default: default:
return 40; return 40;
@ -61,11 +61,11 @@ int DockModeData::getNormalItemWidth()
{ {
switch (m_currentMode) switch (m_currentMode)
{ {
case DockConstants::FashionMode: case Dock::FashionMode:
return 60; return 60;
case DockConstants::EfficientMode: case Dock::EfficientMode:
return 60; return 60;
case DockConstants::ClassicMode: case Dock::ClassicMode:
return 40; return 40;
default: default:
return 40; return 40;
@ -76,11 +76,11 @@ int DockModeData::getActivedItemWidth()
{ {
switch (m_currentMode) switch (m_currentMode)
{ {
case DockConstants::FashionMode: case Dock::FashionMode:
return 60; return 60;
case DockConstants::EfficientMode: case Dock::EfficientMode:
return 60; return 60;
case DockConstants::ClassicMode: case Dock::ClassicMode:
return 150; return 150;
default: default:
return 60; return 60;
@ -91,11 +91,11 @@ int DockModeData::getAppItemSpacing()
{ {
switch (m_currentMode) switch (m_currentMode)
{ {
case DockConstants::FashionMode: case Dock::FashionMode:
return 10; return 10;
case DockConstants::EfficientMode: case Dock::EfficientMode:
return 15; return 15;
case DockConstants::ClassicMode: case Dock::ClassicMode:
return 8; return 8;
default: default:
return 8; return 8;
@ -106,11 +106,11 @@ int DockModeData::getAppIconSize()
{ {
switch (m_currentMode) switch (m_currentMode)
{ {
case DockConstants::FashionMode: case Dock::FashionMode:
return 48; return 48;
case DockConstants::EfficientMode: case Dock::EfficientMode:
return 48; return 48;
case DockConstants::ClassicMode: case Dock::ClassicMode:
return 32; return 32;
default: default:
return 32; return 32;
@ -121,11 +121,11 @@ int DockModeData::getAppletsItemHeight()
{ {
switch (m_currentMode) switch (m_currentMode)
{ {
case DockConstants::FashionMode: case Dock::FashionMode:
return 60; return 60;
case DockConstants::EfficientMode: case Dock::EfficientMode:
return 50; return 50;
case DockConstants::ClassicMode: case Dock::ClassicMode:
return 40; return 40;
default: default:
return 40; return 40;
@ -136,11 +136,11 @@ int DockModeData::getAppletsItemWidth()
{ {
switch (m_currentMode) switch (m_currentMode)
{ {
case DockConstants::FashionMode: case Dock::FashionMode:
return 60; return 60;
case DockConstants::EfficientMode: case Dock::EfficientMode:
return 50; return 50;
case DockConstants::ClassicMode: case Dock::ClassicMode:
return 50; return 50;
default: default:
return 50; return 50;
@ -151,11 +151,11 @@ int DockModeData::getAppletsItemSpacing()
{ {
switch (m_currentMode) switch (m_currentMode)
{ {
case DockConstants::FashionMode: case Dock::FashionMode:
return 10; return 10;
case DockConstants::EfficientMode: case Dock::EfficientMode:
return 10; return 10;
case DockConstants::ClassicMode: case Dock::ClassicMode:
return 10; return 10;
default: default:
return 10; return 10;
@ -166,11 +166,11 @@ int DockModeData::getAppletsIconSize()
{ {
switch (m_currentMode) switch (m_currentMode)
{ {
case DockConstants::FashionMode: case Dock::FashionMode:
return 48; return 48;
case DockConstants::EfficientMode: case Dock::EfficientMode:
return 24; return 24;
case DockConstants::ClassicMode: case Dock::ClassicMode:
return 24; return 24;
default: default:
return 24; return 24;

8
dde-dock/src/Controller/dockmodedata.h
View File

@ -11,8 +11,8 @@ class DockModeData : public QObject
public: public:
static DockModeData * getInstants(); static DockModeData * getInstants();
DockConstants::DockMode getDockMode(); Dock::DockMode getDockMode();
void setDockMode(DockConstants::DockMode value); void setDockMode(Dock::DockMode value);
int getDockHeight(); int getDockHeight();
int getItemHeight(); int getItemHeight();
@ -26,7 +26,7 @@ public:
int getAppletsIconSize(); int getAppletsIconSize();
signals: signals:
void dockModeChanged(DockConstants::DockMode newMode,DockConstants::DockMode oldMode); void dockModeChanged(Dock::DockMode newMode,Dock::DockMode oldMode);
private: private:
explicit DockModeData(QObject *parent = 0); explicit DockModeData(QObject *parent = 0);
@ -34,7 +34,7 @@ private:
private: private:
static DockModeData * dockModeData; static DockModeData * dockModeData;
DockConstants::DockMode m_currentMode = DockConstants::EfficientMode; Dock::DockMode m_currentMode = Dock::EfficientMode;
}; };

12
dde-dock/src/Panel/panel.cpp
View File

@ -23,8 +23,8 @@ Panel::Panel(QWidget *parent)
connect(leftLayout, SIGNAL(contentsWidthChange()),this, SLOT(slotLayoutContentsWidthChanged())); connect(leftLayout, SIGNAL(contentsWidthChange()),this, SLOT(slotLayoutContentsWidthChanged()));
connect(rightLayout, SIGNAL(contentsWidthChange()), this, SLOT(slotLayoutContentsWidthChanged())); connect(rightLayout, SIGNAL(contentsWidthChange()), this, SLOT(slotLayoutContentsWidthChanged()));
connect(dockCons, SIGNAL(dockModeChanged(DockConstants::DockMode,DockConstants::DockMode)), connect(dockCons, SIGNAL(dockModeChanged(Dock::DockMode,Dock::DockMode)),
this, SLOT(slotDockModeChanged(DockConstants::DockMode,DockConstants::DockMode))); this, SLOT(slotDockModeChanged(Dock::DockMode,Dock::DockMode)));
DockPluginManager *pluginManager = new DockPluginManager(this); DockPluginManager *pluginManager = new DockPluginManager(this);
QList<DockPluginProxy*> proxies = pluginManager->getAll(); QList<DockPluginProxy*> proxies = pluginManager->getAll();
@ -99,7 +99,7 @@ void Panel::slotExitedMask()
// leftLayout->relayout(); // leftLayout->relayout();
} }
void Panel::slotDockModeChanged(DockConstants::DockMode newMode, DockConstants::DockMode oldMode) void Panel::slotDockModeChanged(Dock::DockMode newMode, Dock::DockMode oldMode)
{ {
leftLayout->relayout(); leftLayout->relayout();
rightLayout->relayout(); rightLayout->relayout();
@ -115,7 +115,7 @@ void Panel::slotLayoutContentsWidthChanged()
{ {
reanchorsLayout(dockCons->getDockMode()); reanchorsLayout(dockCons->getDockMode());
if (dockCons->getDockMode() == DockConstants::FashionMode) if (dockCons->getDockMode() == Dock::FashionMode)
{ {
this->resize(leftLayout->getContentsWidth() + rightLayout->getContentsWidth(),dockCons->getDockHeight()); this->resize(leftLayout->getContentsWidth() + rightLayout->getContentsWidth(),dockCons->getDockHeight());
this->move((parentWidget->width() - leftLayout->getContentsWidth() - rightLayout->getContentsWidth()) / 2,0); 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()); leftLayout->resize(leftLayout->getContentsWidth() + dockCons->getAppItemSpacing(),dockCons->getDockHeight());

4
dde-dock/src/Panel/panel.h
View File

@ -32,7 +32,7 @@ public slots:
void slotExitedMask(); void slotExitedMask();
private slots: private slots:
void slotDockModeChanged(DockConstants::DockMode newMode,DockConstants::DockMode oldMode); void slotDockModeChanged(Dock::DockMode newMode,Dock::DockMode oldMode);
void slotLayoutContentsWidthChanged(); void slotLayoutContentsWidthChanged();
void slotAddAppItem(AppItem *item); void slotAddAppItem(AppItem *item);
@ -43,7 +43,7 @@ protected:
void mouseReleaseEvent(QMouseEvent *event); void mouseReleaseEvent(QMouseEvent *event);
private: private:
void reanchorsLayout(DockConstants::DockMode mode); void reanchorsLayout(Dock::DockMode mode);
void showMenu(); void showMenu();
void hideMenu(); void hideMenu();

6
dde-dock/src/Panel/panelmenu.cpp
View File

@ -44,20 +44,20 @@ PanelMenu::PanelMenu(QWidget *parent) : QWidget(parent)
void PanelMenu::changeToFashionMode() void PanelMenu::changeToFashionMode()
{ {
qWarning() << "Change to fashion mode..."; qWarning() << "Change to fashion mode...";
dockCons->setDockMode(DockConstants::FashionMode); dockCons->setDockMode(Dock::FashionMode);
this->hide(); this->hide();
} }
void PanelMenu::changeToEfficientMode() void PanelMenu::changeToEfficientMode()
{ {
qWarning() << "Change to efficient mode..."; qWarning() << "Change to efficient mode...";
dockCons->setDockMode(DockConstants::EfficientMode); dockCons->setDockMode(Dock::EfficientMode);
this->hide(); this->hide();
} }
void PanelMenu::changeToClassicMode() void PanelMenu::changeToClassicMode()
{ {
qWarning() << "Change to classic mode..."; qWarning() << "Change to classic mode...";
dockCons->setDockMode(DockConstants::ClassicMode); dockCons->setDockMode(Dock::ClassicMode);
this->hide(); this->hide();
} }

10
dde-dock/src/Widgets/appitem.cpp
View File

@ -36,9 +36,9 @@ AppItemData AppItem::itemData() const
return m_itemData; 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); appBackground->setVisible(false);
} }
@ -54,13 +54,13 @@ void AppItem::slotDockModeChanged(DockConstants::DockMode newMode, DockConstants
void AppItem::reanchorIcon() void AppItem::reanchorIcon()
{ {
switch (dockCons->getDockMode()) { switch (dockCons->getDockMode()) {
case DockConstants::FashionMode: case Dock::FashionMode:
m_appIcon->move((width() - m_appIcon->width()) / 2, 0); m_appIcon->move((width() - m_appIcon->width()) / 2, 0);
break; break;
case DockConstants::EfficientMode: case Dock::EfficientMode:
m_appIcon->move((width() - m_appIcon->width()) / 2, (height() - m_appIcon->height()) / 2); m_appIcon->move((width() - m_appIcon->width()) / 2, (height() - m_appIcon->height()) / 2);
break; break;
case DockConstants::ClassicMode: case Dock::ClassicMode:
m_appIcon->move((height() - m_appIcon->height()) / 2, (height() - m_appIcon->height()) / 2); m_appIcon->move((height() - m_appIcon->height()) / 2, (height() - m_appIcon->height()) / 2);
default: default:
break; break;

2
dde-dock/src/Widgets/appitem.h
View File

@ -60,7 +60,7 @@ protected:
void dropEvent(QDropEvent * event); void dropEvent(QDropEvent * event);
private slots: private slots:
void slotDockModeChanged(DockConstants::DockMode newMode,DockConstants::DockMode oldMode); void slotDockModeChanged(Dock::DockMode newMode,Dock::DockMode oldMode);
void reanchorIcon(); void reanchorIcon();
void resizeBackground(); void resizeBackground();
void dbusDataChanged(const QString &key, const QString &value); void dbusDataChanged(const QString &key, const QString &value);

14
dde-dock/src/dockconstants.h Normal file
View File

@ -0,0 +1,14 @@
#ifndef DOCKCONSTANTS_H
#define DOCKCONSTANTS_H
namespace Dock {
enum DockMode {
FashionMode,
EfficientMode,
ClassicMode
};
}
#endif // DOCKCONSTANTS_H

6
dde-dock/src/mainwidget.cpp
View File

@ -13,11 +13,11 @@ MainWidget::MainWidget(QWidget *parent)
this->setAttribute(Qt::WA_TranslucentBackground); this->setAttribute(Qt::WA_TranslucentBackground);
this->move(0,rec.height()); this->move(0,rec.height());
connect(DockModeData::getInstants(), SIGNAL(dockModeChanged(DockConstants::DockMode,DockConstants::DockMode)), connect(DockModeData::getInstants(), SIGNAL(dockModeChanged(Dock::DockMode,Dock::DockMode)),
this, SLOT(slotDockModeChanged(DockConstants::DockMode,DockConstants::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(); QRect rec = QApplication::desktop()->screenGeometry();
this->resize(rec.width(),DockModeData::getInstants()->getDockHeight()); this->resize(rec.width(),DockModeData::getInstants()->getDockHeight());

2
dde-dock/src/mainwidget.h
View File

@ -18,7 +18,7 @@ public:
~MainWidget(); ~MainWidget();
public slots: public slots:
void slotDockModeChanged(DockConstants::DockMode newMode,DockConstants::DockMode oldMode); void slotDockModeChanged(Dock::DockMode newMode,Dock::DockMode oldMode);
private: private:
Panel *mainPanel = NULL; Panel *mainPanel = NULL;