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

All fileselector cases (mixing save, folder only, expand) seem OK, now. 

SVN revision: 55378
This commit is contained in:
Gustavo Lima Chaves 2010-12-08 16:18:37 +00:00
parent b667ede566
commit fb9a4e36f9
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
legacy/elementary/src/lib/elc_fileselector.c
View File

@ -259,23 +259,29 @@ _sel_do(void *data)
if (wd->expand) if (wd->expand)
{ {
_do_anchors(sd->fs, path); _do_anchors(sd->fs, path);
if (wd->filename_entry) elm_scrolled_entry_entry_set(wd->filename_entry, "");
elm_scrolled_entry_entry_set(wd->filename_entry, "");
} }
else else
{ {
// keep a ref to path 'couse it will be destroyed by _populate /* keep a ref to path 'couse it will be destroyed by _populate */
p = eina_stringshare_add(path); p = eina_stringshare_add(path);
_populate(sd->fs, p, NULL); _populate(sd->fs, p, NULL);
eina_stringshare_del(p); eina_stringshare_del(p);
} }
goto end; goto end;
} }
else else /* navigating through folders only or file is not a dir. */
{ {
if (wd->filename_entry) if (wd->expand) _do_anchors(sd->fs, path);
elm_scrolled_entry_entry_set(wd->filename_entry, else if (wd->only_folder)
ecore_file_file_get(path)); {
/* keep a ref to path 'couse it will be destroyed by _populate */
p = eina_stringshare_add(path);
_populate(sd->fs, p, NULL);
eina_stringshare_del(p);
}
elm_scrolled_entry_entry_set(wd->filename_entry,
ecore_file_file_get(path));
} }
evas_object_smart_callback_call(sd->fs, SIG_SELECTED, (void *)path); evas_object_smart_callback_call(sd->fs, SIG_SELECTED, (void *)path);
@ -303,7 +309,13 @@ _sel(void *data,
sd->fs = data; sd->fs = data;
sd->path = elm_genlist_item_data_get(event_info); sd->path = elm_genlist_item_data_get(event_info);
dir = ecore_file_dir_get(sd->path); if (!sd->path)
{
eina_stringshare_replace(&wd->path, "");
goto end;
}
dir = wd->only_folder ? strdup(sd->path) : ecore_file_dir_get(sd->path);
if (dir) if (dir)
{ {
eina_stringshare_replace(&wd->path, dir); eina_stringshare_replace(&wd->path, dir);
@ -314,6 +326,7 @@ _sel(void *data,
eina_stringshare_replace(&wd->path, ""); eina_stringshare_replace(&wd->path, "");
} }
end:
if (wd->sel_idler) if (wd->sel_idler)
{ {
old_sd = ecore_idler_del(wd->sel_idler); old_sd = ecore_idler_del(wd->sel_idler);
@ -656,6 +669,7 @@ elm_fileselector_folder_only_set(Evas_Object *obj,
if (!wd) return; if (!wd) return;
if (wd->only_folder == only) return; if (wd->only_folder == only) return;
wd->only_folder = !!only; wd->only_folder = !!only;
if (wd->path) _populate(obj, wd->path, NULL);
} }
/** /**
@ -764,6 +778,8 @@ elm_fileselector_expandable_set(Evas_Object *obj,
if (!wd) return; if (!wd) return;
wd->expand = !!expand; wd->expand = !!expand;
if (wd->path) _populate(obj, wd->path, NULL);
} }
/** /**
@ -838,7 +854,9 @@ elm_fileselector_selected_get(const Evas_Object *obj)
char buf[PATH_MAX]; char buf[PATH_MAX];
name = elm_scrolled_entry_entry_get(wd->filename_entry); name = elm_scrolled_entry_entry_get(wd->filename_entry);
snprintf(buf, sizeof(buf), "%s/%s", wd->path, name); snprintf(buf, sizeof(buf), "%s/%s",
wd->only_folder ? ecore_file_dir_get(wd->path) : wd->path,
name);
eina_stringshare_replace(&wd->selection, buf); eina_stringshare_replace(&wd->selection, buf);
return wd->selection; return wd->selection;
} }