show column mode in viewport context menu (thanks to Thomas Georgiou for the patch)

[dolphin.git] / src / iconsviewsettingspage.cpp

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index 5142cb6473cc0ce0abf4f4e853f753f4ed1c22ab..84270a71d239ac765b22e1fe4d4832789596a90c 100644 (file)
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -37,19 +37,20 @@
 #include <QPushButton>
 #include <QSpinBox>
 #include <QGridLayout>
+#include <QtDebug>
 
 IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
-                                             QWidget* parent) :
-    KVBox(parent),
-    m_mainWindow(mainWindow),
-    m_iconSize(0),
-    m_previewSize(0),
-    m_iconSizeButton(0),
-    m_textWidthBox(0),
-    m_fontRequester(0),
-    m_textlinesCountBox(0),
-    m_arrangementBox(0),
-    m_gridSpacingBox(0)
+        QWidget* parent) :
+        KVBox(parent),
+        m_mainWindow(mainWindow),
+        m_iconSize(0),
+        m_previewSize(0),
+        m_iconSizeButton(0),
+        m_textWidthBox(0),
+        m_fontRequester(0),
+        m_textlinesCountBox(0),
+        m_arrangementBox(0),
+        m_gridSpacingBox(0)
 {
     const int spacing = KDialog::spacingHint();
     const int margin = KDialog::marginHint();
@@ -63,11 +64,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
     m_iconSize = settings->iconSize();
     m_previewSize = settings->previewSize();
 
-    KHBox* sizesLayout = new KHBox(this);
-    sizesLayout->setSpacing(spacing);
-    sizesLayout->setSizePolicy(sizePolicy);
-
-    m_iconSizeButton = new QPushButton(i18n("Change icon and preview size..."), this);
+    m_iconSizeButton = new QPushButton(i18n("Change Icon && Preview Size..."), this);
     connect(m_iconSizeButton, SIGNAL(clicked()),
             this, SLOT(openIconSizeDialog()));
 
@@ -99,10 +96,12 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
     const int remainingWidth = settings->gridWidth() - settings->iconSize();
     if (leftToRightArrangement) {
         textWidthIndex = (remainingWidth - LeftToRightBase) / LeftToRightInc;
-    }
-    else {
+    } else {
         textWidthIndex = (remainingWidth - TopToBottomBase) / TopToBottomInc;
     }
+    // ensure that chosen index is always valid
+    textWidthIndex = qMax(textWidthIndex, 0);
+    textWidthIndex = qMin(textWidthIndex, m_textWidthBox->count() - 1);
 
     m_textWidthBox->setCurrentIndex(textWidthIndex);
 
@@ -120,8 +119,8 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
 
     QLabel* arrangementLabel = new QLabel(i18n("Arrangement:"), gridGroup);
     m_arrangementBox = new QComboBox(gridGroup);
-    m_arrangementBox->addItem(i18n("Left to right"));
-    m_arrangementBox->addItem(i18n("Top to bottom"));
+    m_arrangementBox->addItem(i18n("Left to Right"));
+    m_arrangementBox->addItem(i18n("Top to Bottom"));
     m_arrangementBox->setCurrentIndex(leftToRightArrangement ? 0 : 1);
 
     QLabel* gridSpacingLabel = new QLabel(i18n("Grid spacing:"), gridGroup);
@@ -144,8 +143,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
 }
 
 IconsViewSettingsPage::~IconsViewSettingsPage()
-{
-}
+{}
 
 void IconsViewSettingsPage::applySettings()
 {
@@ -170,8 +168,7 @@ void IconsViewSettingsPage::applySettings()
     if (arrangement == QListView::TopToBottom) {
         gridWidth += TopToBottomBase + textSizeIndex * TopToBottomInc;
         gridHeight += fontSize * 6;
-    }
-    else {
+    } else {
         gridWidth += LeftToRightBase + textSizeIndex * LeftToRightInc;
     }