libmeegotouch: headers diff between 0.20.60.2 and 0.20.64.2 versions

	mbuttoniconstyle.h	mbuttoniconstyle.h

	skipping to change at line 23	skipping to change at line 23
	** modify it under the terms of the GNU Lesser General Public	** modify it under the terms of the GNU Lesser General Public
	** License version 2.1 as published by the Free Software Foundation	** License version 2.1 as published by the Free Software Foundation
	** 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 MBUTTONICONSTYLE_H	#ifndef MBUTTONICONSTYLE_H
	#define MBUTTONICONSTYLE_H	#define MBUTTONICONSTYLE_H


	#include <QColor>
	#include <mbuttonstyle.h>	#include <mbuttonstyle.h>

	/*!	/*!
	\class MButtonIconStyle	\class MButtonIconStyle
	\brief Style class for m icon buttons.	\brief Style class for m icon buttons.


	\code
	MButtonStyle {
	glow-color: #FFFF00;
	glow-duration: 700;
	glow-radius: 8;

	shrink-duration: 100;
	shrink-factor: 0.2;
	}
	\endcode

	\ingroup styles	\ingroup styles
	\sa MButtonIconStyleContainer MWidgetStyle MButtonStyle \ref styling MB utton MButtonIconView	\sa MButtonIconStyleContainer MWidgetStyle MButtonStyle \ref styling MB utton MButtonIconView
	*/	*/
	class M_VIEWS_EXPORT MButtonIconStyle : public MButtonStyle	class M_VIEWS_EXPORT MButtonIconStyle : public MButtonStyle
	{	{
	Q_OBJECT	Q_OBJECT
	M_STYLE_INTERNAL(MButtonIconStyle)	M_STYLE_INTERNAL(MButtonIconStyle)

	/*!	/*!

	\property MButtonIconStyle::glowColor	\property MButtonStyle::contentOpacity
	\brief Color of the glow effect.	\brief Content opacity.
	*/	*/

	M_STYLE_ATTRIBUTE(QColor, glowColor, GlowColor)	M_STYLE_ATTRIBUTE(qreal, contentOpacity, contentOpacity)

	/*!	/*!

	\property MButtonIconStyle::glowDuration	\deprecated Not in use.
	\brief Length of glow effect in ms.	*/
		M_STYLE_ATTRIBUTE(QColor, glowColor, GlowColor)
		/*!
		\deprecated Not in use.
	*/	*/
	M_STYLE_ATTRIBUTE(int, glowDuration, GlowDuration)	M_STYLE_ATTRIBUTE(int, glowDuration, GlowDuration)


	/*!	/*!

	\property MButtonIconStyle::glowRadius	\deprecated Not in use.
	\brief Radius of the glow effect.
	*/	*/
	M_STYLE_ATTRIBUTE(int, glowRadius, GlowRadius)	M_STYLE_ATTRIBUTE(int, glowRadius, GlowRadius)


	/*!	/*!

	\property MButtonIconStyle::shrinkDuration	\deprecated Not in use.
	\brief Length of the shrink animation in ms.
	*/	*/
	M_STYLE_ATTRIBUTE(int, shrinkDuration, ShrinkDuration)	M_STYLE_ATTRIBUTE(int, shrinkDuration, ShrinkDuration)


	/*!	/*!

	\property MButtonIconStyle::shrinkFactor	\deprecated Not in use.
	\brief Scaling factor for the shrink animation.

	Defines the minimum size for the button.
	*/	*/
	M_STYLE_ATTRIBUTE(qreal, shrinkFactor, ShrinkFactor)	M_STYLE_ATTRIBUTE(qreal, shrinkFactor, ShrinkFactor)
	};	};

	/*!	/*!
	\class MButtonIconStyleContainer	\class MButtonIconStyleContainer
	\brief Style mode container class for MButtonIconStyle.	\brief Style mode container class for MButtonIconStyle.

	\ingroup styles	\ingroup styles
	\sa MButtonIconStyle	\sa MButtonIconStyle

End of changes. 11 change blocks.
	28 lines changed or deleted	11 lines changed or added

	mbuttoniconview.h	mbuttoniconview.h

	skipping to change at line 41	skipping to change at line 41
	\class MButtonIconView	\class MButtonIconView
	\brief View class for icon button.	\brief View class for icon button.

	\ingroup views	\ingroup views

	\section MButtonIconViewOverview Overview	\section MButtonIconViewOverview Overview
	MButtonIconView draws an icon and text similarly as MButtonView	MButtonIconView draws an icon and text similarly as MButtonView
	using the same styling attributes. However this view adds some anim ations	using the same styling attributes. However this view adds some anim ations
	when interacting with a button:	when interacting with a button:


	- When pressing button down it starts to shrink the graphics so it	- When pressing button down the content is drawn with style defined
	looks like the button is actually pressed down.	opacity.
	MButtonIconStyle::shrinkDuration and MButtonIconStyle::shrinkFact	- When releasing button the icon and label opacity is reset.
	or
	attributes are used the define the outlook for the shrinking anim
	ation.
	- When releasing button it starts to glow and grow back to it's nor
	mal
	size. MButtonIconStyle::glowColor, MButtonIconStyle::glowDuration
	and MButtonIconStyle::glowRadius style attributes can be used to
	change the visualization of the glow.

	* MButtonIconView supports the following CSS features:	* MButtonIconView supports the following CSS features:
	*	*

	* glowColor (type: QColor e.g. #ff0000) : sets the color of the glow effec	* content-opacity (type: qreal e.g. 0.75) : sets the opacity of the icon a
	t<br>	nd text label<br>
	* glowDuration (type: int) : sets the time in ms for the glow effect to la
	st<br>
	* glowRadius (type: int) : sets the extent of the glow effect<br>
	* shrinkDuration (type: int) : time how long the shrink effect takes<br>
	* shrinkFactor (type: float) : how much smaller should the shrunk button b
	e?<br>

	\section MButtonIconViewInteractions Interactions	\section MButtonIconViewInteractions Interactions
	See \ref MButtonViewInteractions.	See \ref MButtonViewInteractions.


	\section MButtonIconViewOpenIssues Open issues
	- The outlook of the whole icon button: are glow and shrinking real
	ly
	used in this?

	\sa MButton MButtonView MButtonIconStyle	\sa MButton MButtonView MButtonIconStyle
	*/	*/
	class M_VIEWS_EXPORT MButtonIconView : public MButtonView	class M_VIEWS_EXPORT MButtonIconView : public MButtonView
	{	{
	Q_OBJECT	Q_OBJECT
	M_VIEW(MButtonModel, MButtonIconStyle)	M_VIEW(MButtonModel, MButtonIconStyle)

	public:	public:

	/*!	/*!

	skipping to change at line 90	skipping to change at line 76
	/*!	/*!
	\brief Destructs the view.	\brief Destructs the view.
	*/	*/
	virtual ~MButtonIconView();	virtual ~MButtonIconView();

	protected:	protected:
	//! \reimp	//! \reimp
	virtual void drawContents(QPainter painter, const QStyleOptionGraphics Item option) const;	virtual void drawContents(QPainter painter, const QStyleOptionGraphics Item option) const;
	virtual void drawBackground(QPainter painter, const QStyleOptionGraphi csItem option) const;	virtual void drawBackground(QPainter painter, const QStyleOptionGraphi csItem option) const;
	virtual void applyStyle();	virtual void applyStyle();

	//! \reimp_end

	protected Q_SLOTS:

	//! \reimp
	virtual void updateData(const QList<const char *>& modifications);	virtual void updateData(const QList<const char *>& modifications);
	//! \reimp_end	//! \reimp_end


	private Q_SLOTS:

	/*!
	\brief Receives signals from scale timeline
	*/
	void scaleValueChanged(qreal value);

	/*!
	\brief Receives signals from glow timeline
	*/
	void glowValueChanged(qreal value);

	private:	private:
	Q_DISABLE_COPY(MButtonIconView)	Q_DISABLE_COPY(MButtonIconView)
	Q_DECLARE_PRIVATE(MButtonIconView)	Q_DECLARE_PRIVATE(MButtonIconView)

	#ifdef UNIT_TEST	#ifdef UNIT_TEST
	friend class Ut_MButtonIconView;	friend class Ut_MButtonIconView;
	#endif	#endif

	};	};


