maction.h   maction.h 
skipping to change at line 139 skipping to change at line 139
private: private:
Q_DISABLE_COPY(MAction) Q_DISABLE_COPY(MAction)
Q_DECLARE_PRIVATE(MAction) Q_DECLARE_PRIVATE(MAction)
#ifdef UNIT_TEST #ifdef UNIT_TEST
friend class Ut_MAction; friend class Ut_MAction;
#endif #endif
}; };
Q_DECLARE_OPERATORS_FOR_FLAGS(MAction::Locations)
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 mapplicationmenuview.h   mapplicationmenuview.h 
skipping to change at line 113 skipping to change at line 113
protected: protected:
//! \reimp //! \reimp
virtual void applyStyle(); virtual void applyStyle();
//! \reimp_end //! \reimp_end
MApplicationMenuView(MApplicationMenuViewPrivate &dd, MApplicationMenu *controller); MApplicationMenuView(MApplicationMenuViewPrivate &dd, MApplicationMenu *controller);
private: private:
Q_DISABLE_COPY(MApplicationMenuView) Q_DISABLE_COPY(MApplicationMenuView)
Q_DECLARE_PRIVATE(MApplicationMenuView) Q_DECLARE_PRIVATE(MApplicationMenuView)
Q_PRIVATE_SLOT(d_func(), void _q_displayEntered())
#ifdef UNIT_TEST #ifdef UNIT_TEST
friend class Pt_MApplicationMenu; friend class Pt_MApplicationMenu;
friend class Ut_MApplicationMenu; friend class Ut_MApplicationMenu;
#endif #endif
}; };
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 mapplicationwindow.h   mapplicationwindow.h 
skipping to change at line 80 skipping to change at line 80
(see QWidget::Normal()). (see QWidget::Normal()).
Please note that the full screen mode of an application window is orthog onal to the Please note that the full screen mode of an application window is orthog onal to the
presence of the navigation bar and navigation controls (home button and escape button). presence of the navigation bar and navigation controls (home button and escape button).
The presence of those is set via MApplicationPage::setComponentsDisplayM ode(). The presence of those is set via MApplicationPage::setComponentsDisplayM ode().
*/ */
class M_CORE_EXPORT MApplicationWindow : public MWindow class M_CORE_EXPORT MApplicationWindow : public MWindow
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(MTheme::ViewType toolbarViewType READ toolbarViewType WRITE setToolbarViewType) Q_PROPERTY(MTheme::ViewType toolbarViewType READ toolbarViewType WRITE setToolbarViewType)
Q_PROPERTY(qreal navigationBarOpacity READ navigationBarOpacity WRITE s etNavigationBarOpacity)
public: public:
/*! /*!
Creates an application window. A scene and scene manager are created a utomatically. Creates an application window. A scene and scene manager are created a utomatically.
*/ */
explicit MApplicationWindow(QWidget *parent = 0); explicit MApplicationWindow(QWidget *parent = 0);
/*! /*!
Creates an application window as a view for the given \a scene. A scen e manager is created for the scene. Creates an application window as a view for the given \a scene. A scen e manager is created for the scene.
*/ */
skipping to change at line 137 skipping to change at line 138
* Returns true if the window is chained otherwise false. * Returns true if the window is chained otherwise false.
*/ */
bool isChained() const; bool isChained() const;
#endif #endif
/*! /*!
Returns the style name of the application window. Returns the style name of the application window.
*/ */
QString styleName() const; QString styleName() const;
/*!
Returns current opacity of the navigation bar.
\sa QGraphicsItem::opacity()
*/
qreal navigationBarOpacity() const;
Q_SIGNALS: Q_SIGNALS:
/*! /*!
This signal is emitted after \page has become shown. This signal is emitted after \page has become shown.
*/ */
void pageChanged(MApplicationPage *page); void pageChanged(MApplicationPage *page);
public Q_SLOTS: public Q_SLOTS:
/*! /*!
* Opens the application menu of the window, provided that there * Opens the application menu of the window, provided that there
skipping to change at line 179 skipping to change at line 187
Set the style name to \a name. Set the style name to \a name.
This function sets the style name property of the application window to \a name This function sets the style name property of the application window to \a name
and reloads application window style. The style name is used to selec t a style with and reloads application window style. The style name is used to selec t a style with
a matching name from the theme. a matching name from the theme.
\sa styleName() \sa styleName()
*/ */
void setStyleName(const QString &name); void setStyleName(const QString &name);
/*!
Sets the opacity of the navigation bar.
\sa QGraphicsItem::setOpacity()
*/
void setNavigationBarOpacity(qreal opacity);
protected: protected:
//! \internal //! \internal
explicit MApplicationWindow(MApplicationWindowPrivate &dd, QWidget *par ent = 0); explicit MApplicationWindow(MApplicationWindowPrivate &dd, QWidget *par ent = 0);
explicit MApplicationWindow(MApplicationWindowPrivate &dd, MScene *scen e = 0, QWidget *parent = 0); explicit MApplicationWindow(MApplicationWindowPrivate &dd, MScene *scen e = 0, QWidget *parent = 0);
//! \internal_end //! \internal_end
//! \reimp //! \reimp
virtual bool event(QEvent *event); virtual bool event(QEvent *event);
virtual void closeEvent(QCloseEvent *event); virtual void closeEvent(QCloseEvent *event);
virtual void mousePressEvent(QMouseEvent *event); virtual void mousePressEvent(QMouseEvent *event);
skipping to change at line 216 skipping to change at line 231
#endif #endif
#ifdef M_OS_MAEMO5 #ifdef M_OS_MAEMO5
Q_PRIVATE_SLOT(d_func(), void _q_exitAppView()) Q_PRIVATE_SLOT(d_func(), void _q_exitAppView())
#endif //M_OS_MAEMO5 #endif //M_OS_MAEMO5
Q_PRIVATE_SLOT(d_func(), void _q_updatePageEscapeAuto()) Q_PRIVATE_SLOT(d_func(), void _q_updatePageEscapeAuto())
Q_PRIVATE_SLOT(d_func(), void _q_updatePageExposedContentRect()) Q_PRIVATE_SLOT(d_func(), void _q_updatePageExposedContentRect())
Q_PRIVATE_SLOT(d_func(), void _q_navigationBarStateChanged(MSceneWindow ::SceneWindowState newState, MSceneWindow::SceneWindowState oldState)) Q_PRIVATE_SLOT(d_func(), void _q_navigationBarStateChanged(MSceneWindow ::SceneWindowState newState, MSceneWindow::SceneWindowState oldState))
Q_PRIVATE_SLOT(d_func(), void _q_handleInSwitcherVisibilityChange()) Q_PRIVATE_SLOT(d_func(), void _q_handleInSwitcherVisibilityChange())
Q_PRIVATE_SLOT(d_func(), void _q_updateStyle()) Q_PRIVATE_SLOT(d_func(), void _q_updateStyle())
Q_PRIVATE_SLOT(d_func(), void _q_setupNavigationBarCustomContent()) Q_PRIVATE_SLOT(d_func(), void _q_setupNavigationBarCustomContent())
Q_PRIVATE_SLOT(d_func(), void _q_updateNavigationBarVisibility())
Q_PRIVATE_SLOT(d_func(), void _q_scheduleNavigationBarVisibilityUpdate(
))
}; };
#endif #endif
 End of changes. 4 change blocks. 
