kill applet handles and some animations stuff
This commit is contained in:
parent
390ec09558
commit
1d520ac557
@ -199,7 +199,6 @@ set(plasma_LIB_SRCS
|
|||||||
|
|
||||||
#TODO: all those files will have to be deleted
|
#TODO: all those files will have to be deleted
|
||||||
# set (plasmaqgv_LIB_SRCS
|
# set (plasmaqgv_LIB_SRCS
|
||||||
# private/applethandle.cpp
|
|
||||||
# abstracttoolbox.cpp
|
# abstracttoolbox.cpp
|
||||||
# delegate.cpp
|
# delegate.cpp
|
||||||
# dialog.cpp
|
# dialog.cpp
|
||||||
|
@ -1,69 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright (C) 2009 Adenilson Cavalcanti <adenilson.silva@idnt.org.br>
|
|
||||||
|
|
||||||
This library is free software; you can redistribute it and/or
|
|
||||||
modify it under the terms of the GNU Lesser General Public
|
|
||||||
License as published by the Free Software Foundation; either
|
|
||||||
version 2.1 of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
This library is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
Lesser General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Lesser General Public
|
|
||||||
License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef PLASMA_ABSTRACTANIMATIONPRIVATE_P_H
|
|
||||||
#define PLASMA_ABSTRACTANIMATIONPRIVATE_P_H
|
|
||||||
|
|
||||||
#include <QEasingCurve>
|
|
||||||
#include <QWeakPointer>
|
|
||||||
class QAbstractAnimation;
|
|
||||||
|
|
||||||
namespace Plasma
|
|
||||||
{
|
|
||||||
|
|
||||||
class AnimationPrivate
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
|
|
||||||
AbstractAnimationPrivate();
|
|
||||||
/**
|
|
||||||
* Object the animation(s) should act upon.
|
|
||||||
*/
|
|
||||||
QWeakPointer<QGraphicsWidget> animObject;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Animation direction: where the animation will move.
|
|
||||||
*/
|
|
||||||
qint8 animDirection;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Animation distance: displacement factor for animations where
|
|
||||||
* there is change in the position of animated widget.
|
|
||||||
*/
|
|
||||||
qreal animDistance;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Animation easing curve type
|
|
||||||
*/
|
|
||||||
QEasingCurve easingCurve;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Animation direction, the idea is to offer a way
|
|
||||||
* to rewind the animation by setDirection(QAbstractAnimation::Backward).
|
|
||||||
*/
|
|
||||||
bool forwards;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Duration of the animation. Default is 250ms.
|
|
||||||
*/
|
|
||||||
int duration;
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // PLASMA_ABSTRACTANIMATIONPRIVATE_P_H
|
|
@ -1,51 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright (C) 2009 Adenilson Cavalcanti <adenilson.silva@idnt.org.br>
|
|
||||||
|
|
||||||
This library is free software; you can redistribute it and/or
|
|
||||||
modify it under the terms of the GNU Lesser General Public
|
|
||||||
License as published by the Free Software Foundation; either
|
|
||||||
version 2.1 of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
This library is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
Lesser General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Lesser General Public
|
|
||||||
License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef PLASMA_ANIMATIONPRIVATE_P_H
|
|
||||||
#define PLASMA_ANIMATIONPRIVATE_P_H
|
|
||||||
|
|
||||||
#include <QEasingCurve>
|
|
||||||
#include <QWeakPointer>
|
|
||||||
class QAbstractAnimation;
|
|
||||||
|
|
||||||
namespace Plasma
|
|
||||||
{
|
|
||||||
|
|
||||||
class AnimationPrivate
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
|
|
||||||
AnimationPrivate();
|
|
||||||
/**
|
|
||||||
* Object the animation(s) should act upon.
|
|
||||||
*/
|
|
||||||
QWeakPointer<QGraphicsWidget> animObject;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Animation easing curve type
|
|
||||||
*/
|
|
||||||
QEasingCurve easingCurve;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Duration of the animation. Default is 250ms.
|
|
||||||
*/
|
|
||||||
int duration;
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // PLASMA_ANIMATIONPRIVATE_P_H
|
|
File diff suppressed because it is too large
Load Diff
@ -1,156 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2007 by Kevin Ottens <ervin@kde.org>
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Library General Public License as
|
|
||||||
* published by the Free Software Foundation; either version 2, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Library General Public
|
|
||||||
* License along with this program; if not, write to the
|
|
||||||
* Free Software Foundation, Inc.,
|
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef PLASMA_APPLETHANDLE_P_H
|
|
||||||
#define PLASMA_APPLETHANDLE_P_H
|
|
||||||
|
|
||||||
#include <QtCore/QObject>
|
|
||||||
#include <QGraphicsObject>
|
|
||||||
#include <QTimer>
|
|
||||||
#include <QWeakPointer>
|
|
||||||
#include <QPropertyAnimation>
|
|
||||||
|
|
||||||
#include "animator.h"
|
|
||||||
#include "applet.h"
|
|
||||||
#include "svg.h"
|
|
||||||
|
|
||||||
class QGraphicsView;
|
|
||||||
|
|
||||||
namespace Plasma
|
|
||||||
{
|
|
||||||
class Containment;
|
|
||||||
class FrameSvg;
|
|
||||||
class View;
|
|
||||||
|
|
||||||
class AppletHandle : public QGraphicsObject
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
Q_PROPERTY(qreal fadeAnimation READ fadeAnimation WRITE setFadeAnimation)
|
|
||||||
Q_INTERFACES(QGraphicsItem)
|
|
||||||
public:
|
|
||||||
enum FadeType {
|
|
||||||
FadeIn,
|
|
||||||
FadeOut
|
|
||||||
};
|
|
||||||
enum ButtonType {
|
|
||||||
NoButton,
|
|
||||||
MoveButton,
|
|
||||||
RotateButton,
|
|
||||||
ConfigureButton,
|
|
||||||
RemoveButton,
|
|
||||||
ResizeButton,
|
|
||||||
MaximizeButton
|
|
||||||
};
|
|
||||||
|
|
||||||
AppletHandle(Containment *parent, Applet *applet, const QPointF &hoverPos);
|
|
||||||
virtual ~AppletHandle();
|
|
||||||
|
|
||||||
bool shown() const;
|
|
||||||
|
|
||||||
void detachApplet();
|
|
||||||
Applet *applet() const;
|
|
||||||
|
|
||||||
QRectF boundingRect() const;
|
|
||||||
QPainterPath shape() const;
|
|
||||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
|
|
||||||
void startFading(FadeType anim, const QPointF &hoverPos, bool preserveSide = false);
|
|
||||||
void setHoverPos(const QPointF &hoverPos);
|
|
||||||
|
|
||||||
protected:
|
|
||||||
void mousePressEvent(QGraphicsSceneMouseEvent *event);
|
|
||||||
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
|
|
||||||
void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
|
|
||||||
void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
|
|
||||||
void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
|
|
||||||
void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
|
|
||||||
bool sceneEventFilter(QGraphicsItem *watched, QEvent *event);
|
|
||||||
bool sceneEvent(QEvent*);
|
|
||||||
|
|
||||||
Q_SIGNALS:
|
|
||||||
void disappearDone(AppletHandle *self);
|
|
||||||
|
|
||||||
private Q_SLOTS:
|
|
||||||
void setFadeAnimation(qreal progress);
|
|
||||||
qreal fadeAnimation() const;
|
|
||||||
void appletDestroyed();
|
|
||||||
void appletResized();
|
|
||||||
void hoverTimeout();
|
|
||||||
void leaveTimeout();
|
|
||||||
void emitDisappear();
|
|
||||||
void scheduleUpdate();
|
|
||||||
|
|
||||||
private:
|
|
||||||
static const int HANDLE_MARGIN = 3;
|
|
||||||
|
|
||||||
void calculateSize();
|
|
||||||
ButtonType mapToButton(const QPointF &point) const;
|
|
||||||
void forceDisappear();
|
|
||||||
int minimumHeight();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* move our applet to another containment
|
|
||||||
* @param containment the containment to move to
|
|
||||||
* @param pos the (scene-relative) position to place it at
|
|
||||||
*/
|
|
||||||
void switchContainment(Containment *containment, const QPointF &pos);
|
|
||||||
bool leaveCurrentView(const QPoint &pos) const;
|
|
||||||
|
|
||||||
QRectF m_rect;
|
|
||||||
QRectF m_decorationRect;
|
|
||||||
QRectF m_totalRect;
|
|
||||||
ButtonType m_pressedButton;
|
|
||||||
Containment *m_containment;
|
|
||||||
Applet *m_applet;
|
|
||||||
int m_iconSize;
|
|
||||||
qreal m_opacity;
|
|
||||||
FadeType m_animType;
|
|
||||||
QWeakPointer<QPropertyAnimation> m_anim;
|
|
||||||
qreal m_angle;
|
|
||||||
QColor m_gradientColor;
|
|
||||||
QTimer *m_hoverTimer;
|
|
||||||
QTimer *m_leaveTimer;
|
|
||||||
QPixmap *m_backgroundBuffer;
|
|
||||||
QWeakPointer<QGraphicsView> m_currentView;
|
|
||||||
|
|
||||||
Svg *m_configureIcons;
|
|
||||||
FrameSvg *m_background;
|
|
||||||
|
|
||||||
QPoint m_mousePos; //mousepos relative to applet
|
|
||||||
QPointF m_entryPos; //where the hover in event occurred
|
|
||||||
qreal m_zValue; //current zValue of the applet, so it can be restored after drag.
|
|
||||||
QRectF m_originalGeom;
|
|
||||||
QTransform m_originalTransform;
|
|
||||||
|
|
||||||
// used for both resize and rotate
|
|
||||||
QPointF m_origAppletCenter;
|
|
||||||
QPointF m_origAppletSize;
|
|
||||||
|
|
||||||
// used for resize
|
|
||||||
QPointF m_resizeStaticPoint;
|
|
||||||
QPointF m_resizeGrabPoint;
|
|
||||||
// used for rotate
|
|
||||||
qreal m_rotateAngleOffset; // applet angle minus cursor angle
|
|
||||||
|
|
||||||
bool m_buttonsOnRight : 1;
|
|
||||||
bool m_pendingFade : 1;
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // multiple inclusion guard
|
|
Loading…
Reference in New Issue
Block a user