Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-13 10:32:11 +01:00
Code Releases Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/data/icons.qrc
View File

@ -6,6 +6,7 @@
<file>icons/preferences/applications-system.png</file> <file>icons/preferences/applications-system.png</file>
<file>icons/preferences/applications-webbrowsers.png</file> <file>icons/preferences/applications-webbrowsers.png</file>
<file>icons/preferences/preferences-desktop.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/back.png</file>
<file>icons/faenza/close.png</file> <file>icons/faenza/close.png</file>
<file>icons/faenza/forward.png</file> <file>icons/faenza/forward.png</file>

BIN
src/lib/data/icons/faenza/go-up.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 494 B

13
src/lib/tools/iconprovider.cpp
View File

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