0 lines changed or deleted 18 lines changed or added


 massembly.h   massembly.h 
skipping to change at line 66 skipping to change at line 66
/*! /*!
\brief Returns view type for widget. \brief Returns view type for widget.
*/ */
QString viewType(const MWidgetController *widget, bool &exactMatch) con st; QString viewType(const MWidgetController *widget, bool &exactMatch) con st;
/*! /*!
\brief Returns stylesheet for this assembly. \brief Returns stylesheet for this assembly.
*/ */
MStyleSheet *stylesheet() const; MStyleSheet *stylesheet() const;
//! \deprecated Use themeChanged(const QStringList&) instead. Sice 0.20
.54.
Q_DECL_DEPRECATED void themeChanged(const QStringList &themeInheritance
, const MLogicalValues &);
/*! /*!
\brief Reloads all theme-related data \brief Reloads all theme-related data
*/ */
void themeChanged(const QStringList &themeInheritance, const MLogicalVa lues &logicalValues); void themeChanged(const QStringList &themeInheritance);
}; };
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 6 lines changed or added


 mbanner.h   mbanner.h 
skipping to change at line 41 skipping to change at line 41
\section BannerOverview Overview \section BannerOverview Overview
MBanner is a component used by the system for different purposes relate d with MBanner is a component used by the system for different purposes relate d with
the notifications. Depending on the elements that you use when setting up an MBanner, the notifications. Depending on the elements that you use when setting up an MBanner,
the component will have different appearances. the component will have different appearances.
Although we haven't defined different views for the MBanner, we conside r those three types: Although we haven't defined different views for the MBanner, we conside r those three types:
\li An event banner is a MBanner with an icon, title and subtitle. \li An event banner is a MBanner with an icon, title and subtitle.
\li An information banner is a MBanner with a subtitle (only one label) \li An information banner is a MBanner with a title and icon
\li An system banner is a MBanner with an icon an subtitle \li An system banner is a MBanner with a title (only one label)
You should set the stylename through setStyleName() with one of the fo llowing names: You should set the stylename through setStyleName() with one of the fo llowing names:
\li "EventBanner": used for events as emails, sms, etc. Icon, title and \li "ShortEventBanner": used for events as emails, sms, etc. Icon, titl
subtitle. e and subtitle.
\li "InformationBanner": used to show generic information with icons. \li "InformationBanner": used to show generic information for apps with
icons.
\li "SystemBanner": reserved for system notifications, only text. \li "SystemBanner": reserved for system notifications, only text.
If you create a MBanner without styleName it will have a default style, and it will have the If you create a MBanner without styleName it will have a default style, and it will have the
capability to show any property: title, subtitle, etc. capability to show any property: title, subtitle, etc.
In case that your banner contains any combination above mentioned, the styleName will In case that your banner contains any combination above mentioned, the styleName will
be configured automatically by the library. be configured automatically by the library.
Due to the MBanner has the capability to be shown at the events/lock sc reen, it comes with two Due to the MBanner has the capability to be shown at the events/lock sc reen, it comes with two
styles for this use case: styles for this use case:
\li EventScreen \li FullEventBanner
\li LockScreen \li PrivateEventBanner
The difference between FullEventBanner and PrivateEventBanner is that t
he second doesn't show
the subtitle due to privacy reasons.
MBanner can switch to different styles in anytime only switching the st ylename. MBanner can switch to different styles in anytime only switching the st ylename.
Note that some styles contain some specific layouts in which some prope rties are not show. Note that some styles contain some specific layouts in which some prope rties are not show.
For instance if you create a Event Banner: For instance if you create a Short Event Banner:
\code \code
MBanner *eventBanner = new MBanner(); MBanner *eventBanner = new MBanner();
eventBanner->setStyleName("EventBanner"); eventBanner->setStyleName("ShortEventBanner");
eventBanner->setIconID("icon-l-settings"); eventBanner->setIconID("icon-l-settings");
eventBanner->setTitle("New updates waiting to install"); eventBanner->setTitle("New updates waiting to install");
eventBanner->setSubtitle("130 files"); eventBanner->setSubtitle("130 files");
eventBanner->appear(scene(), MSceneWindow::DestroyWhenDone); eventBanner->appear(scene(), MSceneWindow::DestroyWhenDone);
\endcode \endcode
If you want show the look and feel of this MBanner in the event screen you only need switch If you want show the look and feel of this MBanner in the event screen you only need switch
the stylename: the stylename:
\code \code
eventBanner->setStyleName("EventScreen"); eventBanner->setStyleName("FullEventBanner");
\endcode \endcode
The MBanner layout will be styled with the EventScreen's layout automat ically. The MBanner layout will be styled with the FullEventBanner's layout aut omatically.
Is highly recommended use a styleName contemplated in the mentioned cat egories. As Is highly recommended use a styleName contemplated in the mentioned cat egories. As
a good practice <b>you should setup one of the mentioned stylenames</b> to avoid conflicts a good practice <b>you should setup one of the mentioned stylenames</b> to avoid conflicts
in the look and feel. in the look and feel.
By default MBanner is dismissed automatically after a certain amount of time. This By default MBanner is dismissed automatically after a certain amount of time. This
parameter is defined in mbannerstyle.css under the name of disappear-ti meout. parameter is defined in mbannerstyle.css under the name of disappear-ti meout.
The whole MBanner is interactive. If you click the MBanner before the d iappear-timeout The whole MBanner is interactive. If you click the MBanner before the d iappear-timeout
is reached it will be dismissed. is reached it will be dismissed.
skipping to change at line 101 skipping to change at line 104
\section notification_vs_banner MNotification versus MBanner \section notification_vs_banner MNotification versus MBanner
Use MBanner class to launch in-process notifications. Use MBanner class to launch in-process notifications.
Use MNotification class to launch out-of-process system level notificat ions. Use MNotification class to launch out-of-process system level notificat ions.
\section MBannerExamples Examples \section MBannerExamples Examples
Here's how to launch an event banner from code: Here's how to launch an event banner from code:
\code \code
MBanner *eventBanner = new MBanner(); MBanner *eventBanner = new MBanner();
eventBanner->setStyleName("EventBanner"); eventBanner->setStyleName("ShortEventBanner");
eventBanner->setIconID("icon-l-settings"); eventBanner->setIconID("icon-l-settings");
eventBanner->setTitle("New updates waiting to install"); eventBanner->setTitle("New updates waiting to install");
eventBanner->setSubtitle("130 files"); eventBanner->setSubtitle("130 files");
eventBanner->appear(scene(), MSceneWindow::DestroyWhenDone); eventBanner->appear(scene(), MSceneWindow::DestroyWhenDone);
\endcode \endcode
Here's how to launch an information banner from code: Here's how to launch an information banner from code:
\code \code
MBanner *infoBanner = new MBanner(); MBanner *infoBanner = new MBanner();
infoBanner->setStyleName("InformationBanner"); infoBanner->setStyleName("InformationBanner");
skipping to change at line 125 skipping to change at line 128
\endcode \endcode
Here's how to launch a system banner from code: Here's how to launch a system banner from code:
\code \code
MBanner *systemBanner = new MBanner(); MBanner *systemBanner = new MBanner();
systemBanner->setStyleName("SystemBanner"); systemBanner->setStyleName("SystemBanner");
systemBanner->setTitle("System banner"); systemBanner->setTitle("System banner");
systemBanner->appear(scene(), MSceneWindow::DestroyWhenDone); systemBanner->appear(scene(), MSceneWindow::DestroyWhenDone);
\endcode \endcode
Here's how to launch a event full banner from code:
\code
MBanner *fullEventBanner = new MBanner();
fullEventBanner->setStyleName("FullEventBanner");
fullEventBanner->setIconID("icon-m-camera-scene-landscape-selecte
d");
fullEventBanner->setTitle("Call");
fullEventBanner->setSubtitle("Brianna Edwards");
fullEventBanner->setPrefixTimeStamp("Yesterday:");
fullEventBanner->setBannerTimeStamp(QDateTime::currentDateTime())
;
\endcode
\sa MNotification \sa MNotification
*/ */
class M_CORE_EXPORT MBanner : public MSceneWindow class M_CORE_EXPORT MBanner : public MSceneWindow
{ {
Q_OBJECT Q_OBJECT
M_CONTROLLER(MBanner) M_CONTROLLER(MBanner)
public: public:
/*! /*!
 End of changes. 9 change blocks. 
12 lines changed or deleted 30 lines changed or added


 mbuttonview.h   mbuttonview.h 
skipping to change at line 159 skipping to change at line 159
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:
Q_DISABLE_COPY(MButtonView) Q_DISABLE_COPY(MButtonView)
Q_DECLARE_PRIVATE(MButtonView) Q_DECLARE_PRIVATE(MButtonView)
Q_PRIVATE_SLOT(d_func(), void _q_applyQueuedStyleModeChange()) Q_PRIVATE_SLOT(d_func(), void _q_applyQueuedStyleModeChange())
Q_PRIVATE_SLOT(d_func(), void _q_finishBlinkEffect())
#ifdef UNIT_TEST #ifdef UNIT_TEST
friend class Ut_MButtonView; friend class Ut_MButtonView;
#endif #endif
}; };
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 mdialog.h   mdialog.h 
skipping to change at line 535 skipping to change at line 535
MPannableWidget::PanningPolicy contentsVerticalPanningPolicy() const; MPannableWidget::PanningPolicy contentsVerticalPanningPolicy() const;
/** /**
* \brief Sets vertical panning policy of dialog's contents * \brief Sets vertical panning policy of dialog's contents
* *
* \param policy Vertical panning policy * \param policy Vertical panning policy
* \sa contentsVerticalPanningPolicy() * \sa contentsVerticalPanningPolicy()
*/ */
void setContentsVerticalPanningPolicy(MPannableWidget::PanningPolicy po licy); void setContentsVerticalPanningPolicy(MPannableWidget::PanningPolicy po licy);
/*!
* \brief Returns the dialog's title bar icon id.
* \return Icon being displayed in dialog's title bar.
* \sa setTitleBarIconId()
*/
QString titleBarIconId() const;
/*!
* \brief Sets the dialog's title bar icon.
*
* \param iconId Logical icon id to be displayed in title bar.
* \sa titleBarIconId()
*/
void setTitleBarIconId(const QString &iconId);
public Q_SLOTS: public Q_SLOTS:
/*! /*!
* Shows the dialog on the currently active window and registers it in the * Shows the dialog on the currently active window and registers it in the
* associated MSceneManager. Uses an animation to show the window. * associated MSceneManager. Uses an animation to show the window.
* *
* If systemModal property is true, it will be displayed as a separate top level * If systemModal property is true, it will be displayed as a separate top level
* MWindow regardless of whether there's an active window and the user * MWindow regardless of whether there's an active window and the user
* won't be able to switch to any other application or to the home scre en until * won't be able to switch to any other application or to the home scre en until
* the dialog is closed (the home button won't be accessible). * the dialog is closed (the home button won't be accessible).
* *
 End of changes. 1 change blocks. 
0 lines changed or deleted 15 lines changed or added


 mdialogmodel.h   mdialogmodel.h 
skipping to change at line 89 skipping to change at line 89
\property MDialogModel::centralWidget \property MDialogModel::centralWidget
\brief Central widget for the dialog. \brief Central widget for the dialog.
*/ */
M_MODEL_PTR_PROPERTY(QGraphicsWidget *, centralWidget, CentralWidget, t rue, new MWidget) M_MODEL_PTR_PROPERTY(QGraphicsWidget *, centralWidget, CentralWidget, t rue, new MWidget)
/*! /*!
\property MDialogModel::buttons \property MDialogModel::buttons
\brief List of buttons int the button box. \brief List of buttons int the button box.
*/ */
M_MODEL_PROPERTY(MDialogButtonsList, buttons, Buttons, true, MDialogBut tonsList()) M_MODEL_PROPERTY(MDialogButtonsList, buttons, Buttons, true, MDialogBut tonsList())
M_MODEL_PROPERTY(QString, titleBarIconId, TitleBarIconId, true, QString ())
public: public:
/*! /*!
* Non-const getter for centralWidget property. * Non-const getter for centralWidget property.
* Used by view classes to add the central widget to their internal lay outs. * Used by view classes to add the central widget to their internal lay outs.
*/ */
QGraphicsWidget *centralWidget(); QGraphicsWidget *centralWidget();
/*! /*!
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 mlabelmodel.h   mlabelmodel.h 
skipping to change at line 74 skipping to change at line 74
/*! /*!
\property MLabelModel::alignment \property MLabelModel::alignment
\brief Alignmentation of the label. \brief Alignmentation of the label.
*/ */
M_MODEL_PROPERTY(Qt::Alignment, alignment, Alignment, true, Qt::AlignLe ft | Qt::AlignVCenter) M_MODEL_PROPERTY(Qt::Alignment, alignment, Alignment, true, Qt::AlignLe ft | Qt::AlignVCenter)
/*! /*!
\property MLabelModel::textDirection \property MLabelModel::textDirection
\brief Text direction of the label. \brief Text direction of the label.
The default text direction is autodetected from the text contents
*/ */
M_MODEL_PROPERTY(Qt::LayoutDirection, textDirection, TextDirection, tru e, qApp->layoutDirection()) M_MODEL_PROPERTY(Qt::LayoutDirection, textDirection, TextDirection, tru e, Qt::LayoutDirectionAuto)
/*! /*!
\property MLabelModel::textElide \property MLabelModel::textElide
\brief Text eliding mode of the label. \brief Text eliding mode of the label.
When set to true, the label automatically elides text with three do ts if When set to true, the label automatically elides text with three do ts if
the whole text does not fit into one line. the whole text does not fit into one line.
*/ */
M_MODEL_PROPERTY(bool, textElide, TextElide, true, false) M_MODEL_PROPERTY(bool, textElide, TextElide, true, false)
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added


 mlabelstyle.h   mlabelstyle.h 
skipping to change at line 75 skipping to change at line 75
*/ */
M_STYLE_ATTRIBUTE(QColor, highlightColor, HighlightColor) M_STYLE_ATTRIBUTE(QColor, highlightColor, HighlightColor)
/*! /*!
\property MLabelStyle::activeHighlightColor \property MLabelStyle::activeHighlightColor
\brief Color for active (aka link that is being pressed down) highl ighted text fragments. \brief Color for active (aka link that is being pressed down) highl ighted text fragments.
See QColor::setNamedColor for possbile values. See QColor::setNamedColor for possbile values.
*/ */
M_STYLE_ATTRIBUTE(QColor, activeHighlightColor, ActiveHighlightColor) M_STYLE_ATTRIBUTE(QColor, activeHighlightColor, ActiveHighlightColor)
/*!
\property MLabelStyle::labelOpacity
\brief Opacity for the label
*/
M_STYLE_ATTRIBUTE(qreal, textOpacity, textOpacity)
}; };
/*! /*!
\class MLabelStyleContainer \class MLabelStyleContainer
\brief Style mode container class for MLabelStyle. \brief Style mode container class for MLabelStyle.
\ingroup styles \ingroup styles
\sa MLabelStyle \sa MLabelStyle
*/ */
class M_VIEWS_EXPORT MLabelStyleContainer : public MWidgetStyleContainer class M_VIEWS_EXPORT MLabelStyleContainer : public MWidgetStyleContainer
 End of changes. 1 change blocks. 
0 lines changed or deleted 7 lines changed or added


 mlist.h   mlist.h 
skipping to change at line 208 skipping to change at line 208
and disappears when panning is stopped. and disappears when panning is stopped.
*/ */
Auto, Auto,
/*! /*!
\brief The list index appears on tapping \brief The list index appears on tapping
right area of the list. right area of the list.
*/ */
Floating Floating
}; };
enum AnimationMode {
/*!
\brief The method shall be not animated.
*/
NonAnimated = 0,
/*!
\brief The method shall be animated.
*/
Animated = 1
};
enum ListOptimizationFlag { enum ListOptimizationFlag {
/*! /*!
MAbstractCellCreator::createCell() will be called only on new ite ms. If items receives update MAbstractCellCreator::createCell() will be called only on new ite ms. If items receives update
only MAbstractCellCreate::updateCell() will be called. Enabled by default. only MAbstractCellCreate::updateCell() will be called. Enabled by default.
*/ */
DontCallCreateCellDuringUpdate = 0x1 DontCallCreateCellDuringUpdate = 0x1
}; };
Q_DECLARE_FLAGS(ListOptimizationFlags, ListOptimizationFlag) Q_DECLARE_FLAGS(ListOptimizationFlags, ListOptimizationFlag)
/*! /*!
skipping to change at line 407 skipping to change at line 418
void longTapItem(const QModelIndex &index); void longTapItem(const QModelIndex &index);
/*! /*!
\brief Convenience function - Emits a long tap event for an item. A lso provides tap location. \brief Convenience function - Emits a long tap event for an item. A lso provides tap location.
*/ */
void longTapItem(const QModelIndex &index, const QPointF &position); void longTapItem(const QModelIndex &index, const QPointF &position);
/*! /*!
\brief Scrolls list to a specific index. Call to function will ensu re \brief Scrolls list to a specific index. Call to function will ensu re
that item with specified index becomes visible. that item with specified index becomes visible.
\deprecated Please use the MList::scrollTo(QModelIndex, AnimationMo
de).
*/ */
void scrollTo(const QModelIndex &index); void scrollTo(const QModelIndex &index);
/*! /*!
\brief Scrolls list to a specific index. Call to function will ensu
re
that item with specified index becomes visible. The scroll to might
be
executed animated or non-animated.
*/
void scrollTo(const QModelIndex &index, AnimationMode mode);
/*!
\brief Scrolls list to a specific index with specified hint. \brief Scrolls list to a specific index with specified hint.
\deprecated Please use the MList::scrollTo(QModelIndex, ScrollHint,
AnimationMode).
*/ */
void scrollTo(const QModelIndex &index, ScrollHint hint); void scrollTo(const QModelIndex &index, ScrollHint hint);
/*! /*!
\brief Scrolls list to a specific index with specified hint. The me
thod is executed
either animated or non-animated.
*/
void scrollTo(const QModelIndex &index, ScrollHint hint, AnimationMode
mode);
/*!
\brief Specifies whether the list index for a grouped model should be visible or not. \brief Specifies whether the list index for a grouped model should be visible or not.
\deprecated Please use setIndexDisplayMode(MList::DisplayMode); \deprecated Please use setIndexDisplayMode(MList::DisplayMode);
*/ */
void setIndexVisible(bool visible); void setIndexVisible(bool visible);
/*! /*!
\brief Specifies fi the list index bar for a grouped model should be visible or not, or \brief Specifies fi the list index bar for a grouped model should be visible or not, or
automatically to appear on list panning. automatically to appear on list panning.
\sa MList::DisplayMode \sa MList::DisplayMode
*/ */
 End of changes. 5 change blocks. 
