FCL/sf/app/photos: comparison ui/views/fullscreenview/src/glxfullscreenview.cpp

equal deleted inserted replaced

-:aa2fa096cbfb
+:863223ea6961
 mImageStrip (NULL),
 mUiOffTimer(NULL),
 mIconItem(NULL),
 mTvOutWrapper(NULL),
 mFullScreenToolBar(NULL),
-	mFlipAction(NULL),
-	mSendAction(NULL),
-	mDeleteAction(NULL),
-	mUseImageAction(NULL),
 	mZoomWidget(NULL)
 {
 OstTraceFunctionEntry0( GLXFULLSCREENVIEW_GLXFULLSCREENVIEW_ENTRY );
 mDocLoader = DocLoader;
 // if animations is on, then Set the image to HDMI here
 if (!mTvOutWrapper){
 mTvOutWrapper = new GlxTvOutWrapper();
 }
 setHdmiModel(model);
-//Load/Retrieve the Widgets
 loadWidgets();
-//Initialize the coverflow and partially creates the coverflow with one image
+// Initialize the coverflow and partially creates the coverflow with one image
-// to make the widget light weight in order to make
+// to make the widget light weight in order to make transition smooth
-// transition smooth
+mCoverFlow->partiallyCreate( model, screenSize() );
-mCoverFlow->partiallyCreate( model, screenSize());
 OstTraceFunctionExit0( GLXFULLSCREENVIEW_INITIALIZEVIEW_EXIT );
 }
 void GlxFullScreenView::loadWidgets()
 {
 OstTraceFunctionEntry0( GLXFULLSCREENVIEW_LOADWIDGETS_ENTRY );
-//Load the Coverflow and image strip widget
 mCoverFlow = qobject_cast<GlxCoverFlow*> (mDocLoader->findWidget(GLXFULLSCREEN_COVERFLOW));
-	 mZoomWidget  =  qobject_cast<GlxZoomWidget*> (mDocLoader->findWidget(GLXFULLSCREENZOOMWIDGET));
+mZoomWidget  =  qobject_cast<GlxZoomWidget*> (mDocLoader->findWidget(GLXFULLSCREENZOOMWIDGET));
-	 mZoomWidget->connectDecodeRequestToPinchEvent();
+mZoomWidget->connectDecodeRequestToPinchEvent();
-	 mCoverFlow->setMultitouchFilter(mZoomWidget);
+mCoverFlow->setMultitouchFilter(mZoomWidget);
 //initialise the cover flow for basic connections and the rest
 mCoverFlow->setCoverFlow();
+mImageStrip = qobject_cast<HbGridView*> (mDocLoader->findWidget(GLXFULLSCREEN_FILMSTRIP));
-//Load the IMAGE STRIP & FULLSCREEN TOOLBAR[PUSH BUTTON]
-mImageStrip              =   qobject_cast<HbGridView*> (mDocLoader->findWidget(GLXFULLSCREEN_FILMSTRIP));
 //When the widget is loaded/retreived the widgets are shown by default.
 //@to do : hide the widgets by default in docml
 mImageStrip->hide();
-	mImageStrip->setLayoutName( QString( "ImageStrip" ) );
+	mImageStrip->setLayoutName( QString( "ImageStrip" ) ); // To distinguish in CSS file
-	mImageStrip->setEnabledAnimations(HbAbstractItemView::None);
+	mImageStrip->setEnabledAnimations( HbAbstractItemView::None );
 OstTraceFunctionExit0( GLXFULLSCREENVIEW_LOADWIDGETS_EXIT );
 }
 void GlxFullScreenView::loadFullScreenToolBar()
 mDocLoader->load(GLXFULLSCREENDOCMLPATH,&loaded);
 loadViewSection();
 mFullScreenToolBar = qobject_cast<HbToolBar *> (mDocLoader->findObject(QString("toolBar")));
 mFullScreenToolBar->clearActions();
