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

Ephoto: Remove deprecated use of icon_order_lookup and update some FDO icon names.

This commit is contained in:
Stephen Houston 2016-05-29 10:33:06 -05:00
parent b9fb381f84
commit 057d814be2
8 changed files with 84 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bin/ephoto_config.c
View File

@ -591,21 +591,18 @@ ephoto_config_main(Ephoto *ephoto)
evas_object_data_set(segment, "about", about);
ic = elm_icon_add(segment);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "preferences-system");
evas_object_show(ic);
settingsi = elm_segment_control_item_add(segment, ic, _("Settings"));
ic = elm_icon_add(segment);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "input-keyboard");
evas_object_show(ic);
kbi = elm_segment_control_item_add(segment, ic, _("Bindings"));
ic = elm_icon_add(segment);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "help-about");
evas_object_show(ic);
@ -629,7 +626,6 @@ ephoto_config_main(Ephoto *ephoto)
elm_segment_control_item_selected_set(settingsi, EINA_TRUE);
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "document-save");
@ -641,7 +637,6 @@ ephoto_config_main(Ephoto *ephoto)
evas_object_show(button);
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "window-close");

2
src/bin/ephoto_directory_browser.c
View File

@ -366,7 +366,6 @@ _dir_item_icon_get(void *data EINA_UNUSED, Evas_Object *obj,
return NULL;
Evas_Object *ic = elm_icon_add(obj);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
elm_icon_standard_set(ic, "folder");
return ic;
}
@ -434,7 +433,6 @@ _dir_go_trash(void *data, Evas_Object *obj EINA_UNUSED,
ic = elm_icon_add(db->leftbox);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(),
20*elm_config_scale_get());
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
elm_icon_standard_set(ic, "go-previous");
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);

21
src/bin/ephoto_editor.c
View File

