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

* optional names for tools

Browse Source 
* respond to immutability constraint updates, in particular hide the add widgets toolbox button

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=745246
This commit is contained in:
Aaron J. Seigo 2007-12-05 20:26:23 +00:00
parent 5c257fce5a
commit 198544318a
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
containment.cpp
View File

@ -145,8 +145,15 @@ void Containment::saveConstraints(KConfigGroup* group) const
void Containment::containmentConstraintsUpdated(Plasma::Constraints constraints) void Containment::containmentConstraintsUpdated(Plasma::Constraints constraints)
{ {
if (d->toolbox && constraints & Plasma::ScreenConstraint) { //kDebug() << "got containmentConstraintsUpdated" << constraints << (QObject*)d->toolbox;
d->toolbox->setPos(geometry().width() - d->toolbox->boundingRect().width(), 0); if (d->toolbox) {
if (constraints & Plasma::ScreenConstraint) {
d->toolbox->setPos(geometry().width() - d->toolbox->boundingRect().width(), 0);
}
if (constraints & Plasma::ImmutableConstraint) {
d->toolbox->enableTool("addwidgets", !isImmutable());
}
} }
} }
@ -163,7 +170,7 @@ void Containment::setContainmentType(Containment::Type type)
if (!d->toolbox) { if (!d->toolbox) {
Plasma::PushButton *tool = new Plasma::PushButton(i18n("Add Widgets")); Plasma::PushButton *tool = new Plasma::PushButton(i18n("Add Widgets"));
tool->resize(tool->sizeHint()); tool->resize(tool->sizeHint());
addToolBoxTool(tool); addToolBoxTool(tool, "addwidgets");
connect(tool, SIGNAL(clicked()), this, SIGNAL(showAddWidgets())); connect(tool, SIGNAL(clicked()), this, SIGNAL(showAddWidgets()));
tool = new Plasma::PushButton(i18n("Zoom In")); tool = new Plasma::PushButton(i18n("Zoom In"));
@ -681,14 +688,14 @@ void Containment::emitLaunchActivated()
emit launchActivated(); emit launchActivated();
} }
void Containment::addToolBoxTool(QGraphicsItem *tool) void Containment::addToolBoxTool(QGraphicsItem *tool, const QString& toolName)
{ {
if (!d->toolbox) { if (!d->toolbox) {
d->toolbox = new DesktopToolbox(this); d->toolbox = new DesktopToolbox(this);
d->toolbox->setPos(geometry().width() - d->toolbox->boundingRect().width(), 0); d->toolbox->setPos(geometry().width() - d->toolbox->boundingRect().width(), 0);
} }
d->toolbox->addTool(tool); d->toolbox->addTool(tool, toolName);
} }
} // Plasma namespace } // Plasma namespace

2
containment.h
View File

@ -217,7 +217,7 @@ class PLASMA_EXPORT Containment : public Applet
* Adds an item to the toolbox. The toolbox takes over ownership of the item. * Adds an item to the toolbox. The toolbox takes over ownership of the item.
* TODO: add remove and accessor methods * TODO: add remove and accessor methods
*/ */
void addToolBoxTool(QGraphicsItem *tool); void addToolBoxTool(QGraphicsItem *tool, const QString &toolname = QString());
/** /**
* @internal * @internal