Change default Dolphin toolbar layout

[dolphin.git] / src / panels / information / pixmapviewer.cpp

diff --git a/src/panels/information/pixmapviewer.cpp b/src/panels/information/pixmapviewer.cpp
index 45a8c17e222d1bb64f5d1a185b706c2554e02a24..311995ec2f81250e2b99f7947cb3b06fceda1b85 100644 (file)
--- a/src/panels/information/pixmapviewer.cpp
+++ b/src/panels/information/pixmapviewer.cpp
@@ -21,10 +21,8 @@
 
 #include <KIconLoader>
 
 
 #include <KIconLoader>
 

-#include <QLayout>

 #include <QPainter>
 #include <QPainter>

-#include <QPixmap>
-#include <QKeyEvent>
+#include <QStyle>

 
 PixmapViewer::PixmapViewer(QWidget* parent, Transition transition) :
     QWidget(parent),
 
 PixmapViewer::PixmapViewer(QWidget* parent, Transition transition) :
     QWidget(parent),


@@ -39,8 +37,8 @@ PixmapViewer::PixmapViewer(QWidget* parent, Transition transition) :
     m_animation.setCurveShape(QTimeLine::LinearCurve);
 
     if (m_transition != NoTransition) {
     m_animation.setCurveShape(QTimeLine::LinearCurve);
 
     if (m_transition != NoTransition) {

-        connect(&m_animation, SIGNAL(valueChanged(qreal)), this, SLOT(update()));
-        connect(&m_animation, SIGNAL(finished()), this, SLOT(checkPendingPixmaps()));
+        connect(&m_animation, &QTimeLine::valueChanged, this, QOverload<>::of(&PixmapViewer::update));
+        connect(&m_animation, &QTimeLine::finished, this, &PixmapViewer::checkPendingPixmaps);

     }
 }
 
     }
 }
 


@@ -96,29 +94,25 @@ void PixmapViewer::paintEvent(QPaintEvent* event)
         const int scaledWidth  = static_cast<int>((m_oldPixmap.width()  * (1.0 - value)) + (m_pixmap.width()  * value));
         const int scaledHeight = static_cast<int>((m_oldPixmap.height() * (1.0 - value)) + (m_pixmap.height() * value));
 
         const int scaledWidth  = static_cast<int>((m_oldPixmap.width()  * (1.0 - value)) + (m_pixmap.width()  * value));
         const int scaledHeight = static_cast<int>((m_oldPixmap.height() * (1.0 - value)) + (m_pixmap.height() * value));
 

-        const int x = (width()  - scaledWidth ) / 2;
-        const int y = (height() - scaledHeight) / 2;
-

         const bool useOldPixmap = (m_transition == SizeTransition) &&
                                   (m_oldPixmap.width() > m_pixmap.width());
         const QPixmap& largePixmap = useOldPixmap ? m_oldPixmap : m_pixmap;
         const bool useOldPixmap = (m_transition == SizeTransition) &&
                                   (m_oldPixmap.width() > m_pixmap.width());
         const QPixmap& largePixmap = useOldPixmap ? m_oldPixmap : m_pixmap;

-       if (!largePixmap.isNull()) {
+        if (!largePixmap.isNull()) {

             const QPixmap scaledPixmap = largePixmap.scaled(scaledWidth,
                                                             scaledHeight,
                                                             Qt::IgnoreAspectRatio,
                                                             Qt::FastTransformation);
             const QPixmap scaledPixmap = largePixmap.scaled(scaledWidth,
                                                             scaledHeight,
                                                             Qt::IgnoreAspectRatio,
                                                             Qt::FastTransformation);

-            painter.drawPixmap(x, y, scaledPixmap);
-       }
+
+            style()->drawItemPixmap(&painter, rect(), Qt::AlignCenter, scaledPixmap);
+        }

     } else {
     } else {

-        const int x = (width()  - m_pixmap.width() ) / 2;
-        const int y = (height() - m_pixmap.height()) / 2;
-        painter.drawPixmap(x, y, m_pixmap);
+        style()->drawItemPixmap(&painter, rect(), Qt::AlignCenter, m_pixmap);

     }
 }
 
 void PixmapViewer::checkPendingPixmaps()
 {
     }
 }
 
 void PixmapViewer::checkPendingPixmaps()
 {

-    if (m_pendingPixmaps.count() > 0) {
+    if (!m_pendingPixmaps.isEmpty()) {

         QPixmap pixmap = m_pendingPixmaps.dequeue();
         m_oldPixmap = m_pixmap.isNull() ? pixmap : m_pixmap;
         m_pixmap = pixmap;
         QPixmap pixmap = m_pendingPixmaps.dequeue();
         m_oldPixmap = m_pixmap.isNull() ? pixmap : m_pixmap;
         m_pixmap = pixmap;


@@ -129,4 +123,3 @@ void PixmapViewer::checkPendingPixmaps()
     }
 }
 
     }
 }
 

-#include "pixmapviewer.moc"