mabstractscroller.h   mabstractscroller.h 
skipping to change at line 57 skipping to change at line 57
* *
* Current limitation: If scrolling amount of the particular widget is restricted, * Current limitation: If scrolling amount of the particular widget is restricted,
* and this method is called more than once, subsequent queries might promise too * and this method is called more than once, subsequent queries might promise too
* much and exceed the scrolling range of the widget. * much and exceed the scrolling range of the widget.
* This method could be replaced by getters for viewport area and scro llable range, * This method could be replaced by getters for viewport area and scro llable range,
* and then MScrollChain would do the math, keeping track of scrolling position. * and then MScrollChain would do the math, keeping track of scrolling position.
* *
* \param widget The scrollable widget in question. * \param widget The scrollable widget in question.
* \param targetRect Target rectangle of the area of interest, in loca l widget coordinates. * \param targetRect Target rectangle of the area of interest, in loca l widget coordinates.
* \param originPoint Current position (top left) of the area to be mo ved to targetRect, in local widget coordinates. * \param originPoint Current position (top left) of the area to be mo ved to targetRect, in local widget coordinates.
* \param currentOffset The amount that \a widget is already planned t o be scrolled but not yet applied.
*/ */
virtual QPoint queryScrollingAmount(const QGraphicsWidget *widget, virtual QPoint queryScrollingAmount(const QGraphicsWidget *widget,
const QRect &targetRect, const QRect &targetRect,
const QPoint &originPoint) = 0; const QPoint &originPoint,
const QPoint &currentOffset) = 0;
//! \brief Scrolls the contents of given \a widget by the amount of \a contentsOffset. //! \brief Scrolls the contents of given \a widget by the amount of \a contentsOffset.
virtual void applyScrolling(QGraphicsWidget *widget, const QPoint &cont entsOffset) = 0; virtual void applyScrolling(QGraphicsWidget *widget, const QPoint &cont entsOffset) = 0;
//! \brief Restores the widget to its original state (Optional) //! \brief Restores the widget to its original state (Optional)
virtual void restoreScrolling(QGraphicsWidget *widget); virtual void restoreScrolling(QGraphicsWidget *widget);
//! \brief Helper method for moving a small rectangle inside a larger a rea. //! \brief Helper method for moving a small rectangle inside a larger a rea.
static void moveRectInsideArea(const QRect &area, QRect &rect); static void moveRectInsideArea(const QRect &area, QRect &rect);
}; };
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added


 mbannerview.h   mbannerview.h 