-//create  Flip tool bar button action
+addToolBarAction( EGlxCmdDetailsOpen, GLXICON_FLIP, "Flip Action" ); //create  Flip tool bar button action
-mFlipAction = new HbAction(this);
+addToolBarAction( EGlxCmdSend, GLXICON_SEND, "Send Action" );        //create  Send tool bar button action
-mFlipAction->setData(EGlxCmdDetailsOpen);
+if( getSubState() != IMAGEVIEWER_S ) {
-mFlipAction->setIcon(HbIcon(GLXICON_FLIP));
+addToolBarAction( EGlxCmdDelete, GLXICON_DELETE, "Delete Action" ); //create  Delete tool bar button action
-mFullScreenToolBar->addAction( mFlipAction);
+}
+else {
-//create  Send tool bar button action
+addToolBarAction( EGlxCmdHandled, GLXICON_USEIMAGE, "Use Action" ); //create  Use Image tool bar button action
-mSendAction = new HbAction(this);
+}
-mSendAction->setData(EGlxCmdSend);
-mSendAction->setIcon(HbIcon(GLXICON_SEND));
-mFullScreenToolBar->addAction( mSendAction);
-//create  Delete tool bar button action
-mDeleteAction = new HbAction(this);
-mDeleteAction->setData(EGlxCmdDelete);
-mDeleteAction->setIcon(HbIcon(GLXICON_DELETE));
-//create  Use Image tool bar button action
-mUseImageAction = new HbAction(this);
-//mUseImageAction->setData(EGlxCmdDelete);
-mUseImageAction->setIcon(HbIcon(GLXICON_USEIMAGE));
-if(getSubState() != IMAGEVIEWER_S){
-mFullScreenToolBar->addAction( mDeleteAction);
-}else{
-mFullScreenToolBar->addAction( mUseImageAction);
-}
-connect(mFlipAction, SIGNAL(triggered( )), this, SLOT(handleToolBarAction( )) );
-connect(mSendAction, SIGNAL(triggered( )), this, SLOT(handleToolBarAction( )) );
-connect(mDeleteAction, SIGNAL(triggered( )), this, SLOT(handleToolBarAction( )) );
-connect(mUseImageAction, SIGNAL(triggered( )), this, SLOT(handleToolBarAction( )) );
 OstTraceFunctionExit0( GLXFULLSCREENVIEW_LOADFULLSCREENTOOLBAR_EXIT );
 }
