mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 17:01:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

CFrameBuffer: add more possible icon paths in order of priority

Browse Source 
This gives possibility to use theme relevant icon sets.

scheme:
	/path/to/theme/icons/file.png

example:
	/usr/share/tuxbox/neutrino/themes/Neutrino-3.0/icons/file.png


Origin commit data
------------------
Commit: bc794bab56
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-04-11 (Wed, 11 Apr 2018)
This commit is contained in:
Thilo Graf
2018-04-11 23:58:15 +02:00
committed by vanhofen
parent 7b21adb9dd
commit 90bf89e1ff
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/driver/fb_generic.cpp
View File

@@ -698,11 +698,23 @@ std::string CFrameBuffer::getIconPath(std::string icon_name, std::string file_ty
{ {
std::string path, filetype; std::string path, filetype;
filetype = "." + file_type; filetype = "." + file_type;
path = std::string(ICONSDIR_VAR) + "/" + icon_name + filetype;
if (access(path.c_str(), F_OK)) std::string dir[] = { THEMESDIR_VAR "/" + g_settings.theme_name + "/icons",
path = iconBasePath + "/" + icon_name + filetype; THEMESDIR "/" + g_settings.theme_name + "/icons",
ICONSDIR_VAR,
iconBasePath
};
for(int i=0; i<4 ; i++){
path = std::string(dir[i]) + "/" + icon_name + filetype;
if (access(path.c_str(), F_OK) == 0){
return path;
}
}
if (icon_name.find("/", 0) != std::string::npos) if (icon_name.find("/", 0) != std::string::npos)
path = icon_name; path = icon_name;
return path; return path;
} }