mapplication.h   mapplication.h 
skipping to change at line 161 skipping to change at line 161
static void setShowCursor(bool show); static void setShowCursor(bool show);
/*! /*!
* Returns the currently active application window. * Returns the currently active application window.
* \note If the active window is of type MWindow (and not MApplicationW indow) * \note If the active window is of type MWindow (and not MApplicationW indow)
* this method will return a null pointer. * this method will return a null pointer.
* \sa activeWindow() * \sa activeWindow()
*/ */
static MApplicationWindow *activeApplicationWindow(); static MApplicationWindow *activeApplicationWindow();
/*! Returns the currently active window. /*! Returns the currently active window.
* The returned window is a topmost normal type window (i.e. not a dia
log)
* of the application. Even if system or system modal dialog is shown
on top
* of a window, its own MWindow is not recognized as an active window.
* The active window in this case is the first window below the dialog
.
*
* \note In comparison to QApplication::activeWindow(), this method wil l return * \note In comparison to QApplication::activeWindow(), this method wil l return
* a pointer to the MWindow even if it doesn't have focus. For si ngle-window * a pointer to the MWindow even if it doesn't have focus. For si ngle-window
* applications this method will return a pointer to the window o nce it's * applications this method will return a pointer to the window o nce it's
* created (even before it's shown). For multiple-window applicat ions this method * created (even before it's shown). For multiple-window applicat ions this method
* will return a pointer to the current topmost window. * will return a pointer to the current topmost window (excluding system dialogs).
*/ */
static MWindow *activeWindow(); static MWindow *activeWindow();
//! Returns a list of all windows in the application //! Returns a list of all windows in the application
static QList<MWindow *> windows(); static QList<MWindow *> windows();
//! Returns the application's app name //! Returns the application's app name
static QString appName(); static QString appName();
//! Returns the application's binary name //! Returns the application's binary name
static QString binaryName(); static QString binaryName();
//! Returns object which provide interface for nonvisual feedback or NU LL //! Returns object which provide interface for nonvisual feedback or NU LL
 End of changes. 2 change blocks. 
1 lines changed or deleted 9 lines changed or added


 mbanner.h   mbanner.h 
skipping to change at line 26 skipping to change at line 26
** of this file. ** of this file.
** **
*************************************************************************** */ *************************************************************************** */
#ifndef MBANNER_H #ifndef MBANNER_H
#define MBANNER_H #define MBANNER_H
#include <mscenewindow.h> #include <mscenewindow.h>
#include <mbannermodel.h> #include <mbannermodel.h>
class MBannerPrivate;
/*! /*!
\class MBanner \class MBanner
\brief A class that represents in-process notification banner. \brief A class that represents in-process notification banner.
\ingroup widgets \ingroup widgets
\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,
skipping to change at line 222 skipping to change at line 224
/*! /*!
\brief Get the timestamp. \brief Get the timestamp.
*/ */
QDateTime bannerTimeStamp() const; QDateTime bannerTimeStamp() const;
/*! /*!
\brief Get the prefix of the timestamp. \brief Get the prefix of the timestamp.
*/ */
QString prefixTimeStamp() const; QString prefixTimeStamp() const;
/*!
\brief Get the pixmap of the mbanner
*/
QPixmap pixmap() const;
Q_SIGNALS: Q_SIGNALS:
/*! /*!
\brief This signal is emitted when the banner is activated. \brief This signal is emitted when the banner is activated.
*/ */
void clicked(); void clicked();
public Q_SLOTS: public Q_SLOTS:
/*! /*!
skipping to change at line 261 skipping to change at line 268
\param Timestamp QDateTime. \param Timestamp QDateTime.
*/ */
void setBannerTimeStamp(const QDateTime &date); void setBannerTimeStamp(const QDateTime &date);
/** /**
\brief Set prefix timestamp text. This is third line before the tim estamp. \brief Set prefix timestamp text. This is third line before the tim estamp.
\param Prefix text. \param Prefix text.
*/ */
void setPrefixTimeStamp(const QString &text); void setPrefixTimeStamp(const QString &text);
/**
\brief Sets a pixmap for the banner.
\param pixmap
*/
void setPixmap(const QPixmap &pixmap);
private: private:
Q_DISABLE_COPY(MBanner) Q_DISABLE_COPY(MBanner)
Q_DECLARE_PRIVATE(MBanner)
#ifdef UNIT_TEST #ifdef UNIT_TEST
friend class Ut_MBanner; friend class Ut_MBanner;
#endif #endif
}; };
#endif #endif
 End of changes. 4 change blocks. 
0 lines changed or deleted 14 lines changed or added


 mbannermodel.h   mbannermodel.h 
skipping to change at line 59 skipping to change at line 59
\property Timestamp \property Timestamp
*/ */
M_MODEL_PROPERTY(QDateTime, bannerTimeStamp, BannerTimeStamp, true, QDa teTime()) M_MODEL_PROPERTY(QDateTime, bannerTimeStamp, BannerTimeStamp, true, QDa teTime())
/*! /*!
\property Prefix timestamp mbanner \property Prefix timestamp mbanner
*/ */
M_MODEL_PROPERTY(QString, prefixTimeStamp, PrefixTimeStamp, true, QStri ng()) M_MODEL_PROPERTY(QString, prefixTimeStamp, PrefixTimeStamp, true, QStri ng())
/*!
\property Pixmap in MBanner
*/
M_MODEL_PROPERTY(QPixmap, pixmap, Pixmap, false, QPixmap())
}; };
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 lines changed or added


 mcity.h   mcity.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 MCITY_H #ifndef MCITY_H
