X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/6072005ddce81b456fdcf2e77d5156a1d86f3686..579eadeb6ddffb03e8043090a330c6dba0717299:/src/settings/viewmodes/viewsettingstab.cpp diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp index cf8cd2810..6ac280e7b 100644 --- a/src/settings/viewmodes/viewsettingstab.cpp +++ b/src/settings/viewmodes/viewsettingstab.cpp @@ -11,19 +11,20 @@ #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 -#include +#include ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) : QWidget(parent), @@ -34,7 +35,9 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) : m_widthBox(nullptr), m_maxLinesBox(nullptr), m_expandableFolders(nullptr), - m_recursiveDirectorySizeLimit(nullptr) + m_recursiveDirectorySizeLimit(nullptr), + m_useRelatetiveDates(nullptr), + m_useShortDates(nullptr) { QFormLayout* topLayout = new QFormLayout(this); @@ -98,6 +101,19 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, 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")); @@ -108,7 +124,7 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) : sortingModeGroup->addButton(m_sizeOfContents); m_recursiveDirectorySizeLimit = new QSpinBox(); - connect(m_recursiveDirectorySizeLimit, QOverload::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); @@ -121,6 +137,25 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) : topLayout->addRow(i18nc("@title:group", "Folder size displays:"), m_numberOfItems); topLayout->addRow(QString(), contentsSizeLayout); #endif + + QDateTime thirtyMinutesAgo = QDateTime::currentDateTime().addSecs(-30 * 60); + QLocale local; + KFormat formatter(local); + + m_useRelatetiveDates = new QRadioButton(i18nc( + "option:radio as in relative date", "Relative (e.g. '%1')", formatter.formatRelativeDateTime(thirtyMinutesAgo, QLocale::ShortFormat)) + ); + m_useShortDates = new QRadioButton( + i18nc("option:radio as in absolute date", "Absolute (e.g. '%1')", local.toString(thirtyMinutesAgo, QLocale::ShortFormat)) + ); + + QButtonGroup* dateFormatGroup = new QButtonGroup(this); + dateFormatGroup->addButton(m_useRelatetiveDates); + dateFormatGroup->addButton(m_useShortDates); + + topLayout->addRow(i18nc("@title:group", "Date style:"), m_useRelatetiveDates); + topLayout->addRow(QString(), m_useShortDates); + break; } @@ -132,21 +167,24 @@ 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_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()); }); #endif + connect(m_useRelatetiveDates, &QRadioButton::toggled, this, &ViewSettingsTab::changed); + connect(m_useShortDates, &QRadioButton::toggled, this, &ViewSettingsTab::changed); break; default: break; @@ -171,17 +209,34 @@ void ViewSettingsTab::applySettings() 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()); DetailsModeSettings::setRecursiveDirectorySizeLimit(m_recursiveDirectorySizeLimit->value()); #endif + DetailsModeSettings::setUseShortRelativeDates(m_useRelatetiveDates->isChecked()); break; default: break; } - ViewModeSettings settings(viewMode()); + ViewModeSettings settings(m_mode); const int iconSize = ZoomLevelInfo::iconSizeForZoomLevel(m_defaultSizeSlider->value()); const int previewSize = ZoomLevelInfo::iconSizeForZoomLevel(m_previewSizeSlider->value()); @@ -189,27 +244,17 @@ void ViewSettingsTab::applySettings() 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() @@ -223,6 +268,8 @@ 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()) { @@ -234,12 +281,14 @@ void ViewSettingsTab::loadSettings() } m_recursiveDirectorySizeLimit->setValue(DetailsModeSettings::recursiveDirectorySizeLimit()); #endif + m_useRelatetiveDates->setChecked(DetailsModeSettings::useShortRelativeDates()); + m_useShortDates->setChecked(!DetailsModeSettings::useShortRelativeDates()); 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)); @@ -251,30 +300,10 @@ void ViewSettingsTab::loadSettings() ? 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);