From: Enlightenment S. <no-...@en...> - 2008-09-20 00:51:31
|
Author: raster Date: 2008-09-19 17:51:19 -0700 (Fri, 19 Sep 2008) New Revision: 36105 Log: fix fileman initial position with multipl zones - it was really wrong before anyway, and also save window pos/size via fm_custom, not e remembers. Modified: trunk/e/src/modules/fileman/e_fwin.c Modified: trunk/e/src/modules/fileman/e_fwin.c =================================================================== --- trunk/e/src/modules/fileman/e_fwin.c 2008-09-19 23:59:29 UTC (rev 36104) +++ trunk/e/src/modules/fileman/e_fwin.c 2008-09-20 00:51:19 UTC (rev 36105) @@ -44,6 +44,8 @@ E_Toolbar *tbar; Ecore_Event_Handler *zone_handler; Ecore_Event_Handler *zone_del_handler; + + unsigned char geom_save_ready : 1; }; struct _E_Fwin_Apps_Dialog @@ -70,6 +72,7 @@ static E_Fwin *_e_fwin_new(E_Container *con, const char *dev, const char *path); static void _e_fwin_free(E_Fwin *fwin); static void _e_fwin_cb_delete(E_Win *win); +static void _e_fwin_cb_move(E_Win *win); static void _e_fwin_cb_resize(E_Win *win); static void _e_fwin_deleted(void *data, Evas_Object *obj, void *event_info); static const char *_e_fwin_custom_file_path_eval(E_Fwin *fwin, Efreet_Desktop *ef, const char *prev_path, const char *key); @@ -341,6 +344,7 @@ } fwins = evas_list_append(fwins, fwin); e_win_delete_callback_set(fwin->win, _e_fwin_cb_delete); + e_win_move_callback_set(fwin->win, _e_fwin_cb_move); e_win_resize_callback_set(fwin->win, _e_fwin_cb_resize); fwin->win->data = fwin; @@ -443,6 +447,7 @@ _e_fwin_free(E_Fwin *fwin) { if (!fwin) return; //safety + if (fwin->fm_obj) evas_object_del(fwin->fm_obj); if (fwin->tbar) e_object_del(E_OBJECT(fwin->tbar)); if (fwin->scrollframe_obj) evas_object_del(fwin->scrollframe_obj); @@ -483,6 +488,38 @@ } static void +_e_fwin_geom_save(E_Fwin *fwin) +{ + char buf[PATH_MAX]; + E_Fm2_Custom_File *cf; + + if (!fwin->geom_save_ready) return; + snprintf(buf, sizeof(buf), "dir::%s", e_fm2_real_path_get(fwin->fm_obj)); + cf = e_fm2_custom_file_get(buf); + if (!cf) + { + cf = alloca(sizeof(E_Fm2_Custom_File)); + memset(cf, 0, sizeof(E_Fm2_Custom_File)); + } + cf->geom.x = fwin->win->x - fwin->win->border->client_inset.l; + cf->geom.y = fwin->win->y - fwin->win->border->client_inset.t; + cf->geom.w = fwin->win->w; + cf->geom.h = fwin->win->h; + cf->geom.valid = 1; + e_fm2_custom_file_set(buf, cf); +} + +static void +_e_fwin_cb_move(E_Win *win) +{ + E_Fwin *fwin; + + if (!win) return; //safety + fwin = win->data; + _e_fwin_geom_save(fwin); +} + +static void _e_fwin_cb_resize(E_Win *win) { E_Fwin *fwin; @@ -505,6 +542,7 @@ } else if (fwin->zone) evas_object_resize(fwin->scrollframe_obj, fwin->zone->w, fwin->zone->h); + _e_fwin_geom_save(fwin); } static void @@ -1129,13 +1167,14 @@ { Evas_Object *oic; const char *itype = NULL; - int ix, iy, iw, ih, nx, ny; + int ix, iy, iw, ih, nx, ny, nw, nh; oic = e_fm2_icon_get(evas_object_evas_get(fwin->fm_obj), ici->ic, NULL, NULL, 0, &itype); if (oic) { const char *file = NULL, *group = NULL; + E_Fm2_Custom_File *cf; if (fwin2->win->border->internal_icon) evas_stringshare_del(fwin2->win->border->internal_icon); @@ -1163,18 +1202,74 @@ evas_stringshare_add(file); } evas_object_del(oic); - - /* Move spawned window */ - e_fm2_icon_geometry_get(ici->ic, &ix, &iy, &iw, &ih); - nx = ((ix + iw) / 2); - ny = ((iy + ih) / 2); - if (fwin->win) + + snprintf(buf, sizeof(buf), "dir::%s", + e_fm2_real_path_get(fwin2->fm_obj)); + cf = e_fm2_custom_file_get(buf); + if ((cf) && (cf->geom.valid)) { - nx += fwin->win->x; - ny += fwin->win->y; + nx = cf->geom.x; + ny = cf->geom.y; + nw = cf->geom.w; + nh = cf->geom.h; + /* if it ended up too small - fix to a decent size */ + if (nw < 24) nw = 200; + if (nh < 24) nh = 280; + printf("load @ %i %i, %ix%i inset %i %i\n", + nx, ny, nw, nh, + fwin2->win->border->client_inset.l, + fwin2->win->border->client_inset.t); + /* if it ended up out of the zone */ + if (nx < fwin2->win->border->zone->x) + nx = fwin2->win->border->zone->x + + fwin2->win->border->client_inset.l; + if (ny < fwin2->win->border->zone->y) + ny = fwin2->win->border->zone->y + + fwin2->win->border->client_inset.t; + if ((fwin2->win->border->zone->x + + fwin2->win->border->zone->w) < + (fwin2->win->border->w + nx)) + nx = fwin2->win->border->zone->x + + fwin2->win->border->zone->w - + fwin2->win->border->w - + fwin2->win->border->client_inset.l; + if ((fwin2->win->border->zone->y + + fwin2->win->border->zone->h) < + (fwin2->win->border->h + ny)) + ny = fwin2->win->border->zone->y + + fwin2->win->border->zone->h - + fwin2->win->border->h - + fwin2->win->border->client_inset.t; + e_win_move_resize + (fwin2->win, + nx - fwin2->win->border->client_inset.l, + ny - fwin2->win->border->client_inset.t, + nw, nh); } - e_win_move(fwin2->win, nx, ny); + else + { + /* No custom info, so just put window near icon */ + e_fm2_icon_geometry_get(ici->ic, &ix, &iy, &iw, &ih); + nx = (ix + (iw / 2)); + ny = (iy + (ih / 2)); + if (fwin->win) + { + nx += fwin->win->x; + ny += fwin->win->y; + } + /* iff going out of zone - adjust to be in */ + if ((fwin2->win->border->zone->x + + fwin2->win->border->zone->w) < + (fwin2->win->border->w + nx)) + nx -= fwin2->win->border->w; + if ((fwin2->win->border->zone->y + + fwin2->win->border->zone->h) < + (fwin2->win->border->h + ny)) + ny -= fwin2->win->border->h; + e_win_move(fwin2->win, nx, ny); + } } + fwin2->geom_save_ready = 1; if (ici->label) e_win_title_set(fwin2->win, ici->label); else if (ici->file) |
From: Enlightenment S. <no-...@en...> - 2010-12-13 07:29:30
|
Log: fix valgrind complaint on accessing freed mem. it was right. Author: raster Date: 2010-12-12 23:29:23 -0800 (Sun, 12 Dec 2010) New Revision: 55532 Trac: http://trac.enlightenment.org/e/changeset/55532 Modified: trunk/e/src/modules/fileman/e_fwin.c Modified: trunk/e/src/modules/fileman/e_fwin.c =================================================================== --- trunk/e/src/modules/fileman/e_fwin.c 2010-12-13 07:26:21 UTC (rev 55531) +++ trunk/e/src/modules/fileman/e_fwin.c 2010-12-13 07:29:23 UTC (rev 55532) @@ -277,10 +277,10 @@ void e_fwin_zone_shutdown(E_Zone *zone) { - Eina_List *f; + Eina_List *f, *fn; E_Fwin *win; - EINA_LIST_FOREACH(fwins, f, win) + EINA_LIST_FOREACH_SAFE(fwins, f, fn, win) { if (win->zone != zone) continue; e_object_del(E_OBJECT(win)); |
From: Enlightenment S. <no-...@en...> - 2011-02-16 03:46:05
|
Log: no - disco-stu... that was not the right fix.. this is the right fix for whatever segv u were seeing (page invalid ptr). Author: raster Date: 2011-02-15 19:45:57 -0800 (Tue, 15 Feb 2011) New Revision: 57072 Trac: http://trac.enlightenment.org/e/changeset/57072 Modified: trunk/e/src/modules/fileman/e_fwin.c Modified: trunk/e/src/modules/fileman/e_fwin.c =================================================================== --- trunk/e/src/modules/fileman/e_fwin.c 2011-02-15 21:39:01 UTC (rev 57071) +++ trunk/e/src/modules/fileman/e_fwin.c 2011-02-16 03:45:57 UTC (rev 57072) @@ -178,7 +178,8 @@ Evas_Coord *w, Evas_Coord *h); static void _e_fwin_pan_scroll_update(E_Fwin_Page *page); - +static void _e_fwin_cb_page_obj_del(void *data, Evas *evas, + Evas_Object *obj, void *event_info); static void _e_fwin_zone_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, @@ -291,6 +292,8 @@ _e_fwin_selected, page); evas_object_smart_callback_add(o, "selection_change", _e_fwin_selection_change, page); + evas_object_event_callback_add(o, EVAS_CALLBACK_DEL, + _e_fwin_cb_page_obj_del, page); e_fm2_icon_menu_start_extend_callback_set(o, _e_fwin_cb_menu_extend_start, page); e_fm2_icon_menu_end_extend_callback_set(o, _e_fwin_menu_extend, page); e_fm2_underlay_hide(o); @@ -556,6 +559,8 @@ _e_fwin_selected, page); evas_object_smart_callback_add(o, "selection_change", _e_fwin_selection_change, page); + evas_object_event_callback_add(o, EVAS_CALLBACK_DEL, + _e_fwin_cb_page_obj_del, page); e_fm2_icon_menu_start_extend_callback_set(o, _e_fwin_cb_menu_extend_start, page); e_fm2_icon_menu_end_extend_callback_set(o, _e_fwin_menu_extend, page); e_fm2_window_object_set(o, E_OBJECT(fwin->win)); @@ -1225,7 +1230,6 @@ page = data; fwin = page->fwin; if (!fwin) return; //safety - EINA_SAFETY_ON_NULL_RETURN(fwin->cur_page); /* FIXME: first look in E config for a special override for this dir's bg * or overlay @@ -1484,6 +1488,28 @@ } } +static void +_e_fwin_cb_page_obj_del(void *data, + Evas *evas __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) +{ + E_Fwin_Page *page; + + page = data; + printf("------ page obj del %p %p\n", page, page->fm_obj); + evas_object_smart_callback_del(page->fm_obj, "dir_changed", + _e_fwin_changed); + evas_object_smart_callback_del(page->fm_obj, "dir_deleted", + _e_fwin_deleted); + evas_object_smart_callback_del(page->fm_obj, "selected", + _e_fwin_selected); + evas_object_smart_callback_del(page->fm_obj, "selection_change", + _e_fwin_selection_change); + evas_object_event_callback_del(page->fm_obj, EVAS_CALLBACK_DEL, + _e_fwin_cb_page_obj_del); +} + /* fwin zone callbacks */ static void _e_fwin_zone_cb_mouse_down(void *data, |
From: Enlightenment S. <no-...@en...> - 2011-02-16 03:46:34
|
Log: formatting. Author: raster Date: 2011-02-15 19:46:27 -0800 (Tue, 15 Feb 2011) New Revision: 57073 Trac: http://trac.enlightenment.org/e/changeset/57073 Modified: trunk/e/src/modules/fileman/e_fwin.c Modified: trunk/e/src/modules/fileman/e_fwin.c =================================================================== --- trunk/e/src/modules/fileman/e_fwin.c 2011-02-16 03:45:57 UTC (rev 57072) +++ trunk/e/src/modules/fileman/e_fwin.c 2011-02-16 03:46:27 UTC (rev 57073) @@ -1246,13 +1246,12 @@ } else { - #define RELEASE_STR(x) if (x) { eina_stringshare_del(x); (x) = NULL; \ - } +#define RELEASE_STR(x) if (x) {eina_stringshare_del(x); (x) = NULL;} RELEASE_STR(fwin->wallpaper_file); RELEASE_STR(fwin->overlay_file); RELEASE_STR(fwin->scrollframe_file); RELEASE_STR(fwin->theme_file); - #undef RELEASE_STR +#undef RELEASE_STR } if (fwin->under_obj) { |
From: Enlightenment S. <no-...@en...> - 2011-06-25 06:16:45
|
Log: use efreet dirs for finding mime globs files. Author: raster Date: 2011-06-24 23:16:38 -0700 (Fri, 24 Jun 2011) New Revision: 60671 Trac: http://trac.enlightenment.org/e/changeset/60671 Modified: trunk/e/src/modules/fileman/e_int_config_mime.c Modified: trunk/e/src/modules/fileman/e_int_config_mime.c =================================================================== --- trunk/e/src/modules/fileman/e_int_config_mime.c 2011-06-25 04:50:43 UTC (rev 60670) +++ trunk/e/src/modules/fileman/e_int_config_mime.c 2011-06-25 06:16:38 UTC (rev 60671) @@ -78,38 +78,31 @@ static void _fill_data(E_Config_Dialog_Data *cfdata) { - const char *homedir; + const char *s, *homedir; + Eina_List *l; char buf[4096]; if (!cfdata) return; homedir = e_user_homedir_get(); snprintf(buf, sizeof(buf), "/usr/local/etc/mime.types"); - if (ecore_file_exists(buf)) - _load_mimes(cfdata, buf); - + if (ecore_file_exists(buf)) _load_mimes(cfdata, buf); snprintf(buf, sizeof(buf), "/etc/mime.types"); - if (ecore_file_exists(buf)) - _load_mimes(cfdata, buf); + if (ecore_file_exists(buf)) _load_mimes(cfdata, buf); - snprintf(buf, sizeof(buf), "/usr/local/share/mime/globs"); - if (ecore_file_exists(buf)) - _load_globs(cfdata, buf); - - snprintf(buf, sizeof(buf), "/usr/share/mime/globs"); - if (ecore_file_exists(buf)) - _load_globs(cfdata, buf); - + EINA_LIST_FOREACH(efreet_config_dirs_get(), l, s) + { + snprintf(buf, sizeof(buf), "%s/mime/globs", s); + if (ecore_file_exists(buf)) _load_globs(cfdata, buf); + } + snprintf(buf, sizeof(buf), "%s/.mime.types", homedir); - if (ecore_file_exists(buf)) - _load_mimes(cfdata, buf); - - snprintf(buf, sizeof(buf), "%s/.local/share/mime/globs", homedir); - if (ecore_file_exists(buf)) - _load_globs(cfdata, buf); - + if (ecore_file_exists(buf)) _load_mimes(cfdata, buf); + + snprintf(buf, sizeof(buf), "%s/mime/globs", efreet_data_home_get()); + if (ecore_file_exists(buf)) _load_globs(cfdata, buf); + cfdata->mimes = eina_list_sort(cfdata->mimes, 0, _sort_mimes); - _fill_types(cfdata); } |
From: Enlightenment S. <no-...@en...> - 2011-06-25 09:32:29
|
Log: dont dup mimetypes! no it didnt work. Author: raster Date: 2011-06-25 02:32:22 -0700 (Sat, 25 Jun 2011) New Revision: 60676 Trac: http://trac.enlightenment.org/e/changeset/60676 Modified: trunk/e/src/modules/fileman/e_int_config_mime.c Modified: trunk/e/src/modules/fileman/e_int_config_mime.c =================================================================== --- trunk/e/src/modules/fileman/e_int_config_mime.c 2011-06-25 09:07:55 UTC (rev 60675) +++ trunk/e/src/modules/fileman/e_int_config_mime.c 2011-06-25 09:32:22 UTC (rev 60676) @@ -336,7 +336,17 @@ cfdata->mimes = eina_list_append(cfdata->mimes, mime); } } - } + else + { + glob = _find_glob(mime, ext); + if (!glob) + { + glob = E_NEW(Config_Glob, 1); + glob->name = eina_stringshare_add(ext); + mime->globs = eina_list_append(mime->globs, glob); + } + } + } } while ((*p != '\n') && (*p != 0)); } @@ -486,36 +496,14 @@ _find_mime(E_Config_Dialog_Data *cfdata, char *mime) { Config_Mime *cm; - const char *tmp; Eina_List *l; - + if (!cfdata) return NULL; - - if (eina_list_count(cfdata->mimes) > 10) + EINA_LIST_FOREACH(cfdata->mimes, l, cm) { - tmp = eina_stringshare_add(mime); - - EINA_LIST_FOREACH(cfdata->mimes, l, cm) - { - if (!cm) continue; - if (cm->mime != mime) continue; - - eina_stringshare_del(tmp); - return cm; - } - - eina_stringshare_del(tmp); + if (!cm) continue; + if (!strcmp(cm->mime, mime)) return cm; } - else - { - EINA_LIST_FOREACH(cfdata->mimes, l, cm) - { - if (!cm) continue; - if (strcmp(cm->mime, mime)) continue; - return cm; - } - } - return NULL; } |
From: Enlightenment S. <no-...@en...> - 2011-11-25 08:27:26
|
Log: fix efm nav bar alignment of path bar. Author: raster Date: 2011-11-25 00:27:19 -0800 (Fri, 25 Nov 2011) New Revision: 65595 Trac: http://trac.enlightenment.org/e/changeset/65595 Modified: trunk/e/src/modules/fileman/e_fwin_nav.c Modified: trunk/e/src/modules/fileman/e_fwin_nav.c =================================================================== --- trunk/e/src/modules/fileman/e_fwin_nav.c 2011-11-25 08:07:12 UTC (rev 65594) +++ trunk/e/src/modules/fileman/e_fwin_nav.c 2011-11-25 08:27:19 UTC (rev 65595) @@ -39,6 +39,7 @@ static void _cb_changed(void *data, Evas_Object *obj, void *event_info); static void _cb_dir_changed(void *data, Evas_Object *obj, void *event_info); static void _cb_button_click(void *data, Evas_Object *obj, const char *emission, const char *source); +static void _cb_scroll_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); static void _box_button_append(Instance *inst, const char *label, void (*func)(void *data, Evas_Object *obj, const char *emission, const char *source)); static Eina_List *instances = NULL; @@ -153,6 +154,9 @@ e_scrollframe_child_set(inst->o_scroll, inst->o_box); evas_object_show(inst->o_box); + evas_object_event_callback_add(inst->o_scroll, EVAS_CALLBACK_RESIZE, + _cb_scroll_resize, inst); + edje_object_part_swallow(inst->o_base, "e.swallow.pathbar", inst->o_scroll); inst->gcc = e_gadcon_client_new(gc, name, id, style, inst->o_base); @@ -423,6 +427,17 @@ } static void +_cb_scroll_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +{ + Instance *inst = data; + Evas_Coord mw = 0, mh = 0; + + evas_object_geometry_get(inst->o_box, NULL, NULL, &mw, NULL); + evas_object_geometry_get(inst->o_scroll, NULL, NULL, NULL, &mh); + evas_object_resize(inst->o_box, mw, mh); +} + +static void _box_button_append(Instance *inst, const char *label, void (*func)(void *data, Evas_Object *obj, const char *emission, const char *source)) { Evas_Object *o; |
From: Enlightenment S. <no-...@en...> - 2012-05-03 12:26:52
|
Log: oh make custom bg/overlays etc. work again in efm. i know e_icon was being used - not quite right as per before. need to look into this. mental note. Author: raster Date: 2012-05-03 05:13:34 -0700 (Thu, 03 May 2012) New Revision: 70695 Trac: http://trac.enlightenment.org/e/changeset/70695 Modified: trunk/e/src/modules/fileman/e_fwin.c Modified: trunk/e/src/modules/fileman/e_fwin.c =================================================================== --- trunk/e/src/modules/fileman/e_fwin.c 2012-05-03 11:02:35 UTC (rev 70694) +++ trunk/e/src/modules/fileman/e_fwin.c 2012-05-03 12:13:34 UTC (rev 70695) @@ -470,16 +470,18 @@ fwin->pages = eina_list_append(fwin->pages, page); fwin->cur_page = page; - o = e_icon_add(e_win_evas_get(fwin->win)); - e_icon_scale_size_set(o, 0); - e_icon_fill_inside_set(o, 0); + o = edje_object_add(fwin->win->evas); +// o = e_icon_add(e_win_evas_get(fwin->win)); +// e_icon_scale_size_set(o, 0); +// e_icon_fill_inside_set(o, 0); edje_object_part_swallow(fwin->bg_obj, "e.swallow.bg", o); evas_object_pass_events_set(o, 1); fwin->under_obj = o; - o = e_icon_add(e_win_evas_get(fwin->win)); - e_icon_scale_size_set(o, 0); - e_icon_fill_inside_set(o, 0); + o = edje_object_add(fwin->win->evas); +// o = e_icon_add(e_win_evas_get(fwin->win)); +// e_icon_scale_size_set(o, 0); +// e_icon_fill_inside_set(o, 0); edje_object_part_swallow(e_scrollframe_edje_object_get(page->scrollframe_obj), "e.swallow.overlay", o); evas_object_pass_events_set(o, 1); fwin->over_obj = o; @@ -606,6 +608,7 @@ _e_fwin_pan_child_size_get); evas_object_propagate_events_set(page->fm_obj, 0); page->scrollframe_obj = o; +// edje_object_part_swallow(fwin->bg_obj, "e.swallow.content", o); evas_object_move(o, 0, 0); evas_object_show(o); @@ -1251,12 +1254,14 @@ */ snprintf(buf, sizeof(buf), "%s/.directory.desktop", e_fm2_real_path_get(page->fm_obj)); ef = efreet_desktop_new(buf); + printf("EF=%p for %s\n", ef, buf); if (ef) { fwin->wallpaper_file = _e_fwin_custom_file_path_eval(fwin, ef, fwin->wallpaper_file, "X-Enlightenment-Directory-Wallpaper"); fwin->overlay_file = _e_fwin_custom_file_path_eval(fwin, ef, fwin->overlay_file, "X-Enlightenment-Directory-Overlay"); fwin->scrollframe_file = _e_fwin_custom_file_path_eval(fwin, ef, fwin->scrollframe_file, "X-Enlightenment-Directory-Scrollframe"); fwin->theme_file = _e_fwin_custom_file_path_eval(fwin, ef, fwin->theme_file, "X-Enlightenment-Directory-Theme"); + printf("fwin->wallpaper_file = %s\n", fwin->wallpaper_file); efreet_desktop_free(ef); } else @@ -1273,29 +1278,32 @@ evas_object_hide(fwin->under_obj); if (fwin->wallpaper_file) { - ext = strrchr(fwin->wallpaper_file, '.'); - if (ext && !strcasecmp(ext, ".edj")) - e_icon_file_edje_set(fwin->under_obj, fwin->wallpaper_file, "e/desktop/background"); - else - e_icon_file_set(fwin->under_obj, fwin->wallpaper_file); + edje_object_file_set(fwin->under_obj, fwin->wallpaper_file, "e/desktop/background"); +// ext = strrchr(fwin->wallpaper_file, '.'); +// if (ext && !strcasecmp(ext, ".edj")) +// e_icon_file_edje_set(fwin->under_obj, fwin->wallpaper_file, "e/desktop/background"); +// else +// e_icon_file_set(fwin->under_obj, fwin->wallpaper_file); } - else - e_icon_file_edje_set(fwin->under_obj, NULL, NULL); +// else +// e_icon_file_edje_set(fwin->under_obj, NULL, NULL); evas_object_show(fwin->under_obj); } if (fwin->over_obj) { + printf("over obj\n"); evas_object_hide(fwin->over_obj); if (fwin->overlay_file) { - ext = strrchr(fwin->overlay_file, '.'); - if (ext && !strcasecmp(ext, ".edj")) - e_icon_file_edje_set(fwin->over_obj, fwin->overlay_file, "e/desktop/background"); - else - e_icon_file_set(fwin->over_obj, fwin->overlay_file); + edje_object_file_set(fwin->over_obj, fwin->overlay_file, "e/desktop/background"); +// ext = strrchr(fwin->overlay_file, '.'); +// if (ext && !strcasecmp(ext, ".edj")) +// e_icon_file_edje_set(fwin->over_obj, fwin->overlay_file, "e/desktop/background"); +// else +// e_icon_file_set(fwin->over_obj, fwin->overlay_file); } - else - e_icon_file_edje_set(fwin->over_obj, NULL, NULL); +// else +// e_icon_file_edje_set(fwin->over_obj, NULL, NULL); evas_object_show(fwin->over_obj); } if (page->scrollframe_obj) |
From: Enlightenment S. <no-...@en...> - 2012-08-23 06:54:00
|
Log: if up opening of .sh (executable things) in editors in efm. Author: raster Date: 2012-08-22 23:53:53 -0700 (Wed, 22 Aug 2012) New Revision: 75594 Trac: http://trac.enlightenment.org/e/changeset/75594 Modified: trunk/e/src/modules/fileman/e_fwin.c Modified: trunk/e/src/modules/fileman/e_fwin.c =================================================================== --- trunk/e/src/modules/fileman/e_fwin.c 2012-08-23 06:49:54 UTC (rev 75593) +++ trunk/e/src/modules/fileman/e_fwin.c 2012-08-23 06:53:53 UTC (rev 75594) @@ -1091,7 +1091,7 @@ */ buf[0] = 0; ext = _e_fwin_file_is_exec(ici); - if (ext == E_FWIN_EXEC_NONE) + if ((ext == E_FWIN_EXEC_NONE) || (desktop)) { if (!((ici->link) && (ici->mount))) eina_strlcpy(buf, ici->file, sizeof(buf)); @@ -1215,25 +1215,25 @@ case E_FWIN_EXEC_SH: snprintf(buf, sizeof(buf), "/bin/sh %s", e_util_filename_escape(ici->file)); if (fwin->win) - e_exec(fwin->win->border->zone, NULL, buf, NULL, NULL); + e_exec(fwin->win->border->zone, NULL, buf, NULL, "fwin"); else if (fwin->zone) - e_exec(fwin->zone, NULL, buf, NULL, NULL); + e_exec(fwin->zone, NULL, buf, NULL, "fwin"); break; case E_FWIN_EXEC_TERMINAL_DIRECT: snprintf(buf, sizeof(buf), "%s %s", e_config->exebuf_term_cmd, e_util_filename_escape(ici->file)); if (fwin->win) - e_exec(fwin->win->border->zone, NULL, buf, NULL, NULL); + e_exec(fwin->win->border->zone, NULL, buf, NULL, "fwin"); else if (fwin->zone) - e_exec(fwin->zone, NULL, buf, NULL, NULL); + e_exec(fwin->zone, NULL, buf, NULL, "fwin"); break; case E_FWIN_EXEC_TERMINAL_SH: snprintf(buf, sizeof(buf), "%s /bin/sh %s", e_config->exebuf_term_cmd, e_util_filename_escape(ici->file)); if (fwin->win) - e_exec(fwin->win->border->zone, NULL, buf, NULL, NULL); + e_exec(fwin->win->border->zone, NULL, buf, NULL, "fwin"); else if (fwin->zone) - e_exec(fwin->zone, NULL, buf, NULL, NULL); + e_exec(fwin->zone, NULL, buf, NULL, "fwin"); break; case E_FWIN_EXEC_DESKTOP: @@ -1242,9 +1242,9 @@ if (desktop) { if (fwin->win) - e_exec(fwin->win->border->zone, desktop, NULL, NULL, NULL); + e_exec(fwin->win->border->zone, desktop, NULL, NULL, "fwin"); else if (fwin->zone) - e_exec(fwin->zone, desktop, NULL, NULL, NULL); + e_exec(fwin->zone, desktop, NULL, NULL, "fwin"); e_exehist_mime_desktop_add(ici->mime, desktop); efreet_desktop_free(desktop); } |
From: Enlightenment S. <no-...@en...> - 2012-09-13 00:31:04
|
Log: disable saving of desktop path until such a time as it isnt broken in multiple ways :) Author: raster Date: 2012-09-12 17:30:57 -0700 (Wed, 12 Sep 2012) New Revision: 76566 Trac: http://trac.enlightenment.org/e/changeset/76566 Modified: trunk/e/src/modules/fileman/e_fwin.c Modified: trunk/e/src/modules/fileman/e_fwin.c =================================================================== --- trunk/e/src/modules/fileman/e_fwin.c 2012-09-12 21:59:23 UTC (rev 76565) +++ trunk/e/src/modules/fileman/e_fwin.c 2012-09-13 00:30:57 UTC (rev 76566) @@ -459,7 +459,13 @@ if (e_fwin_zone_find(zone)) continue; if ((zone->container->num == 0) && (zone->num == 0) && (fileman_config->view.show_desktop_icons)) - e_fwin_zone_new(zone, fileman_config->dev, fileman_config->path); + { +// disable until such a day as this handles both screens properly! +// if ((fileman_config->dev) && (fileman_config->path)) +// e_fwin_zone_new(zone, fileman_config->dev, fileman_config->path); +// else + e_fwin_zone_new(zone, "desktop", "/"); + } else { char buf[256]; |
From: Enlightenment S. <no-...@en...> - 2012-09-13 00:41:37
|
Log: fix morning discomfitor b0rks. Author: raster Date: 2012-09-12 17:41:30 -0700 (Wed, 12 Sep 2012) New Revision: 76567 Trac: http://trac.enlightenment.org/e/changeset/76567 Modified: trunk/e/src/modules/fileman/e_fwin.c trunk/e/src/modules/fileman/e_mod_main.c Modified: trunk/e/src/modules/fileman/e_fwin.c =================================================================== --- trunk/e/src/modules/fileman/e_fwin.c 2012-09-13 00:30:57 UTC (rev 76566) +++ trunk/e/src/modules/fileman/e_fwin.c 2012-09-13 00:41:30 UTC (rev 76567) @@ -460,11 +460,7 @@ if ((zone->container->num == 0) && (zone->num == 0) && (fileman_config->view.show_desktop_icons)) { -// disable until such a day as this handles both screens properly! -// if ((fileman_config->dev) && (fileman_config->path)) -// e_fwin_zone_new(zone, fileman_config->dev, fileman_config->path); -// else - e_fwin_zone_new(zone, "desktop", "/"); + e_fwin_zone_new(zone, "desktop", "/"); } else { Modified: trunk/e/src/modules/fileman/e_mod_main.c =================================================================== --- trunk/e/src/modules/fileman/e_mod_main.c 2012-09-13 00:30:57 UTC (rev 76566) +++ trunk/e/src/modules/fileman/e_mod_main.c 2012-09-13 00:41:30 UTC (rev 76567) @@ -93,7 +93,13 @@ if (e_fwin_zone_find(zone)) continue; if ((zone->container->num == 0) && (zone->num == 0) && (fileman_config->view.show_desktop_icons)) - e_fwin_zone_new(zone, fileman_config->dev, fileman_config->path); + { +// disable until such a day as this handles both screens properly! +// if ((fileman_config->dev) && (fileman_config->path)) +// e_fwin_zone_new(zone, fileman_config->dev, fileman_config->path); +// else + e_fwin_zone_new(zone, "desktop", "/"); + } else { char buf[256]; |
From: Enlightenment S. <no-...@en...> - 2012-09-13 00:43:33
|
Log: make it the exact same disable comment too. Author: raster Date: 2012-09-12 17:43:26 -0700 (Wed, 12 Sep 2012) New Revision: 76568 Trac: http://trac.enlightenment.org/e/changeset/76568 Modified: trunk/e/src/modules/fileman/e_fwin.c Modified: trunk/e/src/modules/fileman/e_fwin.c =================================================================== --- trunk/e/src/modules/fileman/e_fwin.c 2012-09-13 00:41:30 UTC (rev 76567) +++ trunk/e/src/modules/fileman/e_fwin.c 2012-09-13 00:43:26 UTC (rev 76568) @@ -460,6 +460,10 @@ if ((zone->container->num == 0) && (zone->num == 0) && (fileman_config->view.show_desktop_icons)) { +// disable until such a day as this handles both screens properly! +// if ((fileman_config->dev) && (fileman_config->path)) +// e_fwin_zone_new(zone, fileman_config->dev, fileman_config->path); +// else e_fwin_zone_new(zone, "desktop", "/"); } else |
From: Enlightenment S. <no-...@en...> - 2012-09-17 10:33:50
|
Log: fix executing executables directly in efm. Author: raster Date: 2012-09-17 03:33:42 -0700 (Mon, 17 Sep 2012) New Revision: 76753 Trac: http://trac.enlightenment.org/e/changeset/76753 Modified: trunk/e/src/modules/fileman/e_fwin.c Modified: trunk/e/src/modules/fileman/e_fwin.c =================================================================== --- trunk/e/src/modules/fileman/e_fwin.c 2012-09-17 10:12:48 UTC (rev 76752) +++ trunk/e/src/modules/fileman/e_fwin.c 2012-09-17 10:33:42 UTC (rev 76753) @@ -1281,6 +1281,7 @@ (!strcmp(ici->mime, "application/x-csh")) || (!strcmp(ici->mime, "application/x-perl")) || (!strcmp(ici->mime, "application/x-shar")) || + (!strcmp(ici->mime, "application/x-executable")) || (!strcmp(ici->mime, "text/x-csh")) || (!strcmp(ici->mime, "text/x-python")) || (!strcmp(ici->mime, "text/x-sh")) |
From: Enlightenment S. <no-...@en...> - 2012-10-31 09:37:31
|
Log: improve file op list so it can.. do more. Author: raster Date: 2012-10-31 02:37:21 -0700 (Wed, 31 Oct 2012) New Revision: 78696 Trac: http://trac.enlightenment.org/e/changeset/78696 Modified: trunk/e/src/modules/fileman/e_fwin.c Modified: trunk/e/src/modules/fileman/e_fwin.c =================================================================== --- trunk/e/src/modules/fileman/e_fwin.c 2012-10-31 09:28:32 UTC (rev 78695) +++ trunk/e/src/modules/fileman/e_fwin.c 2012-10-31 09:37:21 UTC (rev 78696) @@ -2893,16 +2893,11 @@ char buf[4096]; char *total; int mw, mh; - + Edje_Message_Float msg; + // Don't show if the operation keep less than 1 second if (ere->start_time + 1.0 > ecore_loop_time_get()) return; - // Update element - edje_object_part_drag_size_set(o, "e.gauge.bar", ((double)(ere->percent)) / 100, 1.0); - edje_object_size_min_get(o, &mw, &mh); - evas_object_resize(o, mw * e_scale, mh * e_scale); - evas_object_show(o); - // Update icon switch (ere->op) { @@ -2981,6 +2976,39 @@ edje_object_signal_emit(o, "e,action,set,need_attention", "e"); else edje_object_signal_emit(o, "e,action,set,normal", "e"); + + if ((ere->finished) || (ere->status == E_FM2_OP_STATUS_ABORTED)) + { + if (!evas_object_data_get(o, "stopped")) + { + evas_object_data_set(o, "stopped", o); + edje_object_signal_emit(o, "e,state,busy,stop", "e"); + } + } + if (ere->percent > 0) + { + if (!evas_object_data_get(o, "started")) + { + evas_object_data_set(o, "started", o); + edje_object_signal_emit(o, "e,state,busy,start", "e"); + } + } + + // Update element + edje_object_part_drag_size_set(o, "e.gauge.bar", + ((double)(ere->percent)) / 100.0, 1.0); + msg.val = ((double)(ere->percent)) / 100.0; + edje_object_message_send(o, EDJE_MESSAGE_FLOAT, 1, &msg); + edje_object_size_min_get(o, &mw, &mh); + if ((mw == 0) || (mh == 0)) + edje_object_size_min_calc(o, &mw, &mh); + else + { + mw *= e_scale; + mh *= e_scale; + } + evas_object_resize(o, mw, mh); + evas_object_show(o); } static void |
From: Enlightenment S. <no-...@en...> - 2012-11-01 06:37:03
|
Log: double ensure that tb signal emit happens. Author: raster Date: 2012-10-31 23:36:57 -0700 (Wed, 31 Oct 2012) New Revision: 78745 Trac: http://trac.enlightenment.org/e/changeset/78745 Modified: trunk/e/src/modules/fileman/e_fwin.c Modified: trunk/e/src/modules/fileman/e_fwin.c =================================================================== --- trunk/e/src/modules/fileman/e_fwin.c 2012-11-01 06:32:07 UTC (rev 78744) +++ trunk/e/src/modules/fileman/e_fwin.c 2012-11-01 06:36:57 UTC (rev 78745) @@ -581,6 +581,7 @@ } _e_fwin_window_title_set(fwin->cur_page); _e_fwin_cb_resize(fwin->win); + _e_fwin_toolbar_resize(fwin->cur_page); } } |