#include "viewsettingstab.h"
-#include "dolphinfontrequester.h"
#include "dolphin_compactmodesettings.h"
#include "dolphin_detailsmodesettings.h"
#include "dolphin_iconsmodesettings.h"
+#include "dolphinfontrequester.h"
+#include "global.h"
+#include "views/zoomlevelinfo.h"
-#include <KComboBox>
-#include <KLocale>
+#include <KLocalizedString>
+#include <QApplication>
#include <QCheckBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QSlider>
-#include <QVBoxLayout>
+#include <QComboBox>
#include <QHelpEvent>
-#include <QApplication>
-
-#include <views/zoomlevelinfo.h>
+#include <QFormLayout>
+#include <QSpinBox>
+#include <QRadioButton>
+#include <QButtonGroup>
+#include <QLabel>
ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
QWidget(parent),
m_mode(mode),
- m_defaultSizeSlider(0),
- m_previewSizeSlider(0),
- m_fontRequester(0),
- m_widthBox(0),
- m_maxLinesBox(0),
- m_expandableFolders(0)
+ m_defaultSizeSlider(nullptr),
+ m_previewSizeSlider(nullptr),
+ m_fontRequester(nullptr),
+ m_widthBox(nullptr),
+ m_maxLinesBox(nullptr),
+ m_expandableFolders(nullptr),
+ m_recursiveDirectorySizeLimit(nullptr)
{
- QVBoxLayout* topLayout = new QVBoxLayout(this);
-
- // Create "Icon Size" group
- QGroupBox* iconSizeGroup = new QGroupBox(this);
- iconSizeGroup->setTitle(i18nc("@title:group", "Icon Size"));
+ QFormLayout* topLayout = new QFormLayout(this);
+ // Create "Icon Size" section
const int minRange = ZoomLevelInfo::minimumLevel();
const int maxRange = ZoomLevelInfo::maximumLevel();
- QLabel* defaultLabel = new QLabel(i18nc("@label:listbox", "Default:"), this);
- m_defaultSizeSlider = new QSlider(Qt::Horizontal, this);
+ m_defaultSizeSlider = new QSlider(Qt::Horizontal);
m_defaultSizeSlider->setPageStep(1);
m_defaultSizeSlider->setTickPosition(QSlider::TicksBelow);
m_defaultSizeSlider->setRange(minRange, maxRange);
- connect(m_defaultSizeSlider, SIGNAL(valueChanged(int)),
- this, SLOT(slotDefaultSliderMoved(int)));
+ connect(m_defaultSizeSlider, &QSlider::valueChanged,
+ this, &ViewSettingsTab::slotDefaultSliderMoved);
+ topLayout->addRow(i18nc("@label:listbox", "Default icon size:"), m_defaultSizeSlider);
- QLabel* previewLabel = new QLabel(i18nc("@label:listbox", "Preview:"), this);
- m_previewSizeSlider = new QSlider(Qt::Horizontal, this);
+ m_previewSizeSlider = new QSlider(Qt::Horizontal);
m_previewSizeSlider->setPageStep(1);
m_previewSizeSlider->setTickPosition(QSlider::TicksBelow);
m_previewSizeSlider->setRange(minRange, maxRange);
- connect(m_previewSizeSlider, SIGNAL(valueChanged(int)),
- this, SLOT(slotPreviewSliderMoved(int)));
+ connect(m_previewSizeSlider, &QSlider::valueChanged,
+ this, &ViewSettingsTab::slotPreviewSliderMoved);
+ topLayout->addRow(i18nc("@label:listbox", "Preview icon size:"), m_previewSizeSlider);
- QGridLayout* layout = new QGridLayout(iconSizeGroup);
- layout->addWidget(defaultLabel, 0, 0, Qt::AlignRight);
- layout->addWidget(m_defaultSizeSlider, 0, 1);
- layout->addWidget(previewLabel, 1, 0, Qt::AlignRight);
- layout->addWidget(m_previewSizeSlider, 1, 1);
- // Create "Text" group
- QGroupBox* textGroup = new QGroupBox(i18nc("@title:group", "Text"), this);
+ topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed));
- QLabel* fontLabel = new QLabel(i18nc("@label:listbox", "Font:"), textGroup);
- m_fontRequester = new DolphinFontRequester(textGroup);
- QGridLayout* textGroupLayout = new QGridLayout(textGroup);
- textGroupLayout->addWidget(fontLabel, 0, 0, Qt::AlignRight);
- textGroupLayout->addWidget(m_fontRequester, 0, 1);
+ // Create "Label" section
+ m_fontRequester = new DolphinFontRequester(this);
+ topLayout->addRow(i18nc("@label:listbox", "Label font:"), m_fontRequester);
switch (m_mode) {
case IconsMode: {
- QLabel* widthLabel = new QLabel(i18nc("@label:listbox", "Width:"), textGroup);
- m_widthBox = new KComboBox(textGroup);
- m_widthBox->addItem(i18nc("@item:inlistbox Text width", "Small"));
- m_widthBox->addItem(i18nc("@item:inlistbox Text width", "Medium"));
- m_widthBox->addItem(i18nc("@item:inlistbox Text width", "Large"));
- m_widthBox->addItem(i18nc("@item:inlistbox Text width", "Huge"));
-
- QLabel* maxLinesLabel = new QLabel(i18nc("@label:listbox", "Maximum lines:"), textGroup);
- m_maxLinesBox = new KComboBox(textGroup);
+ m_widthBox = new QComboBox();
+ m_widthBox->addItem(i18nc("@item:inlistbox Label width", "Small"));
+ m_widthBox->addItem(i18nc("@item:inlistbox Label width", "Medium"));
+ m_widthBox->addItem(i18nc("@item:inlistbox Label width", "Large"));
+ m_widthBox->addItem(i18nc("@item:inlistbox Label width", "Huge"));
+ topLayout->addRow(i18nc("@label:listbox", "Label width:"), m_widthBox);
+
+ m_maxLinesBox = new QComboBox();
m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "Unlimited"));
m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "1"));
m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "2"));
m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "3"));
m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "4"));
m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "5"));
-
- textGroupLayout->addWidget(widthLabel, 2, 0, Qt::AlignRight);
- textGroupLayout->addWidget(m_widthBox, 2, 1);
- textGroupLayout->addWidget(maxLinesLabel, 3, 0, Qt::AlignRight);
- textGroupLayout->addWidget(m_maxLinesBox, 3, 1);
+ topLayout->addRow(i18nc("@label:listbox", "Maximum lines:"), m_maxLinesBox);
break;
}
case CompactMode: {
- QLabel* maxWidthLabel = new QLabel(i18nc("@label:listbox", "Maximum width:"), textGroup);
- m_widthBox = new KComboBox(textGroup);
+ m_widthBox = new QComboBox();
m_widthBox->addItem(i18nc("@item:inlistbox Maximum width", "Unlimited"));
m_widthBox->addItem(i18nc("@item:inlistbox Maximum width", "Small"));
m_widthBox->addItem(i18nc("@item:inlistbox Maximum width", "Medium"));
m_widthBox->addItem(i18nc("@item:inlistbox Maximum width", "Large"));
-
- textGroupLayout->addWidget(maxWidthLabel, 2, 0, Qt::AlignRight);
- textGroupLayout->addWidget(m_widthBox, 2, 1);
+ topLayout->addRow(i18nc("@label:listbox", "Maximum width:"), m_widthBox);
break;
}
case DetailsMode:
- m_expandableFolders = new QCheckBox(i18nc("@option:check", "Expandable folders"), this);
- break;
- default:
+ m_expandableFolders = new QCheckBox(i18nc("@option:check", "Expandable"));
+ topLayout->addRow(i18nc("@label:checkbox", "Folders:"), m_expandableFolders);
+
+#ifndef Q_OS_WIN
+ // Sorting properties
+ m_numberOfItems = new QRadioButton(i18nc("option:radio", "Number of items"));
+ m_sizeOfContents = new QRadioButton(i18nc("option:radio", "Size of contents, up to "));
+
+ QButtonGroup* sortingModeGroup = new QButtonGroup(this);
+ sortingModeGroup->addButton(m_numberOfItems);
+ sortingModeGroup->addButton(m_sizeOfContents);
+
+ m_recursiveDirectorySizeLimit = new QSpinBox();
+ connect(m_recursiveDirectorySizeLimit, QOverload<int>::of(&QSpinBox::valueChanged), this, [this](int value) {
+ m_recursiveDirectorySizeLimit->setSuffix(i18np(" level deep", " levels deep", value));
+ });
+ m_recursiveDirectorySizeLimit->setRange(1, 20);
+ m_recursiveDirectorySizeLimit->setSingleStep(1);
+
+ QHBoxLayout *contentsSizeLayout = new QHBoxLayout();
+ contentsSizeLayout->addWidget(m_sizeOfContents);
+ contentsSizeLayout->addWidget(m_recursiveDirectorySizeLimit);
+
+ topLayout->addRow(i18nc("@title:group", "Folder size displays:"), m_numberOfItems);
+ topLayout->addRow(QString(), contentsSizeLayout);
+#endif
break;
}
- topLayout->addWidget(iconSizeGroup);
- topLayout->addWidget(textGroup);
- topLayout->addWidget(m_expandableFolders);
- topLayout->addStretch(1);
-
loadSettings();
- connect(m_defaultSizeSlider, SIGNAL(valueChanged(int)), this, SIGNAL(changed()));
- connect(m_previewSizeSlider, SIGNAL(valueChanged(int)), this, SIGNAL(changed()));
- connect(m_fontRequester, SIGNAL(changed()), this, SIGNAL(changed()));
+ connect(m_defaultSizeSlider, &QSlider::valueChanged, this, &ViewSettingsTab::changed);
+ connect(m_previewSizeSlider, &QSlider::valueChanged, this, &ViewSettingsTab::changed);
+ connect(m_fontRequester, &DolphinFontRequester::changed, this, &ViewSettingsTab::changed);
switch (m_mode) {
case IconsMode:
- connect(m_widthBox, SIGNAL(currentIndexChanged(int)), this, SIGNAL(changed()));
- connect(m_maxLinesBox, SIGNAL(currentIndexChanged(int)), this, SIGNAL(changed()));
+ connect(m_widthBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
+ connect(m_maxLinesBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
break;
case CompactMode:
- connect(m_widthBox, SIGNAL(currentIndexChanged(int)), this, SIGNAL(changed()));
+ connect(m_widthBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
break;
case DetailsMode:
- connect(m_expandableFolders, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+ connect(m_expandableFolders, &QCheckBox::toggled, this, &ViewSettingsTab::changed);
+#ifndef Q_OS_WIN
+ connect(m_recursiveDirectorySizeLimit, QOverload<int>::of(&QSpinBox::valueChanged), this, &ViewSettingsTab::changed);
+ connect(m_numberOfItems, &QRadioButton::toggled, this, &ViewSettingsTab::changed);
+ connect(m_sizeOfContents, &QRadioButton::toggled, this, [=]() {
+ m_recursiveDirectorySizeLimit->setEnabled(m_sizeOfContents->isChecked());
+ });
+#endif
break;
default:
break;
break;
case DetailsMode:
DetailsModeSettings::setExpandableFolders(m_expandableFolders->isChecked());
+#ifndef Q_OS_WIN
+ DetailsModeSettings::setDirectorySizeCount(m_numberOfItems->isChecked());
+ DetailsModeSettings::setRecursiveDirectorySizeLimit(m_recursiveDirectorySizeLimit->value());
+#endif
break;
default:
break;
settings.setItalicFont(font.italic());
settings.setFontWeight(font.weight());
- settings.writeConfig();
+ settings.save();
}
void ViewSettingsTab::restoreDefaultSettings()
{
- KConfigSkeleton* settings = 0;
+ KConfigSkeleton* settings = nullptr;
switch (m_mode) {
case IconsMode: settings = IconsModeSettings::self(); break;
case CompactMode: settings = CompactModeSettings::self(); break;
break;
case DetailsMode:
m_expandableFolders->setChecked(DetailsModeSettings::expandableFolders());
+ if (DetailsModeSettings::directorySizeCount()) {
+ m_numberOfItems->setChecked(true);
+ m_recursiveDirectorySizeLimit->setEnabled(false);
+ } else {
+ m_sizeOfContents->setChecked(true);
+ m_recursiveDirectorySizeLimit->setEnabled(true);
+ }
+ m_recursiveDirectorySizeLimit->setValue(DetailsModeSettings::recursiveDirectorySizeLimit());
break;
default:
break;
}
- ViewModeSettings settings(viewMode());
- settings.readConfig();
+ const ViewModeSettings settings(viewMode());
const QSize iconSize(settings.iconSize(), settings.iconSize());
m_defaultSizeSlider->setValue(ZoomLevelInfo::zoomLevelForIconSize(iconSize));
QHelpEvent toolTipEvent(QEvent::ToolTip, QPoint(0, 0), slider->mapToGlobal(global));
QApplication::sendEvent(slider, &toolTipEvent);
}
-#include "viewsettingstab.moc"
+