differ between pasting one folder, pasting one file and pasting n items

[dolphin.git] / src / iconsizedialog.cpp

diff --git a/src/iconsizedialog.cpp b/src/iconsizedialog.cpp
index 429f8926b6c8ceb7051be110fbeefa92b9f99ce9..00f1c7b2eba2cc3e5894ddb48b4c8555e3f2db58 100644 (file)
--- a/src/iconsizedialog.cpp
+++ b/src/iconsizedialog.cpp
@@ -119,22 +119,24 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
     topLayout->addWidget(previewSizeBox);
     main->setLayout(topLayout);
     setMainWidget(main);
+
+    const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
+                                    "IconSizeDialog");
+    restoreDialogSize(dialogConfig);
 }
 
 IconSizeDialog::~IconSizeDialog()
 {
+    KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
+                              "IconSizeDialog");
+    saveDialogSize(dialogConfig, KConfigBase::Persistent);
 }
 
 void IconSizeDialog::slotButtonClicked(int button)
 {
     if (button == Ok) {
         m_iconSize = iconSize(m_iconSizeSlider->value());
-
         m_previewSize = iconSize(m_previewSizeSlider->value());
-        if (m_previewSize < m_iconSize) {
-            // assure that the preview size is never smaller than the icon size
-            m_previewSize = m_iconSize;
-        }
     }
 
     KDialog::slotButtonClicked(button);
@@ -143,18 +145,10 @@ void IconSizeDialog::slotButtonClicked(int button)
 void IconSizeDialog::updateIconSize(int value)
 {
     m_iconSizeViewer->setPixmap(KIconLoader::global()->loadIcon("folder", KIconLoader::Desktop, iconSize(value)));
-    if (m_previewSizeSlider != 0) {
-        updatePreviewSize(m_previewSizeSlider->value());
-    }
 }
 
 void IconSizeDialog::updatePreviewSize(int value)
 {
-    const int iconSizeValue = m_iconSizeSlider->value();
-    if (value < iconSizeValue) {
-        // assure that the preview size is never smaller than the icon size
-        value = iconSizeValue;
-    }
     m_previewSizeViewer->setPixmap(KIconLoader::global()->loadIcon("preview", KIconLoader::Desktop, iconSize(value)));
 }