FCL/sf/app/videoplayer: comparison videocollection/videofiledetailsview/src/videofiledetailsviewplugin.cpp

equal deleted inserted replaced

-:bbb98528c666
+:3738fe97f027
 #include "videosortfilterproxymodel.h"
 #include "videoservices.h"
 #include "videodetailslabel.h"
 const char* const VIDEO_DETAILS_DOCML = ":/xml/videofiledetails.docml";
-const char* const VIDEO_DETAILS_GFX_PLAY = ":/gfx/play.png";
+const char* const VIDEO_DETAILS_PORTRAIT = "portrait";
+const char* const VIDEO_DETAILS_LANDSCAPE = "landscape";
 const char* const VIDEO_DETAILS_GFX_DEFAULT = ":/gfx/pri_large_video.svg";
 const char* const VIDEO_DETAILS_VIEW = "videofiledetailsview";
 const char* const VIDEO_DETAILS_TITLE = "mLblTitle";
 const char* const VIDEO_DETAILS_THUMBNAIL = "mDetailsLabel";
 const char* const VIDEO_DETAILS_BUTTON = "mButton";
 VideoFileDetailsViewPlugin::VideoFileDetailsViewPlugin()
 : mModel(0),
 mVideoServices(0),
 mActivated(false),
 mIsService(false),
-mCreated(VideoFileDetailsViewPlugin::ENotCreated),
 mVideoId(TMPXItemId::InvalidId()),
 mDeletedIndex(-1),
+mPreviousOrietation(Qt::Vertical),
 mNavKeyBackAction(0),
 mTitleAnim(0),
 mThumbLabel(0),
 mThumbnailManager(0),
 mCollectionWrapper(VideoCollectionWrapper::instance())
 // Create view
 // ---------------------------------------------------------------------------
 //
 void VideoFileDetailsViewPlugin::createView()
 {
-if (VideoFileDetailsViewPlugin::EPreCreated == mCreated)
+	mLoader.reset();
-{
-	finalizeCreateView();
-}
-else if (VideoFileDetailsViewPlugin::ENotCreated == mCreated)
-{
-	preCreateView();
-}
-}
-// ---------------------------------------------------------------------------
-// preCreateView
-// ---------------------------------------------------------------------------
-//
-void VideoFileDetailsViewPlugin::preCreateView()
-{
 	mActivated = false;
-	mCreated = VideoFileDetailsViewPlugin::EPreCreated;
+	bool ok = false;
-	if (!mThumbnailManager)
+	//Load the details view docml first
+	mLoader.load(VIDEO_DETAILS_DOCML, &ok);
+	if(!ok)
 	{
-		mThumbnailManager = new ThumbnailManager();
+		return;
 	}
-}
-// ---------------------------------------------------------------------------
+	//Load portrait section by default as only vertical orientation is currently supported by videoplayer
-// finalizeCreateView
+	mLoader.load(VIDEO_DETAILS_DOCML, VIDEO_DETAILS_PORTRAIT, &ok);
-// ---------------------------------------------------------------------------
-//
+	if(!ok)
-void VideoFileDetailsViewPlugin::finalizeCreateView()
+	{
-{
+		return;
-	mView.reset();
+	}
-	mActivated = false;
-	mCreated = VideoFileDetailsViewPlugin::EFinalized;
-	bool ok = false;
-	mView.load(VIDEO_DETAILS_DOCML, &ok);
 	mModel = mCollectionWrapper.getModel(VideoCollectionWrapper::EAllVideos);
 	if (!mModel)
 		{
 	connect(mModel->sourceModel(),
 			SIGNAL(shortDetailsReady(TMPXItemId)),
 			this, SLOT(shortDetailsReadySlot(TMPXItemId)));
-	connect(mModel,
+	connect(mModel->sourceModel(),
-			SIGNAL(fullDetailsReady(TMPXItemId)),
+			SIGNAL(fullVideoDetailsReady(TMPXItemId)),
 			this, SLOT(fullDetailsReadySlot(TMPXItemId)));
 	connect(mModel,
 			SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
 			this, SLOT(rowsRemovedSlot(const QModelIndex&, int, int)));
 	}
 	else
 	{
 		connect(deleteAction, SIGNAL(triggered(bool)), this, SLOT(deleteVideoSlot()));
 	}
 	// Create navigation keys.
 	mNavKeyBackAction = new HbAction(Hb::BackNaviAction);
+	if (!mThumbnailManager)
+	{
+		mThumbnailManager = new ThumbnailManager();
+	}
 	connect(mThumbnailManager, SIGNAL(thumbnailReady(QPixmap,void*,int,int)),
 			this, SLOT(thumbnailReadySlot(QPixmap,void*,int,int)));
 }
 // ---------------------------------------------------------------------------
 }
 delete mNavKeyBackAction; mNavKeyBackAction = 0;
 delete mThumbnailManager; mThumbnailManager = 0;
 disconnect();
