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

reverting to previous revision since aaron dislikes the patch as it is.. hoping for a better new one =)

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=853143
This commit is contained in:
Alessandro Diaferia 2008-08-27 10:45:43 +00:00
parent f58ae0fbc4
commit 813647bdbd
2 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
popupapplet.cpp
View File

@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2008 by Montel Laurent <montel@kde.org> *
* Copyright (C) 2008 by Alessandro Diaferia <alediaferia@gmail.com> *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@ -47,8 +46,7 @@ public:
layout(0),
proxy(0),
savedAspectRatio(Plasma::InvalidAspectRatioMode),
timer(0),
alwaysIconified(false)
timer(0)
{
}
@ -72,7 +70,6 @@ public:
QGraphicsProxyWidget *proxy;
Plasma::AspectRatioMode savedAspectRatio;
QTimer *timer;
bool alwaysIconified;
};
PopupApplet::PopupApplet(QObject *parent, const QVariantList &args)
@ -150,12 +147,7 @@ void PopupApplet::constraintsEvent(Plasma::Constraints constraints)
if (constraints & Plasma::FormFactorConstraint) {
d->layout->removeAt(0);
Plasma::FormFactor factor = formFactor();
if(d->alwaysIconified)
factor = Plasma::Vertical;
switch (factor) {
switch (formFactor()) {
case Plasma::Planar:
case Plasma::MediaCenter: {
if (d->icon) {
@ -299,16 +291,6 @@ void PopupApplet::widgetGeometryChanged()
}
}
void PopupApplet::setAlwaysIconified(bool set)
{
d->alwaysIconified = set;
}
bool PopupApplet::alwaysIconified()
{
return d->alwaysIconified;
}
void PopupAppletPrivate::togglePopup()
{
if (dialog) {

11
popupapplet.h
View File

@ -1,6 +1,5 @@
/***************************************************************************
* Copyright (C) 2008 by Montel Laurent <montel@kde.org> *
* Copyright (C) 2008 by Alessandro Diaferia <alediaferia@gmail.com> *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@ -89,16 +88,6 @@ public:
*/
void showPopup(uint displayTime = 0);
/**
* Shows the applet always as an icon, even when put on the desktop.
*/
void setAlwaysIconified(bool set);
/**
* @return true if the PopupApplet is set to be always shown as icon.
*/
bool alwaysIconified();
public Q_SLOTS:
/**
* Hides the popup.