X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/553c85e336b9ebad47295306b37d4625d7db218b..846b21edf57e7aeb83e84ee68e9f61c5981fbacd:/src/generalviewsettingspage.cpp diff --git a/src/generalviewsettingspage.cpp b/src/generalviewsettingspage.cpp index 61439d323..ebf235f2a 100644 --- a/src/generalviewsettingspage.cpp +++ b/src/generalviewsettingspage.cpp @@ -25,8 +25,9 @@ #include "dolphin_generalsettings.h" -#include +#include #include +#include #include #include #include @@ -45,7 +46,9 @@ GeneralViewSettingsPage::GeneralViewSettingsPage(DolphinMainWindow* mainWindow, m_localProps(0), m_globalProps(0), m_maxPreviewSize(0), - m_spinBox(0) + m_spinBox(0), + m_useFileThumbnails(0), + m_showSelectionToggle(0) { const int spacing = KDialog::spacingHint(); const int margin = KDialog::marginHint(); @@ -66,10 +69,10 @@ GeneralViewSettingsPage::GeneralViewSettingsPage(DolphinMainWindow* mainWindow, // create 'File Previews' box QGroupBox* previewBox = new QGroupBox(i18nc("@title:group", "File Previews"), this); - QLabel* maxFileSize = new QLabel(i18n("Maximum file size:"), previewBox); - KHBox* vBox = new KHBox(previewBox); vBox->setSpacing(spacing); + + new QLabel(i18nc("@label:slider", "Maximum file size:"), vBox); m_maxPreviewSize = new QSlider(Qt::Horizontal, vBox); m_spinBox = new QSpinBox(vBox); @@ -79,9 +82,13 @@ GeneralViewSettingsPage::GeneralViewSettingsPage(DolphinMainWindow* mainWindow, 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); - previewBoxLayout->addWidget(maxFileSize); previewBoxLayout->addWidget(vBox); + previewBoxLayout->addWidget(m_useFileThumbnails); + + m_showSelectionToggle = new QCheckBox(i18nc("option:check", "Show selection toggle"), this); // Add a dummy widget with no restriction regarding // a vertical resizing. This assures that the dialog layout @@ -94,10 +101,6 @@ GeneralViewSettingsPage::GeneralViewSettingsPage(DolphinMainWindow* mainWindow, GeneralViewSettingsPage::~GeneralViewSettingsPage() { - GeneralSettings* settings = DolphinSettings::instance().generalSettings(); - settings->setDefaults(); - - loadSettings(); } void GeneralViewSettingsPage::applySettings() @@ -124,7 +127,12 @@ void GeneralViewSettingsPage::applySettings() globalConfig.writeEntry("MaximumSize", byteCount, KConfigBase::Normal | KConfigBase::Global); + globalConfig.writeEntry("UseFileThumbnails", + m_useFileThumbnails->isChecked(), + KConfigBase::Normal | KConfigBase::Global); globalConfig.sync(); + + settings->setShowSelectionToggle(m_showSelectionToggle->isChecked()); } void GeneralViewSettingsPage::restoreDefaults() @@ -151,19 +159,28 @@ void GeneralViewSettingsPage::loadSettings() m_maxPreviewSize->setTickPosition(QSlider::TicksBelow); KConfigGroup globalConfig(KGlobal::config(), "PreviewSettings"); - const int maxByteSize = globalConfig.readEntry("MaximumSize", 1024 * 1024 /* 1 MB */); + // TODO: The default value of 5 MB must match with the default value inside + // kdelibs/kio/kio/previewjob.cpp. Maybe a static getter method in PreviewJob + // should be added for getting the default size? + 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; } - m_maxPreviewSize->setValue(maxMByteSize); m_spinBox->setRange(min, max); m_spinBox->setSingleStep(1); m_spinBox->setSuffix(" MB"); + + m_maxPreviewSize->setValue(maxMByteSize); m_spinBox->setValue(m_maxPreviewSize->value()); + + const bool useFileThumbnails = globalConfig.readEntry("UseFileThumbnails", true); + m_useFileThumbnails->setChecked(useFileThumbnails); + + m_showSelectionToggle->setChecked(settings->showSelectionToggle()); } #include "generalviewsettingspage.moc"