skipping to change at line 61 skipping to change at line 61
\param dd Private class implementation \param dd Private class implementation
\param controller Pointer to the banner's controller \param controller Pointer to the banner's controller
*/ */
MBannerView(MBannerViewPrivate &dd, MBanner *controller); MBannerView(MBannerViewPrivate &dd, MBanner *controller);
//! \reimp //! \reimp
virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
virtual void setupModel(); virtual void setupModel();
virtual void applyStyle(); virtual void applyStyle();
virtual void drawForeground(QPainter *painter, const QStyleOptionGraphi csItem *option) const;
//! \reimp_end //! \reimp_end
MBannerViewPrivate *const d_ptr; MBannerViewPrivate *const d_ptr;
protected Q_SLOTS: protected Q_SLOTS:
//! \reimp //! \reimp
virtual void updateData(const QList<const char *>& modifications); virtual void updateData(const QList<const char *>& modifications);
//! \reimp_end //! \reimp_end
private: private:
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 mcontentitem.h   mcontentitem.h 
skipping to change at line 330 skipping to change at line 330
\brief Makes content item to send clicked() signal. \brief Makes content item to send clicked() signal.
*/ */
void click(); void click();
/*! /*!
\brief Makes the content item to send longTapped signal. \brief Makes the content item to send longTapped signal.
\param pos The position of the tap. \param pos The position of the tap.
If the MContentItem is used outside MList, the user needs to If the MContentItem is used outside MList, the user needs to
invoke item->grabGesture(Qt::TapAndHoldGesture) to start invoke item->grabGesture(Qt::TapAndHoldGesture) to start
receiving longTapped() signal. receiving longTapped() signal. You might also be interested in
using cancel event with that gesture, please see also
MWidget::grabGestureWithCancelPolicy() method.
\sa MWidget::grabGestureWithCancelPolicy.
*/ */
void longTap(const QPointF &pos); void longTap(const QPointF &pos);
Q_SIGNALS: Q_SIGNALS:
/*! /*!
\brief This signal is emitted when content item is pressed. \brief This signal is emitted when content item is pressed.
*/ */
void clicked(); void clicked();
/*! /*!
 End of changes. 1 change blocks. 
1 lines changed or deleted 5 lines changed or added


 mextensionrunner.h   mextensionrunner.h 
skipping to change at line 45 skipping to change at line 45
class MAppletMessage; class MAppletMessage;
class MAppletMouseMessage; class MAppletMouseMessage;
class MAppletCancelMessage; class MAppletCancelMessage;
class MAppletMetaData; class MAppletMetaData;
class MAppletInterface; class MAppletInterface;
class MAppletSharedMutex; class MAppletSharedMutex;
class QAction; class QAction;
#ifdef QT_OPENGL_LIB #ifdef QT_OPENGL_LIB
class QGLContext; class QGLContext;
#endif #endif
#ifdef HAVE_CONTEXTSUBSCRIBER
class ContextProperty;
#endif
//! \internal //! \internal
/** /**
* MExtensionRunner is a class that is used to start and run oop (out of pr ocess) * MExtensionRunner is a class that is used to start and run oop (out of pr ocess)
* extension widgets. * extension widgets.
* *
* W A R N I N G * W A R N I N G
* ------------- * -------------
* This file is not part of the libmeegotouch API. It should only be used b y applet runner developers. * This file is not part of the libmeegotouch API. It should only be used b y applet runner developers.
*/ */
skipping to change at line 111 skipping to change at line 114
/*! /*!
* \brief A slot for notifying that the scene has changed and needs to be painted * \brief A slot for notifying that the scene has changed and needs to be painted
*/ */
virtual void sceneChanged(const QList<QRectF> &region); virtual void sceneChanged(const QList<QRectF> &region);
/*! /*!
* \brief Slot to be called when the host process has not sent any mess ages in ALIVE_TIMER_TIMEOUT milliseconds * \brief Slot to be called when the host process has not sent any mess ages in ALIVE_TIMER_TIMEOUT milliseconds
*/ */
virtual void hostProcessNotAlive(); virtual void hostProcessNotAlive();
/*!
* \brief Stops or starts the alive timer depending on the display blan
king state
*/
void updateDisplayState();
protected: protected:
//! AppletClient for communicating between the runner and the host proc esses. //! AppletClient for communicating between the runner and the host proc esses.
MAppletClient *communicator; MAppletClient *communicator;
//! A parent widget for the actual extension widget //! A parent widget for the actual extension widget
QGraphicsWidget *parentWidget; QGraphicsWidget *parentWidget;
//! The extension widget instantiated from shared library //! The extension widget instantiated from shared library
QGraphicsWidget *widget; QGraphicsWidget *widget;
skipping to change at line 134 skipping to change at line 142
//! View into the scene. //! View into the scene.
MWindow *view; MWindow *view;
/*! Pixmap in which the extension is painted. The underlying X pixmap i s /*! Pixmap in which the extension is painted. The underlying X pixmap i s
shared between the host and runner processes. */ shared between the host and runner processes. */
QPixmap pixmap; QPixmap pixmap;
//! List to hold object menu actions received from widget. //! List to hold object menu actions received from widget.
QList<QAction *> widgetObjectMenuActions; QList<QAction *> widgetObjectMenuActions;
#ifdef HAVE_CONTEXTSUBSCRIBER
//! Context property for getting the screen blanking status
ContextProperty *screenBlankProperty;
#endif
//! True if the display is currently blanked
bool displayBlanked;
#ifdef QT_OPENGL_LIB #ifdef QT_OPENGL_LIB
//! OpenGL context //! OpenGL context
QGLContext *context; QGLContext *context;
#endif #endif
//! Timer for checking that the host process is alive //! Timer for checking that the host process is alive
QTimer *aliveTimer; QTimer *aliveTimer;
//! Shared mutex for locking the pixmap //! Shared mutex for locking the pixmap
MAppletSharedMutex *pixmapMutex; MAppletSharedMutex *pixmapMutex;
 End of changes. 3 change blocks. 
