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

[dolphin.git] / src / detailsviewsettingspage.cpp

diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp
index 33ae82d3e6ae09a5c8b133935d8b3cab84761567..ea45c9688b4429b38bac4d6a5f5ce48b95883fae 100644 (file)
--- a/src/detailsviewsettingspage.cpp
+++ b/src/detailsviewsettingspage.cpp
@@ -39,10 +39,6 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
                                                  QWidget* parent) :
     KVBox(parent),
     m_mainWindow(mainWindow),
                                                  QWidget* parent) :
     KVBox(parent),
     m_mainWindow(mainWindow),

-    m_dateBox(0),
-    m_permissionsBox(0),
-    m_ownerBox(0),
-    m_groupBox(0),

     m_smallIconSize(0),
     m_mediumIconSize(0),
     m_largeIconSize(0),
     m_smallIconSize(0),
     m_mediumIconSize(0),
     m_largeIconSize(0),


@@ -55,30 +51,13 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
     setSpacing(spacing);
     setMargin(margin);
 
     setSpacing(spacing);
     setMargin(margin);
 

-    // create "Columns" properties
-    QGroupBox* columnsBox = new QGroupBox(i18n("Columns"), this);
-    columnsBox->setSizePolicy(sizePolicy);
-
-    m_dateBox = new QCheckBox(i18n("Date"), this);
-    m_permissionsBox = new QCheckBox(i18n("Permissions"), this);
-    m_ownerBox = new QCheckBox(i18n("Owner"), this);
-    m_groupBox = new QCheckBox(i18n("Group"), this);
-    m_typeBox = new QCheckBox(i18n("Type"), this);
-
-    QHBoxLayout* columnsLayout = new QHBoxLayout(columnsBox);
-    columnsLayout->addWidget(m_dateBox);
-    columnsLayout->addWidget(m_permissionsBox);
-    columnsLayout->addWidget(m_ownerBox);
-    columnsLayout->addWidget(m_groupBox);
-    columnsLayout->addWidget(m_typeBox);
-

     // Create "Icon" properties
     // Create "Icon" properties

-    QGroupBox* iconSizeBox = new QGroupBox(i18n("Icon Size"), this);
+    QGroupBox* iconSizeBox = new QGroupBox(i18nc("@title:group", "Icon Size"), this);

     iconSizeBox->setSizePolicy(sizePolicy);
 
     iconSizeBox->setSizePolicy(sizePolicy);
 

-    m_smallIconSize  = new QRadioButton(i18nc("Size", "Small"), this);
-    m_mediumIconSize = new QRadioButton(i18nc("Size", "Medium"), this);
-    m_largeIconSize  = new QRadioButton(i18nc("Size", "Large"), this);
+    m_smallIconSize  = new QRadioButton(i18nc("@option:radio Icon Size", "Small"), this);
+    m_mediumIconSize = new QRadioButton(i18nc("@option:radio Icon Size", "Medium"), this);
+    m_largeIconSize  = new QRadioButton(i18nc("@option:radio Icon Size", "Large"), this);

 
     QButtonGroup* iconSizeGroup = new QButtonGroup(this);
     iconSizeGroup->addButton(m_smallIconSize);
 
     QButtonGroup* iconSizeGroup = new QButtonGroup(this);
     iconSizeGroup->addButton(m_smallIconSize);


@@ -91,10 +70,10 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
     iconSizeLayout->addWidget(m_largeIconSize);
 
     // create "Text" properties
     iconSizeLayout->addWidget(m_largeIconSize);
 
     // create "Text" properties

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

     textBox->setSizePolicy(sizePolicy);
 
     textBox->setSizePolicy(sizePolicy);
 

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

     m_fontRequester = new KFontRequester(textBox);
 
     QHBoxLayout* textLayout = new QHBoxLayout(textBox);
     m_fontRequester = new KFontRequester(textBox);
 
     QHBoxLayout* textLayout = new QHBoxLayout(textBox);


@@ -117,17 +96,11 @@ void DetailsViewSettingsPage::applySettings()
 {
     DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
 
 {
     DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
 

-    settings->setShowDate(m_dateBox->isChecked());
-    settings->setShowPermissions(m_permissionsBox->isChecked());
-    settings->setShowOwner(m_ownerBox->isChecked());
-    settings->setShowGroup(m_groupBox->isChecked());
-    settings->setShowType(m_typeBox->isChecked());
-
-    int iconSize = K3Icon::SizeSmall;
+    int iconSize = KIconLoader::SizeSmall;

     if (m_mediumIconSize->isChecked()) {
     if (m_mediumIconSize->isChecked()) {

-        iconSize = K3Icon::SizeMedium;
+        iconSize = KIconLoader::SizeMedium;

     } else if (m_largeIconSize->isChecked()) {
     } else if (m_largeIconSize->isChecked()) {

-        iconSize = K3Icon::SizeLarge;
+        iconSize = KIconLoader::SizeLarge;

     }
     settings->setIconSize(iconSize);
 
     }
     settings->setIconSize(iconSize);
 


@@ -149,22 +122,16 @@ void DetailsViewSettingsPage::loadSettings()
 {
     DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
 
 {
     DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
 

-    m_dateBox->setChecked(settings->showDate());
-    m_permissionsBox->setChecked(settings->showPermissions());
-    m_ownerBox->setChecked(settings->showOwner());
-    m_groupBox->setChecked(settings->showGroup());
-    m_typeBox->setChecked(settings->showType());
-

     switch (settings->iconSize()) {
     switch (settings->iconSize()) {

-    case K3Icon::SizeLarge:
+    case KIconLoader::SizeLarge:

         m_largeIconSize->setChecked(true);
         break;
 
         m_largeIconSize->setChecked(true);
         break;
 

-    case K3Icon::SizeMedium:
+    case KIconLoader::SizeMedium:

         m_mediumIconSize->setChecked(true);
         break;
 
         m_mediumIconSize->setChecked(true);
         break;
 

-    case K3Icon::SizeSmall:
+    case KIconLoader::SizeSmall:

     default:
         m_smallIconSize->setChecked(true);
     }
     default:
         m_smallIconSize->setChecked(true);
     }