mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-05 16:19:10 +00:00
Merge branch 'Applications/18.08'
This commit is contained in:
commit
496ba56f42
|
@ -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,6 +144,7 @@ void PlacesItemEditDialog::initialize()
|
|||
m_urlEdit->setMinimumWidth(m_urlEdit->fontMetrics().height() * (40 / 2));
|
||||
connect(m_urlEdit, &KUrlRequester::textChanged, this, &PlacesItemEditDialog::slotUrlChanged);
|
||||
|
||||
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));
|
||||
|
@ -154,6 +155,7 @@ void PlacesItemEditDialog::initialize()
|
|||
} else {
|
||||
m_iconButton->setIcon(m_icon);
|
||||
}
|
||||
}
|
||||
|
||||
if (m_allowGlobal) {
|
||||
const QString appName = KAboutData::applicationData().displayName();
|
||||
|
|
Loading…
Reference in a new issue