0 lines changed or deleted 35 lines changed or added


 mlistmodel.h   mlistmodel.h 
skipping to change at line 113 skipping to change at line 113
M_MODEL_PROPERTY(QModelIndex, scrollToIndex, ScrollToIndex, false, QMod elIndex()) M_MODEL_PROPERTY(QModelIndex, scrollToIndex, ScrollToIndex, false, QMod elIndex())
/*! /*!
\property MListModel::scrollHint \property MListModel::scrollHint
\brief Indicates if item to which list should scroll should be on t op, bottom etc. \brief Indicates if item to which list should scroll should be on t op, bottom etc.
\sa MList::ScrollHint \sa MList::ScrollHint
*/ */
M_MODEL_PROPERTY(int, scrollHint, ScrollHint, true, 0) M_MODEL_PROPERTY(int, scrollHint, ScrollHint, true, 0)
/*! /*!
\property MListModel::animationMode
\brief Indicates if a method executed on list should be animated or
non-animated.
\sa MList::AnimationMode
*/
M_MODEL_PROPERTY(int, animationMode, AnimationMode, true, 0)
/*!
\property MListModel::longTap \property MListModel::longTap
\brief Coordinates of long tap. \brief Coordinates of long tap.
*/ */
M_MODEL_PROPERTY(QPointF, longTap, LongTap, true, QPointF()) M_MODEL_PROPERTY(QPointF, longTap, LongTap, true, QPointF())
/*! /*!
\property MListModel::longTapEnabled \property MListModel::longTapEnabled
\brief Boolean indicating if long tap is enabled or not. \brief Boolean indicating if long tap is enabled or not.
*/ */
M_MODEL_PROPERTY(bool, longTapEnabled, LongTapEnabled, true, false) M_MODEL_PROPERTY(bool, longTapEnabled, LongTapEnabled, true, false)
 End of changes. 1 change blocks. 