0 lines changed or deleted 17 lines changed or added


 mpannableviewportscroller.h   mpannableviewportscroller.h 
skipping to change at line 32 skipping to change at line 32
#include "mabstractscroller.h" #include "mabstractscroller.h"
//! \internal //! \internal
class MPannableViewportScroller : public MAbstractScroller class MPannableViewportScroller : public MAbstractScroller
{ {
public: public:
virtual QPoint queryScrollingAmount(const QGraphicsWidget *widget, virtual QPoint queryScrollingAmount(const QGraphicsWidget *widget,
const QRect &targetRect, const QRect &targetRect,
const QPoint &originPoint); const QPoint &originPoint,
const QPoint &currentOffset);
virtual void applyScrolling(QGraphicsWidget *widget, const QPoint &cont entsOffset); virtual void applyScrolling(QGraphicsWidget *widget, const QPoint &cont entsOffset);
virtual void restoreScrolling(QGraphicsWidget *widget); virtual void restoreScrolling(QGraphicsWidget *widget);
}; };
//! \internal_end //! \internal_end
#endif // MPANNABLEVIEWPORTCROLLER_H #endif // MPANNABLEVIEWPORTCROLLER_H
 End of changes. 1 change blocks. 
1 lines changed or deleted 2 lines changed or added


 mpannablewidget.h   mpannablewidget.h 
skipping to change at line 296 skipping to change at line 296
virtual void onDisplayChangeEvent(MOnDisplayChangeEvent *event); virtual void onDisplayChangeEvent(MOnDisplayChangeEvent *event);
virtual void panGestureEvent(QGestureEvent *event, QPanGesture* state); virtual void panGestureEvent(QGestureEvent *event, QPanGesture* state);
virtual void tapAndHoldGestureEvent(QGestureEvent *event, QTapAndHoldGe sture *gesture); virtual void tapAndHoldGestureEvent(QGestureEvent *event, QTapAndHoldGe sture *gesture);
virtual void orientationChangeEvent(MOrientationChangeEvent *event); virtual void orientationChangeEvent(MOrientationChangeEvent *event);
//! \reimp_end //! \reimp_end
private: private:
Q_DISABLE_COPY(MPannableWidget) Q_DISABLE_COPY(MPannableWidget)
Q_DECLARE_PRIVATE(MPannableWidget) Q_DECLARE_PRIVATE(MPannableWidget)
/*!
* \brief Method for handling the press events from the glass.
*/
void glassMousePressEvent(QGraphicsSceneMouseEvent *event);
/*!
* \brief Method for handling the release events from the glass.
*/
void glassMouseReleaseEvent(QGraphicsSceneMouseEvent *event);
/*!
* \brief Method for handling the move events from the glass.
*/
void glassMouseMoveEvent(QGraphicsSceneMouseEvent *event);
/*!
* \brief Method for delivering timer events.
*/
void glassTimerEvent(QTimerEvent* event);
/*!
* \brief Method for checking if the event is on the resent list
* and should pass the glass when it hits it the second time.
*/
bool checkForResent(QEvent *event);
/*!
* \brief Method for posting a captured event back to viewport.
*/
void resendEvent(QGraphicsSceneMouseEvent *event);
/*!
* \brief Method for sending cancel event to viewport.
*/
void sendCancel();
/*!
* \brief Init method.
*/
void init();
#ifdef UNIT_TEST #ifdef UNIT_TEST
// Test unit is defined as a friend of production code to access privat e members // Test unit is defined as a friend of production code to access privat e members
friend class Ut_MPannableWidget; friend class Ut_MPannableWidget;
#endif #endif
friend class MPannableWidgetGlass; friend class MPannableWidgetGlass;
// We are using a hack which will allow reimplementing the panGestureEv ent // We are using a hack which will allow reimplementing the panGestureEv ent
// method in the pannable widget without recompilation of all client ap plications. // method in the pannable widget without recompilation of all client ap plications.
// This needs to be deleted when API unfreeze will finally happen. // This needs to be deleted when API unfreeze will finally happen.
 End of changes. 1 change blocks. 
