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

Merge branch 'master' of git+ssh://git.enlightenment.org/apps/ephoto

This commit is contained in:
Stephen Houston 2016-01-23 12:13:11 -06:00
parent 71e1ef6aa6 aa2c756ce0
commit 6c38b82f95
6 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -31,7 +31,7 @@ have_po="yes"
],[ ],[
have_po="no" have_po="no"
]) ])
AC_SUBST(LTLLIBINTL) AC_SUBST([LTLIBINTL])
if test "x$LIBINTL" = "x"; then if test "x$LIBINTL" = "x"; then
LIBINTL="$INTLLIBS" LIBINTL="$INTLLIBS"
fi fi

2
src/bin/Makefile.am
View File

@ -13,7 +13,7 @@ ephoto_CPPFLAGS = \
ephoto_LDADD = @EFL_LIBS@ ephoto_LDADD = @EFL_LIBS@
if HAVE_PO if HAVE_PO
ephoto_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\" ephoto_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\"
ephoto_LDADD += @LIBINTL@ ephoto_LDADD += @LTLIBINTL@
endif endif
ephoto_SOURCES = \ ephoto_SOURCES = \

2
src/bin/ephoto.c
View File

@ -2,7 +2,7 @@
static void _ephoto_display_usage(void); static void _ephoto_display_usage(void);
EAPI int EAPI_MAIN int
elm_main(int argc, char **argv) elm_main(int argc, char **argv)
{ {
int r = 0; int r = 0;

7
src/bin/ephoto.h
View File

@ -29,10 +29,11 @@
# endif # endif
#if HAVE_GETTEXT && ENABLE_NLS #if HAVE_GETTEXT && ENABLE_NLS
#define _(string) gettext (string) # include <libintl.h>
# define _(string) gettext (string)
#else #else
#define _(string) (string) # define _(string) (string)
#define ngettext(String1, String2, Var) Var == 1 ? String1 : String2 # define ngettext(String1, String2, Var) Var == 1 ? String1 : String2
#endif #endif
typedef struct _Ephoto_Config Ephoto_Config; typedef struct _Ephoto_Config Ephoto_Config;

8
src/bin/ephoto_config.c
View File

@ -79,7 +79,7 @@ ephoto_config_free(Ephoto *ephoto)
} }
static void static void
_close(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) _config_close_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{ {
Evas_Object *popup = data; Evas_Object *popup = data;
@ -87,7 +87,7 @@ _close(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
} }
static void static void
_save(void *data, Evas_Object *obj EINA_UNUSED, _config_save_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED) void *event_info EINA_UNUSED)
{ {
Evas_Object *popup = data; Evas_Object *popup = data;
@ -527,7 +527,7 @@ ephoto_config_main(Ephoto *ephoto)
button = elm_button_add(popup); button = elm_button_add(popup);
elm_object_text_set(button, _("Save")); elm_object_text_set(button, _("Save"));
elm_object_part_content_set(button, "icon", ic); elm_object_part_content_set(button, "icon", ic);
evas_object_smart_callback_add(button, "clicked", _save, popup); evas_object_smart_callback_add(button, "clicked", _config_save_cb, popup);
elm_object_part_content_set(popup, "button1", button); elm_object_part_content_set(popup, "button1", button);
evas_object_show(button); evas_object_show(button);
@ -539,7 +539,7 @@ ephoto_config_main(Ephoto *ephoto)
button = elm_button_add(popup); button = elm_button_add(popup);
elm_object_text_set(button, _("Close")); elm_object_text_set(button, _("Close"));
elm_object_part_content_set(button, "icon", ic); elm_object_part_content_set(button, "icon", ic);
evas_object_smart_callback_add(button, "clicked", _close, popup); evas_object_smart_callback_add(button, "clicked", _config_close_cb, popup);
elm_object_part_content_set(popup, "button2", button); elm_object_part_content_set(popup, "button2", button);
evas_object_show(button); evas_object_show(button);

5
src/bin/ephoto_main.c
View File

@ -640,7 +640,8 @@ _thumb_gen_size_changed_timer_cb(void *data)
{ {
Ethumb_Thumb_Format format; Ethumb_Thumb_Format format;
format = (long) evas_object_data_get(o, "ephoto_format"); format = (Ethumb_Thumb_Format) (uintptr_t)
evas_object_data_get(o, "ephoto_format");
if (format) if (format)
{ {
elm_thumb_format_set(o, format); elm_thumb_format_set(o, format);
@ -753,7 +754,7 @@ ephoto_thumb_path_set(Evas_Object *obj, const char *path)
} }
} }
elm_thumb_format_set(obj, format); elm_thumb_format_set(obj, format);
evas_object_data_set(obj, "ephoto_format", (void *) (long) format); evas_object_data_set(obj, "ephoto_format", (void *) (uintptr_t) format);
elm_thumb_crop_align_set(obj, 0.5, 0.5); elm_thumb_crop_align_set(obj, 0.5, 0.5);
elm_thumb_aspect_set(obj, ETHUMB_THUMB_CROP); elm_thumb_aspect_set(obj, ETHUMB_THUMB_CROP);
elm_thumb_orientation_set(obj, ETHUMB_THUMB_ORIENT_ORIGINAL); elm_thumb_orientation_set(obj, ETHUMB_THUMB_ORIENT_ORIGINAL);