#define MCITY_H #define MCITY_H
#include <QDateTime> #include <QDateTime>
#ifdef HAVE_ICU
#include <unicode/umachine.h>
#include <unicode/datefmt.h>
#include <unicode/dtfmtsym.h>
#include "micuconversions.h"
#endif
#include "mexport.h" #include "mexport.h"
#include "mcountry.h" #include "mcountry.h"
class MCityPrivate; class MCityPrivate;
class M_CORE_EXPORT MCity class M_CORE_EXPORT MCity
{ {
public: public:
MCity(); MCity();
MCity(const MCity&); MCity(const MCity&);
 End of changes. 1 change blocks. 
7 lines changed or deleted 0 lines changed or added


 mcomponentdata.h   mcomponentdata.h 
skipping to change at line 180 skipping to change at line 180
*/ */
static bool setSyslogServer(const QUrl &url); static bool setSyslogServer(const QUrl &url);
/*! /*!
* Returns the currently active application window. * Returns the currently active application window.
* \note If the active window is of type MWindow (and not MApplicationW indow) * \note If the active window is of type MWindow (and not MApplicationW indow)
* this method will return a null pointer. * this method will return a null pointer.
* \sa activeWindow() * \sa activeWindow()
*/ */
static MApplicationWindow *activeApplicationWindow(); static MApplicationWindow *activeApplicationWindow();
//! Returns the currently active window /*! Returns the currently active window.
*
* \note The returned window is a topmost normal type window (i.e. not
a dialog)
* of the application. Even if system or system modal dialog is s
hown on top
* of a window, its own MWindow is not recognized as an active wi
ndow.
* The active window in this case is the first window below the d
ialog.
*/
static MWindow *activeWindow(); static MWindow *activeWindow();
//! Returns a list of all windows in the application //! Returns a list of all windows in the application
static QList<MWindow *> windows(); static QList<MWindow *> windows();
//! Returns the application's app name //! Returns the application's app name
static QString appName(); static QString appName();
//! Returns the application's binary name //! Returns the application's binary name
static QString binaryName(); static QString binaryName();
//! Returns the application's service name //! Returns the application's service name
static QString serviceName(); static QString serviceName();
skipping to change at line 252 skipping to change at line 258
private: private:
static MComponentData *self; static MComponentData *self;
static void registerWindow(MWindow *); static void registerWindow(MWindow *);
static void unregisterWindow(MWindow *); static void unregisterWindow(MWindow *);
static void setActiveWindow(MWindow *); static void setActiveWindow(MWindow *);
void reinit(int &argc, char **argv, const QString &appIdentifier = QStr ing(), MApplicationService *service = 0); void reinit(int &argc, char **argv, const QString &appIdentifier = QStr ing(), MApplicationService *service = 0);
Q_DECLARE_PRIVATE(MComponentData) Q_DECLARE_PRIVATE(MComponentData)
Q_DISABLE_COPY(MComponentData) Q_DISABLE_COPY(MComponentData)
Q_PRIVATE_SLOT(d_func(), void _q_notifyInputMethodActiveWindowOrientati
onChangeStarted())
Q_PRIVATE_SLOT(d_func(), void _q_notifyInputMethodActiveWindowOrientati
onChangeFinished())
friend class MWindow; friend class MWindow;
friend class MApplicationWindow; friend class MApplicationWindow;
friend class MSceneWindow; friend class MSceneWindow;
friend class MTheme; friend class MTheme;
friend class MDeviceProfile; friend class MDeviceProfile;
friend class MComponentCachePrivate; friend class MComponentCachePrivate;
}; };
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 15 lines changed or added


 mcontainerstyle.h   mcontainerstyle.h 
skipping to change at line 32 skipping to change at line 32
#include <mwidgetstyle.h> #include <mwidgetstyle.h>
#include <QSize> #include <QSize>
class M_VIEWS_EXPORT MContainerStyle : public MWidgetStyle class M_VIEWS_EXPORT MContainerStyle : public MWidgetStyle
{ {
Q_OBJECT Q_OBJECT
M_STYLE(MContainerStyle) M_STYLE(MContainerStyle)
M_STYLE_ATTRIBUTE(QSize, iconSize, IconSize) M_STYLE_ATTRIBUTE(QSize, iconSize, IconSize)
M_STYLE_ATTRIBUTE(int, internalMargins, InternalMargins) M_STYLE_ATTRIBUTE(int, internalMargins, InternalMargins)
M_STYLE_ATTRIBUTE(int, internalItemSpacing, InternalItemSpacing) M_STYLE_ATTRIBUTE(int, internalItemSpacing, InternalItemSpacing)
M_STYLE_ATTRIBUTE(QString, titleStyleName, TitleStyleName)
}; };
class M_VIEWS_EXPORT MContainerStyleContainer : public MWidgetStyleContaine r class M_VIEWS_EXPORT MContainerStyleContainer : public MWidgetStyleContaine r
{ {
M_STYLE_CONTAINER(MContainerStyle) M_STYLE_CONTAINER(MContainerStyle)
}; };
#endif #endif
 End of changes. 2 change blocks. 
