Katana_mirror/kde-extraapps
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-extraapps.git synced 2025-02-23 10:22:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: replace KMimeType::iconNameForUrl() with KIO::pixmapForUrl()

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-05-30 02:16:14 +03:00
parent 33f615be71
commit 4e8c2c24c2
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ark/kerfuffle/adddialog.cpp
View file

@ -34,6 +34,7 @@
#include <KFilePlacesModel> #include <KFilePlacesModel>
#include <KGlobal> #include <KGlobal>
#include <KLocale> #include <KLocale>
#include <kio/global.h>
#include <QFileInfo> #include <QFileInfo>
#include <QStandardItemModel> #include <QStandardItemModel>
@ -116,8 +117,7 @@ void AddDialog::setupIconList(const QStringList& itemsToAdd)
QStandardItem* item = new QStandardItem; QStandardItem* item = new QStandardItem;
item->setText(url.fileName()); item->setText(url.fileName());
QString iconName = KMimeType::iconNameForUrl(url); item->setIcon(KIcon(KIO::pixmapForUrl(url)));
item->setIcon(KIcon(iconName));
item->setData(QVariant(url), KFilePlacesModel::UrlRole); item->setData(QVariant(url), KFilePlacesModel::UrlRole);

13
gwenview/lib/historymodel.cpp
View file

@ -127,24 +127,23 @@ private:
HistoryItem(const KUrl& url, const QDateTime& dateTime, const QString& configPath) HistoryItem(const KUrl& url, const QDateTime& dateTime, const QString& configPath)
: mUrl(url) : mUrl(url)
, mDateTime(dateTime) , mDateTime(dateTime)
, mConfigPath(configPath) { , mConfigPath(configPath)
{
mUrl.cleanPath(); mUrl.cleanPath();
KUrl urlForView = mUrl; KUrl urlForView = mUrl;
urlForView.adjustPath(KUrl::RemoveTrailingSlash); urlForView.adjustPath(KUrl::RemoveTrailingSlash);
setText(urlForView.pathOrUrl()); setText(urlForView.pathOrUrl());
setIcon(KIcon(KIO::pixmapForUrl(mUrl)));
QString iconName = KMimeType::iconNameForUrl(mUrl);
setIcon(KIcon(iconName));
setData(qVariantFromValue(mUrl), KFilePlacesModel::UrlRole); setData(qVariantFromValue(mUrl), KFilePlacesModel::UrlRole);
setData(QVariant(KFileItem(mUrl)), KDirModel::FileItemRole); setData(QVariant(KFileItem(mUrl)), KDirModel::FileItemRole);
QString date = KGlobal::locale()->formatDateTime(mDateTime, QLocale::NarrowFormat); QString date = KGlobal::locale()->formatDateTime(mDateTime, QLocale::NarrowFormat);
setData(QVariant(i18n("Last visited: %1", date)), Qt::ToolTipRole); setData(QVariant(i18n("Last visited: %1", date)), Qt::ToolTipRole);
} }
bool operator<(const QStandardItem& other) const { bool operator<(const QStandardItem& other) const
{
return mDateTime > static_cast<const HistoryItem*>(&other)->mDateTime; return mDateTime > static_cast<const HistoryItem*>(&other)->mDateTime;
} }
}; };