The opening/closing animation of subtrees flickers in combination with the sidebar...

[dolphin.git] / src / iconsviewsettingspage.cpp

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index 23fbd7e75b07516a9cf2a2e5ba34521e4f93048d..8273234eb4250d69cd319253505c81666059bc7d 100644 (file)
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -30,9 +30,9 @@
 #include <kiconloader.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
+#include <kcombobox.h>
 
 #include <QCheckBox>
-#include <QComboBox>
 #include <QGroupBox>
 #include <QLabel>
 #include <QListView>
@@ -87,10 +87,11 @@ IconsViewSettingsPage::IconsViewSettingsPage(QWidget* parent) :
     connect(m_textlinesCountBox, SIGNAL(valueChanged(int)), this, SIGNAL(changed()));
 
     QLabel* textWidthLabel = new QLabel(i18nc("@label:listbox", "Text width:"), textGroup);
-    m_textWidthBox = new QComboBox(textGroup);
+    m_textWidthBox = new KComboBox(textGroup);
     m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Small"));
     m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Medium"));
     m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Large"));
+    m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Huge"));
     connect(m_textWidthBox, SIGNAL(activated(int)), this, SIGNAL(changed()));
 
     QGridLayout* textGroupLayout = new QGridLayout(textGroup);
@@ -106,13 +107,14 @@ IconsViewSettingsPage::IconsViewSettingsPage(QWidget* parent) :
     gridGroup->setSizePolicy(sizePolicy);
 
     QLabel* arrangementLabel = new QLabel(i18nc("@label:listbox", "Arrangement:"), gridGroup);
-    m_arrangementBox = new QComboBox(gridGroup);
+    m_arrangementBox = new KComboBox(gridGroup);
     m_arrangementBox->addItem(i18nc("@item:inlistbox Arrangement", "Columns"));
     m_arrangementBox->addItem(i18nc("@item:inlistbox Arrangement", "Rows"));
     connect(m_arrangementBox, SIGNAL(activated(int)), this, SIGNAL(changed()));
 
     QLabel* gridSpacingLabel = new QLabel(i18nc("@label:listbox", "Grid spacing:"), gridGroup);
-    m_gridSpacingBox = new QComboBox(gridGroup);
+    m_gridSpacingBox = new KComboBox(gridGroup);
+    m_gridSpacingBox->addItem(i18nc("@item:inlistbox Grid spacing", "None"));
     m_gridSpacingBox->addItem(i18nc("@item:inlistbox Grid spacing", "Small"));
     m_gridSpacingBox->addItem(i18nc("@item:inlistbox Grid spacing", "Medium"));
     m_gridSpacingBox->addItem(i18nc("@item:inlistbox Grid spacing", "Large"));
@@ -177,8 +179,13 @@ void IconsViewSettingsPage::applySettings()
 
     settings->setNumberOfTextlines(numberOfTextlines);
 
-    settings->setGridSpacing(GridSpacingBase +
-                             m_gridSpacingBox->currentIndex() * GridSpacingInc);
+    const int index = m_gridSpacingBox->currentIndex();
+    if (index == 0) {
+        // No grid spacing
+        settings->setGridSpacing(0);
+    } else {
+        settings->setGridSpacing(GridSpacingBase + (index - 1) * GridSpacingInc);
+    }
 }
 
 void IconsViewSettingsPage::restoreDefaults()
@@ -227,7 +234,10 @@ void IconsViewSettingsPage::loadSettings()
 
     m_textWidthBox->setCurrentIndex(textWidthIndex);
     m_arrangementBox->setCurrentIndex(leftToRightArrangement ? 0 : 1);
-    m_gridSpacingBox->setCurrentIndex((settings->gridSpacing() - GridSpacingBase) / GridSpacingInc);
+    
+    const int spacing = settings->gridSpacing();
+    const int index = (spacing <= 0) ? 0 : 1 + (spacing - GridSpacingBase) / GridSpacingInc;
+    m_gridSpacingBox->setCurrentIndex(index);
 }
 
 #include "iconsviewsettingspage.moc"