Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dolphin: 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-29 03:13:26 +03:00
parent b1409732e6
commit e1729bdbb5
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dolphin/src/dolphinmainwindow.cpp
View file

@ -297,8 +297,7 @@ void DolphinMainWindow::changeUrl(const KUrl& url)
updateGoActions();
setUrlAsCaption(url);
const QString iconName = KMimeType::iconNameForUrl(url);
m_tabBar->setTabIcon(m_tabIndex, KIcon(iconName));
m_tabBar->setTabIcon(m_tabIndex, QIcon(KIO::pixmapForUrl(url)));
m_tabBar->setTabText(m_tabIndex, squeezedText(tabName(view->url())));
emit urlChanged(url);
@ -397,8 +396,7 @@ void DolphinMainWindow::openNewTab(const KUrl& primaryUrl, const KUrl& secondary
tabPage->hide();
m_tabBar->addTab(KIcon(KMimeType::iconNameForUrl(primaryUrl)),
squeezedText(tabName(primaryUrl)));
m_tabBar->addTab(QIcon(KIO::pixmapForUrl(primaryUrl)), squeezedText(tabName(primaryUrl)));
if (m_viewTab.count() > 1) {
actionCollection()->action("close_tab")->setEnabled(true);
@ -1229,7 +1227,7 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain
const KUrl url = m_activeViewContainer->url();
setUrlAsCaption(url);
m_tabBar->setTabText(m_tabIndex, squeezedText(tabName(url)));
m_tabBar->setTabIcon(m_tabIndex, KIcon(KMimeType::iconNameForUrl(url)));
m_tabBar->setTabIcon(m_tabIndex, QIcon(KIO::pixmapForUrl(url)));
emit urlChanged(url);
}

4
dolphin/src/dolphinrecenttabsmenu.cpp
View file

@ -24,6 +24,7 @@
#include <KMimeType>
#include <KMenu>
#include <KIcon>
#include <kio/global.h>
DolphinRecentTabsMenu::DolphinRecentTabsMenu(QObject* parent) :
KActionMenu(KIcon("edit-undo"), i18n("Recently Closed Tabs"), parent)
@ -46,8 +47,7 @@ void DolphinRecentTabsMenu::rememberClosedTab(const KUrl& primaryUrl, const KUrl
QAction* action = new QAction(menu());
action->setText(primaryUrl.path());
const QString iconName = KMimeType::iconNameForUrl(primaryUrl);
action->setIcon(KIcon(iconName));
action->setIcon(QIcon(KIO::pixmapForUrl(primaryUrl)));
KUrl::List urls;
urls << primaryUrl;

3
dolphin/src/panels/places/placesitemeditdialog.cpp
View file

@ -32,6 +32,7 @@
#include <KLocale>
#include <KMimeType>
#include <KUrlRequester>
#include <kio/global.h>
#include <QCheckBox>
#include <QEvent>
#include <QFormLayout>
@ -140,7 +141,7 @@ void PlacesItemEditDialog::initialize()
m_iconButton->setIconSize(IconSize(KIconLoader::Desktop));
m_iconButton->setIconType(KIconLoader::NoGroup, KIconLoader::Place);
if (m_icon.isEmpty()) {
m_iconButton->setIcon(KMimeType::iconNameForUrl(m_url));
m_iconButton->setIcon(KIO::pixmapForUrl(m_url));
} else {
m_iconButton->setIcon(m_icon);
}