Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdeui: check if icon passed to apps via --icon is valid and fallback if not

Browse source
This commit is contained in:
Ivailo Monev 2015-09-21 20:29:47 +00:00
parent a8a54f0484
commit 596f3bde1d
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
kdeui/kernel/kapplication.cpp
View file

@ -44,6 +44,7 @@
#include "kdebug.h"
#include "kglobal.h"
#include "kicon.h"
#include "kiconloader.h"
#include "klocale.h"
#include "ksessionmanager.h"
#include "kstandarddirs.h"
@ -802,13 +803,17 @@ void KApplicationPrivate::parseCommandLine( )
}
if ( q->type() != KApplication::Tty ) {
if (args && args->isSet("icon") && !args->getOption("icon").trimmed().isEmpty())
QString appicon;
if (args && args->isSet("icon")
&& !args->getOption("icon").trimmed().isEmpty()
&& !KIconLoader::global()->iconPath(args->getOption("icon"), -1, true).isEmpty())
{
q->setWindowIcon(KIcon(args->getOption("icon")));
appicon = args->getOption("icon");
}
else {
q->setWindowIcon(KIcon(componentData.aboutData()->programIconName()));
if(appicon.isEmpty()) {
appicon = componentData.aboutData()->programIconName();
}
q->setWindowIcon(KIcon(appicon));
}
if (!args)