enlightenment
/
ephoto
6
0
Fork 3
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Enter commit summary

Browse Source 
Ephoto: Formatting
And change details
Committed via EDI: Cool!
v-1.6.0
Stephen Houston 6 years ago
parent 223076607e
commit 2863d68423
13 changed files with 142 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/bin/ephoto.h
  2. 30
      src/bin/ephoto_color.c
  3. 12
      src/bin/ephoto_config.c
  4. 6
      src/bin/ephoto_cropper.c
  5. 25
      src/bin/ephoto_directory_browser.c
  6. 4
      src/bin/ephoto_editor.c
  7. 6
      src/bin/ephoto_ipc.c
  8. 9
      src/bin/ephoto_main.c
  9. 29
      src/bin/ephoto_single_browser.c
  10. 6
      src/bin/ephoto_slideshow.c
  11. 20
      src/bin/ephoto_thumb.c
  12. 45
      src/bin/ephoto_thumb_browser.c
  13. 3
      src/bin/ephoto_thumbnailer.c

20
src/bin/ephoto.h
Unescape View File

@ -51,7 +51,8 @@ void ephoto_thumb_size_set(Ephoto *ephoto, int size);
Evas_Object *ephoto_thumb_add(Ephoto *ephoto, Evas_Object *parent,
Ephoto_Entry *entry);
void ephoto_directory_set(Ephoto *ephoto, const char *path,
Elm_Object_Item *expanded, Eina_Bool dirs_only, Eina_Bool thumbs_only);
Elm_Object_Item *expanded, Eina_Bool dirs_only,
Eina_Bool thumbs_only);
void ephoto_show_folders(Ephoto *ephoto, Eina_Bool toggle);
/*config panel functions*/
@ -71,9 +72,14 @@ void ephoto_single_browser_path_pending_set(Evas_Object *obj,
void ephoto_single_browser_path_pending_unset(Evas_Object *obj);
void ephoto_single_browser_path_created(Evas_Object *obj, Ephoto_Entry *entry);
void ephoto_single_browser_image_data_update(Evas_Object *main,
Evas_Object *image, unsigned int *image_data, Evas_Coord w, Evas_Coord h);
Evas_Object *image,
unsigned int *image_data,
Evas_Coord w,
Evas_Coord h);
void ephoto_single_browser_image_data_done(Evas_Object *main,
unsigned int *image_data, Evas_Coord w, Evas_Coord h);
unsigned int *image_data,
Evas_Coord w,
Evas_Coord h);
void ephoto_single_browser_cancel_editing(Evas_Object *main);
void ephoto_single_browser_slideshow(Evas_Object *obj);
/* smart callbacks called: "back" - the user wants to go back to the previous
@ -331,9 +337,13 @@ Ephoto_Entry *ephoto_entry_new(Ephoto *ephoto, const char *path,
Eina_Bool ephoto_entry_exists(Ephoto *ephoto, const char *path);
void ephoto_entry_free(Ephoto *ephoto, Ephoto_Entry *entry);
void ephoto_entry_free_listener_add(Ephoto_Entry *entry,
void (*cb)(void *data, const Ephoto_Entry *entry), const void *data);
void (*cb)(void *data,
const Ephoto_Entry *entry),
const void *data);
void ephoto_entry_free_listener_del(Ephoto_Entry *entry,
void (*cb)(void *data, const Ephoto_Entry *entry), const void *data);
void (*cb)(void *data,
const Ephoto_Entry *entry),
const void *data);
void ephoto_entries_free(Ephoto *ephoto);
int ephoto_entries_cmp(const void *pa, const void *pb);

30
src/bin/ephoto_color.c
Unescape View File

@ -27,7 +27,8 @@ enum _Ephoto_Color_Adjust
};
unsigned int *
_ephoto_apply_color_adjustment(Ephoto_Color *eco, unsigned int *image_data, int adjust, Ephoto_Color_Adjust color)
_ephoto_apply_color_adjustment(Ephoto_Color *eco, unsigned int *image_data,
int adjust, Ephoto_Color_Adjust color)
{
unsigned int *im_data, *im_data_new, *p1, *p2;
Evas_Coord x, y;
@ -103,9 +104,12 @@ _red_slider_changed(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
unsigned int *image_data, *image_data_two;
red = elm_slider_value_get(obj);
image_data = _ephoto_apply_color_adjustment(eco, NULL, red, EPHOTO_COLOR_ADJUST_RED);
image_data_two = _ephoto_apply_color_adjustment(eco, image_data, eco->green, EPHOTO_COLOR_ADJUST_GREEN);
_ephoto_apply_color_adjustment(eco, image_data_two, eco->blue, EPHOTO_COLOR_ADJUST_BLUE);
image_data = _ephoto_apply_color_adjustment(eco, NULL, red,
EPHOTO_COLOR_ADJUST_RED);
image_data_two = _ephoto_apply_color_adjustment(eco, image_data, eco->green,
EPHOTO_COLOR_ADJUST_GREEN);
_ephoto_apply_color_adjustment(eco, image_data_two, eco->blue,
EPHOTO_COLOR_ADJUST_BLUE);
}
static void
@ -117,9 +121,12 @@ _green_slider_changed(void *data, Evas_Object *obj,
unsigned int *image_data, *image_data_two;
green = elm_slider_value_get(obj);
image_data = _ephoto_apply_color_adjustment(eco, NULL, green, EPHOTO_COLOR_ADJUST_GREEN);
image_data_two = _ephoto_apply_color_adjustment(eco, image_data, eco->red, EPHOTO_COLOR_ADJUST_RED);
_ephoto_apply_color_adjustment(eco, image_data_two, eco->blue, EPHOTO_COLOR_ADJUST_BLUE);
image_data = _ephoto_apply_color_adjustment(eco, NULL, green,
EPHOTO_COLOR_ADJUST_GREEN);
image_data_two = _ephoto_apply_color_adjustment(eco, image_data, eco->red,
EPHOTO_COLOR_ADJUST_RED);
_ephoto_apply_color_adjustment(eco, image_data_two, eco->blue,
EPHOTO_COLOR_ADJUST_BLUE);
}
static void
@ -131,9 +138,12 @@ _blue_slider_changed(void *data, Evas_Object *obj,
unsigned int *image_data, *image_data_two;
blue = elm_slider_value_get(obj);
image_data = _ephoto_apply_color_adjustment(eco, NULL, blue, EPHOTO_COLOR_ADJUST_BLUE);
image_data_two = _ephoto_apply_color_adjustment(eco, image_data, eco->red, EPHOTO_COLOR_ADJUST_RED);
_ephoto_apply_color_adjustment(eco, image_data_two, eco->green, EPHOTO_COLOR_ADJUST_GREEN);
image_data = _ephoto_apply_color_adjustment(eco, NULL, blue,
EPHOTO_COLOR_ADJUST_BLUE);
image_data_two = _ephoto_apply_color_adjustment(eco, image_data, eco->red,
EPHOTO_COLOR_ADJUST_RED);
_ephoto_apply_color_adjustment(eco, image_data_two, eco->green,
EPHOTO_COLOR_ADJUST_GREEN);
}
static Eina_Bool

12
src/bin/ephoto_config.c
Unescape View File

@ -46,9 +46,12 @@ _config_save_cb(void *data, Evas_Object *obj EINA_UNUSED,
ephoto->config->thumbnail_aspect = elm_check_state_get(ephoto->config->thumb_aspect);
if (elm_spinner_value_get(ephoto->config->panel_size) > 0)
{
ephoto->config->left_size = (elm_spinner_value_get(ephoto->config->panel_size) / 0.05) * 0.05;
ephoto->config->right_size = (elm_spinner_value_get(ephoto->config->panel_size) / 0.05) * 0.05;
evas_object_size_hint_weight_set(ephoto->dir_browser, ephoto->config->left_size, EVAS_HINT_EXPAND);
ephoto->config->left_size =
(elm_spinner_value_get(ephoto->config->panel_size) / 0.05) * 0.05;
ephoto->config->right_size =
(elm_spinner_value_get(ephoto->config->panel_size) / 0.05) * 0.05;
evas_object_size_hint_weight_set(ephoto->dir_browser,
ephoto->config->left_size, EVAS_HINT_EXPAND);
}
if (elm_spinner_value_get(ephoto->config->slide_time) > 0)
@ -281,7 +284,8 @@ _config_slideshow(Ephoto *ephoto, Evas_Object *parent)
evas_object_show(label);
transitions = _ephoto_transitions_list_get(edje_object_data_get(elm_layout_edje_get
(ephoto->slideshow), "transitions"));
(ephoto->slideshow),
"transitions"));
hoversel = elm_hoversel_add(table);
elm_hoversel_hover_parent_set(hoversel, ephoto->win);

6
src/bin/ephoto_cropper.c
Unescape View File

@ -23,7 +23,8 @@ struct _Ephoto_Cropper
static void
_calculate_cropper_size(void *data, Evas_Object *obj EINA_UNUSED,
const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
const char *emission EINA_UNUSED,
const char *source EINA_UNUSED)
{
Ephoto_Cropper *ec = data;
Edje_Message_Int_Set *msg;
@ -670,7 +671,8 @@ ephoto_cropper_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent,
edje_object_file_set(ec->cropper, PACKAGE_DATA_DIR "/themes/ephoto.edj",
"ephoto,image,cropper");
edje_object_signal_callback_add(elm_layout_edje_get(ec->layout),
"cropper,changed", "ephoto.swallow.cropper", _calculate_cropper_size,
"cropper,changed", "ephoto.swallow.cropper",
_calculate_cropper_size,
ec);
elm_layout_content_set(ec->layout, "ephoto.swallow.cropper", ec->cropper);
evas_object_show(ec->cropper);

25
src/bin/ephoto_directory_browser.c
Unescape View File

@ -1037,14 +1037,18 @@ _todo_items_process(void *data)
ic = _ephoto_dir_tree_class;
entry->item =
elm_genlist_item_sorted_insert(db->fsel, ic, entry,
entry->parent, ELM_GENLIST_ITEM_TREE, _entry_cmp, NULL, NULL);
entry->parent,
ELM_GENLIST_ITEM_TREE,
_entry_cmp, NULL, NULL);
}
else
{
ic = _ephoto_dir_class;
entry->item =
elm_genlist_item_sorted_insert(db->fsel, ic, entry,
entry->parent, ELM_GENLIST_ITEM_NONE, _entry_cmp, NULL, NULL);
entry->parent,
ELM_GENLIST_ITEM_NONE,
_entry_cmp, NULL, NULL);
}
if (!entry->item)
{
@ -1234,7 +1238,8 @@ ephoto_directory_browser_initialize_structure(Ephoto *ephoto)
end_dir = strdup(ephoto->config->directory);
if (strcmp(ephoto->config->open, ephoto->config->directory))
{
if (!strncmp(ephoto->config->open, ephoto->config->directory, strlen(ephoto->config->open)))
if (!strncmp(ephoto->config->open, ephoto->config->directory,
strlen(ephoto->config->open)))
{
snprintf(path, PATH_MAX, "%s", ephoto->config->directory);
dirs = eina_list_prepend(dirs, strdup(path));
@ -1276,7 +1281,8 @@ ephoto_directory_browser_initialize_structure(Ephoto *ephoto)
if (strncmp(finfo->path + finfo->name_start, ".", 1))
{
Ephoto_Entry *entry = ephoto_entry_new(ephoto, finfo->path,
finfo->path + finfo->name_start, finfo->type);
finfo->path + finfo->name_start,
finfo->type);
entry->parent = cur;
if (entry->is_dir && !entry->item)
{
@ -1286,7 +1292,9 @@ ephoto_directory_browser_initialize_structure(Ephoto *ephoto)
ic = _ephoto_dir_tree_class;
entry->item =
elm_genlist_item_sorted_insert(db->fsel, ic, entry,
entry->parent, ELM_GENLIST_ITEM_TREE, _entry_cmp,
entry->parent,
ELM_GENLIST_ITEM_TREE,
_entry_cmp,
NULL, NULL);
}
else
@ -1294,7 +1302,9 @@ ephoto_directory_browser_initialize_structure(Ephoto *ephoto)
ic = _ephoto_dir_class;
entry->item =
elm_genlist_item_sorted_insert(db->fsel, ic, entry,
entry->parent, ELM_GENLIST_ITEM_NONE, _entry_cmp,
entry->parent,
ELM_GENLIST_ITEM_NONE,
_entry_cmp,
NULL, NULL);
}
if (!entry->item)
@ -1330,7 +1340,8 @@ ephoto_directory_browser_initialize_structure(Ephoto *ephoto)
}
else
{
ephoto_directory_set(ephoto, ephoto->config->directory, NULL, EINA_FALSE, EINA_FALSE);
ephoto_directory_set(ephoto, ephoto->config->directory, NULL,
EINA_FALSE, EINA_FALSE);
ephoto_directory_browser_top_dir_set(ephoto, ephoto->config->directory);
}
ephoto_title_set(ephoto, ephoto->config->directory);

4
src/bin/ephoto_editor.c
Unescape View File

@ -22,8 +22,8 @@ _editor_cancel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
}
Evas_Object *
ephoto_editor_add(Ephoto *ephoto, Evas_Object *parent, const char *title, const char *data_name,
void *data)
ephoto_editor_add(Ephoto *ephoto, Evas_Object *parent, const char *title,
const char *data_name, void *data)
{
Evas_Object *frame, *box, *ic, *button;

6
src/bin/ephoto_ipc.c
Unescape View File

@ -4,8 +4,10 @@
#ifdef USE_IPC
/* local subsystem functions */
static Eina_Bool _e_ipc_cb_client_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event);
static Eina_Bool _e_ipc_cb_client_data(void *data EINA_UNUSED, int type EINA_UNUSED, void *event);
static Eina_Bool _e_ipc_cb_client_del(void *data EINA_UNUSED,
int type EINA_UNUSED, void *event);
static Eina_Bool _e_ipc_cb_client_data(void *data EINA_UNUSED,
int type EINA_UNUSED, void *event);
/* local subsystem globals */
static Ecore_Ipc_Server *_e_ipc_server = NULL;