0 lines changed or deleted 8 lines changed or added


 mlistview.h   mlistview.h 
skipping to change at line 86 skipping to change at line 86
protected: protected:
/*! \reimp */ /*! \reimp */
virtual void setupModel(); virtual void setupModel();
virtual void applyStyle(); virtual void applyStyle();
virtual void notifyItemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value); virtual void notifyItemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value);
/*! \reimp_end */ /*! \reimp_end */
private: private:
void init(); void init();
void connectSelectionModel(); void connectSelectionModel();
void scrollTo(const QModelIndex &index, MList::ScrollHint hint); void scrollTo(const QModelIndex &index, MList::ScrollHint hint, MList:: AnimationMode mode);
void longTap(const QPointF &pos); void longTap(const QPointF &pos);
Q_PRIVATE_SLOT(d_func(), void _q_itemLongTapped(QPointF)) Q_PRIVATE_SLOT(d_func(), void _q_itemLongTapped(QPointF))
Q_PRIVATE_SLOT(d_func(), void _q_relayoutItemsIfNeeded()) Q_PRIVATE_SLOT(d_func(), void _q_relayoutItemsIfNeeded())
private: private:
Q_DECLARE_PRIVATE(MListView) Q_DECLARE_PRIVATE(MListView)
MListViewPrivate *d_ptr; MListViewPrivate *d_ptr;
MList *controller; MList *controller;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mmashupcanvas.h   mmashupcanvas.h 
skipping to change at line 30 skipping to change at line 30
#ifndef MMASHUPCANVAS_H #ifndef MMASHUPCANVAS_H
#define MMASHUPCANVAS_H #define MMASHUPCANVAS_H
#include "mextensionarea.h" #include "mextensionarea.h"
#include "mmashupcanvasmodel.h" #include "mmashupcanvasmodel.h"
class MDataStore; class MDataStore;
class MAppletInstanceManager; class MAppletInstanceManager;
class MMashupCanvasPrivate; class MMashupCanvasPrivate;
//! \internal
/*! /*!
* MMashupCanvas is a widget which can be populated with applet instances. * MMashupCanvas is a widget which can be populated with applet instances.
* A MMashupCanvas can be placed on any view that wants to leverage applet support. * A MMashupCanvas can be placed on any view that wants to leverage applet support.
* *
* \section overview Overview * \section overview Overview
* *
* Applets are small programs that are embedded into mashup canvases. The m ashup canvas composites applet images as part of it's own visual presentati on. * Applets are small programs that are embedded into mashup canvases. The m ashup canvas composites applet images as part of it's own visual presentati on.
* Applets are primarily run in separate processes in order to safeguard ag ainst possible bugs in applets such as blocking the GUI or crashing. * Applets are primarily run in separate processes in order to safeguard ag ainst possible bugs in applets such as blocking the GUI or crashing.
* The mashup canvas contains an applet inventory (\c MAppletInventory), wh ich is a special type of menu which populates its content from .desktop fil es that applets have installed during their package installation. * The mashup canvas contains an applet inventory (\c MAppletInventory), wh ich is a special type of menu which populates its content from .desktop fil es that applets have installed during their package installation.
* It automatically registers applets (through \c MAppletInstanceManager) a nd implements state handling, memory management etc. * It automatically registers applets (through \c MAppletInstanceManager) a nd implements state handling, memory management etc.
skipping to change at line 156 skipping to change at line 157
/*! /*!
* Protected constructor to be called by derived classes to set up the private implementation * Protected constructor to be called by derived classes to set up the private implementation
* hierarchy. * hierarchy.
*/ */
MMashupCanvas(MMashupCanvasPrivate *dd, MMashupCanvasModel *model, QGra phicsItem *parent, const QString &identifier); MMashupCanvas(MMashupCanvasPrivate *dd, MMashupCanvasModel *model, QGra phicsItem *parent, const QString &identifier);
private: private:
Q_DECLARE_PRIVATE(MMashupCanvas) Q_DECLARE_PRIVATE(MMashupCanvas)
Q_DISABLE_COPY(MMashupCanvas) Q_DISABLE_COPY(MMashupCanvas)
}; };
//! \internal_end
#endif // MMASHUPCANVAS_H #endif // MMASHUPCANVAS_H
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 mmashupcanvasmodel.h   mmashupcanvasmodel.h 
skipping to change at line 29 skipping to change at line 29
#ifndef MMASHUPCANVASMODEL_H_ #ifndef MMASHUPCANVASMODEL_H_
#define MMASHUPCANVASMODEL_H_ #define MMASHUPCANVASMODEL_H_
#include "mextensionareamodel.h" #include "mextensionareamodel.h"
#include <QStringList> #include <QStringList>
class MWidget; class MWidget;
class MDataStore; class MDataStore;
//! \internal
/*! /*!
* MMashupCanvasModel is the model class for MMashupCanvas. * MMashupCanvasModel is the model class for MMashupCanvas.
*/ */
class M_EXTENSIONS_EXPORT MMashupCanvasModel : public MExtensionAreaModel class M_EXTENSIONS_EXPORT MMashupCanvasModel : public MExtensionAreaModel
{ {
Q_OBJECT Q_OBJECT
M_MODEL_INTERNAL(MMashupCanvasModel) M_MODEL_INTERNAL(MMashupCanvasModel)
public: public:
//! A list of names of the applet categories to show in this mashup can vas //! A list of names of the applet categories to show in this mashup can vas
M_MODEL_PROPERTY(QStringList, categories, Categories, true, QStringList ()) M_MODEL_PROPERTY(QStringList, categories, Categories, true, QStringList ())
}; };
//! \internal_end
#endif /* MMASHUPCANVASMODEL_H_ */ #endif /* MMASHUPCANVASMODEL_H_ */
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 mmashupcanvasstyle.h   mmashupcanvasstyle.h 
skipping to change at line 25 skipping to change at line 25
** and appearing in the file LICENSE.LGPL included in the packaging ** and appearing in the file LICENSE.LGPL included in the packaging
** of this file. ** of this file.
** **
*************************************************************************** */ *************************************************************************** */
#ifndef MMASHUPCANVASSTYLE_H_ #ifndef MMASHUPCANVASSTYLE_H_
#define MMASHUPCANVASSTYLE_H_ #define MMASHUPCANVASSTYLE_H_
#include <MWidgetStyle> #include <MWidgetStyle>
//! \internal
/*! /*!
* MMashupCanvasStyle is the style class for MMashupCanvas. * MMashupCanvasStyle is the style class for MMashupCanvas.
*/ */
class M_EXTENSIONS_EXPORT MMashupCanvasStyle : public MWidgetStyle class M_EXTENSIONS_EXPORT MMashupCanvasStyle : public MWidgetStyle
{ {
Q_OBJECT Q_OBJECT
M_STYLE(MMashupCanvasStyle) M_STYLE(MMashupCanvasStyle)
//! Whether the applets on this mashup canvas should be inside containe rs or not //! Whether the applets on this mashup canvas should be inside containe rs or not
M_STYLE_ATTRIBUTE(bool, containerMode, ContainerMode) M_STYLE_ATTRIBUTE(bool, containerMode, ContainerMode)
}; };
/*! /*!
* MMashupCanvasStyleContainer is the style container class for MMashupCanv as. * MMashupCanvasStyleContainer is the style container class for MMashupCanv as.
*/ */
class M_EXTENSIONS_EXPORT MMashupCanvasStyleContainer : public MWidgetStyle Container class M_EXTENSIONS_EXPORT MMashupCanvasStyleContainer : public MWidgetStyle Container
{ {
M_STYLE_CONTAINER(MMashupCanvasStyle) M_STYLE_CONTAINER(MMashupCanvasStyle)
}; };
//! \internal_end
#endif /* MMASHUPCANVASSTYLE_H_ */ #endif /* MMASHUPCANVASSTYLE_H_ */
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 mmashupcanvasview.h   mmashupcanvasview.h 
skipping to change at line 32 skipping to change at line 32
#include "mextensionareaview.h" #include "mextensionareaview.h"
#include <MNamespace> #include <MNamespace>
#include "mmashupcanvasmodel.h" #include "mmashupcanvasmodel.h"
#include "mmashupcanvasstyle.h" #include "mmashupcanvasstyle.h"
class MMashupCanvasViewPrivate; class MMashupCanvasViewPrivate;
class MMashupCanvas; class MMashupCanvas;
class MContainer; class MContainer;
//! \internal
/*! /*!
* A view class for the MMashupCanvas. * A view class for the MMashupCanvas.
*/ */
class M_EXTENSIONS_EXPORT MMashupCanvasView : public MExtensionAreaView class M_EXTENSIONS_EXPORT MMashupCanvasView : public MExtensionAreaView
{ {
Q_OBJECT Q_OBJECT
M_VIEW(MMashupCanvasModel, MMashupCanvasStyle) M_VIEW(MMashupCanvasModel, MMashupCanvasStyle)
public: public:
/*! /*!
skipping to change at line 108 skipping to change at line 109
void orientationChanged(M::Orientation); void orientationChanged(M::Orientation);
//! \reimp //! \reimp
virtual void updateData(const QList<const char *>& modifications); virtual void updateData(const QList<const char *>& modifications);
//! \reimp_end //! \reimp_end
private: private:
Q_DISABLE_COPY(MMashupCanvasView) Q_DISABLE_COPY(MMashupCanvasView)
Q_DECLARE_PRIVATE(MMashupCanvasView) Q_DECLARE_PRIVATE(MMashupCanvasView)
}; };
//! \internal_end
#endif /* MMASHUPCANVASVIEW_H_ */ #endif /* MMASHUPCANVASVIEW_H_ */
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 mnavigationbarview.h   mnavigationbarview.h 
skipping to change at line 61 skipping to change at line 61
//! \reimp_end //! \reimp_end
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:
Q_DISABLE_COPY(MNavigationBarView) Q_DISABLE_COPY(MNavigationBarView)
Q_DECLARE_PRIVATE(MNavigationBarView) Q_DECLARE_PRIVATE(MNavigationBarView)
Q_PRIVATE_SLOT(d_func(), void _q_updateIsEmptyProperty())
friend class Ut_MNavigationBarView; friend class Ut_MNavigationBarView;
}; };
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 mobjectmenu.h   mobjectmenu.h 
skipping to change at line 123 skipping to change at line 123
\sa MObjectMenuModel MObjectMenuStyle \sa MObjectMenuModel MObjectMenuStyle
*/ */
class M_CORE_EXPORT MObjectMenu : public MSceneWindow class M_CORE_EXPORT MObjectMenu : public MSceneWindow
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY(MObjectMenu) Q_DISABLE_COPY(MObjectMenu)
M_CONTROLLER(MObjectMenu) M_CONTROLLER(MObjectMenu)
Q_PROPERTY(QPointF cursorPosition READ cursorPosition WRITE setCursorPo sition) Q_PROPERTY(QPointF cursorPosition READ cursorPosition WRITE setCursorPo sition)
Q_PROPERTY(QString iconId READ iconId WRITE setIconId)
Q_PROPERTY(QString title READ title WRITE setTitle)
public: public:
/*! /*!
\brief Constructs an object menu. \brief Constructs an object menu.
Object menu is associated to exactly one widget. The menu shows Object menu is associated to exactly one widget. The menu shows
automatically all object menu actions from the \a target widget. automatically all object menu actions from the \a target widget.
*/ */
explicit MObjectMenu(MWidget *target); explicit MObjectMenu(MWidget *target);
/*! /*!
skipping to change at line 146 skipping to change at line 147
explicit MObjectMenu(const QList<MAction *>& actionList); explicit MObjectMenu(const QList<MAction *>& actionList);
/*! /*!
\brief Destructs an object menu. \brief Destructs an object menu.
*/ */
virtual ~MObjectMenu(); virtual ~MObjectMenu();
QPointF cursorPosition() const; QPointF cursorPosition() const;
void setCursorPosition(const QPointF &pos); void setCursorPosition(const QPointF &pos);
/*!
\brief Get the current title string.
*/
QString title() const;
/*!
\brief Set the title string.
Alternatively, the title can be defined by setting the dynamic prop
erty
named "objectMenuTitle" for the target widget that is given to the
constructor of this class before constructing this MObjectMenu.
*/
void setTitle(const QString& title);
/*!
\brief Get the current icon id.
*/
QString iconId() const;
/*!
\brief Set the icon id.
Alternatively, the icon id can be defined by setting the dynamic pr
operty
named "objectMenuIconId" for the target widget that is given to the
constructor of this class before constructing this MObjectMenu.
*/
void setIconId(const QString& iconId);
protected: protected:
//! \reimp //! \reimp
virtual bool eventFilter(QObject *obj, QEvent *event); virtual bool eventFilter(QObject *obj, QEvent *event);
virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *event); virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);
//! \reimp_end //! \reimp_end
}; };
//! \internal_end //! \internal_end
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 32 lines changed or added


 mobjectmenumodel.h   mobjectmenumodel.h 
