bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

A few fixes for icon themes, including - 

Icon theme inherits can have a list of parents, I don't recall seeing
that in the spec, but some of mine have that.


SVN revision: 26020
This commit is contained in:
David Walter Seikel 2006-09-22 07:51:32 +00:00
parent 60b375073a
commit 55c9565b6d
2 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/ecore/src/lib/ecore_desktop/Ecore_Desktop.h
View File

@ -71,6 +71,7 @@ typedef struct _Ecore_Desktop Ecore_Desktop;
struct _Ecore_Desktop_Icon_Theme struct _Ecore_Desktop_Icon_Theme
{ {
Ecore_Hash *data, *group; Ecore_Hash *data, *group;
Ecore_List *Inherits;
Ecore_List *Directories; Ecore_List *Directories;
char *path; char *path;
char *name; char *name;

60
legacy/ecore/src/lib/ecore_desktop/ecore_desktop_icon.c
View File

@ -249,19 +249,24 @@ _ecore_desktop_icon_find0(const char *icon, const char *icon_size,
/* Fall back strategy #1, look for closest size in this theme. */ /* Fall back strategy #1, look for closest size in this theme. */
found = closest; found = closest;
/* Fall back strategy #2, Try again with the parent theme. */ /* Fall back strategy #2, Try again with the parent themes. */
if ((!found) && (theme->inherits) if ((!found) && (theme->Inherits)
&& (theme->inherits[0] != '\0')
&& (strcmp(icon_theme, "hicolor") != 0)) && (strcmp(icon_theme, "hicolor") != 0))
{ {
found = (char *) char *inherits;
_ecore_desktop_icon_find0(icon, icon_size,
theme->inherits); ecore_list_goto_first(theme->Inherits);
while ((inherits = ecore_list_next(theme->Inherits)) != NULL)
{
found = (char *) _ecore_desktop_icon_find0(icon, icon_size, inherits);
if (found)
break;
}
} }
/* Fall back strategy #3, Try the default hicolor theme. */ /* Fall back strategy #3, Try the default hicolor theme. */
if ((!found) if ((!found)
&& (!((theme->inherits) && (theme->inherits[0] != '\0'))) && (!(theme->Inherits))
&& (strcmp(icon_theme, "hicolor") != 0)) && (strcmp(icon_theme, "hicolor") != 0))
{ {
found = (char *) found = (char *)
@ -385,28 +390,29 @@ Ecore_Desktop_Icon_Theme *
ecore_desktop_icon_theme_get(const char *icon_theme, const char *lang) ecore_desktop_icon_theme_get(const char *icon_theme, const char *lang)
{ {
Ecore_Desktop_Icon_Theme *result; Ecore_Desktop_Icon_Theme *result;
char *theme_path = NULL, *dir = NULL;
if (icon_theme[0] == '/')
{
theme_path = strdup(icon_theme);
dir = ecore_file_get_dir(theme_path);
if (dir)
icon_theme = (char *)ecore_file_get_file(dir);
#ifdef DEBUG
printf("LOADING THEME %s - %s\n", icon_theme, theme_path);
#endif
}
result = result =
(Ecore_Desktop_Icon_Theme *) ecore_hash_get(icon_theme_cache, (Ecore_Desktop_Icon_Theme *) ecore_hash_get(icon_theme_cache,
(char *)icon_theme); (char *)icon_theme);
if (!result) if (!result)
{ {
char icn[PATH_MAX], *theme_path;
if (icon_theme[0] == '/') if (!dir)
{ {
char *dir; char icn[PATH_MAX];
theme_path = strdup(icon_theme);
dir = ecore_file_get_dir(theme_path);
if (dir)
icon_theme = (char *)ecore_file_get_file(dir);
#ifdef DEBUG
printf("LOADING THEME %s - %s\n", icon_theme, theme_path);
#endif
}
else
{
snprintf(icn, PATH_MAX, "%s/index.theme", icon_theme); snprintf(icn, PATH_MAX, "%s/index.theme", icon_theme);
#ifdef DEBUG #ifdef DEBUG
printf("SEARCHING FOR %s\n", icn); printf("SEARCHING FOR %s\n", icn);
@ -442,10 +448,13 @@ ecore_desktop_icon_theme_get(const char *icon_theme, const char *lang)
value = "No comment provided."; value = "No comment provided.";
result->comment = strdup(value); result->comment = strdup(value);
value = value =
(char *)ecore_hash_get(result->group, (char *)ecore_hash_get(result->group, "Inherits");
"Inherits");
if (value) if (value)
result->inherits = strdup(value); {
result->inherits = strdup(value);
if (result->inherits)
result->Inherits = ecore_desktop_paths_to_list(result->inherits);
}
value = value =
(char *)ecore_hash_get(result->group, "Example"); (char *)ecore_hash_get(result->group, "Example");
if (!value) if (!value)
@ -557,7 +566,7 @@ ecore_desktop_icon_theme_get(const char *icon_theme, const char *lang)
} }
/* This passes the basic validation tests, mark it as real and cache it. */ /* This passes the basic validation tests, mark it as real and cache it. */
result->path = theme_path; result->path = strdup(theme_path);
ecore_hash_set(icon_theme_cache, ecore_hash_set(icon_theme_cache,
strdup(icon_theme), result); strdup(icon_theme), result);
} }
@ -568,12 +577,13 @@ ecore_desktop_icon_theme_get(const char *icon_theme, const char *lang)
if (!result->path) if (!result->path)
{ {
_ecore_desktop_icon_theme_destroy(result); _ecore_desktop_icon_theme_destroy(result);
free(theme_path);
result = NULL; result = NULL;
} }
} }
} }
} }
if (dir) free(dir);
if (theme_path) free(theme_path);
return result; return result;
} }