diff -r bf4420e9fa4d -r 2e16851ffecd ginebra2/VisibilityAnimator.cpp --- a/ginebra2/VisibilityAnimator.cpp Fri Jun 11 16:23:26 2010 +0100 +++ b/ginebra2/VisibilityAnimator.cpp Thu Jul 22 16:30:16 2010 +0100 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License as published by +* the Free Software Foundation, version 2.1 of the License. * -* Initial Contributors: -* Nokia Corporation - initial contribution. +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License for more details. * -* Contributors: +* You should have received a copy of the GNU Lesser General Public License +* along with this program. If not, +* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/". * -* Description: +* Description: * */ - #include "VisibilityAnimator.h" #include @@ -33,10 +36,10 @@ // NB: Replace factory implementation with hash table populated by plugin discovery VisibilityAnimator * VisibilityAnimator:: create(const QString & name, ChromeSnippet* snippet){ - if(name.compare("G_VISIBILITY_SLIDE_ANIMATOR") == 0){ + if (name.compare("G_VISIBILITY_SLIDE_ANIMATOR") == 0){ return new SlideAnimator(snippet); } - if(name.compare("G_VISIBILITY_FADE_ANIMATOR") == 0){ + if (name.compare("G_VISIBILITY_FADE_ANIMATOR") == 0){ return new FadeAnimator(snippet); } return 0; @@ -44,23 +47,23 @@ void VisibilityAnimator::setVisible(bool visible, bool animate){ m_visible = visible; - if(!animate) { + if (!animate) { updateVisibility((m_visible)?0.0:1.0); return; } - if(!m_timeLine) { - m_timeLine = new QTimeLine(500); //Default to .5 sec + if (!m_timeLine) { + m_timeLine = new QTimeLine(m_duration); //Default to .5 sec connect(m_timeLine, SIGNAL(valueChanged(qreal)), - this, SLOT(updateVisibility(qreal))); + this, SLOT(updateVisibility(qreal))); connect(m_timeLine, SIGNAL(finished()), - this, SLOT(onFinished())); + this, SLOT(onFinished())); } else { m_timeLine->stop(); } - - if(!m_visible) { + + if (!m_visible) { m_timeLine->setDirection(QTimeLine::Forward); } else { @@ -71,7 +74,7 @@ emit started(m_visible); m_timeLine->start(); } - + void VisibilityAnimator::onFinished() { emit finished(m_visible);