1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00

IconProvider: fixed, return a fallback icon on non-linux OSes

This commit is contained in:
S. Razi Alavizadeh 2013-02-22 01:25:28 +03:30
parent 2a5ff86972
commit 06ad80583c
3 changed files with 7 additions and 7 deletions

View File

@ -6,6 +6,7 @@
<file>icons/preferences/applications-system.png</file>
<file>icons/preferences/applications-webbrowsers.png</file>
<file>icons/preferences/preferences-desktop.png</file>
<file>icons/faenza/go-up.png</file>
<file>icons/faenza/back.png</file>
<file>icons/faenza/close.png</file>
<file>icons/faenza/forward.png</file>

Binary file not shown.

After

Width:  |  Height:  |  Size: 494 B

View File

@ -158,10 +158,7 @@ QIcon IconProvider::standardIcon(QStyle::StandardPixmap icon)
case QStyle::SP_MessageBoxWarning:
return QIcon::fromTheme("dialog-warning", mApp->style()->standardIcon(QStyle::SP_MessageBoxWarning));
#ifdef QZ_WS_X11
default:
return mApp->style()->standardIcon(icon);
#else
#ifndef QZ_WS_X11
case QStyle::SP_DialogCloseButton:
return QIcon(":/icons/faenza/close.png");
@ -171,6 +168,9 @@ QIcon IconProvider::standardIcon(QStyle::StandardPixmap icon)
case QStyle::SP_BrowserReload:
return QIcon(":/icons/faenza/reload.png");
case QStyle::SP_FileDialogToParent:
return QIcon(":/icons/faenza/go-up.png");
case QStyle::SP_ArrowForward:
//RTL Support
if (QApplication::layoutDirection() == Qt::RightToLeft) {
@ -188,10 +188,9 @@ QIcon IconProvider::standardIcon(QStyle::StandardPixmap icon)
else {
return QIcon(":/icons/faenza/back.png");
}
default:
return QIcon();
#endif
default:
return mApp->style()->standardIcon(icon);
}
}