fixed some activation issues in combination with split views

[dolphin.git] / src / iconsizedialog.cpp

diff --git a/src/iconsizedialog.cpp b/src/iconsizedialog.cpp
index 55256e87cd9831bb7a418d5d7503539c757706b7..948cfc5e6400e535c4e63300214fde342f15a323 100644 (file)
--- a/src/iconsizedialog.cpp
+++ b/src/iconsizedialog.cpp
@@ -28,20 +28,19 @@
 #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),
-        m_iconSize(0),
-        m_previewSize(0),
-        m_iconSizeSlider(0),
-        m_iconSizeViewer(0),
-        m_previewSizeSlider(0),
-        m_previewSizeViewer(0)
-
+    KDialog(parent),
+    m_iconSize(0),
+    m_previewSize(0),
+    m_iconSizeSlider(0),
+    m_iconSizeViewer(0),
+    m_previewSizeSlider(0),
+    m_previewSizeViewer(0)
 {
     IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     Q_ASSERT(settings != 0);
@@ -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);
@@ -112,7 +111,8 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
 }
 
 IconSizeDialog::~IconSizeDialog()
-{}
+{
+}
 
 void IconSizeDialog::slotButtonClicked(int button)
 {