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

connect activate to the togglePopup signal

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=862006
This commit is contained in:
Aaron J. Seigo 2008-09-17 19:15:24 +00:00
parent ec98e6c6ba
commit 04d66c614a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
popupapplet.cpp
View File

@ -96,6 +96,8 @@ PopupApplet::PopupApplet(QObject *parent, const QVariantList &args)
} else { } else {
setPopupIcon(KIcon("icons")); setPopupIcon(KIcon("icons"));
} }
connect(this, SIGNAL(activate()), this, SLOT(togglePopup()));
} }
PopupApplet::~PopupApplet() PopupApplet::~PopupApplet()
@ -332,7 +334,6 @@ QVariant PopupApplet::itemChange(GraphicsItemChange change, const QVariant &valu
return Applet::itemChange(change, value); return Applet::itemChange(change, value);
} }
void PopupApplet::showPopup(uint popupDuration) void PopupApplet::showPopup(uint popupDuration)
{ {
if (d->dialog && (formFactor() == Horizontal || formFactor() == Vertical)) { if (d->dialog && (formFactor() == Horizontal || formFactor() == Vertical)) {
@ -404,7 +405,8 @@ void PopupAppletPrivate::dialogSizeChanged()
dialog->updateGeometry(); dialog->updateGeometry();
dialog->move(q->popupPosition(dialog->size())); dialog->move(q->popupPosition(dialog->size()));
KConfigGroup sizeGroup = KConfigGroup(&q->config(), "PopupApplet"); KConfigGroup sizeGroup = q->config();
sizeGroup = KConfigGroup(&sizeGroup, "PopupApplet");
sizeGroup.writeEntry("DialogHeight", dialog->height()); sizeGroup.writeEntry("DialogHeight", dialog->height());
sizeGroup.writeEntry("DialogWidth", dialog->width()); sizeGroup.writeEntry("DialogWidth", dialog->width());
@ -419,7 +421,8 @@ void PopupAppletPrivate::dialogStatusChanged(bool status)
void PopupAppletPrivate::updateDialogPosition() void PopupAppletPrivate::updateDialogPosition()
{ {
KConfigGroup sizeGroup = KConfigGroup(&q->config(), "PopupApplet"); KConfigGroup sizeGroup = q->config();
sizeGroup = KConfigGroup(&sizeGroup, "PopupApplet");
const int width = qMin(sizeGroup.readEntry("DialogWidth", 0), QApplication::desktop()->screen()->width() - 50); const int width = qMin(sizeGroup.readEntry("DialogWidth", 0), QApplication::desktop()->screen()->width() - 50);
const int height = qMin(sizeGroup.readEntry("DialogHeight", 0), QApplication::desktop()->screen()->height() - 50); const int height = qMin(sizeGroup.readEntry("DialogHeight", 0), QApplication::desktop()->screen()->height() - 50);

1
popupapplet.h
View File

@ -118,6 +118,7 @@ private:
Q_PRIVATE_SLOT(d, void hideTimedPopup()) Q_PRIVATE_SLOT(d, void hideTimedPopup())
Q_PRIVATE_SLOT(d, void dialogSizeChanged()) Q_PRIVATE_SLOT(d, void dialogSizeChanged())
Q_PRIVATE_SLOT(d, void dialogStatusChanged(bool)) Q_PRIVATE_SLOT(d, void dialogStatusChanged(bool))
PopupAppletPrivate * const d; PopupAppletPrivate * const d;
}; };