diff options
| author | Daniel Juyung Seo <juyung.seo@samsung.com> | 2013-12-03 21:42:17 +0900 |
|---|---|---|
| committer | Daniel Juyung Seo <juyung.seo@samsung.com> | 2013-12-03 21:42:17 +0900 |
| commit | 216cc4407e63969cf7b7634b3a3c3dd14ffa7e31 (patch) | |
| tree | f5532c6ee602c4a72f7de908ec18ec437929c643 | |
| parent | ce4082520bc44713d8fd305b95aa44d26979a55d (diff) | |
| parent | 7de81530eee84a807b648c39444e6987a54be349 (diff) | |
| download | elementary-216cc4407e63969cf7b7634b3a3c3dd14ffa7e31.tar.gz | |
Merge branch 'devs/seoz/highlight' of ssh://git.enlightenment.org/core/elementary into devs/seoz/highlight
Conflicts:
NEWS
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile_Elm_Helpers.am | 19 | ||||
| -rw-r--r-- | configure.ac | 141 | ||||
| -rw-r--r-- | data/edje_externals/Makefile.am | 10 | ||||
| -rw-r--r-- | data/objects/Makefile.am | 30 | ||||
| -rw-r--r-- | data/themes/Makefile.am | 13 | ||||
| -rw-r--r-- | doc/examples.dox | 8 | ||||
| -rw-r--r-- | doc/widgets/Makefile.am | 6 | ||||
| -rw-r--r-- | m4/efl_binary.m4 | 2 | ||||
| -rw-r--r-- | po/ar.po | 2 | ||||
| -rw-r--r-- | po/az_IR.po | 2 | ||||
| -rw-r--r-- | po/ca.po | 2 | ||||
| -rw-r--r-- | po/cs.po | 2 | ||||
| -rw-r--r-- | po/de.po | 2 | ||||
| -rw-r--r-- | po/el.po | 2 | ||||
| -rw-r--r-- | po/eo.po | 2 | ||||
| -rw-r--r-- | po/es.po | 2 | ||||
| -rw-r--r-- | po/fa.po | 2 | ||||
| -rw-r--r-- | po/fr.po | 2 | ||||
| -rw-r--r-- | po/gl.po | 2 | ||||
| -rw-r--r-- | po/he.po | 2 | ||||
| -rw-r--r-- | po/it.po | 2 | ||||
| -rw-r--r-- | po/ko_KR.po | 2 | ||||
| -rw-r--r-- | po/nl.po | 2 | ||||
| -rw-r--r-- | po/pl.po | 2 | ||||
| -rw-r--r-- | po/ps.po | 2 | ||||
| -rw-r--r-- | po/pt.po | 2 | ||||
| -rw-r--r-- | po/ru.po | 2 | ||||
| -rw-r--r-- | po/sr.po | 2 | ||||
| -rw-r--r-- | po/ur.po | 2 | ||||
| -rw-r--r-- | po/yi.po | 2 | ||||
| -rw-r--r-- | po/zh_CN.po | 2 | ||||
| -rw-r--r-- | src/bin/test_tooltip.c | 93 | ||||
| -rw-r--r-- | src/examples/Makefile.am | 14 | ||||
| -rw-r--r-- | src/lib/elm_genlist.c | 17 | ||||
| -rw-r--r-- | src/lib/elm_tooltip.h | 52 | ||||
| -rw-r--r-- | src/lib/els_tooltip.c | 85 | ||||
| -rw-r--r-- | src/modules/prefs/Makefile.am | 8 |
39 files changed, 400 insertions, 151 deletions
diff --git a/.gitignore b/.gitignore index 8a3caf14e..84e5f7e54 100644 --- a/.gitignore +++ b/.gitignore @@ -18,8 +18,10 @@ Makefile Makefile.in *.so +*.dll *.edj *.cmake +*.exe elementary-*-doc.tar.bz2 /aclocal.m4 /autom4te.cache/ @@ -38,6 +40,7 @@ elementary-*-doc.tar.bz2 /ltmain.sh /missing /stamp-h1 +/ar-lib /test-driver core cscope.* @@ -1760,3 +1760,7 @@ 2013-11-28 Daniel Juyung Seo (SeoZ) * spinner: fix mouse wheel support. + +2013-12-01 Abhinandan Aryadipta (aryarockstar) + + * tooltip: Added elm_object_tooltip_orient_set() and elm_object_tooltip_orient_get(). diff --git a/Makefile_Elm_Helpers.am b/Makefile_Elm_Helpers.am new file mode 100644 index 000000000..f26ceb7b7 --- /dev/null +++ b/Makefile_Elm_Helpers.am @@ -0,0 +1,19 @@ +if HAVE_ELM_PREFS_CC +ELM_PREFS_CC = @elm_prefs_cc@ +else +ELM_PREFS_CC = $(top_builddir)/src/bin/elm_prefs_cc +endif + +AM_V_EPB = $(am__v_EPB_@AM_V@) +am__v_EPB_ = $(am__v_EPB_@AM_DEFAULT_V@) +am__v_EPB_0 = @echo " EPB " $@; + +EDJE_CC = @edje_cc@ +EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@) +EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@) +EDJE_CC_FLAGS_VERBOSE_1 = -v +EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -fastdecomp -id $(srcdir) -fd $(srcdir) + +AM_V_EDJ = $(am__v_EDJ_@AM_V@) +am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@) +am__v_EDJ_0 = @echo " EDJ " $@; diff --git a/configure.ac b/configure.ac index 7268b28ed..e4bc736b1 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ dnl m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || ech ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) ##-- When doing snapshots - change soname. remove dnl on below line -dnl m4_define([relname], [beta2]) +dnl m4_define([relname], [dev]) dnl m4_define([v_rel], [-release relname]) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])], @@ -18,7 +18,7 @@ m4_define([lt_age], v_min) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## -AC_INIT([elementary], [v_ver-beta2], [enlightenment-devel@lists.sourceforge.net]) +AC_INIT([elementary], [v_ver], [enlightenment-devel@lists.sourceforge.net]) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_MACRO_DIR([m4]) @@ -48,34 +48,6 @@ AC_C_CONST AC_C___ATTRIBUTE__ AC_FUNC_ALLOCA -AC_LIBTOOL_WIN32_DLL -define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl -define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl -AC_PROG_LIBTOOL - -##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## -##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## -m4_ifdef([v_rev], , [m4_define([v_rev], [0])]) -m4_ifdef([v_rel], , [m4_define([v_rel], [])]) -AC_DEFINE_UNQUOTED(VMAJ, [v_maj], [Major version]) -AC_DEFINE_UNQUOTED(VMIN, [v_min], [Minor version]) -AC_DEFINE_UNQUOTED(VMIC, [v_mic], [Micro version]) -AC_DEFINE_UNQUOTED(VREV, [v_rev], [Revison]) -version_info="lt_rev:lt_cur:lt_age" -release_info="v_rel" -AC_SUBST(version_info) -AC_SUBST(release_info) -##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## -##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## -VMAJ=v_maj -VMIN=v_min -AC_SUBST(VMAJ) -AC_SUBST(VMIN) -ELM_VERSION_MAJOR=v_maj -ELM_VERSION_MINOR=v_min -AC_SUBST(ELM_VERSION_MAJOR) -AC_SUBST(ELM_VERSION_MINOR) - # pkg-config PKG_PROG_PKG_CONFIG @@ -95,44 +67,6 @@ fi AC_SUBST(MODULE_EDJE) AC_DEFINE_UNQUOTED(MODULE_EDJE, "$MODULE_EDJE", "Edje module architecture") -case "$host_os" in - mingw32ce* | cegcc*) - MODULE_ARCH="$host_os-$host_cpu" - ;; - *) - MODULE_ARCH="$host_os-$host_cpu-v_maj.v_min.v_mic" - ;; -esac -AC_SUBST(release_info) -AC_SUBST(MODULE_ARCH) -AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture") - -EFL_SHARED_EXTENSION="${shrext_cmds}" -AC_DEFINE_UNQUOTED(EFL_SHARED_EXTENSION, "${EFL_SHARED_EXTENSION}", "Shared extension") - -requirement_elm="" - -PKG_PROG_PKG_CONFIG - -# Check whether pkg-config supports Requires.private -if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then - pkgconfig_requires_private="Requires.private" -else - pkgconfig_requires_private="Requires" -fi -AC_SUBST(pkgconfig_requires_private) - -#================================================ -if test "x${prefix}" = "xNONE"; then - LOCALE_DIR="${ac_default_prefix}/share/locale" -else - LOCALE_DIR="${prefix}/share/locale" -fi -AC_SUBST(LOCALE_DIR) -#================================================ -elementary_icon_dir="${datadir}/icons" -AC_SUBST(elementary_icon_dir) - lt_enable_auto_import="" ELM_UNIX_DEF="#undef" ELM_WIN32_DEF="#undef" @@ -207,6 +141,77 @@ m4_ifdef([v_mic], EFL_COMPILER_FLAG([-W]) ]) +if test "x${have_windows}" = "xyes" ; then + lt_cv_deplibs_check_method='pass_all' +fi +AC_LIBTOOL_WIN32_DLL +define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl +define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) +LT_INIT([win32-dll disable-static pic-only]) +#AC_PROG_LIBTOOL + +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +m4_ifdef([v_rev], , [m4_define([v_rev], [0])]) +m4_ifdef([v_rel], , [m4_define([v_rel], [])]) +AC_DEFINE_UNQUOTED(VMAJ, [v_maj], [Major version]) +AC_DEFINE_UNQUOTED(VMIN, [v_min], [Minor version]) +AC_DEFINE_UNQUOTED(VMIC, [v_mic], [Micro version]) +AC_DEFINE_UNQUOTED(VREV, [v_rev], [Revison]) +version_info="lt_rev:lt_cur:lt_age" +release_info="v_rel" +AC_SUBST(version_info) +AC_SUBST(release_info) +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +VMAJ=v_maj +VMIN=v_min +AC_SUBST(VMAJ) +AC_SUBST(VMIN) +ELM_VERSION_MAJOR=v_maj +ELM_VERSION_MINOR=v_min +AC_SUBST(ELM_VERSION_MAJOR) +AC_SUBST(ELM_VERSION_MINOR) + +case "$host_os" in + mingw32ce* | cegcc*) + MODULE_ARCH="$host_os-$host_cpu" + ;; + *) + MODULE_ARCH="$host_os-$host_cpu-v_maj.v_min.v_mic" + ;; +esac +AC_SUBST(release_info) +AC_SUBST(MODULE_ARCH) +AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture") + +EFL_SHARED_EXTENSION="${shrext_cmds}" +AC_DEFINE_UNQUOTED(EFL_SHARED_EXTENSION, "${EFL_SHARED_EXTENSION}", "Shared extension") + +requirement_elm="" + +PKG_PROG_PKG_CONFIG + +# Check whether pkg-config supports Requires.private +if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then + pkgconfig_requires_private="Requires.private" +else + pkgconfig_requires_private="Requires" +fi +AC_SUBST(pkgconfig_requires_private) + +#================================================ +if test "x${prefix}" = "xNONE"; then + LOCALE_DIR="${ac_default_prefix}/share/locale" +else + LOCALE_DIR="${prefix}/share/locale" +fi +AC_SUBST(LOCALE_DIR) +#================================================ +elementary_icon_dir="${datadir}/icons" +AC_SUBST(elementary_icon_dir) + have_fork="no" want_quicklaunch="auto" AC_ARG_ENABLE([quick-launch], diff --git a/data/edje_externals/Makefile.am b/data/edje_externals/Makefile.am index b5762b121..a4ae9066d 100644 --- a/data/edje_externals/Makefile.am +++ b/data/edje_externals/Makefile.am @@ -1,11 +1,9 @@ AUTOMAKE_OPTIONS = 1.4 foreign MAINTAINERCLEANFILES = Makefile.in -EDJE_CC = @edje_cc@ -EDJE_FLAGS_VERBOSE_ = -EDJE_FLAGS_VERBOSE_0 = -EDJE_FLAGS_VERBOSE_1 = -v -EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) -id $(top_srcdir)/data/edje_externals -fd $(top_srcdir)/data/edje_externals +include ../../Makefile_Elm_Helpers.am + +EDJE_CC_FLAGS += -id $(top_srcdir)/data/edje_externals -fd $(top_srcdir)/data/edje_externals filesdir = $(datadir)/elementary/edje_externals files_DATA = icons.edj @@ -36,7 +34,7 @@ ico_thumb.png \ ico_toolbar.png icons.edj: Makefile $(EXTRA_DIST) - $(EDJE_CC) $(EDJE_FLAGS) \ + $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \ $(top_srcdir)/data/edje_externals/icons.edc \ $(top_builddir)/data/edje_externals/icons.edj diff --git a/data/objects/Makefile.am b/data/objects/Makefile.am index c6a775db8..f18e34743 100644 --- a/data/objects/Makefile.am +++ b/data/objects/Makefile.am @@ -1,18 +1,14 @@ AUTOMAKE_OPTIONS = 1.4 foreign MAINTAINERCLEANFILES = Makefile.in -EDJE_CC = @edje_cc@ -EDJE_FLAGS_VERBOSE_ = -EDJE_FLAGS_VERBOSE_0 = -EDJE_FLAGS_VERBOSE_1 = -v -EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) -id $(top_srcdir)/data/objects -fd $(top_srcdir)/data/objects +include ../../Makefile_Elm_Helpers.am + +EDJE_CC_FLAGS += -id $(top_srcdir)/data/objects -fd $(top_srcdir)/data/objects filesdir = $(datadir)/elementary/objects files_DATA = test.edj test_external.edj multip.edj cursors.edj font_preview.edj postit_ent.edj multibuttonentry.edj test_prefs.edj test_prefs.epb test_focus_custom.edj -ELM_PREFS_CC = $(top_builddir)/src/bin/@ELM_PREFS_CC_PRG@ - EXTRA_DIST = \ test.edc \ test_external.edc \ @@ -37,46 +33,46 @@ border5.png \ border6.png test.edj: Makefile $(EXTRA_DIST) - $(EDJE_CC) $(EDJE_FLAGS) \ + $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \ $(top_srcdir)/data/objects/test.edc \ $(top_builddir)/data/objects/test.edj test_external.edj: Makefile $(EXTRA_DIST) - $(EDJE_CC) $(EDJE_FLAGS) \ + $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \ $(top_srcdir)/data/objects/test_external.edc \ $(top_builddir)/data/objects/test_external.edj multip.edj: Makefile $(EXTRA_DIST) - $(EDJE_CC) $(EDJE_FLAGS) \ + $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \ $(top_srcdir)/data/objects/multip.edc \ $(top_builddir)/data/objects/multip.edj colorpreview.edj: Makefile $(EXTRA_DIST) - $(EDJE_CC) $(EDJE_FLAGS) \ + $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \ $(top_srcdir)/data/objects/colorpreview.edc \ $(top_builddir)/data/objects/colorpreview.edj cursors.edj: Makefile $(EXTRA_DIST) - $(EDJE_CC) $(EDJE_FLAGS) \ + $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \ $(top_srcdir)/data/objects/cursors.edc \ $(top_builddir)/data/objects/cursors.edj font_preview.edj: Makefile $(EXTRA_DIST) - $(EDJE_CC) $(EDJE_FLAGS) \ + $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \ $(top_srcdir)/data/objects/font_preview.edc \ $(top_builddir)/data/objects/font_preview.edj postit_ent.edj: Makefile $(EXTRA_DIST) - $(EDJE_CC) $(EDJE_FLAGS) \ + $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \ $(top_srcdir)/data/objects/postit_ent.edc \ $(top_builddir)/data/objects/postit_ent.edj multibuttonentry.edj: Makefile $(EXTRA_DIST) - $(EDJE_CC) $(EDJE_FLAGS) \ + $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \ $(top_srcdir)/data/objects/multibuttonentry.edc \ $(top_builddir)/data/objects/multibuttonentry.edj test_prefs.edj: Makefile test_prefs.edc - $(EDJE_CC) $(EDJE_FLAGS) \ + $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \ $(top_srcdir)/data/objects/test_prefs.edc \ $(top_builddir)/data/objects/test_prefs.edj @@ -86,7 +82,7 @@ test_prefs.epb: Makefile test_prefs.epc $(top_builddir)/data/objects/test_prefs.epb test_focus_custom.edj: Makefile test_focus_custom.edc - $(EDJE_CC) $(EDJE_FLAGS) \ + $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \ $(top_srcdir)/data/objects/test_focus_custom.edc \ $(top_builddir)/data/objects/test_focus_custom.edj diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am index 8b65e7f7b..682e5f923 100644 --- a/data/themes/Makefile.am +++ b/data/themes/Makefile.am @@ -1,19 +1,16 @@ AUTOMAKE_OPTIONS = 1.4 foreign MAINTAINERCLEANFILES = Makefile.in -EDJE_CC = @edje_cc@ -EDJE_FLAGS_VERBOSE_ = -EDJE_FLAGS_VERBOSE_0 = -EDJE_FLAGS_VERBOSE_1 = -v -EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) -id $(top_srcdir)/data/themes/img -fd $(top_srcdir)/data/themes/fnt -sd $(top_srcdir)/data/themes/snd +include ../../Makefile_Elm_Helpers.am + +EDJE_CC_FLAGS += -id $(top_srcdir)/data/themes/img -fd $(top_srcdir)/data/themes/fnt -sd $(top_srcdir)/data/themes/snd filesdir = $(datadir)/elementary/themes files_DATA = default.edj default.edj: Makefile $(EXTRA_DIST) - $(EDJE_CC) \ - -fastdecomp \ - $(EDJE_FLAGS) \ + $(AM_V_EDJ)$(EDJE_CC) \ + $(EDJE_CC_FLAGS) \ $(top_srcdir)/data/themes/default.edc \ $(top_builddir)/data/themes/default.edj diff --git a/doc/examples.dox b/doc/examples.dox index dcced877f..09233292d 100644 --- a/doc/examples.dox +++ b/doc/examples.dox @@ -42,7 +42,7 @@ * @ref dayselector_example * * @ref mapbuf_example - + * * @ref map_example_01 * * @ref map_example_02 @@ -118,6 +118,8 @@ * @ref prefs_example_02 * * @ref prefs_example_03 + * + * @ref label_example_01 */ /** @@ -3531,7 +3533,7 @@ * them and see what changes in appearance those properties cause. * * We start with the setup code that by now you should be familiar with: - * @until show(bg) + * @until elm_win_autodel_set * * For our first label we have a moderately long text(that doesn't fit in the * label's width) so we will make it a sliding label. Since the text isn't @@ -3561,7 +3563,7 @@ * @until show(label * * And last but not least for our sixth label we set the style to "marker" and - * the color to red(the default color is white which would be hard to see on + * the color to red (the default color is white which would be hard to see on * our white background): * @until show(label * diff --git a/doc/widgets/Makefile.am b/doc/widgets/Makefile.am index c1508b818..aaee0666f 100644 --- a/doc/widgets/Makefile.am +++ b/doc/widgets/Makefile.am @@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in if EFL_BUILD_DOC +include ../../Makefile_Elm_Helpers.am + AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/src/lib \ @@ -19,12 +21,10 @@ AM_CPPFLAGS = \ @ELEMENTARY_EWEATHER_CFLAGS@ \ @ELEMENTARY_EMAP_CFLAGS@ -ELM_PREFS_CC = $(top_builddir)/src/bin/@ELM_PREFS_CC_PRG@ - noinst_DATA = widget_preview_prefs.epb widget_preview_prefs.epb: Makefile widget_preview_prefs.epc - $(ELM_PREFS_CC) $(ELM_PREFS_FLAGS) \ + $(AM_V_EPB)$(ELM_PREFS_CC) $(ELM_PREFS_FLAGS) \ $(top_srcdir)/doc/widgets/widget_preview_prefs.epc \ $(top_builddir)/doc/widgets/widget_preview_prefs.epb diff --git a/m4/efl_binary.m4 b/m4/efl_binary.m4 index c77468817..f6262dc73 100644 --- a/m4/efl_binary.m4 +++ b/m4/efl_binary.m4 @@ -53,6 +53,7 @@ AC_DEFUN([EFL_WITH_BIN], [ m4_pushdef([DOWN], m4_translit([[$2]], [-A-Z], [_a-z]))dnl +m4_pushdef([UP], m4_translit([[$2]], [-a-z], [_A-Z]))dnl dnl configure option @@ -66,6 +67,7 @@ AC_MSG_NOTICE(DOWN[ set to ${_efl_with_binary}]) with_binary_[]m4_defn([DOWN])=${_efl_with_binary} +AM_CONDITIONAL(HAVE_[]UP, [test "x${_efl_binary_define}" = "xyes"]) AC_SUBST(DOWN) ]) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2010-12-26 10:05+0200\n" "Last-Translator: Tom Hacohen <tom.hacohen@samsung.com>\n" "Language-Team: General\n" diff --git a/po/az_IR.po b/po/az_IR.po index d9bf7cb35..101d03ec3 100644 --- a/po/az_IR.po +++ b/po/az_IR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2010-12-26 10:05+0200\n" "Last-Translator: Tom Hacohen <tom.hacohen@samsung.com>\n" "Language-Team: General\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2013-03-22 00:32+0100\n" "Last-Translator: JoanColl <jcoll2@gmail.com>\n" "Language-Team: Catalan\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2012-12-16 21:59+0100\n" "Last-Translator: Tomáš Čech <sleep_walker@suse.cz>\n" "Language-Team: Czech <kde-i18n-doc@kde.org>\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary 0.7.0.57309\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2011-02-25 20:22+0100\n" "Last-Translator: Fabian Nowak <timystery@arcor.de>\n" "Language-Team: German\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2012-12-19 15:58+0200\n" "Last-Translator: Efstathios Iosifidis <iosifidis@opensuse.org>\n" "Language-Team: Ελληνικά, Σύγχρονα <opensuse-translation-el@opensuse.org>\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2013-01-23 05:24+0000\n" "Last-Translator: Eliovir <Unknown>\n" "Language-Team: Esperanto <eo@li.org>\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2013-01-04 14:42+0100\n" "Last-Translator: Adrián Arévalo <adri58@gmail.com>\n" "Language-Team: Enlightenment Team\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2010-12-26 10:05+0200\n" "Last-Translator: Tom Hacohen <tom.hacohen@samsung.com>\n" "Language-Team: General\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2013-06-20 07:08+0000\n" "Last-Translator: Eliovir <Unknown>\n" "Language-Team: French <sansgourou@gmail.com>\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2013-11-07 09:25+0100\n" "Last-Translator: Aníbal Garrido Hermo <khanyux@gmail.com>\n" "Language-Team: Galician <proxecto@trasno.net>\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2010-12-26 10:05+0200\n" "Last-Translator: Aharon Hillel <a.hillel@samsung.com>\n" "Language-Team: General\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2013-11-10 13:35+0100\n" "Last-Translator: Massimo Maiurana <maiurana@gmail.com>\n" "Language-Team: none\n" diff --git a/po/ko_KR.po b/po/ko_KR.po index 4d8fe9407..f83851fe4 100644 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2013-11-27 11:32+0900\n" "Last-Translator: Seong-ho Cho <darkcircle.0426@gmail.com>\n" "Language-Team: General\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary 0.7.0.57309\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2011-06-19 16:41+0100\n" "Last-Translator: Heimen Stoffels <vistausss@gmail.com>\n" "Language-Team: Dutch <vistausss@gmail.com>\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2013-11-23 14:48+0100\n" "Last-Translator: Konrad Makowski <poczta@konradmakowski.pl>\n" "Language-Team: \n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2010-12-26 10:05+0200\n" "Last-Translator: Tom Hacohen <tom.hacohen@samsung.com>\n" "Language-Team: General\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2013-11-05 14:11-0000\n" "Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n" "Language-Team: \n" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary 1.7.99.76688\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2012-09-14 22:20+0300\n" "Last-Translator: Danny Moshnakov <dm@agent.co.il>\n" "Language-Team: ru <ru>\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: а\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2013-04-11 16:30+0000\n" "Last-Translator: Саша Петровић <salepetronije@gmail.com>\n" "Language-Team: српски <xfce-i18n@xfce.org>\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2010-12-26 10:05+0200\n" "Last-Translator: Tom Hacohen <tom.hacohen@samsung.com>\n" "Language-Team: General\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2010-12-26 10:05+0200\n" "Last-Translator: Tom Hacohen <tom.hacohen@samsung.com>\n" "Language-Team: General\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index df0a5d9fa..f9706db0d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-11-29 19:31+0900\n" +"POT-Creation-Date: 2013-12-01 18:58+0900\n" "PO-Revision-Date: 2012-12-22 03:55+0800\n" "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n" "Language-Team: Chinese (simplified)\n" diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c index 241f04f78..70de973d2 100644 --- a/src/bin/test_tooltip.c +++ b/src/bin/test_tooltip.c @@ -201,6 +201,91 @@ _tt_text_replace(void *data EINA_UNUSED, } static void +_tt_orient_text_replace(void *data EINA_UNUSED, + Evas_Object *obj, + void *event_info EINA_UNUSED) +{ + static Elm_Tooltip_Orient orient; + + orient = elm_object_tooltip_orient_get(obj); + orient++; + if (orient >= ELM_TOOLTIP_ORIENT_LAST) + orient = ELM_TOOLTIP_ORIENT_TOP_LEFT; + switch(orient) + { + case ELM_TOOLTIP_ORIENT_TOP_LEFT: + { + elm_object_tooltip_text_set(obj, "Top Left"); + elm_object_tooltip_orient_set(obj, ELM_TOOLTIP_ORIENT_TOP_LEFT); + printf("elm_object_tooltip_orient_get :: Orientation: ELM_TOOLTIP_ORIENT_TOP_LEFT\n"); + break; + } + case ELM_TOOLTIP_ORIENT_TOP: + { + elm_object_tooltip_text_set(obj, "Top"); + elm_object_tooltip_orient_set(obj, ELM_TOOLTIP_ORIENT_TOP); + printf("elm_object_tooltip_orient_get :: Orientation: ELM_TOOLTIP_ORIENT_TOP\n"); + break; + } + case ELM_TOOLTIP_ORIENT_TOP_RIGHT: + { + elm_object_tooltip_text_set(obj, "Top Right"); + elm_object_tooltip_orient_set(obj, ELM_TOOLTIP_ORIENT_TOP_RIGHT); + printf("elm_object_tooltip_orient_get :: Orientation: ELM_TOOLTIP_ORIENT_TOP_RIGHT\n"); + break; + } + case ELM_TOOLTIP_ORIENT_LEFT: + { + elm_object_tooltip_text_set(obj, "Left"); + elm_object_tooltip_orient_set(obj, ELM_TOOLTIP_ORIENT_LEFT); + printf("elm_object_tooltip_orient_get :: Orientation: ELM_TOOLTIP_ORIENT_LEFT\n"); + break; + } + case ELM_TOOLTIP_ORIENT_CENTER: + { + elm_object_tooltip_text_set(obj, "Center"); + elm_object_tooltip_orient_set(obj, ELM_TOOLTIP_ORIENT_CENTER); + printf("elm_object_tooltip_orient_get :: Orientation: ELM_TOOLTIP_ORIENT_CENTER\n"); + break; + } + case ELM_TOOLTIP_ORIENT_RIGHT: + { + elm_object_tooltip_text_set(obj, "Right"); + elm_object_tooltip_orient_set(obj, ELM_TOOLTIP_ORIENT_RIGHT); + printf("elm_object_tooltip_orient_get :: Orientation: ELM_TOOLTIP_ORIENT_RIGHT\n"); + break; + } + case ELM_TOOLTIP_ORIENT_BOTTOM_LEFT: + { + elm_object_tooltip_text_set(obj, "Bottom Left"); + elm_object_tooltip_orient_set(obj, ELM_TOOLTIP_ORIENT_BOTTOM_LEFT); + printf("elm_object_tooltip_orient_get :: Orientation: ELM_TOOLTIP_ORIENT_BOTTOM_LEFT\n"); + break; + } + case ELM_TOOLTIP_ORIENT_BOTTOM: + { + elm_object_tooltip_text_set(obj, "Bottom"); + elm_object_tooltip_orient_set(obj, ELM_TOOLTIP_ORIENT_BOTTOM); + printf("elm_object_tooltip_orient_get :: Orientation: ELM_TOOLTIP_ORIENT_BOTTOM\n"); + break; + } + case ELM_TOOLTIP_ORIENT_BOTTOM_RIGHT: + { + elm_object_tooltip_text_set(obj, "Bottom Right"); + elm_object_tooltip_orient_set(obj, ELM_TOOLTIP_ORIENT_BOTTOM_RIGHT); + printf("elm_object_tooltip_orient_get :: Orientation: ELM_TOOLTIP_ORIENT_BOTTOM_RIGHT\n"); + break; + } + default: + { + elm_object_tooltip_text_set(obj, "No Orientation"); + elm_object_tooltip_orient_set(obj, ELM_TOOLTIP_ORIENT_NONE); + printf("elm_object_tooltip_orient_get :: Orientation: ELM_TOOLTIP_ORIENT_NONE\n"); + } + }; +} + +static void _tt_timer_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, @@ -405,6 +490,14 @@ test_tooltip(void *data EINA_UNUSED, evas_object_show(bt); bt = elm_button_add(win); + elm_object_text_set(bt, "Orient Tooltip, click to change"); + elm_object_tooltip_text_set(bt, "Top Left"); + elm_object_tooltip_orient_set(bt, ELM_TOOLTIP_ORIENT_TOP_LEFT); + evas_object_smart_callback_add(bt, "clicked", _tt_orient_text_replace, NULL); + elm_box_pack_end(bx, bt); + evas_object_show(bt); + + bt = elm_button_add(win); elm_object_text_set(bt, "Simple text tooltip, click to change"); elm_object_tooltip_text_set(bt, "Initial"); evas_object_smart_callback_add(bt, "clicked", _tt_text_replace, NULL); diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am index 7184ca10f..fc35c7515 100644 --- a/src/examples/Makefile.am +++ b/src/examples/Makefile.am @@ -1,5 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in +include ../../Makefile_Elm_Helpers.am + .PHONY: screenshots examplesdir = $(pkgdatadir)/examples @@ -27,14 +29,6 @@ LDADD = \ @ELEMENTARY_X_LIBS@ \ $(top_builddir)/src/lib/libelementary.la -EDJE_CC = @edje_cc@ -EDJE_FLAGS_VERBOSE_ = -EDJE_FLAGS_VERBOSE_0 = -EDJE_FLAGS_VERBOSE_1 = -v -EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) - -ELM_PREFS_CC = $(top_builddir)/src/bin/@ELM_PREFS_CC_PRG@ - ELEMENTARY_CODEGEN = $(top_builddir)/src/bin/@ELEMENTARY_CODEGEN_PRG@ ELEMENTARY_CODEGEN_FLAGS = --prefix=codegen_example @@ -148,10 +142,10 @@ win_example.c \ track_example_01.c .edc.edj: - $(EDJE_CC) $(EDJE_FLAGS) $< $@ + $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@ .epc.epb: - $(ELM_PREFS_CC) $< $@ + $(AM_V_EPB)$(ELM_PREFS_CC) $< $@ if EFL_INSTALL_EXAMPLES files_DATA += $(SRCS) \ diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index 19d76e359..c43241953 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -5202,7 +5202,12 @@ _item_content_get_hook(Elm_Gen_Item *it, else if (it->decorate_it_set) ret = edje_object_part_swallow_get(it->item->deco_it_view, part); if (!ret) - ret = edje_object_part_swallow_get(VIEW(it), part); + { + if (part) + ret = edje_object_part_swallow_get(VIEW(it), part); + else + ret = edje_object_part_swallow_get(VIEW(it), "elm.swallow.icon"); + } return ret; } @@ -5217,10 +5222,12 @@ _item_text_get_hook(Elm_Gen_Item *it, else if (it->decorate_it_set) ret = edje_object_part_text_get(it->item->deco_it_view, part); if (!ret) - if (part) - ret = edje_object_part_text_get(VIEW(it), part); - else - ret = edje_object_part_text_get(VIEW(it), "elm.text"); + { + if (part) + ret = edje_object_part_text_get(VIEW(it), part); + else + ret = edje_object_part_text_get(VIEW(it), "elm.text"); + } return ret; } diff --git a/src/lib/elm_tooltip.h b/src/lib/elm_tooltip.h index 3daf1c7ea..21bbfcd46 100644 --- a/src/lib/elm_tooltip.h +++ b/src/lib/elm_tooltip.h @@ -10,6 +10,58 @@ */ /** + * @brief Possible orient values for tooltip. + * + * These values should be used in conjunction to elm_object_tooltip_orient_set() to + * set the position around which the tooltip should appear(relative to its parent) + * + * @ingroup Tooltips + */ +typedef enum +{ + ELM_TOOLTIP_ORIENT_NONE = 0, /**< Default value, Tooltip moves with mouse pointer */ + ELM_TOOLTIP_ORIENT_TOP_LEFT, /**< Tooltip should appear at the top left of parent */ + ELM_TOOLTIP_ORIENT_TOP, /**< Tooltip should appear at the top of parent */ + ELM_TOOLTIP_ORIENT_TOP_RIGHT, /**< Tooltip should appear at the top right of parent */ + ELM_TOOLTIP_ORIENT_LEFT, /**< Tooltip should appear at the left of parent */ + ELM_TOOLTIP_ORIENT_CENTER, /**< Tooltip should appear at the center of parent */ + ELM_TOOLTIP_ORIENT_RIGHT, /**< Tooltip should appear at the right of parent */ + ELM_TOOLTIP_ORIENT_BOTTOM_LEFT, /**< Tooltip should appear at the bottom left of parent */ + ELM_TOOLTIP_ORIENT_BOTTOM, /**< Tooltip should appear at the bottom of parent */ + ELM_TOOLTIP_ORIENT_BOTTOM_RIGHT, /**< Tooltip should appear at the bottom right of parent */ + ELM_TOOLTIP_ORIENT_LAST /**< Sentinel value, @b don't use */ + } Elm_Tooltip_Orient; + +/** + * @def elm_object_tooltip_orient_set + * @since 1.9 + * + * @brief Sets the orientation of the tooltip around the owner region + * + * Sets the position in which tooltip will appear around its owner. By default, + * #ELM_TOOLTIP_ORIENT_NONE is set. + * + * @param[in] obj owner widget. + * @param[in] orient orientation. + * + * @ingroup Tooltips + * @see @ref Elm_Tooltip_Orient for possible values. + */ +EAPI void elm_object_tooltip_orient_set(Evas_Object *obj, Elm_Tooltip_Orient orient); + +/** + * @brief Returns the orientation of Tooltip + * + * @param obj The owner object + * @return The orientation of the tooltip + * + * @ingroup Tooltips + * @see elm_object_tooltip_orient_set() + * @ref Elm_Tooltip_Orient for possible values. + */ +EAPI Elm_Tooltip_Orient elm_object_tooltip_orient_get(const Evas_Object *obj); + +/** * Called back when a widget's tooltip is activated and needs content. * @param data user-data given to elm_object_tooltip_content_cb_set() * @param obj owner widget. diff --git a/src/lib/els_tooltip.c b/src/lib/els_tooltip.c index 9f5dd58d7..63cbb57f0 100644 --- a/src/lib/els_tooltip.c +++ b/src/lib/els_tooltip.c @@ -56,6 +56,7 @@ struct _Elm_Tooltip { double x, y; } rel_pos; + Elm_Tooltip_Orient orient; /** orientation for tooltip */ double hide_timeout; /* from theme */ Eina_Bool visible_lock:1; Eina_Bool changed_style:1; @@ -155,8 +156,12 @@ _elm_tooltip_show(Elm_Tooltip *tt) (tt->eventarea, EVAS_CALLBACK_MOVE, _elm_tooltip_obj_move_cb, tt); evas_object_event_callback_add (tt->eventarea, EVAS_CALLBACK_RESIZE, _elm_tooltip_obj_resize_cb, tt); - evas_object_event_callback_add - (tt->eventarea, EVAS_CALLBACK_MOUSE_MOVE, (Evas_Object_Event_Cb)_elm_tooltip_obj_mouse_move_cb, tt); + //No movement of tooltip upon mouse move if orientation set + if ((tt->orient <= ELM_TOOLTIP_ORIENT_NONE) || (tt->orient >= ELM_TOOLTIP_ORIENT_LAST)) + { + evas_object_event_callback_add + (tt->eventarea, EVAS_CALLBACK_MOUSE_MOVE, (Evas_Object_Event_Cb)_elm_tooltip_obj_mouse_move_cb, tt); + } tt->changed_style = EINA_TRUE; _elm_tooltip_reconfigure_job_start(tt); @@ -520,6 +525,60 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt) msg = alloca(sizeof(Edje_Message_Float_Set) + sizeof(double)); msg->count = 2; + //Orient calculations if orient set + switch(tt->orient) + { + case ELM_TOOLTIP_ORIENT_TOP_LEFT: + evas_object_move(tt->tooltip, ox - tw, oy - th); + rel_x = 1.1; + rel_y = 1.1; + break; + case ELM_TOOLTIP_ORIENT_TOP: + evas_object_move(tt->tooltip, ox + ((ow - tw) / 2), oy - th); + rel_x = 0.5; + rel_y = 1.1; + break; + case ELM_TOOLTIP_ORIENT_TOP_RIGHT: + evas_object_move(tt->tooltip, ox + ow, oy - th); + rel_x = -1.1; + rel_y = 1.1; + break; + case ELM_TOOLTIP_ORIENT_LEFT: + evas_object_move(tt->tooltip, ox - tw, oy + ((oh - th) / 2)); + rel_x = 1.1; + rel_y = 0.5; + break; + case ELM_TOOLTIP_ORIENT_CENTER: + evas_object_move(tt->tooltip, ox + ((ow - tw) / 2), oy + ((oh - th) / 2)); + rel_x = 0.5; + rel_y = 0.5; + break; + case ELM_TOOLTIP_ORIENT_RIGHT: + evas_object_move(tt->tooltip, ox + ow, oy + ((oh - th) / 2)); + rel_x = -1.1; + rel_y = 0.5; + break; + case ELM_TOOLTIP_ORIENT_BOTTOM_LEFT: + evas_object_move(tt->tooltip, ox - tw, oy + oh); + rel_x = 1.1; + rel_y = -1.1; + break; + case ELM_TOOLTIP_ORIENT_BOTTOM: + evas_object_move(tt->tooltip, ox + ((ow - tw) / 2), oy + oh); + rel_x = 0.5; + rel_y = -1.1; + break; + case ELM_TOOLTIP_ORIENT_BOTTOM_RIGHT: + evas_object_move(tt->tooltip, ox + ow, oy + oh); + rel_x = -1.1; + rel_y = -1.1; + break; + default: + { /*Do Nothing!!*/ + } + }; + evas_object_show(tt->tooltip); + msg->val[0] = rel_x; msg->val[1] = rel_y; tt->rel_pos.x = rel_x; @@ -665,6 +724,28 @@ _elm_tooltip_data_clean(Elm_Tooltip *tt) tt->del_cb = NULL; } +EAPI void +elm_object_tooltip_orient_set(Evas_Object *obj, Elm_Tooltip_Orient orient) +{ + ELM_TOOLTIP_GET_OR_RETURN(tt, obj); + + if ((orient > ELM_TOOLTIP_ORIENT_NONE) && (orient < ELM_TOOLTIP_ORIENT_LAST)) + tt->orient = orient; + else + tt->orient = ELM_TOOLTIP_ORIENT_NONE; +} + +EAPI Elm_Tooltip_Orient +elm_object_tooltip_orient_get(const Evas_Object *obj) +{ + ELM_TOOLTIP_GET_OR_RETURN(tt, obj, ELM_TOOLTIP_ORIENT_NONE); + + Elm_Tooltip_Orient orient = ELM_TOOLTIP_ORIENT_NONE; + + orient = tt->orient; + return orient; +} + /** * Notify tooltip should recalculate its theme. * @internal diff --git a/src/modules/prefs/Makefile.am b/src/modules/prefs/Makefile.am index 6f19bf523..72ded15c0 100644 --- a/src/modules/prefs/Makefile.am +++ b/src/modules/prefs/Makefile.am @@ -1,10 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -EDJE_CC = @edje_cc@ -EDJE_FLAGS_VERBOSE_ = -EDJE_FLAGS_VERBOSE_0 = -EDJE_FLAGS_VERBOSE_1 = -v -EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) +include ../../../Makefile_Elm_Helpers.am EXTRA_DIST = \ elm_prefs_swallow.edc @@ -13,7 +9,7 @@ filesdir = $(libdir)/elementary/modules/prefs/$(MODULE_ARCH) files_DATA = elm_prefs_swallow.edj elm_prefs_swallow.edj: Makefile elm_prefs_swallow.edc - $(EDJE_CC) $(EDJE_FLAGS) \ + $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \ $(top_srcdir)/src/modules/prefs/elm_prefs_swallow.edc \ $(top_builddir)/src/modules/prefs/elm_prefs_swallow.edj |