End of changes. 5 change blocks.
	41 lines changed or deleted	5 lines changed or added

	mcompleter.h	mcompleter.h

	skipping to change at line 334	skipping to change at line 334
	virtual void disappear();	virtual void disappear();
	virtual bool eventFilter(QObject , QEvent );	virtual bool eventFilter(QObject , QEvent );
	//! \reimp_end	//! \reimp_end

	private:	private:
	Q_DECLARE_PRIVATE(MCompleter)	Q_DECLARE_PRIVATE(MCompleter)
	Q_DISABLE_COPY(MCompleter)	Q_DISABLE_COPY(MCompleter)

	Q_PRIVATE_SLOT(d_func(), void _q_modelUpdate())	Q_PRIVATE_SLOT(d_func(), void _q_modelUpdate())
	Q_PRIVATE_SLOT(d_func(), void _q_complete())	Q_PRIVATE_SLOT(d_func(), void _q_complete())

		Q_PRIVATE_SLOT(d_func(), void _q_pollModel())
		Q_PRIVATE_SLOT(d_func(), void _q_modelAboutToBeReset())
		Q_PRIVATE_SLOT(d_func(), void _q_rowsRemoved(const QModelIndex &parent,
		int start, int end))

	#ifdef UNIT_TEST	#ifdef UNIT_TEST
	friend class Ut_MCompleter;	friend class Ut_MCompleter;
	#endif	#endif
	};	};

	#endif	#endif