@ -61,8 +61,8 @@ ephoto_editor_add(Ephoto *ephoto, const char *title, const char *data_name,
evas_object_show(box);
ic = elm_icon_add(box);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(), 20*elm_config_scale_get());
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(),
20*elm_config_scale_get());
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "edit-undo");
@ -72,13 +72,14 @@ ephoto_editor_add(Ephoto *ephoto, const char *title, const char *data_name,
evas_object_smart_callback_add(button, "clicked", _editor_reset, box);
evas_object_size_hint_weight_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_min_set(button, 220*elm_config_scale_get(), 30*elm_config_scale_get());
evas_object_size_hint_min_set(button, 220*elm_config_scale_get(),
30*elm_config_scale_get());
elm_box_pack_end(box, button);
evas_object_show(button);
ic = elm_icon_add(box);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(), 20*elm_config_scale_get());
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(),
20*elm_config_scale_get());
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "document-save");
@ -88,13 +89,14 @@ ephoto_editor_add(Ephoto *ephoto, const char *title, const char *data_name,
evas_object_smart_callback_add(button, "clicked", _editor_apply, ephoto);
evas_object_size_hint_weight_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_min_set(button, 220*elm_config_scale_get(), 30*elm_config_scale_get());
evas_object_size_hint_min_set(button, 220*elm_config_scale_get(),
30*elm_config_scale_get());
elm_box_pack_end(box, button);
evas_object_show(button);
ic = elm_icon_add(box);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(), 20*elm_config_scale_get());
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(),
20*elm_config_scale_get());
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "window-close");
@ -104,7 +106,8 @@ ephoto_editor_add(Ephoto *ephoto, const char *title, const char *data_name,
evas_object_smart_callback_add(button, "clicked", _editor_cancel, ephoto);
evas_object_size_hint_weight_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_min_set(button, 220*elm_config_scale_get(), 30*elm_config_scale_get());
evas_object_size_hint_min_set(button, 220*elm_config_scale_get(),
30*elm_config_scale_get());
elm_box_pack_end(box, button);
evas_object_show(button);

30
src/bin/ephoto_file.c
View File

@ -37,7 +37,6 @@ _complete(Ephoto *ephoto, const char *title, const char *text)
evas_object_show(label);
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "window-close");
@ -182,6 +181,7 @@ _upload_image_complete_cb(void *data, int ev_type EINA_UNUSED, void *event)
Ecore_Con_Event_Url_Complete *ev = event;
Ecore_Event_Handler *handler;
Evas_Object *popup, *box, *hbox, *label, *entry, *ic, *button;
int ret;
if (ev->url_con != ephoto->url_up)
return ECORE_CALLBACK_RENEW;
@ -231,19 +231,19 @@ _upload_image_complete_cb(void *data, int ev_type EINA_UNUSED, void *event)
evas_object_show(entry);
ic = elm_icon_add(hbox);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
elm_icon_standard_set(ic, "edit-copy");
ret = elm_icon_standard_set(ic, "edit-copy");
button = elm_button_add(hbox);
elm_object_part_content_set(button, "icon", ic);
if (!ret)
elm_object_text_set(button, _("Copy"));
evas_object_smart_callback_add(button, "clicked", _upload_image_url_copy,
entry);
elm_box_pack_end(hbox, button);
evas_object_show(button);
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "window-close");
@ -403,7 +403,6 @@ _new_dir(Ephoto *ephoto, const char *file)
evas_object_data_set(popup, "entry", entry);
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "document-save");
@ -415,7 +414,6 @@ _new_dir(Ephoto *ephoto, const char *file)
evas_object_show(button);
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "window-close");
@ -534,7 +532,6 @@ _rename_file(Ephoto *ephoto, const char *file)
free(string);
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "document-save");
@ -546,7 +543,6 @@ _rename_file(Ephoto *ephoto, const char *file)
evas_object_show(button);
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "window-close");
@ -1156,7 +1152,6 @@ _prompt_save_image_as_apply(void *data, Evas_Object *obj EINA_UNUSED, void *even
_("Are you sure you want to overwrite this image?"));
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL,
1, 1);
elm_icon_standard_set(ic, "document-save");
@ -1170,7 +1165,6 @@ _prompt_save_image_as_apply(void *data, Evas_Object *obj EINA_UNUSED, void *even
evas_object_show(button);
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL,
1, 1);
elm_icon_standard_set(ic, "window-close");
@ -1289,7 +1283,6 @@ ephoto_file_save_image(Ephoto *ephoto, Ephoto_Entry *entry, Evas_Object *image)
_("Are you sure you want to overwrite this image?"));
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "document-save");
@ -1301,7 +1294,6 @@ ephoto_file_save_image(Ephoto *ephoto, Ephoto_Entry *entry, Evas_Object *image)
evas_object_show(button);
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "window-close");
@ -1375,7 +1367,6 @@ ephoto_file_upload_image(Ephoto *ephoto, Ephoto_Entry *entry)
_("Are you sure you want to upload this image publically to imgur.com?"));
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "document-save");
@ -1388,7 +1379,6 @@ ephoto_file_upload_image(Ephoto *ephoto, Ephoto_Entry *entry)
evas_object_show(button);
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "window-close");
@ -1433,7 +1423,6 @@ ephoto_file_move(Ephoto *ephoto, Eina_List *files, const char *path)
popup = _prompt(ephoto, _("Move Files"), move_dir);
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1,
1);
elm_icon_standard_set(ic, "document-save");
@ -1447,7 +1436,6 @@ ephoto_file_move(Ephoto *ephoto, Eina_List *files, const char *path)
evas_object_show(button);
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1,
1);
elm_icon_standard_set(ic, "window-close");
@ -1486,7 +1474,6 @@ ephoto_file_copy(Ephoto *ephoto, Eina_List *files, const char *path)
popup = _prompt(ephoto, _("Copy Files"), copy_dir);
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1,
1);
elm_icon_standard_set(ic, "document-save");
@ -1500,7 +1487,6 @@ ephoto_file_copy(Ephoto *ephoto, Eina_List *files, const char *path)
evas_object_show(button);
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1,
1);
elm_icon_standard_set(ic, "window-close");
@ -1539,7 +1525,6 @@ ephoto_file_paste(Ephoto *ephoto, Eina_List *files, Eina_Bool copy, const char *
_("Are you sure you want to move these files here?"));
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL,
1, 1);
elm_icon_standard_set(ic, "document-save");
@ -1553,7 +1538,6 @@ ephoto_file_paste(Ephoto *ephoto, Eina_List *files, Eina_Bool copy, const char *
evas_object_show(button);
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL,
1, 1);
elm_icon_standard_set(ic, "window-close");
@ -1588,7 +1572,6 @@ ephoto_file_paste(Ephoto *ephoto, Eina_List *files, Eina_Bool copy, const char *
_("Are you sure you want to copy these files here?"));
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL,
1, 1);
elm_icon_standard_set(ic, "document-save");
@ -1602,7 +1585,6 @@ ephoto_file_paste(Ephoto *ephoto, Eina_List *files, Eina_Bool copy, const char *
evas_object_show(button);
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL,
1, 1);
elm_icon_standard_set(ic, "window-close");
@ -1648,7 +1630,6 @@ ephoto_file_delete(Ephoto *ephoto, Eina_List *files, Eina_File_Type type)
_("Are you sure you want to delete these files?"));
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1,
1);
elm_icon_standard_set(ic, "document-save");
@ -1662,7 +1643,6 @@ ephoto_file_delete(Ephoto *ephoto, Eina_List *files, Eina_File_Type type)
evas_object_show(button);
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1,
1);
elm_icon_standard_set(ic, "window-close");
@ -1704,7 +1684,6 @@ ephoto_file_empty_trash(Ephoto *ephoto, Eina_List *files)
_("Are you sure you want to empty the trash?"));
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1,
1);
elm_icon_standard_set(ic, "document-save");
@ -1718,7 +1697,6 @@ ephoto_file_empty_trash(Ephoto *ephoto, Eina_List *files)
evas_object_show(button);
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1,
1);
elm_icon_standard_set(ic, "window-close");

