kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-05 16:19:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Applications/18.08'

Browse source
This commit is contained in:
Nathaniel Graham 2018-08-04 17:05:22 -06:00
parent cdb715eb42 6e04f50081
commit 496ba56f42
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/panels/places/placesitemeditdialog.cpp
View file

@ -59,7 +59,7 @@ void PlacesItemEditDialog::setIcon(const QString& icon)
QString PlacesItemEditDialog::icon() const
{
return m_iconButton->icon();
return m_iconButton ? m_iconButton->icon() : m_icon;
}
void PlacesItemEditDialog::setText(const QString& text)
@ -144,15 +144,17 @@ void PlacesItemEditDialog::initialize()
m_urlEdit->setMinimumWidth(m_urlEdit->fontMetrics().height() * (40 / 2));
connect(m_urlEdit, &KUrlRequester::textChanged, this, &PlacesItemEditDialog::slotUrlChanged);
m_iconButton = new KIconButton(mainWidget);
formLayout->addRow(i18nc("@label", "Choose an icon:"), m_iconButton);
m_iconButton->setIconSize(IconSize(KIconLoader::Desktop));
m_iconButton->setIconType(KIconLoader::NoGroup, KIconLoader::Place);
if (m_icon.isEmpty()) {
QMimeDatabase db;
m_iconButton->setIcon(db.mimeTypeForUrl(m_url).iconName());
} else {
m_iconButton->setIcon(m_icon);
if (m_url.scheme() != QLatin1String("trash")) {
m_iconButton = new KIconButton(mainWidget);
formLayout->addRow(i18nc("@label", "Choose an icon:"), m_iconButton);
m_iconButton->setIconSize(IconSize(KIconLoader::Desktop));
m_iconButton->setIconType(KIconLoader::NoGroup, KIconLoader::Place);
if (m_icon.isEmpty()) {
QMimeDatabase db;
m_iconButton->setIcon(db.mimeTypeForUrl(m_url).iconName());
} else {
m_iconButton->setIcon(m_icon);
}
}
if (m_allowGlobal) {