2 lines changed or deleted 3 lines changed or added


 mcontentfadeandslideanimation.h   mcontentfadeandslideanimation.h 
skipping to change at line 40 skipping to change at line 40
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(MContentFadeAndSlideAnimation) Q_DECLARE_PRIVATE(MContentFadeAndSlideAnimation)
M_ANIMATION_GROUP(MContentFadeAndSlideAnimationStyle) M_ANIMATION_GROUP(MContentFadeAndSlideAnimationStyle)
public: public:
explicit MContentFadeAndSlideAnimation(QObject *parent = 0); explicit MContentFadeAndSlideAnimation(QObject *parent = 0);
virtual ~MContentFadeAndSlideAnimation(); virtual ~MContentFadeAndSlideAnimation();
virtual void setTargetWidget(MWidgetController *widget); virtual void setTargetWidget(MWidgetController *widget);
virtual void setTransitionDirection(MAbstractWidgetAnimation::Transitio nDirection direction);
public slots: public slots:
void takeContentSnapshot(); void takeContentSnapshot();
protected: protected:
//! \reimp //! \reimp
virtual void updateState(QAbstractAnimation::State newState, QAbstractA nimation::State oldState); virtual void updateState(QAbstractAnimation::State newState, QAbstractA nimation::State oldState);
//! \reimp_end //! \reimp_end
virtual void restoreTargetWidgetState(); virtual void restoreTargetWidgetState();
virtual void setTransitionDirection(MAbstractWidgetAnimation::Transitio nDirection direction);
}; };
//! \internal_end //! \internal_end
#endif // MContentFadeAndSlideAnimationmation_H #endif // MContentFadeAndSlideAnimationmation_H
 End of changes. 2 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mcontentfadeandslideanimationstyle.h   mcontentfadeandslideanimationstyle.h 
skipping to change at line 34 skipping to change at line 34
#include <QPointF> #include <QPointF>
//! \internal //! \internal
class MContentFadeAndSlideAnimationStyle : public MAbstractWidgetAnimationS tyle class MContentFadeAndSlideAnimationStyle : public MAbstractWidgetAnimationS tyle
{ {
Q_OBJECT Q_OBJECT
M_STYLE_INTERNAL(MContentFadeAndSlideAnimationStyle) M_STYLE_INTERNAL(MContentFadeAndSlideAnimationStyle)
M_STYLE_ATTRIBUTE(QString, contentObjectName, ContentObjectName) M_STYLE_ATTRIBUTE(QString, contentObjectName, ContentObjectName)
M_STYLE_ATTRIBUTE(qreal, fadeOutOpacity, FadeOutOpacity)
M_STYLE_ATTRIBUTE(int, fadeOutDuration, FadeOutDuration) M_STYLE_ATTRIBUTE(int, fadeOutDuration, FadeOutDuration)
M_STYLE_ATTRIBUTE(QEasingCurve, fadeOutEasingCurve, FadeOutEasingCurve) M_STYLE_ATTRIBUTE(QEasingCurve, fadeOutEasingCurve, FadeOutEasingCurve)
M_STYLE_ATTRIBUTE(QPointF, slideOutDisplacement, SlideOutDisplacement) M_STYLE_ATTRIBUTE(QPointF, slideOutDisplacement, SlideOutDisplacement)
M_STYLE_ATTRIBUTE(int, slideOutDuration, SlideOutDuration) M_STYLE_ATTRIBUTE(int, slideOutDuration, SlideOutDuration)
M_STYLE_ATTRIBUTE(QEasingCurve, slideOutEasingCurve, SlideOutEasingCurv e) M_STYLE_ATTRIBUTE(QEasingCurve, slideOutEasingCurve, SlideOutEasingCurv e)
M_STYLE_ATTRIBUTE(int, delay, Delay) M_STYLE_ATTRIBUTE(int, delay, Delay)
M_STYLE_ATTRIBUTE(qreal, fadeInOpacity, FadeInOpacity)
M_STYLE_ATTRIBUTE(int, fadeInDuration, FadeInDuration) M_STYLE_ATTRIBUTE(int, fadeInDuration, FadeInDuration)
M_STYLE_ATTRIBUTE(QEasingCurve, fadeInEasingCurve, FadeInEasingCurve) M_STYLE_ATTRIBUTE(QEasingCurve, fadeInEasingCurve, FadeInEasingCurve)
M_STYLE_ATTRIBUTE(QPointF, slideInDisplacement, SlideInDisplacement) M_STYLE_ATTRIBUTE(QPointF, slideInDisplacement, SlideInDisplacement)
M_STYLE_ATTRIBUTE(int, slideInDuration, SlideInDuration) M_STYLE_ATTRIBUTE(int, slideInDuration, SlideInDuration)
M_STYLE_ATTRIBUTE(QEasingCurve, slideInEasingCurve, SlideInEasingCurve) M_STYLE_ATTRIBUTE(QEasingCurve, slideInEasingCurve, SlideInEasingCurve)
}; };
class MContentFadeAndSlideAnimationStyleContainer : public MAbstractWidgetA nimationStyleContainer class MContentFadeAndSlideAnimationStyleContainer : public MAbstractWidgetA nimationStyleContainer
{ {
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 mdialogstyle.h   mdialogstyle.h 
skipping to change at line 51 skipping to change at line 51
dialog-right-margin: 10; dialog-right-margin: 10;
dialog-minimum-size: 1mm 1mm; dialog-minimum-size: 1mm 1mm;
dialog-preferred-size: 100% -1; dialog-preferred-size: 100% -1;
button-box-orientation: horizontal; button-box-orientation: horizontal;
button-box-centered: false; button-box-centered: false;
has-close-button: true; has-close-button: true;
has-title-bar: true; has-title-bar: true;
contents-viewport-style-name: "MDialogContentsViewport";
button-box-style-name: "MDialogButtonBox";
title-bar-style-name: "MDialogTItleBar";
title-label-style-name: "CommonDialogHeader";
} }
\endcode \endcode
\ingroup styles \ingroup styles
\sa MWidgetStyle MDialog MDialogView \sa MWidgetStyle MDialog MDialogView
*/ */
class M_VIEWS_EXPORT MDialogStyle : public MSceneWindowStyle class M_VIEWS_EXPORT MDialogStyle : public MSceneWindowStyle
{ {
Q_OBJECT Q_OBJECT
M_STYLE_INTERNAL(MDialogStyle) M_STYLE_INTERNAL(MDialogStyle)
skipping to change at line 185 skipping to change at line 190
M_STYLE_ATTRIBUTE(bool, hasTitleBar, HasTitleBar) M_STYLE_ATTRIBUTE(bool, hasTitleBar, HasTitleBar)
/*! /*!
\property MDialogStyle::hasCloseButton \property MDialogStyle::hasCloseButton
\brief Whether the dialog should have a close button. \brief Whether the dialog should have a close button.
The dialog's optional close button is provided as a convenient way o f The dialog's optional close button is provided as a convenient way o f
rejecting the dialog and discarding all changes. rejecting the dialog and discarding all changes.
*/ */
M_STYLE_ATTRIBUTE(bool, hasCloseButton, HasCloseButton) M_STYLE_ATTRIBUTE(bool, hasCloseButton, HasCloseButton)
/*!
\property MDialogStyle::contentsViewportStyleName
\brief Style name of the pannable viewport.
*/
M_STYLE_ATTRIBUTE(QString, contentsViewportStyleName, ContentsViewportS
tyleName)
/*!
\property MDialogStyle::buttonBoxStyleName
\brief Style name of the button box.
*/
M_STYLE_ATTRIBUTE(QString, buttonBoxStyleName, ButtonBoxStyleName)
/*!
\property MDialogStyle::titleBarStyleName
\brief Style name of the title bar.
*/
M_STYLE_ATTRIBUTE(QString, titleBarStyleName, TitleBarStyleName)
/*!
\property MDialogStyle::titleLabelStyleName
\brief Style name of the title bar label.
*/
M_STYLE_ATTRIBUTE(QString, titleLabelStyleName, TitleLabelStyleName)
}; };
/*! /*!
\class MDialogStyleContainer \class MDialogStyleContainer
\brief Style mode container class for MDialogStyle. \brief Style mode container class for MDialogStyle.
\ingroup styles \ingroup styles
\sa MDialogStyle \sa MDialogStyle
*/ */
class M_VIEWS_EXPORT MDialogStyleContainer : public MSceneWindowStyleContai ner class M_VIEWS_EXPORT MDialogStyleContainer : public MSceneWindowStyleContai ner
 End of changes. 2 change blocks. 
0 lines changed or deleted 26 lines changed or added


 minputmethodstate.h   minputmethodstate.h 
