X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/5252c12db4929886dbe502013e0a1fee6500f568..2060fa8d4676fb2d5116830c304db8fdb556d959:/src/pixmapviewer.cpp

diff --git a/src/pixmapviewer.cpp b/src/pixmapviewer.cpp
index 575f3eda1..351f6463f 100644
--- a/src/pixmapviewer.cpp
+++ b/src/pixmapviewer.cpp
@@ -15,23 +15,28 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
 #include "pixmapviewer.h"
 
-#include <kglobalsettings.h>
 #include <kiconloader.h>
-#include <qpainter.h>
-//Added by qt3to4:
-#include <QPixmap>
-#include <QPaintEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
+#include <QtGui/QPaintEvent>
+#include <QtDebug>
 
 PixmapViewer::PixmapViewer(QWidget* parent) :
-    QWidget(parent)
+    QWidget(parent),
+    m_animationStep(0)
 {
-    setMinimumWidth(KIcon::SizeEnormous);
-    setMinimumWidth(KIcon::SizeEnormous);
+    setMinimumWidth(K3Icon::SizeEnormous);
+    setMinimumWidth(K3Icon::SizeEnormous);
+
+    m_animation.setDuration(750);
+
+    connect(&m_animation, SIGNAL(valueChanged(qreal)), this, SLOT(update()));
+    connect(&m_animation, SIGNAL(finished()), this, SLOT(finishTransition()));
 }
 
 PixmapViewer::~PixmapViewer()
@@ -40,8 +45,35 @@ PixmapViewer::~PixmapViewer()
 
 void PixmapViewer::setPixmap(const QPixmap& pixmap)
 {
-    m_pixmap = pixmap;
-    update();
+    if (pixmap.isNull()) {
+        return;
+    }
+
+    m_pendingPixmap = pixmap;
+
+    if (m_animation.state() == QTimeLine::NotRunning) {
+        beginTransition();
+    }
+}
+
+void PixmapViewer::beginTransition()
+{
+    Q_ASSERT(!m_pendingPixmap.isNull());
+    Q_ASSERT(m_nextPixmap.isNull());
+
+    m_nextPixmap = m_pendingPixmap;
+    m_pendingPixmap = QPixmap();
+    m_animation.start();
+}
+
+void PixmapViewer::finishTransition()
+{
+    m_pixmap = m_nextPixmap;
+    m_nextPixmap = QPixmap();
+
+    if (!m_pendingPixmap.isNull()) {
+        beginTransition();
+    }
 }
 
 void PixmapViewer::paintEvent(QPaintEvent* event)
@@ -52,7 +84,19 @@ void PixmapViewer::paintEvent(QPaintEvent* event)
     painter.begin(this);
     const int x = (width() - m_pixmap.width()) / 2;
     const int y = (height() - m_pixmap.height()) / 2;
-    painter.drawPixmap(x, y, m_pixmap);
+
+    if (!m_nextPixmap.isNull()) {
+        const int nextPixmapX = (width() - m_nextPixmap.width()) / 2;
+        const int nextPixmapY = (height() - m_nextPixmap.height()) / 2;
+
+        painter.setOpacity( 1 - m_animation.currentValue() );
+        painter.drawPixmap(x, y, m_pixmap);
+        painter.setOpacity( m_animation.currentValue() );
+        painter.drawPixmap(nextPixmapX,nextPixmapY,m_nextPixmap);
+    } else {
+        painter.drawPixmap(x, y, m_pixmap);
+    }
+
     painter.end();
 }