41 lines changed or deleted 0 lines changed or added


 mscene.h   mscene.h 
skipping to change at line 96 skipping to change at line 96
void drawForeground(QPainter *painter, const QRectF &rect); void drawForeground(QPainter *painter, const QRectF &rect);
//! \reimp_end //! \reimp_end
//! \internal //! \internal
MScenePrivate *const d_ptr; MScenePrivate *const d_ptr;
//! \internal_end //! \internal_end
private: private:
Q_DISABLE_COPY(MScene) Q_DISABLE_COPY(MScene)
Q_DECLARE_PRIVATE(MScene) Q_DECLARE_PRIVATE(MScene)
Q_PRIVATE_SLOT(d_func(), void _q_initialPressDeliveryTimeout())
#ifdef UNIT_TEST #ifdef UNIT_TEST
friend class Ut_MScene; friend class Ut_MScene;
#endif // UNIT_TEST #endif // UNIT_TEST
friend class MSceneManager; friend class MSceneManager;
friend class MWindowPrivate; friend class MWindowPrivate;
friend class MSceneWindow; friend class MSceneWindow;
friend class MWidget;
}; };
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 mscenewindowscroller.h   mscenewindowscroller.h 
skipping to change at line 45 skipping to change at line 45
//! connected to using Qt::DirectConnection, or similar, since after em itting it is assumed the //! connected to using Qt::DirectConnection, or similar, since after em itting it is assumed the
//! window has been moved. //! window has been moved.
void sceneWindowDislocationRequest(MSceneWindow *sceneWindow, const QPo intF &displacement); void sceneWindowDislocationRequest(MSceneWindow *sceneWindow, const QPo intF &displacement);
//! This signal requests undoing previous displacement of a given scene window. //! This signal requests undoing previous displacement of a given scene window.
void sceneWindowUndoDislocationRequest(MSceneWindow *sceneWindow); void sceneWindowUndoDislocationRequest(MSceneWindow *sceneWindow);
public: public:
virtual QPoint queryScrollingAmount(const QGraphicsWidget *widget, virtual QPoint queryScrollingAmount(const QGraphicsWidget *widget,
const QRect &targetRect, const QRect &targetRect,
const QPoint &originPoint); const QPoint &originPoint,
const QPoint &currentOffset);
virtual void applyScrolling(QGraphicsWidget *widget, const QPoint &cont entsOffset); virtual void applyScrolling(QGraphicsWidget *widget, const QPoint &cont entsOffset);
virtual void restoreScrolling(QGraphicsWidget *widget); virtual void restoreScrolling(QGraphicsWidget *widget);
}; };
//! \internal_end //! \internal_end
#endif // MSCENEWINDOWSCROLLER_H #endif // MSCENEWINDOWSCROLLER_H
 End of changes. 1 change blocks. 
1 lines changed or deleted 2 lines changed or added


 mwidget.h   mwidget.h 
