alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into plasma/declarative

Browse Source
This commit is contained in:
Sebastian Kügler 2011-03-15 16:35:27 +01:00
commit 9ac11a2f07
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
scriptengines/javascript/plasmoid/appletinterface.cpp
View File

@ -436,7 +436,8 @@ QGraphicsWidget *PopupAppletInterface::popupWidget()
} }
ContainmentInterface::ContainmentInterface(AbstractJsAppletScript *parent) ContainmentInterface::ContainmentInterface(AbstractJsAppletScript *parent)
: APPLETSUPERCLASS(parent) : APPLETSUPERCLASS(parent),
m_movableApplets(true)
{ {
connect(containment(), SIGNAL(appletRemoved(Plasma::Applet *)), this, SLOT(appletRemovedForward(Plasma::Applet *))); connect(containment(), SIGNAL(appletRemoved(Plasma::Applet *)), this, SLOT(appletRemovedForward(Plasma::Applet *)));
@ -498,14 +499,34 @@ QScriptValue ContainmentInterface::screenGeometry(int id) const
void ContainmentInterface::appletAddedForward(Plasma::Applet *applet, const QPointF &pos) void ContainmentInterface::appletAddedForward(Plasma::Applet *applet, const QPointF &pos)
{ {
applet->setFlag(QGraphicsItem::ItemIsMovable, m_movableApplets);
emit appletAdded(applet, pos); emit appletAdded(applet, pos);
} }
void ContainmentInterface::appletRemovedForward(Plasma::Applet *applet) void ContainmentInterface::appletRemovedForward(Plasma::Applet *applet)
{ {
applet->setFlag(QGraphicsItem::ItemIsMovable, true);
emit appletRemoved(applet); emit appletRemoved(applet);
} }
void ContainmentInterface::setMovableApplets(bool movable)
{
if (m_movableApplets == movable) {
return;
}
m_movableApplets = movable;
foreach (Plasma::Applet *applet, containment()->applets()) {
applet->setFlag(QGraphicsItem::ItemIsMovable, movable);
}
}
bool ContainmentInterface::hasMovableApplets() const
{
return m_movableApplets;
}
#ifndef USE_JS_SCRIPTENGINE #ifndef USE_JS_SCRIPTENGINE
#include "appletinterface.moc" #include "appletinterface.moc"
#endif #endif

7
scriptengines/javascript/plasmoid/appletinterface.h
View File

@ -362,6 +362,7 @@ class ContainmentInterface : public APPLETSUPERCLASS
Q_PROPERTY(bool drawWallpaper READ drawWallpaper WRITE setDrawWallpaper) Q_PROPERTY(bool drawWallpaper READ drawWallpaper WRITE setDrawWallpaper)
Q_PROPERTY(Type containmentType READ containmentType WRITE setContainmentType) Q_PROPERTY(Type containmentType READ containmentType WRITE setContainmentType)
Q_PROPERTY(int screen READ screen NOTIFY screenChanged) Q_PROPERTY(int screen READ screen NOTIFY screenChanged)
Q_PROPERTY(bool movableApplets READ hasMovableApplets WRITE setMovableApplets)
Q_ENUMS(Type) Q_ENUMS(Type)
public: public:
@ -385,6 +386,9 @@ public:
void setContainmentType(Type type); void setContainmentType(Type type);
int screen() const; int screen() const;
void setMovableApplets(bool movable);
bool hasMovableApplets() const;
Q_INVOKABLE QScriptValue screenGeometry(int id) const; Q_INVOKABLE QScriptValue screenGeometry(int id) const;
Q_SIGNALS: Q_SIGNALS:
@ -395,6 +399,9 @@ Q_SIGNALS:
protected Q_SLOTS: protected Q_SLOTS:
void appletAddedForward(Plasma::Applet *applet, const QPointF &pos); void appletAddedForward(Plasma::Applet *applet, const QPointF &pos);
void appletRemovedForward(Plasma::Applet *applet); void appletRemovedForward(Plasma::Applet *applet);
private:
bool m_movableApplets;
}; };
#endif #endif