FCL/sf/app/photos: comparison ui/viewmanagement/viewmanager/src/glxviewmanager.cpp

equal deleted inserted replaced

-:a3a4c0de738e
+:0f0f3f26f787
 #include <hbprogressdialog.h>
 #include <QItemSelectionModel>
 #include <glxmainwindoweventfilter.h>
 #include <xqsettingsmanager.h>
 #include <xqsettingskey.h>
+#include <glxviewids.h>
+#include "glxmodelroles.h"
 GlxViewManager::GlxViewManager()
 : mBackAction( NULL ),
 mMenuManager( NULL ),
 mEffectEngine( NULL ),
 mMarkingToolBar( NULL ),
 mSelectionModel ( NULL ),
 mProgressDialog( NULL )
 {
 qDebug("GlxViewManager::GlxViewManager() ");
-PERFORMANCE_ADV ( viewMgrD1, "main window creation time" ) {
 //check the case when application launch through some other application (view plugin)
 mMainWindow = GlxExternalUtility::instance()->getMainWindow();
 if(mMainWindow == NULL)	{
 mMainWindow = new HbMainWindow();
-connect(mMainWindow, SIGNAL( viewReady() ), this, SLOT( handleReadyView() ));
+}
-}
+connect(mMainWindow, SIGNAL( viewReady() ), this, SLOT( handleReadyView() ));
-		//Without this Zoom Does not work
+//Without this Zoom Does not work
-		mWindowEventFilter = new GlxMainWindowEventFilter;
+mWindowEventFilter = new GlxMainWindowEventFilter;
-		mMainWindow->scene()->installEventFilter(mWindowEventFilter);
+mMainWindow->scene()->installEventFilter(mWindowEventFilter);
-		mMainWindow->viewport()->setAttribute(Qt::WA_AcceptTouchEvents);
+mMainWindow->viewport()->setAttribute(Qt::WA_AcceptTouchEvents);
-		mMainWindow->viewport()->grabGesture(Qt::PinchGesture);
+mMainWindow->viewport()->grabGesture(Qt::PinchGesture);
-}
 HbStyleLoader::registerFilePath(":/data/photos.css");
 }
 void GlxViewManager::handleReadyView()
 {
 emit actionTriggered( EGlxCmdSetupItem );
 emit applicationReady();
 disconnect(mMainWindow, SIGNAL( viewReady() ), this, SLOT( handleReadyView() ));
 }
 void GlxViewManager::setupItems( )
 {
-mMenuManager = new GlxMenuManager(mMainWindow);
 addBackSoftKeyAction();
 addConnection();
-mMenuManager->addMenu( mView->viewId(), mView->menu() );
+}
+void GlxViewManager::launchApplication(qint32 id, QAbstractItemModel *model)
+{
+mModel = model;
+mMenuManager = new GlxMenuManager( mMainWindow );  //menu manager should be created before view.
 mMenuManager->setModel( mModel );
-}
+mView = resolveView( id );
-void GlxViewManager::launchApplication(qint32 id, QAbstractItemModel *model)
-{
-mModel = model;
-PERFORMANCE_ADV ( viewMgrD1, "View Creation time" ) {
-mView = resolveView(id);
-}
 createToolBar();
-mView->addToolBar(mViewToolBar);
 /* We are showing the toolBar before activating the
 * view. This is done to avoid the animation effect seen otherwise
 * when the tool bar comes up.
 *
 * since we are creating a new tool bar..although a fake tool bar was
 * already created on the splashscreen
 *
 */
 mView->activate();
+mView->setModel( mModel );
-PERFORMANCE_ADV ( viewMgrD3, "Set Model time")
+//visibility of tool bar dependes of view internal state so add the toolbar after setting model
-mView->setModel(mModel);
+mView->addToolBar( mViewToolBar );
+mMainWindow->setCurrentView( mView, false );
-PERFORMANCE_ADV( viewMgrD4, "View Display time") {
+mMainWindow->showFullScreen();
-mMainWindow->setCurrentView(mView, false);
-mMainWindow->showFullScreen();
-}
 }
 void GlxViewManager::handleMenuAction(qint32 commandId)
 {
 emit actionTriggered(commandId);
 }
 void GlxViewManager::handleAction()
 {
 HbAction *action = qobject_cast<HbAction*>(sender());
+action->setChecked( TRUE );
 qint32 commandId = action->data().toInt();
 emit actionTriggered(commandId);
 }
 void GlxViewManager::addBackSoftKeyAction ( )
 Qt::Orientation GlxViewManager::orientation() const
 {
 return mMainWindow->orientation();
 }
