X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/b6700f77dd8e07fdab0d40ea4bc91f8d0c03ae70..41c7a9267f32424eda40c73ff691688173a47dbe:/src/settings/viewmodes/viewsettingstab.cpp diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp index 3e3f96ffc..fc9e94131 100644 --- a/src/settings/viewmodes/viewsettingstab.cpp +++ b/src/settings/viewmodes/viewsettingstab.cpp @@ -1,21 +1,8 @@ -/*************************************************************************** - * Copyright (C) 2008-2011 by Peter Penz * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - ***************************************************************************/ +/* + * SPDX-FileCopyrightText: 2008-2011 Peter Penz + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #include "viewsettingstab.h" @@ -24,32 +11,31 @@ #include "dolphin_iconsmodesettings.h" #include "dolphinfontrequester.h" #include "global.h" +#include "settings/viewmodes/viewmodesettings.h" #include "views/zoomlevelinfo.h" #include #include +#include #include #include -#include #include -#include +#include #include -#include -#include - -ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) : - QWidget(parent), - m_mode(mode), - m_defaultSizeSlider(nullptr), - m_previewSizeSlider(nullptr), - m_fontRequester(nullptr), - m_widthBox(nullptr), - m_maxLinesBox(nullptr), - m_expandableFolders(nullptr), - m_recursiveDirectorySizeLimit(nullptr) +#include + +ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget *parent) + : SettingsPageBase(parent) + , m_mode(mode) + , m_defaultSizeSlider(nullptr) + , m_previewSizeSlider(nullptr) + , m_fontRequester(nullptr) + , m_widthBox(nullptr) + , m_maxLinesBox(nullptr) + , m_expandableFolders(nullptr) { - QFormLayout* topLayout = new QFormLayout(this); + QFormLayout *topLayout = new QFormLayout(this); // Create "Icon Size" section const int minRange = ZoomLevelInfo::minimumLevel(); @@ -59,22 +45,18 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) : m_defaultSizeSlider->setPageStep(1); m_defaultSizeSlider->setTickPosition(QSlider::TicksBelow); m_defaultSizeSlider->setRange(minRange, maxRange); - connect(m_defaultSizeSlider, &QSlider::valueChanged, - this, &ViewSettingsTab::slotDefaultSliderMoved); + connect(m_defaultSizeSlider, &QSlider::valueChanged, this, &ViewSettingsTab::slotDefaultSliderMoved); topLayout->addRow(i18nc("@label:listbox", "Default icon size:"), m_defaultSizeSlider); m_previewSizeSlider = new QSlider(Qt::Horizontal); m_previewSizeSlider->setPageStep(1); m_previewSizeSlider->setTickPosition(QSlider::TicksBelow); m_previewSizeSlider->setRange(minRange, maxRange); - connect(m_previewSizeSlider, &QSlider::valueChanged, - this, &ViewSettingsTab::slotPreviewSliderMoved); + connect(m_previewSizeSlider, &QSlider::valueChanged, this, &ViewSettingsTab::slotPreviewSliderMoved); topLayout->addRow(i18nc("@label:listbox", "Preview icon size:"), m_previewSizeSlider); - topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed)); - // Create "Label" section m_fontRequester = new DolphinFontRequester(this); topLayout->addRow(i18nc("@label:listbox", "Label font:"), m_fontRequester); @@ -111,29 +93,19 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) : 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::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 + // 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); + + // clang-format off + // 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); + // clang-format on + topLayout->addRow(QString(), m_iconAndNameOnly); break; } @@ -145,21 +117,15 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) : switch (m_mode) { case IconsMode: - connect(m_widthBox, QOverload::of(&QComboBox::currentIndexChanged), this, &ViewSettingsTab::changed); - connect(m_maxLinesBox, QOverload::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::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::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; @@ -172,57 +138,65 @@ ViewSettingsTab::~ViewSettingsTab() void ViewSettingsTab::applySettings() { - const QFont font = m_fontRequester->currentFont(); - const bool useSystemFont = (m_fontRequester->mode() == DolphinFontRequester::SystemFont); - switch (m_mode) { case IconsMode: IconsModeSettings::setTextWidthIndex(m_widthBox->currentIndex()); IconsModeSettings::setMaximumTextLines(m_maxLinesBox->currentIndex()); + IconsModeSettings::self()->save(); break; case CompactMode: CompactModeSettings::setMaximumTextWidthIndex(m_widthBox->currentIndex()); + CompactModeSettings::self()->save(); 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: + auto detailsModeSettings = DetailsModeSettings::self(); + // 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()) { + const bool usedDefaults = detailsModeSettings->useDefaults(true); + const uint defaultLeftPadding = detailsModeSettings->leftPadding(); + const uint defaultRightPadding = detailsModeSettings->rightPadding(); + detailsModeSettings->useDefaults(usedDefaults); + if (detailsModeSettings->leftPadding() < defaultLeftPadding) { + detailsModeSettings->setLeftPadding(defaultLeftPadding); + } + if (detailsModeSettings->rightPadding() < defaultRightPadding) { + detailsModeSettings->setRightPadding(defaultRightPadding); + } + } 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->setLeftPadding(0); + detailsModeSettings->setRightPadding(0); + } + detailsModeSettings->setHighlightEntireRow(m_entireRow->isChecked()); + detailsModeSettings->setExpandableFolders(m_expandableFolders->isChecked()); + detailsModeSettings->save(); 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.setIconSize(iconSize); settings.setPreviewSize(previewSize); + const QFont font = m_fontRequester->currentFont(); + const bool useSystemFont = (m_fontRequester->mode() == DolphinFontRequester::SystemFont); + 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() +void ViewSettingsTab::restoreDefaults() { - 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() @@ -236,21 +210,15 @@ 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()); - 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; } - const ViewModeSettings settings(viewMode()); + const ViewModeSettings settings(m_mode); const QSize iconSize(settings.iconSize(), settings.iconSize()); m_defaultSizeSlider->setValue(ZoomLevelInfo::zoomLevelForIconSize(iconSize)); @@ -258,34 +226,12 @@ void ViewSettingsTab::loadSettings() const QSize previewSize(settings.previewSize(), settings.previewSize()); m_previewSizeSlider->setValue(ZoomLevelInfo::zoomLevelForIconSize(previewSize)); - m_fontRequester->setMode(settings.useSystemFont() - ? DolphinFontRequester::SystemFont - : DolphinFontRequester::CustomFont); + m_fontRequester->setMode(settings.useSystemFont() ? 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); @@ -296,7 +242,7 @@ void ViewSettingsTab::slotPreviewSliderMoved(int value) showToolTip(m_previewSizeSlider, value); } -void ViewSettingsTab::showToolTip(QSlider* slider, int value) +void ViewSettingsTab::showToolTip(QSlider *slider, int value) { const int size = ZoomLevelInfo::iconSizeForZoomLevel(value); slider->setToolTip(i18ncp("@info:tooltip", "Size: 1 pixel", "Size: %1 pixels", size)); @@ -309,3 +255,4 @@ void ViewSettingsTab::showToolTip(QSlider* slider, int value) QApplication::sendEvent(slider, &toolTipEvent); } +#include "moc_viewsettingstab.cpp"