skipping to change at line 92 skipping to change at line 92
// providing item name -> (attribute name -> attribute value) // providing item name -> (attribute name -> attribute value)
typedef QMap<QString, QVariant> AttributeMap; typedef QMap<QString, QVariant> AttributeMap;
typedef QMap<QString, AttributeMap> ItemAttributeMap; typedef QMap<QString, AttributeMap> ItemAttributeMap;
// returns state set for a toolbar // returns state set for a toolbar
ItemAttributeMap toolbarState(int id) const; ItemAttributeMap toolbarState(int id) const;
//! \internal_end //! \internal_end
public Q_SLOTS: public Q_SLOTS:
//! \brief Set the orientation of application's active window to \a new /*!
Orientation * \brief Application's active window start to rotate to \a newOrientat
void setActiveWindowOrientationAngle(M::OrientationAngle newOrientation ionAngle.
); *
* \note This method should be called when active window start rotation
animation.
*/
void startActiveWindowOrientationAngleChange(M::OrientationAngle newOri
entationAngle);
/*!
* \brief Set the orientation angle of application's active window to \
a newOrientationAngle
*
* \note This method should be called when active window already finish
ed the rotation animation.
*/
void setActiveWindowOrientationAngle(M::OrientationAngle newOrientation
Angle);
//! \brief Set input method area to \a newRegion //! \brief Set input method area to \a newRegion
void setInputMethodArea(const QRect &newRegion); void setInputMethodArea(const QRect &newRegion);
/*! /*!
* \brief Register an input method toolbar which is defined in \a fileN ame. * \brief Register an input method toolbar which is defined in \a fileN ame.
* \param \a fileName is the absolute file name of a custom toolbar, o r the relative file under * \param \a fileName is the absolute file name of a custom toolbar, o r the relative file under
* /usr/share/meegoimframework/imtoolbars/ (relative path deprecat ed). * /usr/share/meegoimframework/imtoolbars/ (relative path deprecat ed).
* \return the registered unique identifier of this toolbar. * \return the registered unique identifier of this toolbar.
*/ */
skipping to change at line 128 skipping to change at line 139
* \param id the unique identifier of a registered toolbar. * \param id the unique identifier of a registered toolbar.
* \return the file name of toolbar, or empty QString if \a id is inva lid. * \return the file name of toolbar, or empty QString if \a id is inva lid.
*/ */
QString toolbar(int id) const; QString toolbar(int id) const;
Q_SIGNALS: Q_SIGNALS:
//! Emitted when input method area is changed //! Emitted when input method area is changed
//! \param region new input method area //! \param region new input method area
void inputMethodAreaChanged(const QRect &region); void inputMethodAreaChanged(const QRect &region);
//! Emitted when the orientation of application's active window is chan /*!
ged * \brief This signal is emitted before the orientation angle of the ap
//! \param orientation new orientation angle plication's active window is changed.
void activeWindowOrientationAngleChanged(M::OrientationAngle orientatio * \param orientationAngle New orientation angle which is about to chan
n); ge.
*
* \note It is emitted at the start of the rotation animation.
*/
void activeWindowOrientationAngleAboutToChange(M::OrientationAngle orie
ntationAngle);
/*!
* \brief This signal is emitted when the orientation angle of applicat
ion's active window is changed
* \param orientationAngle new orientation angle
*
* \note It's emitted with every orientation angle change finished.
*/
void activeWindowOrientationAngleChanged(M::OrientationAngle orientatio
nAngle);
//! Emitted when an input method toolbar which is defined in \a fileNam e with an unique identifier \a id is registered. //! Emitted when an input method toolbar which is defined in \a fileNam e with an unique identifier \a id is registered.
void toolbarRegistered(int id, const QString &fileName); void toolbarRegistered(int id, const QString &fileName);
//! Emitted when an input method toolbar with an unique \a id is unregi stered. //! Emitted when an input method toolbar with an unique \a id is unregi stered.
void toolbarUnregistered(int id); void toolbarUnregistered(int id);
//! Emitted when input method toolbar item attribute is changed. //! Emitted when input method toolbar item attribute is changed.
void toolbarItemAttributeChanged(int id, const QString &item, const QSt ring &attribute, void toolbarItemAttributeChanged(int id, const QString &item, const QSt ring &attribute,
const QVariant &value); const QVariant &value);
 End of changes. 2 change blocks. 
9 lines changed or deleted 39 lines changed or added


 mlocale.h   mlocale.h 
skipping to change at line 1490 skipping to change at line 1490
* are available for use with qtTrId(), i.e. one can use code * are available for use with qtTrId(), i.e. one can use code
* like this to translate a string: * like this to translate a string:
* *
* \code * \code
* // translate a string: * // translate a string:
* *
* //% "Hello" * //% "Hello"
* QString translatedString = qtTrId("hello_msg"); * QString translatedString = qtTrId("hello_msg");
* \endcode * \endcode
* *
* \sa isInstalledTrCatalog(const QString &name)
* \sa removeTrCatalog(const QString &name)
* \sa setDefault(const MLocale &locale) * \sa setDefault(const MLocale &locale)
* \sa translationPaths() * \sa translationPaths()
* \sa setTranslationPaths(const QStringList &paths) * \sa setTranslationPaths(const QStringList &paths)
* \sa addTranslationPath(const QString &path) * \sa addTranslationPath(const QString &path)
* \sa removeTranslationPath(const QString &path) * \sa removeTranslationPath(const QString &path)
*/ */
void installTrCatalog(const QString &name); void installTrCatalog(const QString &name);
/*! /*!
* \brief removes a translation catalog * \brief removes a translation catalog
* \param name of the translation catalog to remove * \param name of the translation catalog to remove
* *
* Removes the catalog from the list of translation catalogs used by th is * Removes the catalog from the list of translation catalogs used by th is
* MLocale. * MLocale.
*
* \sa isInstalledTrCatalog(const QString &name)
* \sa installTrCatalog(const QString &name)
*/ */
void removeTrCatalog(const QString &name); void removeTrCatalog(const QString &name);
/*! /*!
* \brief checks whether a translation catalog is installed nor not
* \param name of the translation catalog to check
*
* returns true if such a translation catalog has been installed
* already, false if not.
*
* \sa installTrCatalog(const QString &name)
* \sa removeTrCatalog(const QString &name)
*/
bool isInstalledTrCatalog(const QString &name) const;
/*!
* \brief tr() compatibility translation method. * \brief tr() compatibility translation method.
* \param context context of the translation * \param context context of the translation
* \param sourceText text to translate * \param sourceText text to translate
* \param comment about the translation. may be helpful when creating t ranslation files * \param comment about the translation. may be helpful when creating t ranslation files
* \param n plurality * \param n plurality
*/ */
QString translate(const char *context, const char *sourceText, QString translate(const char *context, const char *sourceText,
const char *comment = 0, int n = -1); const char *comment = 0, int n = -1);
/*! /*!
 End of changes. 3 change blocks. 
0 lines changed or deleted 17 lines changed or added


 mlocationdatabase.h   mlocationdatabase.h 
skipping to change at line 54 skipping to change at line 54
* \brief returns a list with all known cities * \brief returns a list with all known cities
*/ */
QList<MCity> cities(); QList<MCity> cities();
/** /**
* \brief returns a list with all cities in a country * \brief returns a list with all cities in a country
*/ */
QList<MCity> citiesInCountry( const QString& countryKey ); QList<MCity> citiesInCountry( const QString& countryKey );
/** /**
* \brief returns a list with all cities in a time zone
* \param timeZoneId the Olson id of the timezone
*
* Time zone ids are “canonicalized” when comparing, i.e.
* citiesInTimeZone("US/Pacific") and
* citiesInTimeZone("America/Los_Angeles") will return the same
* list.
*
* For invalid time zone ids like "Oz/Emerald_City", an empty list
* is returned.
*/
QList<MCity> citiesInTimeZone(const QString& timeZoneId);
/**
* \brief returns a list with all cities that contain the given searchS tring * \brief returns a list with all cities that contain the given searchS tring
*/ */
QList<MCity> matchingCities( const QString& searchString ); QList<MCity> matchingCities( const QString& searchString );
/** /**
* \brief returns the city with the nearest position to the given locat ion. * \brief returns the city with the nearest position to the given locat ion.
*/ */
MCity nearestCity( qreal latitude, qreal longitude ); MCity nearestCity( qreal latitude, qreal longitude );
private: private:
 End of changes. 1 change blocks. 
