# HG changeset patch # User nemo # Date 1322326873 18000 # Node ID e6e409d9d6dba72265c3c9631daa055428007217 # Parent 9e5a3b2a3c3840721f959ebc9c9e768169d8e6fd ffs diff -r 9e5a3b2a3c38 -r e6e409d9d6db QTfrontend/hwform.cpp --- a/QTfrontend/hwform.cpp Sat Nov 26 17:47:55 2011 +0100 +++ b/QTfrontend/hwform.cpp Sat Nov 26 12:01:13 2011 -0500 @@ -562,7 +562,7 @@ { /**Start animation :**/ int coeff = 1; -#ifdef Q_OS_LINUX +#ifndef Q_OS_OSX coeff = 2; QGraphicsOpacityEffect *effectNew = new QGraphicsOpacityEffect(ui.Pages->widget(id)); ui.Pages->widget(id)->setGraphicsEffect(effectNew); @@ -578,7 +578,7 @@ animationNewSlide->setEndValue(QPoint(0, 0)); animationNewSlide->setEasingCurve(QEasingCurve::OutExpo); -#ifdef Q_OS_LINUX +#ifndef Q_OS_OSX animationNewOpacity = new QPropertyAnimation(effectNew, "opacity"); animationNewOpacity->setDuration(500); animationNewOpacity->setStartValue(0.01); @@ -595,7 +595,7 @@ animationOldSlide->setEndValue(QPoint(-width()/coeff, 0)); animationOldSlide->setEasingCurve(QEasingCurve::OutExpo); -#ifdef Q_OS_LINUX +#ifndef Q_OS_OSX animationOldOpacity = new QPropertyAnimation(effectLast, "opacity"); animationOldOpacity->setDuration(500); animationOldOpacity->setStartValue(1); @@ -606,7 +606,7 @@ QParallelAnimationGroup *group = new QParallelAnimationGroup; group->addAnimation(animationOldSlide); group->addAnimation(animationNewSlide); -#ifdef Q_OS_LINUX +#ifndef Q_OS_OSX group->addAnimation(animationOldOpacity); group->addAnimation(animationNewOpacity); #endif @@ -668,7 +668,7 @@ if (curid != 0 && frontendEffects && !stopAnim) { int coeff = 1; -#ifdef Q_OS_LINUX +#ifndef Q_OS_OSX coeff = 2; QGraphicsOpacityEffect *effectNew = new QGraphicsOpacityEffect(ui.Pages->widget(id)); effectNew->setOpacity(1); @@ -685,7 +685,7 @@ animationOldSlide->setEndValue(QPoint(0, 0)); animationOldSlide->setEasingCurve(QEasingCurve::OutExpo); -#ifdef Q_OS_LINUX +#ifndef Q_OS_OSX animationOldOpacity = new QPropertyAnimation(effectLast, "opacity"); animationOldOpacity->setDuration(500); animationOldOpacity->setStartValue(1); @@ -701,7 +701,7 @@ animationNewSlide->setEndValue(QPoint(width()/coeff, 0)); animationNewSlide->setEasingCurve(QEasingCurve::OutExpo); -#ifdef Q_OS_LINUX +#ifndef Q_OS_OSX animationNewOpacity = new QPropertyAnimation(effectNew, "opacity"); animationNewOpacity->setDuration(500); animationNewOpacity->setStartValue(0.01); @@ -712,7 +712,7 @@ QParallelAnimationGroup *group = new QParallelAnimationGroup; group->addAnimation(animationOldSlide); group->addAnimation(animationNewSlide); -#ifdef Q_OS_LINUX +#ifndef Q_OS_OSX group->addAnimation(animationOldOpacity); group->addAnimation(animationNewOpacity); #endif