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

equal deleted inserted replaced

-:d0b4e67b3a60
+:f291796e213d
 #include <QDebug>
 #include <hbstyleloader.h>
 #include <hbprogressdialog.h>
 #include <QItemSelectionModel>
 #include <glxmainwindoweventfilter.h>
+#include <xqsettingsmanager.h>
+#include <xqsettingskey.h>
 GlxViewManager::GlxViewManager()
 : mBackAction( NULL ),
 mMenuManager( NULL ),
 mEffectEngine( NULL ),
 mViewToolBar( NULL ),
 mMarkingToolBar( NULL ),
-mMenu( 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() ));
 }
 		//Without this Zoom Does not work
 		mWindowEventFilter = new GlxMainWindowEventFilter;
 		mMainWindow->scene()->installEventFilter(mWindowEventFilter);
 		mMainWindow->viewport()->setAttribute(Qt::WA_AcceptTouchEvents);
 		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);
 {
 qDebug("GlxViewManager::addBackSoftKeyAction ");
 //create the back soft key action and set the data
 mBackAction = new HbAction(Hb::BackNaviAction, this);
 mBackAction->setData(EGlxCmdBack);
-mView->setNavigationAction(mBackAction);
+mBackAction->setObjectName( "App Back" );
+mView->setNavigationAction( mBackAction );
 }
 Qt::Orientation GlxViewManager::orientation() const
 {
 return mMainWindow->orientation();
 }
 void GlxViewManager::launchProgressDialog( int maxValue )
 {
 if ( maxValue <= 0 ) {
-return;
+// TNM return the some error code ( negative value ) until it populated the count
+		// To show progress dialog 10 is chossen
+	     maxValue = 10;
 }
 if ( mProgressDialog == NULL ) {
 mProgressDialog = new HbProgressDialog( HbProgressDialog::ProgressDialog );
 mProgressDialog->actions().at(0)->disconnect( SIGNAL( triggered() ) );
 connect ( mProgressDialog->actions().at(0), SIGNAL( triggered() ), this, SLOT( hideProgressDialog() ) );
 void GlxViewManager::hideProgressDialog( )
 {
 mMainWindow->lower();
 }
-void GlxViewManager::updateProgressDialog( int currentValue)
+void GlxViewManager::updateProgressDialog( int currentValue )
 {
 static int i = 0;
 HbIcon icon;
 User::ResetInactivityTime();
 int max = mProgressDialog->maximum() ;
 if ( currentValue > max ) {
 mProgressDialog->setMaximum( currentValue );
 max = currentValue ;
 }
-int value = max - currentValue;
-mProgressDialog->setProgressValue( value );
 mProgressDialog->setIcon(icon);
-mProgressDialog->setText( QString( " %1 / %2").arg( value ).arg( max ) );
+if ( currentValue < 0 ) {
+mProgressDialog->setText( QString( "Refreshing" ) ); //To:Do string will change later
+mProgressDialog->setProgressValue( 0 );
+}
+else {
+int value = max - currentValue;
+mProgressDialog->setProgressValue( value );
+mProgressDialog->setText( QString( " %1 " ).arg( currentValue ) );
+}
 }
 }
 //to be called only when the photos plugin was activated by external means
 void GlxViewManager::deactivateCurrentView()
 void GlxViewManager::enterMarkingMode(qint32 viewId)
 {
 GlxView *view = findView ( viewId );
 qDebug("GlxViewManager::enterMarkingMode view ID %d", viewId);
-//In the case of first time create the marking mode menu( Mark All, Un Mark All )
-if( mMenu == NULL ) {
-mMenu = new HbMenu();
-mMenuManager->createMarkingModeMenu(mMenu);
-}
 if ( mMarkingToolBar == NULL) {
 createMarkingModeToolBar(); //Marking mode tool bar is different from normal mode tool bar
 }
 if ( view ) {
 view->enableMarking();
-HbMenu *menu = view->takeMenu(); //Take the owner ship of current menu
-view->setMenu(mMenu); //Set the marking mode menu
-mMenu = menu;
 view->takeToolBar();
 view->addToolBar(mMarkingToolBar);
 mSelectionModel = view->getSelectionModel();
 if(mSelectionModel)
 {
 {
 GlxView *view = findView ( viewId );
 qDebug("GlxViewManager::exitMarkingMode view ID %d", viewId);
 if ( view ) {
 view->disableMarking();
-HbMenu *menu = view->takeMenu(); //Take the owner ship of current menu
-view->setMenu(mMenu); //Set the view menu option
-mMenu = menu;
 view->takeToolBar();
 view->addToolBar(mViewToolBar);
 if(mSelectionModel)
 {
 disconnect(mSelectionModel, SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection& ) ), this, SLOT(checkMarked()));
 mViewList.append(view);
 mMainWindow->addView(view);
 if ( mMenuManager ) {
 mMenuManager->addMenu( id, view->menu());
 }
-view->setNavigationAction(mBackAction);
+if ( mBackAction ) {
+view->setNavigationAction( mBackAction );
+}
 }
 return view;
 }
 void GlxViewManager::itemSpecificMenuTriggered(qint32 viewId,QPointF pos)
 {
 qDebug("GlxViewManager::createActions() " );
 mActionList.clear();
 //create the All tool bar button action
-HbAction* allAction = new HbAction(this);
+HbAction* allAction = new HbAction( this );
-allAction->setData(EGlxCmdAllGridOpen);
+allAction->setData( EGlxCmdAllGridOpen );
-mActionList.append(allAction);
+mActionList.append( allAction );
-allAction->setIcon(HbIcon(GLXICON_ALL)) ;
+allAction->setIcon( HbIcon( GLXICON_ALL ) ) ;
+allAction->setObjectName( "All Action" );
 //create the Album tool bar button action
-HbAction* albumAction = new HbAction(this);
+HbAction* albumAction = new HbAction( this );
-albumAction->setData(EGlxCmdAlbumListOpen);
+albumAction->setData( EGlxCmdAlbumListOpen );
-mActionList.append(albumAction);
+mActionList.append( albumAction );
-albumAction->setIcon(HbIcon(GLXICON_ALBUMS)) ;
+albumAction->setIcon( HbIcon( GLXICON_ALBUMS ) ) ;
+albumAction->setObjectName( "Album Action" );
 //create the album tool bar button action
-HbAction* cameraAction = new HbAction(this);
+HbAction* cameraAction = new HbAction( this );
-cameraAction->setData(EGlxCmdCameraOpen);
+cameraAction->setData( EGlxCmdCameraOpen );
-mActionList.append(cameraAction);
+mActionList.append( cameraAction );
-cameraAction->setIcon(HbIcon(GLXICON_CAMERA)) ;
+cameraAction->setIcon( HbIcon( GLXICON_CAMERA ) ) ;
+cameraAction->setObjectName( "Camera Action" );
-//create the ovi tool bar button action
+//Configure the 4 th Action in the tool bar
-HbAction* oviAction = new HbAction(this);
+XQSettingsManager *ciSettingsManager = NULL;
-oviAction->setData(EGlxCmdOviOpen);
+ciSettingsManager = new XQSettingsManager(this);
-mActionList.append(oviAction);
-oviAction->setIcon(HbIcon(GLXICON_OVI)) ;
+XQSettingsKey* operatorLinkCenrepKey = NULL;
+operatorLinkCenrepKey = new XQSettingsKey(XQSettingsKey::TargetCentralRepository,
+KGlxCi_UidGallery, KGlxOperatorLink);
+QVariant value = ciSettingsManager->readItemValue(*operatorLinkCenrepKey);
+switch(value.toInt()) {
+case KGlxOvi:
+{
+XQSettingsKey* oviCenrepKey = NULL;
+oviCenrepKey = new XQSettingsKey(XQSettingsKey::TargetCentralRepository,
+KGlxCi_UidGallery, KGlxOvi);
+QVariant Ovivalue = ciSettingsManager->readItemValue(*oviCenrepKey, XQSettingsManager::TypeString);
+HbAction* configurableAction = new HbAction(this);
+configurableAction->setData(EGlxCmdOviOpen);
+mActionList.append(configurableAction);
+if ( Ovivalue.isValid() && Ovivalue.canConvert<QString>() ) {
+configurableAction->setIcon( HbIcon( Ovivalue.toString() ) );
+}
+delete oviCenrepKey;
+}
+break;
+default:
+qDebug("GlxViewManager::Configurable Action is empty " );
+break;
+}
+delete operatorLinkCenrepKey;
+delete ciSettingsManager;
 }
 void GlxViewManager::createMarkingModeActions()
 {
 mMarkingActionList.clear();
 //create the ok tool bar button action
 HbAction* selectAction = new HbAction(GLX_BUTTON_OK, this);
 selectAction->setData(EGlxCmdSelect);
+selectAction->setObjectName( "Select Action" );
 mMarkingActionList.append(selectAction);
 connect( selectAction, SIGNAL(triggered( )), this, SLOT(handleAction( )), Qt::QueuedConnection );
 mMarkingToolBar->addAction( selectAction );
 //create the cancel tool bar button action
 HbAction* cancelAction = new HbAction(GLX_BUTTON_CANCEL, this);
 cancelAction->setData(EGlxCmdCancel);
+cancelAction->setObjectName( "Cancel Action" );
 mMarkingActionList.append(cancelAction);
 connect( cancelAction, SIGNAL(triggered( )), this, SLOT(handleAction( )), Qt::QueuedConnection );
 mMarkingToolBar->addAction( cancelAction );
 }
 {
 qDebug("GlxViewManager::~GlxViewManager");
 HbStyleLoader::unregisterFilePath(":/data/photos.css");
 removeConnection();
 delete mMenuManager;
 qDebug("GlxViewManager::~GlxViewManager deleted menu manager");
+delete mViewToolBar;
+delete mMarkingToolBar;
+qDebug("GlxViewManager::~GlxViewManager deleted toolbar");
 while( mViewList.isEmpty( ) == FALSE){
 delete mViewList.takeLast() ;
 }
 qDebug("GlxViewManager::~GlxViewManager view deleted");
 delete mBackAction;
-delete mViewToolBar;
-delete mMarkingToolBar;
-delete mMenu;
 delete mProgressDialog;
 if ( mEffectEngine ) {
 mEffectEngine->deregistertransitionEffect();
 delete mEffectEngine;
 }

changeset 49	f291796e213d
parent 48	d0b4e67b3a60
child 50	a0f57508af73
child 55	fb37077c270f