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

[dolphin.git] / src / generalviewsettingspage.cpp

diff --git a/src/generalviewsettingspage.cpp b/src/generalviewsettingspage.cpp
index 6b484f120069b5a3b5a112e64ba4c349e1e1b031..2d815d3d20274995a083d10e901ed3ae6137c5bc 100644 (file)
--- a/src/generalviewsettingspage.cpp
+++ b/src/generalviewsettingspage.cpp
@@ -25,8 +25,9 @@
 
 #include "dolphin_generalsettings.h"
 
 
 #include "dolphin_generalsettings.h"
 

-#include <QLabel>
+#include <QCheckBox>

 #include <QGroupBox>
 #include <QGroupBox>

+#include <QLabel>

 #include <QRadioButton>
 #include <QSlider>
 #include <QSpinBox>
 #include <QRadioButton>
 #include <QSlider>
 #include <QSpinBox>


@@ -45,7 +46,8 @@ GeneralViewSettingsPage::GeneralViewSettingsPage(DolphinMainWindow* mainWindow,
     m_localProps(0),
     m_globalProps(0),
     m_maxPreviewSize(0),
     m_localProps(0),
     m_globalProps(0),
     m_maxPreviewSize(0),

-    m_spinBox(0)
+    m_spinBox(0),
+    m_useFileThumbnails(0)

 {
     const int spacing = KDialog::spacingHint();
     const int margin = KDialog::marginHint();
 {
     const int spacing = KDialog::spacingHint();
     const int margin = KDialog::marginHint();


@@ -54,22 +56,22 @@ GeneralViewSettingsPage::GeneralViewSettingsPage(DolphinMainWindow* mainWindow,
     setSpacing(spacing);
     setMargin(margin);
 
     setSpacing(spacing);
     setMargin(margin);
 

-    QGroupBox* propsBox = new QGroupBox(i18n("View Properties"), this);
+    QGroupBox* propsBox = new QGroupBox(i18nc("@title:group", "View Properties"), this);

 
 

-    m_localProps = new QRadioButton(i18n("Remember view properties for each folder"), propsBox);
-    m_globalProps = new QRadioButton(i18n("Use common view properties for all folders"), propsBox);
+    m_localProps = new QRadioButton(i18nc("@option:radio", "Remember view properties for each folder"), propsBox);
+    m_globalProps = new QRadioButton(i18nc("@option:radio", "Use common view properties for all folders"), propsBox);

 
     QVBoxLayout* propsBoxLayout = new QVBoxLayout(propsBox);
     propsBoxLayout->addWidget(m_localProps);
     propsBoxLayout->addWidget(m_globalProps);
 
     // create 'File Previews' box
 
     QVBoxLayout* propsBoxLayout = new QVBoxLayout(propsBox);
     propsBoxLayout->addWidget(m_localProps);
     propsBoxLayout->addWidget(m_globalProps);
 
     // create 'File Previews' box

-    QGroupBox* previewBox = new QGroupBox(i18n("File Previews"), this);
-
-    QLabel* maxFileSize = new QLabel(i18n("Maximum file size:"), previewBox);
+    QGroupBox* previewBox = new QGroupBox(i18nc("@title:group", "File Previews"), this);

 
     KHBox* vBox = new KHBox(previewBox);
     vBox->setSpacing(spacing);
 
     KHBox* vBox = new KHBox(previewBox);
     vBox->setSpacing(spacing);

+
+    QLabel* maxFileSize = new QLabel(i18nc("@label:slider", "Maximum file size:"), vBox);

     m_maxPreviewSize = new QSlider(Qt::Horizontal, vBox);
 
     m_spinBox = new QSpinBox(vBox);
     m_maxPreviewSize = new QSlider(Qt::Horizontal, vBox);
 
     m_spinBox = new QSpinBox(vBox);


@@ -79,9 +81,11 @@ GeneralViewSettingsPage::GeneralViewSettingsPage(DolphinMainWindow* mainWindow,
     connect(m_spinBox, SIGNAL(valueChanged(int)),
             m_maxPreviewSize, SLOT(setValue(int)));
 
     connect(m_spinBox, SIGNAL(valueChanged(int)),
             m_maxPreviewSize, SLOT(setValue(int)));
 

+    m_useFileThumbnails = new QCheckBox(i18n("Use thumbnails embedded in files"), previewBox);
+

     QVBoxLayout* previewBoxLayout = new QVBoxLayout(previewBox);
     QVBoxLayout* previewBoxLayout = new QVBoxLayout(previewBox);

-    previewBoxLayout->addWidget(maxFileSize);

     previewBoxLayout->addWidget(vBox);
     previewBoxLayout->addWidget(vBox);

+    previewBoxLayout->addWidget(m_useFileThumbnails);

 
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout
 
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout


@@ -94,10 +98,6 @@ GeneralViewSettingsPage::GeneralViewSettingsPage(DolphinMainWindow* mainWindow,
 
 GeneralViewSettingsPage::~GeneralViewSettingsPage()
 {
 
 GeneralViewSettingsPage::~GeneralViewSettingsPage()
 {

-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-    settings->setDefaults();
-
-    loadSettings();

 }
 
 void GeneralViewSettingsPage::applySettings()
 }
 
 void GeneralViewSettingsPage::applySettings()


@@ -124,6 +124,9 @@ void GeneralViewSettingsPage::applySettings()
     globalConfig.writeEntry("MaximumSize",
                             byteCount,
                             KConfigBase::Normal | KConfigBase::Global);
     globalConfig.writeEntry("MaximumSize",
                             byteCount,
                             KConfigBase::Normal | KConfigBase::Global);

+    globalConfig.writeEntry("UseFileThumbnails",
+                            m_useFileThumbnails->isChecked(),
+                            KConfigBase::Normal | KConfigBase::Global);

     globalConfig.sync();
 }
 
     globalConfig.sync();
 }
 


@@ -151,19 +154,23 @@ void GeneralViewSettingsPage::loadSettings()
     m_maxPreviewSize->setTickPosition(QSlider::TicksBelow);
 
     KConfigGroup globalConfig(KGlobal::config(), "PreviewSettings");
     m_maxPreviewSize->setTickPosition(QSlider::TicksBelow);
 
     KConfigGroup globalConfig(KGlobal::config(), "PreviewSettings");

-    const int maxByteSize = globalConfig.readEntry("MaximumSize", 1024 * 1024 /* 1 MB */);
+    const int maxByteSize = globalConfig.readEntry("MaximumSize", 5 * 1024 * 1024 /* 5 MB */);

     int maxMByteSize = maxByteSize / (1024 * 1024);
     if (maxMByteSize < 1) {
         maxMByteSize = 1;
     } else if (maxMByteSize > max) {
         maxMByteSize = max;
     }
     int maxMByteSize = maxByteSize / (1024 * 1024);
     if (maxMByteSize < 1) {
         maxMByteSize = 1;
     } else if (maxMByteSize > max) {
         maxMByteSize = max;
     }

-    m_maxPreviewSize->setValue(maxMByteSize);

 
     m_spinBox->setRange(min, max);
     m_spinBox->setSingleStep(1);
     m_spinBox->setSuffix(" MB");
 
     m_spinBox->setRange(min, max);
     m_spinBox->setSingleStep(1);
     m_spinBox->setSuffix(" MB");

+
+    m_maxPreviewSize->setValue(maxMByteSize);

     m_spinBox->setValue(m_maxPreviewSize->value());
     m_spinBox->setValue(m_maxPreviewSize->value());

+
+    const bool useFileThumbnails = globalConfig.readEntry("UseFileThumbnails", true);
+    m_useFileThumbnails->setChecked(useFileThumbnails);

 }
 
 #include "generalviewsettingspage.moc"
 }
 
 #include "generalviewsettingspage.moc"