diff options
| author | Nathaniel Graham <[email protected]> | 2018-08-04 17:05:22 -0600 |
|---|---|---|
| committer | Nathaniel Graham <[email protected]> | 2018-08-04 17:05:22 -0600 |
| commit | 496ba56f42a5ca7f5315f069aef153d32344300b (patch) | |
| tree | d3011abb740d69aa2ab12fb768aec9268fc6ca9b | |
| parent | cdb715eb429b0462cbc25be36e2b362831bcdf14 (diff) | |
| parent | 6e04f50081a92e5958cbba4c5292a8f5a10f51b4 (diff) | |
Merge branch 'Applications/18.08'
| -rw-r--r-- | src/panels/places/placesitemeditdialog.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp index 289b511af..dfb5dda10 100644 --- a/src/panels/places/placesitemeditdialog.cpp +++ b/src/panels/places/placesitemeditdialog.cpp @@ -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) { |