equal
deleted
inserted
replaced
698 group->addAnimation(animationNewSlide); |
698 group->addAnimation(animationNewSlide); |
699 #ifdef false |
699 #ifdef false |
700 group->addAnimation(animationOldOpacity); |
700 group->addAnimation(animationOldOpacity); |
701 group->addAnimation(animationNewOpacity); |
701 group->addAnimation(animationNewOpacity); |
702 #endif |
702 #endif |
|
703 |
|
704 connect(animationOldSlide, SIGNAL(finished()), ui.Pages->widget(lastid), SLOT(hide())); |
703 group->start(); |
705 group->start(); |
704 |
706 |
705 connect(animationOldSlide, SIGNAL(finished()), ui.Pages->widget(lastid), SLOT(hide())); |
|
706 /* this is for the situation when the animation below is interrupted by a new animation. For some reason, finished is not being fired */ |
707 /* this is for the situation when the animation below is interrupted by a new animation. For some reason, finished is not being fired */ |
707 for(int i=0;i<MAX_PAGE;i++) if (i!=id && i!=lastid) ui.Pages->widget(i)->hide(); |
708 for(int i=0;i<MAX_PAGE;i++) if (i!=id && i!=lastid) ui.Pages->widget(i)->hide(); |
708 } |
709 } |
709 #endif |
710 #endif |
710 } |
711 } |
811 group->addAnimation(animationNewSlide); |
812 group->addAnimation(animationNewSlide); |
812 #ifdef false |
813 #ifdef false |
813 group->addAnimation(animationOldOpacity); |
814 group->addAnimation(animationOldOpacity); |
814 group->addAnimation(animationNewOpacity); |
815 group->addAnimation(animationNewOpacity); |
815 #endif |
816 #endif |
|
817 |
|
818 connect(animationNewSlide, SIGNAL(finished()), ui.Pages->widget(curid), SLOT(hide())); |
816 group->start(); |
819 group->start(); |
817 |
820 } |
818 connect(animationNewSlide, SIGNAL(finished()), ui.Pages->widget(curid), SLOT(hide())); |
821 #endif |
819 } |
822 |
820 #endif |
823 if (stopAnim) |
|
824 ui.Pages->widget(curid)->hide(); |
|
825 |
|
826 // TODO the whole pages shown and effects stuff should be moved |
|
827 // out of hwform.cpp and into a subclass of QStackedLayout |
|
828 |
821 } |
829 } |
822 |
830 |
823 void HWForm::OpenSnapshotFolder() |
831 void HWForm::OpenSnapshotFolder() |
824 { |
832 { |
825 QString path = QDir::toNativeSeparators(cfgdir->absolutePath() + "/Screenshots"); |
833 QString path = QDir::toNativeSeparators(cfgdir->absolutePath() + "/Screenshots"); |