skipping to change at line 59 skipping to change at line 59
M_MODEL_PROPERTY(MActionList, actions, Actions, true, MActionList()) M_MODEL_PROPERTY(MActionList, actions, Actions, true, MActionList())
/*! /*!
\property MObjectMenuModel::cursorPosition \property MObjectMenuModel::cursorPosition
\brief Position of the cursor that invokes the object menu \brief Position of the cursor that invokes the object menu
This property contains the position of the cursor that causes menu to appear. This property contains the position of the cursor that causes menu to appear.
*/ */
M_MODEL_PROPERTY(QPointF, cursorPosition, CursorPosition, true, QPointF ()) M_MODEL_PROPERTY(QPointF, cursorPosition, CursorPosition, true, QPointF ())
/*!
\property MObjectMenuModel::title
\brief Title/header text for the object menu.
*/
M_MODEL_PROPERTY(QString, title, Title, true, QString())
/*!
\property MObjectMenuModel::iconId
\brief IconId for the icon for the object menu.
*/
M_MODEL_PROPERTY(QString, iconId, IconId, true, QString())
public: public:
/*! /*!
\brief Adds the \a action to the actions list. \brief Adds the \a action to the actions list.
This method should be used instead of modifying the actions list di rectly. This method should be used instead of modifying the actions list di rectly.
When the action has been added, this method will emit a actionAdded () signal. When the action has been added, this method will emit a actionAdded () signal.
*/ */
void addAction(MAction *action); void addAction(MAction *action);
/*! /*!
 End of changes. 1 change blocks. 
0 lines changed or deleted 12 lines changed or added


 msliderstyle.h   msliderstyle.h 
skipping to change at line 149 skipping to change at line 149
/*! /*!
\property MSlider::minimumFeedbackInterval \property MSlider::minimumFeedbackInterval
\brief Minimum time between haptic feedbacks when moving slider (in milliseconds) \brief Minimum time between haptic feedbacks when moving slider (in milliseconds)
*/ */
M_STYLE_ATTRIBUTE(int, minimumFeedbackInterval, MinimumFeedbackInterval ) M_STYLE_ATTRIBUTE(int, minimumFeedbackInterval, MinimumFeedbackInterval )
/*! /*!
\property MSlider::stepsPerFeedback \property MSlider::stepsPerFeedback
\brief Steps needed before giving haptic feedback when moving slide r \brief Steps needed before giving haptic feedback when moving slide r
*/ */
M_STYLE_ATTRIBUTE(int, stepsPerFeedback, StepsPerFeedback) M_STYLE_ATTRIBUTE(int, stepsPerFeedback, StepsPerFeedback)
/*!
\property MSlider::handleLabelMargin
\brief Minimum margin between handle indicator and slider edge
*/
M_STYLE_ATTRIBUTE(qreal, handleLabelMargin, HandleLabelMargin)
/*!
\property MSlider::handleLabelArrowMargin
\brief Minimum margin between arrow and handle indicator edge
*/
M_STYLE_ATTRIBUTE(qreal, handleLabelArrowMargin, HandleLabelArrowMargin
)
}; };
class M_VIEWS_EXPORT MSliderStyleContainer : public MWidgetStyleContainer class M_VIEWS_EXPORT MSliderStyleContainer : public MWidgetStyleContainer
{ {
M_STYLE_CONTAINER(MSliderStyle) M_STYLE_CONTAINER(MSliderStyle)
}; };
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 11 lines changed or added


 mspinnerstyle.h   mspinnerstyle.h 