End of changes. 1 change blocks.
	0 lines changed or deleted	4 lines changed or added

	mdialog.h	mdialog.h

	skipping to change at line 214	skipping to change at line 214

	Q_PROPERTY(QString title READ title WRITE setTitle)	Q_PROPERTY(QString title READ title WRITE setTitle)
	Q_PROPERTY(bool system READ isSystem WRITE setSystem)	Q_PROPERTY(bool system READ isSystem WRITE setSystem)
	Q_PROPERTY(bool modal READ isModal WRITE setModal)	Q_PROPERTY(bool modal READ isModal WRITE setModal)
	//! \internal	//! \internal
	Q_PROPERTY(bool systemModal READ isSystemModal WRITE setSystemModal)	Q_PROPERTY(bool systemModal READ isSystemModal WRITE setSystemModal)
	//! \internal_end	//! \internal_end
	Q_PROPERTY(bool progressIndicatorVisible READ isProgressIndicatorVisibl e WRITE setProgressIndicatorVisible)	Q_PROPERTY(bool progressIndicatorVisible READ isProgressIndicatorVisibl e WRITE setProgressIndicatorVisible)

	/*!	/*!

		\property MDialog::titleBarIconId
		\brief Id of Icon to be displayed in dialog's title bar.

		Icon with supplied Id appears leftmost in dialog's title bar. If ic
		on Id is set
		and dialog's progress indicator is shown, then the progress indicat
		or replaces the
		icon.

		By default its value is empty QString.
		*/
		Q_PROPERTY(QString titleBarIconId READ titleBarIconId WRITE setTitleBar
		IconId)

		/*!
	\property MDialog::contentsVerticalPanningPolicy	\property MDialog::contentsVerticalPanningPolicy
	\brief Panning policy for the dialog's contents.	\brief Panning policy for the dialog's contents.

	The contents of a dialog are normally put inside a pannable viewpor t since they can	The contents of a dialog are normally put inside a pannable viewpor t since they can
	exceed the maximum height of a dialog.	exceed the maximum height of a dialog.

	This property defines the vertical panning policy to be used when a pannable	This property defines the vertical panning policy to be used when a pannable
	viewport is holding the dialog's contents.	viewport is holding the dialog's contents.

	By default its value is MPannableWidget::PanningAsNeeded.	By default its value is MPannableWidget::PanningAsNeeded.

	skipping to change at line 537	skipping to change at line 549
	/**	/**
	* \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.	* \brief Returns the dialog's title bar icon id.

	* \return Icon being displayed in dialog's title bar.	* \return Id of icon being displayed in dialog's title bar.
	* \sa setTitleBarIconId()	* \sa setTitleBarIconId()
	*/	*/
	QString titleBarIconId() const;	QString titleBarIconId() const;

	/*!	/*!
	* \brief Sets the dialog's title bar icon.	* \brief Sets the dialog's title bar icon.
	*	*

	* \param iconId Logical icon id to be displayed in title bar.	* \param iconId Logical id of icon to be displayed in title bar.
	* \sa titleBarIconId()	* \sa titleBarIconId()
	*/	*/
	void setTitleBarIconId(const QString &iconId);	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

