diff options
author | Antti Pulakka <ext-antti.j.pulakka@nokia.com> | 2010-09-07 16:03:02 +0300 |
---|---|---|
committer | Daniel d'Andrada <daniel.dandrada@nokia.com> | 2010-09-14 13:28:31 +0300 |
commit | 9f5eb8580065843b2bb68e2fa453a48c4a56a771 (patch) | |
tree | 4e099f8816db3457f53450ed94a62893e53a146f /src | |
parent | fa35bc0dbb5f974cd7956a18694545bb7dc236c2 (diff) |
Changes: Changed feedback for MSceneWindow
RevBy: Daniel d'Andrada
Details: Input feedback is given already when scene window starts to appear
instead of after the window has already been appeared. This way
the feedback has more meaning for the user by telling that it is
ok to stop pressing the display when waiting for object menu to
appear.
Diffstat (limited to 'src')
-rw-r--r-- | src/views/mscenewindowview.cpp | 8 | ||||
-rw-r--r-- | src/views/mscenewindowview.h | 2 | ||||
-rw-r--r-- | src/views/mscenewindowview_p.h | 2 | ||||
-rw-r--r-- | src/views/style/mscenewindowstyle.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/views/mscenewindowview.cpp b/src/views/mscenewindowview.cpp index 72003b45..71e7bbc9 100644 --- a/src/views/mscenewindowview.cpp +++ b/src/views/mscenewindowview.cpp @@ -34,11 +34,11 @@ MSceneWindowViewPrivate::~MSceneWindowViewPrivate() { } -void MSceneWindowViewPrivate::_q_playSceneWindowAppearedFeedback() +void MSceneWindowViewPrivate::_q_playSceneWindowAppearingFeedback() { Q_Q(MSceneWindowView); - // Play a feedback when scene window appears + // Play a feedback when scene window starts to appear q->style()->appearFeedback().play(); } @@ -49,7 +49,7 @@ MSceneWindowView::MSceneWindowView(MSceneWindow *controller) : d->controller = controller; connect(this, SIGNAL(geometryAttributesChanged()), controller, SIGNAL(repositionNeeded())); - connect(controller, SIGNAL(appeared()), this, SLOT(_q_playSceneWindowAppearedFeedback())); + connect(controller, SIGNAL(appearing()), this, SLOT(_q_playSceneWindowAppearingFeedback())); } MSceneWindowView::MSceneWindowView(MSceneWindowViewPrivate &dd, MSceneWindow *controller) : @@ -59,7 +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())); + connect(controller, SIGNAL(appearing()), this, SLOT(_q_playSceneWindowAppearingFeedback())); } MSceneWindowView::~MSceneWindowView() diff --git a/src/views/mscenewindowview.h b/src/views/mscenewindowview.h index a1d7e43e..e154a218 100644 --- a/src/views/mscenewindowview.h +++ b/src/views/mscenewindowview.h @@ -84,7 +84,7 @@ signals: void geometryAttributesChanged(); private: - Q_PRIVATE_SLOT(d_func(), void _q_playSceneWindowAppearedFeedback()) + Q_PRIVATE_SLOT(d_func(), void _q_playSceneWindowAppearingFeedback()) Q_DECLARE_PRIVATE(MSceneWindowView) Q_DISABLE_COPY(MSceneWindowView) diff --git a/src/views/mscenewindowview_p.h b/src/views/mscenewindowview_p.h index dab9e8dc..fb707646 100644 --- a/src/views/mscenewindowview_p.h +++ b/src/views/mscenewindowview_p.h @@ -33,7 +33,7 @@ public: MSceneWindow *controller; - void _q_playSceneWindowAppearedFeedback(); + void _q_playSceneWindowAppearingFeedback(); }; #endif diff --git a/src/views/style/mscenewindowstyle.h b/src/views/style/mscenewindowstyle.h index 9252edd9..ccc1b8f8 100644 --- a/src/views/style/mscenewindowstyle.h +++ b/src/views/style/mscenewindowstyle.h @@ -35,7 +35,7 @@ class M_EXPORT MSceneWindowStyle : public MWidgetStyle /*! \property MSceneWindowStyle::appearFeedback - \brief Feedback given when scene window reaches the Appeared state. + \brief Feedback given when scene window reaches the Appearing state. */ M_STYLE_ATTRIBUTE(MFeedback, appearFeedback, AppearFeedback) }; |