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

Much nicer icons.

Browse Source 
Implemented the concept for icons from David Vignoni (screencast coming...).
Context menu now shows "Plasma".

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=676455
This commit is contained in:
Riccardo Iaconelli 2007-06-16 22:35:31 +00:00
parent 5a3e39e685
commit 7a70eac7fe
3 changed files with 132 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
corona.cpp
View File

@ -257,6 +257,7 @@ void Corona::dropEvent(QGraphicsSceneDragDropEvent *event)
foreach (const KUrl& url, urls) {
Plasma::Icon *icon = new Plasma::Icon(0);
icon->setIcon(KMimeType::iconNameForUrl(url));
icon->setUrl(url);
icon->setSize(128,128);
//TODO: associate the url with the icon, use the Button plasmoid here
icon->setPos(event->scenePos()-QPoint(icon->boundingRect().width()/2,icon->boundingRect().height()/2));
@ -291,7 +292,7 @@ void Corona::contextMenuEvent(QGraphicsSceneContextMenuEvent *contextMenuEvent)
return;
}
desktopMenu.setTitle("Corona");
desktopMenu.addTitle("Plasma");
desktopMenu.addAction(d->engineExplorerAction);
} else {
desktopMenu.addTitle(applet->name());

140
widgets/icon.cpp
View File

@ -18,11 +18,12 @@
#include "icon.h"
#include <QTimeLine>
#include <QPainter>
#include <QGraphicsSceneMouseEvent>
#include <QGraphicsView>
//#define PROVE_IT_CAN_BE_DONE
// #define PROVE_IT_CAN_BE_DONE
#ifdef PROVE_IT_CAN_BE_DONE
#include <private/qwindowsurface_p.h>
@ -30,6 +31,9 @@
#include <KIcon>
#include <KImageEffect>
#include <KUrl>
#include <KRun>
#include <KMimeType>
#include <KDebug>
#include "svg.h"
@ -73,7 +77,10 @@ class Icon::Private
if (svg.elementExists("foreground-pressed")) {
svgElements |= SvgForegroundPressed;
}
stepMenu = 0;
timeline = new QTimeLine;
button1Pressed = false;
button1Hovered = false;
}
~Private() {}
enum ButtonState
@ -92,13 +99,18 @@ class Icon::Private
SvgForegroundHover = 16,
SvgForegroundPressed = 32 };
KUrl url;
QString text;
QSizeF size;
QSizeF iconSize;
QIcon icon;
QTimeLine *timeline;
ButtonState state;
Svg svg;
int svgElements;
int stepMenu;
bool button1Hovered;
bool button1Pressed;
};
Icon::Icon(QGraphicsItem *parent)
@ -111,6 +123,7 @@ Icon::Icon(QGraphicsItem *parent)
setEnabled(true);
setFlags(ItemIsMovable);
setPos(QPointF(0.0,0.0));
d->timeline->setDuration(500);
}
Icon::~Icon()
@ -129,23 +142,24 @@ void Icon::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWid
Q_UNUSED(widget)
#ifdef PROVE_IT_CAN_BE_DONE
if (d->state == Private::HoverState && scene()) {
QList<QGraphicsView*> views = scene()->views();
if (views.count() > 0) {
QPixmap* pix = static_cast<QPixmap*>(views[0]->windowSurface()->paintDevice());
QImage image(boundingRect().size().toSize(), QImage::Format_ARGB32_Premultiplied);
{
QPainter p(&image);
p.drawPixmap(image.rect(), *pix, sceneBoundingRect());
}
expblur<16,7>(image, 10);
painter->save();
painter->drawImage(0, 0, image);
painter->restore();
}
}
// if (d->state == Private::HoverState && scene()) {
// QList<QGraphicsView*> views = scene()->views();
// if (views.count() > 0) {
// QPixmap* pix = static_cast<QPixmap*>(views[0]->windowSurface()->paintDevice());
// QImage image(boundingRect().size().toSize(), QImage::Format_ARGB32_Premultiplied);
// {
// QPainter p(&image);
// p.drawPixmap(image.rect(), *pix, sceneBoundingRect());
// }
// expblur<16,7>(image, 8);
// painter->save();
// painter->drawImage(0, 0, image);
// painter->restore();
// }
// }
#endif
QString element;
if (d->svgElements & Private::SvgBackground) {
element = "background";
@ -153,6 +167,7 @@ void Icon::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWid
switch (d->state) {
case Private::NoState:
element = "background";
break;
case Private::HoverState:
if (d->svgElements & Private::SvgBackgroundHover) {
@ -185,24 +200,26 @@ void Icon::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWid
painter->scale(0.95, 0.95);
deltaY *= 0.95;
deltaX *= 0.95;
painter->drawPixmap(deltaX + (iw * .025), deltaY + (ih * .025),
painter->drawPixmap((int)(deltaX + (iw * .025)), (int)(deltaY + (ih * .025)),
d->icon.pixmap(d->iconSize.toSize()));
painter->restore();
}
else
{
painter->drawPixmap(deltaX, deltaY, d->icon.pixmap(d->iconSize.toSize()));
painter->drawPixmap((int)deltaX, (int)deltaY, d->icon.pixmap(d->iconSize.toSize()));
}
}
//TODO: draw text
// Make it default
if (d->svgElements & Private::SvgForeground) {
element = "foreground";
}
switch (d->state) {
case Private::NoState:
element = "foreground";
break;
case Private::HoverState:
if (d->svgElements & Private::SvgForegroundHover) {
@ -218,10 +235,43 @@ void Icon::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWid
break;
}
//paint foreground element
if (!element.isEmpty()) {
//kDebug() << "painting " << element << endl;
d->svg.paint(painter, 0, 0, element);
}
// Draw top-left button
QColor colorButton1;
if (d->button1Hovered) {
// colorButton1 = QColor(0, 49, 110); //Oxygen color
element = "button1-hover";
} else if (d->button1Pressed) {
// colorButton1 = QColor(29, 10, 85); //Oxygen color
element = "button1-pressed";
} else {
// colorButton1 = QColor(0, 67, 138); //Oxygen color
element = "button1";
}
KIcon exec("exec");
painter->setRenderHint(QPainter::Antialiasing);
painter->setOpacity(d->stepMenu*0.04);
// painter->setBrush(colorButton1);
painter->setPen(Qt::NoPen);
if (!element.isEmpty()) {
//kDebug() << "painting " << element << endl;
d->svg.paint(painter, QRect(6, 6, 32, 32), element);
}
painter->drawPixmap(11, 11, exec.pixmap(22,22));
}
void Icon::animateBubbles(int step)
{
d->stepMenu = step;
// kDebug() << "pop in: " << d->stepMenu << endl;
update();
}
void Icon::setText(const QString& text)
@ -237,6 +287,7 @@ QString Icon::text() const
void Icon::setIcon(const QString& icon)
{
kDebug() << "Icon set: " << icon << endl;
if (icon.isEmpty()) {
setIcon(QIcon());
return;
@ -251,6 +302,11 @@ void Icon::setIcon(const QIcon& icon)
update();
}
void Icon::setUrl(const KUrl& url)
{
d->url = url;
}
QSizeF Icon::size() const
{
return d->size;
@ -282,10 +338,18 @@ bool Icon::isDown()
void Icon::mousePressEvent(QGraphicsSceneMouseEvent *event)
{
QRectF button1(6, 6, 32, 32); // The top-left circle
if (button1.contains(event->pos())) {
if (d->url.isValid()) {
KRun::runUrl(d->url, KMimeType::findByUrl(d->url)->name(), 0);
}
d->button1Pressed = true;
} else {
d->state = Private::PressedState;
emit pressed(true);
QGraphicsItem::mousePressEvent(event);
update();
d->button1Pressed = false;
}
}
void Icon::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
@ -303,18 +367,54 @@ void Icon::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
emit pressed(false);
emit clicked();
}
d->button1Pressed = false;
QRectF button1(6, 6, 32, 32); // The top-left circle
if (button1.contains(event->pos())) {
d->button1Hovered = true;
} else {
d->button1Hovered = false;
}
QGraphicsItem::mouseReleaseEvent(event);
update();
}
void Icon::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
{
d->button1Pressed = false;
QRectF button1(6, 6, 32, 32); // The top-left circle
if (button1.contains(event->pos())) {
d->button1Hovered = true;
} else {
d->button1Hovered = false;
}
if (d->timeline->state() == QTimeLine::Running) {
d->timeline->setPaused(true);
}
d->timeline->setFrameRange(0, 25);
d->timeline->setDirection(QTimeLine::Forward);
connect(d->timeline, SIGNAL(frameChanged(int)), this, SLOT(animateBubbles(int)));
d->state = Private::HoverState;
QGraphicsItem::hoverEnterEvent(event);
d->timeline->start();
}
void Icon::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
{
if (d->timeline->state() == QTimeLine::Running) {
d->timeline->setPaused(true);
}
d->timeline->setFrameRange(0, 25);
d->timeline->setDirection(QTimeLine::Backward);
connect(d->timeline, SIGNAL(frameChanged(int)), this, SLOT(animateBubbles(int)));
d->state = Private::HoverState;
QGraphicsItem::hoverEnterEvent(event);
d->timeline->start();
d->state = Private::NoState;
QGraphicsItem::hoverLeaveEvent(event);
}

6
widgets/icon.h
View File

@ -55,6 +55,8 @@ class PLASMA_EXPORT Icon : public QObject,
void setIcon(const QString& icon);
void setIcon(const QIcon& icon);
void setUrl(const KUrl& url);
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
QRectF boundingRect() const;
@ -80,6 +82,7 @@ class PLASMA_EXPORT Icon : public QObject,
Q_SIGNALS:
void pressed(bool down);
void clicked();
void openUrl();
protected:
bool isDown();
@ -88,6 +91,9 @@ class PLASMA_EXPORT Icon : public QObject,
void hoverEnterEvent (QGraphicsSceneHoverEvent * event);
void hoverLeaveEvent (QGraphicsSceneHoverEvent * event);
private Q_SLOTS:
void animateBubbles(int step);
private:
class Private;
Private * const d;