skipping to change at line 38 skipping to change at line 38
\ingroup styles \ingroup styles
\sa MSpinnerStyleContainer \sa MSpinnerStyleContainer
*/ */
class M_VIEWS_EXPORT MSpinnerStyle : public MWidgetStyle class M_VIEWS_EXPORT MSpinnerStyle : public MWidgetStyle
{ {
Q_OBJECT Q_OBJECT
M_STYLE(MSpinnerStyle) M_STYLE(MSpinnerStyle)
/*! /*!
\property MSpinnerStyle:bgImage \property MSpinnerStyle::baseImageName
\brief Image of background of spinner \brief The base name of the images that will compose the spinner an
imation
*/ */
M_STYLE_PTR_ATTRIBUTE(QPixmap *, bgPixmap, BgPixmap) M_STYLE_ATTRIBUTE(QString, baseImageName, BaseImageName)
/*! /*!
\property MSpinnerStyle::progressImage \property MSpinnerStyle::baseImageSize
\brief Image of progress bar for spinner \brief The size the base images should have (should be the same for
the width and height).
*/ */
M_STYLE_PTR_ATTRIBUTE(QPixmap *, progressPixmap, ProgressPixmap) M_STYLE_ATTRIBUTE(int, baseImageSize, BaseImageSize)
/*! /*!
\property MSpinnerStyle::speed \property MSpinnerStyle::period
\brief Period of unknown duration spinner (duration of one full spi n in msec). \brief Period of unknown duration spinner (duration of one full spi n in msec).
*/ */
M_STYLE_ATTRIBUTE(int, period, Period) M_STYLE_ATTRIBUTE(int, period, Period)
/*! /*!
\property MSpinnerStyle::refreshRate \property MSpinnerStyle::numberOfFrames
\brief Refresh rate of unknown duration spinner (interval between f \brief Number of frames (images) that compose the spinner
rames in msec).
*/ */
M_STYLE_ATTRIBUTE(int, refreshRate, RefreshRate) M_STYLE_ATTRIBUTE(int, numberOfFrames, NumberOfFrames)
}; };
/*! /*!
\class MSpinnerStyleContainer \class MSpinnerStyleContainer
\brief This class groups all the styling modes for progress indicator. \brief This class groups all the styling modes for progress indicator.
\ingroup styles \ingroup styles
\sa MSpinnerStyle \sa MSpinnerStyle
*/ */
class M_VIEWS_EXPORT MSpinnerStyleContainer : public MWidgetStyleContainer class M_VIEWS_EXPORT MSpinnerStyleContainer : public MWidgetStyleContainer
 End of changes. 7 change blocks. 