29
src/bin/ephoto_main.c
View File

@ -326,6 +326,8 @@ _folder_icon_clicked(void *data, Evas_Object *obj,
edje_object_signal_emit(elm_layout_edje_get(ephoto->layout),
"ephoto,folders,show", "ephoto");
ephoto->folders_toggle = EINA_TRUE;
if (elm_object_text_get(obj))
elm_object_text_set(obj, _("Hide Folders"));
elm_object_tooltip_text_set(obj, _("Hide Folders"));
}
else
@ -333,6 +335,8 @@ _folder_icon_clicked(void *data, Evas_Object *obj,
edje_object_signal_emit(elm_layout_edje_get(ephoto->layout),
"ephoto,folders,hide", "ephoto");
ephoto->folders_toggle = EINA_FALSE;
if (elm_object_text_get(obj))
elm_object_text_set(obj, _("Show Folders"));
elm_object_tooltip_text_set(obj, _("Show Folders"));
}
}
@ -388,6 +392,7 @@ ephoto_window_add(const char *path)
Ephoto *ephoto = calloc(1, sizeof(Ephoto));
Evas_Object *ic, *but;
char buf[PATH_MAX];
int ret;
EINA_SAFETY_ON_NULL_RETURN_VAL(ephoto, NULL);
@ -524,11 +529,13 @@ ephoto_window_add(const char *path)
ic = elm_icon_add(ephoto->statusbar);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(),
20*elm_config_scale_get());
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
elm_icon_standard_set(ic, "folder");
ret = elm_icon_standard_set(ic, "folder");
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
but = elm_button_add(ephoto->statusbar);
elm_object_part_content_set(but, "icon", ic);
if (!ret)
elm_object_text_set(but, _("Show Folders"));
evas_object_smart_callback_add(but, "clicked", _folder_icon_clicked, ephoto);
elm_object_tooltip_text_set(but, _("Show Folders"));
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_RIGHT);
@ -570,12 +577,15 @@ ephoto_window_add(const char *path)
ic = elm_icon_add(ephoto->statusbar);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(),
20*elm_config_scale_get());
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
elm_icon_standard_set(ic, "media-playback-start");
ret = elm_icon_standard_set(ic, "media-playback-start");
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
but = elm_button_add(ephoto->statusbar);
elm_object_part_content_set(but, "icon", ic);
evas_object_smart_callback_add(but, "clicked", _slideshow_icon_clicked, ephoto);
if (!ret)
elm_object_text_set(but, _("Slideshow"));
evas_object_smart_callback_add(but, "clicked",
_slideshow_icon_clicked, ephoto);
elm_object_tooltip_text_set(but, _("Slideshow"));
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
elm_box_pack_end(ephoto->statusbar, but);
@ -584,12 +594,15 @@ ephoto_window_add(const char *path)
ic = elm_icon_add(ephoto->statusbar);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(),
20*elm_config_scale_get());
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
elm_icon_standard_set(ic, "preferences-system");
ret = elm_icon_standard_set(ic, "preferences-other");
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
but = elm_button_add(ephoto->statusbar);
elm_object_part_content_set(but, "icon", ic);
evas_object_smart_callback_add(but, "clicked", _settings_icon_clicked, ephoto);
if (!ret)
elm_object_text_set(but, _("Settings"));
evas_object_smart_callback_add(but, "clicked",
_settings_icon_clicked, ephoto);
elm_object_tooltip_text_set(but, _("Settings"));
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_LEFT);
elm_box_pack_end(ephoto->statusbar, but);

