aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntti Pulakka <ext-antti.j.pulakka@nokia.com>2010-06-10 16:41:49 +0300
committerDaniel d'Andrada <daniel.dandrada@nokia.com>2010-06-23 09:58:01 +0300
commit1a9153fad264fda1436c0805a0621ae4e8559e4a (patch)
tree3c8d0b3d3a0906bf5efe4dcc4d7ba6ac77ac97cc
parent95cbc7288cbf02a8381400ec44311c0677f1c7bf (diff)
Changes: Added appear feedback to MSceneWindow
RevBy: Daniel d'Andrada Details: Feedback will be played when scene window has finished appearing.
-rw-r--r--src/views/mscenewindowview.cpp11
-rw-r--r--src/views/mscenewindowview.h2
-rw-r--r--src/views/mscenewindowview_p.h2
-rw-r--r--src/views/style/mscenewindowstyle.h6
4 files changed, 21 insertions, 0 deletions
diff --git a/src/views/mscenewindowview.cpp b/src/views/mscenewindowview.cpp
index ad2a6bb2..72003b45 100644
--- a/src/views/mscenewindowview.cpp
+++ b/src/views/mscenewindowview.cpp
@@ -34,6 +34,13 @@ MSceneWindowViewPrivate::~MSceneWindowViewPrivate()
{
}
+void MSceneWindowViewPrivate::_q_playSceneWindowAppearedFeedback()
+{
+ Q_Q(MSceneWindowView);
+
+ // Play a feedback when scene window appears
+ q->style()->appearFeedback().play();
+}
MSceneWindowView::MSceneWindowView(MSceneWindow *controller) :
MWidgetView(*new MSceneWindowViewPrivate, controller)
@@ -42,6 +49,7 @@ MSceneWindowView::MSceneWindowView(MSceneWindow *controller) :
d->controller = controller;
connect(this, SIGNAL(geometryAttributesChanged()), controller, SIGNAL(repositionNeeded()));
+ connect(controller, SIGNAL(appeared()), this, SLOT(_q_playSceneWindowAppearedFeedback()));
}
MSceneWindowView::MSceneWindowView(MSceneWindowViewPrivate &dd, MSceneWindow *controller) :
@@ -51,6 +59,7 @@ MSceneWindowView::MSceneWindowView(MSceneWindowViewPrivate &dd, MSceneWindow *co
d->controller = controller;
connect(this, SIGNAL(geometryAttributesChanged()), controller, SIGNAL(repositionNeeded()));
+ connect(controller, SIGNAL(appeared()), this, SLOT(_q_playSceneWindowAppearedFeedback()));
}
MSceneWindowView::~MSceneWindowView()
@@ -88,3 +97,5 @@ QPointF MSceneWindowView::offset() const
}
M_REGISTER_VIEW_NEW(MSceneWindowView, MSceneWindow)
+
+#include "moc_mscenewindowview.cpp"
diff --git a/src/views/mscenewindowview.h b/src/views/mscenewindowview.h
index 23ee62b5..a1d7e43e 100644
--- a/src/views/mscenewindowview.h
+++ b/src/views/mscenewindowview.h
@@ -84,6 +84,8 @@ signals:
void geometryAttributesChanged();
private:
+ Q_PRIVATE_SLOT(d_func(), void _q_playSceneWindowAppearedFeedback())
+
Q_DECLARE_PRIVATE(MSceneWindowView)
Q_DISABLE_COPY(MSceneWindowView)
};
diff --git a/src/views/mscenewindowview_p.h b/src/views/mscenewindowview_p.h
index 983789b4..dab9e8dc 100644
--- a/src/views/mscenewindowview_p.h
+++ b/src/views/mscenewindowview_p.h
@@ -32,6 +32,8 @@ public:
virtual ~MSceneWindowViewPrivate();
MSceneWindow *controller;
+
+ void _q_playSceneWindowAppearedFeedback();
};
#endif
diff --git a/src/views/style/mscenewindowstyle.h b/src/views/style/mscenewindowstyle.h
index f909a48f..9252edd9 100644
--- a/src/views/style/mscenewindowstyle.h
+++ b/src/views/style/mscenewindowstyle.h
@@ -32,6 +32,12 @@ class M_EXPORT MSceneWindowStyle : public MWidgetStyle
M_STYLE_ATTRIBUTE(Qt::Alignment, verticalAlign, VerticalAlign)
M_STYLE_ATTRIBUTE(QPointF, offset, Offset)
M_STYLE_ATTRIBUTE(int, disappearTimeout, DisappearTimeout)
+
+ /*!
+ \property MSceneWindowStyle::appearFeedback
+ \brief Feedback given when scene window reaches the Appeared state.
+ */
+ M_STYLE_ATTRIBUTE(MFeedback, appearFeedback, AppearFeedback)
};
class M_EXPORT MSceneWindowStyleContainer : public MWidgetStyleContainer