Martchus
/
qtutilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improved icon theme lookup

This commit is contained in:
Martchus 2015-09-22 01:52:08 +02:00
parent ce39061808
commit 5c89dbbb87
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
resources/qtconfigarguments.cpp
View File

@ -78,10 +78,12 @@ void QtConfigArguments::applySettings() const
cout << "Warning: Can not set a style for the Qt Quick GUI." << endl;
#endif
}
#ifdef Q_OS_WIN32
bool searchPathsPresent = false;
#endif
if(m_iconThemeArg.isPresent()) {
auto i = m_iconThemeArg.values().cbegin(), end = m_iconThemeArg.values().end();
if(i != end) {
QIcon::setThemeName(QString::fromLocal8Bit(i->data()));
if(++i != end) {
QStringList searchPaths;
searchPaths.reserve(m_iconThemeArg.values().size() - 1);
@ -89,24 +91,36 @@ void QtConfigArguments::applySettings() const
searchPaths << QString::fromLocal8Bit(i->data());
}
QIcon::setThemeSearchPaths(searchPaths);
} else {
#ifdef Q_OS_WIN32
QIcon::setThemeSearchPaths(QIcon::themeSearchPaths() << QStringLiteral("../share/icons"));
searchPathsPresent = !searchPaths.isEmpty();
#endif
}
QIcon::setThemeName(QString::fromLocal8Bit(i->data()));
}
} else {
if(qEnvironmentVariableIsSet("ICON_THEME_SEARCH_PATH")) {
QString path;
path.append(qgetenv("ICON_THEME_SEARCH_PATH"));
QIcon::setThemeSearchPaths(QStringList() << path);
#ifdef Q_OS_WIN32
searchPathsPresent = true;
#endif
}
if(qEnvironmentVariableIsSet("ICON_THEME")) {
QString themeName;
themeName.append(qgetenv("ICON_THEME"));
QIcon::setThemeName(themeName);
}
if(qEnvironmentVariableIsSet("ICON_THEME_SEARCH_PATH")) {
QString path;
path.append(qgetenv("ICON_THEME_SEARCH_PATH"));
QIcon::setThemeSearchPaths(QStringList() << path);
}
}
#ifdef Q_OS_WIN32
// default configuration under Windows
if(!searchPathsPresent) {
QIcon::setThemeSearchPaths(QIcon::themeSearchPaths() << QStringLiteral("../share/icons"));
}
if(QIcon::themeName().isEmpty()) {
QIcon::setThemeName(QStringLiteral("default"));
}
#endif
if(m_fontArg.isPresent()) {
QFont font;
font.setFamily(QString::fromLocal8Bit(m_fontArg.values().front().data()));