equal
deleted
inserted
replaced
74 mSettingsManager->writeItemValue(*mTransitionDelayCenrepKey, index); |
74 mSettingsManager->writeItemValue(*mTransitionDelayCenrepKey, index); |
75 } |
75 } |
76 QStringList GlxSlideShowSetting::slideShowEffectList() |
76 QStringList GlxSlideShowSetting::slideShowEffectList() |
77 { |
77 { |
78 if(mSettingsManager->readItemValue(*mWaveEffectCenRepKey).toInt() == WAVE_EFFECT) |
78 if(mSettingsManager->readItemValue(*mWaveEffectCenRepKey).toInt() == WAVE_EFFECT) |
79 mEffectList<<"wave"; |
79 mEffectList<<"Flip"; |
80 if(mSettingsManager->readItemValue(*mFadeEffectCenRepKey).toInt() == SMOOTH_FADE) |
80 if(mSettingsManager->readItemValue(*mFadeEffectCenRepKey).toInt() == SMOOTH_FADE) |
81 mEffectList<<"Fade"; |
81 mEffectList<<"Fade"; |
82 if(mSettingsManager->readItemValue(*mZoomEffectCenRepKey).toInt() == ZOOM_TO_FACE) |
82 if(mSettingsManager->readItemValue(*mZoomEffectCenRepKey).toInt() == ZOOM_TO_FACE) |
83 mEffectList<<"Zoom to face"; |
83 mEffectList<<"Zoom to face"; |
84 return mEffectList; |
84 return mEffectList; |
88 QVariant effectvalue = mSettingsManager->readItemValue(*mTransitionEffectCenrepKey); |
88 QVariant effectvalue = mSettingsManager->readItemValue(*mTransitionEffectCenrepKey); |
89 return effectvalue.toInt(); |
89 return effectvalue.toInt(); |
90 } |
90 } |
91 void GlxSlideShowSetting::setslideShowEffectIndex( int index ) |
91 void GlxSlideShowSetting::setslideShowEffectIndex( int index ) |
92 { |
92 { |
|
93 mEffect = ( GlxEffect ) ( index + 1 ) ; |
93 mSettingsManager->writeItemValue(*mTransitionEffectCenrepKey, index); |
94 mSettingsManager->writeItemValue(*mTransitionEffectCenrepKey, index); |
94 } |
95 } |
95 void GlxSlideShowSetting::readSlideShowSetting() |
96 void GlxSlideShowSetting::readSlideShowSetting() |
96 { |
97 { |
97 //To:Do read from the file system |
98 //To:Do read from the file system |
108 break; |
109 break; |
109 default: |
110 default: |
110 mSlideDelayTime = 3000; |
111 mSlideDelayTime = 3000; |
111 break; |
112 break; |
112 } |
113 } |
113 mEffect = FADE_EFFECT; |
114 mEffect = ( GlxEffect ) ( mSettingsManager->readItemValue(*mTransitionEffectCenrepKey).toInt() + 1 ) ; |
114 mMoveDir = MOVE_FORWARD; |
115 mMoveDir = MOVE_FORWARD; |
115 qDebug("GlxSlideShowSetting::readSlideShowSetting() slide delay time %d effect %d move direction %d", mSlideDelayTime, mEffect, mMoveDir); |
116 qDebug("GlxSlideShowSetting::readSlideShowSetting() slide delay time %d effect %d move direction %d", mSlideDelayTime, mEffect, mMoveDir); |
116 } |
117 } |
117 |
118 |
118 |
119 |
385 |
386 |
386 delete mEffectPlugin; |
387 delete mEffectPlugin; |
387 mEffectPlugin = NULL; |
388 mEffectPlugin = NULL; |
388 |
389 |
389 switch ( mSlideShowSetting.effect() ) { |
390 switch ( mSlideShowSetting.effect() ) { |
390 case TRANSITION_EFFECT : |
391 case WAVE_EFFECT : |
|
392 mEffectPlugin = new GlxForwardTransitionPlugin(); |
|
393 break ; |
|
394 |
|
395 /*case TRANSITION_EFFECT : |
391 if ( slideShowMoveDir() == MOVE_FORWARD ) { |
396 if ( slideShowMoveDir() == MOVE_FORWARD ) { |
392 mEffectPlugin = new GlxForwardTransitionPlugin(); |
397 mEffectPlugin = new GlxForwardTransitionPlugin(); |
393 } |
398 } |
394 else { |
399 else { |
395 mEffectPlugin = new GlxBackwardTransitionPlugin(); |
400 mEffectPlugin = new GlxBackwardTransitionPlugin(); |
396 } |
401 } |
397 break; |
402 break;*/ |
398 |
403 |
399 case FADE_EFFECT : |
404 case SMOOTH_FADE : |
400 mEffectPlugin = new GlxFadePlugin(); |
405 mEffectPlugin = new GlxFadePlugin(); |
401 break; |
406 break; |
402 |
407 |
403 default : |
408 default : |
|
409 mEffectPlugin = new GlxFadePlugin(); |
404 break; |
410 break; |
405 } |
411 } |
406 } |
412 } |
407 |
413 |
408 void GlxSlideShowEffectEngine::initTransitionEffect() |
414 void GlxSlideShowEffectEngine::initTransitionEffect() |