From 5b68ea125af474f632f166f2f829c0e00a41a5c5 Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Fri, 3 Aug 2012 13:43:04 +0300 Subject: [PATCH] Fixed wrong connects in media item. --- src/domain/UBGraphicsMediaItem.h | 5 ++--- src/domain/UBGraphicsMediaItemDelegate.cpp | 13 ++++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/domain/UBGraphicsMediaItem.h b/src/domain/UBGraphicsMediaItem.h index e3c6b75b..b182f27c 100644 --- a/src/domain/UBGraphicsMediaItem.h +++ b/src/domain/UBGraphicsMediaItem.h @@ -85,9 +85,6 @@ public: return Type; } - void hasMediaChanged(bool hasMedia); - void showOnDisplayChanged(bool shown); - virtual QUrl mediaFileUrl() const { return mMediaFileUrl; @@ -138,6 +135,8 @@ public slots: void toggleMute(); void activeSceneChanged(); + void hasMediaChanged(bool hasMedia); + void showOnDisplayChanged(bool shown); protected: diff --git a/src/domain/UBGraphicsMediaItemDelegate.cpp b/src/domain/UBGraphicsMediaItemDelegate.cpp index 41679aed..b88cabce 100644 --- a/src/domain/UBGraphicsMediaItemDelegate.cpp +++ b/src/domain/UBGraphicsMediaItemDelegate.cpp @@ -74,17 +74,13 @@ void UBGraphicsMediaItemDelegate::buildButtons() { mPlayPauseButton = new DelegateButton(":/images/play.svg", mDelegated, mToolBarItem, Qt::TitleBarArea); connect(mPlayPauseButton, SIGNAL(clicked(bool)), this, SLOT(togglePlayPause())); - connect(mPlayPauseButton, SIGNAL(clicked(bool)), mToolBarShowTimer, SLOT(start())); - mStopButton = new DelegateButton(":/images/stop.svg", mDelegated, mToolBarItem, Qt::TitleBarArea); connect(mStopButton, SIGNAL(clicked(bool)), mMedia, SLOT(stop())); - connect(mStopButton, SIGNAL(clicked(bool)), mToolBarShowTimer, SLOT(start())); mMediaControl = new DelegateMediaControl(delegated(), mToolBarItem); mMediaControl->setFlag(QGraphicsItem::ItemIsSelectable, true); UBGraphicsItem::assignZValue(mMediaControl, delegated()->zValue()); - connect(mMediaControl, SIGNAL(used()), mToolBarShowTimer, SLOT(start())); if (delegated()->isMuted()) mMuteButton = new DelegateButton(":/images/soundOff.svg", mDelegated, mToolBarItem, Qt::TitleBarArea); @@ -93,7 +89,6 @@ void UBGraphicsMediaItemDelegate::buildButtons() connect(mMuteButton, SIGNAL(clicked(bool)), delegated(), SLOT(toggleMute())); connect(mMuteButton, SIGNAL(clicked(bool)), this, SLOT(toggleMute())); // for changing button image - connect(mMuteButton, SIGNAL(clicked(bool)), mToolBarShowTimer, SLOT(start())); mButtons << mPlayPauseButton << mStopButton << mMuteButton; @@ -101,6 +96,14 @@ void UBGraphicsMediaItemDelegate::buildButtons() mToolBarItem->setVisibleOnBoard(true); mToolBarItem->setShifting(false); + if (mToolBarShowTimer) + { + connect(mPlayPauseButton, SIGNAL(clicked(bool)), mToolBarShowTimer, SLOT(start())); + connect(mStopButton, SIGNAL(clicked(bool)), mToolBarShowTimer, SLOT(start())); + connect(mMediaControl, SIGNAL(used()), mToolBarShowTimer, SLOT(start())); + connect(mMuteButton, SIGNAL(clicked(bool)), mToolBarShowTimer, SLOT(start())); + } + UBGraphicsMediaItem *audioItem = dynamic_cast(mDelegated); if (audioItem) {