-mView.reset();
+mLoader.reset();
 }
 // ---------------------------------------------------------------------------
 // Activate view
 // ---------------------------------------------------------------------------
 //
 void VideoFileDetailsViewPlugin::activateView()
 {
-	if ( !mActivated && (VideoFileDetailsViewPlugin::EFinalized == mCreated))
+	if (!mActivated)
 {
 HbMainWindow *mainWnd = hbInstance->allMainWindows().value(0);
 HbView *currentView = mainWnd->currentView();
 if(currentView && mNavKeyBackAction)
 	else
 	{
 		return;
 	}
 }
 mainWnd->setOrientation(Qt::Vertical, false);
 // following if is for the future implementations where we should support
 // also landscape configuration.
 Qt::Orientation orientation = mainWnd->orientation();
-if ( orientation == Qt::Vertical )
+if ( (orientation == Qt::Vertical) && (orientation != mPreviousOrietation) )
 {
-		mView.load(VIDEO_DETAILS_DOCML, "portrait");
+		mPreviousOrietation = orientation;
+	mLoader.load(VIDEO_DETAILS_DOCML, VIDEO_DETAILS_PORTRAIT);
 }
-else if ( orientation == Qt::Horizontal )
+else if ( (orientation == Qt::Horizontal) && (orientation != mPreviousOrietation) )
 {
-		mView.load(VIDEO_DETAILS_DOCML, "landscape");
+		mPreviousOrietation = orientation;
+		mLoader.load(VIDEO_DETAILS_DOCML, VIDEO_DETAILS_LANDSCAPE);
 }
 	if (mIsService && !mVideoServices)
 	{
 		mVideoServices = VideoServices::instance();
 			if (!mVideoServices)
 			{
 				return;
 			}
 	}
-	if (mIsService && mVideoServices)
+		HbPushButton* button = findWidget<HbPushButton>(VIDEO_DETAILS_BUTTON);
+		if (mIsService && mVideoServices)
 		{
-			HbPushButton* attachBtn = findWidget<HbPushButton>(VIDEO_DETAILS_BUTTON);
+			button->setText(tr("Attach")); //localisation
-			attachBtn->setText(tr("Attach")); //TODO: Localisation
+			connect(button, SIGNAL(clicked(bool)), this, SLOT(getFileUri()));
-			connect(attachBtn, SIGNAL(clicked(bool)), this, SLOT(getFileUri()));
 			connect(this, SIGNAL(fileUri(const QString&)), mVideoServices, SLOT(itemSelected(const QString&)));
 HbMainWindow *mainWnd = hbInstance->allMainWindows().value(0);
 mainWnd->currentView()->setTitle(mVideoServices->contextTitle());
 		}
 	else if(!mIsService)
 	{
-		HbPushButton* shareBtn = findWidget<HbPushButton>(VIDEO_DETAILS_BUTTON);
+			connect(button, SIGNAL(clicked(bool)), this, SLOT(sendVideoSlot()));
-			connect(shareBtn, SIGNAL(triggered(bool)), this, SLOT(sendVideoSlot()));
+			button->setText(hbTrId("txt_videos_opt_share"));
-			shareBtn->setText(hbTrId("txt_videos_opt_share"));
 	}
 connect(mainWnd,
 SIGNAL(orientationChanged(Qt::Orientation)),
 this, SLOT(orientationChange(Qt::Orientation)));
 			disconnect(button, SIGNAL(clicked(bool)), this, SLOT(getFileUri()));
 			disconnect(this, SIGNAL(fileUri(const QString&)), mVideoServices, SLOT(itemSelected(const QString&)));
 	}
 		else
 		{
-			disconnect(button, SIGNAL(triggered(bool)), this, SLOT(sendVideoSlot()));
+			disconnect(button, SIGNAL(clicked(bool)), this, SLOT(sendVideoSlot()));
 		}
 }
 }
 // Get view
 // ---------------------------------------------------------------------------
 //
 QGraphicsWidget* VideoFileDetailsViewPlugin::getView()
 {
-return mView.findWidget(VIDEO_DETAILS_VIEW);
+return mLoader.findWidget(VIDEO_DETAILS_VIEW);
 }
 // ---------------------------------------------------------------------------
 // Slot: Orientation change
 // ---------------------------------------------------------------------------
 //
 void VideoFileDetailsViewPlugin::orientationChange( Qt::Orientation orientation )
 {
 if ( orientation == Qt::Vertical )
 {
-	mView.load(VIDEO_DETAILS_DOCML, "portrait");
+	mLoader.load(VIDEO_DETAILS_DOCML, VIDEO_DETAILS_PORTRAIT);
 }
 else if ( orientation == Qt::Horizontal )
 {
-	mView.load(VIDEO_DETAILS_DOCML, "landscape");
+	mLoader.load(VIDEO_DETAILS_DOCML, VIDEO_DETAILS_LANDSCAPE);
 }
 mTitleAnim->adjustSize();
 mTitleAnim->startAnimation();
 }
 		QModelIndex modelIndex = mModel->indexOfId(mVideoId);
 		QVariant variant = mModel->data(modelIndex, Qt::DisplayRole);
 if (variant.isValid())
 {
-QString text = tr("Do you want to delete \"%1\"?").arg(variant.toStringList().first()); //TODO: Localisation: txt_common_menu_delete
+QString text = hbTrId("txt_videos_info_do_you_want_to_delete_1").arg(
+			   variant.toStringList().first());
 if (HbMessageBox::question(text))
 {
 deleteItem(modelIndex);
 }
 void VideoFileDetailsViewPlugin::handleErrorSlot(int errorCode, QVariant &additional)
 {
 QString msg("");
 if(errorCode == VideoCollectionCommon::statusSingleDeleteFail)
 {
-QString format = tr("Unable to delete item %1. It is currently open."); //TODO: Localisation
+QString format = hbTrId("txt_videos_info_unable_to_delete_1_it_is_current");
 if(additional.isValid())
 {
 msg = format.arg(additional.toString());
 }
 }
 {
 Q_UNUSED(clientData);
 Q_UNUSED(id);
 	QSize size(mThumbLabel->size().toSize());
-	QImage play(VIDEO_DETAILS_GFX_PLAY);
 	if (!errorCode)
 	{
 		QImage sourceImage = pixmap.toImage();
 		sourceImage = sourceImage.copy(rect);
 		QImage resultImage = QImage(sourceImage.size(), QImage::Format_ARGB32_Premultiplied);
 		QPainter painter(&resultImage);
-		painter.setCompositionMode(QPainter::CompositionMode_Source);
+painter.setCompositionMode(QPainter::CompositionMode_Source);
 		painter.fillRect(resultImage.rect(), Qt::transparent);
 		painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-		painter.drawImage( (int)(sourceImage.width() - play.width())/2,
+		painter.drawPixmap( (int)(sourceImage.width() - playIcon().width())/2,
-				           (int)(sourceImage.height() - play.height())/2,
+				           (int)(sourceImage.height() - playIcon().height())/2,
-				            play );
+				            playIcon() );
 		painter.setCompositionMode(QPainter::CompositionMode_Screen);
-		painter.drawImage(0, 0, sourceImage);
+painter.drawImage(0, 0, sourceImage);
 		painter.end();
 		HbIcon compsedIcon(QPixmap::fromImage(resultImage));
 	    mThumbLabel->setIcon(compsedIcon);
 	}
 	mThumbLabel->setIcon(HbIcon(VIDEO_DETAILS_GFX_DEFAULT));
 }
 }
 // ---------------------------------------------------------------------------
+// playIcon
+// ---------------------------------------------------------------------------
+//
+const QPixmap &VideoFileDetailsViewPlugin::playIcon()
+{
+// Check if we have already the icon.
+if(!mPlayIcon.isNull())
+{
+return mPlayIcon;
+}
+// Compose the icon.
+HbIcon play =        HbIcon("qtg_mono_play");
+HbIcon topLeft =     HbIcon("qtg_fr_popup_trans_tl");
+HbIcon top =         HbIcon("qtg_fr_popup_trans_t");
+HbIcon topRight =    HbIcon("qtg_fr_popup_trans_tr");
+HbIcon left =        HbIcon("qtg_fr_popup_trans_l");
+HbIcon center =      HbIcon("qtg_fr_popup_trans_c");
+HbIcon right =       HbIcon("qtg_fr_popup_trans_r");
+HbIcon bottomLeft =  HbIcon("qtg_fr_popup_trans_bl");
+HbIcon bottom =      HbIcon("qtg_fr_popup_trans_b");
+HbIcon bottomRight = HbIcon("qtg_fr_popup_trans_br");
+int width = topLeft.width() + top.width() + topRight.width();
+int height = topLeft.height() + center.height() + bottomLeft.height();
+mPlayIcon = QPixmap(width, height);
+QPainter painter(&mPlayIcon);
+painter.fillRect(mPlayIcon.rect(), Qt::white);
+painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
+int x = 0;
+int y = 0;
+// Draw top
+painter.drawPixmap(QPoint(x, y), topLeft.pixmap());
+x += left.width();
+painter.drawPixmap(QPoint(x, y), top.pixmap());
+x += top.width();
+painter.drawPixmap(QPoint(x, y), topRight.pixmap());
+y += top.height();
+// Draw center
+x = 0;
+painter.drawPixmap(QPoint(x, y), left.pixmap());
+x += left.width();
+painter.drawPixmap(QPoint(x, y), center.pixmap());
+x += center.width();
+painter.drawPixmap(QPoint(x, y), right.pixmap());
+y += center.height();
+// Draw bottom
+x = 0;
+painter.drawPixmap(QPoint(x, y), bottomLeft.pixmap());
+x += left.width();
+painter.drawPixmap(QPoint(x, y), bottom.pixmap());
+x += top.width();
+painter.drawPixmap(QPoint(x, y), bottomRight.pixmap());
+// Draw play icon
+play.setSize(mPlayIcon.size());
+play.setColor(Qt::white);
+painter.drawPixmap(mPlayIcon.rect(), play.pixmap());
+painter.end();
+return mPlayIcon;
+}
+// ---------------------------------------------------------------------------
 // findWidget
 // ---------------------------------------------------------------------------
 //
 template<class T>
 T* VideoFileDetailsViewPlugin::findWidget(QString name)
 {
-return qobject_cast<T *>(mView.findWidget(name));
+return qobject_cast<T *>(mLoader.findWidget(name));
 }
 // ---------------------------------------------------------------------------
 // findObject
 // ---------------------------------------------------------------------------
 //
 template<class T>
 T* VideoFileDetailsViewPlugin::findObject(QString name)
 {
-return qobject_cast<T *>(mView.findObject(name));
+return qobject_cast<T *>(mLoader.findObject(name));
 }
 XQ_EXPORT_PLUGIN2( videofiledetailsview, VideoFileDetailsViewPlugin );
 // end of file

changeset 35	3738fe97f027
parent 34	bbb98528c666
child 36	8aed59de29f9