-void GlxViewManager::launchView(qint32 id, QAbstractItemModel *model)
+void GlxViewManager::launchView( qint32 id, QAbstractItemModel *model )
 {
-qDebug("GlxViewManager::launchView Id = %d ", id);
+qDebug( "GlxViewManager::launchView Id = %d ", id );
 mModel = model;
 deActivateView();
+mMenuManager->setModel( mModel ); //set the model to get the item type info and row count info
-PERFORMANCE_ADV ( viewMgrD1, "View Creation time" ) {
+mView = resolveView( id );
-mView = resolveView(id);
-}
 activateView();
 }
 void GlxViewManager::launchView (qint32 id, QAbstractItemModel *model, GlxEffect effect, GlxViewEffect viewEffect)
 {
 itemList.clear();
 //partially clean the view so that animation run smoothly
 GlxView *curr_view = (GlxView *) mMainWindow->currentView();
 curr_view->resetView();
+mMenuManager->setModel( model ); //set the model to get the item type info and row count info
 mView = resolveView(id);
 //partially initialise the view so that animation run smoothly
 mView->initializeView( model, curr_view );
 mModel = model;
 item->show();
 itemList.append(item);
 }
 }
+if ( effect == GRID_TO_FULLSCREEN ) {
+mViewToolBar->setZValue( item->zValue() - 5 );
+}
 //error check
 if ( itemList.count() > 0 ) {
 mEffectEngine->runEffect(itemList, effect);
 mMainWindow->grabMouse();
 }
 User::ResetInactivityTime();
 //To:Do temp code remove later
 if ( mProgressDialog ) {
 i = ++i % 10;
-icon = HbIcon( QString( ":/data/wait/qgn_graf_ring_wait_%1.svg" ).arg( i + 1, 2, 10, QChar( '0' ) ) );
+icon = HbIcon( QString( ":/data/Wait/qgn_graf_ring_wait_%1.svg" ).arg( i + 1, 2, 10, QChar( '0' ) ) );
 mProgressDialog->setIcon(icon);
 int max = mProgressDialog->maximum() ;
 if ( currentValue > max ) {
 mProgressDialog->setMaximum( currentValue );
 int toolBarActionId = (int) GLX_ALL_ACTION_ID;
 int count = mActionList.count();
 qDebug("GlxViewManager::updateToolBarIcon() action ID list %d count %d", id, count);
-for ( int i = 0; i < count ; i++ )
+for ( int i = 0; i < count ; i++ ) {
-{
 qDebug("GlxViewManager::updateToolBarIcon() toolBarActionId %d value %d", toolBarActionId, ( id & toolBarActionId ) );
 //check and get the icon path
-if ( ( id & toolBarActionId ) == toolBarActionId )
+if ( ( id & toolBarActionId ) == toolBarActionId ) {
-{
-mActionList[i]->setCheckable(TRUE);
 mActionList[i]->setChecked(TRUE);
 }
-else
+else {
-{
 mActionList[i]->setChecked(FALSE);
 }
 //to get it the next action id to verify it is selecter or not
 toolBarActionId = toolBarActionId << 1;
 }
 }
 void GlxViewManager::checkMarked()
 {
 qDebug("GlxViewManager::checkMarked");
 if ( mMenuManager ) {
 mMenuManager->setModel( model );
 }
 }
-GlxView * GlxViewManager::resolveView(qint32 id)
+GlxView * GlxViewManager::resolveView( qint32 id )
 {
-qDebug("GlxViewManager::resolveView %d", id);
+qDebug("GlxViewManager::resolveView %d", id );
 GlxView *view = findView ( id );
 if ( view ) {
 return view ;
 }
-view = GlxViewsFactory::createView(id, mMainWindow);
+view = GlxViewsFactory::createView( id, mMainWindow );
 if ( view ) {
-connect ( view, SIGNAL(actionTriggered(qint32 )), this, SLOT(actionProcess(qint32 )), Qt::QueuedConnection );
+connect ( view, SIGNAL( actionTriggered( qint32 ) ), this, SLOT( actionProcess( qint32 ) ), Qt::QueuedConnection );
-connect ( view, SIGNAL(itemSpecificMenuTriggered(qint32,QPointF ) ), this, SLOT( itemSpecificMenuTriggered(qint32,QPointF ) ), Qt::QueuedConnection );
+connect ( view, SIGNAL( itemSpecificMenuTriggered( qint32, QPointF ) ), this, SLOT( itemSpecificMenuTriggered( qint32, QPointF ) ), Qt::QueuedConnection );
-mViewList.append(view);
+mViewList.append( view );
-mMainWindow->addView(view);
+mMainWindow->addView( view );
-if ( mMenuManager ) {
+mMenuManager->addMenu( id, view->menu() );
-mMenuManager->addMenu( id, view->menu());
-}
 if ( mBackAction ) {
 view->setNavigationAction( mBackAction );
 }
 }
 return view;
 }
 void GlxViewManager::activateView()
 {
 qDebug("GlxViewManager::activateView()");
-PERFORMANCE_ADV ( viewMgrD2, "View Activation time") {
+mView->activate();
-mView->addToolBar(mViewToolBar);
+mView->show();
-mView->activate();
+mView->setModel( mModel );
-mView->show();
+//visibility of tool bar dependes of view internal state so add the toolbar after setting model
-mMenuManager->setModel( mModel ); //set the model to get the item type info and row count info
+mView->addToolBar( mViewToolBar );
-}
+mMainWindow->setCurrentView(mView, false);
+mMainWindow->showFullScreen();
-PERFORMANCE_ADV ( viewMgrD3, "Set Model time")
-mView->setModel(mModel);
-PERFORMANCE_ADV( viewMgrD4, "View Display time") {
-mMainWindow->setCurrentView(mView, false);
-mMainWindow->showFullScreen();
-}
 }
 void GlxViewManager::createActions()
 {
 qDebug("GlxViewManager::createActions() " );
 mActionList.clear();
+int curSubstate = getSubState();
 //create the All tool bar button action
 HbAction* allAction = new HbAction( this );
-allAction->setData( EGlxCmdAllGridOpen );
+if( curSubstate == FETCHER_ITEM_S ) {
+allAction->setData( EGlxCmdFetcherAllGridOpen );
+}else{
+allAction->setData( EGlxCmdAllGridOpen );
+}
 mActionList.append( allAction );
 allAction->setIcon( HbIcon( GLXICON_ALL ) ) ;
 allAction->setObjectName( "All Action" );
 //create the Album tool bar button action
 HbAction* albumAction = new HbAction( this );
-albumAction->setData( EGlxCmdAlbumListOpen );
+if( curSubstate == FETCHER_ITEM_S ) {
+albumAction->setData( EGlxCmdFetcherAlbumListOpen );
+}else{
+albumAction->setData( EGlxCmdAlbumListOpen );
+}
 mActionList.append( albumAction );
 albumAction->setIcon( HbIcon( GLXICON_ALBUMS ) ) ;
 albumAction->setObjectName( "Album Action" );
+	//in case of fetcher no need to create other actions
+	if( curSubstate == FETCHER_ITEM_S ) {
+		return;
+		}
 //create the album tool bar button action
 HbAction* cameraAction = new HbAction( this );
 cameraAction->setData( EGlxCmdCameraOpen );
 mActionList.append( cameraAction );
 cameraAction->setIcon( HbIcon( GLXICON_CAMERA ) ) ;
 qDebug("GlxViewManager::createToolBar() clear the action" );
 int count = mActionList.count();
 for ( int i = 0; i < count; i++ ) {
 connect( mActionList.at(i), SIGNAL(triggered( )), this, SLOT(handleAction( )) );
+mActionList.at(i)->setCheckable( TRUE );
 mViewToolBar->addAction( mActionList.at(i) );
 }
 qDebug("GlxViewManager::createToolBar() exit" );
 }
 mEffectEngine->deregistertransitionEffect();
 delete mEffectEngine;
 }
 if( mMainWindow != GlxExternalUtility::instance()->getMainWindow() ){
-qDebug("GlxViewManager::~GlxViewManager remove view");
+qDebug("GlxViewManager::~GlxViewManager delete mainwindow");
 delete mMainWindow;
 }
 delete mWindowEventFilter;
 qDebug("GlxViewManager::~GlxViewManager Exit");
 }
+int GlxViewManager::getSubState()
+{
+int curSubstate = NO_GRID_S;
+if ( mModel  ) {
+QVariant variant = mModel->data( mModel->index(0,0), GlxSubStateRole );
+if ( variant.isValid() &&  variant.canConvert<int> ()  ) {
+curSubstate = variant.value<int>();
+}
+}
+return curSubstate;
+}

changeset 54	0f0f3f26f787
parent 52	a3a4c0de738e
child 58	383b67fbdb11