X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c209c33cdd3624ca3cf6e9daadad3d7938c8f37b..862ceee323ad3b474ce9de11eefbddd99c528fac:/src/iconsizedialog.cpp

diff --git a/src/iconsizedialog.cpp b/src/iconsizedialog.cpp
index d7d248819..948cfc5e6 100644
--- a/src/iconsizedialog.cpp
+++ b/src/iconsizedialog.cpp
@@ -28,10 +28,10 @@
 #include <klocale.h>
 #include <kvbox.h>
 
-#include <QGroupBox>
-#include <QLabel>
-#include <QSlider>
-#include <QVBoxLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QLabel>
+#include <QtGui/QSlider>
+#include <QtGui/QBoxLayout>
 
 IconSizeDialog::IconSizeDialog(QWidget* parent) :
     KDialog(parent),
@@ -41,7 +41,6 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
     m_iconSizeViewer(0),
     m_previewSizeSlider(0),
     m_previewSizeViewer(0)
-
 {
     IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     Q_ASSERT(settings != 0);
@@ -51,7 +50,7 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
     const int spacing = KDialog::spacingHint();
 
     setCaption(i18n("Change Icon & Preview Size"));
-    setButtons(Ok|Cancel);
+    setButtons(Ok | Cancel);
     setDefaultButton(Ok);
 
     QWidget* main = new QWidget();
@@ -72,7 +71,7 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
             this, SLOT(updateIconSize(int)));
     new QLabel(i18n("Large"), iconSizeHBox);
 
-    m_iconSizeViewer = new PixmapViewer(iconSizeBox);
+    m_iconSizeViewer = new PixmapViewer(iconSizeBox, PixmapViewer::SizeTransition);
     m_iconSizeViewer->setMinimumWidth(K3Icon::SizeEnormous);
     m_iconSizeViewer->setFixedHeight(K3Icon::SizeEnormous);
     m_iconSizeViewer->setEraseColor(iconBackgroundColor);
@@ -95,7 +94,7 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
             this, SLOT(updatePreviewSize(int)));
     new QLabel(i18n("Large"), previewSizeHBox);
 
-    m_previewSizeViewer = new PixmapViewer(previewSizeBox);
+    m_previewSizeViewer = new PixmapViewer(previewSizeBox, PixmapViewer::SizeTransition);
     m_previewSizeViewer->setMinimumWidth(K3Icon::SizeEnormous);
     m_previewSizeViewer->setFixedHeight(K3Icon::SizeEnormous);
     m_previewSizeViewer->setEraseColor(iconBackgroundColor);
@@ -160,12 +159,12 @@ int IconSizeDialog::iconSize(int sliderValue) const
 {
     int size = K3Icon::SizeMedium;
     switch (sliderValue) {
-        case 0: size = K3Icon::SizeSmall; break;
-        case 1: size = K3Icon::SizeSmallMedium; break;
-        case 2: size = K3Icon::SizeMedium; break;
-        case 3: size = K3Icon::SizeLarge; break;
-        case 4: size = K3Icon::SizeHuge; break;
-        case 5: size = K3Icon::SizeEnormous; break;
+    case 0: size = K3Icon::SizeSmall; break;
+    case 1: size = K3Icon::SizeSmallMedium; break;
+    case 2: size = K3Icon::SizeMedium; break;
+    case 3: size = K3Icon::SizeLarge; break;
+    case 4: size = K3Icon::SizeHuge; break;
+    case 5: size = K3Icon::SizeEnormous; break;
     }
     return size;
 }
@@ -174,13 +173,13 @@ int IconSizeDialog::sliderValue(int iconSize) const
 {
     int value = 0;
     switch (iconSize) {
-        case K3Icon::SizeSmall:       value = 0; break;
-        case K3Icon::SizeSmallMedium: value = 1; break;
-        case K3Icon::SizeMedium:      value = 2; break;
-        case K3Icon::SizeLarge:       value = 3; break;
-        case K3Icon::SizeHuge:        value = 4; break;
-        case K3Icon::SizeEnormous:    value = 5; break;
-        default: break;
+    case K3Icon::SizeSmall:       value = 0; break;
+    case K3Icon::SizeSmallMedium: value = 1; break;
+    case K3Icon::SizeMedium:      value = 2; break;
+    case K3Icon::SizeLarge:       value = 3; break;
+    case K3Icon::SizeHuge:        value = 4; break;
+    case K3Icon::SizeEnormous:    value = 5; break;
+    default: break;
     }
     return value;
 }