68
src/bin/ephoto_single_browser.c
View File

@ -869,7 +869,6 @@ _reset_image(void *data, Evas_Object *obj EINA_UNUSED,
evas_object_show(label);
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "document-save");
@ -881,7 +880,6 @@ _reset_image(void *data, Evas_Object *obj EINA_UNUSED,
evas_object_show(button);
ic = elm_icon_add(popup);
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_icon_standard_set(ic, "window-close");
@ -1823,17 +1821,17 @@ ephoto_single_browser_show_controls(Ephoto *ephoto)
ic = elm_icon_add(ephoto->controls_left);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(),
20*elm_config_scale_get());
ret = elm_image_file_set(ic, PACKAGE_DATA_DIR "/images/grid.png", NULL);
ret = elm_icon_standard_set(ic, "view-list-icons");
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
if (!ret)
ret = elm_image_file_set(ic, PACKAGE_DATA_DIR "/images/grid.png", NULL);
but = elm_button_add(ephoto->controls_left);
if (!ret)
elm_object_text_set(but, _("View Thumbnails"));
else
{
elm_object_part_content_set(but, "icon", ic);
elm_object_tooltip_text_set(but, _("View Thumbnails"));
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
}
elm_object_text_set(but, _("Thumbnails"));
elm_object_part_content_set(but, "icon", ic);
elm_object_tooltip_text_set(but, _("View Thumbnails"));
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
evas_object_smart_callback_add(but, "clicked", _ephoto_main_back, sb);
elm_box_pack_end(ephoto->controls_left, but);
evas_object_show(but);
@ -1841,37 +1839,31 @@ ephoto_single_browser_show_controls(Ephoto *ephoto)
ic = elm_icon_add(ephoto->controls_left);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(),
20*elm_config_scale_get());
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
ret = elm_icon_standard_set(ic, "zoom-in");
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
but = elm_button_add(ephoto->controls_left);
but = elm_button_add(ephoto->controls_left);
if (!ret)
elm_object_text_set(but, _("Zoom In"));
else
{
elm_object_part_content_set(but, "icon", ic);
elm_object_tooltip_text_set(but, _("Zoom In"));
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
}
evas_object_smart_callback_add(but, "clicked", _zoom_in_cb, sb);
elm_object_part_content_set(but, "icon", ic);
elm_object_tooltip_text_set(but, _("Zoom In"));
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
evas_object_smart_callback_add(but, "clicked", _zoom_in_cb, sb);
elm_box_pack_end(ephoto->controls_left, but);
evas_object_show(but);
ic = elm_icon_add(ephoto->controls_left);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(),
20*elm_config_scale_get());
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
elm_icon_standard_set(ic, "zoom-out");
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
but = elm_button_add(ephoto->controls_left);
if (!ret)
elm_object_text_set(but, _("Zoom Out"));
else
{
elm_object_part_content_set(but, "icon", ic);
elm_object_tooltip_text_set(but, _("Zoom Out"));
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
}
elm_object_part_content_set(but, "icon", ic);
elm_object_tooltip_text_set(but, _("Zoom Out"));
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
evas_object_smart_callback_add(but, "clicked", _zoom_out_cb, sb);
elm_box_pack_end(ephoto->controls_left, but);
evas_object_show(but);
@ -1879,18 +1871,15 @@ ephoto_single_browser_show_controls(Ephoto *ephoto)
ic = elm_icon_add(ephoto->controls_right);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(),
20*elm_config_scale_get());
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
ret = elm_icon_standard_set(ic, "go-previous");
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
but = elm_button_add(ephoto->controls_right);
if (!ret)
elm_object_text_set(but, _("Previous"));
else
{
elm_object_part_content_set(but, "icon", ic);
elm_object_tooltip_text_set(but, _("Previous"));
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
}
elm_object_part_content_set(but, "icon", ic);
elm_object_tooltip_text_set(but, _("Previous"));
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
evas_object_smart_callback_add(but, "clicked", _go_prev, sb);
elm_box_pack_end(ephoto->controls_right, but);
evas_object_show(but);
@ -1898,18 +1887,15 @@ ephoto_single_browser_show_controls(Ephoto *ephoto)
ic = elm_icon_add(ephoto->controls_right);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(),
20*elm_config_scale_get());
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
elm_icon_standard_set(ic, "go-next");
ret = elm_icon_standard_set(ic, "go-next");
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
but = elm_button_add(ephoto->controls_right);
if (!ret)
elm_object_text_set(but, _("Next"));
else
{
elm_object_part_content_set(but, "icon", ic);
elm_object_tooltip_text_set(but, _("Next"));
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
}
elm_object_part_content_set(but, "icon", ic);
elm_object_tooltip_text_set(but, _("Next"));
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
evas_object_smart_callback_add(but, "clicked", _go_next, sb);
elm_box_pack_end(ephoto->controls_right, but);
evas_object_show(but);

