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

here, have your containments back. type() was pretty widely used and rather important apparently ;)

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=738514
This commit is contained in:
Aaron J. Seigo 2007-11-19 02:14:18 +00:00
parent aad6b2a52b
commit b0789ebe14
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
containment.cpp
View File

@ -109,18 +109,18 @@ void Containment::init()
//TODO: would be nice to not do this on init, as it causes Phase to init
connect(Phase::self(), SIGNAL(animationComplete(QGraphicsItem*,Plasma::Phase::Animation)),
this, SLOT(appletAnimationComplete(QGraphicsItem*,Plasma::Phase::Animation)));
if (type() == DesktopContainment) {
if (containmentType() == DesktopContainment) {
Plasma::PushButton *tool = new Plasma::PushButton(i18n("Add Widgets"));
tool->resize(tool->sizeHint());
addToolBoxTool(tool);
connect(tool, SIGNAL(clicked()), this, SIGNAL(showAddWidgets()));
tool = new Plasma::PushButton(i18n("Zoom In"));
connect(tool, SIGNAL(clicked()), this, SIGNAL(zoomIn()));
tool->resize(tool->sizeHint());
addToolBoxTool(tool);
tool = new Plasma::PushButton(i18n("Zoom Out"));
connect(tool, SIGNAL(clicked()), this, SIGNAL(zoomOut()));
tool->resize(tool->sizeHint());
@ -130,7 +130,7 @@ void Containment::init()
void Containment::loadConstraints(KConfigGroup* group)
{
/* kDebug() << "!!!!!!!!!!!!initConstraints" << group->name() << type();
/*kDebug() << "!!!!!!!!!!!!initConstraints" << group->name() << containmentType();
kDebug() << " location:" << group->readEntry("location", (int)d->location);
kDebug() << " geom:" << group->readEntry("geometry", geometry());
kDebug() << " formfactor:" << group->readEntry("formfactor", (int)d->formFactor);
@ -341,7 +341,7 @@ Applet* Containment::addApplet(const QString& name, const QVariantList& args, ui
addChild(applet);
//panels don't want backgrounds, which is important when setting geometry
if (type() == PanelContainment) {
if (containmentType() == PanelContainment) {
applet->setDrawStandardBackground(false);
}
@ -408,7 +408,7 @@ void Containment::appletAnimationComplete(QGraphicsItem *item, Plasma::Phase::An
}
}
} else if (anim == Phase::Appear) {
if (type() == DesktopContainment) {
if (containmentType() == DesktopContainment) {
item->installSceneEventFilter(this);
}
}
@ -423,7 +423,7 @@ void Containment::setScreen(int screen)
{
// screen of -1 means no associated screen.
// sanity check to make sure someone else doesn't have this screen already!
if (type() == DesktopContainment && corona()) {
if (containmentType() == DesktopContainment && corona()) {
Containment* currently = corona()->containmentForScreen(screen);
if (currently && currently != this) {
//kDebug() << "currently is on screen" << currently->screen() << "and is" << currently->name() << (QObject*)currently << (QObject*)this;
@ -431,18 +431,18 @@ void Containment::setScreen(int screen)
}
}
//kDebug() << "setting screen to" << screen;
kDebug() << "setting screen to" << screen << "and we are a" << containmentType();
QDesktopWidget *desktop = QApplication::desktop();
int numScreens = desktop->numScreens();
if (screen < -1 || screen > numScreens - 1) {
screen = -1;
}
//kDebug() << "setting screen to " << screen << "and type is" << type();
//kDebug() << "setting screen to " << screen << "and type is" << containmentType();
if (screen > -1) {
QRect r = desktop->screenGeometry(screen);
if (type() == DesktopContainment) {
if (containmentType() == DesktopContainment) {
// we need to find how many screens are to our top and left
// to calculate the proper offsets for the margins.
int x = r.x();
@ -467,7 +467,7 @@ void Containment::setScreen(int screen)
// given screen! we should change the pos() on new containment setup.
setGeometry(r);
//kDebug() << "setting geometry to" << desktop->screenGeometry(screen) << r << geometry();
} else if (type() == PanelContainment) {
} else if (containmentType() == PanelContainment) {
QRect r = desktop->screenGeometry(screen);
//kDebug() << "we are a panel on" << r << ", let's move ourselves to a negative coordinate system" << -r.height() - INTER_CONTAINMENT_MARGIN;
int vertOffset = r.height() + INTER_CONTAINMENT_MARGIN;

6
containment.h
View File

@ -232,19 +232,19 @@ class PLASMA_EXPORT Containment : public Applet
* Usually only used for desktop containments.
*/
void zoomIn();
/**
* Emitted when the containment requests zooming out one step.
* Usually only used for desktop containments.
*/
void zoomOut();
/**
* Emitted when the containment requests an add widgets dialog is shown.
* Usually only used for desktop containments.
*/
void showAddWidgets();
public Q_SLOTS:
/**
* Informs the Corona as to what position it is in. This is informational

2
corona.cpp
View File

@ -274,7 +274,7 @@ Containment* Corona::containmentForScreen(int screen) const
{
foreach (Containment* containment, d->containments) {
if (containment->screen() == screen &&
containment->type() == Containment::DesktopContainment) {
containment->containmentType() == Containment::DesktopContainment) {
return containment;
}
}