Allow configuring different maximum sizes for remote and local files

BUG: 189501
p://reviewboard.kde.org/r/3484/

svn path=/trunk/KDE/kdebase/apps/; revision=1114485
This commit is contained in:
Peter Penz 2010-04-13 18:31:25 +00:00
parent 1829b1c2fb
commit 90dad89131
2 changed files with 53 additions and 62 deletions

View file

@ -25,7 +25,6 @@
#include <kconfiggroup.h> #include <kconfiggroup.h>
#include <kdialog.h> #include <kdialog.h>
#include <kglobal.h> #include <kglobal.h>
#include <khbox.h>
#include <klocale.h> #include <klocale.h>
#include <KNumInput> #include <KNumInput>
#include <kservicetypetrader.h> #include <kservicetypetrader.h>
@ -38,21 +37,26 @@
#include <QRadioButton> #include <QRadioButton>
#include <QShowEvent> #include <QShowEvent>
#include <QSlider> #include <QSlider>
#include <QBoxLayout> #include <QGridLayout>
#include <kdebug.h>
// default settings // default settings
const bool USE_THUMBNAILS = true; namespace {
const int MAX_PREVIEW_SIZE = 5; // 5 MB const bool UseThumbnails = true;
const int MaxLocalPreviewSize = 5; // 5 MB
const int MaxRemotePreviewSize = 0; // 0 MB
}
PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) : PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
SettingsPageBase(parent), SettingsPageBase(parent),
m_initialized(false), m_initialized(false),
m_previewPluginsList(0), m_previewPluginsList(0),
m_enabledPreviewPlugins(), m_enabledPreviewPlugins(),
m_maxPreviewSize(0), m_localFileSizeBox(0),
m_spinBox(0), m_remoteFileSizeBox(0)
m_useFileThumbnails(0)
{ {
kDebug() << "--------- constructing!";
QVBoxLayout* topLayout = new QVBoxLayout(this); QVBoxLayout* topLayout = new QVBoxLayout(this);
topLayout->setSpacing(KDialog::spacingHint()); topLayout->setSpacing(KDialog::spacingHint());
topLayout->setMargin(KDialog::marginHint()); topLayout->setMargin(KDialog::marginHint());
@ -65,38 +69,32 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
connect(m_previewPluginsList, SIGNAL(itemClicked(QListWidgetItem*)), connect(m_previewPluginsList, SIGNAL(itemClicked(QListWidgetItem*)),
this, SIGNAL(changed())); this, SIGNAL(changed()));
KHBox* hBox = new KHBox(this); QLabel* localFileSizeLabel = new QLabel(i18nc("@label", "Local file size maximum:"), this);
hBox->setSpacing(KDialog::spacingHint());
new QLabel(i18nc("@label:slider", "Maximum file size:"), hBox); m_localFileSizeBox = new KIntSpinBox(this);
m_maxPreviewSize = new QSlider(Qt::Horizontal, hBox); m_localFileSizeBox->setSingleStep(1);
m_maxPreviewSize->setPageStep(10); m_localFileSizeBox->setSuffix(QLatin1String(" MB"));
m_maxPreviewSize->setSingleStep(1); m_localFileSizeBox->setRange(0, 9999); /* MB */
m_maxPreviewSize->setTickPosition(QSlider::TicksBelow); connect(m_localFileSizeBox, SIGNAL(valueChanged(int)),
m_maxPreviewSize->setRange(1, 100); /* MB */
m_spinBox = new KIntSpinBox(hBox);
m_spinBox->setSingleStep(1);
m_spinBox->setSuffix(" MB");
m_spinBox->setRange(1, 100); /* MB */
connect(m_maxPreviewSize, SIGNAL(valueChanged(int)),
m_spinBox, SLOT(setValue(int)));
connect(m_spinBox, SIGNAL(valueChanged(int)),
m_maxPreviewSize, SLOT(setValue(int)));
connect(m_maxPreviewSize, SIGNAL(valueChanged(int)),
this, SIGNAL(changed()));
connect(m_spinBox, SIGNAL(valueChanged(int)),
this, SIGNAL(changed())); this, SIGNAL(changed()));
m_useFileThumbnails = new QCheckBox(i18nc("@option:check", "Use thumbnails embedded in files"), this); QLabel* remoteFileSizeLabel = new QLabel(i18nc("@label", "Remote file size maximum:"), this);
connect(m_useFileThumbnails, SIGNAL(toggled(bool)), this, SIGNAL(changed())); m_remoteFileSizeBox = new KIntSpinBox(this);
m_remoteFileSizeBox->setSingleStep(1);
m_remoteFileSizeBox->setSuffix(QLatin1String(" MB"));
m_remoteFileSizeBox->setRange(0, 9999); /* MB */
connect(m_remoteFileSizeBox, SIGNAL(valueChanged(int)),
this, SIGNAL(changed()));
QGridLayout* gridLayout = new QGridLayout();
gridLayout->addWidget(localFileSizeLabel, 0, 0);
gridLayout->addWidget(m_localFileSizeBox, 0, 1);
gridLayout->addWidget(remoteFileSizeLabel, 1, 0);
gridLayout->addWidget(m_remoteFileSizeBox, 1, 1);
topLayout->addWidget(listDescription); topLayout->addWidget(listDescription);
topLayout->addWidget(m_previewPluginsList); topLayout->addWidget(m_previewPluginsList);
topLayout->addWidget(hBox); topLayout->addLayout(gridLayout);
topLayout->addWidget(m_useFileThumbnails);
loadSettings(); loadSettings();
} }
@ -118,23 +116,22 @@ void PreviewsSettingsPage::applySettings()
} }
} }
KConfigGroup globalConfig(KGlobal::config(), "PreviewSettings"); KConfigGroup globalConfig(KGlobal::config(), QLatin1String("PreviewSettings"));
globalConfig.writeEntry("Plugins", m_enabledPreviewPlugins); globalConfig.writeEntry("Plugins", m_enabledPreviewPlugins);
const int byteCount = m_maxPreviewSize->value() * 1024 * 1024; // value() returns size in MB
globalConfig.writeEntry("MaximumSize", globalConfig.writeEntry("MaximumSize",
byteCount, m_localFileSizeBox->value() * 1024 * 1024,
KConfigBase::Normal | KConfigBase::Global); KConfigBase::Normal | KConfigBase::Global);
globalConfig.writeEntry("UseFileThumbnails", globalConfig.writeEntry("RemoteMaximumSize",
m_useFileThumbnails->isChecked(), m_remoteFileSizeBox->value() * 1024 * 1024,
KConfigBase::Normal | KConfigBase::Global); KConfigBase::Normal | KConfigBase::Global);
globalConfig.sync(); globalConfig.sync();
} }
void PreviewsSettingsPage::restoreDefaults() void PreviewsSettingsPage::restoreDefaults()
{ {
m_maxPreviewSize->setValue(MAX_PREVIEW_SIZE); m_localFileSizeBox->setValue(MaxLocalPreviewSize);
m_useFileThumbnails->setChecked(USE_THUMBNAILS); m_remoteFileSizeBox->setValue(MaxRemotePreviewSize);
} }
void PreviewsSettingsPage::showEvent(QShowEvent* event) void PreviewsSettingsPage::showEvent(QShowEvent* event)
@ -148,7 +145,7 @@ void PreviewsSettingsPage::showEvent(QShowEvent* event)
void PreviewsSettingsPage::loadPreviewPlugins() void PreviewsSettingsPage::loadPreviewPlugins()
{ {
const KService::List plugins = KServiceTypeTrader::self()->query("ThumbCreator"); const KService::List plugins = KServiceTypeTrader::self()->query(QLatin1String("ThumbCreator"));
foreach (const KSharedPtr<KService>& service, plugins) { foreach (const KSharedPtr<KService>& service, plugins) {
QListWidgetItem* item = new QListWidgetItem(service->name(), QListWidgetItem* item = new QListWidgetItem(service->name(),
m_previewPluginsList); m_previewPluginsList);
@ -162,27 +159,24 @@ void PreviewsSettingsPage::loadSettings()
{ {
KConfigGroup globalConfig(KGlobal::config(), "PreviewSettings"); KConfigGroup globalConfig(KGlobal::config(), "PreviewSettings");
m_enabledPreviewPlugins = globalConfig.readEntry("Plugins", QStringList() m_enabledPreviewPlugins = globalConfig.readEntry("Plugins", QStringList()
<< "directorythumbnail" << QLatin1String("directorythumbnail")
<< "imagethumbnail" << QLatin1String("imagethumbnail")
<< "jpegthumbnail"); << QLatin1String("jpegthumbnail"));
kDebug() << "----------------- enabled plugins:";
foreach (const QString& plugin, m_enabledPreviewPlugins) {
kDebug() << plugin;
}
// TODO: The default value of 5 MB must match with the default value inside // 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 // kdelibs/kio/kio/previewjob.cpp. Maybe a static getter method in PreviewJob
// should be added for getting the default size? // should be added for getting the default size?
const int min = 1; // MB const int maxLocalByteSize = globalConfig.readEntry("MaximumSize", MaxLocalPreviewSize * 1024 * 1024);
const int max = 100; // MB const int maxLocalMByteSize = maxLocalByteSize / (1024 * 1024);
m_localFileSizeBox->setValue(maxLocalMByteSize);
const int maxByteSize = globalConfig.readEntry("MaximumSize", MAX_PREVIEW_SIZE * 1024 * 1024); const int maxRemoteByteSize = globalConfig.readEntry("MaximumSize", MaxRemotePreviewSize * 1024 * 1024);
int maxMByteSize = maxByteSize / (1024 * 1024); const int maxRemoteMByteSize = maxRemoteByteSize / (1024 * 1024);
if (maxMByteSize < min) { m_localFileSizeBox->setValue(maxRemoteMByteSize);
maxMByteSize = min;
} else if (maxMByteSize > max) {
maxMByteSize = max;
}
m_maxPreviewSize->setValue(maxMByteSize);
const bool useFileThumbnails = globalConfig.readEntry("UseFileThumbnails", USE_THUMBNAILS);
m_useFileThumbnails->setChecked(useFileThumbnails);
} }
#include "previewssettingspage.moc" #include "previewssettingspage.moc"

View file

@ -20,12 +20,10 @@
#ifndef PREVIEWSSETTINGSPAGE_H #ifndef PREVIEWSSETTINGSPAGE_H
#define PREVIEWSSETTINGSPAGE_H #define PREVIEWSSETTINGSPAGE_H
#include <kurl.h>
#include <settings/settingspagebase.h> #include <settings/settingspagebase.h>
class QCheckBox; class QCheckBox;
class QListWidget; class QListWidget;
class QSlider;
class KIntSpinBox; class KIntSpinBox;
/** /**
@ -62,9 +60,8 @@ private:
bool m_initialized; bool m_initialized;
QListWidget* m_previewPluginsList; QListWidget* m_previewPluginsList;
QStringList m_enabledPreviewPlugins; QStringList m_enabledPreviewPlugins;
QSlider* m_maxPreviewSize; KIntSpinBox* m_localFileSizeBox;
KIntSpinBox* m_spinBox; KIntSpinBox* m_remoteFileSizeBox;
QCheckBox* m_useFileThumbnails;
}; };
#endif #endif