diff -r 45459746d5e8 -r 27f2d7aec52a ui/viewmanagement/viewmanager/src/glxviewmanager.cpp --- a/ui/viewmanagement/viewmanager/src/glxviewmanager.cpp Mon Sep 27 15:13:20 2010 +0530 +++ b/ui/viewmanagement/viewmanager/src/glxviewmanager.cpp Wed Oct 06 14:49:39 2010 +0530 @@ -313,15 +313,17 @@ } } -void GlxViewManager::enterMarkingMode(qint32 viewId) +void GlxViewManager::enterMarkingMode( qint32 viewId, qint32 commandId ) { GlxView *view = findView ( viewId ); qDebug("GlxViewManager::enterMarkingMode view ID %d", viewId); - if ( mMarkingToolBar == NULL) { + if ( !mMarkingToolBar ) { createMarkingModeToolBar(); //Marking mode tool bar is different from normal mode tool bar } + setMarkingToolBarAction( commandId ); + if ( view ) { view->enableMarking(); view->takeToolBar(); @@ -336,7 +338,7 @@ qDebug("GlxViewManager::enterMarkingMode view ID %d exit", viewId); } -void GlxViewManager::exitMarkingMode(qint32 viewId) +void GlxViewManager::exitMarkingMode( qint32 viewId ) { GlxView *view = findView ( viewId ); qDebug("GlxViewManager::exitMarkingMode view ID %d", viewId); @@ -597,6 +599,31 @@ createMarkingModeActions(); } +void GlxViewManager::setMarkingToolBarAction( qint32 commandId ) +{ + switch( commandId ) { + case EGlxCmdAddToAlbum : + mMarkingActionList.at( 0 )->setText( GLX_BUTTON_ADD ); + break; + + case EGlxCmdDelete : + mMarkingActionList.at( 0 )->setText( GLX_BUTTON_DELETE ); + break; + + case EGlxCmdRemoveFrom : + mMarkingActionList.at( 0 )->setText( GLX_BUTTON_REMOVE ); + break; + + case EGlxCmdSend : + mMarkingActionList.at( 0 )->setText( GLX_BUTTON_SHARE ); + break; + + default : + mMarkingActionList.at( 0 )->setText( GLX_BUTTON_OK ); + break; + } +} + void GlxViewManager::addConnection() { if ( mMenuManager )