+void GlxFullScreenView::addToolBarAction( int commandId, const QString &iconName, const QString &name )
+{
+HbAction *action = new HbAction( this );
+action->setData( commandId );
+action->setIcon( HbIcon( iconName ) );
+action->setObjectName( name );
+mFullScreenToolBar->addAction( action);
+connect(action, SIGNAL(triggered( )), this, SLOT(handleToolBarAction( )) );
+}
 void GlxFullScreenView::activate()
 {
 OstTraceFunctionEntry0( GLXFULLSCREENVIEW_ACTIVATE_ENTRY );
-setStatusBarVisible(FALSE);
-setTitleBarVisible(FALSE);
-	//To:Do remove it later, currently it is solving the problem of status bar is not
-	//visible when tap on the screen first time
-setStatusBarVisible(FALSE);
-setTitleBarVisible(FALSE);
 //for zoom might not be required after wk15 release
 	mWindow->viewport()->setAttribute(Qt::WA_AcceptTouchEvents,true);
 	mWindow->viewport()->grabGesture(Qt::PinchGesture);
 	QCoreApplication::instance()->installEventFilter(this);
-if(!mCoverFlow){
+if( !mCoverFlow ) {
 loadWidgets();  //retrives the widgets
 }
 //Loads the widgets corresponding to the orientation.
 loadViewSection();
+setStatusBarVisible(FALSE);
+setTitleBarVisible(FALSE);
 mUiOffTimer = new QTimer();
 mUiOff = true;
 mUiOffTimer->stop();
 mCoverFlow->setUiOn(FALSE);
 if (mTvOutWrapper) {
 delete mTvOutWrapper;
 mTvOutWrapper = NULL;
 }
 if(mZoomWidget)
 {
 mZoomWidget->cleanUp();
 mZoomWidget = NULL;
 }
 void GlxFullScreenView::activateUI()
 {
 OstTraceFunctionEntry0( GLXFULLSCREENVIEW_ACTIVATEUI_ENTRY );
 if ( mUiOff && getSubState() != FETCHER_S){
-if(!mFullScreenToolBar) {
+if( !mFullScreenToolBar ) {
 loadFullScreenToolBar();
 }
 mUiOff = FALSE;
 QVariant variant = mModel->data( mModel->index(0,0), GlxFocusIndexRole );
 mFullScreenToolBar->show();
 		setStatusBarVisible(TRUE);
 setTitleBarVisible(TRUE);
 if ( mImageStrip && getSubState() != IMAGEVIEWER_S) {
 mImageStrip->show();
 HbEffect::start(mImageStrip, QString("HbGridView"), QString("TapShow"), this, "effectFinished" );
 }
 else if( getSubState() == IMAGEVIEWER_S){
 if ( variant.isValid() &&  variant.canConvert<int> () && ( index.row() == variant.value<int>() ) ) {
 OstTraceFunctionExit0( GLXFULLSCREENVIEW_CHANGESELECTEDINDEX_EXIT );
 if (mTvOutWrapper){
 // for the image changed on deletion
 mTvOutWrapper->setImagetoHDMI();
+}
+if (mZoomWidget){
+// for the image changed on deletion
+mZoomWidget->indexChanged();
 }
 return;
 }
 mModel->setData( index, index.row(), GlxFocusIndexRole );
 if ( mUiOffTimer ) {
 GLX_LOG_INFO("GlxFullScreenView::removeConnection() mUiOffTimer  " );
 disconnect(mUiOffTimer, SIGNAL(timeout()), this, SLOT(hideUi()));
 }
-if(mFlipAction) {
+	if( mCoverFlow && mZoomWidget ) {
-disconnect(mFlipAction, SIGNAL(triggered( )), this, SLOT(handleToolBarAction( )) );
-}
-if(mSendAction) {
-disconnect(mSendAction, SIGNAL(triggered( )), this, SLOT(handleToolBarAction( )) );
-}
-if(mDeleteAction) {
-disconnect(mDeleteAction, SIGNAL(triggered( )), this, SLOT(handleToolBarAction( )) );
-}
-if(mUseImageAction) {
-disconnect(mUseImageAction, SIGNAL(triggered( )), this, SLOT(handleToolBarAction( )) );
-}
-	if(mCoverFlow && mZoomWidget) {
 		disconnect(mZoomWidget,SIGNAL( pinchGestureReceived(int) ), mCoverFlow, SLOT( zoomStarted(int) ) );
 		disconnect(mZoomWidget,SIGNAL( zoomWidgetMovedBackground(int) ), mCoverFlow, SLOT( zoomFinished(int) ) );
 	}
 	disconnect(mWindow, SIGNAL(orientationChanged(Qt::Orientation)), this, SLOT(orientationChanged(Qt::Orientation)));
 OstTraceFunctionExit0( GLXFULLSCREENVIEW_HANDLETOOLBARACTION_EXIT );
 }
 int GlxFullScreenView::getSubState()
 {
 	int substate = NO_FULLSCREEN_S;
-	QVariant variant = mModel->data( mModel->index(0,0), GlxSubStateRole );
-	if ( variant.isValid() &&  variant.canConvert<int> ()  ) {
+	if ( mModel  ) {
-		substate = variant.value<int>();
+QVariant variant = mModel->data( mModel->index(0,0), GlxSubStateRole );
+if ( variant.isValid() &&  variant.canConvert<int> ()  ) {
+substate = variant.value<int>();
+}
 	}
 	return substate;
 }
 bool GlxFullScreenView::eventFilter(QObject *obj, QEvent *ev)

changeset 45	863223ea6961
parent 44	aa2fa096cbfb
child 50	a0f57508af73
child 55	fb37077c270f