End of changes. 3 change blocks.
	2 lines changed or deleted	17 lines changed or added

	mlabelstyle.h	mlabelstyle.h

	skipping to change at line 82	skipping to change at line 82
	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	\property MLabelStyle::labelOpacity
	\brief Opacity for the label	\brief Opacity for the label
	*/	*/

	M_STYLE_ATTRIBUTE(qreal, textOpacity, textOpacity)	M_STYLE_ATTRIBUTE(qreal, textOpacity, textOpacity)


		/*!
		\property MLabelStyle::horizontalAlignment
		\brief Horizontal alignment of the label.
		*/
		M_STYLE_ATTRIBUTE(Qt::Alignment, horizontalAlignment, HorizontalAlignme
		nt)

		/*!
		\property MLabelStyle::verticalAlignment
		\brief Vertical alignment of the label.
		*/
		M_STYLE_ATTRIBUTE(Qt::Alignment, verticalAlignment, VerticalAlignment)

	};	};

	/*!	/*!
	\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	14 lines changed or added

	mobjectmenustyle.h	mobjectmenustyle.h

	skipping to change at line 31	skipping to change at line 31
	#define MOBJECTMENUSTYLE_H	#define MOBJECTMENUSTYLE_H

	#include <mscenewindowstyle.h>	#include <mscenewindowstyle.h>

	class MScalableImage;	class MScalableImage;

	class M_VIEWS_EXPORT MObjectMenuStyle : public MSceneWindowStyle	class M_VIEWS_EXPORT MObjectMenuStyle : public MSceneWindowStyle
	{	{
	Q_OBJECT	Q_OBJECT
	M_STYLE_INTERNAL(MObjectMenuStyle)	M_STYLE_INTERNAL(MObjectMenuStyle)

		M_STYLE_ATTRIBUTE(QString, titleStyleName, TitleStyleName)
		M_STYLE_ATTRIBUTE(QString, titleIconStyleName, TitleIconStyleName)
		M_STYLE_ATTRIBUTE(QString, titleLabelStyleName, TitleLabelStyleName)
		M_STYLE_ATTRIBUTE(QString, titleSeparatorStyleName, TitleSeparatorStyle
		Name)
	};	};

	class M_VIEWS_EXPORT MObjectMenuStyleContainer : public MSceneWindowStyleCo ntainer	class M_VIEWS_EXPORT MObjectMenuStyleContainer : public MSceneWindowStyleCo ntainer
	{	{
	M_STYLE_CONTAINER_INTERNAL(MObjectMenuStyle)	M_STYLE_CONTAINER_INTERNAL(MObjectMenuStyle)
	};	};

	#endif	#endif

End of changes. 1 change blocks.
	0 lines changed or deleted	5 lines changed or added

	mpannableviewport.h	mpannableviewport.h

	skipping to change at line 185	skipping to change at line 185

	private:	private:
	Q_DISABLE_COPY(MPannableViewport)	Q_DISABLE_COPY(MPannableViewport)
	Q_DECLARE_PRIVATE(MPannableViewport)	Q_DECLARE_PRIVATE(MPannableViewport)
	Q_PRIVATE_SLOT(d_func(), void _q_resolvePannedWidgetIsOnDisplay())	Q_PRIVATE_SLOT(d_func(), void _q_resolvePannedWidgetIsOnDisplay())
	Q_PRIVATE_SLOT(d_func(), void _q_positionIndicatorEnabledChanged())	Q_PRIVATE_SLOT(d_func(), void _q_positionIndicatorEnabledChanged())
	Q_PRIVATE_SLOT(d_func(), void _q_pannedWidgetGeometryChanged())	Q_PRIVATE_SLOT(d_func(), void _q_pannedWidgetGeometryChanged())
	Q_PRIVATE_SLOT(d_func(), void _q_pannedWidgetWidthOutOfViewport())	Q_PRIVATE_SLOT(d_func(), void _q_pannedWidgetWidthOutOfViewport())
	Q_PRIVATE_SLOT(d_func(), void _q_pannedWidgetHeightOutOfViewport())	Q_PRIVATE_SLOT(d_func(), void _q_pannedWidgetHeightOutOfViewport())
	Q_PRIVATE_SLOT(d_func(), void _q_ensureFocusedPannedWidgetIsVisible())	Q_PRIVATE_SLOT(d_func(), void _q_ensureFocusedPannedWidgetIsVisible())

		Q_PRIVATE_SLOT(d_func(), void _q_handleInputMethodAreaChanged(const QRe ct &))
	#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_MPannableViewport;	friend class Ut_MPannableViewport;
	#endif	#endif

	friend class MInputWidgetRelocator;	friend class MPannableViewportScroller;
	};	};

	#endif	#endif

End of changes. 2 change blocks.
	1 lines changed or deleted	2 lines changed or added

	mtexteditview.h	mtexteditview.h

	skipping to change at line 89	skipping to change at line 89
	//! If false, only cursor moves without selecting any text.	//! If false, only cursor moves without selecting any text.
	void updateCursorPosition(QGraphicsSceneMouseEvent *event, bool updateS election);	void updateCursorPosition(QGraphicsSceneMouseEvent *event, bool updateS election);

	/*!	/*!
	* \brief Returns cursor position from a mouse position	* \brief Returns cursor position from a mouse position
	* \param hitPoint mouse position	* \param hitPoint mouse position
	* \return cursor position as characters from start of document	* \return cursor position as characters from start of document
	*/	*/
	int cursorPosition(const QPointF &hitPoint);	int cursorPosition(const QPointF &hitPoint);


		/*!
		* \brief Returns cursor position from a mouse position
		* \param hitPoint mouse position
		* \param accuracy specified accuracy
		* \return cursor position as characters from start of document
		*/
		int cursorPosition(const QPointF &hitPoint, Qt::HitTestAccuracy accurac
		y);

	protected Q_SLOTS:	protected Q_SLOTS:
	/*!	/*!
	* \brief Set view focused	* \brief Set view focused
	*/	*/
	void setFocused(Qt::FocusReason reason);	void setFocused(Qt::FocusReason reason);

	/*!	/*!
	* \brief Remove focus from view	* \brief Remove focus from view
	*/	*/
	void removeFocus(Qt::FocusReason reason);	void removeFocus(Qt::FocusReason reason);

