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

sort these out so we can look at them later for possible streamlining

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=979909
This commit is contained in:
Aaron J. Seigo 2009-06-10 18:28:17 +00:00
parent 5cbc9e157d
commit 1e4a7ee457
2 changed files with 56 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
applet.cpp
View File

@ -1972,6 +1972,24 @@ QVariant Applet::itemChange(GraphicsItemChange change, const QVariant &value)
}
}
break;
case ItemParentChange:
if (d->mainConfig && !d->isContainment &&
!containment() &&
dynamic_cast<Containment*>(value.value<QGraphicsItem *>())) {
// if this is an applet, and we've just been assigned to our first containment,
// but the applet did something stupid like ask for the config() object prior to
// this happening (e.g. inits ctor) then let's repair that situation for them.
kWarning() << "Configuration object was requested prior to init(), which is too early. "
"Please fix this item:" << parentItem() << value.value<QGraphicsItem *>()
<< name();
KConfigGroup *old = d->mainConfig;
KConfigGroup appletConfig = dynamic_cast<Containment*>(value.value<QGraphicsItem *>())->config();
appletConfig = KConfigGroup(&appletConfig, "Applets");
d->mainConfig = new KConfigGroup(&appletConfig, QString::number(d->appletId));
old->copyTo(d->mainConfig);
old->deleteGroup();
delete old;
}
case ItemPositionChange:
return (immutability() == Mutable || isContainment() || formFactor() == Horizontal || formFactor() == Vertical) ? value : pos();
break;
@ -2124,23 +2142,23 @@ bool Applet::isContainment() const
AppletPrivate::AppletPrivate(KService::Ptr service, int uniqueID, Applet *applet)
: appletId(uniqueID),
q(applet),
extender(0),
backgroundHints(Applet::StandardBackground),
aspectRatioMode(Plasma::KeepAspectRatio),
immutability(Mutable),
appletDescription(service),
messageOverlay(0),
busyWidget(0),
extender(0),
background(0),
mainConfig(0),
pendingConstraints(NoConstraint),
messageOverlay(0),
messageOverlayProxy(0),
busyWidget(0),
script(0),
package(0),
configLoader(0),
mainConfig(0),
pendingConstraints(NoConstraint),
aspectRatioMode(Plasma::KeepAspectRatio),
immutability(Mutable),
actions(AppletPrivate::defaultActions(applet)),
activationAction(0),
shortcutEditor(0),
messageOverlayProxy(0),
constraintsTimerId(0),
modificationsTimerId(-1),
hasConfigurationInterface(false),

43
private/applet_p.h
View File

@ -111,27 +111,44 @@ public:
uint appletId;
Applet *q;
Extender *extender;
// applet attributes
Applet::BackgroundHints backgroundHints;
KPluginInfo appletDescription;
AppletOverlayWidget *messageOverlay;
Plasma::BusyWidget *busyWidget;
QSet<QGraphicsItem*> registeredAsDragHandle;
Plasma::FrameSvg *background;
AppletScript *script;
QVariantList args;
Package *package;
ConfigLoader *configLoader;
KConfigGroup *mainConfig;
Plasma::Constraints pendingConstraints;
Plasma::AspectRatioMode aspectRatioMode;
ImmutabilityType immutability;
// applet info we keep around in case its needed
KPluginInfo appletDescription;
QVariantList args;
// bookkeeping
Extender *extender;
QSet<QGraphicsItem*> registeredAsDragHandle;
Plasma::FrameSvg *background;
KConfigGroup *mainConfig;
Plasma::Constraints pendingConstraints;
// overlays and messages
AppletOverlayWidget *messageOverlay;
QGraphicsProxyWidget *messageOverlayProxy;
Plasma::BusyWidget *busyWidget;
// sripting and package stuff
AppletScript *script;
Package *package;
ConfigLoader *configLoader;
// actions stuff; put activationAction into actions?
KActionCollection *actions;
KAction *activationAction;
// configuration
KKeySequenceWidget *shortcutEditor; //TODO: subclass KConfigDialog and encapsulate this in there
QGraphicsProxyWidget *messageOverlayProxy;
// timerEvent bookkeeping
int constraintsTimerId;
int modificationsTimerId;
// a great green field of booleans :)
bool hasConfigurationInterface : 1;
bool failed : 1;
bool isContainment : 1;