0 lines changed or deleted 14 lines changed or added


 mnavigationbarview.h   mnavigationbarview.h 
skipping to change at line 62 skipping to change at line 62
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()) Q_PRIVATE_SLOT(d_func(), void _q_updateIsEmptyProperty())
Q_PRIVATE_SLOT(d_func(), void _q_toolBarModelChanged(QList<const char * >))
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


 mscenemanager.h   mscenemanager.h 
skipping to change at line 58 skipping to change at line 58
* appearance, disappearance and display orientation changes (e.g., from po rtrait * appearance, disappearance and display orientation changes (e.g., from po rtrait
* to landscape). * to landscape).
* *
* \sa MSceneWindow * \sa MSceneWindow
*/ */
class M_CORE_EXPORT MSceneManager : public QObject class M_CORE_EXPORT MSceneManager : public QObject
{ {
Q_OBJECT Q_OBJECT
friend class MSceneWindow; friend class MSceneWindow;
friend class MWindow; friend class MWindow;
friend class MWindowPrivate;
friend class MApplicationWindowPrivate; friend class MApplicationWindowPrivate;
#ifdef UNIT_TEST #ifdef UNIT_TEST
friend class Ut_MSceneManager; friend class Ut_MSceneManager;
friend class Ut_MApplicationWindow; friend class Ut_MApplicationWindow;
friend class Ut_MComboBox; friend class Ut_MComboBox;
#endif #endif
public: public:
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 mscenemanagerstyle.h   mscenemanagerstyle.h 
skipping to change at line 39 skipping to change at line 39
M_STYLE_ATTRIBUTE(QString, pageSwitchAnimation, PageSwitchAnimation) M_STYLE_ATTRIBUTE(QString, pageSwitchAnimation, PageSwitchAnimation)
M_STYLE_ATTRIBUTE(QString, dialogAnimation, DialogAnimation) M_STYLE_ATTRIBUTE(QString, dialogAnimation, DialogAnimation)
M_STYLE_ATTRIBUTE(QString, notificationInformationAnimation, Notificati onInformationAnimation) M_STYLE_ATTRIBUTE(QString, notificationInformationAnimation, Notificati onInformationAnimation)
M_STYLE_ATTRIBUTE(QString, notificationEventAnimation, NotificationEven tAnimation) M_STYLE_ATTRIBUTE(QString, notificationEventAnimation, NotificationEven tAnimation)
M_STYLE_ATTRIBUTE(QString, applicationMenuAnimation, ApplicationMenuAni mation) M_STYLE_ATTRIBUTE(QString, applicationMenuAnimation, ApplicationMenuAni mation)
M_STYLE_ATTRIBUTE(QString, popupListAnimation, PopupListAnimation) M_STYLE_ATTRIBUTE(QString, popupListAnimation, PopupListAnimation)
M_STYLE_ATTRIBUTE(QString, messageBoxAnimation, MessageBoxAnimation) M_STYLE_ATTRIBUTE(QString, messageBoxAnimation, MessageBoxAnimation)
M_STYLE_ATTRIBUTE(QString, statusBarAnimation, StatusBarAnimation) M_STYLE_ATTRIBUTE(QString, statusBarAnimation, StatusBarAnimation)
M_STYLE_ATTRIBUTE(QString, objectMenuAnimation, ObjectMenuAnimation) M_STYLE_ATTRIBUTE(QString, objectMenuAnimation, ObjectMenuAnimation)
M_STYLE_ATTRIBUTE(QString, navigationBarAnimation, NavigationBarAnimati
on)
M_STYLE_ATTRIBUTE(QString, systemBannerAnimation, SystemBannerAnimation
)
}; };
class MSceneManagerStyleContainer : public MStyleContainer class MSceneManagerStyleContainer : public MStyleContainer
{ {
M_STYLE_CONTAINER(MSceneManagerStyle) M_STYLE_CONTAINER(MSceneManagerStyle)
}; };
#endif // MSCENEMANAGERSTYLE_H #endif // MSCENEMANAGERSTYLE_H
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 lines changed or added


 mscenewindow.h   mscenewindow.h 