9
src/bin/ephoto_main.c
Unescape View File

@ -174,7 +174,8 @@ _ephoto_thumb_browser_view(void *data, Evas_Object *obj EINA_UNUSED,
static void
_ephoto_thumb_browser_changed_directory(void *data,
Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
Ephoto *ephoto = data;
@ -1212,7 +1213,8 @@ ephoto_entry_free(Ephoto *ephoto, Ephoto_Entry *entry)
void
ephoto_entry_free_listener_add(Ephoto_Entry *entry, void (*cb)(void *data,
const Ephoto_Entry *entry), const void *data)
const Ephoto_Entry *entry),
const void *data)
{
Ephoto_Entry_Free_Listener *fl;
@ -1224,7 +1226,8 @@ ephoto_entry_free_listener_add(Ephoto_Entry *entry, void (*cb)(void *data,
void
ephoto_entry_free_listener_del(Ephoto_Entry *entry, void (*cb)(void *data,
const Ephoto_Entry *entry), const void *data)
const Ephoto_Entry *entry),
const void *data)
{
Eina_List *l;
Ephoto_Entry_Free_Listener *fl;

29
src/bin/ephoto_single_browser.c
Unescape View File

@ -64,13 +64,15 @@ static void _ephoto_update_bottom_bar(Ephoto_Single_Browser *sb);
/*Main Callbacks*/
static void _ephoto_main_edit_menu(Ephoto_Single_Browser *sb);
static void _ephoto_main_key_down(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED);
Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED);
static void _ephoto_show_settings(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED);
static void _ephoto_main_back(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED);
static void _ephoto_main_del(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED);
Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED);
static void _next_entry(Ephoto_Single_Browser *sb);
static void _orient_apply(Ephoto_Single_Browser *sb);
@ -1812,8 +1814,8 @@ _editor_menu(void *data, Evas_Object *obj EINA_UNUSED, void *event_data EINA_UNU
_go_flip_horiz, sb);
_edit_item_add(list, par, "object-flip-vertical", _("Flip Vertical"),
_go_flip_vert, sb);
par = elm_genlist_item_append(list, itc, _("Adjustable Filters"), NULL, ELM_GENLIST_ITEM_GROUP,
NULL, NULL);
par = elm_genlist_item_append(list, itc, _("Adjustable Filters"), NULL,
ELM_GENLIST_ITEM_GROUP, NULL, NULL);
elm_genlist_item_select_mode_set(par, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
_edit_item_add(list, par, NULL, _("Brightness/Contrast/Gamma"),
_go_bcg, sb);
@ -1823,8 +1825,8 @@ _editor_menu(void *data, Evas_Object *obj EINA_UNUSED, void *event_data EINA_UNU
_go_color, sb);
_edit_item_add(list, par, NULL, _("Red Eye Removal"),
_go_reye, sb);
par = elm_genlist_item_append(list, itc, _("Quick Filters"), NULL, ELM_GENLIST_ITEM_GROUP,
NULL, NULL);
par = elm_genlist_item_append(list, itc, _("Quick Filters"), NULL,
ELM_GENLIST_ITEM_GROUP, NULL, NULL);
elm_genlist_item_select_mode_set(par, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
_edit_item_add(list, par, NULL, _("Auto Equalize"),
_go_auto_eq, sb);
@ -1890,7 +1892,8 @@ _add_edit_menu_items(Ephoto_Single_Browser *sb, Evas_Object *menu)
{
Elm_Object_Item *menu_it;
menu_it = elm_menu_item_add(menu, NULL, "document-properties", _("File"), NULL, NULL);
menu_it = elm_menu_item_add(menu, NULL, "document-properties", _("File"),
NULL, NULL);
elm_menu_item_add(menu, menu_it, "edit-cut", _("Edit"), _editor_menu, sb);
elm_menu_item_add(menu, menu_it, "edit-clear", _("Reset"), _reset_image, sb);
elm_menu_item_add(menu, menu_it, "document-save", _("Save"), _save_image, sb);
@ -1907,10 +1910,10 @@ _add_edit_menu_items(Ephoto_Single_Browser *sb, Evas_Object *menu)
sb);
elm_menu_item_add(menu, NULL, "zoom-original", _("Zoom 1:1"), _zoom_1_cb,
sb);
elm_menu_item_add(menu, NULL, "object-flip-horizontal", _("Flip Horizontal"), _go_flip_horiz,
sb);
elm_menu_item_add(menu, NULL, "object-flip-vertical", _("Flip Vertical"), _go_flip_vert,
sb);
elm_menu_item_add(menu, NULL, "object-flip-horizontal", _("Flip Horizontal"),
_go_flip_horiz, sb);
elm_menu_item_add(menu, NULL, "object-flip-vertical", _("Flip Vertical"),
_go_flip_vert, sb);
}
static void
@ -2230,8 +2233,8 @@ ephoto_single_browser_entry_set(Evas_Object *obj, Ephoto_Entry *entry)
evas_object_color_set(sb->event, 0, 0, 0, 0);
evas_object_repeat_events_set(sb->event, EINA_TRUE);
evas_object_show(sb->event);
evas_object_event_callback_add(sb->event, EVAS_CALLBACK_KEY_DOWN, _ephoto_main_key_down,
sb);
evas_object_event_callback_add(sb->event, EVAS_CALLBACK_KEY_DOWN,
_ephoto_main_key_down, sb);
evas_object_raise(sb->event);
elm_object_focus_set(sb->event, EINA_TRUE);
}