11 lines changed or deleted 13 lines changed or added


 mspinnerview.h   mspinnerview.h 
skipping to change at line 29 skipping to change at line 29
#ifndef MSPINNERVIEW_H #ifndef MSPINNERVIEW_H
#define MSPINNERVIEW_H #define MSPINNERVIEW_H
#include "mwidgetview.h" #include "mwidgetview.h"
#include <mprogressindicatormodel.h> #include <mprogressindicatormodel.h>
#include <mspinnerstyle.h> #include <mspinnerstyle.h>
class MSpinnerViewPrivate; class MSpinnerViewPrivate;
class MProgressIndicator; class MProgressIndicator;
class QGraphicsSceneResizeEvent;
class QTimerEvent;
/*! /*!
\class MSpinnerView \class MSpinnerView
\brief Spinner view for MProgressIndicator. \brief Spinner view for MProgressIndicator.
\ingroup views \ingroup views
\section SpinnerOverview Overview \section SpinnerOverview Overview
Spinner rotates clockwise indefinitely until the process is finishe d or interrupted. Spinner is Spinner rotates clockwise indefinitely until the process is finishe d or interrupted. Spinner is
used only for unknown durations. It can can be placed anywhere in U I and also on top of other UI used only for unknown durations. It can can be placed anywhere in U I and also on top of other UI
skipping to change at line 67 skipping to change at line 65
\li Graphics \li Graphics
\sa MProgressIndicator MProgressIndicatorModel MSpinnerStyle \sa MProgressIndicator MProgressIndicatorModel MSpinnerStyle
*/ */
class M_VIEWS_EXPORT MSpinnerView : public MWidgetView class M_VIEWS_EXPORT MSpinnerView : public MWidgetView
{ {
Q_OBJECT Q_OBJECT
M_VIEW(MProgressIndicatorModel, MSpinnerStyle) M_VIEW(MProgressIndicatorModel, MSpinnerStyle)
Q_PROPERTY(int angle READ angle WRITE setAngle) //! \internal
Q_PROPERTY(int currentFrame READ currentFrame WRITE setCurrentFrame)
//! \internal_end
public: public:
/*! /*!
* \brief Constructor * \brief Constructor
* *
* \param controller Pointer to the progressindicator's controller * \param controller Pointer to the progressindicator's controller
*/ */
MSpinnerView(MProgressIndicator *controller); MSpinnerView(MProgressIndicator *controller);
/*! /*!
* \brief Destructor * \brief Destructor
skipping to change at line 111 skipping to change at line 112
protected Q_SLOTS: protected Q_SLOTS:
/*! /*!
\brief Updates MSpinnerView class instance when some component \brief Updates MSpinnerView class instance when some component
of underlying model is modified. of underlying model is modified.
\param modifications List containing the names of modified model co mponents. \param modifications List containing the names of modified model co mponents.
*/ */
virtual void updateData(const QList<const char *>& modifications); virtual void updateData(const QList<const char *>& modifications);
private: private:
int currentFrame() const;
/*! void setCurrentFrame(int frameIndex);
\brief Creates or destroys animation depending on whether spinner
is of unknown or know duration
*/
void setupAnimation();
int angle() const;
void setAngle(int angle);
Q_DISABLE_COPY(MSpinnerView) Q_DISABLE_COPY(MSpinnerView)
Q_DECLARE_PRIVATE(MSpinnerView) Q_DECLARE_PRIVATE(MSpinnerView)
private Q_SLOTS: Q_PRIVATE_SLOT(d_func(), void _q_pauseAnimation())
/*! Q_PRIVATE_SLOT(d_func(), void _q_resumeAnimation())
\brief Called when underlying controller object visibility changed Q_PRIVATE_SLOT(d_func(), void _q_pauseOrResumeAnimation())
*/
void visibilityChangedSlot();
/*!
\brief Called when underlying controller object enters display
*/
void displayEnteredSlot();
/*!
\brief Called when underlying controller object enters display
*/
void displayExitedSlot();
}; };
#endif // MSPINNERVIEW_H #endif // MSPINNERVIEW_H
 End of changes. 4 change blocks. 
