Fix the scrollbar issue. We can live with the setSingleStep nasty workaround for...

[dolphin.git] / src / iconsizedialog.cpp

diff --git a/src/iconsizedialog.cpp b/src/iconsizedialog.cpp
index 948cfc5e6400e535c4e63300214fde342f15a323..ad7cf31a2b404a809834ae0b041eaf88f1bd4e8a 100644 (file)
--- a/src/iconsizedialog.cpp
+++ b/src/iconsizedialog.cpp
@@ -24,14 +24,14 @@
 
 #include "dolphin_iconsmodesettings.h"
 
-#include <kglobalsettings.h>
+#include <kcolorscheme.h>
 #include <klocale.h>
 #include <kvbox.h>
 
-#include <QtGui/QGroupBox>
-#include <QtGui/QLabel>
-#include <QtGui/QSlider>
-#include <QtGui/QBoxLayout>
+#include <QGroupBox>
+#include <QLabel>
+#include <QSlider>
+#include <QBoxLayout>
 
 IconSizeDialog::IconSizeDialog(QWidget* parent) :
     KDialog(parent),
@@ -59,17 +59,17 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
     // create 'Icon Size' group including slider and preview
     QGroupBox* iconSizeBox = new QGroupBox(i18n("Icon Size"), main);
 
-    const QColor iconBackgroundColor(KGlobalSettings::baseColor());
+    const QColor iconBackgroundColor = KColorScheme(KColorScheme::View).background();
 
     KHBox* iconSizeHBox = new KHBox(iconSizeBox);
     iconSizeHBox->setSpacing(spacing);
-    new QLabel(i18n("Small"), iconSizeHBox);
+    new QLabel(i18nc("Size", "Small"), iconSizeHBox);
     m_iconSizeSlider = new QSlider(0, 5, 1, 0,  Qt::Horizontal, iconSizeHBox);
     m_iconSizeSlider->setValue(sliderValue(settings->iconSize()));
     m_iconSizeSlider->setTickmarks(QSlider::TicksBelow);
     connect(m_iconSizeSlider, SIGNAL(valueChanged(int)),
             this, SLOT(updateIconSize(int)));
-    new QLabel(i18n("Large"), iconSizeHBox);
+    new QLabel(i18nc("Size", "Large"), iconSizeHBox);
 
     m_iconSizeViewer = new PixmapViewer(iconSizeBox, PixmapViewer::SizeTransition);
     m_iconSizeViewer->setMinimumWidth(K3Icon::SizeEnormous);
@@ -86,13 +86,13 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
 
     KHBox* previewSizeHBox = new KHBox(previewSizeBox);
     previewSizeHBox->setSpacing(spacing);
-    new QLabel(i18n("Small"), previewSizeHBox);
+    new QLabel(i18nc("Size", "Small"), previewSizeHBox);
     m_previewSizeSlider = new QSlider(0, 5, 1, 0,  Qt::Horizontal, previewSizeHBox);
     m_previewSizeSlider->setValue(sliderValue(settings->previewSize()));
     m_previewSizeSlider->setTickmarks(QSlider::TicksBelow);
     connect(m_previewSizeSlider, SIGNAL(valueChanged(int)),
             this, SLOT(updatePreviewSize(int)));
-    new QLabel(i18n("Large"), previewSizeHBox);
+    new QLabel(i18nc("Size", "Large"), previewSizeHBox);
 
     m_previewSizeViewer = new PixmapViewer(previewSizeBox, PixmapViewer::SizeTransition);
     m_previewSizeViewer->setMinimumWidth(K3Icon::SizeEnormous);