From c0fd058846b49122bc2724bb1a43d0420e2c4c88 Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Mon, 30 Jul 2012 10:24:53 +0300 Subject: [PATCH] Useless code removed. --- src/domain/UBGraphicsMediaItem.h | 2 +- src/domain/UBGraphicsMediaItemDelegate.cpp | 25 ++++------------------ src/domain/UBGraphicsMediaItemDelegate.h | 3 --- 3 files changed, 5 insertions(+), 25 deletions(-) diff --git a/src/domain/UBGraphicsMediaItem.h b/src/domain/UBGraphicsMediaItem.h index cdd95c1a..e3c6b75b 100644 --- a/src/domain/UBGraphicsMediaItem.h +++ b/src/domain/UBGraphicsMediaItem.h @@ -32,7 +32,7 @@ public: class UBAudioPresentationWidget : public QWidget { public: - UBAudioPresentationWidget::UBAudioPresentationWidget(QWidget *parent = NULL) + UBAudioPresentationWidget(QWidget *parent = NULL) :QWidget(parent) , mBorderSize(10) , mTitleSize(10) diff --git a/src/domain/UBGraphicsMediaItemDelegate.cpp b/src/domain/UBGraphicsMediaItemDelegate.cpp index aad52490..41679aed 100644 --- a/src/domain/UBGraphicsMediaItemDelegate.cpp +++ b/src/domain/UBGraphicsMediaItemDelegate.cpp @@ -36,7 +36,6 @@ UBGraphicsMediaItemDelegate::UBGraphicsMediaItemDelegate(UBGraphicsMediaItem* pD , mMedia(pMedia) , mToolBarShowTimer(NULL) , m_iToolBarShowingInterval(5000) - , mToolBarIsShown(false) { QPalette palette; palette.setBrush ( QPalette::Light, Qt::darkGray ); @@ -53,18 +52,12 @@ UBGraphicsMediaItemDelegate::UBGraphicsMediaItemDelegate(UBGraphicsMediaItem* pD connect(mToolBarShowTimer, SIGNAL(timeout()), this, SLOT(hideToolBar())); mToolBarShowTimer->setInterval(m_iToolBarShowingInterval); } - - if (delegated()->getMediaType() == UBGraphicsMediaItem::mediaType_Video) - { - connect(UBApplication::boardController, SIGNAL(zoomChanged(qreal)), this, SLOT(onZoomChanged())); - } } bool UBGraphicsMediaItemDelegate::mousePressEvent(QGraphicsSceneMouseEvent *event) { Q_UNUSED(event); mToolBarItem->show(); - mToolBarIsShown = true; if (mToolBarShowTimer) mToolBarShowTimer->start(); @@ -75,14 +68,6 @@ bool UBGraphicsMediaItemDelegate::mousePressEvent(QGraphicsSceneMouseEvent *even void UBGraphicsMediaItemDelegate::hideToolBar() { mToolBarItem->hide(); - mToolBarIsShown = false; -} - -void UBGraphicsMediaItemDelegate::onZoomChanged() -{ - positionHandles(); - if (!mToolBarIsShown) - hideToolBar(); } void UBGraphicsMediaItemDelegate::buildButtons() @@ -136,18 +121,16 @@ void UBGraphicsMediaItemDelegate::positionHandles() { UBGraphicsItemDelegate::positionHandles(); - qreal AntiScaleRatio = 1 / (UBApplication::boardController->systemScaleFactor() * UBApplication::boardController->currentZoom()); - UBGraphicsMediaItem *mediaItem = dynamic_cast(mDelegated); if (mediaItem) { QRectF toolBarRect = mToolBarItem->rect(); if (mediaItem->getMediaType() == UBGraphicsMediaItem::mediaType_Video) { - mToolBarItem->setPos(0, delegated()->boundingRect().height()-mToolBarItem->rect().height());//*AntiScaleRatio); + mToolBarItem->setPos(0, delegated()->boundingRect().height()-mToolBarItem->rect().height()); // mToolBarItem->setScale(AntiScaleRatio); - toolBarRect.setWidth(delegated()->boundingRect().width());//AntiScaleRatio); + toolBarRect.setWidth(delegated()->boundingRect().width()); } else if (mediaItem->getMediaType() == UBGraphicsMediaItem::mediaType_Audio) { @@ -156,8 +139,8 @@ void UBGraphicsMediaItemDelegate::positionHandles() if (audioWidget) borderSize = audioWidget->borderSize(); - mToolBarItem->setPos(borderSize,delegated()->boundingRect().height()-(mToolBarItem->rect().height() + borderSize));//*AntiScaleRatio); - toolBarRect.setWidth((delegated()->boundingRect().width()-2*borderSize));///AntiScaleRatio); + mToolBarItem->setPos(borderSize,delegated()->boundingRect().height()-(mToolBarItem->rect().height() + borderSize)); + toolBarRect.setWidth((delegated()->boundingRect().width()-2*borderSize)); mToolBarItem->show(); } diff --git a/src/domain/UBGraphicsMediaItemDelegate.h b/src/domain/UBGraphicsMediaItemDelegate.h index a1c68346..28a71b37 100644 --- a/src/domain/UBGraphicsMediaItemDelegate.h +++ b/src/domain/UBGraphicsMediaItemDelegate.h @@ -57,8 +57,6 @@ class UBGraphicsMediaItemDelegate : public UBGraphicsItemDelegate void hideToolBar(); - void onZoomChanged(); - protected: virtual void buildButtons(); @@ -73,7 +71,6 @@ class UBGraphicsMediaItemDelegate : public UBGraphicsItemDelegate QTimer *mToolBarShowTimer; int m_iToolBarShowingInterval; - bool mToolBarIsShown; }; #endif /* UBGRAPHICSMEDIAITEMDELEGATE_H_ */ \ No newline at end of file