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

separate out the concept of kioskImmutability so we can take separate internal actions based on that as needed

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=693391
This commit is contained in:
Aaron J. Seigo 2007-07-27 21:05:45 +00:00
parent 62052a153c
commit a7fb94fb42
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
applet.cpp
View File

@ -63,6 +63,7 @@ public:
background(0), background(0),
failureText(0), failureText(0),
scriptEngine(0), scriptEngine(0),
kioskImmutable(false),
immutable(false), immutable(false),
hasConfigurationInterface(false), hasConfigurationInterface(false),
failed(false), failed(false),
@ -88,8 +89,9 @@ public:
void init(Applet* applet) void init(Applet* applet)
{ {
applet->setImmutable(applet->globalConfig().isImmutable() || kioskImmutable = applet->globalConfig().isImmutable() ||
applet->config().isImmutable()); applet->config().isImmutable();
applet->setImmutable(kioskImmutable);
if (!appletDescription.isValid()) { if (!appletDescription.isValid()) {
applet->setFailedToLaunch(true); applet->setFailedToLaunch(true);
@ -246,6 +248,7 @@ public:
Plasma::Svg *background; Plasma::Svg *background;
Plasma::LineEdit *failureText; Plasma::LineEdit *failureText;
ScriptEngine* scriptEngine; ScriptEngine* scriptEngine;
bool kioskImmutable : 1;
bool immutable : 1; bool immutable : 1;
bool hasConfigurationInterface : 1; bool hasConfigurationInterface : 1;
bool failed : 1; bool failed : 1;
@ -385,7 +388,7 @@ QString Applet::category(const QString& appletName)
bool Applet::isImmutable() const bool Applet::isImmutable() const
{ {
return d->immutable; return d->immutable || d->kioskImmutable;
} }
void Applet::setImmutable(bool immutable) void Applet::setImmutable(bool immutable)
@ -394,7 +397,7 @@ void Applet::setImmutable(bool immutable)
QGraphicsItem::GraphicsItemFlags f = flags(); QGraphicsItem::GraphicsItemFlags f = flags();
if (immutable) { if (immutable) {
f ^= QGraphicsItem::ItemIsMovable; f ^= QGraphicsItem::ItemIsMovable;
} else if (!scene() || !static_cast<Corona*>(scene())->isImmutable()) { } else if (!d->kioskImmutable && (!scene() || !static_cast<Corona*>(scene())->isImmutable())) {
f |= QGraphicsItem::ItemIsMovable; f |= QGraphicsItem::ItemIsMovable;
} }
setFlags(f); setFlags(f);