End of changes. 1 change blocks.
	0 lines changed or deleted	9 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/

	mapplicationpage.h	mapplicationpage.h

	skipping to change at line 200	skipping to change at line 200

	Default value is true. Set it to false to have the viewport scrolle d to the	Default value is true. Set it to false to have the viewport scrolle d to the
	top with every new appearance. The scrolling is immediate, i.e. it' s not animated	top with every new appearance. The scrolling is immediate, i.e. it' s not animated
	at all.	at all.

	Set it with setRememberPosition() and get its current value with re memberPosition().	Set it with setRememberPosition() and get its current value with re memberPosition().
	*/	*/
	Q_PROPERTY(bool rememberPosition READ rememberPosition WRITE setRemembe rPosition)	Q_PROPERTY(bool rememberPosition READ rememberPosition WRITE setRemembe rPosition)

	/*!	/*!

		\deprecated do not use
	\property MApplicationPage::progressIndicatorVisible	\property MApplicationPage::progressIndicatorVisible
	\brief Defines whether progress indicator is visible	\brief Defines whether progress indicator is visible

	It true, a progress indicator with unknown duration (such as a spin ner) will be	It true, a progress indicator with unknown duration (such as a spin ner) will be
	displayed in the navigation bar. Use it to hint the user that some process is	displayed in the navigation bar. Use it to hint the user that some process is
	ongoing or that the page is waiting for something to complete.	ongoing or that the page is waiting for something to complete.

	By default, this property is false.	By default, this property is false.

	Set it with setProgressIndicatorVisible() and get its current value with isProgressIndicatorVisible().	Set it with setProgressIndicatorVisible() and get its current value with isProgressIndicatorVisible().

	skipping to change at line 345	skipping to change at line 346
	*/	*/
	// FIXME: Do we really need (or want to have) this method? If so, at le ast	// FIXME: Do we really need (or want to have) this method? If so, at le ast
	// make it MSceneWindow::window() instead.	// make it MSceneWindow::window() instead.
	MApplicationWindow *applicationWindow();	MApplicationWindow *applicationWindow();

	/**	/**
	* \return Get the page's title. The title appears in the command area.	* \return Get the page's title. The title appears in the command area.
	*/	*/
	const QString title() const;	const QString title() const;


		//! \deprecated do not use
	/**	/**
	* \brief Returns whether progress indicator is visible	* \brief Returns whether progress indicator is visible
	* \return <code>true</code> if the progress indicator is visible, othe rwise <code>false</code>	* \return <code>true</code> if the progress indicator is visible, othe rwise <code>false</code>
	* \sa setProgressIndicatorVisible()	* \sa setProgressIndicatorVisible()
	*/	*/
	bool isProgressIndicatorVisible() const;	bool isProgressIndicatorVisible() const;

	/*!	/*!
	* \brief Returns the page's escape mode	* \brief Returns the page's escape mode
	*	*

	skipping to change at line 515	skipping to change at line 517
	* Sets the MApplicationPage::pannable property.	* Sets the MApplicationPage::pannable property.
	*/	*/
	void setPannable(bool pannable);	void setPannable(bool pannable);

	/*!	/*!
	* Sets to which direction(s) page should be pannable. Possible values:	* Sets to which direction(s) page should be pannable. Possible values:
	* Qt::Horizontal, Qt::Vertical or Qt::Horizontal \| Qt::Vertical.	* Qt::Horizontal, Qt::Vertical or Qt::Horizontal \| Qt::Vertical.
	*/	*/
	void setPanningDirection(Qt::Orientations directions);	void setPanningDirection(Qt::Orientations directions);


		//! \deprecated do not use
	/*!	/*!
	* Sets the visibility of progress indicator	* Sets the visibility of progress indicator
	* \param bool visible	* \param bool visible
	*/	*/
	void setProgressIndicatorVisible(bool visible);	void setProgressIndicatorVisible(bool visible);

	/*!	/*!
	* \brief Sets the page escape mode	* \brief Sets the page escape mode
	* \sa MApplicationPageModel::PageEscapeMode, escapeMode()	* \sa MApplicationPageModel::PageEscapeMode, escapeMode()
	*/	*/

