[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [declarative-plasmoids] tasks: rename everything
From: Shaun Reich <shaun.reich () kdemail ! net>
Date: 2012-02-10 16:36:17
Message-ID: 20120210163617.D6CEFA60A6 () git ! kde ! org
[Download RAW message or body]
Git commit 69a7899a91c5823e277d6b825346396396db053b by Shaun Reich.
Committed on 10/02/2012 at 17:36.
Pushed by sreich into branch 'master'.
rename everything
M +7 -150 tasks/tasks.cpp
M +9 -17 tasks/tasks.h
http://commits.kde.org/declarative-plasmoids/69a7899a91c5823e277d6b825346396396db053b
diff --git a/tasks/tasks.cpp b/tasks/tasks.cpp
index 5a7229f..5498d24 100644
--- a/tasks/tasks.cpp
+++ b/tasks/tasks.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright 2008-2009 by Olivier Goffart <ogoffart@kde.org> *
+ * Copyright (C) 2012 by Shaun M. Reich <shaun.reich@kdemail.net> *
* *
* 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 *
@@ -17,172 +17,29 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . *
***************************************************************************/
-#include "eyes.h"
+#include "tasks.h"
-#include <QPainter>
#include <QGraphicsView>
-#include <Plasma/Theme>
#include <KDebug>
-#include <math.h>
-
-Eyes::Eyes(QObject *parent, const QVariantList &args)
- : Plasma::Applet(parent, args) , timerInterval(50), previousMousePos(-1,-1)
+Tasks::Tasks(QObject *parent, const QVariantList &args)
+ : Plasma::Applet(parent, args)
{
resize(192, 128);
- m_svg = new Plasma::Svg(this);
- m_svg->setImagePath(QLatin1String( "widgets/eyes" ));
- m_svg->setContainsMultipleImages(true);
-
- rightPupil = new Plasma::SvgWidget(this);
- rightPupil->setSvg(m_svg);
- rightPupil->setElementID(QLatin1String( "rightPupil" ));
-
- leftPupil = new Plasma::SvgWidget(this);
- leftPupil->setSvg(m_svg);
- leftPupil->setElementID(QLatin1String( "leftPupil" ));
-
- timerId = startTimer(50);
setAspectRatioMode(Plasma::IgnoreAspectRatio);
setHasConfigurationInterface(false);
}
-Eyes::~Eyes()
+Tasks::~Tasks()
{
}
-void Eyes::constraintsEvent(Plasma::Constraints constraints)
+void Tasks::constraintsEvent(Plasma::Constraints constraints)
{
- Q_UNUSED(constraints)
-
- if (constraints & Plasma::FormFactorConstraint) {
- setBackgroundHints(NoBackground);
- }
- if (constraints & Plasma::SizeConstraint) {
- if(formFactor() == Plasma::Vertical) {
- setMinimumSize(QSizeF(0, boundingRect().width()/1.5));
- setMaximumSize(QSizeF(-1, boundingRect().width()/1.5));
- } else if(formFactor() == Plasma::Horizontal) {
- setMinimumSize(QSizeF(boundingRect().height()*1.5,0));
- setMaximumSize(QSizeF(boundingRect().height()*1.5,-1));
- } else {
- setMinimumSize(QSizeF());
- setMaximumSize(QSizeF());
- }
-
- double pupilSize = qMin( qMin(boundingRect().width()/2, \
boundingRect().height()) / 5,
- (boundingRect().width()/2 + \
boundingRect().height()) / 12);
-
- leftPupil->resize(pupilSize, pupilSize);
- rightPupil->resize(pupilSize, pupilSize);
- }
- previousMousePos = QPoint(-1,-1);
}
-void Eyes::paintInterface(QPainter *p, const QStyleOptionGraphicsItem *option,
- const QRect &contentsRect)
-{
- Q_UNUSED(option)
- QRect rect = contentsRect;
- rect.setWidth(rect.width()/2 - 2);
- m_svg->paint(p, rect, QLatin1String( "leftEye" ));
- rect.translate(rect.width() + 2*2 , 0);
- m_svg->paint(p, rect, QLatin1String( "rightEye" ));
-}
-
-
-
-static QPointF pupilPos( const QRectF &eyesRect, const QPointF &mousePos)
-{
- const QPointF vect = mousePos - eyesRect.center(); //cursor position \
relative to the center of the eyes
- const qreal abs_vect = vect.x() * vect.x() + vect.y() * vect.y();
-
- if (qFuzzyCompare(vect.x() + 1 , qreal(1.0))) {
- if (vect.y() > eyesRect.height()/2) {
- return eyesRect.center() + QPoint( 0, eyesRect.height()/2);
- } else if (vect.y() < -eyesRect.height()/2) {
- return eyesRect.center() + QPoint( 0, -eyesRect.height()/2);
- } else {
- return mousePos;
- }
- }
-
- const qreal a = eyesRect.width() / 2;
- const qreal b = eyesRect.height() / 2;
- const qreal tan_alpha = vect.y() / vect.x();
-
- /*
- the pupil need to be on the intersection between the line
- y = x * tan_alpha
- and the ellipse
- x^2/a^2 + y^2/b^2
- */
-
- qreal x = a*b / sqrt(b*b + a*a * tan_alpha*tan_alpha);
- if (vect.x() < 0) {
- x = -x;
- }
- const qreal y = x*tan_alpha;
-
- if (abs_vect < (x * x) + (y * y)) {
- return mousePos;
- }
-
- return eyesRect.center() + QPointF(x, y);
-}
-
-void Eyes::timerEvent(QTimerEvent *e)
-{
- if (e->timerId() != timerId) {
- Plasma::Applet::timerEvent(e);
- return;
- }
-
- QPoint absMousePos = QCursor::pos();
-
- if (absMousePos == previousMousePos) {
- if (timerInterval > 300)
- return;
- timerInterval += 50;
- killTimer(timerId);
- timerId = startTimer(timerInterval);
- return;
- }
-
- if (timerInterval != 50) {
- timerInterval = 50;
- killTimer(timerId);
- timerId = startTimer(timerInterval);
- }
-
- QGraphicsView *myview = view();
- if (!myview) {
- return;
- }
-
- previousMousePos = absMousePos;
- //cursor position relative to the item coordonate
- QPointF mousePos = mapFromScene( myview->mapToScene( myview->mapFromGlobal( \
absMousePos ) ) );
-
- const QRectF bounding = boundingRect();
- const qreal paddingX = bounding.width() / 9;
- const qreal paddingY = bounding.height() / 5;
-
- QRectF eyesRect = boundingRect();
- // left pupil
- eyesRect.setWidth(eyesRect.width()/2 - 2);
- leftPupil->setPos(pupilPos(eyesRect.adjusted(paddingX,paddingY,-paddingX,-paddingY), \
mousePos)
- - leftPupil->boundingRect().center());
-
- //right pupil
- eyesRect.translate(eyesRect.width() + 2*2 , 0);
- rightPupil->setPos(pupilPos(eyesRect.adjusted(paddingX,paddingY,-paddingX,-paddingY), \
mousePos)
- - rightPupil->boundingRect().center());
-}
-
-
-#include "eyes.moc"
+#include "tasks.moc"
diff --git a/tasks/tasks.h b/tasks/tasks.h
index 892cdda..1a86923 100644
--- a/tasks/tasks.h
+++ b/tasks/tasks.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright 2008 by Olivier Goffart <ogoffart@kde.org> *
+ * Copyright (C) 2012 by Shaun M. Reich <shaun.reich@kdemail.net> *
* *
* 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 *
@@ -17,32 +17,24 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . *
***************************************************************************/
-#ifndef EYES_H
-#define EYES_H
+#ifndef TASKS_H
+#define TASKS_H
#include <Plasma/Applet>
-#include <Plasma/Svg>
-#include <Plasma/SvgWidget>
-class Eyes : public Plasma::Applet
+class Tasks : public Plasma::Applet
{
Q_OBJECT
public:
- Eyes(QObject *parent, const QVariantList &args);
- ~Eyes();
+ Tasks(QObject *parent, const QVariantList &args);
+ ~Tasks();
void paintInterface(QPainter *painter, const QStyleOptionGraphicsItem \
*option, const QRect& contentsRect); void constraintsEvent(Plasma::Constraints \
constraints);
-
- protected:
- void timerEvent(QTimerEvent *);
- Plasma::SvgWidget *leftPupil, *rightPupil;
- int timerId;
- int timerInterval;
- QPoint previousMousePos;
- Plasma::Svg *m_svg;
+
+ // protected:
};
-K_EXPORT_PLASMA_APPLET(eyes, Eyes)
+K_EXPORT_PLASMA_APPLET(tasks, Tasks)
#endif
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic