X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/08fc0833aa6329600236d6f0a5a02e71a754d1d6..9eb63ebe4f1235e5d11f12018b353c32dac5f651:/src/iconsviewsettingspage.cpp

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index d7b7e0a01..6bcc78ae8 100644
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -30,14 +30,15 @@
 #include <kglobalsettings.h>
 #include <klocale.h>
 
-#include <QtGui/QComboBox>
-#include <QtGui/QGroupBox>
-#include <QtGui/QLabel>
-#include <QtGui/QListView>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpinBox>
-#include <QtGui/QGridLayout>
-#include <QtCore/QDebug>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QGroupBox>
+#include <QLabel>
+#include <QListView>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QGridLayout>
+#include <QVBoxLayout>
 
 IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
                                              QWidget* parent) :
@@ -59,7 +60,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
     setSpacing(spacing);
     setMargin(margin);
 
-    m_iconSizeButton = new QPushButton(i18n("Change Icon && Preview Size..."), this);
+    m_iconSizeButton = new QPushButton(i18nc("@action:button", "Change Icon && Preview Size..."), this);
     connect(m_iconSizeButton, SIGNAL(clicked()),
             this, SLOT(openIconSizeDialog()));
 
@@ -72,13 +73,15 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
     m_fontRequester = new KFontRequester(textGroup);
 
     QLabel* textlinesCountLabel = new QLabel(i18nc("@label:textbox", "Number of lines:"), textGroup);
-    m_textlinesCountBox = new QSpinBox(1, 5, 1, textGroup);
+    m_textlinesCountBox = new QSpinBox(textGroup);
+    m_textlinesCountBox->setMinimum(1);
+    m_textlinesCountBox->setMaximum(5);
 
     QLabel* textWidthLabel = new QLabel(i18nc("@label:listbox", "Text width:"), textGroup);
     m_textWidthBox = new QComboBox(textGroup);
-    m_textWidthBox->addItem(i18nc("Text width", "Small"));
-    m_textWidthBox->addItem(i18nc("Text width", "Medium"));
-    m_textWidthBox->addItem(i18nc("Text width", "Large"));
+    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"));
 
     QGridLayout* textGroupLayout = new QGridLayout(textGroup);
     textGroupLayout->addWidget(fontLabel, 0, 0);
@@ -94,14 +97,14 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
 
     QLabel* arrangementLabel = new QLabel(i18nc("@label:listbox", "Arrangement:"), gridGroup);
     m_arrangementBox = new QComboBox(gridGroup);
-    m_arrangementBox->addItem(i18n("Left to Right"));
-    m_arrangementBox->addItem(i18n("Top to Bottom"));
+    m_arrangementBox->addItem(i18nc("@item:inlistbox Arrangement", "Left to Right"));
+    m_arrangementBox->addItem(i18nc("@item:inlistbox Arrangement", "Top to Bottom"));
 
     QLabel* gridSpacingLabel = new QLabel(i18nc("@label:listbox", "Grid spacing:"), gridGroup);
     m_gridSpacingBox = new QComboBox(gridGroup);
-    m_gridSpacingBox->addItem(i18nc("Grid spacing", "Small"));
-    m_gridSpacingBox->addItem(i18nc("Grid spacing", "Medium"));
-    m_gridSpacingBox->addItem(i18nc("Grid spacing", "Large"));
+    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"));
 
     QGridLayout* gridGroupLayout = new QGridLayout(gridGroup);
     gridGroupLayout->addWidget(arrangementLabel, 0, 0);
@@ -118,7 +121,8 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
 }
 
 IconsViewSettingsPage::~IconsViewSettingsPage()
-{}
+{
+}
 
 void IconsViewSettingsPage::applySettings()
 {
@@ -143,7 +147,7 @@ void IconsViewSettingsPage::applySettings()
     const int textSizeIndex = m_textWidthBox->currentIndex();
     if (arrangement == QListView::TopToBottom) {
         itemWidth += TopToBottomBase + textSizeIndex * TopToBottomInc;
-        itemHeight += fontHeight * numberOfTextlines + 16;
+        itemHeight += fontHeight * numberOfTextlines + 10;
     } else {
         itemWidth += LeftToRightBase + textSizeIndex * LeftToRightInc;
     }