enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

Per devilhorns, this commit does: 

- Adds new desktop font font_class: desktop_icon
 - whitespace and formatting changes

If you don't see the font changes on the desktop, you may need to restart e.


SVN revision: 34053
This commit is contained in:
Eric Schuele 2008-03-18 19:59:52 +00:00
parent de2840e7b8
commit f68c271dd4
1 changed files with 80 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/modules/conf_fonts/e_int_config_fonts.c
View File

@ -94,6 +94,7 @@ const E_Text_Class_Pair text_class_predefined_names[ ] = {
{ NULL, N_("Filemanager")},
{ "fileman_typebuf", N_("Typebuf")},
{ "fileman_icon", N_("Icon")},
{ "desktop_icon", N_("Desktop Icon")},
{ NULL, N_("Modules")},
{ "module_small", N_("Small")},
@ -187,7 +188,8 @@ _fill_data(E_Config_Dialog_Data *cfdata)
{
tc = E_NEW(CFText_Class, 1);
tc->class_name = text_class_predefined_names[i].class_name;
tc->class_description = _(text_class_predefined_names[i].class_description);
tc->class_description =
_(text_class_predefined_names[i].class_description);
tc->font = NULL;
tc->size = 0;
tc->enabled = 0;
@ -372,7 +374,8 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
const char *font_name;
class_name = text_class_predefined_names[i].class_name;
font_name = e_font_fontconfig_name_get(cfdata->cur_font, cfdata->cur_style);
font_name =
e_font_fontconfig_name_get(cfdata->cur_font, cfdata->cur_style);
e_font_default_set(class_name, font_name, cfdata->cur_size);
if (i == 1)
@ -441,7 +444,8 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
cfdata->gui.class_list = NULL;
ob = e_widget_check_add(evas, _("Enable Custom Font Classes"), &(cfdata->cur_enabled));
ob = e_widget_check_add(evas, _("Enable Custom Font Classes"),
&(cfdata->cur_enabled));
cfdata->gui.enabled = ob;
e_widget_on_change_hook_set(ob, _basic_enable_cb_change, cfdata);
e_widget_disabled_set(ob, 0);
@ -463,7 +467,8 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_framelist_object_append(of, ob);
e_widget_table_object_append(ot, of, 1, 1, 1, 1, 1, 1, 1, 1);
ob = e_widget_font_preview_add(evas, _("Basic preview text: 123: 我的天空！"));
ob =
e_widget_font_preview_add(evas, _("Basic preview text: 123: 我的天空！"));
cfdata->gui.preview = ob;
e_widget_table_object_append(ot, ob, 0, 2, 2, 1, 1, 0, 1, 0);
@ -480,7 +485,6 @@ _basic_font_cb_change(void *data, Evas_Object *obj)
cfdata = data;
if (!cfdata) return;
_font_preview_update(cfdata);
}
@ -589,7 +593,8 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
const char *fallback;
fallback = e_widget_config_list_nth_get(cfdata->gui.fallback_list, i);
fallback =
e_widget_config_list_nth_get(cfdata->gui.fallback_list, i);
if ((fallback) && (fallback[0]))
e_font_fallback_append(fallback);
}
@ -755,8 +760,7 @@ _adv_class_cb_change(void *data, Evas_Object *obj)
E_Config_Dialog_Data *cfdata;
CFText_Class *tc;
cfdata = data;
if (!cfdata) return;
if (!(cfdata = data)) return;
/* Save Current */
if (cfdata->cur_index >= 0)
@ -825,8 +829,7 @@ _adv_enabled_font_cb_change(void *data, Evas_Object *obj)
Evas_List *l;
int n;
cfdata = data;
if (!cfdata) return;
if (!(cfdata = data)) return;
e_widget_disabled_set(cfdata->gui.font_list, !cfdata->cur_enabled);
e_widget_disabled_set(cfdata->gui.style_list, !cfdata->cur_enabled);
e_widget_disabled_set(cfdata->gui.size_list, !cfdata->cur_enabled);
@ -838,8 +841,7 @@ _adv_enabled_font_cb_change(void *data, Evas_Object *obj)
Evas_Object *icon = NULL;
CFText_Class *tc;
i = l->data;
if (!i) continue;
if (!(i = l->data)) continue;
if (!i->selected) continue;
tc = evas_list_nth(cfdata->text_classes, n);
@ -866,8 +868,7 @@ _size_cb_change(void *data)
int n;
size_data = data;
cfdata = size_data->cfdata;
if (!cfdata) return;
if (!(cfdata = size_data->cfdata)) return;
cfdata->cur_size = size_data->size;
@ -880,8 +881,7 @@ _size_cb_change(void *data)
E_Ilist_Item *i;
CFText_Class *tc;
i = l->data;
if (!i) continue;
if (!(i = l->data)) continue;
if (!i->selected) continue;
tc = evas_list_nth(cfdata->text_classes, n);
@ -898,16 +898,14 @@ _adv_font_cb_change(void *data, Evas_Object *obj)
int n;
tc = NULL;
cfdata = data;
if (!cfdata) return;
if (!(cfdata = data)) return;
/* Set up the new font name for each selected class */
for (n = 0, l = e_widget_ilist_items_get(cfdata->gui.class_list); l; l = l->next, n++)
{
E_Ilist_Item *i;
i = l->data;
if (!i) continue;
if (!(i = l->data)) continue;
if (!i->selected) continue;
tc = evas_list_nth(cfdata->text_classes, n);
@ -926,14 +924,15 @@ _adv_font_cb_change(void *data, Evas_Object *obj)
evas_event_freeze(evas_object_evas_get(cfdata->gui.style_list));
edje_freeze();
e_widget_ilist_freeze(cfdata->gui.style_list);
e_widget_ilist_clear(cfdata->gui.style_list);
for (next = efp->styles; next; next = next->next)
{
const char *style;
style = next->data;
e_widget_ilist_append(cfdata->gui.style_list, NULL, style, NULL, NULL, style);
e_widget_ilist_append(cfdata->gui.style_list, NULL, style,
NULL, NULL, style);
}
e_widget_ilist_go(cfdata->gui.style_list);
@ -984,6 +983,7 @@ _size_list_load(E_Config_Dialog_Data *cfdata, Evas_List *size_list, Evas_Font_Si
edje_freeze();
e_widget_ilist_freeze(ob);
if (clear) e_widget_ilist_clear(ob);
for (next = size_list; next; next = next->next)
{
E_Font_Size_Data *size_data;
@ -1037,9 +1037,10 @@ _font_list_load(E_Config_Dialog_Data *cfdata, const char *cur_font)
evas_hash_foreach(cfdata->font_hash, _font_hash_cb, cfdata);
if (cfdata->font_list)
{
cfdata->font_list = evas_list_sort(cfdata->font_list,
evas_list_count(cfdata->font_list),
_sort_fonts);
cfdata->font_list =
evas_list_sort(cfdata->font_list,
evas_list_count(cfdata->font_list),
_sort_fonts);
}
evas_font_available_list_free(evas, fonts);
}
@ -1074,7 +1075,7 @@ _font_list_load(E_Config_Dialog_Data *cfdata, const char *cur_font)
const char *f;
f = next->data;
if (cur_font && !strcasecmp(f, cur_font))
if ((cur_font) && (!strcasecmp(f, cur_font)))
{
e_widget_ilist_selected_set(ob, n);
break;
@ -1090,8 +1091,7 @@ _adv_style_cb_change(void *data, Evas_Object *obj)
Evas_List *l;
int n;
cfdata = data;
if (!cfdata) return;
if (!(cfdata = data)) return;
/* Setup the new style name */
for (n = 0, l = e_widget_ilist_items_get(cfdata->gui.class_list); l; l = l->next, n++)
@ -1099,8 +1099,7 @@ _adv_style_cb_change(void *data, Evas_Object *obj)
E_Ilist_Item *i;
CFText_Class *tc;
i = l->data;
if (!i) continue;
if (!(i = l->data)) continue;
if (!i->selected) continue;
tc = evas_list_nth(cfdata->text_classes, n);
@ -1120,10 +1119,9 @@ _adv_enabled_fallback_cb_change(void *data, Evas_Object *obj)
{
E_Config_Dialog_Data *cfdata;
cfdata = data;
if (!cfdata) return;
e_widget_disabled_set(cfdata->gui.fallback_list, !cfdata->cur_fallbacks_enabled);
if (!(cfdata = data)) return;
e_widget_disabled_set(cfdata->gui.fallback_list,
!cfdata->cur_fallbacks_enabled);
}
static int
@ -1131,7 +1129,6 @@ _sort_fonts(void *data1, void *data2)
{
if (!data1) return 1;
if (!data2) return -1;
return e_util_strcmp(data1, data2);
}
@ -1144,7 +1141,8 @@ _font_preview_update(E_Config_Dialog_Data *cfdata)
const char *name;
name = e_font_fontconfig_name_get(cfdata->cur_font, cfdata->cur_style);
e_widget_font_preview_font_set(cfdata->gui.preview, name, cfdata->cur_size);
e_widget_font_preview_font_set(cfdata->gui.preview, name,
cfdata->cur_size);
evas_stringshare_del(name);
}
}