6
src/bin/ephoto_slideshow.c
Unescape View File

@ -970,9 +970,11 @@ ephoto_slideshow_add(Ephoto *ephoto, Evas_Object *parent)
evas_object_event_callback_add(ss->slideshow, EVAS_CALLBACK_MOUSE_MOVE,
_mouse_move, ss);
edje_object_signal_callback_add(elm_layout_edje_get(ss->slideshow),
"ephoto,transition,raise", "ephoto", _on_transition_raise, ss);
"ephoto,transition,raise", "ephoto",
_on_transition_raise, ss);
edje_object_signal_callback_add(elm_layout_edje_get(ss->slideshow),
"ephoto,transition,end", "ephoto", _on_transition_end, ss);
"ephoto,transition,end", "ephoto",
_on_transition_end, ss);
return ss->slideshow;
error:

20
src/bin/ephoto_thumb.c
Unescape View File

@ -17,9 +17,11 @@ struct _E_Thumb
};
/* local subsystem functions */
static void _e_thumb_gen_begin(int objid, const char *file, const char *key, int w, int h);
static void _e_thumb_gen_begin(int objid, const char *file,
const char *key, int w, int h);
static void _e_thumb_gen_end(int objid);
static void _e_thumb_del_hook(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _e_thumb_del_hook(void *data, Evas *e, Evas_Object *obj,
void *event_info);
static void _e_thumb_hash_add(int objid, Evas_Object *obj);
static void _e_thumb_hash_del(int objid);
static Evas_Object *_e_thumb_hash_find(int objid);
@ -142,8 +144,9 @@ e_thumb_icon_begin(Evas_Object *obj)
{
Ecore_Exe *exe;
snprintf(buf, sizeof(buf), "%s/ephoto/ephoto_thumbnail --nice=1", PACKAGE_LIB_DIR);
exe = ecore_exe_run(buf, NULL);
snprintf(buf, sizeof(buf),
"%s/ephoto/ephoto_thumbnail --nice=1", PACKAGE_LIB_DIR);
exe = ecore_exe_run(buf, NULL);
_thumbnailers_exe = eina_list_append(_thumbnailers_exe, exe);
}
_thumb_queue = eina_list_append(_thumb_queue, eth);
@ -315,7 +318,8 @@ _e_thumb_gen_begin(int objid, const char *file, const char *key, int w, int h)
if (!cli) return;
_thumbnailers = eina_list_remove_list(_thumbnailers, _thumbnailers);
_thumbnailers = eina_list_append(_thumbnailers, cli);
ecore_ipc_client_send(cli, EPHOTO_IPC_DOMAIN_THUMB, 1, objid, w, h, buf, l1 + 1 + l2 + 1);
ecore_ipc_client_send(cli, EPHOTO_IPC_DOMAIN_THUMB, 1, objid, w, h,
buf, l1 + 1 + l2 + 1);
}
static void
@ -332,7 +336,8 @@ _e_thumb_gen_end(int objid)
}
static void
_e_thumb_del_hook(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
_e_thumb_del_hook(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
void *event_info EINA_UNUSED)
{
E_Thumb *eth;
@ -432,7 +437,8 @@ _e_thumb_cb_exe_event_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *ev
Ecore_Exe *exe_thumb;
char buf[4096];
snprintf(buf, sizeof(buf), "%s/ephoto/ephoto_thumbnail --nice=1", PACKAGE_LIB_DIR);
snprintf(buf, sizeof(buf),
"%s/ephoto/ephoto_thumbnail --nice=1", PACKAGE_LIB_DIR);
exe_thumb = ecore_exe_run(buf, NULL);
_thumbnailers_exe = eina_list_append(_thumbnailers_exe, exe_thumb);
}

45
src/bin/ephoto_thumb_browser.c
Unescape View File

@ -64,9 +64,11 @@ static Elm_Gengrid_Item_Class _ephoto_thumb_file_class;
static void _ephoto_show_settings(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED);
static void _ephoto_main_key_down(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED);
Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED);
static void _ephoto_main_del(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED);
Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED);
/*Thumb Pane Functions*/
static void _ephoto_thumb_activated(void *data, Evas_Object *obj EINA_UNUSED,
@ -169,7 +171,8 @@ _drop_dropcb(void *data EINA_UNUSED, Evas_Object *obj, Elm_Object_Item *it EINA_
static Elm_Object_Item *
_drop_item_getcb(Evas_Object *obj EINA_UNUSED, Evas_Coord x EINA_UNUSED,
Evas_Coord y EINA_UNUSED, int *xposret EINA_UNUSED, int *yposret EINA_UNUSED)
Evas_Coord y EINA_UNUSED, int *xposret EINA_UNUSED,
int *yposret EINA_UNUSED)
{
return NULL;
}
@ -1230,23 +1233,28 @@ _ephoto_thumb_search_go(void *data, Evas_Object *obj EINA_UNUSED,
if (tb->sort == EPHOTO_SORT_ALPHABETICAL_ASCENDING)
e->item =
elm_gengrid_item_sorted_insert(tb->grid, ic, e,
_entry_cmp_grid_alpha_asc, NULL, NULL);
_entry_cmp_grid_alpha_asc,
NULL, NULL);
else if (tb->sort == EPHOTO_SORT_ALPHABETICAL_DESCENDING)
e->item =
elm_gengrid_item_sorted_insert(tb->grid, ic, e,
_entry_cmp_grid_alpha_desc, NULL, NULL);
_entry_cmp_grid_alpha_desc,
NULL, NULL);
else if (tb->sort == EPHOTO_SORT_MODTIME_ASCENDING)
e->item =
elm_gengrid_item_sorted_insert(tb->grid, ic, e,
_entry_cmp_grid_mod_asc, NULL, NULL);
_entry_cmp_grid_mod_asc,
NULL, NULL);
else if (tb->sort == EPHOTO_SORT_MODTIME_DESCENDING)
e->item =
elm_gengrid_item_sorted_insert(tb->grid, ic, e,
_entry_cmp_grid_mod_desc, NULL, NULL);
_entry_cmp_grid_mod_desc,
NULL, NULL);
else if (tb->sort == EPHOTO_SORT_SIMILARITY)
e->item =
elm_gengrid_item_sorted_insert(tb->grid, ic, e,
_entry_cmp_grid_similarity, NULL, NULL);
_entry_cmp_grid_similarity,
NULL, NULL);
if (e->item)
{
Eina_File *f;
@ -1929,13 +1937,15 @@ ephoto_thumb_browser_paste(Ephoto *ephoto, Elm_Object_Item *item)
if (eina_list_count(tb->cut_items))
{
ephoto_file_paste(tb->ephoto, eina_list_clone(tb->cut_items), EINA_FALSE, path);
ephoto_file_paste(tb->ephoto, eina_list_clone(tb->cut_items),
EINA_FALSE, path);
eina_list_free(tb->cut_items);
tb->cut_items = NULL;
}
else if (eina_list_count(tb->copy_items))
{
ephoto_file_paste(tb->ephoto, eina_list_clone(tb->copy_items), EINA_TRUE, path);
ephoto_file_paste(tb->ephoto, eina_list_clone(tb->copy_items),
EINA_TRUE, path);
eina_list_free(tb->copy_items);
tb->copy_items = NULL;
}
@ -2101,15 +2111,20 @@ ephoto_thumb_browser_show_controls(Ephoto *ephoto)
hover = elm_hoversel_add(ephoto->controls_right);
elm_hoversel_hover_parent_set(hover, ephoto->win);
elm_hoversel_item_add(hover, _("Alphabetical Ascending"),
"view-sort-ascending", ELM_ICON_STANDARD, _sort_alpha_asc, tb);
"view-sort-ascending", ELM_ICON_STANDARD,
_sort_alpha_asc, tb);
elm_hoversel_item_add(hover, _("Alphabetical Descending"),
"view-sort-descending", ELM_ICON_STANDARD, _sort_alpha_desc, tb);
"view-sort-descending", ELM_ICON_STANDARD,
_sort_alpha_desc, tb);
elm_hoversel_item_add(hover, _("Modification Time Ascending"),
"view-sort-ascending", ELM_ICON_STANDARD, _sort_mod_asc, tb);
"view-sort-ascending", ELM_ICON_STANDARD,
_sort_mod_asc, tb);
elm_hoversel_item_add(hover, _("Modification Time Descending"),
"view-sort-descending", ELM_ICON_STANDARD, _sort_mod_desc, tb);
"view-sort-descending", ELM_ICON_STANDARD,
_sort_mod_desc, tb);
tb->similarity = elm_hoversel_item_add(hover, _("Image Simalarity"),
"view-sort-ascending", ELM_ICON_STANDARD, _sort_similarity, tb);
"view-sort-ascending", ELM_ICON_STANDARD,
_sort_similarity, tb);
elm_object_text_set(hover, _("Sort"));
ic = elm_icon_add(hover);
evas_object_size_hint_min_set(ic, 20 * elm_config_scale_get(),

3
src/bin/ephoto_thumbnailer.c
Unescape View File

@ -584,7 +584,8 @@ end:
break;
}
/* send back path to thumb */
ecore_ipc_server_send(_e_ipc_server, EPHOTO_IPC_DOMAIN_THUMB, 2, eth->objid, 0, 0, buf, strlen(buf) + 1);
ecore_ipc_server_send(_e_ipc_server, EPHOTO_IPC_DOMAIN_THUMB, 2, eth->objid,
0, 0, buf, strlen(buf) + 1);
}
static int

Write Preview
Loading…
Cancel
Save