when having split views: darken the background color of the inactive view

[dolphin.git] / src / iconsviewsettingspage.cpp

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index 5142cb6473cc0ce0abf4f4e853f753f4ed1c22ab..86823ede05c66de72f5cc0f3cd4f4a2bc805f99a 100644 (file)
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -30,13 +30,14 @@
 #include <kglobalsettings.h>
 #include <klocale.h>
 
-#include <QComboBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QListView>
-#include <QPushButton>
-#include <QSpinBox>
-#include <QGridLayout>
+#include <QtGui/QComboBox>
+#include <QtGui/QGroupBox>
+#include <QtGui/QLabel>
+#include <QtGui/QListView>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpinBox>
+#include <QtGui/QGridLayout>
+#include <QtCore/QDebug>
 
 IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
                                              QWidget* parent) :
@@ -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()));
 
@@ -96,13 +93,15 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
 
     const bool leftToRightArrangement = (settings->arrangement() == QListView::LeftToRight);
     int textWidthIndex = 0;
-    const int remainingWidth = settings->gridWidth() - settings->iconSize();
+    const int remainingWidth = settings->itemWidth() - 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()
 {
@@ -156,34 +154,35 @@ void IconsViewSettingsPage::applySettings()
     settings->setPreviewSize(m_previewSize);
 
     const QFont font = m_fontRequester->font();
-    const int fontSize = font.pointSize();
+    const int fontHeight = QFontMetrics(font).height();
 
     const int arrangement = (m_arrangementBox->currentIndex() == 0) ?
                             QListView::LeftToRight :
                             QListView::TopToBottom;
     settings->setArrangement(arrangement);
 
+    const int numberOfTextlines = m_textlinesCountBox->value();
+
     const int defaultSize = settings->iconSize();
-    int gridWidth = defaultSize;
-    int gridHeight = defaultSize;
+    int itemWidth = defaultSize;
+    int itemHeight = defaultSize;
     const int textSizeIndex = m_textWidthBox->currentIndex();
     if (arrangement == QListView::TopToBottom) {
-        gridWidth += TopToBottomBase + textSizeIndex * TopToBottomInc;
-        gridHeight += fontSize * 6;
-    }
-    else {
-        gridWidth += LeftToRightBase + textSizeIndex * LeftToRightInc;
+        itemWidth += TopToBottomBase + textSizeIndex * TopToBottomInc;
+        itemHeight += fontHeight * numberOfTextlines + 16;
+    } else {
+        itemWidth += LeftToRightBase + textSizeIndex * LeftToRightInc;
     }
 
-    settings->setGridWidth(gridWidth);
-    settings->setGridHeight(gridHeight);
+    settings->setItemWidth(itemWidth);
+    settings->setItemHeight(itemHeight);
 
     settings->setFontFamily(font.family());
-    settings->setFontSize(fontSize);
+    settings->setFontSize(font.pointSize());
     settings->setItalicFont(font.italic());
     settings->setBoldFont(font.bold());
 
-    settings->setNumberOfTextlines(m_textlinesCountBox->value());
+    settings->setNumberOfTextlines(numberOfTextlines);
 
     settings->setGridSpacing(GridSpacingBase +
                              m_gridSpacingBox->currentIndex() * GridSpacingInc);