Move the parent directory icon out of the gengrid. Next the directories will be moved out of the gengrid.
SVN revision: 54941
This commit is contained in:
parent
37e9d6c757
commit
d2a93f9e9e
|
@ -105,7 +105,6 @@ _populate_main(void *data, Eio_File *handler __UNUSED__, const Eina_File_Direct_
|
||||||
|
|
||||||
obj = dt->objs->data;
|
obj = dt->objs->data;
|
||||||
file = eina_stringshare_add(info->path);
|
file = eina_stringshare_add(info->path);
|
||||||
|
|
||||||
DBG("populate thumbnail %p with path '%s'", obj, file);
|
DBG("populate thumbnail %p with path '%s'", obj, file);
|
||||||
|
|
||||||
dt->objs = eina_list_remove_list(dt->objs, dt->objs);
|
dt->objs = eina_list_remove_list(dt->objs, dt->objs);
|
||||||
|
@ -136,6 +135,7 @@ ephoto_directory_thumb_add(Evas_Object *parent, Ephoto_Entry *entry)
|
||||||
}
|
}
|
||||||
|
|
||||||
obj = ephoto_thumb_add(entry->ephoto, parent, NULL);
|
obj = ephoto_thumb_add(entry->ephoto, parent, NULL);
|
||||||
|
evas_object_size_hint_max_set(obj, 32, 32);
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL);
|
||||||
|
|
||||||
if (!dt)
|
if (!dt)
|
||||||
|
|
|
@ -27,6 +27,7 @@ struct _Ephoto_Thumb_Browser
|
||||||
Elm_Toolbar_Item *zoom_out;
|
Elm_Toolbar_Item *zoom_out;
|
||||||
Elm_Toolbar_Item *view_flow;
|
Elm_Toolbar_Item *view_flow;
|
||||||
Elm_Toolbar_Item *slideshow;
|
Elm_Toolbar_Item *slideshow;
|
||||||
|
Elm_Toolbar_Item *parent;
|
||||||
} action;
|
} action;
|
||||||
struct {
|
struct {
|
||||||
Ecore_Animator *todo_items;
|
Ecore_Animator *todo_items;
|
||||||
|
@ -222,29 +223,6 @@ _entry_item_add(Ephoto_Thumb_Browser *tb, Ephoto_Entry *e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
_up_item_add_if_required(Ephoto_Thumb_Browser *tb)
|
|
||||||
{
|
|
||||||
Ephoto_Entry *entry;
|
|
||||||
char *parent_dir;
|
|
||||||
|
|
||||||
if ((elm_gengrid_first_item_get(tb->grid)) ||
|
|
||||||
(strcmp(tb->ephoto->config->directory, "/") == 0))
|
|
||||||
return;
|
|
||||||
|
|
||||||
parent_dir = ecore_file_dir_get(tb->ephoto->config->directory);
|
|
||||||
if (!parent_dir) return;
|
|
||||||
|
|
||||||
entry = ephoto_entry_new(tb->ephoto, parent_dir, PARENT_DIR);
|
|
||||||
free(parent_dir);
|
|
||||||
EINA_SAFETY_ON_NULL_RETURN(entry);
|
|
||||||
entry->is_up = EINA_TRUE;
|
|
||||||
entry->is_dir = EINA_TRUE;
|
|
||||||
entry->item = elm_gengrid_item_append
|
|
||||||
(tb->grid, &_ephoto_thumb_up_class, entry, NULL, NULL);
|
|
||||||
/* does not go into entries as it is always the first - no sort! */
|
|
||||||
}
|
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_todo_items_process(void *data)
|
_todo_items_process(void *data)
|
||||||
{
|
{
|
||||||
|
@ -255,8 +233,6 @@ _todo_items_process(void *data)
|
||||||
if ((tb->ls) && (eina_list_count(tb->todo_items) < TODO_ITEM_MIN_BATCH))
|
if ((tb->ls) && (eina_list_count(tb->todo_items) < TODO_ITEM_MIN_BATCH))
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
|
|
||||||
_up_item_add_if_required(tb);
|
|
||||||
|
|
||||||
tb->animator.todo_items = NULL;
|
tb->animator.todo_items = NULL;
|
||||||
|
|
||||||
EINA_LIST_FREE(tb->todo_items, entry)
|
EINA_LIST_FREE(tb->todo_items, entry)
|
||||||
|
@ -365,6 +341,18 @@ _slideshow(void *data, Evas_Object *o __UNUSED__, void *event_info __UNUSED__)
|
||||||
evas_object_smart_callback_call(tb->layout, "slideshow", entry);
|
evas_object_smart_callback_call(tb->layout, "slideshow", entry);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_parent_directory(void *data, Evas_Object *o __UNUSED__, void *event_info __UNUSED__)
|
||||||
|
{
|
||||||
|
Ephoto_Thumb_Browser *tb = data;
|
||||||
|
const char *parent_dir;
|
||||||
|
|
||||||
|
elm_toolbar_item_selected_set(tb->action.parent, EINA_FALSE);
|
||||||
|
parent_dir = ecore_file_dir_get(tb->ephoto->config->directory);
|
||||||
|
if (!parent_dir) return;
|
||||||
|
ephoto_directory_set(tb->ephoto, parent_dir);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_key_down(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event_info)
|
_key_down(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event_info)
|
||||||
{
|
{
|
||||||
|
@ -466,8 +454,6 @@ _ephoto_thumb_populate_end(void *data, int type __UNUSED__, void *event __UNUSED
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!tb->animator.todo_items) _up_item_add_if_required(tb);
|
|
||||||
|
|
||||||
edje_object_signal_emit(tb->edje, "populate,stop", "ephoto");
|
edje_object_signal_emit(tb->edje, "populate,stop", "ephoto");
|
||||||
|
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
|
@ -535,6 +521,8 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent)
|
||||||
elm_toolbar_mode_shrink_set(tb->toolbar, ELM_TOOLBAR_SHRINK_MENU);
|
elm_toolbar_mode_shrink_set(tb->toolbar, ELM_TOOLBAR_SHRINK_MENU);
|
||||||
elm_toolbar_menu_parent_set(tb->toolbar, parent);
|
elm_toolbar_menu_parent_set(tb->toolbar, parent);
|
||||||
|
|
||||||
|
tb->action.parent = _toolbar_item_add
|
||||||
|
(tb, "stock_up", "Parent", 150, _parent_directory);
|
||||||
tb->action.slideshow = _toolbar_item_add
|
tb->action.slideshow = _toolbar_item_add
|
||||||
(tb, "media-playback-start", "Slideshow", 100, _slideshow);
|
(tb, "media-playback-start", "Slideshow", 100, _slideshow);
|
||||||
tb->action.zoom_in = _toolbar_item_add
|
tb->action.zoom_in = _toolbar_item_add
|
||||||
|
|
Loading…
Reference in New Issue