kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-12 12:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/21.04'

Browse source
This commit is contained in:
Ismael Asensio 2021-05-13 15:09:42 +02:00
parent 08a4edad3e 29636baff0
commit 4d9ea4261a
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/panels/places/placesview.cpp
View file

@ -1,5 +1,6 @@
/* /*
* SPDX-FileCopyrightText: 2012 Frank Reininghaus <frank78ac@googlemail.com> * SPDX-FileCopyrightText: 2012 Frank Reininghaus <frank78ac@googlemail.com>
* SPDX-FileCopyrightText: 2021 Harald Sitter <sitter@kde.org>
* *
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
@ -11,6 +12,10 @@
PlacesView::PlacesView(QGraphicsWidget* parent) : PlacesView::PlacesView(QGraphicsWidget* parent) :
KStandardItemListView(parent) KStandardItemListView(parent)
{ {
KItemListStyleOption option = styleOption();
option.padding = 4;
setStyleOption(option);
const int iconSize = PlacesPanelSettings::iconSize(); const int iconSize = PlacesPanelSettings::iconSize();
if (iconSize >= 0) { if (iconSize >= 0) {
setIconSize(iconSize); setIconSize(iconSize);
@ -26,7 +31,6 @@ void PlacesView::setIconSize(int size)
KItemListStyleOption option = styleOption(); KItemListStyleOption option = styleOption();
option.iconSize = size; option.iconSize = size;
option.padding = 4;
setStyleOption(option); setStyleOption(option);
} }
} }

5
src/search/dolphinfacetswidget.cpp
View file

@ -8,6 +8,7 @@
#include "dolphinfacetswidget.h" #include "dolphinfacetswidget.h"
#include <KLocalizedString> #include <KLocalizedString>
#include <KProtocolInfo>
#include <QComboBox> #include <QComboBox>
#include <QDate> #include <QDate>
@ -257,7 +258,9 @@ void DolphinFacetsWidget::updateTagsSelector()
void DolphinFacetsWidget::updateTagsMenu() void DolphinFacetsWidget::updateTagsMenu()
{ {
updateTagsMenuItems({}, {}); updateTagsMenuItems({}, {});
m_tagsLister.openUrl(QUrl(QStringLiteral("tags:/")), KCoreDirLister::OpenUrlFlag::Reload); if (KProtocolInfo::isKnownProtocol(QStringLiteral("tags"))) {
m_tagsLister.openUrl(QUrl(QStringLiteral("tags:/")), KCoreDirLister::OpenUrlFlag::Reload);
}
} }
void DolphinFacetsWidget::updateTagsMenuItems(const QUrl&, const KFileItemList& items) void DolphinFacetsWidget::updateTagsMenuItems(const QUrl&, const KFileItemList& items)