mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-12 12:54:29 +00:00
Merge branch 'release/21.04'
This commit is contained in:
commit
4d9ea4261a
|
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue