kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #15588 from cjmayo/ThemeSearchPaths

Browse Source 
Remove icon ThemeSearchPaths option on Linux
This commit is contained in:
Chris Hennes
2024-08-05 10:41:41 -05:00
committed by GitHub
parent dcfae6a897 598fa20b03
commit ef7cbac494
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Gui/StartupProcess.cpp
View File

@@ -163,24 +163,14 @@ void StartupProcess::registerEventType()
void StartupProcess::setThemePaths()
{
ParameterGrp::handle hTheme = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/Bitmaps/Theme");
#if !defined(Q_OS_LINUX)
QIcon::setThemeSearchPaths(QIcon::themeSearchPaths()
<< QString::fromLatin1(":/icons/FreeCAD-default"));
QIcon::setThemeName(QLatin1String("FreeCAD-default"));
#else
// Option to opt-in into using a Linux desktop icon theme.
// https://forum.freecad.org/viewtopic.php?f=4&t=35624
bool themePaths = hTheme->GetBool("ThemeSearchPaths", false);
if (!themePaths) {
QStringList searchPaths;
searchPaths.prepend(QString::fromUtf8(":/icons"));
QIcon::setThemeSearchPaths(searchPaths);
QIcon::setThemeName(QLatin1String("FreeCAD-default"));
}
#endif
ParameterGrp::handle hTheme = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/Bitmaps/Theme");
std::string searchpath = hTheme->GetASCII("SearchPath");
if (!searchpath.empty()) {
QStringList searchPaths = QIcon::themeSearchPaths();
@@ -188,8 +178,13 @@ void StartupProcess::setThemePaths()
QIcon::setThemeSearchPaths(searchPaths);
}
// KDE file dialog needs icons from the desktop theme
QIcon::setFallbackThemeName(QIcon::themeName());
std::string name = hTheme->GetASCII("Name");
if (!name.empty()) {
if (name.empty()) {
QIcon::setThemeName(QLatin1String("FreeCAD-default"));
} else {
QIcon::setThemeName(QString::fromLatin1(name.c_str()));
}
}