From: Enlightenment C. <no...@cv...> - 2007-12-27 06:38:29
|
Enlightenment CVS committal Author : ravenlock Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_border.c Log Message: Make sure xrandr is present before using it to change the display resolution during a fullcreen operation. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.616 retrieving revision 1.617 diff -u -3 -r1.616 -r1.617 --- e_border.c 22 Dec 2007 01:46:22 -0000 1.616 +++ e_border.c 27 Dec 2007 06:38:28 -0000 1.617 @@ -2092,7 +2092,7 @@ if (!e_config->allow_above_fullscreen) e_border_layer_set(bd, 200); - if ((evas_list_count(bd->zone->container->zones) > 1) || (policy == E_FULLSCREEN_RESIZE)) + if ((evas_list_count(bd->zone->container->zones) > 1) || (policy == E_FULLSCREEN_RESIZE) || (!ecore_x_randr_present())) { e_border_move_resize(bd, bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h); } |
From: Enlightenment C. <no...@cv...> - 2007-12-28 22:57:53
|
Enlightenment CVS committal Author : ravenlock Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_border.c Log Message: Change name for consistency =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.619 retrieving revision 1.620 diff -u -3 -r1.619 -r1.620 --- e_border.c 28 Dec 2007 03:18:37 -0000 1.619 +++ e_border.c 28 Dec 2007 22:57:49 -0000 1.620 @@ -2092,7 +2092,7 @@ if (!e_config->allow_above_fullscreen) e_border_layer_set(bd, 200); - if ((evas_list_count(bd->zone->container->zones) > 1) || (policy == E_FULLSCREEN_RESIZE) || (!ecore_x_randr_present())) + if ((evas_list_count(bd->zone->container->zones) > 1) || (policy == E_FULLSCREEN_RESIZE) || (!ecore_x_randr_query())) { e_border_move_resize(bd, bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h); } |
From: Enlightenment C. <no...@cv...> - 2007-12-28 22:58:49
|
Enlightenment CVS committal Author : ravenlock Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_display Modified Files: e_int_config_display.c Log Message: Change name for consistency =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_display/e_int_config_display.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_int_config_display.c 27 Dec 2007 06:36:49 -0000 1.4 +++ e_int_config_display.c 28 Dec 2007 22:58:48 -0000 1.5 @@ -231,7 +231,7 @@ E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if (!ecore_x_randr_present()) + if (!ecore_x_randr_query()) { ecore_timer_add(0.5, _deferred_noxrandr_error, NULL); fprintf(stderr, "XRandR not present on this display. \n"); |
From: Enlightenment C. <no...@cv...> - 2008-01-21 06:11:58
|
Enlightenment CVS committal Author : ravenlock Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibox Modified Files: e_mod_config.c e_mod_main.c Log Message: Allow ibox to show the border caption. This was not garunteed with the previously available options. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/ibox/e_mod_config.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- e_mod_config.c 16 Sep 2007 00:02:53 -0000 1.32 +++ e_mod_config.c 21 Jan 2008 06:11:56 -0000 1.33 @@ -102,6 +102,8 @@ e_widget_framelist_object_append(of, ob); ob = e_widget_radio_add(evas, _("Display Icon Name"), 3, rg); e_widget_framelist_object_append(of, ob); + ob = e_widget_radio_add(evas, _("Display Border Caption"), 4, rg); + e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o, of, 1, 1, 0.5); =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/ibox/e_mod_main.c,v retrieving revision 1.90 retrieving revision 1.91 diff -u -3 -r1.90 -r1.91 --- e_mod_main.c 31 Oct 2007 12:23:14 -0000 1.90 +++ e_mod_main.c 21 Jan 2008 06:11:56 -0000 1.91 @@ -576,6 +576,9 @@ if (!label) label = ic->border->client.icccm.icon_name; break; + case 4: + label = e_border_name_get(ic->border); + break; } if (!label) label = "?"; |
From: Enlightenment C. <no...@cv...> - 2008-03-18 19:59:56
|
Enlightenment CVS committal Author : ravenlock Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_fonts Modified Files: e_int_config_fonts.c Log Message: Per devilhorns, this commit does: - Adds new desktop font font_class: desktop_icon - whitespace and formatting changes If you don't see the font changes on the desktop, you may need to restart e. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_fonts/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 Feb 2008 06:02:17 -0000 1.6 +++ e_int_config_fonts.c 18 Mar 2008 19:59:52 -0000 1.7 @@ -90,11 +90,12 @@ { "tlist", N_("Text List Item")}, { "ilist_item", N_("List Item")}, { "ilist_header", N_("List Header")}, - + { NULL, N_("Filemanager")}, { "fileman_typebuf", N_("Typebuf")}, { "fileman_icon", N_("Icon")}, - + { "desktop_icon", N_("Desktop Icon")}, + { NULL, N_("Modules")}, { "module_small", N_("Small")}, { "module_normal", N_("Normal")}, @@ -187,18 +188,19 @@ { tc = E_NEW(CFText_Class, 1); tc->class_name = text_class_predefined_names[i].class_name; - tc->class_description = _(text_class_predefined_names[i].class_description); + tc->class_description = + _(text_class_predefined_names[i].class_description); tc->font = NULL; tc->size = 0; tc->enabled = 0; - + if (text_class_predefined_names[i].class_name) { /* Search manually because we dont want to fallback */ for (next = font_list; next ; next = next->next) { efd = next->data; - + if (!strcmp(tc->class_name, efd->text_class)) { if (efd->font) @@ -216,7 +218,7 @@ tc->enabled = 1; } } - + if (!tc->enabled) { /* search with default fallbacks */ @@ -238,11 +240,11 @@ } } } - + /* Append the class */ cfdata->text_classes = evas_list_append(cfdata->text_classes, tc); } - + /* Fill Hinting */ cfdata->hinting = e_config->font_hinting; @@ -316,7 +318,7 @@ e_font_available_hash_free(cfdata->font_hash); while (cfdata->font_list) cfdata->font_list = evas_list_remove_list(cfdata->font_list, cfdata->font_list); - + while ((l = cfdata->text_classes)) { CFText_Class *tc; @@ -327,7 +329,7 @@ if (tc->style) evas_stringshare_del(tc->style); E_FREE(tc); } - + while ((l = cfdata->font_scale_list)) { E_Font_Size_Data *size_data; @@ -347,7 +349,7 @@ if (size_data->size_str) evas_stringshare_del(size_data->size_str); E_FREE(size_data); } - + E_FREE(cfdata->cur_font); E_FREE(cfdata->cur_style); E_FREE(cfdata); @@ -372,7 +374,8 @@ const char *font_name; class_name = text_class_predefined_names[i].class_name; - font_name = e_font_fontconfig_name_get(cfdata->cur_font, cfdata->cur_style); + font_name = + e_font_fontconfig_name_get(cfdata->cur_font, cfdata->cur_style); e_font_default_set(class_name, font_name, cfdata->cur_size); if (i == 1) @@ -404,7 +407,7 @@ tc->font = evas_stringshare_add(cfdata->cur_font); else tc->font = NULL; - + if (tc->style) evas_stringshare_del(tc->style); if (cfdata->cur_style) tc->style = evas_stringshare_add(cfdata->cur_style); @@ -433,7 +436,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *ot, *ob, *of; - + cfdata->cur_index = -1; cfdata->evas = evas; @@ -441,7 +444,8 @@ cfdata->gui.class_list = NULL; - ob = e_widget_check_add(evas, _("Enable Custom Font Classes"), &(cfdata->cur_enabled)); + ob = e_widget_check_add(evas, _("Enable Custom Font Classes"), + &(cfdata->cur_enabled)); cfdata->gui.enabled = ob; e_widget_on_change_hook_set(ob, _basic_enable_cb_change, cfdata); e_widget_disabled_set(ob, 0); @@ -463,7 +467,8 @@ e_widget_framelist_object_append(of, ob); e_widget_table_object_append(ot, of, 1, 1, 1, 1, 1, 1, 1, 1); - ob = e_widget_font_preview_add(evas, _("Basic preview text: 123: æç天空ï¼")); + ob = + e_widget_font_preview_add(evas, _("Basic preview text: 123: æç天空ï¼")); cfdata->gui.preview = ob; e_widget_table_object_append(ot, ob, 0, 2, 2, 1, 1, 0, 1, 0); @@ -477,10 +482,9 @@ _basic_font_cb_change(void *data, Evas_Object *obj) { E_Config_Dialog_Data *cfdata; - + cfdata = data; if (!cfdata) return; - _font_preview_update(cfdata); } @@ -488,7 +492,7 @@ _basic_enable_cb_change(void *data, Evas_Object *obj) { E_Config_Dialog_Data *cfdata; - + cfdata = data; if (!cfdata) return; @@ -540,7 +544,7 @@ /* Populate font list (Select current font) */ _font_list_load(cfdata, init_font); - + /* Populate size list (Select current font) */ _size_list_load(cfdata, cfdata->font_scale_list, init_size, 1); } @@ -551,7 +555,7 @@ int i; Evas_List *next; CFText_Class *tc; - + /* Save current data */ if (cfdata->cur_index >= 0) { @@ -582,20 +586,21 @@ /* Fallbacks configure */ e_font_fallback_clear(); - + if (cfdata->cur_fallbacks_enabled) { for (i = 0; i < e_widget_config_list_count(cfdata->gui.fallback_list); i++) { const char *fallback; - fallback = e_widget_config_list_nth_get(cfdata->gui.fallback_list, i); + fallback = + e_widget_config_list_nth_get(cfdata->gui.fallback_list, i); if ((fallback) && (fallback[0])) e_font_fallback_append(fallback); } } e_font_apply(); - + /* Apply Hinting */ e_config->font_hinting = cfdata->hinting; e_config_save_queue(); @@ -614,7 +619,7 @@ cfdata->cur_index = -1; cfdata->evas = evas; - + ot = e_widget_table_add(evas, 0); of = e_widget_frametable_add(evas, _("Font Classes"), 0); ob = e_widget_ilist_add(evas, 16, 16, NULL); @@ -648,7 +653,7 @@ e_widget_min_size_set(ob, 90, 90); e_widget_framelist_object_append(of, ob); e_widget_table_object_append(ot, of, 2, 0, 1, 1, 1, 1, 1, 1); - + of = e_widget_framelist_add(evas, _("Size"), 1); ob = e_widget_ilist_add(evas, 16, 16, NULL); cfdata->gui.size_list = ob; @@ -681,7 +686,7 @@ for (next = e_font_fallback_list(); next; next = next->next) { E_Font_Fallback *eff; - + eff = next->data; e_widget_config_list_append(ob, eff->name); option_enable = 1; @@ -694,7 +699,7 @@ e_widget_check_checked_set(ob, option_enable); e_widget_change(ob); e_widget_table_object_append(ot, of, 3, 1, 1, 2, 1, 1, 1, 1); - + ob = e_widget_font_preview_add(evas, _("Advanced Preview Text.. æççä¼åä¸æ")); cfdata->gui.preview = ob; e_widget_table_object_append(ot, ob, 0, 3, 4, 1, 1, 0, 1, 0); @@ -709,20 +714,20 @@ { Evas *evas; Evas_List *next; - + if (!cfdata->gui.class_list) return; evas = evas_object_evas_get(cfdata->gui.class_list); evas_event_freeze(evas); edje_freeze(); e_widget_ilist_freeze(cfdata->gui.class_list); e_widget_ilist_clear(cfdata->gui.class_list); - + /* Fill in Class Ilist */ for (next = cfdata->text_classes; next; next = next->next) { CFText_Class *tc; Evas_Object *ic; - + tc = next->data; if (tc) { @@ -754,10 +759,9 @@ int indx; E_Config_Dialog_Data *cfdata; CFText_Class *tc; - - cfdata = data; - if (!cfdata) return; - + + if (!(cfdata = data)) return; + /* Save Current */ if (cfdata->cur_index >= 0) { @@ -779,7 +783,7 @@ if (cfdata->gui.size_list) e_widget_ilist_unselect(cfdata->gui.size_list); } - + /* If no class is selected unselect all and return */ indx = e_widget_ilist_selected_get(cfdata->gui.class_list); if (indx < 0) @@ -792,7 +796,7 @@ e_widget_ilist_unselect(cfdata->gui.font_list); return; } - + tc = evas_list_nth(cfdata->text_classes, indx); cfdata->cur_index = indx; @@ -807,7 +811,7 @@ for (indx = 0; indx < e_widget_ilist_count(cfdata->gui.font_list); indx++) { const char *f; - + f = e_widget_ilist_nth_label_get(cfdata->gui.font_list, indx); if (tc->font && !strcasecmp(f, tc->font)) { @@ -824,13 +828,12 @@ E_Config_Dialog_Data *cfdata; Evas_List *l; int n; - - cfdata = data; - if (!cfdata) return; + + if (!(cfdata = data)) return; e_widget_disabled_set(cfdata->gui.font_list, !cfdata->cur_enabled); e_widget_disabled_set(cfdata->gui.style_list, !cfdata->cur_enabled); e_widget_disabled_set(cfdata->gui.size_list, !cfdata->cur_enabled); - + /* Search class list fot selected and enable Icon */ for (n = 0, l = e_widget_ilist_items_get(cfdata->gui.class_list); l; l = l->next, n++) { @@ -838,8 +841,7 @@ Evas_Object *icon = NULL; CFText_Class *tc; - i = l->data; - if (!i) continue; + if (!(i = l->data)) continue; if (!i->selected) continue; tc = evas_list_nth(cfdata->text_classes, n); @@ -864,10 +866,9 @@ E_Font_Size_Data *size_data; Evas_List *l; int n; - + size_data = data; - cfdata = size_data->cfdata; - if (!cfdata) return; + if (!(cfdata = size_data->cfdata)) return; cfdata->cur_size = size_data->size; @@ -880,8 +881,7 @@ E_Ilist_Item *i; CFText_Class *tc; - i = l->data; - if (!i) continue; + if (!(i = l->data)) continue; if (!i->selected) continue; tc = evas_list_nth(cfdata->text_classes, n); @@ -896,18 +896,16 @@ CFText_Class *tc; Evas_List *l; int n; - + tc = NULL; - cfdata = data; - if (!cfdata) return; - + if (!(cfdata = data)) return; + /* Set up the new font name for each selected class */ for (n = 0, l = e_widget_ilist_items_get(cfdata->gui.class_list); l; l = l->next, n++) { E_Ilist_Item *i; - - i = l->data; - if (!i) continue; + + if (!(i = l->data)) continue; if (!i->selected) continue; tc = evas_list_nth(cfdata->text_classes, n); @@ -926,14 +924,15 @@ evas_event_freeze(evas_object_evas_get(cfdata->gui.style_list)); edje_freeze(); e_widget_ilist_freeze(cfdata->gui.style_list); - e_widget_ilist_clear(cfdata->gui.style_list); + for (next = efp->styles; next; next = next->next) { const char *style; style = next->data; - e_widget_ilist_append(cfdata->gui.style_list, NULL, style, NULL, NULL, style); + e_widget_ilist_append(cfdata->gui.style_list, NULL, style, + NULL, NULL, style); } e_widget_ilist_go(cfdata->gui.style_list); @@ -948,7 +947,7 @@ for (n = 0; n < e_widget_ilist_count(cfdata->gui.style_list); n++) { const char *f; - + f = e_widget_ilist_nth_label_get(cfdata->gui.style_list, n); if (!strcasecmp(f, tc->style)) { @@ -984,6 +983,7 @@ edje_freeze(); e_widget_ilist_freeze(ob); if (clear) e_widget_ilist_clear(ob); + for (next = size_list; next; next = next->next) { E_Font_Size_Data *size_data; @@ -992,7 +992,7 @@ e_widget_ilist_append(ob, NULL, size_data->size_str, _size_cb_change, size_data, NULL); } - + e_widget_ilist_go(ob); e_widget_ilist_thaw(ob); edje_thaw(); @@ -1001,7 +1001,7 @@ for (n = 0; n < e_widget_ilist_count(ob); n++) { E_Font_Size_Data *size_data; - + size_data = e_widget_ilist_nth_data_get(ob, n); if (cur_size == size_data->size) { @@ -1031,15 +1031,16 @@ if (cfdata->font_hash == NULL) { Evas_List *fonts; - + fonts = evas_font_available_list(evas); cfdata->font_hash = e_font_available_list_parse(fonts); evas_hash_foreach(cfdata->font_hash, _font_hash_cb, cfdata); if (cfdata->font_list) { - cfdata->font_list = evas_list_sort(cfdata->font_list, - evas_list_count(cfdata->font_list), - _sort_fonts); + cfdata->font_list = + evas_list_sort(cfdata->font_list, + evas_list_count(cfdata->font_list), + _sort_fonts); } evas_font_available_list_free(evas, fonts); } @@ -1052,12 +1053,12 @@ for (next = cfdata->font_list; next; next = next->next) { const char *f; - + f = next->data; e_widget_ilist_append(ob, NULL, f, NULL, NULL, f); } } - + e_widget_ilist_go(ob); e_widget_min_size_get(ob, &w, NULL); e_widget_min_size_set(ob, w, 250); @@ -1072,9 +1073,9 @@ for (next = cfdata->font_list; next; next = next->next) { const char *f; - + f = next->data; - if (cur_font && !strcasecmp(f, cur_font)) + if ((cur_font) && (!strcasecmp(f, cur_font))) { e_widget_ilist_selected_set(ob, n); break; @@ -1089,18 +1090,16 @@ E_Config_Dialog_Data *cfdata; Evas_List *l; int n; - - cfdata = data; - if (!cfdata) return; - + + if (!(cfdata = data)) return; + /* Setup the new style name */ for (n = 0, l = e_widget_ilist_items_get(cfdata->gui.class_list); l; l = l->next, n++) { E_Ilist_Item *i; CFText_Class *tc; - i = l->data; - if (!i) continue; + if (!(i = l->data)) continue; if (!i->selected) continue; tc = evas_list_nth(cfdata->text_classes, n); @@ -1119,11 +1118,10 @@ _adv_enabled_fallback_cb_change(void *data, Evas_Object *obj) { E_Config_Dialog_Data *cfdata; - - cfdata = data; - if (!cfdata) return; - - e_widget_disabled_set(cfdata->gui.fallback_list, !cfdata->cur_fallbacks_enabled); + + if (!(cfdata = data)) return; + e_widget_disabled_set(cfdata->gui.fallback_list, + !cfdata->cur_fallbacks_enabled); } static int @@ -1131,7 +1129,6 @@ { if (!data1) return 1; if (!data2) return -1; - return e_util_strcmp(data1, data2); } @@ -1144,7 +1141,8 @@ const char *name; name = e_font_fontconfig_name_get(cfdata->cur_font, cfdata->cur_style); - e_widget_font_preview_font_set(cfdata->gui.preview, name, cfdata->cur_size); + e_widget_font_preview_font_set(cfdata->gui.preview, name, + cfdata->cur_size); evas_stringshare_del(name); } } |
From: Enlightenment C. <no...@cv...> - 2008-03-25 02:17:59
|
Enlightenment CVS committal Author : ravenlock Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_wallpaper Modified Files: e_int_config_wallpaper.c Log Message: Per Devilhorns: Whitespace and formatting fixes. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_int_config_wallpaper.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- e_int_config_wallpaper.c 5 Mar 2008 05:35:37 -0000 1.9 +++ e_int_config_wallpaper.c 25 Mar 2008 02:17:55 -0000 1.10 @@ -4,13 +4,13 @@ #include "e.h" #include "e_mod_main.h" -static void *_create_data (E_Config_Dialog *cfd); -static void _free_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static void _fill_data (E_Config_Dialog_Data *cfdata); -static int _basic_apply (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _adv_apply (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static Evas_Object *_adv_create (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); +static void *_create_data(E_Config_Dialog *cfd); +static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static void _fill_data(E_Config_Dialog_Data *cfdata); +static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static Evas_Object *_adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static E_Config_Dialog *_e_int_config_wallpaper_desk(E_Container *con, int con_num, int zone_num, int desk_x, int desk_y); @@ -52,6 +52,7 @@ /* advanced */ int all_this_desk_screen; + /* dialogs */ E_Win *win_import; E_Dialog *dia_gradient; @@ -68,7 +69,7 @@ e_int_config_wallpaper_desk(E_Container *con, const char *params) { int con_num, zone_num, desk_x, desk_y; - + if (!params) return NULL; con_num = zone_num = desk_x = desk_y = -1; if (sscanf(params, "%i %i %i %i", &con_num, &zone_num, &desk_x, &desk_y) != 4) @@ -87,9 +88,9 @@ v = E_NEW(E_Config_Dialog_View, 1); cw = E_NEW(E_Config_Wallpaper, 1); - v->create_cfdata = _create_data; - v->free_cfdata = _free_data; - v->basic.apply_cfdata = _basic_apply; + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply; v->basic.create_widgets = _basic_create; if (!(con_num == -1 && zone_num == -1 && desk_x == -1 && desk_y == -1)) @@ -117,8 +118,8 @@ e_int_config_wallpaper_update(E_Config_Dialog *dia, char *file) { E_Config_Dialog_Data *cfdata; - char path[4096]; - + char path[PATH_MAX]; + cfdata = dia->cfdata; cfdata->fmdir = 1; e_widget_radio_toggle_set(cfdata->o_personal, 1); @@ -130,7 +131,8 @@ e_widget_check_checked_set(cfdata->o_theme_bg, cfdata->use_theme_bg); if (cfdata->o_fm) e_fm2_path_set(cfdata->o_fm, path, "/"); if (cfdata->o_preview) - e_widget_preview_edje_set(cfdata->o_preview, cfdata->bg, "e/desktop/background"); + e_widget_preview_edje_set(cfdata->o_preview, cfdata->bg, + "e/desktop/background"); if (cfdata->o_frame) e_widget_change(cfdata->o_frame); } @@ -138,7 +140,7 @@ e_int_config_wallpaper_import_done(E_Config_Dialog *dia) { E_Config_Dialog_Data *cfdata; - + cfdata = dia->cfdata; cfdata->win_import = NULL; } @@ -147,7 +149,7 @@ e_int_config_wallpaper_gradient_done(E_Config_Dialog *dia) { E_Config_Dialog_Data *cfdata; - + cfdata = dia->cfdata; cfdata->dia_gradient = NULL; } @@ -165,7 +167,7 @@ e_int_config_wallpaper_handler_set(Evas_Object *obj, const char *path, void *data) { const char *dev, *fpath; - + if (!path) return; e_fm2_path_get(obj, &dev, &fpath); if (dev) @@ -196,10 +198,9 @@ _cb_button_up(void *data1, void *data2) { E_Config_Dialog_Data *cfdata; - + cfdata = data1; - if (cfdata->o_fm) - e_fm2_parent_go(cfdata->o_fm); + if (cfdata->o_fm) e_fm2_parent_go(cfdata->o_fm); if (cfdata->o_frame) e_widget_scrollframe_child_pos_set(cfdata->o_frame, 0, 0); } @@ -208,19 +209,13 @@ _cb_files_changed(void *data, Evas_Object *obj, void *event_info) { E_Config_Dialog_Data *cfdata; - + cfdata = data; if (!cfdata->o_fm) return; - if (!e_fm2_has_parent_get(cfdata->o_fm)) - { - if (cfdata->o_up_button) - e_widget_disabled_set(cfdata->o_up_button, 1); - } - else - { - if (cfdata->o_up_button) - e_widget_disabled_set(cfdata->o_up_button, 0); - } + if (cfdata->o_up_button) + e_widget_disabled_set(cfdata->o_up_button, + !e_fm2_has_parent_get(cfdata->o_fm)); + if (cfdata->o_frame) e_widget_scrollframe_child_pos_set(cfdata->o_frame, 0, 0); } @@ -232,8 +227,8 @@ Evas_List *selected; E_Fm2_Icon_Info *ici; const char *realpath; - char buf[4096]; - + char buf[PATH_MAX]; + cfdata = data; if (!cfdata->o_fm) return; selected = e_fm2_selected_list_get(cfdata->o_fm); @@ -246,7 +241,9 @@ snprintf(buf, sizeof(buf), "%s/%s", realpath, ici->file); evas_list_free(selected); if (ecore_file_is_dir(buf)) return; + E_FREE(cfdata->bg); + cfdata->bg = strdup(buf); if (cfdata->o_preview) e_widget_preview_edje_set(cfdata->o_preview, buf, "e/desktop/background"); @@ -260,20 +257,19 @@ _cb_files_files_changed(void *data, Evas_Object *obj, void *event_info) { E_Config_Dialog_Data *cfdata; - const char *p, *homedir; - char buf[4096]; - + const char *p = NULL; + char buf[PATH_MAX]; + cfdata = data; - if (!cfdata->bg) return; - if (!cfdata->o_fm) return; + if ((!cfdata->bg) || (!cfdata->o_fm)) return; p = e_fm2_real_path_get(cfdata->o_fm); if (p) { if (strncmp(p, cfdata->bg, strlen(p))) return; } - homedir = e_user_homedir_get(); - snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds", homedir); - if (!p) return; + else return; + + snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds", e_user_homedir_get()); if (!strncmp(cfdata->bg, buf, strlen(buf))) p = cfdata->bg + strlen(buf) + 1; else @@ -295,10 +291,9 @@ E_Config_Dialog_Data *cfdata; Evas_List *sel, *all, *n; E_Fm2_Icon_Info *ici, *ic; - + cfdata = data; - if (!cfdata->bg) return; - if (!cfdata->o_fm) return; + if ((!cfdata->bg) || (!cfdata->o_fm)) return; all = e_fm2_all_list_get(cfdata->o_fm); if (!all) return; @@ -306,7 +301,6 @@ if (!sel) return; ici = sel->data; - all = evas_list_find_list(all, ici); n = evas_list_next(all); if (!n) @@ -314,15 +308,14 @@ n = evas_list_prev(all); if (!n) return; } - - ic = n->data; - if (!ic) return; - + + if (!(ic = n->data)) return; + e_fm2_select_set(cfdata->o_fm, ic->file, 1); e_fm2_file_show(cfdata->o_fm, ic->file); - + evas_list_free(n); - + evas_object_smart_callback_call(cfdata->o_fm, "selection_change", cfdata); } @@ -331,23 +324,27 @@ { E_Config_Dialog_Data *cfdata; const char *f; - + cfdata = data; if (cfdata->use_theme_bg) { - f = e_theme_edje_file_get("base/theme/backgrounds", "e/desktop/background"); + f = e_theme_edje_file_get("base/theme/backgrounds", + "e/desktop/background"); E_FREE(cfdata->bg); cfdata->bg = strdup(f); if (cfdata->o_preview) - e_widget_preview_edje_set(cfdata->o_preview, f, "e/desktop/background"); + e_widget_preview_edje_set(cfdata->o_preview, f, + "e/desktop/background"); } else { - evas_object_smart_callback_call(cfdata->o_fm, "selection_change", cfdata); + evas_object_smart_callback_call(cfdata->o_fm, "selection_change", + cfdata); if (cfdata->bg) { if (cfdata->o_preview) - e_widget_preview_edje_set(cfdata->o_preview, cfdata->bg, "e/desktop/background"); + e_widget_preview_edje_set(cfdata->o_preview, cfdata->bg, + "e/desktop/background"); } } } @@ -356,8 +353,8 @@ _cb_dir(void *data, Evas_Object *obj, void *event_info) { E_Config_Dialog_Data *cfdata; - char path[4096]; - + char path[PATH_MAX]; + cfdata = data; if (cfdata->fmdir == 1) snprintf(path, sizeof(path), "%s/data/backgrounds", e_prefix_data_get()); @@ -370,7 +367,7 @@ _cb_import(void *data1, void *data2) { E_Config_Dialog_Data *cfdata; - + cfdata = data1; if (cfdata->win_import) e_win_raise(cfdata->win_import); @@ -382,7 +379,7 @@ _cb_gradient(void *data1, void *data2) { E_Config_Dialog_Data *cfdata; - + cfdata = data1; if (cfdata->dia_gradient) e_win_raise(cfdata->dia_gradient->win); @@ -405,12 +402,11 @@ static void _fill_data(E_Config_Dialog_Data *cfdata) { - char path[4096]; E_Config_Wallpaper *cw; const E_Config_Desktop_Background *cfbg; - - cw = cfdata->cfd->data; + char path[PATH_MAX]; + cw = cfdata->cfd->data; if (cw->specific_config) { const char *bg; @@ -444,15 +440,16 @@ cfdata->bg = strdup(cfbg->file); } } - - if ((!cfdata->bg) && e_config->desktop_default_background) + + if ((!cfdata->bg) && (e_config->desktop_default_background)) cfdata->bg = strdup(e_config->desktop_default_background); - + if (cfdata->bg) { const char *f; - f = e_theme_edje_file_get("base/theme/backgrounds", "e/desktop/background"); + f = e_theme_edje_file_get("base/theme/backgrounds", + "e/desktop/background"); if (!strcmp(cfdata->bg, f)) cfdata->use_theme_bg = 1; snprintf(path, sizeof(path), "%s/data/backgrounds", e_prefix_data_get()); @@ -496,7 +493,7 @@ Evas_Object *ow, *of, *oa; E_Zone *zone = NULL; E_Radio_Group *rg; - char path[4096]; + char path[PATH_MAX]; E_Fm2_Config fmc; int mw, mh; const char *f; @@ -561,18 +558,17 @@ _cb_files_files_deleted, cfdata); e_fm2_path_set(ow, path, "/"); - of = e_widget_scrollframe_pan_add(evas, ow, - e_fm2_pan_set, - e_fm2_pan_get, + of = e_widget_scrollframe_pan_add(evas, ow, e_fm2_pan_set, e_fm2_pan_get, e_fm2_pan_max_get, e_fm2_pan_child_size_get); cfdata->o_frame = of; - e_widget_min_size_set(of, 60, 60);//******* + e_widget_min_size_set(of, 60, 60); e_widget_table_object_append(ot, of, 0, 2, 1, 1, 1, 1, 1, 1); e_widget_list_object_append(o, ot, 1, 1, 0.0); ot = e_widget_table_add(evas, 0); - ow = e_widget_check_add(evas, _("Use Theme Wallpaper"), &cfdata->use_theme_bg); + ow = e_widget_check_add(evas, _("Use Theme Wallpaper"), + &cfdata->use_theme_bg); cfdata->o_theme_bg = ow; evas_object_smart_callback_add(ow, "changed", _cb_theme_wallpaper, cfdata); e_widget_table_object_append(ot, ow, 0, 0, 2, 1, 1, 0, 0, 0); @@ -601,7 +597,6 @@ e_widget_preview_edje_set(ow, f, "e/desktop/background"); e_widget_aspect_child_set(oa, ow); e_widget_table_object_append(ot, oa, 0, 2, 4, 1, 1, 1, 1, 1); - e_widget_list_object_append(o, ot, 1, 0, 0.5); e_dialog_resizable_set(cfd->dia, 1); return o; @@ -625,6 +620,7 @@ while (e_config->desktop_backgrounds) { E_Config_Desktop_Background *cfbg; + cfbg = e_config->desktop_backgrounds->data; e_bg_del(cfbg->container, cfbg->zone, cfbg->desk_x, cfbg->desk_y); } @@ -648,7 +644,7 @@ Evas_Object *ow, *of, *oa; E_Zone *zone = NULL; E_Radio_Group *rg; - char path[4096]; + char path[PATH_MAX]; E_Fm2_Config fmc; int mw, mh; const char *f; @@ -713,9 +709,7 @@ _cb_files_files_deleted, cfdata); e_fm2_path_set(ow, path, "/"); - of = e_widget_scrollframe_pan_add(evas, ow, - e_fm2_pan_set, - e_fm2_pan_get, + of = e_widget_scrollframe_pan_add(evas, ow, e_fm2_pan_set, e_fm2_pan_get, e_fm2_pan_max_get, e_fm2_pan_child_size_get); cfdata->o_frame = of; @@ -724,7 +718,8 @@ e_widget_list_object_append(o, ot, 1, 1, 0.0); ot = e_widget_table_add(evas, 0); - ow = e_widget_check_add(evas, _("Use Theme Wallpaper"), &cfdata->use_theme_bg); + ow = e_widget_check_add(evas, _("Use Theme Wallpaper"), + &cfdata->use_theme_bg); cfdata->o_theme_bg = ow; evas_object_smart_callback_add(ow, "changed", _cb_theme_wallpaper, cfdata); e_widget_table_object_append(ot, ow, 0, 0, 2, 1, 1, 0, 0, 0); @@ -778,11 +773,9 @@ Evas_List *fl = NULL, *l; E_Zone *z; E_Desk *d; - - z = e_zone_current_get(cfdata->cfd->con); - if (!z) return 0; - d = e_desk_current_get(z); - if (!d) return 0; + + if (!(z = e_zone_current_get(cfdata->cfd->con))) return 0; + if (!(d = e_desk_current_get(z))) return 0; if (cfdata->use_theme_bg) { while (e_config->desktop_backgrounds) @@ -820,7 +813,7 @@ for (l = e_config->desktop_backgrounds; l; l = l->next) { E_Config_Desktop_Background *cfbg; - + cfbg = l->data; if ((cfbg->container == z->container->num) && (cfbg->zone == z->id)) @@ -831,7 +824,8 @@ E_Config_Desktop_Background *cfbg; cfbg = fl->data; - e_bg_del(cfbg->container, cfbg->zone, cfbg->desk_x, cfbg->desk_y); + e_bg_del(cfbg->container, cfbg->zone, cfbg->desk_x, + cfbg->desk_y); fl = evas_list_remove_list(fl, fl); } e_bg_add(z->container->num, z->id, -1, -1, cfdata->bg); |
From: Enlightenment C. <no...@cv...> - 2008-03-25 02:20:34
|
Enlightenment CVS committal Author : ravenlock Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_widget_preview.c Log Message: Per Devilhorns: - Formatting - Use PATH_MAX where needed =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_preview.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_widget_preview.c 12 May 2007 21:48:59 -0000 1.10 +++ e_widget_preview.c 25 Mar 2008 02:20:32 -0000 1.11 @@ -9,9 +9,9 @@ Evas_Object *obj, *o_frame, *img, *o_thumb, *o_extern; }; +/* local subsystem functions */ static void _e_wid_del_hook(Evas_Object *obj); static void _e_wid_preview_thumb_gen(void *data, Evas_Object *obj, void *event_info); -/* local subsystem functions */ /* externally accessible functions */ EAPI Evas_Object * @@ -20,21 +20,21 @@ Evas_Object *obj, *o; E_Widget_Data *wd; Evas_Coord mw, mh; - + obj = e_widget_add(evas); e_widget_del_hook_set(obj, _e_wid_del_hook); wd = calloc(1, sizeof(E_Widget_Data)); + if (!wd) return NULL; wd->obj = obj; - + o = edje_object_add(evas); wd->o_frame = o; - e_theme_edje_object_set(o, "base/theme/widgets", - "e/widgets/preview"); + e_theme_edje_object_set(o, "base/theme/widgets", "e/widgets/preview"); evas_object_show(o); e_widget_sub_object_add(obj, o); e_widget_resize_object_set(obj, o); - + o = e_livethumb_add(evas); wd->img = o; e_livethumb_vsize_set(o, minw * 2, minh * 2); @@ -42,13 +42,13 @@ edje_extern_object_max_size_set(o, minw, minh); evas_object_show(o); edje_object_part_swallow(wd->o_frame, "e.swallow.content", o); - + e_widget_data_set(obj, wd); e_widget_can_focus_set(obj, 0); edje_object_size_min_calc(wd->o_frame, &mw, &mh); e_widget_min_size_set(obj, mw, mh); e_widget_sub_object_add(obj, o); - + return obj; } @@ -56,7 +56,7 @@ e_widget_preview_evas_get(Evas_Object *obj) { E_Widget_Data *wd; - + wd = e_widget_data_get(obj); return e_livethumb_evas_get(wd->img); } @@ -65,7 +65,7 @@ e_widget_preview_extern_object_set(Evas_Object *obj, Evas_Object *eobj) { E_Widget_Data *wd; - + wd = e_widget_data_get(obj); wd->o_extern = eobj; e_livethumb_thumb_set(wd->img, wd->o_extern); @@ -75,15 +75,15 @@ e_widget_preview_file_set(Evas_Object *obj, const char *file, const char *key) { E_Widget_Data *wd; - + wd = e_widget_data_get(obj); - if (wd->o_thumb) evas_object_del(wd->o_thumb); wd->o_thumb = e_icon_add(e_livethumb_evas_get(wd->img)); e_icon_file_key_set(wd->o_thumb, file, key); evas_object_show(wd->o_thumb); e_livethumb_thumb_set(wd->img, wd->o_thumb); + return 1; } @@ -91,15 +91,14 @@ e_widget_preview_thumb_set(Evas_Object *obj, const char *file, const char *key, int w, int h) { E_Widget_Data *wd; - + wd = e_widget_data_get(obj); - if (wd->img) { e_widget_sub_object_del(obj, wd->img); evas_object_del(wd->img); } - + wd->img = e_thumb_icon_add(evas_object_evas_get(obj)); e_widget_sub_object_add(obj, wd->img); if (e_util_glob_case_match(file, "*.edj")) @@ -117,9 +116,10 @@ evas_object_smart_callback_add(wd->img, "e_thumb_gen", _e_wid_preview_thumb_gen, wd); e_thumb_icon_size_set(wd->img, w, h); e_thumb_icon_begin(wd->img); - + edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->img); evas_object_show(wd->img); + return 1; } @@ -145,13 +145,14 @@ { E_Widget_Data *wd; int ret; - + wd = e_widget_data_get(obj); if (wd->o_thumb) evas_object_del(wd->o_thumb); wd->o_thumb = edje_object_add(e_livethumb_evas_get(wd->img)); ret = edje_object_file_set(wd->o_thumb, file, group); evas_object_show(wd->o_thumb); e_livethumb_thumb_set(wd->img, wd->o_thumb); + return ret; } @@ -159,7 +160,7 @@ _e_wid_del_hook(Evas_Object *obj) { E_Widget_Data *wd; - + wd = e_widget_data_get(obj); free(wd); } |
From: Enlightenment C. <no...@cv...> - 2008-03-25 16:48:22
|
Enlightenment CVS committal Author : ravenlock Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_menus.c Log Message: Per Devilhorns: General cleanup. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v retrieving revision 1.232 retrieving revision 1.233 diff -u -3 -r1.232 -r1.233 --- e_int_menus.c 11 Jan 2008 07:33:55 -0000 1.232 +++ e_int_menus.c 25 Mar 2008 16:48:14 -0000 1.233 @@ -83,8 +83,8 @@ E_Menu *m, *subm; E_Menu_Item *mi; Main_Data *dat; - Evas_List *l; - + Evas_List *l = NULL; + dat = calloc(1, sizeof(Main_Data)); m = e_menu_new(); e_menu_title_set(m, _("Main")); @@ -109,7 +109,7 @@ e_menu_item_submenu_set(mi, subm); } } - + if (e_config->menu_apps_show) { subm = e_int_menus_all_apps_new(); @@ -119,7 +119,7 @@ e_util_menu_item_edje_icon_set(mi, "enlightenment/applications"); e_menu_item_submenu_set(mi, subm); } - + l = evas_hash_find(_e_int_menus_augmentation, "main/1"); if (l) _e_int_menus_augmentation_add(m, l); @@ -135,7 +135,7 @@ e_menu_item_label_set(mi, _("Desktop")); e_util_menu_item_edje_icon_set(mi, "enlightenment/desktops"); e_menu_item_submenu_set(mi, subm); - + subm = e_int_menus_clients_new(); e_object_data_set(E_OBJECT(subm), dat); dat->clients = subm; @@ -179,13 +179,13 @@ e_menu_item_label_set(mi, _("Theme")); e_util_menu_item_edje_icon_set(mi, "enlightenment/themes"); e_menu_item_callback_set(mi, _e_int_menus_themes_about, NULL); - + l = evas_hash_find(_e_int_menus_augmentation, "main/5"); if (l) _e_int_menus_augmentation_add(m, l); mi = e_menu_item_new(subm); e_menu_item_separator_set(mi, 1); - + l = evas_hash_find(_e_int_menus_augmentation, "main/6"); if (l) _e_int_menus_augmentation_add(m, l); @@ -241,7 +241,7 @@ e_int_menus_apps_new(const char *dir) { E_Menu *m; - + m = e_menu_new(); if (dir) e_object_data_set(E_OBJECT(m), strdup(dir)); e_menu_pre_activate_callback_set(m, _e_int_menus_apps_start, NULL); @@ -255,9 +255,9 @@ { E_Menu *m, *subm; E_Menu_Item *mi; - + m = e_menu_new(); - + subm = e_menu_new(); mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Virtual")); @@ -276,7 +276,7 @@ mi = e_menu_item_new(m); e_menu_item_separator_set(mi, 1); - + mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Show/Hide All Windows")); e_util_menu_item_edje_icon_set(mi, "enlightenment/showhide"); @@ -290,14 +290,14 @@ e_int_menus_favorite_apps_new(void) { E_Menu *m = NULL; - char buf[4096]; + char buf[PATH_MAX]; const char *homedir; - + homedir = e_user_homedir_get(); - snprintf(buf, sizeof(buf), "%s/.e/e/applications/menu/favorite.menu", homedir); + snprintf(buf, sizeof(buf), + "%s/.e/e/applications/menu/favorite.menu", homedir); - if (ecore_file_exists(buf)) - m = e_int_menus_apps_new(buf); + if (ecore_file_exists(buf)) m = e_int_menus_apps_new(buf); return m; } @@ -305,6 +305,7 @@ e_int_menus_all_apps_new(void) { E_Menu *m; + m = e_int_menus_apps_new(NULL); return m; } @@ -313,10 +314,9 @@ e_int_menus_config_new(void) { E_Menu *m; - + m = e_menu_new(); e_menu_pre_activate_callback_set(m, _e_int_menus_config_pre_cb, NULL); - return m; } @@ -344,7 +344,7 @@ e_int_menus_sys_new(void) { E_Menu *m; - + m = e_menu_new(); e_menu_pre_activate_callback_set(m, _e_int_menus_sys_pre_cb, NULL); return m; @@ -358,7 +358,7 @@ void *data_del) { E_Int_Menu_Augmentation *maug; - Evas_List *l; + Evas_List *l = NULL; maug = E_NEW(E_Int_Menu_Augmentation, 1); if (!maug) return NULL; @@ -371,10 +371,14 @@ l = evas_hash_find(_e_int_menus_augmentation, menu); if (l) - _e_int_menus_augmentation = evas_hash_del(_e_int_menus_augmentation, menu, l); + { + _e_int_menus_augmentation = + evas_hash_del(_e_int_menus_augmentation, menu, l); + } l = evas_list_append(l, maug); - _e_int_menus_augmentation = evas_hash_add(_e_int_menus_augmentation, menu, l); + _e_int_menus_augmentation = + evas_hash_add(_e_int_menus_augmentation, menu, l); return maug; } @@ -382,7 +386,7 @@ EAPI void e_int_menus_menu_augmentation_del(const char *menu, E_Int_Menu_Augmentation *maug) { - Evas_List *l; + Evas_List *l = NULL; l = evas_hash_find(_e_int_menus_augmentation, menu); if (l) @@ -391,13 +395,15 @@ * We should always add the list to the hash, in case the list * becomes empty, or the first element is removed. */ - _e_int_menus_augmentation = evas_hash_del(_e_int_menus_augmentation, - menu, l); + _e_int_menus_augmentation = + evas_hash_del(_e_int_menus_augmentation, menu, l); l = evas_list_remove(l, maug); - if (l) - _e_int_menus_augmentation = evas_hash_add(_e_int_menus_augmentation, - menu, l); + if (l) + { + _e_int_menus_augmentation = + evas_hash_add(_e_int_menus_augmentation, menu, l); + } } free(maug); } @@ -408,7 +414,7 @@ { Main_Data *dat; E_Menu *m; - + m = obj; dat = e_object_data_get(E_OBJECT(obj)); if (dat) @@ -441,7 +447,7 @@ _e_int_menus_main_about(void *data, E_Menu *m, E_Menu_Item *mi) { E_About *about; - + about = e_about_new(e_container_current_get(e_manager_current_get())); if (about) e_about_show(about); } @@ -450,7 +456,7 @@ _e_int_menus_themes_about(void *data, E_Menu *m, E_Menu_Item *mi) { E_Theme_About *about; - + about = e_theme_about_new(e_container_current_get(e_manager_current_get())); if (about) e_theme_about_show(about); } @@ -485,7 +491,7 @@ _e_int_menus_main_showhide(void *data, E_Menu *m, E_Menu_Item *mi) { E_Action *act; - + act = e_action_find("desk_deskshow_toggle"); if (act) act->func.go(E_OBJECT(m->zone), NULL); } @@ -494,7 +500,7 @@ _e_int_menus_main_restart(void *data, E_Menu *m, E_Menu_Item *mi) { E_Action *a; - + a = e_action_find("restart"); if ((a) && (a->func.go)) a->func.go(NULL, NULL); } @@ -503,7 +509,7 @@ _e_int_menus_main_logout(void *data, E_Menu *m, E_Menu_Item *mi) { E_Action *a; - + a = e_action_find("logout"); if ((a) && (a->func.go)) a->func.go(NULL, NULL); } @@ -512,7 +518,7 @@ _e_int_menus_main_exit(void *data, E_Menu *m, E_Menu_Item *mi) { E_Action *a; - + a = e_action_find("exit"); if ((a) && (a->func.go)) a->func.go(NULL, NULL); } @@ -521,7 +527,7 @@ _e_int_menus_main_halt(void *data, E_Menu *m, E_Menu_Item *mi) { E_Action *a; - + a = e_action_find("halt"); if ((a) && (a->func.go)) a->func.go(NULL, NULL); } @@ -530,7 +536,7 @@ _e_int_menus_main_reboot(void *data, E_Menu *m, E_Menu_Item *mi) { E_Action *a; - + a = e_action_find("reboot"); if ((a) && (a->func.go)) a->func.go(NULL, NULL); } @@ -539,7 +545,7 @@ _e_int_menus_main_suspend(void *data, E_Menu *m, E_Menu_Item *mi) { E_Action *a; - + a = e_action_find("suspend"); if ((a) && (a->func.go)) a->func.go(NULL, NULL); } @@ -548,7 +554,7 @@ _e_int_menus_main_hibernate(void *data, E_Menu *m, E_Menu_Item *mi) { E_Action *a; - + a = e_action_find("hibernate"); if ((a) && (a->func.go)) a->func.go(NULL, NULL); } @@ -561,14 +567,14 @@ if (menu->entries) { Efreet_Menu *entry; - + ecore_list_first_goto(menu->entries); while ((entry = ecore_list_next(menu->entries))) { mi = e_menu_item_new(m); - + _e_int_menus_item_label_set(entry, mi); - + if (entry->icon) { if (entry->icon[0] == '/') @@ -577,7 +583,8 @@ { char *file; - file = efreet_icon_path_find(e_config->icon_theme, entry->icon, "24x24"); + file = efreet_icon_path_find(e_config->icon_theme, + entry->icon, "24x24"); e_menu_item_icon_file_set(mi, file); E_FREE(file); } @@ -586,16 +593,21 @@ e_menu_item_separator_set(mi, 1); else if (entry->type == EFREET_MENU_ENTRY_DESKTOP) { - e_menu_item_callback_set(mi, _e_int_menus_apps_run, entry->desktop); - e_menu_item_drag_callback_set(mi, _e_int_menus_apps_drag, entry->desktop); + e_menu_item_callback_set(mi, _e_int_menus_apps_run, + entry->desktop); + e_menu_item_drag_callback_set(mi, _e_int_menus_apps_drag, + entry->desktop); } else if (entry->type == EFREET_MENU_ENTRY_MENU) { E_Menu *subm; subm = e_menu_new(); - e_menu_pre_activate_callback_set(subm, _e_int_menus_apps_start, entry); - e_object_del_attach_func_set(E_OBJECT(subm), _e_int_menus_items_del_hook); + e_menu_pre_activate_callback_set(subm, + _e_int_menus_apps_start, + entry); + e_object_del_attach_func_set(E_OBJECT(subm), + _e_int_menus_items_del_hook); e_menu_item_submenu_set(mi, subm); } /* TODO: Highlight header @@ -618,8 +630,8 @@ menu = data; if (!menu) { - char *dir; - + char *dir = NULL; + dir = e_object_data_get(E_OBJECT(m)); if (dir) { @@ -628,7 +640,8 @@ } else menu = efreet_menu_get(); e_object_data_set(E_OBJECT(m), menu); - e_object_free_attach_func_set(E_OBJECT(m), _e_int_menus_apps_free_hook2); + e_object_free_attach_func_set(E_OBJECT(m), + _e_int_menus_apps_free_hook2); } if (menu) _e_int_menus_apps_scan(m, menu); e_menu_pre_activate_callback_set(m, NULL, NULL); @@ -638,13 +651,13 @@ _e_int_menus_items_del_hook(void *obj) { E_Menu *m; - Evas_List *l; - + Evas_List *l = NULL; + m = obj; for (l = m->items; l; l = l->next) { E_Menu_Item *mi; - + mi = l->data; if (mi->submenu) e_object_del(E_OBJECT(mi->submenu)); } @@ -655,7 +668,7 @@ { E_Menu *m; char *dir; - + m = obj; dir = e_object_data_get(E_OBJECT(m)); E_FREE(dir); @@ -666,7 +679,7 @@ { E_Menu *m; Efreet_Menu *menu; - + m = obj; menu = e_object_data_get(E_OBJECT(m)); if (menu) efreet_menu_free(menu); @@ -676,7 +689,7 @@ _e_int_menus_apps_run(void *data, E_Menu *m, E_Menu_Item *mi) { Efreet_Desktop *desktop; - + desktop = data; e_exec(m->zone, desktop, NULL, NULL, "menu/apps"); } @@ -685,7 +698,7 @@ _e_int_menus_apps_drag(void *data, E_Menu *m, E_Menu_Item *mi) { Efreet_Desktop *desktop; - + desktop = data; /* start drag! */ @@ -714,20 +727,21 @@ { E_Menu_Item *mi; E_Menu *root; - + e_menu_pre_activate_callback_set(m, NULL, NULL); - + root = e_menu_root_get(m); if ((root) && (root->zone)) { - int i; E_Zone *zone; - + int i; + zone = root->zone; for (i = 0; i < zone->desk_x_count * zone->desk_y_count; i++) { - E_Desk *desk = zone->desks[i]; - + E_Desk *desk; + + desk = zone->desks[i]; mi = e_menu_item_new(m); e_menu_item_radio_group_set(mi, 1); e_menu_item_radio_set(mi, 1); @@ -773,10 +787,10 @@ _e_int_menus_config_pre_cb(void *data, E_Menu *m) { E_Menu_Item *mi; - Evas_List *l; + Evas_List *l = NULL; e_menu_pre_activate_callback_set(m, NULL, NULL); - + l = evas_hash_find(_e_int_menus_augmentation, "config/0"); if (l) { @@ -794,10 +808,7 @@ } l = evas_hash_find(_e_int_menus_augmentation, "config/1"); - if (l) - { - _e_int_menus_augmentation_add(m, l); - } + if (l) _e_int_menus_augmentation_add(m, l); l = evas_hash_find(_e_int_menus_augmentation, "config/2"); if (l) @@ -826,10 +837,10 @@ _e_int_menus_sys_pre_cb(void *data, E_Menu *m) { E_Menu_Item *mi; - Evas_List *l; + Evas_List *l = NULL; e_menu_pre_activate_callback_set(m, NULL, NULL); - + l = evas_hash_find(_e_int_menus_augmentation, "sys/0"); if (l) { @@ -843,10 +854,10 @@ e_menu_item_label_set(mi, _("Lock Screen")); e_util_menu_item_edje_icon_set(mi, "enlightenment/desklock_menu"); e_menu_item_callback_set(mi, _e_int_menus_main_lock, NULL); - + mi = e_menu_item_new(m); e_menu_item_separator_set(mi, 1); - + if (e_sys_action_possible_get(E_SYS_HALT) || e_sys_action_possible_get(E_SYS_REBOOT) || e_sys_action_possible_get(E_SYS_SUSPEND) || @@ -883,12 +894,12 @@ mi = e_menu_item_new(m); e_menu_item_separator_set(mi, 1); } - + mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Logout")); e_util_menu_item_edje_icon_set(mi, "enlightenment/logout"); e_menu_item_callback_set(mi, _e_int_menus_main_logout, NULL); - + l = evas_hash_find(_e_int_menus_augmentation, "sys/1"); if (l) { @@ -947,11 +958,11 @@ if (strcmp((const char*)bd1->client.icccm.class, (const char*)bd2->client.icccm.class) > 0) return 1; - + if (strcmp((const char*)bd1->client.icccm.class, (const char*)bd2->client.icccm.class) < 0) return -1; - + return -1; /* Returning '-1' on equal is intentional */ } @@ -962,7 +973,7 @@ E_Border *bd2; const char *name1; const char *name2; - + if (!d1) return 1; if (!d2) return -1; @@ -970,7 +981,7 @@ bd2 = d2; name1 = e_border_name_get(bd1); name2 = e_border_name_get(bd2); - + if (strcasecmp(name1, name2) > 0) return 1; if (strcasecmp(name1, name2) < 0) return -1; return 0; @@ -979,8 +990,7 @@ static int _e_int_menus_clients_sort_z_order_cb(void *d1, void *d2) { - E_Border *bd1; - E_Border *bd2; + E_Border *bd1, *bd2; if (!d1) return 1; if (!d2) return -1; @@ -996,7 +1006,7 @@ static void _e_int_menus_clients_menu_add_iconified(Evas_List *borders, E_Menu *m) { - Evas_List *l; + Evas_List *l = NULL; E_Menu_Item *mi; if (evas_list_count(borders) > 0) @@ -1007,8 +1017,8 @@ for (l = borders; l; l = l->next) { E_Border *bd; - bd = l->data; - + + bd = l->data; _e_int_menus_clients_item_create(bd, m); } } @@ -1024,10 +1034,10 @@ class = strdup(""); for (l = borders; l; l = l->next) - { + { E_Border *bd; - bd = l->data; + bd = l->data; if ((bd->iconic) && (e_config->clientlist_separate_iconified_apps == E_CLIENTLIST_GROUPICONS_SEP)) { @@ -1040,8 +1050,7 @@ { if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU) { - if (subm && mi) - e_menu_item_submenu_set(mi, subm); + if ((subm) && (mi)) e_menu_item_submenu_set(mi, subm); mi = e_menu_item_new(m); e_menu_item_label_set(mi, bd->client.icccm.class); e_util_menu_item_edje_icon_set(mi, "enlightenment/windows"); @@ -1061,7 +1070,7 @@ } if ((e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU) - && subm && mi) + && (subm) && (mi)) e_menu_item_submenu_set(mi, subm); _e_int_menus_clients_menu_add_iconified(ico, m); @@ -1079,7 +1088,7 @@ for (l = borders; l; l = l->next) { E_Border *bd; - + bd = l->data; if (bd->iconic && e_config->clientlist_separate_iconified_apps && E_CLIENTLIST_GROUPICONS_SEP) { @@ -1110,23 +1119,21 @@ mi = e_menu_item_new(m); e_menu_item_separator_set(mi, 1); } - + for (l = alt; l; l = l->next) { E_Border *bd; - - bd = l->data; - if (bd->desk != desk && - e_config->clientlist_separate_with != E_CLIENTLIST_GROUP_SEP_NONE) + bd = l->data; + if ((bd->desk != desk) && + (e_config->clientlist_separate_with != E_CLIENTLIST_GROUP_SEP_NONE)) { if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU) { - if (subm && mi) - e_menu_item_submenu_set(mi, subm); + if (subm && mi) e_menu_item_submenu_set(mi, subm); mi = e_menu_item_new(m); e_menu_item_label_set(mi, bd->desk->name); - e_util_menu_item_edje_icon_set(mi, "enlightenment/desktops"); + e_util_menu_item_edje_icon_set(mi, "enlightenment/desktops"); subm = e_menu_new(); } else @@ -1142,10 +1149,10 @@ _e_int_menus_clients_item_create(bd, m); } if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU - && subm && mi) + && (subm) && (mi)) e_menu_item_submenu_set(mi, subm); } - + _e_int_menus_clients_menu_add_iconified(ico, m); } @@ -1153,13 +1160,14 @@ _e_int_menus_clients_add_by_none(Evas_List *borders, E_Menu *m) { Evas_List *l = NULL, *ico = NULL; - + for (l = borders; l; l = l->next) { E_Border *bd; bd = l->data; - if (bd->iconic && e_config->clientlist_separate_iconified_apps && E_CLIENTLIST_GROUPICONS_SEP) + if ((bd->iconic) && (e_config->clientlist_separate_iconified_apps) && + (E_CLIENTLIST_GROUPICONS_SEP)) { ico = evas_list_append(ico, bd); continue; @@ -1216,34 +1224,32 @@ /* Sort the borders */ if (e_config->clientlist_sort_by == E_CLIENTLIST_SORT_ALPHA) borders = evas_list_sort(borders, evas_list_count(borders), - _e_int_menus_clients_sort_alpha_cb); + _e_int_menus_clients_sort_alpha_cb); if (e_config->clientlist_sort_by == E_CLIENTLIST_SORT_ZORDER) borders = evas_list_sort(borders, evas_list_count(borders), - _e_int_menus_clients_sort_z_order_cb); + _e_int_menus_clients_sort_z_order_cb); /* Group the borders */ if (e_config->clientlist_group_by == E_CLIENTLIST_GROUP_DESK) { borders = evas_list_sort(borders, evas_list_count(borders), - _e_int_menus_clients_group_desk_cb); + _e_int_menus_clients_group_desk_cb); _e_int_menus_clients_add_by_desk(desk, borders, m); } if (e_config->clientlist_group_by == E_CLIENTLIST_GROUP_CLASS) { borders = evas_list_sort(borders, evas_list_count(borders), - _e_int_menus_clients_group_class_cb); + _e_int_menus_clients_group_class_cb); _e_int_menus_clients_add_by_class(borders, m); } if (e_config->clientlist_group_by == E_CLIENTLIST_GROUP_NONE) - { - _e_int_menus_clients_add_by_none(borders, m); - } + _e_int_menus_clients_add_by_none(borders, m); } - + mi = e_menu_item_new(m); e_menu_item_separator_set(mi, 1); - + mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Cleanup Windows")); e_util_menu_item_edje_icon_set(mi, "enlightenment/windows"); @@ -1262,7 +1268,7 @@ e_util_menu_item_edje_icon_set(mi, "enlightenment/lost_windows"); e_menu_item_submenu_set(mi, subm); } - + e_object_free_attach_func_set(E_OBJECT(m), _e_int_menus_clients_free_hook); e_object_data_set(E_OBJECT(m), borders); } @@ -1297,7 +1303,7 @@ { E_Menu_Item *mi; const char *title; - + title = _e_int_menus_clients_title_abbrv(e_border_name_get(bd)); mi = e_menu_item_new(m); e_menu_item_check_set(mi, 1); @@ -1317,14 +1323,14 @@ _e_int_menus_clients_free_hook(void *obj) { E_Menu *m; - Evas_List *borders; - + Evas_List *borders = NULL; + m = obj; borders = e_object_data_get(E_OBJECT(m)); while (borders) { E_Border *bd; - + bd = borders->data; borders = evas_list_remove_list(borders, borders); e_object_unref(E_OBJECT(bd)); @@ -1335,7 +1341,7 @@ _e_int_menus_clients_item_cb(void *data, E_Menu *m, E_Menu_Item *mi) { E_Border *bd; - + bd = data; E_OBJECT_CHECK(bd); @@ -1349,9 +1355,7 @@ } if (!bd->iconic) e_desk_show(bd->desk); - - if (!bd->lock_user_stacking) - e_border_raise(bd); + if (!bd->lock_user_stacking) e_border_raise(bd); if (!bd->lock_focus_out) { if (e_config->focus_policy != E_FOCUS_CLICK) @@ -1366,7 +1370,7 @@ { E_Border *bd; Evas_Object *o; - + bd = data; E_OBJECT_CHECK(bd); @@ -1379,7 +1383,7 @@ _e_int_menus_clients_cleanup_cb(void *data, E_Menu *m, E_Menu_Item *mi) { E_Action *act; - + act = e_action_find("cleanup_windows"); if (act) act->func.go(E_OBJECT(m->zone), NULL); } @@ -1395,8 +1399,7 @@ e_menu_pre_activate_callback_set(m, NULL, NULL); root = e_menu_root_get(m); /* get the current clients */ - if (root) - zone = root->zone; + if (root) zone = root->zone; borders = e_border_lost_windows_get(zone); if (!borders) @@ -1408,9 +1411,10 @@ } for (l = borders; l; l = l->next) { - E_Border *bd = l->data; + E_Border *bd; const char *title = ""; - + + bd = l->data; title = e_border_name_get(bd); mi = e_menu_item_new(m); if ((title) && (title[0])) @@ -1420,7 +1424,8 @@ /* ref the border as we implicitly unref it in the callback */ e_object_ref(E_OBJECT(bd)); e_menu_item_callback_set(mi, _e_int_menus_lost_clients_item_cb, bd); - if (bd->desktop) e_util_desktop_menu_item_icon_add(bd->desktop, "24x24", mi); + if (bd->desktop) + e_util_desktop_menu_item_icon_add(bd->desktop, "24x24", mi); } e_object_free_attach_func_set(E_OBJECT(m), _e_int_menus_lost_clients_free_hook); @@ -1431,14 +1436,14 @@ _e_int_menus_lost_clients_free_hook(void *obj) { E_Menu *m; - Evas_List *borders; - + Evas_List *borders = NULL; + m = obj; borders = e_object_data_get(E_OBJECT(m)); while (borders) { E_Border *bd; - + bd = borders->data; borders = evas_list_remove_list(borders, borders); e_object_unref(E_OBJECT(bd)); @@ -1462,31 +1467,28 @@ static void _e_int_menus_augmentation_add(E_Menu *m, Evas_List *augmentation) { - Evas_List *l; + Evas_List *l = NULL; for (l = augmentation; l; l = l->next) { E_Int_Menu_Augmentation *aug; aug = l->data; - if (aug->add.func) - aug->add.func(aug->add.data, m); + if (aug->add.func) aug->add.func(aug->add.data, m); } } static void _e_int_menus_augmentation_del(E_Menu *m, Evas_List *augmentation) { - Evas_List *l; + Evas_List *l = NULL; for (l = augmentation; l; l = l->next) { E_Int_Menu_Augmentation *aug; aug = l->data; - - if (aug->del.func) - aug->del.func(aug->del.data, m); + if (aug->del.func) aug->del.func(aug->del.data, m); } } @@ -1497,11 +1499,11 @@ Evas_List *l, *shelves = NULL; E_Container *con; E_Zone *zone; - + e_menu_pre_activate_callback_set(m, NULL, NULL); con = e_container_current_get(e_manager_current_get()); zone = e_zone_current_get(con); - + /* get the current clients */ shelves = e_shelf_list(); @@ -1516,12 +1518,11 @@ E_Shelf *s; const char *name; char buf[4096]; - - s = l->data; - if (!s) continue; + + if (!(s = l->data)) continue; if (s->zone->num != zone->num) continue; if (s->cfg->container != con->num) continue; - + name = s->name; if (!name) name = _("Shelf #"); snprintf(buf, sizeof(buf), "%s %i", name, s->id); @@ -1574,7 +1575,7 @@ } mi = e_menu_item_new(m); e_menu_item_separator_set(mi, 1); - + mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Add A Shelf")); e_menu_item_callback_set(mi, _e_int_menus_shelves_add_cb, NULL); @@ -1602,7 +1603,7 @@ E_Container *con; E_Zone *zone; E_Config_Shelf *cs; - + con = e_container_current_get(e_manager_current_get()); zone = e_zone_current_get(con); cs = E_NEW(E_Config_Shelf, 1); @@ -1619,7 +1620,7 @@ cs->overlap = 0; e_config->shelves = evas_list_append(e_config->shelves, cs); e_config_save_queue(); - + e_shelf_config_init(); } @@ -1635,9 +1636,9 @@ Efreet_Desktop *desktop; char label[4096]; int opt = 0; - + if ((!entry) || (!mi)) return; - + desktop = entry->desktop; if ((e_config->menu_eap_name_show) && (entry->name)) opt |= 0x4; if (desktop) @@ -1647,23 +1648,26 @@ if ((e_config->menu_eap_comment_show) && (desktop->comment)) opt |= 0x1; } - + if (opt == 0x7) - snprintf(label, sizeof(label), "%s (%s) [%s]", entry->name, desktop->generic_name, desktop->comment); + snprintf(label, sizeof(label), "%s (%s) [%s]", entry->name, + desktop->generic_name, desktop->comment); else if (opt == 0x6) - snprintf(label, sizeof(label), "%s (%s)", entry->name, desktop->generic_name); + snprintf(label, sizeof(label), "%s (%s)", entry->name, + desktop->generic_name); else if (opt == 0x5) snprintf(label, sizeof(label), "%s [%s]", entry->name, desktop->comment); else if (opt == 0x4) snprintf(label, sizeof(label), "%s", entry->name); else if (opt == 0x3) - snprintf(label, sizeof(label), "%s [%s]", desktop->generic_name, desktop->comment); + snprintf(label, sizeof(label), "%s [%s]", desktop->generic_name, + desktop->comment); else if (opt == 0x2) snprintf(label, sizeof(label), "%s", desktop->generic_name); else if (opt == 0x1) snprintf(label, sizeof(label), "%s", desktop->comment); else snprintf(label, sizeof(label), "%s", entry->name); - + e_menu_item_label_set(mi, label); } |
From: Enlightenment C. <no...@cv...> - 2008-04-17 02:51:29
|
Enlightenment CVS committal Author : ravenlock Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fm.c Log Message: Fix typo. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v retrieving revision 1.239 retrieving revision 1.240 diff -u -3 -r1.239 -r1.240 --- e_fm.c 7 Mar 2008 19:13:53 -0000 1.239 +++ e_fm.c 17 Apr 2008 02:51:26 -0000 1.240 @@ -509,10 +509,10 @@ dialog = e_dialog_new(con, "E", "_fm_file_unexisting_path_dialog"); e_dialog_button_add(dialog, _("Close"), NULL, NULL, dialog); e_dialog_button_focus_num(dialog, 0); - e_dialog_title_set(dialog, _("Unexisting path")); + e_dialog_title_set(dialog, _("Nonexistent path")); snprintf(text, sizeof(text), - _("%s doesn't exists"), + _("%s doesn't exist."), realpath); e_dialog_text_set(dialog, text); |
From: Enlightenment C. <no...@cv...> - 2008-04-17 03:07:53
|
Enlightenment CVS committal Author : ravenlock Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_eap_editor.c Log Message: I beleive these wires were crossed. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v retrieving revision 1.94 retrieving revision 1.95 diff -u -3 -r1.94 -r1.95 --- e_eap_editor.c 4 Dec 2007 17:48:28 -0000 1.94 +++ e_eap_editor.c 17 Apr 2008 03:07:51 -0000 1.95 @@ -582,7 +582,7 @@ } else { - o = e_widget_fsel_add(dia->win->evas, "/", "~/", NULL, NULL, + o = e_widget_fsel_add(dia->win->evas, "~/", "/", NULL, NULL, _e_desktop_edit_select_cb, cfdata, NULL, cfdata, 1); } @@ -646,7 +646,7 @@ } else { - o = e_widget_fsel_add(dia->win->evas, "/", "~/", NULL, NULL, + o = e_widget_fsel_add(dia->win->evas, "~/", "/", NULL, NULL, _e_desktop_edit_select_cb, cfdata, NULL, cfdata, 1); } |
From: Enlightenment C. <no...@cv...> - 2008-04-23 05:51:05
|
Enlightenment CVS committal Author : ravenlock Project : e17 Module : apps/e Dir : e17/apps/e/data/themes Modified Files: default_battery.edc Log Message: Toma's fix for the battery module's poor width calc. =================================================================== RCS file: /cvs/e/e17/apps/e/data/themes/default_battery.edc,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- default_battery.edc 17 Sep 2007 12:03:47 -0000 1.15 +++ default_battery.edc 23 Apr 2008 05:51:02 -0000 1.16 @@ -15,6 +15,7 @@ group { name: "e/modules/battery/main"; max: 128 128; + min: 1 1; script { public message(Msg_Type:type, id, ...) { if ((type == MSG_FLOAT) && (id == 1)) { |
From: Enlightenment C. <no...@cv...> - 2008-05-07 03:10:59
|
Enlightenment CVS committal Author : ravenlock Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_winlist Modified Files: e_mod_main.c Log Message: Remove duplicate \"Windows\" category. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_winlist/e_mod_main.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_main.c 24 Feb 2008 05:14:35 -0000 1.4 +++ e_mod_main.c 7 May 2008 03:10:53 -0000 1.5 @@ -31,7 +31,7 @@ EAPI void * e_modapi_init(E_Module *m) { - e_configure_registry_category_add("windows", 80, _("Windows"), NULL, "enlightenment/windows"); + e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "enlightenment/windows"); e_configure_registry_item_add("windows/window_list", 30, _("Window List"), NULL, "enlightenment/winlist", e_int_config_winlist); conf_module = m; e_module_delayed_set(m, 1); |
From: Enlightenment C. <no...@cv...> - 2008-05-13 04:36:53
|
Enlightenment CVS committal Author : ravenlock Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_window_remembers Modified Files: e_int_config_remembers.c Log Message: Add some details to the remembers in the list. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_window_remembers/e_int_config_remembers.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_int_config_remembers.c 6 May 2008 09:30:21 -0000 1.1 +++ e_int_config_remembers.c 13 May 2008 04:36:50 -0000 1.2 @@ -10,7 +10,7 @@ struct _E_Config_Dialog_Data { - Evas_Object *list, *btn; + Evas_Object *list, *btn, *name, *class, *title, *role; }; EAPI E_Config_Dialog * @@ -52,7 +52,7 @@ static Evas_Object * _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { - Evas_Object *o, *of, *ow; + Evas_Object *o, *of, *of2, *ow; o = e_widget_list_add(evas, 0, 0); of = e_widget_frametable_add(evas, _("Window Remembers"), 0); @@ -67,8 +67,31 @@ e_widget_on_change_hook_set(ow, _cb_list_change, cfdata); _fill_remembers(cfdata); + of2 = e_widget_frametable_add(evas, _("Details"), 0); + ow = e_widget_label_add(evas, _("Name:")); + e_widget_frametable_object_append(of2, ow, 0, 0, 1, 1, 1, 1, 0, 0); + ow = e_widget_label_add(evas, _("<No Name>")); + cfdata->name = ow; + e_widget_frametable_object_append(of2, cfdata->name, 1, 0, 1, 1, 1, 1, 1, 0); + ow = e_widget_label_add(evas, _("Class:")); + e_widget_frametable_object_append(of2, ow, 0, 1, 1, 1, 1, 1, 0, 0); + ow = e_widget_label_add(evas, _("<No Class>")); + cfdata->class = ow; + e_widget_frametable_object_append(of2, cfdata->class, 1, 1, 1, 1, 1, 1, 1, 0); + ow = e_widget_label_add(evas, _("Title:")); + e_widget_frametable_object_append(of2, ow, 0, 2, 1, 1, 1, 1, 0, 0); + ow = e_widget_label_add(evas, _("<No Title>")); + cfdata->title = ow; + e_widget_frametable_object_append(of2, cfdata->title, 1, 2, 1, 1, 1, 1, 1, 0); + ow = e_widget_label_add(evas, _("Role:")); + e_widget_frametable_object_append(of2, ow, 0, 3, 1, 1, 1, 1, 0, 0); + ow = e_widget_label_add(evas, _("<No Role>")); + cfdata->role = ow; + e_widget_frametable_object_append(of2, cfdata->role, 1, 3, 1, 1, 1, 1, 1, 0); + e_widget_frametable_object_append(of, cfdata->list, 0, 0, 1, 1, 1, 1, 1, 1); - e_widget_frametable_object_append(of, cfdata->btn, 0, 1, 1, 1, 1, 1, 1, 0); + e_widget_frametable_object_append(of, of2, 0, 1, 1, 1, 1, 1, 1, 0); + e_widget_frametable_object_append(of, cfdata->btn, 0, 2, 1, 1, 1, 1, 1, 0); e_widget_list_object_append(o, of, 1, 1, 0.5); @@ -149,12 +172,24 @@ _cb_list_change(void *data, Evas_Object *obj) { E_Config_Dialog_Data *cfdata; + E_Ilist_Item *item = NULL; + E_Remember *rem = NULL; + int n = 0; + char *s; if (!(cfdata = data)) return; - if (e_widget_ilist_selected_count_get(cfdata->list) < 1) + + n = e_widget_ilist_selected_get(cfdata->list); + if ((rem = e_widget_ilist_nth_data_get(cfdata->list, n))) { - e_widget_disabled_set(cfdata->btn, 1); - return; + e_widget_label_text_set(cfdata->name, rem->name ? rem->name : _("<No Name>")); + e_widget_label_text_set(cfdata->class, rem->class ? rem->class : _("<No Class>")); + e_widget_label_text_set(cfdata->title, rem->title ? rem->title : _("<No Title>")); + e_widget_label_text_set(cfdata->role, rem->role ? rem->role : _("<No Role>")); } - e_widget_disabled_set(cfdata->btn, 0); + + if (e_widget_ilist_selected_count_get(cfdata->list) < 1) + e_widget_disabled_set(cfdata->btn, 1); + else + e_widget_disabled_set(cfdata->btn, 0); } |
From: Enlightenment C. <no...@cv...> - 2008-05-13 04:59:10
|
Enlightenment CVS committal Author : ravenlock Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_window_remembers Modified Files: e_int_config_remembers.c Log Message: Sort the list. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_window_remembers/e_int_config_remembers.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_int_config_remembers.c 13 May 2008 04:36:50 -0000 1.2 +++ e_int_config_remembers.c 13 May 2008 04:59:01 -0000 1.3 @@ -34,6 +34,39 @@ } /* private functions */ +static int +_cb_sort(void *data1, void *data2) +{ + E_Remember *rem1 = NULL; + E_Remember *rem2 = NULL; + const char *d1, *d2; + + rem1 = data1; + rem2 = data2; + if (!rem1) return 1; + if (!rem2) return -1; + + if (rem1->name) + d1 = rem1->name; + else if (rem1->class) + d1 = rem1->class; + else if (rem1->title) + d1 = rem1->title; + else if (rem1->role) + d1 = rem1->role; + + if (rem2->name) + d2 = rem2->name; + else if (rem2->class) + d2 = rem2->class; + else if (rem2->title) + d2 = rem2->title; + else if (rem2->role) + d2 = rem2->role; + + return strcmp(d1, d2); +} + static void * _create_data(E_Config_Dialog *cfd) { @@ -112,7 +145,7 @@ e_widget_ilist_freeze(cfdata->list); e_widget_ilist_clear(cfdata->list); - for (l = e_config->remembers; l; l = l->next) + for (l = evas_list_sort(e_config->remembers, -1, _cb_sort); l; l = l->next) { E_Remember *rem = NULL; |
From: Enlightenment C. <no...@cv...> - 2008-05-13 06:20:17
|
Enlightenment CVS committal Author : ravenlock Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_window_remembers Modified Files: e_int_config_remembers.c Log Message: Something not right with the sorting of that list. Disabling for now. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_window_remembers/e_int_config_remembers.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_int_config_remembers.c 13 May 2008 04:59:01 -0000 1.3 +++ e_int_config_remembers.c 13 May 2008 06:20:15 -0000 1.4 @@ -145,7 +145,8 @@ e_widget_ilist_freeze(cfdata->list); e_widget_ilist_clear(cfdata->list); - for (l = evas_list_sort(e_config->remembers, -1, _cb_sort); l; l = l->next) + //for (l = evas_list_sort(e_config->remembers, -1, _cb_sort); l; l = l->next) + for (l = e_config->remembers; l; l = l->next) { E_Remember *rem = NULL; |
From: Enlightenment C. <no...@cv...> - 2008-05-20 04:23:12
|
Enlightenment CVS committal Author : ravenlock Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_window_remembers Modified Files: e_int_config_remembers.c Log Message: - Categorize the remembers - Show E's internal remembers - Fix a sort issue - Fix a couple warnings =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_window_remembers/e_int_config_remembers.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_int_config_remembers.c 13 May 2008 08:39:29 -0000 1.6 +++ e_int_config_remembers.c 20 May 2008 04:23:09 -0000 1.7 @@ -62,7 +62,10 @@ else if (rem2->role) d2 = rem2->role; - return strcmp(d1, d2); + if (!strcmp(d1, d2)) + return -1; + else + return strcmp(d1, d2); } static void * @@ -135,6 +138,7 @@ { Evas *evas; Evas_List *l = NULL; + Evas_List *ll = NULL; int w = 0; evas = evas_object_evas_get(cfdata->list); @@ -143,9 +147,11 @@ e_widget_ilist_freeze(cfdata->list); e_widget_ilist_clear(cfdata->list); - l = e_config->remembers; - for (l = evas_list_sort(l, -1, _cb_sort); l; l = l->next) - //for (l = e_config->remembers; l; l = l->next) + ll = e_config->remembers; + ll = evas_list_sort(ll, -1, _cb_sort); + + e_widget_ilist_header_append(cfdata->list, NULL, _("Applications")); + for (l = ll; l; l = l->next) { E_Remember *rem = NULL; @@ -153,15 +159,45 @@ /* Filter out E's own remember */ if ((rem->name) && (!strcmp(rem->name, "E"))) continue; + /* Filter out the module config remembers */ + if ((rem->class) && (rem->class[0] == '_')) continue; - if (rem->name) + if (rem->name) e_widget_ilist_append(cfdata->list, NULL, rem->name, NULL, rem, NULL); - else if (rem->class) + else if (rem->class) e_widget_ilist_append(cfdata->list, NULL, rem->class, NULL, rem, NULL); - else if (rem->title) + else if (rem->title) e_widget_ilist_append(cfdata->list, NULL, rem->title, NULL, rem, NULL); - else if (rem->role) - e_widget_ilist_append(cfdata->list, NULL, rem->role, NULL, rem, NULL); + else if (rem->role) + e_widget_ilist_append(cfdata->list, NULL, rem->role, NULL, rem, NULL); + } + + e_widget_ilist_header_append(cfdata->list, NULL, _("Enlightenment")); + for (l = ll; l; l = l->next) + { + E_Remember *rem = NULL; + + if (!(rem = l->data)) continue; + + /* Garuntee we add only E's internal remembers */ + if ((rem->name) && (strcmp(rem->name, "E"))) continue; + + e_widget_ilist_append(cfdata->list, NULL, rem->class, NULL, rem, NULL); + } + + e_widget_ilist_header_append(cfdata->list, NULL, _("Modules")); + for (l = ll; l; l = l->next) + { + E_Remember *rem = NULL; + + if (!(rem = l->data)) continue; + + /* Filter out E's own remember */ + if ((rem->name) && (!strcmp(rem->name, "E"))) continue; + /* Filter out everything except the module config remembers */ + if ((rem->name) && (rem->class[0] != '_')) continue; + + e_widget_ilist_append(cfdata->list, NULL, rem->name, NULL, rem, NULL); } e_widget_ilist_go(cfdata->list); @@ -219,10 +255,8 @@ _cb_list_change(void *data, Evas_Object *obj) { E_Config_Dialog_Data *cfdata; - E_Ilist_Item *item = NULL; E_Remember *rem = NULL; int n = 0; - char *s; if (!(cfdata = data)) return; |