End of changes. 3 change blocks.
	0 lines changed or deleted	3 lines changed or added

	mapplicationpagemodel.h	mapplicationpagemodel.h

	skipping to change at line 95	skipping to change at line 95
	M_MODEL_PROPERTY(MApplicationPageModel::ComponentDisplayMode, navigatio nBarDisplayMode, NavigationBarDisplayMode, true, MApplicationPageModel::Sho w)	M_MODEL_PROPERTY(MApplicationPageModel::ComponentDisplayMode, navigatio nBarDisplayMode, NavigationBarDisplayMode, true, MApplicationPageModel::Sho w)

	/*!	/*!
	* \property MApplicationPageModel::escapeMode	* \property MApplicationPageModel::escapeMode
	* \brief Page's escape mode.	* \brief Page's escape mode.
	* \sa MApplicationPageMode::EscapeMode	* \sa MApplicationPageMode::EscapeMode
	*/	*/
	M_MODEL_PROPERTY(MApplicationPageModel::PageEscapeMode, escapeMode, Esc apeMode, true, MApplicationPageModel::EscapeAuto)	M_MODEL_PROPERTY(MApplicationPageModel::PageEscapeMode, escapeMode, Esc apeMode, true, MApplicationPageModel::EscapeAuto)

	/*!	/*!

		\deprecated do not use
	\property MApplicationPageModel::progressIndicatorVisible	\property MApplicationPageModel::progressIndicatorVisible
	\brief Whether the progress indicator is visible.	\brief Whether the progress indicator is visible.
	*/	*/
	M_MODEL_PROPERTY(bool, progressIndicatorVisible, ProgressIndicatorVisib le, true, false)	M_MODEL_PROPERTY(bool, progressIndicatorVisible, ProgressIndicatorVisib le, true, false)

	/*!	/*!
	\property MApplicationPageModel::marginsForComponentsEnabled	\property MApplicationPageModel::marginsForComponentsEnabled
	\brief Whether extra margins will be automatically added around the central	\brief Whether extra margins will be automatically added around the central
	widget to avoid occlusion by other components.	widget to avoid occlusion by other components.


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 72	skipping to change at line 72
	*/	*/
	M_MODEL_PROPERTY(QTextOption::WrapMode, wrapMode, WrapMode, true, QText Option::WordWrap)	M_MODEL_PROPERTY(QTextOption::WrapMode, wrapMode, WrapMode, true, QText Option::WordWrap)

	/*!	/*!
	\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::alignmentFromStyle
		\brief Alignment of the label is done by style.
		*/
		M_MODEL_PROPERTY(bool, alignmentFromStyle, AlignmentFromStyle, true, tr
		ue)

		/*!
	\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	The default text direction is autodetected from the text contents
	*/	*/
	M_MODEL_PROPERTY(Qt::LayoutDirection, textDirection, TextDirection, tru e, Qt::LayoutDirectionAuto)	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.

