mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-27 23:42:58 +02:00
CFrameBuffer: add more possible icon paths in order of priority
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
This commit is contained in:
@@ -706,11 +706,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user