12
src/bin/ephoto_slideshow.c
View File

@ -254,18 +254,16 @@ _add_icon(Evas_Object *parent, const char *icon, const char *label, Evas_Object
ic = elm_icon_add(parent);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(),
20*elm_config_scale_get());
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
ret = elm_icon_standard_set(ic, icon);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
but = elm_button_add(parent);
if (!ret)
elm_object_text_set(but, label);
else
{
elm_object_part_content_set(but, "icon", ic);
elm_object_tooltip_text_set(but, label);
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
}
elm_object_part_content_set(but, "icon", ic);
elm_object_tooltip_text_set(but, label);
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
if (before)
elm_box_pack_before(parent, but, before);
else

36
src/bin/ephoto_thumb_browser.c
View File

@ -1842,17 +1842,17 @@ ephoto_thumb_browser_show_controls(Ephoto *ephoto)
ic = elm_icon_add(ephoto->controls_left);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(),
20*elm_config_scale_get());
ret = elm_image_file_set(ic, PACKAGE_DATA_DIR "/images/single.png", NULL);
ret = elm_icon_standard_set(ic, "image-x-generic");
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
if (!ret)
ret = elm_image_file_set(ic, PACKAGE_DATA_DIR "/images/single.png", NULL);
but = elm_button_add(ephoto->controls_left);
if (!ret)
elm_object_text_set(but, _("View Images"));
else
{
elm_object_part_content_set(but, "icon", ic);
elm_object_tooltip_text_set(but, _("View Images"));
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
}
elm_object_part_content_set(but, "icon", ic);
elm_object_tooltip_text_set(but, _("View Images"));
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
evas_object_smart_callback_add(but, "clicked", _view_single, tb);
elm_box_pack_end(ephoto->controls_left, but);
evas_object_show(but);
@ -1860,18 +1860,15 @@ ephoto_thumb_browser_show_controls(Ephoto *ephoto)
ic = elm_icon_add(ephoto->controls_left);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(),
20*elm_config_scale_get());
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
ret = elm_icon_standard_set(ic, "zoom-in");
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
but = elm_button_add(ephoto->controls_left);
if (!ret)
elm_object_text_set(but, _("Zoom In"));
else
{
elm_object_part_content_set(but, "icon", ic);
elm_object_tooltip_text_set(but, _("Zoom In"));
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
}
elm_object_part_content_set(but, "icon", ic);
elm_object_tooltip_text_set(but, _("Zoom In"));
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
evas_object_smart_callback_add(but, "clicked", _zoom_in, tb);
elm_box_pack_end(ephoto->controls_left, but);
evas_object_show(but);
@ -1879,18 +1876,15 @@ ephoto_thumb_browser_show_controls(Ephoto *ephoto)
ic = elm_icon_add(ephoto->controls_left);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(),
20*elm_config_scale_get());
elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_FDO_THEME);
elm_icon_standard_set(ic, "zoom-out");
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
but = elm_button_add(ephoto->controls_left);
if (!ret)
elm_object_text_set(but, _("Zoom Out"));
else
{
elm_object_part_content_set(but, "icon", ic);
elm_object_tooltip_text_set(but, _("Zoom Out"));
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
}
elm_object_part_content_set(but, "icon", ic);
elm_object_tooltip_text_set(but, _("Zoom Out"));
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
evas_object_smart_callback_add(but, "clicked", _zoom_out, tb);
elm_box_pack_end(ephoto->controls_left, but);
evas_object_show(but);