27 lines changed or deleted 9 lines changed or added


 mtheme.h   mtheme.h 
skipping to change at line 409 skipping to change at line 409
Q_DISABLE_COPY(MTheme) Q_DISABLE_COPY(MTheme)
Q_DECLARE_PRIVATE(MTheme) Q_DECLARE_PRIVATE(MTheme)
#ifndef UNIT_TEST #ifndef UNIT_TEST
Q_PRIVATE_SLOT(d_func(), void themeChangedSlot(QStringList,QStringList) ) Q_PRIVATE_SLOT(d_func(), void themeChangedSlot(QStringList,QStringList) )
Q_PRIVATE_SLOT(d_func(), void pixmapCreatedOrChangedSlot(QString,QSize, MPixmapHandle)) Q_PRIVATE_SLOT(d_func(), void pixmapCreatedOrChangedSlot(QString,QSize, MPixmapHandle))
Q_PRIVATE_SLOT(d_func(), void localeChangedSlot()) Q_PRIVATE_SLOT(d_func(), void localeChangedSlot())
#endif #endif
friend class MApplicationPrivate; friend class MApplicationPrivate;
friend class MAssemblyPrivate;
friend class MComponentCachePrivate;
friend class MComponentData; friend class MComponentData;
friend class MWidgetController; friend class MWidgetController;
friend class MStyle; friend class MStyle;
#ifdef UNIT_TEST #ifdef UNIT_TEST
//! Test unit is defined as a friend of production code to access priva te members //! Test unit is defined as a friend of production code to access priva te members
friend class Ut_MTheme; friend class Ut_MTheme;
friend class Ft_Theme; friend class Ft_Theme;
#endif #endif
}; };
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 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/