End of changes. 1 change blocks.
	0 lines changed or deleted	7 lines changed or added

	mnavigationbar.h	mnavigationbar.h

	skipping to change at line 73	skipping to change at line 73
	/*!	/*!
	\brief Destroys the navigation bar.	\brief Destroys the navigation bar.
	*/	*/
	virtual ~MNavigationBar();	virtual ~MNavigationBar();

	/**	/**
	* Returns the iconID of the icon of the application menu button.	* Returns the iconID of the icon of the application menu button.
	*/	*/
	QString viewMenuIconID() const;	QString viewMenuIconID() const;


		//! \deprecated do not use
	/**	/**
	* Returns if the progress indicator is visible	* Returns if the progress indicator is visible
	*/	*/
	bool isProgressIndicatorVisible() const;	bool isProgressIndicatorVisible() const;

	/*!	/*!
	\brief Returns true if the arrow icon is visible.	\brief Returns true if the arrow icon is visible.
	*/	*/
	bool isArrowIconVisible() const;	bool isArrowIconVisible() const;


	skipping to change at line 129	skipping to change at line 130
	void undockToolBar();	void undockToolBar();

	void setViewMenuDescription(const QString &text);	void setViewMenuDescription(const QString &text);

	/**	/**
	* Sets the new icon of the application menu button.	* Sets the new icon of the application menu button.
	* \param the id of the icon that should be shown.	* \param the id of the icon that should be shown.
	*/	*/
	void setViewMenuIconID(const QString &id);	void setViewMenuIconID(const QString &id);


		//! \deprecated do not use
	/**	/**
	* Sets the visible of progress indicator	* Sets the visible of progress indicator
	* \param bool visible	* \param bool visible
	*/	*/
	void setProgressIndicatorVisible(bool visible);	void setProgressIndicatorVisible(bool visible);

	/**	/**
	* Sets the visible of progress indicator	* Sets the visible of progress indicator
	*/	*/
	void setArrowIconVisible(bool visible);	void setArrowIconVisible(bool visible);

