Hide the "Sort by Rating" and "Sort by Tags" menu entries for KDE 4.0, as currently...

[dolphin.git] / src / iconsviewsettingspage.cpp

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index c4d07f53bc0452dd09c8d11d805492e8c079862e..bfe23ffa545923575e417d24dd182f663ce08fb9 100644 (file)
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -59,26 +59,28 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
     setSpacing(spacing);
     setMargin(margin);
 
     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()));
 
     // create 'Text' group for selecting the font, the number of lines
     // and the text width
     connect(m_iconSizeButton, SIGNAL(clicked()),
             this, SLOT(openIconSizeDialog()));
 
     // create 'Text' group for selecting the font, the number of lines
     // and the text width

-    QGroupBox* textGroup = new QGroupBox(i18n("Text"), this);
+    QGroupBox* textGroup = new QGroupBox(i18nc("@title:group", "Text"), this);

     textGroup->setSizePolicy(sizePolicy);
 
     textGroup->setSizePolicy(sizePolicy);
 

-    QLabel* fontLabel = new QLabel(i18n("Font:"), textGroup);
+    QLabel* fontLabel = new QLabel(i18nc("@label:listbox", "Font:"), textGroup);

     m_fontRequester = new KFontRequester(textGroup);
 
     m_fontRequester = new KFontRequester(textGroup);
 

-    QLabel* textlinesCountLabel = new QLabel(i18n("Number of lines:"), textGroup);
-    m_textlinesCountBox = new QSpinBox(1, 5, 1, textGroup);
+    QLabel* textlinesCountLabel = new QLabel(i18nc("@label:textbox", "Number of lines:"), textGroup);
+    m_textlinesCountBox = new QSpinBox(textGroup);
+    m_textlinesCountBox->setMinimum(1);
+    m_textlinesCountBox->setMaximum(5);

 
 

-    QLabel* textWidthLabel = new QLabel(i18n("Text width:"), textGroup);
+    QLabel* textWidthLabel = new QLabel(i18nc("@label:listbox", "Text width:"), textGroup);

     m_textWidthBox = new QComboBox(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);
 
     QGridLayout* textGroupLayout = new QGridLayout(textGroup);
     textGroupLayout->addWidget(fontLabel, 0, 0);


@@ -89,19 +91,19 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
     textGroupLayout->addWidget(m_textWidthBox, 2, 1);
 
     // create the 'Grid' group for selecting the arrangement and the grid spacing
     textGroupLayout->addWidget(m_textWidthBox, 2, 1);
 
     // create the 'Grid' group for selecting the arrangement and the grid spacing

-    QGroupBox* gridGroup = new QGroupBox(i18n("Grid"), this);
+    QGroupBox* gridGroup = new QGroupBox(i18nc("@title:group", "Grid"), this);

     gridGroup->setSizePolicy(sizePolicy);
 
     gridGroup->setSizePolicy(sizePolicy);
 

-    QLabel* arrangementLabel = new QLabel(i18n("Arrangement:"), gridGroup);
+    QLabel* arrangementLabel = new QLabel(i18nc("@label:listbox", "Arrangement:"), gridGroup);

     m_arrangementBox = new QComboBox(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(i18n("Grid spacing:"), gridGroup);
+    QLabel* gridSpacingLabel = new QLabel(i18nc("@label:listbox", "Grid spacing:"), gridGroup);

     m_gridSpacingBox = new QComboBox(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);
 
     QGridLayout* gridGroupLayout = new QGridLayout(gridGroup);
     gridGroupLayout->addWidget(arrangementLabel, 0, 0);


@@ -143,7 +145,7 @@ void IconsViewSettingsPage::applySettings()
     const int textSizeIndex = m_textWidthBox->currentIndex();
     if (arrangement == QListView::TopToBottom) {
         itemWidth += TopToBottomBase + textSizeIndex * TopToBottomInc;
     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;
     }
     } else {
         itemWidth += LeftToRightBase + textSizeIndex * LeftToRightInc;
     }