skipping to change at line 118 skipping to change at line 118
The paint offset allows for a widget to appear as if in a position The paint offset allows for a widget to appear as if in a position
different than that of the widget's pos() property. This allows for ex ample different than that of the widget's pos() property. This allows for ex ample
to animate the widget's apparent location using a QPropertyAnimation to animate the widget's apparent location using a QPropertyAnimation
without affecting layouting or the layout affecting the animation. without affecting layouting or the layout affecting the animation.
\sa paintOffset() \sa paintOffset()
*/ */
void setPaintOffset(const QPointF & offset); void setPaintOffset(const QPointF & offset);
/*!
* This enum contains possible values of a mouse event cancel policy.
*
* \li MouseEventNoCancel - the cancel event will not be sent if this w
idget receives a gesture.
* \li MouseEventCancelOnGestureStarted - the cancel event will be sent
when
* a gesture is being started and accepted by this widget.
* \li MouseEventCancelOnGestureFinished - the cancel event will be sen
t when
* a gesture is being finished and was accepted by this widget.
*
* \sa grabGestureWithCancelPolicy.
*/
enum MouseEventCancelPolicy {
MouseEventNoCancel,
MouseEventCancelOnGestureStarted,
MouseEventCancelOnGestureFinished
};
/*!
Subscribes the widget to gestures events of a specific \a type. Allows
definition
of cancel event handling policy for that gesture.
The meegotouch library can send cancel event to the current mouse grab
ber and
stop processing mouse events. This allows the UI to react to situation
when
the user starts a gesture on top of interactive elements like buttons.
In
a typical example, the user starts panning gesture over a button, whic
h will
initially reach the pressed state. Then the user moves his finger and
the button
will then be moved back to un-pressed state, without triggering action
s connected
to it. Internally, the button will receive a cancel event and it will
not receive
the release event.
This method is an overloaded version of grabGesture defined in QGraphi
csWidget
which introduces \a cancelPolicy argument. It can be used to define th
e reaction
to started or finished gesture when it reaches the object of the MWidg
et.
\sa MouseEventCancelPolicy
*/
void grabGestureWithCancelPolicy(Qt::GestureType type, Qt::GestureFlags
flags = Qt::GestureFlags(), MouseEventCancelPolicy cancelPolicy = MouseEve
ntNoCancel);
/*! \reimp /*! \reimp
* We reimplement these to distinguish between the user hiding items * We reimplement these to distinguish between the user hiding items
* explicitly, and the layout hiding them. * explicitly, and the layout hiding them.
*/ */
void setVisible(bool visible); void setVisible(bool visible);
void hide() { void hide() {
setVisible(false); setVisible(false);
} }
void show() { void show() {
setVisible(true); setVisible(true);
 End of changes. 1 change blocks. 
0 lines changed or deleted 54 lines changed or added


 mwindowstyle.h   mwindowstyle.h 
skipping to change at line 26 skipping to change at line 26
** of this file. ** of this file.
** **
*************************************************************************** */ *************************************************************************** */
#ifndef MWINDOWSTYLE_H #ifndef MWINDOWSTYLE_H
#define MWINDOWSTYLE_H #define MWINDOWSTYLE_H
#include <mstyle.h> #include <mstyle.h>
#include <QColor> #include <QColor>
class QPixmap;
//! \internal //! \internal
/** \brief Defines a style for a MWindow class. /** \brief Defines a style for a MWindow class.
*/ */
class MWindowStyle : public MStyle class MWindowStyle : public MStyle
{ {
Q_OBJECT Q_OBJECT
M_STYLE_INTERNAL(MWindowStyle) M_STYLE_INTERNAL(MWindowStyle)
/*! /*!
\brief Sets the default background color when opening a window. Sets the default background color when opening a window. If
*/ x11StartupPixmap is defined the color will be ignored.
M_STYLE_ATTRIBUTE(QColor, backgroundColor, BackgroundColor) */
M_STYLE_ATTRIBUTE(QColor, startupFillColor, StartupFillColor)
/*! /*!
\brief Sets the default background image when opening a window. The pixmap used to initially fill the window before it is shown.
The pixmap needs to be an X11 pixmap, to ensure this make sure it has
forcex11 in its filename.
*/ */
M_STYLE_ATTRIBUTE(QString, backgroundImage, BackgroundImage) M_STYLE_PTR_ATTRIBUTE(QPixmap *, x11StartupPixmap, X11StartupPixmap)
}; };
class MWindowStyleContainer : public MStyleContainer class MWindowStyleContainer : public MStyleContainer
{ {
M_STYLE_CONTAINER_INTERNAL(MWindowStyle) M_STYLE_CONTAINER_INTERNAL(MWindowStyle)
}; };
//! \internal_end //! \internal_end
#endif // MWINDOWSTYLE_H #endif // MWINDOWSTYLE_H
 End of changes. 4 change blocks. 
5 lines changed or deleted 11 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/