skipping to change at line 95 skipping to change at line 95
*/ */
class M_CORE_EXPORT MSceneWindow : public MWidgetController class M_CORE_EXPORT MSceneWindow : public MWidgetController
{ {
Q_OBJECT Q_OBJECT
M_CONTROLLER(MSceneWindow) M_CONTROLLER(MSceneWindow)
Q_PROPERTY(bool managedManually READ isManagedManually WRITE setManaged Manually) Q_PROPERTY(bool managedManually READ isManagedManually WRITE setManaged Manually)
public: public:
/*! /*!
* This enum defines how to handle scene window after hiding it using d \brief This enum defines how to handle scene window after hiding it
isappear() or dismiss(). using disappear() or dismiss().
We have both DestroyWhenDone + disappear() and DestroyWhenDismissed
+ dismiss() to
cover the use case where you want your scene windows to be deleted
\b only when
they are no longer in the page history.
Example:
When drilling down (from root page to sub page and then to sub-sub
page) you
want your previous pages (root page and sub page) to be kept alive
since the
user might go back to them by pressing a back button (which calls d
ismiss()
on current page). But once the user have moved away from a page for
good
(pressed back on sub-sub page, reaching sub page), that page can be
deleted
(sub-sub page gets deleted). You will get that for free by using De
stroyWhenDismissed.
If you use DestroyWhenDone for your pages you will never be able to
go back to
them in a drill down navigational pattern as they will be deleted a
s soon as
they leave the screen. If you use DestroyWhenDismissed they will on
ly be
deleted if they get dismissed, for instance, by the user via the ba
ck button.
\sa appear()
*/ */
enum DeletionPolicy { enum DeletionPolicy {
KeepWhenDone, //!< Window is kept alive after being dismissed or disappeared. KeepWhenDone, //!< Window is kept alive after being dismissed or disappeared.
DestroyWhenDone, //!< Window is destroyed after being dismissed or disappeared DestroyWhenDone, //!< Window is destroyed after being dismissed or disappeared
DestroyWhenDismissed //!< Window is destroyed after being dismissed DestroyWhenDismissed //!< Window is destroyed after being dismissed
}; };
/*! /*!
* Defines multiple window types which will have different Z value * Defines multiple window types which will have different Z value
*/ */
skipping to change at line 251 skipping to change at line 271
*/ */
virtual void appear(MSceneWindow::DeletionPolicy policy = KeepWhenDone) ; virtual void appear(MSceneWindow::DeletionPolicy policy = KeepWhenDone) ;
/*! /*!
* Makes this scene window disappear and unregisters it from the associ ated * Makes this scene window disappear and unregisters it from the associ ated
* MSceneManager. * MSceneManager.
* *
* This is the same as calling: * This is the same as calling:
* <code>sceneWindow->sceneManager()->disappearSceneWindow(sceneWindow) ;</code> * <code>sceneWindow->sceneManager()->disappearSceneWindow(sceneWindow) ;</code>
* *
* \sa MSceneManager::disappearSceneWindow() * If DestroyWhenDone was used on the last appear() call, the scene win
dow will
* be deleted after its disappearance is finished. Note that nothing wi
ll happen
* if the scene window is already in Disappeared state.
*
* \sa MSceneManager::disappearSceneWindow(), SceneWindowState
*/ */
virtual void disappear(); virtual void disappear();
/* ! /* !
* \brief Dismisses the scene window. * \brief Dismisses the scene window.
* *
* Returns true if the scene window was dismissed; otherwise returns fa lse. * Returns true if the scene window was dismissed; otherwise returns fa lse.
* This slot will first send a MDismissEvent to the widget, which may o r may * This slot will first send a MDismissEvent to the widget, which may o r may
* not accept the event. If the event was ignored, nothing happens. If the event * not accept the event. If the event was ignored, nothing happens. If the event
* was accepted, it will disappear() the scene window. * was accepted, it will call MSceneManager::dismissSceneWindow().
* *
* If DestroyWhenDone was used on the last appear() call and * If DestroyWhenDismissed or DestroyWhenDone was used on the last appe
* the event was accepted, the scene window will be deleted after its ar()
* disappearance is finished. * call and the event was accepted, the scene window will be deleted af
ter its
* disappearance is finished. Note that nothing will happen if the scen
e window
* is already in Disappeared state.
* *
* Please refer to MDismissEvent documentation for more information. * Please refer to MDismissEvent documentation for more information.
* *
* \sa dismissEvent(), disappear(), deleteWhenDone(), * \sa dismissEvent(), disappear(), SceneWindowState, MSceneManager::di
* MSceneManager::dismissSceneWindow() smissSceneWindow()
*/ */
bool dismiss(); bool dismiss();
public: public:
/*! /*!
* Returns the currently active deletion policy of this window. * Returns the currently active deletion policy of this window.
* \return Deletion policy of this window, KeepWhenDone as a default. * \return Deletion policy of this window, KeepWhenDone as a default.
* \sa DeletionPolicy * \sa DeletionPolicy
*/ */
DeletionPolicy deletionPolicy() const; DeletionPolicy deletionPolicy() const;
 End of changes. 5 change blocks. 
9 lines changed or deleted 51 lines changed or added


 msliderstyle.h   msliderstyle.h 
skipping to change at line 179 skipping to change at line 179
/*! /*!
\property MSlider::indicatorOffset \property MSlider::indicatorOffset
\brief Adjusts the position of the indicator handle \brief Adjusts the position of the indicator handle
*/ */
M_STYLE_ATTRIBUTE(qreal, indicatorOffset, IndicatorOffset) M_STYLE_ATTRIBUTE(qreal, indicatorOffset, IndicatorOffset)
/*! /*!
\property MSlider::indicatorStyleName \property MSlider::indicatorStyleName
\brief Style name of the indicator label \brief Style name of the indicator label
*/ */
M_STYLE_ATTRIBUTE(QString, indicatorStyleName, IndicatorStyleName) M_STYLE_ATTRIBUTE(QString, indicatorStyleName, IndicatorStyleName)
/*!
\property MSlider::minLabelFixedWidth
\brief Fixed width of the minimum label of the slider, if not empty
*/
M_STYLE_ATTRIBUTE(qreal, minLabelFixedWidth, MinLabelFixedWidth)
/*!
\property MSlider::maxLabelFixedWidth
\brief Fixed width of the maximum label of the slider, if not empty
*/
M_STYLE_ATTRIBUTE(qreal, maxLabelFixedWidth, MaxLabelFixedWidth)
}; };
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 10 lines changed or added


 mstatusbarstyle.h   mstatusbarstyle.h 