End of changes. 2 change blocks.
	0 lines changed or deleted	2 lines changed or added

	mnavigationbarmodel.h	mnavigationbarmodel.h

	skipping to change at line 45	skipping to change at line 45
	*/	*/
	enum EscapeButtonModeEnum {	enum EscapeButtonModeEnum {
	EscapeButtonBack, /!< The escape button is a back button./	EscapeButtonBack, /!< The escape button is a back button./
	EscapeButtonClose /!< The escape button is a close button./	EscapeButtonClose /!< The escape button is a close button./
	};	};

	private:	private:
	M_MODEL_PROPERTY(bool, notifyUser, NotifyUser, true, false)	M_MODEL_PROPERTY(bool, notifyUser, NotifyUser, true, false)
	M_MODEL_PROPERTY(QString, viewMenuDescription, ViewMenuDescription, tru e, "Menu")	M_MODEL_PROPERTY(QString, viewMenuDescription, ViewMenuDescription, tru e, "Menu")
	M_MODEL_PROPERTY(QString, viewMenuIconID, ViewMenuIconID, true, QString ())	M_MODEL_PROPERTY(QString, viewMenuIconID, ViewMenuIconID, true, QString ())

		//! \deprecated do not use
	M_MODEL_PROPERTY(bool, progressIndicatorVisible, ProgressIndicatorVisib le, true, false)	M_MODEL_PROPERTY(bool, progressIndicatorVisible, ProgressIndicatorVisib le, true, false)
	M_MODEL_PROPERTY(bool, arrowIconVisible, ArrowIconVisible, true, false)	M_MODEL_PROPERTY(bool, arrowIconVisible, ArrowIconVisible, true, false)
	M_MODEL_PTR_PROPERTY(MToolBar *, toolBar, ToolBar, true, 0)	M_MODEL_PTR_PROPERTY(MToolBar *, toolBar, ToolBar, true, 0)
	M_MODEL_PROPERTY(MNavigationBarModel::EscapeButtonModeEnum, escapeButto nMode, EscapeButtonMode, true,	M_MODEL_PROPERTY(MNavigationBarModel::EscapeButtonModeEnum, escapeButto nMode, EscapeButtonMode, true,
	MNavigationBarModel::EscapeButtonClose)	MNavigationBarModel::EscapeButtonClose)
	M_MODEL_PROPERTY(bool, escapeButtonEnabled, EscapeButtonEnabled, true, true)	M_MODEL_PROPERTY(bool, escapeButtonEnabled, EscapeButtonEnabled, true, true)
	M_MODEL_PROPERTY(bool, escapeButtonVisible, EscapeButtonVisible, true, true)	M_MODEL_PROPERTY(bool, escapeButtonVisible, EscapeButtonVisible, true, true)

	//! \internal	//! \internal
	M_MODEL_PTR_PROPERTY(QGraphicsWidget *, customContent, CustomContent, t rue, 0)	M_MODEL_PTR_PROPERTY(QGraphicsWidget *, customContent, CustomContent, t rue, 0)

End of changes. 1 change blocks.
	0 lines changed or deleted	1 lines changed or added

	mscenewindow.h	mscenewindow.h

	skipping to change at line 415	skipping to change at line 415
	//! \reimp	//! \reimp
	virtual bool event(QEvent *e);	virtual bool event(QEvent *e);
	virtual void tapAndHoldGestureEvent(QGestureEvent event, QTapAndHoldGe sture gesture);	virtual void tapAndHoldGestureEvent(QGestureEvent event, QTapAndHoldGe sture gesture);
	virtual void gestureEvent(QGestureEvent *event);	virtual void gestureEvent(QGestureEvent *event);
	//! \reimp_end	//! \reimp_end

	private:	private:
	Q_DECLARE_PRIVATE(MSceneWindow)	Q_DECLARE_PRIVATE(MSceneWindow)

	friend class MSceneWindowView;	friend class MSceneWindowView;

		friend class MInputWidgetRelocator; // Needed for alignment attribute.
	friend class MSceneManagerPrivate;	friend class MSceneManagerPrivate;
	friend class MApplicationWindowPrivate;	friend class MApplicationWindowPrivate;

	/* TODO: temporarily required for calling MSceneWindow::done()	/* TODO: temporarily required for calling MSceneWindow::done()
	from MSceneManager::{hide,show}Window{,Now}()*/	from MSceneManager::{hide,show}Window{,Now}()*/
	friend class MSceneManager;	friend class MSceneManager;
	};	};

	Q_DECLARE_METATYPE(MSceneWindow::SceneWindowState)	Q_DECLARE_METATYPE(MSceneWindow::SceneWindowState)


End of changes. 1 change blocks.
	0 lines changed or deleted	1 lines changed or added