--- a/ui/viewutilities/effectengine/src/glxeffectengine.cpp Mon Sep 20 12:39:08 2010 +0530
+++ b/ui/viewutilities/effectengine/src/glxeffectengine.cpp Mon Sep 27 15:13:20 2010 +0530
@@ -30,20 +30,20 @@
mTransitionEffect( NO_EFFECT ),
mEffectResolver( NULL )
{
- qDebug("GlxSlideShowEffectEngine::GlxSlideShowEffectEngine()");
+ qDebug( "GlxSlideShowEffectEngine::GlxSlideShowEffectEngine()" );
mTransitionEffectList.clear();
}
GlxEffectEngine::~GlxEffectEngine()
{
- qDebug("GlxSlideShowEffectEngine::~GlxSlideShowEffectEngine()");
+ qDebug( "GlxSlideShowEffectEngine::~GlxSlideShowEffectEngine()" );
delete mEffectResolver;
mEffectResolver = NULL;
cleanTransitionEfffect();
}
-void GlxEffectEngine::registerEffect(const QString &itemType)
+void GlxEffectEngine::registerEffect( const QString &itemType )
{
GlxSettingInterface *settingObj = GlxSettingInterface::instance(); // NO ownership
if ( mEffectResolver == NULL ) {
@@ -54,56 +54,56 @@
QList <QString > effectPathList = mEffectPlugin->effectFileList();
- qDebug("GlxSlideShowEffectEngine::registerEffect() item type %s file path %s", itemType.utf16(), effectPathList[0].utf16());
+ qDebug( "GlxSlideShowEffectEngine::registerEffect() item type %s file path %s", itemType.utf16(), effectPathList[0].utf16() );
for ( int i = 0; i < effectPathList.count() ; ++i ) {
- HbEffect::add(itemType, effectPathList.at(i), QString( "Click%1" ).arg(i));
+ HbEffect::add( itemType, effectPathList.at( i ), QString( "Click%1" ).arg( i ) );
}
}
-void GlxEffectEngine::deRegisterEffect(const QString &itemType)
+void GlxEffectEngine::deRegisterEffect( const QString &itemType )
{
- qDebug("GlxSlideShowEffectEngine::deRegisterEffect() item type %s", itemType.utf16());
+ qDebug( "GlxSlideShowEffectEngine::deRegisterEffect() item type %s", itemType.utf16() );
QList <QString > effectPathList = mEffectPlugin->effectFileList();
for ( int i = 0; i < effectPathList.count() ; ++i ) {
- HbEffect::remove(itemType, effectPathList.at(i), QString( "Click%1" ).arg(i));
+ HbEffect::remove( itemType, effectPathList.at( i ), QString( "Click%1" ).arg( i ) );
}
mEffectPlugin = NULL;
}
void GlxEffectEngine::registerTransitionEffect()
{
- qDebug("GlxSlideShowEffectEngine::registerTransitionEffect()");
+ qDebug( "GlxSlideShowEffectEngine::registerTransitionEffect()" );
initTransitionEffect();
}
void GlxEffectEngine::deregistertransitionEffect()
{
- qDebug("GlxSlideShowEffectEngine::deregisterTransitionEffect()");
+ qDebug( "GlxSlideShowEffectEngine::deregisterTransitionEffect()" );
cleanTransitionEfffect();
}
-void GlxEffectEngine::runEffect(QGraphicsItem * item, const QString & itemType )
+void GlxEffectEngine::runEffect( QGraphicsItem * item, const QString & itemType )
{
- qDebug("GlxSlideShowEffectEngine::runEffect()1 item type %s", itemType.utf16());
- HbEffect::start(item, itemType, QString( "Click1" ), this, "slideShowEffectFinished");
+ qDebug( "GlxSlideShowEffectEngine::runEffect()1 item type %s", itemType.utf16() );
+ HbEffect::start( item, itemType, QString( "Click1" ), this, "slideShowEffectFinished" );
++mNbrEffectRunning;
}
-void GlxEffectEngine::runEffect(QList< QGraphicsItem * > & items, const QString & itemType )
+void GlxEffectEngine::runEffect( QList< QGraphicsItem * > & items, const QString & itemType )
{
- qDebug("GlxSlideShowEffectEngine::runEffect()2 item Type %s", itemType.utf16());
+ qDebug( "GlxSlideShowEffectEngine::runEffect()2 item Type %s", itemType.utf16() );
mEffectPlugin->setUpItems(items);
for ( int i = 0; i < items.count() ; ++i ) {
- if ( mEffectPlugin->isAnimationLater(i) == FALSE ) {
- HbEffect::start(items.at(i), itemType, QString( "Click%1").arg(i), this, "slideShowEffectFinished");
+ if ( mEffectPlugin->isAnimationLater( i ) == FALSE ) {
+ HbEffect::start( items.at( i ), itemType, QString( "Click%1" ).arg( i ), this, "slideShowEffectFinished" );
}
++mNbrEffectRunning;
}
}
-void GlxEffectEngine::runEffect(QList< QGraphicsItem * > & items, GlxEffect transitionEffect)
+void GlxEffectEngine::runEffect( QList< QGraphicsItem * > & items, GlxEffect transitionEffect )
{
- qDebug("GlxSlideShowEffectEngine::runEffect()3 effect type %d ", transitionEffect);
+ qDebug( "GlxSlideShowEffectEngine::runEffect()3 effect type %d ", transitionEffect );
GlxTransitionEffectSetting *effectSetting = mTransitionEffectList.value( transitionEffect );
@@ -116,32 +116,32 @@
++mNbrEffectRunning;
if ( ( i == effectSetting->count() -1) && effectSetting->isTransitionLater() )
{
- effectSetting->setAnimationItem( items.at(i) );
- items.at(i)->hide();
+ effectSetting->setAnimationItem( items.at( i ) );
+ items.at( i )->hide();
}
else {
- HbEffect::start(items.at(i), effectSetting->itemType().at(i), effectSetting->eventType().at(i), this, "transitionEffectFinished");
+ HbEffect::start( items.at( i ), effectSetting->itemType().at( i ), effectSetting->eventType().at( i ), this, "transitionEffectFinished" );
}
}
}
-void GlxEffectEngine::cancelEffect(QGraphicsItem * item)
+void GlxEffectEngine::cancelEffect( QGraphicsItem * item )
{
if ( HbEffect::effectRunning( item, QString( "Click1" ) ) ) {
HbEffect::cancel( item, QString( "Click1" ) );
}
}
-void GlxEffectEngine::cancelEffect(const QList< QGraphicsItem * > & items)
+void GlxEffectEngine::cancelEffect( const QList< QGraphicsItem * > & items )
{
for ( int i = 0; i < items.count() ; ++i ) {
- if ( HbEffect::effectRunning( items.at(i), QString( "Click%1").arg(i) ) ) {
- HbEffect::cancel( items.at(i), QString( "Click%1").arg(i) );
+ if ( HbEffect::effectRunning( items.at( i ), QString( "Click%1" ).arg( i ) ) ) {
+ HbEffect::cancel( items.at( i ), QString( "Click%1" ).arg( i ) );
}
}
}
-void GlxEffectEngine::cancelEffect(QList< QGraphicsItem * > & items, GlxEffect transitionEffect)
+void GlxEffectEngine::cancelEffect( QList< QGraphicsItem * > & items, GlxEffect transitionEffect )
{
GlxTransitionEffectSetting *effectSetting = mTransitionEffectList.value( transitionEffect );
@@ -150,11 +150,11 @@
}
for ( int i = 0; i < effectSetting->count() ; ++i) {
- HbEffect::cancel(items.at(i), effectSetting->eventType().at(i) );
+ HbEffect::cancel(items.at( i ), effectSetting->eventType().at( i ) );
}
}
-bool GlxEffectEngine::isEffectRuning(QGraphicsItem * item)
+bool GlxEffectEngine::isEffectRuning( QGraphicsItem * item )
{
if ( HbEffect::effectRunning( item, QString( "Click1" ) ) ) {
return true;
@@ -162,10 +162,10 @@
return false;
}
-bool GlxEffectEngine::isEffectRuning(const QList< QGraphicsItem * > & items)
+bool GlxEffectEngine::isEffectRuning( const QList< QGraphicsItem * > & items )
{
for ( int i = 0; i < items.count() ; ++i ) {
- if ( HbEffect::effectRunning( items.at(i), QString( "Click%1").arg(i) ) ) {
+ if ( HbEffect::effectRunning( items.at( i ), QString( "Click%1" ).arg( i ) ) ) {
return true;
}
}
@@ -175,12 +175,12 @@
void GlxEffectEngine::slideShowEffectFinished( const HbEffect::EffectStatus &status )
{
Q_UNUSED( status )
- qDebug("GlxSlideShowEffectEngine::slideShowEffectFinished() number of effect %d ", mNbrEffectRunning);
+ qDebug( "GlxSlideShowEffectEngine::slideShowEffectFinished() number of effect %d ", mNbrEffectRunning);
--mNbrEffectRunning;
if ( mEffectPlugin->isAnimationLater( mNbrEffectRunning) ) {
- HbEffect::start( mEffectPlugin->animationItem(), mEffectPlugin->ItemType(), QString( "Click%1").arg(mNbrEffectRunning), this, "slideShowEffectFinished");
+ HbEffect::start( mEffectPlugin->animationItem(), mEffectPlugin->ItemType(), QString( "Click%1" ).arg(mNbrEffectRunning), this, "slideShowEffectFinished" );
}
if (mNbrEffectRunning == 0) {
@@ -191,14 +191,14 @@
void GlxEffectEngine::transitionEffectFinished( const HbEffect::EffectStatus &status )
{
Q_UNUSED( status )
- qDebug("GlxSlideShowEffectEngine::transitionEffectFinished() number of effect %d status %d", mNbrEffectRunning, status.reason);
+ qDebug( "GlxSlideShowEffectEngine::transitionEffectFinished() number of effect %d status %d", mNbrEffectRunning, status.reason);
--mNbrEffectRunning;
if ( mNbrEffectRunning == 1 ) {
GlxTransitionEffectSetting *effectSetting = mTransitionEffectList.value( mTransitionEffect );
if ( effectSetting->isTransitionLater() ){
effectSetting->animationItem()->show();
- HbEffect::start( effectSetting->animationItem(), effectSetting->itemType().at(1), effectSetting->eventType().at(1), this, "transitionEffectFinished");
+ HbEffect::start( effectSetting->animationItem(), effectSetting->itemType().at( 1 ), effectSetting->eventType().at( 1 ), this, "transitionEffectFinished" );
mTransitionEffect = NO_EFFECT;
}
}
@@ -212,46 +212,52 @@
{
GlxTransitionEffectSetting *effectSetting = NULL;
- effectSetting = new GlxTransitionEffectSetting(GRID_TO_FULLSCREEN);
+ effectSetting = new GlxTransitionEffectSetting( GRID_TO_FULLSCREEN );
for ( int i = 0; i < effectSetting->count(); ++i ) {
- HbEffect::add( effectSetting->itemType().at(i), effectSetting->effectFileList().at(i), effectSetting->eventType().at(i)) ;
+ HbEffect::add( effectSetting->itemType().at( i ), effectSetting->effectFileList().at( i ), effectSetting->eventType().at( i ) ) ;
}
- mTransitionEffectList[GRID_TO_FULLSCREEN] = effectSetting;
+ mTransitionEffectList[ GRID_TO_FULLSCREEN ] = effectSetting;
effectSetting = new GlxTransitionEffectSetting( FULLSCREEN_TO_GRID );
for ( int i = 0; i < effectSetting->count(); ++i ) {
- HbEffect::add( effectSetting->itemType().at(i), effectSetting->effectFileList().at(i), effectSetting->eventType().at(i)) ;
+ HbEffect::add( effectSetting->itemType().at( i ), effectSetting->effectFileList().at( i ), effectSetting->eventType().at( i ) ) ;
}
- mTransitionEffectList[FULLSCREEN_TO_GRID] = effectSetting;
+ mTransitionEffectList[ FULLSCREEN_TO_GRID ] = effectSetting;
+
+ effectSetting = new GlxTransitionEffectSetting( FULLSCREEN_TO_GRID_PORTRAIT );
+ for ( int i = 0; i < effectSetting->count(); ++i ) {
+ HbEffect::add( effectSetting->itemType().at( i ), effectSetting->effectFileList().at( i ), effectSetting->eventType().at( i ) ) ;
+ }
+ mTransitionEffectList[ FULLSCREEN_TO_GRID_PORTRAIT ] = effectSetting;
effectSetting = new GlxTransitionEffectSetting( GRID_TO_ALBUMLIST );
for ( int i = 0; i < effectSetting->count(); ++i ) {
- HbEffect::add( effectSetting->itemType().at(i), effectSetting->effectFileList().at(i), effectSetting->eventType().at(i)) ;
+ HbEffect::add( effectSetting->itemType().at( i ), effectSetting->effectFileList().at( i ), effectSetting->eventType().at( i ) ) ;
}
- mTransitionEffectList[GRID_TO_ALBUMLIST] = effectSetting;
+ mTransitionEffectList[ GRID_TO_ALBUMLIST ] = effectSetting;
effectSetting = new GlxTransitionEffectSetting( ALBUMLIST_TO_GRID );
for ( int i = 0; i < effectSetting->count(); ++i ) {
- HbEffect::add( effectSetting->itemType().at(i), effectSetting->effectFileList().at(i), effectSetting->eventType().at(i)) ;
+ HbEffect::add( effectSetting->itemType().at( i ), effectSetting->effectFileList().at( i ), effectSetting->eventType().at( i ) ) ;
}
- mTransitionEffectList[ALBUMLIST_TO_GRID] = effectSetting;
+ mTransitionEffectList[ ALBUMLIST_TO_GRID ] = effectSetting;
effectSetting = new GlxTransitionEffectSetting( FULLSCREEN_TO_DETAIL );
for ( int i = 0; i < effectSetting->count(); ++i ) {
- HbEffect::add( effectSetting->itemType().at(i), effectSetting->effectFileList().at(i), effectSetting->eventType().at(i)) ;
+ HbEffect::add( effectSetting->itemType().at( i ), effectSetting->effectFileList().at( i ), effectSetting->eventType().at( i ) ) ;
}
- mTransitionEffectList[FULLSCREEN_TO_DETAIL] = effectSetting;
+ mTransitionEffectList[ FULLSCREEN_TO_DETAIL ] = effectSetting;
effectSetting = new GlxTransitionEffectSetting( DETAIL_TO_FULLSCREEN );
for ( int i = 0; i < effectSetting->count(); ++i ) {
- HbEffect::add( effectSetting->itemType().at(i), effectSetting->effectFileList().at(i), effectSetting->eventType().at(i)) ;
+ HbEffect::add( effectSetting->itemType().at( i ), effectSetting->effectFileList().at( i ), effectSetting->eventType().at( i ) ) ;
}
- mTransitionEffectList[DETAIL_TO_FULLSCREEN] = effectSetting;
+ mTransitionEffectList[ DETAIL_TO_FULLSCREEN ] = effectSetting;
}
void GlxEffectEngine::cleanTransitionEfffect()
{
- qDebug("GlxSlideShowEffectEngine::cleanTrnastionEfffect()");
+ qDebug( "GlxSlideShowEffectEngine::cleanTrnastionEfffect()" );
QHashIterator<GlxEffect, GlxTransitionEffectSetting *> iter( mTransitionEffectList );
@@ -259,7 +265,7 @@
iter.next();
GlxTransitionEffectSetting *list = iter.value();
for ( int i = 0; i < list->count(); ++i ) {
- HbEffect::remove( list->itemType().at(i), list->effectFileList().at(i), list->eventType().at(i)) ;
+ HbEffect::remove( list->itemType().at( i ), list->effectFileList().at( i ), list->eventType().at( i ) ) ;
}
delete list;
}