skipping to change at line 32 skipping to change at line 32
#include <mscenewindowstyle.h> #include <mscenewindowstyle.h>
class M_VIEWS_EXPORT MStatusBarStyle : public MSceneWindowStyle class M_VIEWS_EXPORT MStatusBarStyle : public MSceneWindowStyle
{ {
Q_OBJECT Q_OBJECT
M_STYLE(MStatusBarStyle) M_STYLE(MStatusBarStyle)
M_STYLE_ATTRIBUTE(bool, useSwipeGesture, UseSwipeGesture) M_STYLE_ATTRIBUTE(bool, useSwipeGesture, UseSwipeGesture)
M_STYLE_ATTRIBUTE(int, swipeThreshold, SwipeThreshold) M_STYLE_ATTRIBUTE(int, swipeThreshold, SwipeThreshold)
M_STYLE_ATTRIBUTE(qreal, pressDimFactor, PressDimFactor)
}; };
class M_VIEWS_EXPORT MStatusBarStyleContainer : public MSceneWindowStyleCon tainer class M_VIEWS_EXPORT MStatusBarStyleContainer : public MSceneWindowStyleCon tainer
{ {
M_STYLE_CONTAINER(MStatusBarStyle) M_STYLE_CONTAINER(MStatusBarStyle)
}; };
#endif // MSTATUSBARSTYLE_H #endif // MSTATUSBARSTYLE_H
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 mtheme.h   mtheme.h 
skipping to change at line 230 skipping to change at line 230
*/ */
static const QPixmap *pixmap(const QString &id, const QSize &size = QSi ze(0, 0)); static const QPixmap *pixmap(const QString &id, const QSize &size = QSi ze(0, 0));
/*! /*!
Returns a QPixmap that contains the graphical asset specified by the \ ref logicalid "logical ID". Returns a QPixmap that contains the graphical asset specified by the \ ref logicalid "logical ID".
Loads the pixmap specified by \a id of size \a size. Loads the pixmap specified by \a id of size \a size.
The requested pixmap is loaded asynchronously. The returned pixmap can be one of the following: The requested pixmap is loaded asynchronously. The returned pixmap can be one of the following:
- The real pixmap if the pixmap was already loaded by the system. - The real pixmap if the pixmap was already loaded by the system.
- A transparent 1x1 or \a size sized pixmap, serving as a placeholder - A transparent (or green, if GConf key /meegotouch/debug/show_async_r
while the pixmap data is loading. equests is set to true),
\a size sized (QSize(0,0) by default) pixmap, serving as a placehold
er while the pixmap data is loading.
- A red pixmap of 50x50 size, indicating that the pixmap with the requ ested id was not found in the theme. - A red pixmap of 50x50 size, indicating that the pixmap with the requ ested id was not found in the theme.
In the first two cases, the pixmap data can be changed at any time by the theme. This may happen when In the first two cases, the pixmap data can be changed at any time by the theme. This may happen when
the theme changes, as pixmaps are updated, pixmaps finish loading or f or any other reason. the theme changes, as pixmaps are updated, pixmaps finish loading or f or any other reason.
The returned pixmap is owned by the theme and should be freed with rel easePixmap() when no longer needed. The returned pixmap is owned by the theme and should be freed with rel easePixmap() when no longer needed.
\sa pixmap \sa pixmap
\sa releasePixmap \sa releasePixmap
*/ */
 End of changes. 1 change blocks. 
2 lines changed or deleted 4 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/