From: Enlightenment C. <no...@cv...> - 2006-03-28 08:01:28
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/data/themes Modified Files: default_about.edc default_dialog.edc default_error.edc Log Message: Add some text classes so we can use fontconfig fonts if needed =================================================================== RCS file: /cvs/e/e17/apps/e/data/themes/default_about.edc,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- default_about.edc 19 Mar 2006 12:24:19 -0000 1.7 +++ default_about.edc 28 Mar 2006 08:01:26 -0000 1.8 @@ -19,11 +19,11 @@ { style { name: "about_style"; - base: "font=Edje-Vera font_size=10 align=center color=#000 style=shadow shadow_color=#ffffff80 wrap=word"; + base: "font=Edje-Vera font_size=10 text_class=tb_plain align=center color=#000 style=shadow shadow_color=#ffffff80 wrap=word"; tag: "br" "\n"; - tag: "hilight" "+ font=Edje-Vera-Bold style=glow color=#fff glow2_color=#fe87 glow_color=#fa14"; - tag: "title" "+ font_size=12 font=Edje-Vera-Bold style=soft_shadow color=#fff shadow_color=#00000020"; + tag: "hilight" "+ font=Edje-Vera-Bold text_class=tb_light style=glow color=#fff glow2_color=#fe87 glow_color=#fa14"; + tag: "title" "+ font_size=12 font=Edje-Vera-Bold text_class=tb_big style=soft_shadow color=#fff shadow_color=#00000020"; tag: "/title" "- \n \n"; } } =================================================================== RCS file: /cvs/e/e17/apps/e/data/themes/default_dialog.edc,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- default_dialog.edc 12 Oct 2005 16:02:33 -0000 1.13 +++ default_dialog.edc 28 Mar 2006 08:01:26 -0000 1.14 @@ -8,10 +8,10 @@ { style { name: "dialog_style"; - base: "font=Edje-Vera font_size=10 align=center color=#000 style=shadow shadow_color=#ffffff80 wrap=word"; + base: "font=Edje-Vera font_size=10 text_class=tb_plain align=center color=#000 style=shadow shadow_color=#ffffff80 wrap=word"; tag: "br" "\n"; - tag: "hilight" "+ font=Edje-Vera-Bold style=glow color=#fff glow2_color=#fe87 glow_color=#fa14"; + tag: "hilight" "+ font=Edje-Vera-Bold text_class=tb_light style=glow color=#fff glow2_color=#fe87 glow_color=#fa14"; } } =================================================================== RCS file: /cvs/e/e17/apps/e/data/themes/default_error.edc,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- default_error.edc 19 Mar 2006 12:24:19 -0000 1.10 +++ default_error.edc 28 Mar 2006 08:01:26 -0000 1.11 @@ -8,10 +8,10 @@ { style { name: "error_style"; - base: "font=Edje-Vera font_size=10 align=left color=#000 style=shadow shadow_color=#ffffff80 wrap=word"; + base: "font=Edje-Vera font_size=10 text_class=tb_plain align=left color=#000 style=shadow shadow_color=#ffffff80 wrap=word"; tag: "br" "\n"; - tag: "hilight" "+ font=Edje-Vera-Bold style=glow color=#fff glow2_color=#fe87 glow_color=#fa14"; + tag: "hilight" "+ font=Edje-Vera-Bold text_class=tb_light style=glow color=#fff glow2_color=#fe87 glow_color=#fa14"; } } |
From: Enlightenment C. <no...@cv...> - 2006-04-01 09:25:08
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/itray Modified Files: e_mod_main.c Log Message: Add Font Configuration Dialog, and... * Added some e_widget api for handy things (Toggling checks, Setting Entry Text...) * Fixed some compiler warnings * TODO : Font hinting and this new font dialog should be merged, Also, need To add font fallbacks configuration to this dialog =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/itray/e_mod_main.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_mod_main.c 20 Feb 2006 19:11:06 -0000 1.11 +++ e_mod_main.c 1 Apr 2006 09:24:56 -0000 1.12 @@ -479,6 +479,7 @@ w = h = TRAY_ICON_SIZE + itb->box_inset.l + itb->box_inset.r; else { + if (itb->tray->rows > 0) itb->tray->rows = 1; icons_per_row = (itb->tray->icons + (itb->tray->icons % itb->tray->rows)) / itb->tray->rows; w = (icons_per_row * TRAY_ICON_SIZE) |
From: Enlightenment C. <no...@cv...> - 2006-04-01 09:25:10
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: Makefile.am e_apps_cache.c e_config.c e_configure.c e_font.c e_ilist.c e_ilist.h e_includes.h e_int_config_keybindings.c e_ipc_handlers_list.h e_widget_check.c e_widget_check.h e_widget_entry.c e_widget_ilist.c e_widget_ilist.h e_widget_preview.c e_widget_preview.h e_widget_slider.c e_widget_slider.h Log Message: Add Font Configuration Dialog, and... * Added some e_widget api for handy things (Toggling checks, Setting Entry Text...) * Fixed some compiler warnings * TODO : Font hinting and this new font dialog should be merged, Also, need To add font fallbacks configuration to this dialog =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v retrieving revision 1.114 retrieving revision 1.115 diff -u -3 -r1.114 -r1.115 --- Makefile.am 5 Mar 2006 06:23:14 -0000 1.114 +++ Makefile.am 1 Apr 2006 09:24:56 -0000 1.115 @@ -129,6 +129,7 @@ e_int_config_menus.h \ e_int_config_keybindings.h \ e_int_config_cursor.h \ +e_int_config_fonts.h \ e_int_config_startup.h \ e_int_config_performance.h \ e_int_config_winlist.h \ @@ -258,6 +259,7 @@ e_int_config_menus.c \ e_int_config_keybindings.c \ e_int_config_cursor.c \ +e_int_config_fonts.c \ e_int_config_startup.c \ e_int_config_performance.c \ e_int_config_winlist.c \ =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_apps_cache.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_apps_cache.c 2 Mar 2006 12:03:48 -0000 1.6 +++ e_apps_cache.c 1 Apr 2006 09:24:56 -0000 1.7 @@ -29,15 +29,17 @@ eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION; eddc.func.mem_alloc = NULL; eddc.func.mem_free = NULL; - eddc.func.str_alloc = evas_stringshare_add; - eddc.func.str_free = evas_stringshare_del; - eddc.func.list_next = evas_list_next; - eddc.func.list_append = evas_list_append; - eddc.func.list_data = evas_list_data; - eddc.func.list_free = evas_list_free; - eddc.func.hash_foreach = evas_hash_foreach; - eddc.func.hash_add = evas_hash_add; - eddc.func.hash_free = evas_hash_free; + eddc.func.str_alloc = (char *(*)(const char *)) evas_stringshare_add; + eddc.func.str_free = (void (*)(const char *)) evas_stringshare_del; + eddc.func.list_next = (void *(*)(void *)) evas_list_next; + eddc.func.list_append = (void *(*)(void *l, void *d)) evas_list_append; + eddc.func.list_data = (void *(*)(void *)) evas_list_data; + eddc.func.list_free = (void *(*)(void *)) evas_list_free; + eddc.func.hash_foreach = + (void (*) (void *, int (*) (void *, const char *, void *, void *), void *)) + evas_hash_foreach; + eddc.func.hash_add = (void *(*) (void *, const char *, void *)) evas_hash_add; + eddc.func.hash_free = (void (*) (void *)) evas_hash_free; NEWD("E_App_Cache", E_App_Cache); _e_app_cache_edd = eet_data_descriptor2_new(&eddc); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v retrieving revision 1.161 retrieving revision 1.162 diff -u -3 -r1.161 -r1.162 --- e_config.c 1 Apr 2006 01:27:46 -0000 1.161 +++ e_config.c 1 Apr 2006 09:24:56 -0000 1.162 @@ -664,7 +664,7 @@ CFG_MODULE("pager", 1); } { - E_Font_Fallback* eff; +// E_Font_Fallback* eff; #define CFG_FONTFALLBACK(_name) \ eff = E_NEW(E_Font_Fallback, 1); \ @@ -1209,15 +1209,17 @@ eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION; eddc.func.mem_alloc = NULL; eddc.func.mem_free = NULL; - eddc.func.str_alloc = evas_stringshare_add; - eddc.func.str_free = evas_stringshare_del; - eddc.func.list_next = evas_list_next; - eddc.func.list_append = evas_list_append; - eddc.func.list_data = evas_list_data; - eddc.func.list_free = evas_list_free; - eddc.func.hash_foreach = evas_hash_foreach; - eddc.func.hash_add = evas_hash_add; - eddc.func.hash_free = evas_hash_free; + eddc.func.str_alloc = (char *(*)(const char *)) evas_stringshare_add; + eddc.func.str_free = (void (*)(const char *)) evas_stringshare_del; + eddc.func.list_next = (void *(*)(void *)) evas_list_next; + eddc.func.list_append = (void *(*)(void *l, void *d)) evas_list_append; + eddc.func.list_data = (void *(*)(void *)) evas_list_data; + eddc.func.list_free = (void *(*)(void *)) evas_list_free; + eddc.func.hash_foreach = + (void (*) (void *, int (*) (void *, const char *, void *, void *), void *)) + evas_hash_foreach; + eddc.func.hash_add = (void *(*) (void *, const char *, void *)) evas_hash_add; + eddc.func.hash_free = (void (*) (void *)) evas_hash_free; eddc.name = name; eddc.size = size; return (E_Config_DD *)eet_data_descriptor2_new(&eddc); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -3 -r1.41 -r1.42 --- e_configure.c 27 Mar 2006 14:46:26 -0000 1.41 +++ e_configure.c 1 Apr 2006 09:24:56 -0000 1.42 @@ -66,6 +66,7 @@ e_configure_header_item_add(eco, "enlightenment/appearance", _("Appearance")); e_configure_standard_item_add(eco, "enlightenment/desktops", _("Background Settings"), e_int_config_background); e_configure_standard_item_add(eco, "enlightenment/themes", _("Theme Selector"), e_int_config_theme); + e_configure_standard_item_add(eco, "enlightenment/e", _("Font Properties"), e_int_config_fonts); e_configure_standard_item_add(eco, "enlightenment/e", _("Font Display Hinting"), e_int_config_hinting); e_configure_standard_item_add(eco, "enlightenment/mouse", _("Cursor Settings"), e_int_config_cursor); e_configure_standard_item_add(eco, "enlightenment/windows", _("Window Display Settings"), e_int_config_window_display); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_font.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- e_font.c 2 Mar 2006 12:03:48 -0000 1.18 +++ e_font.c 1 Apr 2006 09:24:56 -0000 1.19 @@ -279,6 +279,10 @@ return e_config->font_defaults; } +/* return the default font name with fallbacks, font size is returned + * in size_ret. This function is needed when all hell breaks loose and + * we need a font name and size. + */ EAPI const char * e_font_default_string_get(const char *text_class, int *size_ret) { =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_ilist.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- e_ilist.c 27 Mar 2006 14:46:26 -0000 1.16 +++ e_ilist.c 1 Apr 2006 09:24:56 -0000 1.17 @@ -93,7 +93,7 @@ } EAPI void -e_ilist_append(Evas_Object *obj, Evas_Object *icon, char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2) +e_ilist_append(Evas_Object *obj, Evas_Object *icon, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2) { E_Smart_Item *si; Evas_Coord mw = 0, mh = 0; @@ -267,7 +267,7 @@ } EAPI void -e_ilist_remove_label(Evas_Object *obj, char *label) +e_ilist_remove_label(Evas_Object *obj, const char *label) { E_Smart_Item *si; Evas_List *l; =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_ilist.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- e_ilist.h 27 Mar 2006 14:46:26 -0000 1.9 +++ e_ilist.h 1 Apr 2006 09:24:56 -0000 1.10 @@ -8,7 +8,7 @@ EAPI Evas_Object *e_ilist_add (Evas *evas); EAPI void e_ilist_icon_size_set (Evas_Object *obj, Evas_Coord w, Evas_Coord h); -EAPI void e_ilist_append (Evas_Object *obj, Evas_Object *icon, char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2); +EAPI void e_ilist_append (Evas_Object *obj, Evas_Object *icon, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2); EAPI void e_ilist_selected_set (Evas_Object *obj, int n); EAPI int e_ilist_selected_get (Evas_Object *obj); EAPI const char *e_ilist_selected_label_get (Evas_Object *obj); @@ -19,7 +19,7 @@ EAPI void e_ilist_selector_set (Evas_Object *obj, int selector); EAPI int e_ilist_selector_get (Evas_Object *obj); EAPI void e_ilist_remove_num (Evas_Object *obj, int n); -EAPI void e_ilist_remove_label (Evas_Object *obj, char *label); +EAPI void e_ilist_remove_label (Evas_Object *obj, const char *label); EAPI int e_ilist_count (Evas_Object *obj); EAPI void e_ilist_clear (Evas_Object *obj); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v retrieving revision 1.95 retrieving revision 1.96 diff -u -3 -r1.95 -r1.96 --- e_includes.h 4 Mar 2006 04:11:51 -0000 1.95 +++ e_includes.h 1 Apr 2006 09:24:56 -0000 1.96 @@ -107,6 +107,7 @@ #include "e_int_config_menus.h" #include "e_int_config_keybindings.h" #include "e_int_config_cursor.h" +#include "e_int_config_fonts.h" #include "e_int_config_startup.h" #include "e_int_config_performance.h" #include "e_int_config_winlist.h" =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_keybindings.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- e_int_config_keybindings.c 28 Mar 2006 07:25:12 -0000 1.16 +++ e_int_config_keybindings.c 1 Apr 2006 09:24:56 -0000 1.17 @@ -85,7 +85,7 @@ char *action_params; int def_action; int restrictions; -}ACTION; +} ACTION; const ACTION actions_predefined_names[ ] = { {"Flip Desktop Left", "desk_flip_by", "-1 0", _DEFAULT_ACTION, =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_ipc_handlers_list.h,v retrieving revision 1.45 retrieving revision 1.46 diff -u -3 -r1.45 -r1.46 --- e_ipc_handlers_list.h 29 Mar 2006 15:50:01 -0000 1.45 +++ e_ipc_handlers_list.h 1 Apr 2006 09:24:56 -0000 1.46 @@ -379,3 +379,4 @@ #define E_IPC_OP_MAXIMIZE_MANIPULATION_GET_REPLY 352 #define E_IPC_OP_DESKTOP_LOCK 353 + =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_check.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_widget_check.c 12 Mar 2006 01:55:16 -0000 1.10 +++ e_widget_check.c 1 Apr 2006 09:24:56 -0000 1.11 @@ -59,6 +59,35 @@ return obj; } +EAPI void +e_widget_check_checked_set(Evas_Object *check, int checked) +{ + E_Widget_Data *wd; + + wd = e_widget_data_get(check); + if (wd->valptr) + *(wd->valptr) = checked; + if (checked) + edje_object_signal_emit(wd->o_check, "toggle_on", ""); + else + edje_object_signal_emit(wd->o_check, "toggle_off", ""); +} + +EAPI int +e_widget_check_checked_get(Evas_Object *check) +{ + E_Widget_Data *wd; + int ret; + + wd = e_widget_data_get(check); + if (wd->valptr) + ret = *(wd->valptr); + else + ret = -1; + + return ret; +} + static void _e_wid_del_hook(Evas_Object *obj) { =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_check.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_widget_check.h 10 Oct 2005 15:27:51 -0000 1.2 +++ e_widget_check.h 1 Apr 2006 09:24:56 -0000 1.3 @@ -7,6 +7,8 @@ #define E_WIDGET_CHECK_H EAPI Evas_Object *e_widget_check_add(Evas *evas, char *label, int *val); +EAPI void e_widget_check_checked_set(Evas_Object *check, int checked); +EAPI int e_widget_check_checked_get(Evas_Object *check); #endif #endif =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_entry.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_widget_entry.c 3 Mar 2006 00:02:32 -0000 1.10 +++ e_widget_entry.c 1 Apr 2006 09:24:56 -0000 1.11 @@ -149,13 +149,18 @@ wd->on_change_data = data; } -#if 0 void e_widget_entry_text_set(Evas_Object *entry, const char *text) { - e_entry_text_set(entry, text); + E_Widget_Data *wd; + + wd = e_widget_data_get(entry); + e_entry_text_set(wd->o_entry, text); + E_FREE(*(wd->valptr)); + *(wd->valptr) = strdup(text); } +#if 0 const char * e_widget_entry_text_get(Evas_Object *entry) { =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_ilist.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_widget_ilist.c 27 Mar 2006 14:46:26 -0000 1.13 +++ e_widget_ilist.c 1 Apr 2006 09:24:56 -0000 1.14 @@ -62,7 +62,7 @@ } EAPI void -e_widget_ilist_append(Evas_Object *obj, Evas_Object *icon, char *label, void (*func) (void *data), void *data, char *val) +e_widget_ilist_append(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data), void *data, char *val) { E_Widget_Data *wd; E_Widget_Callback *wcb; @@ -78,7 +78,7 @@ } EAPI void -e_widget_ilist_header_append(Evas_Object *obj, Evas_Object *icon, char *label) +e_widget_ilist_header_append(Evas_Object *obj, Evas_Object *icon, const char *label) { E_Widget_Data *wd; @@ -158,7 +158,7 @@ } EAPI void -e_widget_ilist_remove_label(Evas_Object *obj, char *label) +e_widget_ilist_remove_label(Evas_Object *obj, const char *label) { E_Widget_Data *wd; =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_ilist.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_widget_ilist.h 27 Mar 2006 14:46:26 -0000 1.7 +++ e_widget_ilist.h 1 Apr 2006 09:24:56 -0000 1.8 @@ -7,15 +7,15 @@ #define E_WIDGET_ILIST_H EAPI Evas_Object *e_widget_ilist_add(Evas *evas, int icon_w, int icon_h, char **value); -EAPI void e_widget_ilist_append(Evas_Object *obj, Evas_Object *icon, char *label, void (*func) (void *data), void *data, char *val); -EAPI void e_widget_ilist_header_append(Evas_Object *obj, Evas_Object *icon, char *label); +EAPI void e_widget_ilist_append(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data), void *data, char *val); +EAPI void e_widget_ilist_header_append(Evas_Object *obj, Evas_Object *icon, const char *label); EAPI void e_widget_ilist_selected_set(Evas_Object *obj, int n); EAPI void e_widget_ilist_selector_set(Evas_Object *obj, int selector); EAPI void e_widget_ilist_go(Evas_Object *obj); EAPI int e_widget_ilist_selected_get(Evas_Object *obj); EAPI const char *e_widget_ilist_selected_label_get(Evas_Object *obj); EAPI void e_widget_ilist_remove_num(Evas_Object *obj, int n); -EAPI void e_widget_ilist_remove_label(Evas_Object *obj, char *label); +EAPI void e_widget_ilist_remove_label(Evas_Object *obj, const char *label); EAPI int e_widget_ilist_count(Evas_Object *obj); EAPI void e_widget_ilist_clear(Evas_Object *obj); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_preview.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_widget_preview.c 4 Mar 2006 04:11:51 -0000 1.1 +++ e_widget_preview.c 1 Apr 2006 09:24:56 -0000 1.2 @@ -51,7 +51,7 @@ } EAPI int -e_widget_preview_file_set(Evas_Object *obj, char *file, char *key) +e_widget_preview_file_set(Evas_Object *obj, const char *file, const char *key) { E_Widget_Data *wd; @@ -65,7 +65,7 @@ } EAPI int -e_widget_preview_edje_set(Evas_Object *obj, char *file, char *group) +e_widget_preview_edje_set(Evas_Object *obj, const char *file, const char *group) { E_Widget_Data *wd; int ret; =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_preview.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_widget_preview.h 4 Mar 2006 04:11:51 -0000 1.1 +++ e_widget_preview.h 1 Apr 2006 09:24:56 -0000 1.2 @@ -7,8 +7,8 @@ #define E_WIDGET_PREVIEW_H EAPI Evas_Object *e_widget_preview_add(Evas *evas, int minw, int minh); -EAPI int e_widget_preview_file_set(Evas_Object *obj, char *file, char *key); -EAPI int e_widget_preview_edje_set(Evas_Object *obj, char *file, char *group); +EAPI int e_widget_preview_file_set(Evas_Object *obj, const char *file, const char *key); +EAPI int e_widget_preview_edje_set(Evas_Object *obj, const char *file, const char *group); #endif #endif =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_slider.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_widget_slider.c 7 Jan 2006 10:39:45 -0000 1.5 +++ e_widget_slider.c 1 Apr 2006 09:24:56 -0000 1.6 @@ -61,6 +61,91 @@ return obj; } +/** + * Set the double value for the slider. This will also move the slider to + * the correct position and update the text indecator. Will not do anything + * if the slider was not created with a double value. + * + * @param slider pointer to the slider to be modified + * @param dval the double value to set the slider to + * @return 1 if value set, return 0 if value not set + */ +EAPI int +e_widget_slider_value_double_set(Evas_Object *slider, double dval) +{ + E_Widget_Data *wd; + + wd = e_widget_data_get(slider); + if (!wd->dval) return 0; + *(wd->dval) = dval; + e_slider_value_set(wd->o_slider, dval); + return 1; +} + +/** + * Set the integer value for the slider. This will also move the slider to + * the correct position and update the text indecator. Will not do anything + * if the slider was not created with an integer value. + * + * @param slider pointer to the slider to be modified + * @param int the integer value to set the slider to + * @return 1 if value set, return 0 if value not set + */ +EAPI int +e_widget_slider_value_int_set(Evas_Object *slider, int ival) +{ + E_Widget_Data *wd; + + wd = e_widget_data_get(slider); + if (!wd->ival) return 0; + *(wd->ival) = ival; + e_slider_value_set(wd->o_slider, ival); + return 1; +} + +/** + * Get the double value for the slider. The value of dval is undefined + * if the slider was not created with a double value. + * + * @param slider pointer to the slider to be queried + * @param dval the pointer to the double value to be set with the value of the slider + * @return 1 if value returned, return 0 if value not returned + */ +EAPI int +e_widget_slider_value_double_get(Evas_Object *slider, double *dval) +{ + E_Widget_Data *wd; + + wd = e_widget_data_get(slider); + if (!wd->dval) return 0; + if (!dval) return 0; + + *dval = *(wd->dval); + return 1; +} + +/** + * Get the integer value for the slider. The value of ival is undefined + * if the slider was not created with an integer value. + * + * @param slider pointer to the slider to be queried + * @param ival the pointer to the integer value to be set with the value of the slider + * @return 1 if value returned, return 0 if value not returned + */ +EAPI int +e_widget_slider_value_int_get(Evas_Object *slider, int *ival) +{ + E_Widget_Data *wd; + + wd = e_widget_data_get(slider); + if (!wd->ival) return 0; + if (!ival) return 0; + + *ival = *(wd->ival); + return 1; +} + +/* Private functions */ static void _e_wid_del_hook(Evas_Object *obj) { =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_slider.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_widget_slider.h 19 Nov 2005 06:10:52 -0000 1.3 +++ e_widget_slider.h 1 Apr 2006 09:24:56 -0000 1.4 @@ -7,6 +7,10 @@ #define E_WIDGET_SLIDER_H EAPI Evas_Object *e_widget_slider_add(Evas *evas, int horiz, int rev, char *fmt, double min, double max, double step, int count, double *dval, int *ival, Evas_Coord size); - +EAPI int e_widget_slider_value_double_set(Evas_Object *slider, double dval); +EAPI int e_widget_slider_value_int_set(Evas_Object *slider, int ival); +EAPI int e_widget_slider_value_double_get(Evas_Object *slider, double *dval); +EAPI int e_widget_slider_value_int_get(Evas_Object *slider, int *ival); + #endif #endif |
From: Enlightenment C. <no...@cv...> - 2006-04-01 09:59:48
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_configure.c Added Files: e_int_config_fonts.c e_int_config_fonts.h Log Message: Adding in the font config dialog files * Merged Hinting into Dialog * TODO: remove old hinting files, if everyone agrees =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -3 -r1.42 -r1.43 --- e_configure.c 1 Apr 2006 09:24:56 -0000 1.42 +++ e_configure.c 1 Apr 2006 09:59:40 -0000 1.43 @@ -67,7 +67,9 @@ e_configure_standard_item_add(eco, "enlightenment/desktops", _("Background Settings"), e_int_config_background); e_configure_standard_item_add(eco, "enlightenment/themes", _("Theme Selector"), e_int_config_theme); e_configure_standard_item_add(eco, "enlightenment/e", _("Font Properties"), e_int_config_fonts); +/* e_configure_standard_item_add(eco, "enlightenment/e", _("Font Display Hinting"), e_int_config_hinting); +*/ e_configure_standard_item_add(eco, "enlightenment/mouse", _("Cursor Settings"), e_int_config_cursor); e_configure_standard_item_add(eco, "enlightenment/windows", _("Window Display Settings"), e_int_config_window_display); |
From: Enlightenment C. <no...@cv...> - 2006-04-04 14:00:33
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_ilist.c e_ilist.h e_int_config_fonts.c e_widget_ilist.c e_widget_ilist.h Log Message: Add font fallbacks configuration to font config dialog * Add arrow icons to default theme * Add api to ilist for manipulating list labels (for moving) * TODO: need to split list manipulation code out to its own widget but what should the diget be called? e_widget_editable_list? =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_ilist.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- e_ilist.c 1 Apr 2006 09:24:56 -0000 1.17 +++ e_ilist.c 4 Apr 2006 14:00:19 -0000 1.18 @@ -296,6 +296,29 @@ } } +EAPI const char * +e_ilist_nth_label_get(Evas_Object *obj, int n) +{ + E_Smart_Item *si; + + API_ENTRY return NULL; + if (!sd->items) return NULL; + si = evas_list_nth(sd->items, n); + if (si) return edje_object_part_text_get(si->base_obj, "label"); + return NULL; +} + +EAPI void +e_ilist_nth_label_set(Evas_Object *obj, int n, const char *label) +{ + E_Smart_Item *si; + + API_ENTRY return; + if (!sd->items) return; + si = evas_list_nth(sd->items, n); + if (si) edje_object_part_text_set(si->base_obj, "label", label); +} + EAPI int e_ilist_count(Evas_Object *obj) { =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_ilist.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_ilist.h 1 Apr 2006 09:24:56 -0000 1.10 +++ e_ilist.h 4 Apr 2006 14:00:19 -0000 1.11 @@ -20,6 +20,8 @@ EAPI int e_ilist_selector_get (Evas_Object *obj); EAPI void e_ilist_remove_num (Evas_Object *obj, int n); EAPI void e_ilist_remove_label (Evas_Object *obj, const char *label); +EAPI const char *e_ilist_nth_label_get (Evas_Object *obj, int n); +EAPI void e_ilist_nth_label_set (Evas_Object *obj, int n, const char *label); EAPI int e_ilist_count (Evas_Object *obj); EAPI void e_ilist_clear (Evas_Object *obj); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_fonts.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_int_config_fonts.c 2 Apr 2006 08:19:17 -0000 1.2 +++ e_int_config_fonts.c 4 Apr 2006 14:00:19 -0000 1.3 @@ -3,28 +3,24 @@ */ #include "e.h" -#define CLASS_ENABLED 0 -#define CLASS_DISABLED 1 - typedef struct _E_Text_Class_Pair E_Text_Class_Pair; typedef struct _CFText_Class CFText_Class; -typedef struct _E_Widget_Data E_Widget_Data; static void *_create_data(E_Config_Dialog *cfd); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -static void _ilist_cb_change(void *data, Evas_Object *obj); -static void _enabled_cb_change(void *data, Evas_Object *obj); +static void _ilist_font_cb_change(void *data, Evas_Object *obj); +static void _enabled_font_cb_change(void *data, Evas_Object *obj); - -struct _E_Widget_Data -{ - E_Radio_Group *group; - Evas_Object *o_radio; - int valnum; -}; +static void _ilist_fallback_cb_change(void *data, Evas_Object *obj); +static void _enabled_fallback_cb_change(void *data, Evas_Object *obj); +static void _button_fallback_cb_add(void *data, void *obj); +static void _button_fallback_cb_remove(void *data, void *obj); +static void _button_fallback_cb_up(void *data, void *obj); +static void _button_fallback_cb_down(void *data, void *obj); +static void _list_select_num(E_Config_Dialog_Data *cfdata, int indx); struct _E_Text_Class_Pair { @@ -84,19 +80,29 @@ int cur_index; /* Font Fallbacks */ - Evas_List *font_fallbacks; - int fallbacks_state; + char *cur_fallback; + int cur_fallbacks_enabled; /* Font Hinting */ int hinting; struct { + /* Font Classes */ Evas_Object *class_list; Evas_Object *font; Evas_Object *size; Evas_Object *enabled; + + /* Font Fallbacks */ + Evas_Object *fallback_list; /* Selecting a list entry starts edit*/ + + Evas_Object *fallback; /* Text Entry */ + Evas_Object *fallback_up; /* Move selected list entry up */ + Evas_Object *fallback_down; /* Move selected list entry down */ + Evas_Object *fallback_add; /* create and select a new list entry */ + Evas_Object *fallback_remove; /* remove the selected entry */ } gui; }; @@ -121,13 +127,13 @@ static void _fill_data(E_Config_Dialog_Data *cfdata) { - Evas_List *enabled_list; + Evas_List *font_list; Evas_List *next; E_Font_Default *efd; CFText_Class *tc; int i; - enabled_list = e_font_default_list(); + font_list = e_font_default_list(); /* Fill out the font list */ for (i = 0; text_class_predefined_names[i].class_name; i++ ) @@ -140,7 +146,7 @@ tc->size = 0; tc->enabled = 0; - for (next = enabled_list; next ; next = next->next) + for (next = font_list; next ; next = next->next) { efd = next->data; @@ -173,6 +179,8 @@ /* Fill Hinting */ cfdata->hinting = e_config->font_hinting; + /* Font fallbacks configured in widgets */ + return; } @@ -201,12 +209,14 @@ evas_stringshare_del(tc->font); E_FREE(tc); } + free(cfdata); } static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { + int i; Evas_List *next; CFText_Class *tc; @@ -234,6 +244,19 @@ } } + /* Fallbacks configure */ + e_font_fallback_clear(); + + if (cfdata->cur_fallbacks_enabled) + { + for (i = 0; i < e_widget_ilist_count(cfdata->gui.fallback_list); i++) + { + const char *fallback; + fallback = e_widget_ilist_nth_label_get(cfdata->gui.fallback_list, i); + if (fallback != NULL && strlen(fallback) > 0) + e_font_fallback_append(fallback); + } + } e_font_apply(); /* Apply Hinting */ @@ -259,7 +282,7 @@ of = e_widget_frametable_add(evas, _("Font Class Configuration"), 0); cfdata->gui.class_list = e_widget_ilist_add(evas, 16, 16, NULL); e_widget_min_size_set(cfdata->gui.class_list, 100, 100); - e_widget_on_change_hook_set(cfdata->gui.class_list, _ilist_cb_change, cfdata); + e_widget_on_change_hook_set(cfdata->gui.class_list, _ilist_font_cb_change, cfdata); /* Fill In Ilist */ for (i = 0; i < evas_list_count(cfdata->text_classes); i++) @@ -319,7 +342,7 @@ e_widget_frametable_object_append(of, cfdata->gui.enabled, 1, 3, 2, 1, 1, 1, 1, 1); - e_widget_on_change_hook_set(cfdata->gui.enabled, _enabled_cb_change, cfdata); + e_widget_on_change_hook_set(cfdata->gui.enabled, _enabled_font_cb_change, cfdata); e_widget_list_object_append(o, of, 1, 1, 0.5); @@ -342,13 +365,99 @@ ob = e_widget_radio_add(evas, _("None"), 2, rg); e_widget_disabled_set(ob, !option_enable); e_widget_framelist_object_append(of, ob); - + + e_widget_list_object_append(o, of, 1, 1, 0.5); + + /* Create Fallbacks Widgets */ + option_enable = (e_font_fallback_list() != NULL); + of = e_widget_frametable_add(evas, _("Font Fallbacks"), 1); + + ob = e_widget_button_add(evas, _("Move Up"), "widget/up_arrow", _button_fallback_cb_up, cfdata, NULL); + cfdata->gui.fallback_up = ob; + e_widget_disabled_set(ob, 1); + e_widget_frametable_object_append( of, + ob, + 1, 0, 1, 1, + 1, 1, 1, 1); + + + ob = e_widget_button_add(evas, _("Move Down"), "widget/down_arrow", _button_fallback_cb_down, cfdata, NULL); + cfdata->gui.fallback_down = ob; + e_widget_disabled_set(ob, 1); + e_widget_frametable_object_append( of, + ob, + 1, 3, 1, 1, + 1, 1, 1, 1); + + + cfdata->gui.fallback_list = e_widget_ilist_add(evas, 16, 16, NULL); + e_widget_disabled_set(cfdata->gui.fallback_list, !option_enable); + e_widget_min_size_set(cfdata->gui.fallback_list, 100, 100); + e_widget_on_change_hook_set(cfdata->gui.fallback_list, _ilist_fallback_cb_change, cfdata); + /* Fill In Ilist */ + for (i = 0; i < evas_list_count(e_font_fallback_list()); i++) + { + E_Font_Fallback *eff; + + eff = evas_list_nth(e_font_fallback_list(), i); + e_widget_ilist_append(cfdata->gui.fallback_list, NULL, eff->name, NULL, NULL, NULL); + } + e_widget_ilist_go(cfdata->gui.fallback_list); + e_widget_frametable_object_append( of, + cfdata->gui.fallback_list, + 2, /* Col Start*/ + 0, /* Row Start */ + 1, /* Col Span*/ + 4, /* Row Span*/ + 1, 1, 1, 1); + + ob = e_widget_label_add(evas, _("Fallback Name")); + e_widget_frametable_object_append( of, + ob, + 0, 0, 1, 1, + 1, 1, 1, 1); + + cfdata->gui.fallback = e_widget_entry_add(evas, &(cfdata->cur_fallback)); + e_widget_disabled_set(cfdata->gui.fallback, !option_enable); + e_widget_min_size_set(cfdata->gui.fallback, 100, 25); + e_widget_frametable_object_append(of, cfdata->gui.fallback, + 0, 1, 1, 1, + 1, 1, 1, 1); + + cfdata->gui.fallback_add = e_widget_button_add(evas, _("Add"), NULL, _button_fallback_cb_add, cfdata, NULL); + e_widget_disabled_set(cfdata->gui.fallback_add, !option_enable); + e_widget_frametable_object_append( of, + cfdata->gui.fallback_add, + 1, 1, 1, 1, + 1, 1, 1, 1); + + cfdata->gui.fallback_remove = e_widget_button_add(evas, _("Remove"), NULL, _button_fallback_cb_remove, cfdata, NULL); + e_widget_disabled_set(cfdata->gui.fallback_remove, !option_enable); + e_widget_frametable_object_append( of, + cfdata->gui.fallback_remove , + 1, 2, 1, 1, + 1, 1, 1, 1); + + ob = e_widget_check_add(evas, _("Enable Fallbacks"), &(cfdata->cur_fallbacks_enabled)); + e_widget_frametable_object_append(of, ob, + 0, 3, 1, 1, + 1, 1, 1, 1); + e_widget_check_checked_set(ob, option_enable); + e_widget_on_change_hook_set(ob, _enabled_fallback_cb_change, cfdata); + + if (e_widget_ilist_count(cfdata->gui.fallback_list) > 0) + { + e_widget_ilist_selected_set(cfdata->gui.fallback_list, 0); + } + e_widget_list_object_append(o, of, 1, 1, 0.5); return o; } +/* Private Font Class Functions */ + static void -_ilist_cb_change(void *data, Evas_Object *obj) +_ilist_font_cb_change(void *data, Evas_Object *obj) { int indx; E_Config_Dialog_Data *cfdata; @@ -383,7 +492,7 @@ } static void -_enabled_cb_change(void *data, Evas_Object *obj) +_enabled_font_cb_change(void *data, Evas_Object *obj) { E_Config_Dialog_Data *cfdata; cfdata = data; @@ -399,4 +508,174 @@ e_widget_disabled_set(cfdata->gui.font, 1); e_widget_disabled_set(cfdata->gui.size, 1); } +} + +/* Private Font Fallback Functions */ +static void _ilist_fallback_cb_change(void *data, Evas_Object *obj) +{ + int indx; + E_Config_Dialog_Data *cfdata; + + cfdata = data; + if (!cfdata) return; + + indx = e_widget_ilist_selected_get(cfdata->gui.fallback_list); + _list_select_num(cfdata, indx); +} +static void _enabled_fallback_cb_change(void *data, Evas_Object *obj) +{ + E_Config_Dialog_Data *cfdata; + + cfdata = data; + if (!cfdata) return; + + if (cfdata->cur_fallbacks_enabled) + { + e_widget_disabled_set(cfdata->gui.fallback_list, 0); + e_widget_disabled_set(cfdata->gui.fallback_add, 0); + e_widget_disabled_set(cfdata->gui.fallback, 0); + } + else + { + _list_select_num(cfdata, -1); + e_widget_disabled_set(cfdata->gui.fallback_list, 1); + e_widget_disabled_set(cfdata->gui.fallback, 1); + e_widget_disabled_set(cfdata->gui.fallback_add, 1); + } +} +static void _button_fallback_cb_add(void *data, void *obj) +{ + E_Config_Dialog_Data *cfdata; + + cfdata = data; + if (!cfdata) return; + + if (cfdata->cur_fallback && strlen(cfdata->cur_fallback) > 0) + { + int count; + int i; + + /* If it already esists just select the existing one */ + for (i = 0; i < e_widget_ilist_count(cfdata->gui.fallback_list); i++) + { + const char *fallback; + fallback = e_widget_ilist_nth_label_get(cfdata->gui.fallback_list, i); + if ( fallback != NULL && + strlen(fallback) > 0 && + !strcmp(fallback, cfdata->cur_fallback) ) + { + e_widget_ilist_selected_set(cfdata->gui.fallback_list, i); + return; + } + } + + e_widget_ilist_append(cfdata->gui.fallback_list, NULL, cfdata->cur_fallback, NULL, NULL, NULL); + e_widget_ilist_go(cfdata->gui.fallback_list); + count = e_widget_ilist_count(cfdata->gui.fallback_list); + e_widget_ilist_selected_set(cfdata->gui.fallback_list, count - 1); + + e_widget_entry_text_set(cfdata->gui.fallback, ""); + } +} + +static void _button_fallback_cb_remove(void *data, void *obj) +{ + int indx; + int count; + E_Config_Dialog_Data *cfdata; + + cfdata = data; + if (!cfdata) return; + + indx = e_widget_ilist_selected_get(cfdata->gui.fallback_list); + count = e_widget_ilist_count(cfdata->gui.fallback_list); + + e_widget_ilist_remove_num(cfdata->gui.fallback_list, indx); + + e_widget_ilist_go(cfdata->gui.fallback_list); + e_widget_ilist_selected_set(cfdata->gui.fallback_list, indx); + if (count == 1) + { + _list_select_num(cfdata, -1); + } +} +static void _button_fallback_cb_up(void *data, void *obj) +{ + E_Config_Dialog_Data *cfdata; + int idx_sel; + const char *label_sel; + const char *label_rep; + + cfdata = data; + if (!cfdata) return; + + idx_sel = e_widget_ilist_selected_get(cfdata->gui.fallback_list); + + label_sel = e_widget_ilist_nth_label_get(cfdata->gui.fallback_list, idx_sel); + label_rep = e_widget_ilist_nth_label_get(cfdata->gui.fallback_list, idx_sel - 1); + + e_widget_ilist_nth_label_set(cfdata->gui.fallback_list, idx_sel - 1, label_sel); + e_widget_ilist_nth_label_set(cfdata->gui.fallback_list, idx_sel, label_rep); + + e_widget_ilist_selected_set(cfdata->gui.fallback_list, idx_sel - 1); +} +static void _button_fallback_cb_down(void *data, void *obj) +{ + E_Config_Dialog_Data *cfdata; + int idx_sel; + const char *label_sel; + const char *label_rep; + + cfdata = data; + if (!cfdata) return; + + idx_sel = e_widget_ilist_selected_get(cfdata->gui.fallback_list); + + label_sel = e_widget_ilist_nth_label_get(cfdata->gui.fallback_list, idx_sel); + label_rep = e_widget_ilist_nth_label_get(cfdata->gui.fallback_list, idx_sel + 1); + + e_widget_ilist_nth_label_set(cfdata->gui.fallback_list, idx_sel + 1, label_sel); + e_widget_ilist_nth_label_set(cfdata->gui.fallback_list, idx_sel, label_rep); + + e_widget_ilist_selected_set(cfdata->gui.fallback_list, idx_sel + 1); +} + +static void _list_select_num(E_Config_Dialog_Data *cfdata, int indx) +{ + int count; + + /* Disable selecting the list while we are disabled */ + if (indx >= 0 && !cfdata->cur_fallbacks_enabled) return; + + count = e_widget_ilist_count(cfdata->gui.fallback_list); + + if (count == 0 || indx < 0) + { + e_widget_disabled_set(cfdata->gui.fallback_remove, 1); + } + else + { + e_widget_disabled_set(cfdata->gui.fallback_remove, 0); + } + + if (count == 1 || indx < 0) + { + e_widget_disabled_set(cfdata->gui.fallback_up, 1); + e_widget_disabled_set(cfdata->gui.fallback_down, 1); + } + else if (indx == 0) + { + e_widget_disabled_set(cfdata->gui.fallback_up, 1); + e_widget_disabled_set(cfdata->gui.fallback_down, 0); + } + else if (indx + 1 == count) + { + e_widget_disabled_set(cfdata->gui.fallback_up, 0); + e_widget_disabled_set(cfdata->gui.fallback_down, 1); + } + else + { + e_widget_disabled_set(cfdata->gui.fallback_up, 0); + e_widget_disabled_set(cfdata->gui.fallback_down, 0); + } } =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_ilist.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- e_widget_ilist.c 1 Apr 2006 09:24:56 -0000 1.14 +++ e_widget_ilist.c 4 Apr 2006 14:00:19 -0000 1.15 @@ -166,6 +166,24 @@ e_ilist_remove_label(wd->o_ilist, label); } +EAPI const char * +e_widget_ilist_nth_label_get(Evas_Object *obj, int n) +{ + E_Widget_Data *wd; + + wd = e_widget_data_get(obj); + return e_ilist_nth_label_get(wd->o_ilist, n); +} + +EAPI void +e_widget_ilist_nth_label_set(Evas_Object *obj, int n, const char *label) +{ + E_Widget_Data *wd; + + wd = e_widget_data_get(obj); + e_ilist_nth_label_set(wd->o_ilist, n, label); +} + EAPI int e_widget_ilist_count(Evas_Object *obj) { @@ -179,8 +197,9 @@ e_widget_ilist_clear(Evas_Object *obj) { E_Widget_Data *wd; +/* int mw, mh, vw, vh, w, h; - + */ wd = e_widget_data_get(obj); e_ilist_clear(wd->o_ilist); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_ilist.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_widget_ilist.h 1 Apr 2006 09:24:56 -0000 1.8 +++ e_widget_ilist.h 4 Apr 2006 14:00:19 -0000 1.9 @@ -16,6 +16,8 @@ EAPI const char *e_widget_ilist_selected_label_get(Evas_Object *obj); EAPI void e_widget_ilist_remove_num(Evas_Object *obj, int n); EAPI void e_widget_ilist_remove_label(Evas_Object *obj, const char *label); +EAPI const char *e_widget_ilist_nth_label_get(Evas_Object *obj, int n); +EAPI void e_widget_ilist_nth_label_set(Evas_Object *obj, int n, const char *label); EAPI int e_widget_ilist_count(Evas_Object *obj); EAPI void e_widget_ilist_clear(Evas_Object *obj); |
From: Enlightenment C. <no...@cv...> - 2006-04-04 14:00:33
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/data/themes/images Added Files: e17_icon_down_arrow.png e17_icon_up_arrow.png Log Message: Add font fallbacks configuration to font config dialog * Add arrow icons to default theme * Add api to ilist for manipulating list labels (for moving) * TODO: need to split list manipulation code out to its own widget but what should the diget be called? e_widget_editable_list? |
From: Enlightenment C. <no...@cv...> - 2006-04-04 14:01:09
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/data/themes Modified Files: default_icons.edc Log Message: Add font fallbacks configuration to font config dialog * Add arrow icons to default theme * Add api to ilist for manipulating list labels (for moving) * TODO: need to split list manipulation code out to its own widget but what should the diget be called? e_widget_editable_list? =================================================================== RCS file: /cvs/e/e17/apps/e/data/themes/default_icons.edc,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- default_icons.edc 25 Jan 2006 04:00:46 -0000 1.7 +++ default_icons.edc 4 Apr 2006 14:00:19 -0000 1.8 @@ -29,6 +29,9 @@ image: "e17_pager_window.png" COMP; image: "e17_icon_right_arrow.png" COMP; + image: "e17_icon_up_arrow.png" COMP; + image: "e17_icon_down_arrow.png" COMP; + image: "e17_pointer.png" COMP; } @@ -506,6 +509,40 @@ max: 10 12; image { normal: "e17_icon_right_arrow.png"; + } + } + } + } +} +group { + name: "icons/widget/up_arrow"; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 0.83333333333 0.83333333333; + max: 12 10; + image { + normal: "e17_icon_up_arrow.png"; + } + } + } + } +} +group { + name: "icons/widget/down_arrow"; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 0.83333333333 0.83333333333; + max: 12 10; + image { + normal: "e17_icon_down_arrow.png"; } } } |
From: Enlightenment C. <no...@cv...> - 2006-04-06 12:08:13
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: Makefile.am e_includes.h e_int_config_fonts.c e_widget_label.c e_widget_label.h Added Files: e_widget_config_list.c e_widget_config_list.h Log Message: Add and Use the config list widget * Config list widget is used to have an editable ilist * Config list widget will be reused in the paths configuration dialog =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v retrieving revision 1.115 retrieving revision 1.116 diff -u -3 -r1.115 -r1.116 --- Makefile.am 1 Apr 2006 09:24:56 -0000 1.115 +++ Makefile.am 6 Apr 2006 12:07:45 -0000 1.116 @@ -119,6 +119,7 @@ e_int_border_border.h \ e_widget_ilist.h \ e_widget_tlist.h \ +e_widget_config_list.h \ e_slider.h \ e_widget_slider.h \ e_int_config_window_manipulation.h \ @@ -249,6 +250,7 @@ e_int_border_border.c \ e_widget_ilist.c \ e_widget_tlist.c \ +e_widget_config_list.c \ e_slider.c \ e_widget_slider.c \ e_int_config_window_manipulation.c \ =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v retrieving revision 1.96 retrieving revision 1.97 diff -u -3 -r1.96 -r1.97 --- e_includes.h 1 Apr 2006 09:24:56 -0000 1.96 +++ e_includes.h 6 Apr 2006 12:07:45 -0000 1.97 @@ -97,6 +97,7 @@ #include "e_livethumb.h" #include "e_int_border_border.h" #include "e_widget_ilist.h" +#include "e_widget_config_list.h" #include "e_slider.h" #include "e_widget_slider.h" #include "e_int_config_window_manipulation.h" =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_fonts.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_int_config_fonts.c 4 Apr 2006 14:00:19 -0000 1.3 +++ e_int_config_fonts.c 6 Apr 2006 12:07:45 -0000 1.4 @@ -14,13 +14,7 @@ static void _ilist_font_cb_change(void *data, Evas_Object *obj); static void _enabled_font_cb_change(void *data, Evas_Object *obj); -static void _ilist_fallback_cb_change(void *data, Evas_Object *obj); static void _enabled_fallback_cb_change(void *data, Evas_Object *obj); -static void _button_fallback_cb_add(void *data, void *obj); -static void _button_fallback_cb_remove(void *data, void *obj); -static void _button_fallback_cb_up(void *data, void *obj); -static void _button_fallback_cb_down(void *data, void *obj); -static void _list_select_num(E_Config_Dialog_Data *cfdata, int indx); struct _E_Text_Class_Pair { @@ -80,7 +74,6 @@ int cur_index; /* Font Fallbacks */ - char *cur_fallback; int cur_fallbacks_enabled; /* Font Hinting */ @@ -97,12 +90,6 @@ /* Font Fallbacks */ Evas_Object *fallback_list; /* Selecting a list entry starts edit*/ - - Evas_Object *fallback; /* Text Entry */ - Evas_Object *fallback_up; /* Move selected list entry up */ - Evas_Object *fallback_down; /* Move selected list entry down */ - Evas_Object *fallback_add; /* create and select a new list entry */ - Evas_Object *fallback_remove; /* remove the selected entry */ } gui; }; @@ -249,10 +236,10 @@ if (cfdata->cur_fallbacks_enabled) { - for (i = 0; i < e_widget_ilist_count(cfdata->gui.fallback_list); i++) + for (i = 0; i < e_widget_config_list_count(cfdata->gui.fallback_list); i++) { const char *fallback; - fallback = e_widget_ilist_nth_label_get(cfdata->gui.fallback_list, i); + fallback = e_widget_config_list_nth_get(cfdata->gui.fallback_list, i); if (fallback != NULL && strlen(fallback) > 0) e_font_fallback_append(fallback); } @@ -369,88 +356,35 @@ e_widget_list_object_append(o, of, 1, 1, 0.5); /* Create Fallbacks Widgets */ - option_enable = (e_font_fallback_list() != NULL); - of = e_widget_frametable_add(evas, _("Font Fallbacks"), 1); + of = e_widget_framelist_add(evas, _("Font Fallbacks"), 0); + e_widget_framelist_content_align_set(of, 0.5, 0.5); - ob = e_widget_button_add(evas, _("Move Up"), "widget/up_arrow", _button_fallback_cb_up, cfdata, NULL); - cfdata->gui.fallback_up = ob; - e_widget_disabled_set(ob, 1); - e_widget_frametable_object_append( of, - ob, - 1, 0, 1, 1, - 1, 1, 1, 1); - - - ob = e_widget_button_add(evas, _("Move Down"), "widget/down_arrow", _button_fallback_cb_down, cfdata, NULL); - cfdata->gui.fallback_down = ob; - e_widget_disabled_set(ob, 1); - e_widget_frametable_object_append( of, - ob, - 1, 3, 1, 1, - 1, 1, 1, 1); - + ob = e_widget_config_list_add(evas, e_widget_entry_add, _("Fallback Name")); + cfdata->gui.fallback_list = ob; + e_widget_framelist_object_append(of, ob); - cfdata->gui.fallback_list = e_widget_ilist_add(evas, 16, 16, NULL); - e_widget_disabled_set(cfdata->gui.fallback_list, !option_enable); - e_widget_min_size_set(cfdata->gui.fallback_list, 100, 100); - e_widget_on_change_hook_set(cfdata->gui.fallback_list, _ilist_fallback_cb_change, cfdata); /* Fill In Ilist */ + option_enable = 0; for (i = 0; i < evas_list_count(e_font_fallback_list()); i++) { E_Font_Fallback *eff; eff = evas_list_nth(e_font_fallback_list(), i); - e_widget_ilist_append(cfdata->gui.fallback_list, NULL, eff->name, NULL, NULL, NULL); + e_widget_config_list_append(ob, eff->name); + option_enable = 1; } - e_widget_ilist_go(cfdata->gui.fallback_list); - e_widget_frametable_object_append( of, - cfdata->gui.fallback_list, - 2, /* Col Start*/ - 0, /* Row Start */ - 1, /* Col Span*/ - 4, /* Row Span*/ - 1, 1, 1, 1); - - ob = e_widget_label_add(evas, _("Fallback Name")); - e_widget_frametable_object_append( of, - ob, - 0, 0, 1, 1, - 1, 1, 1, 1); - - cfdata->gui.fallback = e_widget_entry_add(evas, &(cfdata->cur_fallback)); - e_widget_disabled_set(cfdata->gui.fallback, !option_enable); - e_widget_min_size_set(cfdata->gui.fallback, 100, 25); - e_widget_frametable_object_append(of, cfdata->gui.fallback, - 0, 1, 1, 1, - 1, 1, 1, 1); - - cfdata->gui.fallback_add = e_widget_button_add(evas, _("Add"), NULL, _button_fallback_cb_add, cfdata, NULL); - e_widget_disabled_set(cfdata->gui.fallback_add, !option_enable); - e_widget_frametable_object_append( of, - cfdata->gui.fallback_add, - 1, 1, 1, 1, - 1, 1, 1, 1); - cfdata->gui.fallback_remove = e_widget_button_add(evas, _("Remove"), NULL, _button_fallback_cb_remove, cfdata, NULL); - e_widget_disabled_set(cfdata->gui.fallback_remove, !option_enable); - e_widget_frametable_object_append( of, - cfdata->gui.fallback_remove , - 1, 2, 1, 1, - 1, 1, 1, 1); - ob = e_widget_check_add(evas, _("Enable Fallbacks"), &(cfdata->cur_fallbacks_enabled)); - e_widget_frametable_object_append(of, ob, + e_widget_config_list_object_append( cfdata->gui.fallback_list, + ob, 0, 3, 1, 1, 1, 1, 1, 1); + e_widget_on_change_hook_set(ob, _enabled_fallback_cb_change, cfdata); e_widget_check_checked_set(ob, option_enable); - e_widget_on_change_hook_set(ob, _enabled_fallback_cb_change, cfdata); - - if (e_widget_ilist_count(cfdata->gui.fallback_list) > 0) - { - e_widget_ilist_selected_set(cfdata->gui.fallback_list, 0); - } + e_widget_change(ob); e_widget_list_object_append(o, of, 1, 1, 0.5); + return o; } @@ -511,171 +445,13 @@ } /* Private Font Fallback Functions */ -static void _ilist_fallback_cb_change(void *data, Evas_Object *obj) -{ - int indx; - E_Config_Dialog_Data *cfdata; - - cfdata = data; - if (!cfdata) return; - - indx = e_widget_ilist_selected_get(cfdata->gui.fallback_list); - _list_select_num(cfdata, indx); -} static void _enabled_fallback_cb_change(void *data, Evas_Object *obj) { E_Config_Dialog_Data *cfdata; cfdata = data; if (!cfdata) return; - - if (cfdata->cur_fallbacks_enabled) - { - e_widget_disabled_set(cfdata->gui.fallback_list, 0); - e_widget_disabled_set(cfdata->gui.fallback_add, 0); - e_widget_disabled_set(cfdata->gui.fallback, 0); - } - else - { - _list_select_num(cfdata, -1); - e_widget_disabled_set(cfdata->gui.fallback_list, 1); - e_widget_disabled_set(cfdata->gui.fallback, 1); - e_widget_disabled_set(cfdata->gui.fallback_add, 1); - } -} -static void _button_fallback_cb_add(void *data, void *obj) -{ - E_Config_Dialog_Data *cfdata; - - cfdata = data; - if (!cfdata) return; - - if (cfdata->cur_fallback && strlen(cfdata->cur_fallback) > 0) - { - int count; - int i; - - /* If it already esists just select the existing one */ - for (i = 0; i < e_widget_ilist_count(cfdata->gui.fallback_list); i++) - { - const char *fallback; - fallback = e_widget_ilist_nth_label_get(cfdata->gui.fallback_list, i); - if ( fallback != NULL && - strlen(fallback) > 0 && - !strcmp(fallback, cfdata->cur_fallback) ) - { - e_widget_ilist_selected_set(cfdata->gui.fallback_list, i); - return; - } - } - - e_widget_ilist_append(cfdata->gui.fallback_list, NULL, cfdata->cur_fallback, NULL, NULL, NULL); - e_widget_ilist_go(cfdata->gui.fallback_list); - count = e_widget_ilist_count(cfdata->gui.fallback_list); - e_widget_ilist_selected_set(cfdata->gui.fallback_list, count - 1); - - e_widget_entry_text_set(cfdata->gui.fallback, ""); - } -} - -static void _button_fallback_cb_remove(void *data, void *obj) -{ - int indx; - int count; - E_Config_Dialog_Data *cfdata; - - cfdata = data; - if (!cfdata) return; - - indx = e_widget_ilist_selected_get(cfdata->gui.fallback_list); - count = e_widget_ilist_count(cfdata->gui.fallback_list); - - e_widget_ilist_remove_num(cfdata->gui.fallback_list, indx); - - e_widget_ilist_go(cfdata->gui.fallback_list); - e_widget_ilist_selected_set(cfdata->gui.fallback_list, indx); - if (count == 1) - { - _list_select_num(cfdata, -1); - } -} -static void _button_fallback_cb_up(void *data, void *obj) -{ - E_Config_Dialog_Data *cfdata; - int idx_sel; - const char *label_sel; - const char *label_rep; - - cfdata = data; - if (!cfdata) return; - - idx_sel = e_widget_ilist_selected_get(cfdata->gui.fallback_list); - - label_sel = e_widget_ilist_nth_label_get(cfdata->gui.fallback_list, idx_sel); - label_rep = e_widget_ilist_nth_label_get(cfdata->gui.fallback_list, idx_sel - 1); - - e_widget_ilist_nth_label_set(cfdata->gui.fallback_list, idx_sel - 1, label_sel); - e_widget_ilist_nth_label_set(cfdata->gui.fallback_list, idx_sel, label_rep); - - e_widget_ilist_selected_set(cfdata->gui.fallback_list, idx_sel - 1); -} -static void _button_fallback_cb_down(void *data, void *obj) -{ - E_Config_Dialog_Data *cfdata; - int idx_sel; - const char *label_sel; - const char *label_rep; - - cfdata = data; - if (!cfdata) return; - - idx_sel = e_widget_ilist_selected_get(cfdata->gui.fallback_list); - - label_sel = e_widget_ilist_nth_label_get(cfdata->gui.fallback_list, idx_sel); - label_rep = e_widget_ilist_nth_label_get(cfdata->gui.fallback_list, idx_sel + 1); - - e_widget_ilist_nth_label_set(cfdata->gui.fallback_list, idx_sel + 1, label_sel); - e_widget_ilist_nth_label_set(cfdata->gui.fallback_list, idx_sel, label_rep); - - e_widget_ilist_selected_set(cfdata->gui.fallback_list, idx_sel + 1); + + e_widget_disabled_set(cfdata->gui.fallback_list, !cfdata->cur_fallbacks_enabled); } -static void _list_select_num(E_Config_Dialog_Data *cfdata, int indx) -{ - int count; - - /* Disable selecting the list while we are disabled */ - if (indx >= 0 && !cfdata->cur_fallbacks_enabled) return; - - count = e_widget_ilist_count(cfdata->gui.fallback_list); - - if (count == 0 || indx < 0) - { - e_widget_disabled_set(cfdata->gui.fallback_remove, 1); - } - else - { - e_widget_disabled_set(cfdata->gui.fallback_remove, 0); - } - - if (count == 1 || indx < 0) - { - e_widget_disabled_set(cfdata->gui.fallback_up, 1); - e_widget_disabled_set(cfdata->gui.fallback_down, 1); - } - else if (indx == 0) - { - e_widget_disabled_set(cfdata->gui.fallback_up, 1); - e_widget_disabled_set(cfdata->gui.fallback_down, 0); - } - else if (indx + 1 == count) - { - e_widget_disabled_set(cfdata->gui.fallback_up, 0); - e_widget_disabled_set(cfdata->gui.fallback_down, 1); - } - else - { - e_widget_disabled_set(cfdata->gui.fallback_up, 0); - e_widget_disabled_set(cfdata->gui.fallback_down, 0); - } -} =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_label.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_widget_label.c 7 Jan 2006 10:39:45 -0000 1.3 +++ e_widget_label.c 6 Apr 2006 12:07:45 -0000 1.4 @@ -7,7 +7,7 @@ /* externally accessible functions */ EAPI Evas_Object * -e_widget_label_add(Evas *evas, char *label) +e_widget_label_add(Evas *evas, const char *label) { Evas_Object *obj, *o; Evas_Coord mw, mh; =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_label.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_widget_label.h 12 Oct 2005 23:00:45 -0000 1.2 +++ e_widget_label.h 6 Apr 2006 12:07:45 -0000 1.3 @@ -6,7 +6,7 @@ #ifndef E_WIDGET_LABEL_H #define E_WIDGET_LABEL_H -EAPI Evas_Object *e_widget_label_add(Evas *evas, char *label); +EAPI Evas_Object *e_widget_label_add(Evas *evas, const char *label); #endif #endif |
From: Enlightenment C. <no...@cv...> - 2006-04-09 11:55:46
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: Makefile.am e_configure.c e_includes.h e_int_config_fonts.c e_ipc_handlers.h e_path.c e_path.h e_widget_config_list.c e_widget_config_list.h Added Files: e_int_config_paths.c e_int_config_paths.h Log Message: Add a simple search path configuration dialog, plus: * Add some widget API used by new dialog * Fix typo =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v retrieving revision 1.116 retrieving revision 1.117 diff -u -3 -r1.116 -r1.117 --- Makefile.am 6 Apr 2006 12:07:45 -0000 1.116 +++ Makefile.am 9 Apr 2006 11:55:18 -0000 1.117 @@ -150,7 +150,8 @@ e_stolen.h \ e_gadcon.h \ e_shelf.h \ -e_widget_preview.h +e_widget_preview.h \ +e_int_config_paths.h enlightenment_src = \ e_user.c \ @@ -282,6 +283,7 @@ e_gadcon.c \ e_shelf.c \ e_widget_preview.c \ +e_int_config_paths.c \ $(ENLIGHTENMENTHEADERS) enlightenment_SOURCES = \ =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -3 -r1.43 -r1.44 --- e_configure.c 1 Apr 2006 09:59:40 -0000 1.43 +++ e_configure.c 9 Apr 2006 11:55:18 -0000 1.44 @@ -95,7 +95,8 @@ e_configure_standard_item_add(eco, "enlightenment/windows", _("Window List Settings"), e_int_config_winlist); e_configure_standard_item_add(eco, "enlightenment/windows", _("Window Manipulation Settings"), e_int_config_window_manipulation); e_configure_standard_item_add(eco, "enlightenment/run", _("Run Command Settings"), e_int_config_exebuf); - + e_configure_standard_item_add(eco, "enlightenment/e", _("Search Paths"), e_int_config_paths); + /* FIXME: we should have a way for modules to hook in here and add their * own entries */ =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v retrieving revision 1.97 retrieving revision 1.98 diff -u -3 -r1.97 -r1.98 --- e_includes.h 6 Apr 2006 12:07:45 -0000 1.97 +++ e_includes.h 9 Apr 2006 11:55:18 -0000 1.98 @@ -130,3 +130,4 @@ #include "e_shelf.h" #include "e_tlist.h" #include "e_widget_preview.h" +#include "e_int_config_paths.h" =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_fonts.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_int_config_fonts.c 6 Apr 2006 12:07:45 -0000 1.4 +++ e_int_config_fonts.c 9 Apr 2006 11:55:18 -0000 1.5 @@ -359,7 +359,7 @@ of = e_widget_framelist_add(evas, _("Font Fallbacks"), 0); e_widget_framelist_content_align_set(of, 0.5, 0.5); - ob = e_widget_config_list_add(evas, e_widget_entry_add, _("Fallback Name")); + ob = e_widget_config_list_add(evas, e_widget_entry_add, _("Fallback Name"), 1); cfdata->gui.fallback_list = ob; e_widget_framelist_object_append(of, ob); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_ipc_handlers.h,v retrieving revision 1.127 retrieving revision 1.128 diff -u -3 -r1.127 -r1.128 --- e_ipc_handlers.h 29 Mar 2006 15:50:01 -0000 1.127 +++ e_ipc_handlers.h 9 Apr 2006 11:55:18 -0000 1.128 @@ -3,7 +3,7 @@ */ /* NOTE: * - * This is a very SPECIAL file. This servers as a kind of "auto code generator" + * This is a very SPECIAL file. This serves as a kind of "auto code generator" * to handle the encoder, decoder etc. aspects of ipc requests. the aim here * is to make writing support for a new opcode simple and compact. It intends * to centralize the handling into 1 spot, instead of having ti spread around =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_path.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- e_path.c 2 Mar 2006 12:03:48 -0000 1.19 +++ e_path.c 9 Apr 2006 11:55:18 -0000 1.20 @@ -249,6 +249,20 @@ } } +EAPI void +e_path_user_path_clear(E_Path *ep) +{ + while (*(ep->user_dir_list)) + { + E_Path_Dir *epd; + epd = (*(ep->user_dir_list))->data; + *(ep->user_dir_list) = evas_list_remove_list(*(ep->user_dir_list), *(ep->user_dir_list)); + evas_stringshare_del(epd->dir); + free(epd); + } + _e_path_cache_free(ep); +} + EAPI const char * e_path_find(E_Path *ep, const char *file) { =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_path.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_path.h 2 Mar 2006 12:03:48 -0000 1.10 +++ e_path.h 9 Apr 2006 11:55:18 -0000 1.11 @@ -38,6 +38,7 @@ EAPI void e_path_user_path_append(E_Path *ep, const char *path); EAPI void e_path_user_path_prepend(E_Path *ep, const char *path); EAPI void e_path_user_path_remove(E_Path *ep, const char *path); +EAPI void e_path_user_path_clear(E_Path *ep); EAPI const char *e_path_find(E_Path *ep, const char *file); EAPI void e_path_evas_append(E_Path *ep, Evas *evas); EAPI Evas_List *e_path_dir_list_get(E_Path *ep); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_config_list.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_widget_config_list.c 6 Apr 2006 12:07:45 -0000 1.1 +++ e_widget_config_list.c 9 Apr 2006 11:55:18 -0000 1.2 @@ -38,7 +38,7 @@ /* Externally accessible functions */ EAPI Evas_Object * -e_widget_config_list_add(Evas *evas, Evas_Object* (*func_entry_add) (Evas *evas, char **val), const char *label) +e_widget_config_list_add(Evas *evas, Evas_Object* (*func_entry_add) (Evas *evas, char **val), const char *label, int listspan) { Evas_Object *obj, *o; E_Widget_Data *wd; @@ -72,7 +72,7 @@ 1, 1, 1, 1); - o = e_widget_ilist_add(evas, 16, 16, NULL); + o = e_widget_ilist_add(evas, 0, 0, NULL); wd->gui.list = o; e_widget_disabled_set(o, 1); e_widget_min_size_set(o, 100, 100); @@ -80,7 +80,7 @@ e_widget_ilist_go(o); e_widget_table_object_append( wd->gui.table, o, - 2, 0, 1, 4, + 2, 0, listspan, 4, 1, 1, 1, 1); o = e_widget_label_add(evas, label); @@ -130,6 +130,16 @@ return e_widget_ilist_count(wd->gui.list); } +EAPI void +e_widget_config_list_clear(Evas_Object *obj) +{ + E_Widget_Data *wd; + + wd = e_widget_data_get(obj); + e_widget_ilist_clear(wd->gui.list); + _list_select_num(wd, -1); +} + EAPI const char * e_widget_config_list_nth_get(Evas_Object *obj, int n) { @@ -330,7 +340,7 @@ if (!wd) return; wd->cur_enabled = !e_widget_disabled_get(obj); - + if (wd->cur_enabled) { e_widget_disabled_set(wd->gui.list, 0); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_config_list.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_widget_config_list.h 6 Apr 2006 12:07:45 -0000 1.1 +++ e_widget_config_list.h 9 Apr 2006 11:55:18 -0000 1.2 @@ -6,11 +6,12 @@ #ifndef E_WIDGET_CONFIG_LIST_H #define E_WIDGET_CONFIG_LIST_H -EAPI Evas_Object *e_widget_config_list_add(Evas *evas, Evas_Object* (*func_entry_add) (Evas *evas, char **val), const char *label); +EAPI Evas_Object *e_widget_config_list_add(Evas *evas, Evas_Object* (*func_entry_add) (Evas *evas, char **val), const char *label, int listspan); EAPI int e_widget_config_list_count(Evas_Object *obj); EAPI const char *e_widget_config_list_nth_get(Evas_Object *obj, int n); EAPI void e_widget_config_list_append(Evas_Object *obj, const char *entry); EAPI void e_widget_config_list_object_append(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h); +EAPI void e_widget_config_list_clear(Evas_Object *obj); #endif #endif |
From: Enlightenment C. <no...@cv...> - 2006-04-13 00:01:45
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_ilist.c e_ilist.h e_int_config_fonts.c e_widget_ilist.c e_widget_ilist.h Log Message: Code cleanups for font config dialog * Move sndev's code into ilist so it can be reused =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_ilist.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- e_ilist.c 4 Apr 2006 14:00:19 -0000 1.18 +++ e_ilist.c 13 Apr 2006 00:01:15 -0000 1.19 @@ -187,6 +187,18 @@ return NULL; } +EAPI Evas_Object * +e_ilist_selected_icon_get(Evas_Object *obj) +{ + E_Smart_Item *si; + + API_ENTRY return NULL; + if (!sd->items) return NULL; + si = evas_list_nth(sd->items, sd->selected); + if (si) return si->icon_obj; + return NULL; +} + EAPI void * e_ilist_selected_data_get(Evas_Object *obj) { @@ -317,6 +329,45 @@ if (!sd->items) return; si = evas_list_nth(sd->items, n); if (si) edje_object_part_text_set(si->base_obj, "label", label); +} + +EAPI Evas_Object * +e_ilist_nth_icon_get(Evas_Object *obj, int n) +{ + E_Smart_Item *si; + + API_ENTRY return NULL; + if (!sd->items) return NULL; + si = evas_list_nth(sd->items, n); + if (si) return si->icon_obj; + return NULL; +} + +EAPI void +e_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon) +{ + E_Smart_Item *si; + + API_ENTRY return; + if (!sd->items) return; + si = evas_list_nth(sd->items, n); + if (si) + { + if (si->icon_obj) + { + edje_object_part_unswallow(si->base_obj, si->icon_obj); + evas_object_hide(si->icon_obj); + evas_object_del(si->icon_obj); + } + + si->icon_obj = icon; + if (si->icon_obj) + { + edje_extern_object_min_size_set(si->icon_obj, sd->icon_w, sd->icon_h); + edje_object_part_swallow(si->base_obj, "icon_swallow", si->icon_obj); + evas_object_show(si->icon_obj); + } + } } EAPI int =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_ilist.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_ilist.h 4 Apr 2006 14:00:19 -0000 1.11 +++ e_ilist.h 13 Apr 2006 00:01:15 -0000 1.12 @@ -22,6 +22,9 @@ EAPI void e_ilist_remove_label (Evas_Object *obj, const char *label); EAPI const char *e_ilist_nth_label_get (Evas_Object *obj, int n); EAPI void e_ilist_nth_label_set (Evas_Object *obj, int n, const char *label); +EAPI void e_ilist_nth_icon_set (Evas_Object *obj, int n, Evas_Object *icon); +EAPI Evas_Object *e_ilist_nth_icon_get (Evas_Object *obj, int n); +EAPI Evas_Object *e_ilist_selected_icon_get (Evas_Object *obj); EAPI int e_ilist_count (Evas_Object *obj); EAPI void e_ilist_clear (Evas_Object *obj); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_fonts.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_int_config_fonts.c 12 Apr 2006 14:45:10 -0000 1.6 +++ e_int_config_fonts.c 13 Apr 2006 00:01:15 -0000 1.7 @@ -20,40 +20,6 @@ static void _enabled_fallback_cb_change(void *data, Evas_Object *obj); -typedef struct _E_Smart_Item E_Smart_Item; -typedef struct _E_Smart_Data E_Smart_Data; -typedef struct _E_Widget_IList_Data E_Widget_IList_Data; - -struct _E_Widget_IList_Data -{ - Evas_Object *o_widget, *o_scrollframe, *o_ilist; - Evas_List *callbacks; - char **value; -}; - -struct _E_Smart_Data -{ - Evas_Coord x, y, w, h; - - Evas_Object *smart_obj; - Evas_Object *box_obj; - Evas_List *items; - int selected; - Evas_Coord icon_w, icon_h; - unsigned char selector : 1; -}; - -struct _E_Smart_Item -{ - E_Smart_Data *sd; - Evas_Object *base_obj; - Evas_Object *icon_obj; - void (*func) (void *data, void *data2); - void (*func_hilight) (void *data, void *data2); - void *data; - void *data2; -}; - struct _E_Text_Class_Pair { const char *class_name; @@ -102,6 +68,7 @@ struct _E_Config_Dialog_Data { E_Config_Dialog *cfd; + Evas *evas; /* Text Classes */ Evas_List *text_classes; @@ -301,6 +268,7 @@ int i; cfdata->cur_index = -1; + cfdata->evas = evas; o = e_widget_list_add(evas, 0, 0); /* Create Font Class Widgets */ @@ -318,11 +286,15 @@ tc = evas_list_nth(cfdata->text_classes, i); if (tc) { - ic = edje_object_add(evas); if (tc->enabled) - e_util_edje_icon_set(ic, ILIST_ICON_WITH_DEFINED_FONT); + { + ic = edje_object_add(evas); + e_util_edje_icon_set(ic, ILIST_ICON_WITH_DEFINED_FONT); + } else - e_util_edje_icon_set(ic, ""); + { + ic = NULL; + } e_widget_ilist_append(cfdata->gui.class_list, ic, tc->class_description, NULL, NULL, NULL); } } @@ -467,21 +439,27 @@ _enabled_font_cb_change(void *data, Evas_Object *obj) { E_Config_Dialog_Data *cfdata; + Evas_Object *icon; + int n; + cfdata = data; if (!cfdata) return; + n = e_widget_ilist_selected_get(cfdata->gui.class_list); if (cfdata->cur_enabled) { e_widget_disabled_set(cfdata->gui.font, 0); e_widget_disabled_set(cfdata->gui.size, 0); + icon = edje_object_add(cfdata->evas); + e_util_edje_icon_set(icon, ILIST_ICON_WITH_DEFINED_FONT); } else { e_widget_disabled_set(cfdata->gui.font, 1); e_widget_disabled_set(cfdata->gui.size, 1); + icon = NULL; } - - _update_font_class_ilist_icon(cfdata); + e_widget_ilist_nth_icon_set(cfdata->gui.class_list, n, icon); } /* Private Font Fallback Functions */ @@ -493,52 +471,5 @@ if (!cfdata) return; e_widget_disabled_set(cfdata->gui.fallback_list, !cfdata->cur_fallbacks_enabled); -} - -/* Just to have nice icon change in fontclass list */ -static void _update_font_class_ilist_icon(void *data) -{ - E_Smart_Item *si; - E_Smart_Data *sd; - E_Widget_IList_Data *wd; - Evas_Object *obj; - - E_Config_Dialog_Data *cfdata; - - if (!(cfdata = data)) - return; - - if (!(wd = e_widget_data_get(cfdata->gui.class_list))) - return; - - obj = wd->o_ilist; - - sd = evas_object_smart_data_get(obj); - - if ((!obj) || (!sd) || - (evas_object_type_get(obj) && strcmp(evas_object_type_get(obj), "e_ilist"))) - return; - - si = evas_list_nth(sd->items, sd->selected); - if (si) - { - edje_object_part_unswallow(si->base_obj, si->icon_obj); - evas_object_hide(si->icon_obj); - if (cfdata->cur_enabled) - { - if (si->icon_obj == NULL) - si->icon_obj = edje_object_add(evas_object_evas_get(sd->smart_obj)); - e_util_edje_icon_set(si->icon_obj, ILIST_ICON_WITH_DEFINED_FONT); - } - else - si->icon_obj = NULL; - - if (si->icon_obj) - { - edje_extern_object_min_size_set(si->icon_obj, sd->icon_w, sd->icon_h); - edje_object_part_swallow(si->base_obj, "icon_swallow", si->icon_obj); - evas_object_show(si->icon_obj); - } - } } =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_ilist.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- e_widget_ilist.c 4 Apr 2006 14:00:19 -0000 1.15 +++ e_widget_ilist.c 13 Apr 2006 00:01:15 -0000 1.16 @@ -184,6 +184,33 @@ e_ilist_nth_label_set(wd->o_ilist, n, label); } +EAPI void +e_widget_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon) +{ + E_Widget_Data *wd; + + wd = e_widget_data_get(obj); + e_ilist_nth_icon_set(wd->o_ilist, n, icon); +} + +EAPI Evas_Object * +e_widget_ilist_nth_icon_get(Evas_Object *obj, int n) +{ + E_Widget_Data *wd; + + wd = e_widget_data_get(obj); + return e_ilist_nth_icon_get(wd->o_ilist, n); +} + +EAPI Evas_Object * +e_widget_ilist_selected_icon_get(Evas_Object *obj) +{ + E_Widget_Data *wd; + + wd = e_widget_data_get(obj); + return e_ilist_selected_icon_get(wd->o_ilist); +} + EAPI int e_widget_ilist_count(Evas_Object *obj) { =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_ilist.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- e_widget_ilist.h 4 Apr 2006 14:00:19 -0000 1.9 +++ e_widget_ilist.h 13 Apr 2006 00:01:15 -0000 1.10 @@ -18,6 +18,9 @@ EAPI void e_widget_ilist_remove_label(Evas_Object *obj, const char *label); EAPI const char *e_widget_ilist_nth_label_get(Evas_Object *obj, int n); EAPI void e_widget_ilist_nth_label_set(Evas_Object *obj, int n, const char *label); +EAPI void e_widget_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon); +EAPI Evas_Object *e_widget_ilist_nth_icon_get(Evas_Object *obj, int n); +EAPI Evas_Object *e_widget_ilist_selected_icon_get(Evas_Object *obj); EAPI int e_widget_ilist_count(Evas_Object *obj); EAPI void e_widget_ilist_clear(Evas_Object *obj); |
From: Enlightenment C. <no...@cv...> - 2006-04-18 18:36:51
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_fonts.c Log Message: Fix segv in font configuration (thanks tobias) * When the font is originally configured it is set to "". after a restart the font will be read from eet as NULL. I need to check for this. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_fonts.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_int_config_fonts.c 13 Apr 2006 00:01:15 -0000 1.7 +++ e_int_config_fonts.c 18 Apr 2006 18:36:11 -0000 1.8 @@ -144,16 +144,20 @@ if (!strcmp(tc->class_name, efd->text_class)) { - tc->font = evas_stringshare_add(efd->font); - tc->size = efd->size; - tc->enabled = 1; + if (efd->font) + tc->font = evas_stringshare_add(efd->font); + else + tc->font = evas_stringshare_add(""); + + tc->size = efd->size; + tc->enabled = 1; } } if (!tc->enabled) { efd = e_font_default_get(tc->class_name); - if (efd) + if (efd && efd->font) { tc->font = evas_stringshare_add(efd->font); tc->size = efd->size; |
From: Enlightenment C. <no...@cv...> - 2006-04-23 15:31:32
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_fonts.c e_widget_config_list.c Log Message: Updates for Font Dialog * New font classes for widgets/modules modules MUST use module classes * Headers to organize classes * fix mem leaks of entry text =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_fonts.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_int_config_fonts.c 18 Apr 2006 18:36:11 -0000 1.8 +++ e_int_config_fonts.c 23 Apr 2006 15:30:47 -0000 1.9 @@ -16,7 +16,6 @@ static void _ilist_font_cb_change(void *data, Evas_Object *obj); static void _enabled_font_cb_change(void *data, Evas_Object *obj); -static void _update_font_class_ilist_icon(void *data); static void _enabled_fallback_cb_change(void *data, Evas_Object *obj); @@ -36,21 +35,14 @@ }; const E_Text_Class_Pair text_class_predefined_names[ ] = { + { NULL, "Window Manager Classes"}, { "title_bar", "Title Bar"}, { "menu_item", "Menu Item"}, - { "ilist_item", "List Item"}, - { "ilist_header", "List Header"}, { "tb_plain", "Textblock Plain"}, { "tb_light", "Textblock Light"}, { "tb_big", "Textblock Big"}, - { "frame", "Frame"}, - { "label", "Label"}, - { "button", "Buttons"}, - { "radio_button", "Radio Buttons"}, - { "check_button", "Check Buttons"}, { "move_text", "Move Text"}, { "resize_text", "Resize Text"}, - { "tlist", "Text List Item"}, { "winlist_title", "Winlist Title"}, { "configure", "Configure Heading"}, { "about_title", "About Title"}, @@ -60,9 +52,31 @@ { "desklock_passwd", "Desklock Password"}, { "dialog_error", "Dialog Error"}, { "exebuf_command", "Exebuf Command"}, + + { NULL, "Widget Classes"}, + { "frame", "Frame"}, + { "label", "Label"}, + { "button", "Buttons"}, + { "slider", "Slider"}, + { "radio_button", "Radio Buttons"}, + { "check_button", "Check Buttons"}, + { "tlist", "Text List Item"}, + { "ilist_item", "List Item"}, + { "ilist_header", "List Header"}, + + { NULL, "EFM Classes"}, { "fileman_typebuf", "EFM Typebuf"}, { "fileman_icon", "EFM Icon"}, - { NULL, NULL} + + { NULL, "Module Classes"}, + { "module_small", "Small"}, + { "module_normal", "Normal"}, + { "module_large", "Large"}, + { "module_small_s", "Small Styled"}, + { "module_normal_s", "Normal Styled"}, + { "module_large_s", "Large Styled"}, + + { NULL, NULL} }; struct _E_Config_Dialog_Data @@ -128,46 +142,52 @@ font_list = e_font_default_list(); /* Fill out the font list */ - for (i = 0; text_class_predefined_names[i].class_name; i++ ) + for (i = 0; text_class_predefined_names[i].class_description; i++ ) { - tc = E_NEW(CFText_Class, 1); - + 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->font = NULL; tc->size = 0; tc->enabled = 0; - - for (next = font_list; next ; next = next->next) - { - efd = next->data; - - if (!strcmp(tc->class_name, efd->text_class)) - { - if (efd->font) - tc->font = evas_stringshare_add(efd->font); - else - tc->font = evas_stringshare_add(""); - - tc->size = efd->size; - tc->enabled = 1; - } - } - - if (!tc->enabled) + + if (text_class_predefined_names[i].class_name) { - efd = e_font_default_get(tc->class_name); - if (efd && efd->font) + for (next = font_list; next ; next = next->next) { - tc->font = evas_stringshare_add(efd->font); - tc->size = efd->size; + efd = next->data; + + if (!strcmp(tc->class_name, efd->text_class)) + { + if (efd->font) + tc->font = evas_stringshare_add(efd->font); + else + tc->font = evas_stringshare_add(""); + + tc->size = efd->size; + tc->enabled = 1; + } } - else + + if (!tc->enabled) { - tc->font = evas_stringshare_add(""); + efd = e_font_default_get(tc->class_name); + if (efd) + { + if (efd->font) + tc->font = evas_stringshare_add(efd->font); + else + tc->font = evas_stringshare_add(""); + + tc->size = efd->size; + } + else + { + tc->font = evas_stringshare_add(""); + } } } - + /* Append the class */ cfdata->text_classes = evas_list_append(cfdata->text_classes, tc); } @@ -202,10 +222,11 @@ tc = l->data; cfdata->text_classes = evas_list_remove_list(cfdata->text_classes, l); - evas_stringshare_del(tc->font); + if (tc->font) evas_stringshare_del(tc->font); E_FREE(tc); } + E_FREE(cfdata->cur_font); free(cfdata); } @@ -230,6 +251,8 @@ { tc = next->data; + if (!tc->class_name) continue; + if (tc->enabled && tc->font) { e_font_default_set(tc->class_name, tc->font, tc->size); @@ -268,8 +291,8 @@ { Evas_Object *o, *of, *ob; E_Radio_Group *rg; + Evas_List *next; int option_enable; - int i; cfdata->cur_index = -1; cfdata->evas = evas; @@ -282,24 +305,31 @@ e_widget_on_change_hook_set(cfdata->gui.class_list, _ilist_font_cb_change, cfdata); /* Fill In Ilist */ - for (i = 0; i < evas_list_count(cfdata->text_classes); i++) + for (next = cfdata->text_classes; next; next = next->next) { CFText_Class *tc; Evas_Object *ic; - tc = evas_list_nth(cfdata->text_classes, i); + tc = next->data; if (tc) { - if (tc->enabled) + if (tc->class_name) { - ic = edje_object_add(evas); - e_util_edje_icon_set(ic, ILIST_ICON_WITH_DEFINED_FONT); + if (tc->enabled) + { + ic = edje_object_add(evas); + e_util_edje_icon_set(ic, ILIST_ICON_WITH_DEFINED_FONT); + } + else + { + ic = NULL; + } + e_widget_ilist_append(cfdata->gui.class_list, ic, tc->class_description, NULL, NULL, NULL); } else { - ic = NULL; + e_widget_ilist_header_append(cfdata->gui.class_list, NULL, tc->class_description); } - e_widget_ilist_append(cfdata->gui.class_list, ic, tc->class_description, NULL, NULL, NULL); } } @@ -379,11 +409,11 @@ /* Fill In Ilist */ option_enable = 0; - for (i = 0; i < evas_list_count(e_font_fallback_list()); i++) + for (next = e_font_fallback_list(); next; next = next->next) { E_Font_Fallback *eff; - eff = evas_list_nth(e_font_fallback_list(), i); + eff = next->data; e_widget_config_list_append(ob, eff->name); option_enable = 1; } =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_config_list.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_widget_config_list.c 9 Apr 2006 11:55:18 -0000 1.2 +++ e_widget_config_list.c 23 Apr 2006 15:30:47 -0000 1.3 @@ -328,6 +328,7 @@ E_Widget_Data *wd; wd = e_widget_data_get(obj); + E_FREE(wd->cur_entry); free(wd); } |
From: Enlightenment C. <no...@cv...> - 2006-04-23 15:32:04
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/data/themes Modified Files: default_battery.edc default_temperature.edc Log Message: Updates for Font Dialog * New font classes for widgets/modules modules MUST use module classes * Headers to organize classes * fix mem leaks of entry text =================================================================== RCS file: /cvs/e/e17/apps/e/data/themes/default_battery.edc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- default_battery.edc 20 Apr 2006 11:30:23 -0000 1.6 +++ default_battery.edc 23 Apr 2006 15:30:47 -0000 1.7 @@ -162,7 +162,7 @@ size: 7; min: 1 1; align: 1.0 0.0; - text_class: "battery"; + text_class: "module_small"; } } } @@ -191,7 +191,7 @@ size: 7; min: 1 1; align: 1.0 0.0; - text_class: "battery"; + text_class: "module_small"; } } } =================================================================== RCS file: /cvs/e/e17/apps/e/data/themes/default_temperature.edc,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- default_temperature.edc 19 Mar 2006 12:24:19 -0000 1.4 +++ default_temperature.edc 23 Apr 2006 15:30:47 -0000 1.5 @@ -90,7 +90,7 @@ size: 7; min: 1 1; align: 0.0 0.0; - text_class: "temperature"; + text_class: "module_small"; } } } |
From: Enlightenment C. <no...@cv...> - 2006-04-24 05:51:49
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_fonts.c Log Message: Fix header naming in font dialog =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_fonts.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- e_int_config_fonts.c 23 Apr 2006 15:30:47 -0000 1.9 +++ e_int_config_fonts.c 24 Apr 2006 05:51:04 -0000 1.10 @@ -35,7 +35,7 @@ }; const E_Text_Class_Pair text_class_predefined_names[ ] = { - { NULL, "Window Manager Classes"}, + { NULL, "Window Manager"}, { "title_bar", "Title Bar"}, { "menu_item", "Menu Item"}, { "tb_plain", "Textblock Plain"}, @@ -53,7 +53,7 @@ { "dialog_error", "Dialog Error"}, { "exebuf_command", "Exebuf Command"}, - { NULL, "Widget Classes"}, + { NULL, "Widget"}, { "frame", "Frame"}, { "label", "Label"}, { "button", "Buttons"}, @@ -64,11 +64,11 @@ { "ilist_item", "List Item"}, { "ilist_header", "List Header"}, - { NULL, "EFM Classes"}, - { "fileman_typebuf", "EFM Typebuf"}, - { "fileman_icon", "EFM Icon"}, + { NULL, "EFM"}, + { "fileman_typebuf", "Typebuf"}, + { "fileman_icon", "Icon"}, - { NULL, "Module Classes"}, + { NULL, "Module"}, { "module_small", "Small"}, { "module_normal", "Normal"}, { "module_large", "Large"}, |
From: Enlightenment C. <no...@cv...> - 2006-04-24 16:09:10
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_fonts.c Log Message: Add classes for Splash screen =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_fonts.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_int_config_fonts.c 24 Apr 2006 05:51:04 -0000 1.10 +++ e_int_config_fonts.c 24 Apr 2006 16:08:20 -0000 1.11 @@ -52,6 +52,9 @@ { "desklock_passwd", "Desklock Password"}, { "dialog_error", "Dialog Error"}, { "exebuf_command", "Exebuf Command"}, + { "init_title", "Splash Title"}, + { "init_text", "Splash Text"}, + { "init_version", "Splash Version"}, { NULL, "Widget"}, { "frame", "Frame"}, |
From: Enlightenment C. <no...@cv...> - 2006-04-24 16:09:35
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/data/init Modified Files: init.edc Log Message: Add classes for Splash screen =================================================================== RCS file: /cvs/e/e17/apps/e/data/init/init.edc,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- init.edc 30 Oct 2005 05:36:50 -0000 1.8 +++ init.edc 24 Apr 2006 16:08:20 -0000 1.9 @@ -564,6 +564,7 @@ size: TSIZE; min: 1 1; align: 0.5 0.5; + text_class: "init_title"; } } } @@ -590,6 +591,7 @@ size: VSIZE; min: 1 1; align: 0.0 0.0; + text_class: "init_version"; } } } @@ -619,6 +621,7 @@ size: SSIZE; min: 1 1; align: 0.5 0.5; + text_class: "init_text"; } } } @@ -646,6 +649,7 @@ size: SSIZE; min: 1 1; align: 0.0 0.5; + text_class: "init_text"; } } } |
From: Enlightenment C. <no...@cv...> - 2006-04-30 11:55:01
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_font.c e_font.h e_ipc_codec.c Log Message: Use evas API to get font list * new api is much faster * may be a bit of a hack the way I get the evas (anyone have another way?) * I guess I am an author (now that I have fulfilled my dodgy code quota) =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_font.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- e_font.c 1 Apr 2006 09:24:56 -0000 1.19 +++ e_font.c 30 Apr 2006 11:54:04 -0000 1.20 @@ -8,8 +8,6 @@ * - use e_path to search for available fonts */ -static Evas_List *_e_font_font_dir_available_get (Evas_List * available_fonts, const char *font_dir); - static char _fn_buf[1024]; EAPI int @@ -91,34 +89,49 @@ EAPI Evas_List * e_font_available_list(void) { - Evas_List *dir_list; - Evas_List *next; - Evas_List *available; + Evas_List *evas_fonts; + Evas_List *e_fonts; + Evas_List *l; + E_Manager *man; + E_Container *con; + + man = e_manager_current_get(); + if (!man) return NULL; + con = e_container_current_get(man); + if (!con) con = e_container_number_get(man, 0); + if (!con) return NULL; - dir_list = e_path_dir_list_get(path_fonts); - available = NULL; - for ( next = dir_list; next; next = next->next) + evas_fonts = evas_font_available_list(con->bg_evas); + + e_fonts = NULL; + for (l = evas_fonts; l; l = l->next) { - E_Path_Dir *epd = next->data; - available = _e_font_font_dir_available_get(available, epd->dir); - } - - e_path_dir_list_free(dir_list); - return available; + E_Font_Available *efa; + const char *evas_font; + + efa = E_NEW(E_Font_Available, 1); + evas_font = l->data; + efa->name = evas_stringshare_add(evas_font); + e_fonts = evas_list_append(e_fonts, efa); + } + + evas_font_available_list_free(con->bg_evas, evas_fonts); + + return e_fonts; } EAPI void e_font_available_list_free(Evas_List *available) { E_Font_Available *efa; - + while (available) - { + { efa = available->data; available = evas_list_remove_list(available, available); if (efa->name) evas_stringshare_del(efa->name); - E_FREE(efa); - } + E_FREE(efa); + } } EAPI void @@ -330,43 +343,3 @@ return _fn_buf; } -static Evas_List * -_e_font_font_dir_available_get(Evas_List *available_fonts, const char *font_dir) -{ - char buf[4096]; - FILE *f; - - snprintf(buf, sizeof(buf), "%s/fonts.alias", font_dir); - f = fopen(buf, "r"); - if (f) - { - char fname[4096], fdef[4096]; - Evas_List *next; - - /* read font alias lines */ - while (fscanf(f, "%4090s %[^\n]\n", fname, fdef) == 2) - { - E_Font_Available *efa; - - /* skip comments */ - if ((fdef[0] == '!') || (fdef[0] == '#')) - continue; - - /* skip duplicates */ - - for (next = available_fonts; next; next = evas_list_next(next)) - { - efa = (E_Font_Available *)evas_list_data(next); - - if (!strcmp(efa->name, fname)) - continue; - } - - efa = malloc(sizeof(E_Font_Available)); - efa->name = evas_stringshare_add(fname); - available_fonts = evas_list_append(available_fonts, efa); - } - fclose (f); - } - return available_fonts; -} =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_font.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_font.h 2 Mar 2006 12:03:48 -0000 1.5 +++ e_font.h 30 Apr 2006 11:54:04 -0000 1.6 @@ -5,7 +5,7 @@ typedef struct _E_Font_Default E_Font_Default; typedef struct _E_Font_Fallback E_Font_Fallback; -typedef struct _E_Font_Fallback E_Font_Available; +typedef struct _E_Font_Available E_Font_Available; #else #ifndef E_FONT_H =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_ipc_codec.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- e_ipc_codec.c 10 Mar 2006 05:48:46 -0000 1.15 +++ e_ipc_codec.c 30 Apr 2006 11:54:04 -0000 1.16 @@ -671,4 +671,5 @@ /* local subsystem globals */ -#endif \ No newline at end of file +#endif + |
From: Enlightenment C. <no...@cv...> - 2006-04-30 11:55:28
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: AUTHORS Log Message: Use evas API to get font list * new api is much faster * may be a bit of a hack the way I get the evas (anyone have another way?) * I guess I am an author (now that I have fulfilled my dodgy code quota) =================================================================== RCS file: /cvs/e/e17/apps/e/AUTHORS,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- AUTHORS 30 Apr 2006 04:31:42 -0000 1.22 +++ AUTHORS 30 Apr 2006 11:54:04 -0000 1.23 @@ -10,3 +10,4 @@ Christopher Michael <dev...@co...> Viktor Kojouharov <vko...@gm...> ilLogict <ill...@on...> +Stafford Horne <sh...@so...> |
From: Enlightenment C. <no...@cv...> - 2006-05-04 01:35:34
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_intl.c Log Message: Fix eet file descriptor leak of imc's =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_intl.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -3 -r1.78 -r1.79 --- e_intl.c 13 Mar 2006 13:51:22 -0000 1.78 +++ e_intl.c 4 May 2006 01:34:32 -0000 1.79 @@ -1023,6 +1023,7 @@ { imcs = evas_list_append(imcs, imc); } + eet_close(imc_file); } } ecore_list_destroy(files); |
From: Enlightenment C. <no...@cv...> - 2006-05-30 23:41:07
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/data/themes Modified Files: default_cpufreq.edc default_pager.edc Log Message: Modules should use the module text classes. =================================================================== RCS file: /cvs/e/e17/apps/e/data/themes/default_cpufreq.edc,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- default_cpufreq.edc 19 Mar 2006 12:24:19 -0000 1.4 +++ default_cpufreq.edc 30 May 2006 23:39:23 -0000 1.5 @@ -309,7 +309,7 @@ size: 7; align: 0.5 0.5; min: 1 1; - text_class: "cpufreq"; + text_class: "module_small"; } } } =================================================================== RCS file: /cvs/e/e17/apps/e/data/themes/default_pager.edc,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- default_pager.edc 5 May 2006 09:47:23 -0000 1.26 +++ default_pager.edc 30 May 2006 23:39:23 -0000 1.27 @@ -120,7 +120,7 @@ size: 12; min: 1 1; align: 0.5 0.5; - text_class: "pager_title"; + text_class: "module_large_s"; } } } |
From: Enlightenment C. <no...@cv...> - 2006-05-31 00:34:09
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_fonts.c e_widget_config_list.c Log Message: Make config list buttons thinner. This is so longer text labels which do not wrap wont affect the layout. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_fonts.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_int_config_fonts.c 30 Apr 2006 04:31:42 -0000 1.12 +++ e_int_config_fonts.c 31 May 2006 00:32:26 -0000 1.13 @@ -406,7 +406,7 @@ of = e_widget_framelist_add(evas, _("Font Fallbacks"), 0); e_widget_framelist_content_align_set(of, 0.5, 0.5); - ob = e_widget_config_list_add(evas, e_widget_entry_add, _("Fallback Name"), 1); + ob = e_widget_config_list_add(evas, e_widget_entry_add, _("Fallback Name"), 2); cfdata->gui.fallback_list = ob; e_widget_framelist_object_append(of, ob); @@ -424,7 +424,7 @@ ob = e_widget_check_add(evas, _("Enable Fallbacks"), &(cfdata->cur_fallbacks_enabled)); e_widget_config_list_object_append( cfdata->gui.fallback_list, ob, - 0, 3, 1, 1, + 0, 3, 2, 1, 1, 1, 1, 1); e_widget_on_change_hook_set(ob, _enabled_fallback_cb_change, cfdata); e_widget_check_checked_set(ob, option_enable); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_config_list.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_widget_config_list.c 23 Apr 2006 15:30:47 -0000 1.3 +++ e_widget_config_list.c 31 May 2006 00:32:26 -0000 1.4 @@ -59,7 +59,7 @@ e_widget_disabled_set(o, 1); e_widget_table_object_append( wd->gui.table, o, - 1, 0, 1, 1, + 2, 0, 1, 1, 1, 1, 1, 1); @@ -68,7 +68,7 @@ e_widget_disabled_set(o, 1); e_widget_table_object_append( wd->gui.table, o, - 1, 3, 1, 1, + 2, 3, 1, 1, 1, 1, 1, 1); @@ -80,13 +80,13 @@ e_widget_ilist_go(o); e_widget_table_object_append( wd->gui.table, o, - 2, 0, listspan, 4, + 3, 0, listspan, 4, 1, 1, 1, 1); o = e_widget_label_add(evas, label); e_widget_table_object_append( wd->gui.table, o, - 0, 0, 1, 1, + 0, 0, 2, 1, 1, 1, 1, 1); o = func_entry_add(evas, &(wd->cur_entry)); @@ -95,7 +95,7 @@ e_widget_min_size_set(o, 100, 25); e_widget_table_object_append( wd->gui.table, o, - 0, 1, 1, 1, + 0, 1, 2, 1, 1, 1, 1, 1); o = e_widget_button_add(evas, _("Add"), NULL, _button_cb_add, wd, obj); @@ -103,7 +103,7 @@ e_widget_disabled_set(o, 1); e_widget_table_object_append( wd->gui.table, o, - 1, 1, 1, 1, + 2, 1, 1, 1, 1, 1, 1, 1); o = e_widget_button_add(evas, _("Remove"), NULL, _button_cb_remove, wd, obj); @@ -111,7 +111,7 @@ e_widget_disabled_set(o, 1); e_widget_table_object_append( wd->gui.table, o, - 1, 2, 1, 1, + 2, 2, 1, 1, 1, 1, 1, 1); e_widget_min_size_get(wd->gui.table, &mw, &mh); |
From: Enlightenment C. <no...@cv...> - 2006-05-31 22:53:10
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_fonts.c e_int_config_paths.c e_intl.h Log Message: Add macro for N_ for marking string for translation * Can be used to get static context strings translated * I guess this is the best way to do it, see here: http://www.gnu.org/software/gettext/manual/html_node/gettext_153.html http://www.gnu.org/software/gettext/manual/html_node/gettext_19.html =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_fonts.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_int_config_fonts.c 31 May 2006 00:32:26 -0000 1.13 +++ e_int_config_fonts.c 31 May 2006 22:51:24 -0000 1.14 @@ -35,49 +35,49 @@ }; const E_Text_Class_Pair text_class_predefined_names[ ] = { - { NULL, "Window Manager"}, - { "title_bar", "Title Bar"}, - { "menu_item", "Menu Item"}, - { "tb_plain", "Textblock Plain"}, - { "tb_light", "Textblock Light"}, - { "tb_big", "Textblock Big"}, - { "move_text", "Move Text"}, - { "resize_text", "Resize Text"}, - { "winlist_title", "Winlist Title"}, - { "configure", "Configure Heading"}, - { "about_title", "About Title"}, - { "about_version", "About Version"}, - { "button_text", "About Text"}, - { "desklock_title", "Desklock Title"}, - { "desklock_passwd", "Desklock Password"}, - { "dialog_error", "Dialog Error"}, - { "exebuf_command", "Exebuf Command"}, - { "init_title", "Splash Title"}, - { "init_text", "Splash Text"}, - { "init_version", "Splash Version"}, + { NULL, N_("Window Manager")}, + { "title_bar", N_("Title Bar")}, + { "menu_item", N_("Menu Item")}, + { "tb_plain", N_("Textblock Plain")}, + { "tb_light", N_("Textblock Light")}, + { "tb_big", N_("Textblock Big")}, + { "move_text", N_("Move Text")}, + { "resize_text", N_("Resize Text")}, + { "winlist_title", N_("Winlist Title")}, + { "configure", N_("Configure Heading")}, + { "about_title", N_("About Title")}, + { "about_version", N_("About Version")}, + { "button_text", N_("About Text")}, + { "desklock_title", N_("Desklock Title")}, + { "desklock_passwd", N_("Desklock Password")}, + { "dialog_error", N_("Dialog Error")}, + { "exebuf_command", N_("Exebuf Command")}, + { "init_title", N_("Splash Title")}, + { "init_text", N_("Splash Text")}, + { "init_version", N_("Splash Version")}, - { NULL, "Widget"}, - { "frame", "Frame"}, - { "label", "Label"}, - { "button", "Buttons"}, - { "slider", "Slider"}, - { "radio_button", "Radio Buttons"}, - { "check_button", "Check Buttons"}, - { "tlist", "Text List Item"}, - { "ilist_item", "List Item"}, - { "ilist_header", "List Header"}, + { NULL, N_("Widget")}, + { "frame", N_("Frame")}, + { "label", N_("Label")}, + { "button", N_("Buttons")}, + { "slider", N_("Slider")}, + { "radio_button", N_("Radio Buttons")}, + { "check_button", N_("Check Buttons")}, + { "tlist", N_("Text List Item")}, + { "ilist_item", N_("List Item")}, + { "ilist_header", N_("List Header")}, - { NULL, "EFM"}, - { "fileman_typebuf", "Typebuf"}, - { "fileman_icon", "Icon"}, + { NULL, N_("EFM")}, + { "fileman_typebuf", N_("Typebuf")}, + { "fileman_icon", N_("Icon")}, - { NULL, "Module"}, - { "module_small", "Small"}, - { "module_normal", "Normal"}, - { "module_large", "Large"}, - { "module_small_s", "Small Styled"}, - { "module_normal_s", "Normal Styled"}, - { "module_large_s", "Large Styled"}, + { NULL, N_("Module")}, + { "module_small", N_("Small")}, + { "module_normal", N_("Normal")}, + { "module_large", N_("Large")}, + { "module_small_s", N_("Small Styled")}, + { "module_normal_s", N_("Normal Styled")}, + { "module_large_s", N_("Large Styled")}, { NULL, NULL} }; =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_paths.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_int_config_paths.c 9 Apr 2006 11:55:18 -0000 1.1 +++ e_int_config_paths.c 31 May 2006 22:51:24 -0000 1.2 @@ -67,25 +67,25 @@ { cfdata->paths_available = E_NEW(E_Path_Pair, 11); cfdata->paths_available[0].path = path_data; - cfdata->paths_available[0].path_description = "Data"; + cfdata->paths_available[0].path_description = _("Data"); cfdata->paths_available[1].path = path_images; - cfdata->paths_available[1].path_description = "Images"; + cfdata->paths_available[1].path_description = _("Images"); cfdata->paths_available[2].path = path_fonts; - cfdata->paths_available[2].path_description = "Fonts"; + cfdata->paths_available[2].path_description = _("Fonts"); cfdata->paths_available[3].path = path_themes; - cfdata->paths_available[3].path_description = "Themes"; + cfdata->paths_available[3].path_description = _("Themes"); cfdata->paths_available[4].path = path_init; - cfdata->paths_available[4].path_description = "Init"; + cfdata->paths_available[4].path_description = _("Init"); cfdata->paths_available[5].path = path_icons; - cfdata->paths_available[5].path_description = "Icons"; + cfdata->paths_available[5].path_description = _("Icons"); cfdata->paths_available[6].path = path_modules; - cfdata->paths_available[6].path_description = "Modules"; + cfdata->paths_available[6].path_description = _("Modules"); cfdata->paths_available[7].path = path_backgrounds; - cfdata->paths_available[7].path_description = "Backgrounds"; + cfdata->paths_available[7].path_description = _("Backgrounds"); cfdata->paths_available[8].path = path_input_methods; - cfdata->paths_available[8].path_description = "Input Methods"; + cfdata->paths_available[8].path_description = _("Input Methods"); cfdata->paths_available[9].path = path_messages; - cfdata->paths_available[9].path_description = "Messages"; + cfdata->paths_available[9].path_description = _("Messages"); cfdata->paths_available[10].path = NULL; cfdata->paths_available[10].path_description = NULL; @@ -146,7 +146,7 @@ pcd->path = cfdata->paths_available[i].path; pcd->cfdata = cfdata; cfdata->pcd_list = evas_list_append(cfdata->pcd_list, pcd); - e_widget_ilist_append(ob, NULL, _(cfdata->paths_available[i].path_description), _ilist_path_cb_change, pcd, NULL); + e_widget_ilist_append(ob, NULL, cfdata->paths_available[i].path_description, _ilist_path_cb_change, pcd, NULL); } e_widget_ilist_go(ob); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_intl.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_intl.h 13 Mar 2006 13:51:22 -0000 1.12 +++ e_intl.h 31 May 2006 22:51:24 -0000 1.13 @@ -6,6 +6,11 @@ #define _(str) gettext(str) #define d_(str, dom) dgettext(PACKAGE dom, str) +/* This macro is used to just mark string for translation, this is useful + * for string lists which are not dynamically allocated + */ +#define N_(str) (str) + typedef struct _E_Input_Method_Config E_Input_Method_Config; typedef struct _E_Language_Pack E_Language_Pack; |
From: Enlightenment C. <no...@cv...> - 2006-05-31 22:53:11
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: autogen.sh Log Message: Add macro for N_ for marking string for translation * Can be used to get static context strings translated * I guess this is the best way to do it, see here: http://www.gnu.org/software/gettext/manual/html_node/gettext_153.html http://www.gnu.org/software/gettext/manual/html_node/gettext_19.html =================================================================== RCS file: /cvs/e/e17/apps/e/autogen.sh,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- autogen.sh 8 Aug 2005 21:46:02 -0000 1.15 +++ autogen.sh 31 May 2006 22:51:24 -0000 1.16 @@ -19,7 +19,7 @@ --copyright-holder="Enlightenment development team" \ --foreign-user \ --msgid-bugs-address="enl...@li..." \ --k -k_ -kd_ \ +-k -k_ -kd_ -kN_ \ --from-code=UTF-8 \ -o enlightenment.pot \ `find . -name "*.[ch]" -print` || exit 1 |
From: Enlightenment C. <no...@cv...> - 2006-07-29 13:38:46
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: Check for locks when the mouse goes down on a pager_window. If the lock is there ignore the event to move it. todo-- =================================================================== RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.389 retrieving revision 1.390 diff -u -3 -r1.389 -r1.390 --- TODO 29 Jul 2006 16:56:31 -0000 1.389 +++ TODO 29 Jul 2006 18:38:11 -0000 1.390 @@ -34,8 +34,6 @@ a big xev (xev -g 1280x1024) that won't fit it gets placed offscreen to the right of zone 2 * BUG: Hiding the label of e_widget_slider causes the slider line to disappear -* BUG: Window locks should be honored by the pager (e.g. Lock me from - changing position) ]]] [[[ |
From: Enlightenment C. <no...@cv...> - 2006-07-29 14:01:53
|
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_border_locks.c Log Message: Be able to turn basic settings off =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_locks.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_int_border_locks.c 18 Feb 2006 04:35:27 -0000 1.12 +++ e_int_border_locks.c 29 Jul 2006 19:00:30 -0000 1.13 @@ -147,41 +147,38 @@ static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { + int flag; /* Actually take our cfdata settings and apply them in real life */ - if (cfdata->do_what_i_say) - { - cfdata->border->lock_client_location = 1; - cfdata->border->lock_client_size = 1; - cfdata->border->lock_client_stacking = 1; - cfdata->border->lock_client_iconify = 1; - cfdata->border->lock_client_desk = 0; - cfdata->border->lock_client_sticky = 1; - cfdata->border->lock_client_shade = 1; - cfdata->border->lock_client_maximize = 1; - cfdata->border->lock_client_fullscreen = 1; - } - if (cfdata->protect_from_me) - { - cfdata->border->lock_user_location = 1; - cfdata->border->lock_user_size = 1; - cfdata->border->lock_user_stacking = 1; - cfdata->border->lock_user_iconify = 1; - cfdata->border->lock_user_desk = 0; - cfdata->border->lock_user_sticky = 1; - cfdata->border->lock_user_shade = 1; - cfdata->border->lock_user_maximize = 1; - cfdata->border->lock_user_fullscreen = 1; - } - if (cfdata->important_window) - { - cfdata->border->lock_close = 1; - cfdata->border->lock_life = 1; - } - if (cfdata->keep_my_border) - { - cfdata->border->lock_border = 1; - } + flag = cfdata->do_what_i_say; + cfdata->border->lock_client_location = flag; + cfdata->border->lock_client_size = flag; + cfdata->border->lock_client_stacking = flag; + cfdata->border->lock_client_iconify = flag; + cfdata->border->lock_client_desk = 0; + cfdata->border->lock_client_sticky = flag; + cfdata->border->lock_client_shade = flag; + cfdata->border->lock_client_maximize = flag; + cfdata->border->lock_client_fullscreen = flag; + + flag = cfdata->protect_from_me; + cfdata->border->lock_user_location = flag; + cfdata->border->lock_user_size = flag; + cfdata->border->lock_user_stacking = flag; + cfdata->border->lock_user_iconify = flag; + cfdata->border->lock_user_desk = 0; + cfdata->border->lock_user_sticky = flag; + cfdata->border->lock_user_shade = flag; + cfdata->border->lock_user_maximize = flag; + cfdata->border->lock_user_fullscreen = flag; + + flag = cfdata->important_window; + cfdata->border->lock_close = flag; + cfdata->border->lock_life = flag; + + flag = cfdata->keep_my_border; + cfdata->border->lock_border = flag; + /* FIXME: need to check if the remember stuff will actually work or not * (see e_int_border_remember.c where it checks and warns) */ if (cfdata->remember_locks) |