#include "dolphin_iconsmodesettings.h"
#include "dolphinfontrequester.h"
#include "global.h"
+#include "settings/viewmodes/viewmodesettings.h"
#include "views/zoomlevelinfo.h"
#include <KLocalizedString>
#include <KFormat>
#include <QApplication>
+#include <QButtonGroup>
#include <QCheckBox>
#include <QComboBox>
-#include <QHelpEvent>
#include <QFormLayout>
-#include <QSpinBox>
+#include <QHelpEvent>
#include <QRadioButton>
-#include <QButtonGroup>
-#include <QLabel>
+#include <QSpinBox>
ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
QWidget(parent),
m_expandableFolders = new QCheckBox(i18nc("@option:check", "Expandable"));
topLayout->addRow(i18nc("@label:checkbox", "Folders:"), m_expandableFolders);
+ // Item activation area
+ m_entireRow = new QRadioButton(i18nc("@option:radio how files/folders are opened", "By clicking anywhere on the row"));
+ m_iconAndNameOnly = new QRadioButton(i18nc("@option:radio how files/folders are opened", "By clicking on icon or name"));
+
+ auto itemActivationAreaGroup = new QButtonGroup(this);
+ itemActivationAreaGroup->addButton(m_entireRow);
+ itemActivationAreaGroup->addButton(m_iconAndNameOnly);
+
+ // i18n: Users can choose here if items are opened by clicking on their name/icon or by clicking in the row.
+ topLayout->addRow(i18nc("@title:group", "Open files and folders:"), m_entireRow);
+ topLayout->addRow(QString(), m_iconAndNameOnly);
+
+
#ifndef Q_OS_WIN
// Sorting properties
m_numberOfItems = new QRadioButton(i18nc("option:radio", "Number of items"));
sortingModeGroup->addButton(m_sizeOfContents);
m_recursiveDirectorySizeLimit = new QSpinBox();
- connect(m_recursiveDirectorySizeLimit, QOverload<int>::of(&QSpinBox::valueChanged), this, [this](int value) {
+ connect(m_recursiveDirectorySizeLimit, &QSpinBox::valueChanged, this, [this](int value) {
m_recursiveDirectorySizeLimit->setSuffix(i18np(" level deep", " levels deep", value));
});
m_recursiveDirectorySizeLimit->setRange(1, 20);
switch (m_mode) {
case IconsMode:
- connect(m_widthBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
- connect(m_maxLinesBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
+ connect(m_widthBox, &QComboBox::currentIndexChanged, this, &ViewSettingsTab::changed);
+ connect(m_maxLinesBox, &QComboBox::currentIndexChanged, this, &ViewSettingsTab::changed);
break;
case CompactMode:
- connect(m_widthBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
+ connect(m_widthBox, &QComboBox::currentIndexChanged, this, &ViewSettingsTab::changed);
break;
case DetailsMode:
+ connect(m_entireRow, &QCheckBox::toggled, this, &ViewSettingsTab::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_recursiveDirectorySizeLimit, &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());
CompactModeSettings::setMaximumTextWidthIndex(m_widthBox->currentIndex());
break;
case DetailsMode:
+ // We need side-padding when the full row is a click target to still be able to not click items.
+ // So here the default padding is enabled when the full row highlight is enabled.
+ if (m_entireRow->isChecked() && !DetailsModeSettings::highlightEntireRow()) {
+ auto detailsModeSettings = DetailsModeSettings::self();
+ const bool usedDefaults = detailsModeSettings->useDefaults(true);
+ const uint defaultSidePadding = detailsModeSettings->sidePadding();
+ detailsModeSettings->useDefaults(usedDefaults);
+ if (DetailsModeSettings::sidePadding() < defaultSidePadding) {
+ DetailsModeSettings::setSidePadding(defaultSidePadding);
+ }
+ } else if (!m_entireRow->isChecked() && DetailsModeSettings::highlightEntireRow()) {
+ // The full row click target is disabled so now most of the view area can be used to interact
+ // with the view background. Having an extra side padding has no usability benefit in this case.
+ DetailsModeSettings::setSidePadding(0);
+ }
+ DetailsModeSettings::setHighlightEntireRow(m_entireRow->isChecked());
DetailsModeSettings::setExpandableFolders(m_expandableFolders->isChecked());
#ifndef Q_OS_WIN
DetailsModeSettings::setDirectorySizeCount(m_numberOfItems->isChecked());
break;
}
- ViewModeSettings settings(viewMode());
+ ViewModeSettings settings(m_mode);
const int iconSize = ZoomLevelInfo::iconSizeForZoomLevel(m_defaultSizeSlider->value());
const int previewSize = ZoomLevelInfo::iconSizeForZoomLevel(m_previewSizeSlider->value());
settings.setPreviewSize(previewSize);
settings.setUseSystemFont(useSystemFont);
- settings.setFontFamily(font.family());
- settings.setFontSize(font.pointSizeF());
- settings.setItalicFont(font.italic());
- settings.setFontWeight(font.weight());
+ settings.setViewFont(font);
settings.save();
}
void ViewSettingsTab::restoreDefaultSettings()
{
- KConfigSkeleton* settings = nullptr;
- switch (m_mode) {
- case IconsMode: settings = IconsModeSettings::self(); break;
- case CompactMode: settings = CompactModeSettings::self(); break;
- case DetailsMode: settings = DetailsModeSettings::self(); break;
- default: Q_ASSERT(false); break;
- }
-
- settings->useDefaults(true);
+ ViewModeSettings settings(m_mode);
+ settings.useDefaults(true);
loadSettings();
- settings->useDefaults(false);
+ settings.useDefaults(false);
}
void ViewSettingsTab::loadSettings()
m_widthBox->setCurrentIndex(CompactModeSettings::maximumTextWidthIndex());
break;
case DetailsMode:
+ m_entireRow->setChecked(DetailsModeSettings::highlightEntireRow());
+ m_iconAndNameOnly->setChecked(!m_entireRow->isChecked());
m_expandableFolders->setChecked(DetailsModeSettings::expandableFolders());
#ifndef Q_OS_WIN
if (DetailsModeSettings::directorySizeCount()) {
break;
}
- const ViewModeSettings settings(viewMode());
+ const ViewModeSettings settings(m_mode);
const QSize iconSize(settings.iconSize(), settings.iconSize());
m_defaultSizeSlider->setValue(ZoomLevelInfo::zoomLevelForIconSize(iconSize));
? DolphinFontRequester::SystemFont
: DolphinFontRequester::CustomFont);
- QFont font(settings.fontFamily(), qRound(settings.fontSize()));
- font.setItalic(settings.italicFont());
- font.setWeight(settings.fontWeight());
- font.setPointSizeF(settings.fontSize());
+ QFont font(settings.viewFont());
m_fontRequester->setCustomFont(font);
}
-ViewModeSettings::ViewMode ViewSettingsTab::viewMode() const
-{
- ViewModeSettings::ViewMode mode;
-
- switch (m_mode) {
- case ViewSettingsTab::IconsMode: mode = ViewModeSettings::IconsMode; break;
- case ViewSettingsTab::CompactMode: mode = ViewModeSettings::CompactMode; break;
- case ViewSettingsTab::DetailsMode: mode = ViewModeSettings::DetailsMode; break;
- default: mode = ViewModeSettings::IconsMode;
- Q_ASSERT(false);
- break;
- }
-
- return mode;
-}
-
-
void ViewSettingsTab::slotDefaultSliderMoved(int value)
{
showToolTip(m_defaultSizeSlider, value);
projects / dolphin.git / blobdiff