2012-12-07 Luis Felipe Strano Moraes
* Release 1.7.3
+
+2012-12-08 ChunEon Park (Hermet)
+
+ * Fix the naviframe title_set problem that caused the title visible status reset.
+
+2012-12-10 Cedric Bail
+
+ * Make sure private data is not NULL in elm_interface_scrollable.
+ * Correctly handle failure case in _x11_notify_handler_image.
+ * Fix missuse of EINA_INLIST_FOREACH in elm_transit.c.
+
+2012-12-12 WooHyun Jung
+
+ * Now, dummy object is always smart member of naviframe.
+
+2012-12-12 Nicolas Aguirre
+
+ * backport r76226 : Elm: Fix Escape namespace to compile on Windows.
+
+2012-12-13 Nicolas Aguirre
+
+ * Fix build on win32
+
+2012-12-17 Vincent Torri
+
+ * Add XML output to doc
+ * Add installation rule for doc
+
+2012-12-17 Chueon Park (Hermet)
+
+ * Fix the popup that returned invalid action buttons.
+
+2012-12-17 Chueon Park (Hermet)
+
+ * Makes naviframe safety even if someone deletes the naviframe in transition finished cb.
+
+2012-12-18 Chueon Park (Hermet)
+
+ * Don't Elm_transit image animation use image preloading to avoid image flickering.
+
+2012-12-18 Chueon Park (Hermet)
+
+ * Let image update right now if the image preloading is disabled.
+
+2012-12-21 Stefan Schmidt
+
+ * Fix small memory leak in elm_map error path.
+
+2012-12-21 Jihoon Kim
+
+ * Fix memory leak in _item_tag_remove of elm_entry.
+
+2012-12-21 Luis Felipe Strano Moraes
+
+ * 1.7.4 release
+
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = elementary.pc
-.PHONY: doc screenshots
+.PHONY: doc install-doc screenshots
doc:
@echo "entering doc/"
$(MAKE) -C doc doc
+install-doc:
+ @echo "entering doc/"
+ make -C doc install-doc
+
screenshots: all
@echo "entering src/examples/"
$(MAKE) -C src/examples screenshots
uninstall uninstall-am uninstall-pkgconfigDATA
-.PHONY: doc screenshots
+.PHONY: doc install-doc screenshots
doc:
@echo "entering doc/"
$(MAKE) -C doc doc
+install-doc:
+ @echo "entering doc/"
+ make -C doc install-doc
+
screenshots: all
@echo "entering src/examples/"
$(MAKE) -C src/examples screenshots
+Elementary 1.7.4
+
+Changes since Elementary 1.7.3:
+-------------------------
+
+Fixes:
+
+ * Fix the naviframe title_set problem that caused the title visible status reset
+ * Make sure data is not NULL in elm_interface_scrollable.
+ * Correctly handle failure case in _x11_notify_handler_image.
+ * Fix missuse of EINA_INLIST_FOREACH in elm_transit.c.
+ * Now, dummy object is always smart member of naviframe.
+ * Fix the popup that returned invalid action buttons.
+ * Fix the naviframe to not have crash even if user deletes the naviframe in the transition finished cb.
+ * Fix Don't elm_transit image animation use the image preloading to avoid image flickering.
+ * Fix the image to show the image right now if the image preloading is disabled.
+ * Fix small memory leak in elm_map error path
+ * Fix memory leak in _item_tag_remove of elm_entry.
+
+
Elementary 1.7.3
Changes since Elementary 1.7.2:
-Elementary 1.7.0
+Elementary 1.7.4
******************************************************************************
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for elementary 1.7.3.
+# Generated by GNU Autoconf 2.68 for elementary 1.7.4.
#
# Report bugs to <enlightenment-devel@lists.sourceforge.net>.
#
# Identity of this package.
PACKAGE_NAME='elementary'
PACKAGE_TARNAME='elementary'
-PACKAGE_VERSION='1.7.3'
-PACKAGE_STRING='elementary 1.7.3'
+PACKAGE_VERSION='1.7.4'
+PACKAGE_STRING='elementary 1.7.4'
PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net'
PACKAGE_URL=''
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures elementary 1.7.3 to adapt to many kinds of systems.
+\`configure' configures elementary 1.7.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of elementary 1.7.3:";;
+ short | recursive ) echo "Configuration of elementary 1.7.4:";;
esac
cat <<\_ACEOF
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-elementary configure 1.7.3
+elementary configure 1.7.4
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by elementary $as_me 1.7.3, which was
+It was created by elementary $as_me 1.7.4, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
# Define the identity of the package.
PACKAGE='elementary'
- VERSION='1.7.3'
+ VERSION='1.7.4'
cat >>confdefs.h <<_ACEOF
cat >>confdefs.h <<_ACEOF
-#define VMIC 3
+#define VMIC 4
_ACEOF
#define VREV 0
_ACEOF
-version_info="8:3:7"
+version_info="8:4:7"
release_info=""
MODULE_EDJE="$host_os-$host_cpu"
;;
*)
- MODULE_ARCH="$host_os-$host_cpu-1.7.3"
+ MODULE_ARCH="$host_os-$host_cpu-1.7.4"
MODULE_EDJE="$host_os-$host_cpu-${EDJE_VERSION}"
;;
esac
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by elementary $as_me 1.7.3, which was
+This file was extended by elementary $as_me 1.7.4, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-elementary config.status 1.7.3
+elementary config.status 1.7.4
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
echo " Examples.................: ${enable_build_examples}"
echo " Examples installed.......: ${enable_install_examples}"
echo " Build elementary_config..: ${have_elementary_config}"
+echo " Documentation............: ${build_doc}"
+if test "x${build_doc}" = "xyes" ; then
+echo " Installation...........: make install-doc"
+fi
echo
echo "Compilation................: make (or gmake)"
echo " CPPFLAGS.................: $CPPFLAGS"
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
m4_define([v_maj], [1])
m4_define([v_min], [7])
-m4_define([v_mic], [3])
+m4_define([v_mic], [4])
m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
##-- When released, remove the dnl on the below line
echo " Examples.................: ${enable_build_examples}"
echo " Examples installed.......: ${enable_install_examples}"
echo " Build elementary_config..: ${have_elementary_config}"
+echo " Documentation............: ${build_doc}"
+if test "x${build_doc}" = "xyes" ; then
+echo " Installation...........: make install-doc"
+fi
echo
echo "Compilation................: make (or gmake)"
echo " CPPFLAGS.................: $CPPFLAGS"
MAN_OUTPUT = man
MAN_EXTENSION = .3
MAN_LINKS = YES
-GENERATE_XML = NO
+GENERATE_XML = YES
XML_SCHEMA =
XML_DTD =
GENERATE_AUTOGEN_DEF = NO
MAINTAINERCLEANFILES = Makefile.in
-.PHONY: doc
+.PHONY: doc install-doc
PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
doc-clean:
rm -rf img/widget html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
-gen-doc:
+doc-build:
$(efl_doxygen)
cp -r $(srcdir)/img/* html/
cp -r $(srcdir)/img/* latex/
#run the last rule whenever the elm widget tree changes
#commit the changed pictures, then. depends on python and graphviz
-doc: all doc-clean widget-preview gen-doc
+doc: all doc-clean widget-preview doc-build
@echo "Entering src/examples/"
$(MAKE) -C $(top_builddir)/src/examples screenshots
rm -rf $(PACKAGE_DOCNAME).tar*
mkdir -p $(PACKAGE_DOCNAME)/doc
- cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc
+ cp -R html/ latex/ man/ xml/ $(PACKAGE_DOCNAME)/doc
tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
bzip2 -9 $(PACKAGE_DOCNAME).tar
rm -rf $(PACKAGE_DOCNAME)/
clean-local: doc-clean
+# what about examples screenshots ?
+install-doc: doc-build
+ install -d $(docdir)
+ cp -R html latex man xml $(docdir)
+
+uninstall-local:
+ rm -rf $(docdir)/html $(docdir)/latex $(docdir)/man $(docdir)/xml
+
else
doc:
@echo "Documentation not built. Run ./configure --help"
+install-doc: doc
+
endif
EXTRA_DIST = Doxyfile.in $(wildcard img/*.*) e.css head.html foot.html shot.sh \
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+@EFL_BUILD_DOC_FALSE@uninstall-local:
@EFL_BUILD_DOC_FALSE@clean-local:
clean: clean-recursive
ps-am:
-uninstall-am:
+uninstall-am: uninstall-local
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
install-am install-strip tags-recursive
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am
+ uninstall uninstall-am uninstall-local
-.PHONY: doc
+.PHONY: doc install-doc
@EFL_BUILD_DOC_TRUE@widget-build:
@EFL_BUILD_DOC_TRUE@ @$(MAKE) -C widgets
@EFL_BUILD_DOC_TRUE@doc-clean:
@EFL_BUILD_DOC_TRUE@ rm -rf img/widget html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
-@EFL_BUILD_DOC_TRUE@gen-doc:
+@EFL_BUILD_DOC_TRUE@doc-build:
@EFL_BUILD_DOC_TRUE@ $(efl_doxygen)
@EFL_BUILD_DOC_TRUE@ cp -r $(srcdir)/img/* html/
@EFL_BUILD_DOC_TRUE@ cp -r $(srcdir)/img/* latex/
#run the last rule whenever the elm widget tree changes
#commit the changed pictures, then. depends on python and graphviz
-@EFL_BUILD_DOC_TRUE@doc: all doc-clean widget-preview gen-doc
+@EFL_BUILD_DOC_TRUE@doc: all doc-clean widget-preview doc-build
@EFL_BUILD_DOC_TRUE@ @echo "Entering src/examples/"
@EFL_BUILD_DOC_TRUE@ $(MAKE) -C $(top_builddir)/src/examples screenshots
@EFL_BUILD_DOC_TRUE@ rm -rf $(PACKAGE_DOCNAME).tar*
@EFL_BUILD_DOC_TRUE@ mkdir -p $(PACKAGE_DOCNAME)/doc
-@EFL_BUILD_DOC_TRUE@ cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc
+@EFL_BUILD_DOC_TRUE@ cp -R html/ latex/ man/ xml/ $(PACKAGE_DOCNAME)/doc
@EFL_BUILD_DOC_TRUE@ tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
@EFL_BUILD_DOC_TRUE@ bzip2 -9 $(PACKAGE_DOCNAME).tar
@EFL_BUILD_DOC_TRUE@ rm -rf $(PACKAGE_DOCNAME)/
@EFL_BUILD_DOC_TRUE@clean-local: doc-clean
+# what about examples screenshots ?
+@EFL_BUILD_DOC_TRUE@install-doc: doc-build
+@EFL_BUILD_DOC_TRUE@ install -d $(docdir)
+@EFL_BUILD_DOC_TRUE@ cp -R html latex man xml $(docdir)
+
+@EFL_BUILD_DOC_TRUE@uninstall-local:
+@EFL_BUILD_DOC_TRUE@ rm -rf $(docdir)/html $(docdir)/latex $(docdir)/man $(docdir)/xml
+
@EFL_BUILD_DOC_FALSE@doc:
@EFL_BUILD_DOC_FALSE@ @echo "Documentation not built. Run ./configure --help"
+@EFL_BUILD_DOC_FALSE@install-doc: doc
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
pkgdatadir=@datadir@/elementary
themes=${pkgdatadir}/themes
+docdir=@docdir@
Name: elementary
Description: Mobile device touchscreen widget library
Summary: EFL toolkit for small touchscreens
Name: elementary
-Version: 1.7.3
+Version: 1.7.4
Release: %{_rel}
License: Lesser GPL
Group: System Environment/Libraries
msgstr ""
"Project-Id-Version: elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-07 14:14-0200\n"
+"POT-Creation-Date: 2012-12-21 03:52-0800\n"
"PO-Revision-Date: 2010-12-26 10:05+0200\n"
"Last-Translator: Tom Hacohen <tom.hacohen@samsung.com>\n"
"Language-Team: General\n"
msgid "Home"
msgstr ""
-#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1402
+#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1405
msgid "Cancel"
msgstr ""
msgid "diskselector item"
msgstr ""
-#: src/lib/elm_entry.c:1396
+#: src/lib/elm_entry.c:1399
msgid "Copy"
msgstr ""
-#: src/lib/elm_entry.c:1399
+#: src/lib/elm_entry.c:1402
msgid "Cut"
msgstr ""
-#: src/lib/elm_entry.c:1413
+#: src/lib/elm_entry.c:1416
msgid "Select"
msgstr ""
-#: src/lib/elm_entry.c:1419
+#: src/lib/elm_entry.c:1422
msgid "Paste"
msgstr ""
-#: src/lib/elm_entry.c:2650
+#: src/lib/elm_entry.c:2653
msgid "Entry"
msgstr ""
msgstr ""
"Project-Id-Version: elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-07 14:14-0200\n"
+"POT-Creation-Date: 2012-12-21 03:52-0800\n"
"PO-Revision-Date: 2010-12-26 10:05+0200\n"
"Last-Translator: Tom Hacohen <tom.hacohen@samsung.com>\n"
"Language-Team: General\n"
msgid "Home"
msgstr ""
-#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1402
+#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1405
msgid "Cancel"
msgstr ""
msgid "diskselector item"
msgstr ""
-#: src/lib/elm_entry.c:1396
+#: src/lib/elm_entry.c:1399
msgid "Copy"
msgstr ""
-#: src/lib/elm_entry.c:1399
+#: src/lib/elm_entry.c:1402
msgid "Cut"
msgstr ""
-#: src/lib/elm_entry.c:1413
+#: src/lib/elm_entry.c:1416
msgid "Select"
msgstr ""
-#: src/lib/elm_entry.c:1419
+#: src/lib/elm_entry.c:1422
msgid "Paste"
msgstr ""
-#: src/lib/elm_entry.c:2650
+#: src/lib/elm_entry.c:2653
msgid "Entry"
msgstr ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-07 14:14-0200\n"
+"POT-Creation-Date: 2012-12-21 03:52-0800\n"
"PO-Revision-Date: 2011-10-23 01:31+0100\n"
"Last-Translator: Daniel Kolesa <quaker66@gmail.com>\n"
"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
msgid "Home"
msgstr "Domů"
-#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1402
+#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1405
msgid "Cancel"
msgstr "Zrušit"
msgid "diskselector item"
msgstr ""
-#: src/lib/elm_entry.c:1396
+#: src/lib/elm_entry.c:1399
msgid "Copy"
msgstr "Kopírovat"
-#: src/lib/elm_entry.c:1399
+#: src/lib/elm_entry.c:1402
msgid "Cut"
msgstr "Vyjmout"
-#: src/lib/elm_entry.c:1413
+#: src/lib/elm_entry.c:1416
msgid "Select"
msgstr "Vybrat"
-#: src/lib/elm_entry.c:1419
+#: src/lib/elm_entry.c:1422
msgid "Paste"
msgstr "Vložit"
-#: src/lib/elm_entry.c:2650
+#: src/lib/elm_entry.c:2653
msgid "Entry"
msgstr ""
msgstr ""
"Project-Id-Version: elementary 0.7.0.57309\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-07 14:14-0200\n"
+"POT-Creation-Date: 2012-12-21 03:52-0800\n"
"PO-Revision-Date: 2011-02-25 20:22+0100\n"
"Last-Translator: Fabian Nowak <timystery@arcor.de>\n"
"Language-Team: German\n"
msgid "Home"
msgstr "Persönlicher Ordner"
-#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1402
+#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1405
msgid "Cancel"
msgstr "Abbrechen"
msgid "diskselector item"
msgstr ""
-#: src/lib/elm_entry.c:1396
+#: src/lib/elm_entry.c:1399
msgid "Copy"
msgstr "Kopieren"
-#: src/lib/elm_entry.c:1399
+#: src/lib/elm_entry.c:1402
msgid "Cut"
msgstr "Ausschneiden"
-#: src/lib/elm_entry.c:1413
+#: src/lib/elm_entry.c:1416
msgid "Select"
msgstr "Auswählen"
-#: src/lib/elm_entry.c:1419
+#: src/lib/elm_entry.c:1422
msgid "Paste"
msgstr "Einfügen"
-#: src/lib/elm_entry.c:2650
+#: src/lib/elm_entry.c:2653
msgid "Entry"
msgstr ""
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: elementary 1.7.3\n"
+"Project-Id-Version: elementary 1.7.4\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-07 14:14-0200\n"
+"POT-Creation-Date: 2012-12-21 03:52-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgid "Home"
msgstr ""
-#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1402
+#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1405
msgid "Cancel"
msgstr ""
msgid "diskselector item"
msgstr ""
-#: src/lib/elm_entry.c:1396
+#: src/lib/elm_entry.c:1399
msgid "Copy"
msgstr ""
-#: src/lib/elm_entry.c:1399
+#: src/lib/elm_entry.c:1402
msgid "Cut"
msgstr ""
-#: src/lib/elm_entry.c:1413
+#: src/lib/elm_entry.c:1416
msgid "Select"
msgstr ""
-#: src/lib/elm_entry.c:1419
+#: src/lib/elm_entry.c:1422
msgid "Paste"
msgstr ""
-#: src/lib/elm_entry.c:2650
+#: src/lib/elm_entry.c:2653
msgid "Entry"
msgstr ""
msgstr ""
"Project-Id-Version: elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-07 14:14-0200\n"
+"POT-Creation-Date: 2012-12-21 03:52-0800\n"
"PO-Revision-Date: 2010-12-26 10:05+0200\n"
"Last-Translator: Tom Hacohen <tom.hacohen@samsung.com>\n"
"Language-Team: General\n"
msgid "Home"
msgstr ""
-#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1402
+#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1405
msgid "Cancel"
msgstr ""
msgid "diskselector item"
msgstr ""
-#: src/lib/elm_entry.c:1396
+#: src/lib/elm_entry.c:1399
msgid "Copy"
msgstr ""
-#: src/lib/elm_entry.c:1399
+#: src/lib/elm_entry.c:1402
msgid "Cut"
msgstr ""
-#: src/lib/elm_entry.c:1413
+#: src/lib/elm_entry.c:1416
msgid "Select"
msgstr ""
-#: src/lib/elm_entry.c:1419
+#: src/lib/elm_entry.c:1422
msgid "Paste"
msgstr ""
-#: src/lib/elm_entry.c:2650
+#: src/lib/elm_entry.c:2653
msgid "Entry"
msgstr ""
msgstr ""
"Project-Id-Version: Elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-07 14:14-0200\n"
+"POT-Creation-Date: 2012-12-21 03:52-0800\n"
"PO-Revision-Date: 2011-11-08 07:57+0100\n"
"Last-Translator: dazibao <dazibao@sfr.fr>\n"
"Language-Team: French <sansgourou@gmail.com>\n"
msgid "Home"
msgstr "Home"
-#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1402
+#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1405
msgid "Cancel"
msgstr "Annuler"
msgid "diskselector item"
msgstr ""
-#: src/lib/elm_entry.c:1396
+#: src/lib/elm_entry.c:1399
msgid "Copy"
msgstr "Copier"
-#: src/lib/elm_entry.c:1399
+#: src/lib/elm_entry.c:1402
msgid "Cut"
msgstr "Couper"
-#: src/lib/elm_entry.c:1413
+#: src/lib/elm_entry.c:1416
msgid "Select"
msgstr "Sélectionner"
-#: src/lib/elm_entry.c:1419
+#: src/lib/elm_entry.c:1422
msgid "Paste"
msgstr "Coller"
-#: src/lib/elm_entry.c:2650
+#: src/lib/elm_entry.c:2653
msgid "Entry"
msgstr ""
msgstr ""
"Project-Id-Version: elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-07 14:14-0200\n"
+"POT-Creation-Date: 2012-12-21 03:52-0800\n"
"PO-Revision-Date: 2010-12-26 10:05+0200\n"
"Last-Translator: Aharon Hillel <a.hillel@samsung.com>\n"
"Language-Team: General\n"
msgid "Home"
msgstr ""
-#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1402
+#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1405
msgid "Cancel"
msgstr "בטל"
msgid "diskselector item"
msgstr ""
-#: src/lib/elm_entry.c:1396
+#: src/lib/elm_entry.c:1399
msgid "Copy"
msgstr "העתק"
-#: src/lib/elm_entry.c:1399
+#: src/lib/elm_entry.c:1402
msgid "Cut"
msgstr "גזור"
-#: src/lib/elm_entry.c:1413
+#: src/lib/elm_entry.c:1416
msgid "Select"
msgstr "התחל בחירה"
-#: src/lib/elm_entry.c:1419
+#: src/lib/elm_entry.c:1422
msgid "Paste"
msgstr "הדבק"
-#: src/lib/elm_entry.c:2650
+#: src/lib/elm_entry.c:2653
msgid "Entry"
msgstr ""
msgstr ""
"Project-Id-Version: Elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-07 14:14-0200\n"
+"POT-Creation-Date: 2012-12-21 03:52-0800\n"
"PO-Revision-Date: 2012-08-14 23:01+0200\n"
"Last-Translator: Massimo Maiurana <maiurana@gmail.com>\n"
"Language-Team: none\n"
msgid "Home"
msgstr "Home"
-#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1402
+#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1405
msgid "Cancel"
msgstr "Annulla"
msgid "diskselector item"
msgstr ""
-#: src/lib/elm_entry.c:1396
+#: src/lib/elm_entry.c:1399
msgid "Copy"
msgstr "Copia"
-#: src/lib/elm_entry.c:1399
+#: src/lib/elm_entry.c:1402
msgid "Cut"
msgstr "Taglia"
-#: src/lib/elm_entry.c:1413
+#: src/lib/elm_entry.c:1416
msgid "Select"
msgstr "Seleziona"
-#: src/lib/elm_entry.c:1419
+#: src/lib/elm_entry.c:1422
msgid "Paste"
msgstr "Incolla"
-#: src/lib/elm_entry.c:2650
+#: src/lib/elm_entry.c:2653
msgid "Entry"
msgstr ""
msgstr ""
"Project-Id-Version: elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-07 14:14-0200\n"
+"POT-Creation-Date: 2012-12-21 03:52-0800\n"
"PO-Revision-Date: 2011-02-22 09:09-0800\n"
"Last-Translator: Daniel Juyung Seo <seojuyung@gmail.com>\n"
"Language-Team: General\n"
msgid "Home"
msgstr "홈"
-#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1402
+#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1405
msgid "Cancel"
msgstr "취소"
msgid "diskselector item"
msgstr ""
-#: src/lib/elm_entry.c:1396
+#: src/lib/elm_entry.c:1399
msgid "Copy"
msgstr "복사"
-#: src/lib/elm_entry.c:1399
+#: src/lib/elm_entry.c:1402
msgid "Cut"
msgstr "잘라내기"
-#: src/lib/elm_entry.c:1413
+#: src/lib/elm_entry.c:1416
msgid "Select"
msgstr "선택"
-#: src/lib/elm_entry.c:1419
+#: src/lib/elm_entry.c:1422
msgid "Paste"
msgstr "붙여넣기"
-#: src/lib/elm_entry.c:2650
+#: src/lib/elm_entry.c:2653
msgid "Entry"
msgstr ""
msgstr ""
"Project-Id-Version: elementary 0.7.0.57309\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-07 14:14-0200\n"
+"POT-Creation-Date: 2012-12-21 03:52-0800\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"
msgid "Home"
msgstr "Persoonlijke map"
-#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1402
+#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1405
msgid "Cancel"
msgstr "Annuleren"
msgid "diskselector item"
msgstr ""
-#: src/lib/elm_entry.c:1396
+#: src/lib/elm_entry.c:1399
msgid "Copy"
msgstr "Kopiëren"
-#: src/lib/elm_entry.c:1399
+#: src/lib/elm_entry.c:1402
msgid "Cut"
msgstr "Knippen"
-#: src/lib/elm_entry.c:1413
+#: src/lib/elm_entry.c:1416
msgid "Select"
msgstr "Selecteren"
-#: src/lib/elm_entry.c:1419
+#: src/lib/elm_entry.c:1422
msgid "Paste"
msgstr "Plakken"
-#: src/lib/elm_entry.c:2650
+#: src/lib/elm_entry.c:2653
msgid "Entry"
msgstr ""
msgstr ""
"Project-Id-Version: elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-07 14:14-0200\n"
+"POT-Creation-Date: 2012-12-21 03:52-0800\n"
"PO-Revision-Date: 2010-12-26 10:05+0200\n"
"Last-Translator: Tom Hacohen <tom.hacohen@samsung.com>\n"
"Language-Team: General\n"
msgid "Home"
msgstr ""
-#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1402
+#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1405
msgid "Cancel"
msgstr ""
msgid "diskselector item"
msgstr ""
-#: src/lib/elm_entry.c:1396
+#: src/lib/elm_entry.c:1399
msgid "Copy"
msgstr ""
-#: src/lib/elm_entry.c:1399
+#: src/lib/elm_entry.c:1402
msgid "Cut"
msgstr ""
-#: src/lib/elm_entry.c:1413
+#: src/lib/elm_entry.c:1416
msgid "Select"
msgstr ""
-#: src/lib/elm_entry.c:1419
+#: src/lib/elm_entry.c:1422
msgid "Paste"
msgstr ""
-#: src/lib/elm_entry.c:2650
+#: src/lib/elm_entry.c:2653
msgid "Entry"
msgstr ""
msgstr ""
"Project-Id-Version: Elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-07 14:14-0200\n"
+"POT-Creation-Date: 2012-12-21 03:52-0800\n"
"PO-Revision-Date: 2012-08-14 16:16-0000\n"
"Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
"Language-Team: \n"
msgid "Home"
msgstr "Pasta pessoal"
-#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1402
+#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1405
msgid "Cancel"
msgstr "Cancelar"
msgid "diskselector item"
msgstr ""
-#: src/lib/elm_entry.c:1396
+#: src/lib/elm_entry.c:1399
msgid "Copy"
msgstr "Copiar"
-#: src/lib/elm_entry.c:1399
+#: src/lib/elm_entry.c:1402
msgid "Cut"
msgstr "Cortar"
-#: src/lib/elm_entry.c:1413
+#: src/lib/elm_entry.c:1416
msgid "Select"
msgstr "Selecionar"
-#: src/lib/elm_entry.c:1419
+#: src/lib/elm_entry.c:1422
msgid "Paste"
msgstr "Colar"
-#: src/lib/elm_entry.c:2650
+#: src/lib/elm_entry.c:2653
msgid "Entry"
msgstr ""
msgstr ""
"Project-Id-Version: elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-07 14:14-0200\n"
+"POT-Creation-Date: 2012-12-21 03:52-0800\n"
"PO-Revision-Date: 2010-12-26 10:05+0200\n"
"Last-Translator: Tom Hacohen <tom.hacohen@samsung.com>\n"
"Language-Team: General\n"
msgid "Home"
msgstr ""
-#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1402
+#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1405
msgid "Cancel"
msgstr ""
msgid "diskselector item"
msgstr ""
-#: src/lib/elm_entry.c:1396
+#: src/lib/elm_entry.c:1399
msgid "Copy"
msgstr ""
-#: src/lib/elm_entry.c:1399
+#: src/lib/elm_entry.c:1402
msgid "Cut"
msgstr ""
-#: src/lib/elm_entry.c:1413
+#: src/lib/elm_entry.c:1416
msgid "Select"
msgstr ""
-#: src/lib/elm_entry.c:1419
+#: src/lib/elm_entry.c:1422
msgid "Paste"
msgstr ""
-#: src/lib/elm_entry.c:2650
+#: src/lib/elm_entry.c:2653
msgid "Entry"
msgstr ""
msgstr ""
"Project-Id-Version: elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-07 14:14-0200\n"
+"POT-Creation-Date: 2012-12-21 03:52-0800\n"
"PO-Revision-Date: 2010-12-26 10:05+0200\n"
"Last-Translator: Tom Hacohen <tom.hacohen@samsung.com>\n"
"Language-Team: General\n"
msgid "Home"
msgstr ""
-#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1402
+#: src/lib/elc_fileselector.c:992 src/lib/elm_entry.c:1405
msgid "Cancel"
msgstr ""
msgid "diskselector item"
msgstr ""
-#: src/lib/elm_entry.c:1396
+#: src/lib/elm_entry.c:1399
msgid "Copy"
msgstr ""
-#: src/lib/elm_entry.c:1399
+#: src/lib/elm_entry.c:1402
msgid "Cut"
msgstr ""
-#: src/lib/elm_entry.c:1413
+#: src/lib/elm_entry.c:1416
msgid "Select"
msgstr ""
-#: src/lib/elm_entry.c:1419
+#: src/lib/elm_entry.c:1422
msgid "Paste"
msgstr ""
-#: src/lib/elm_entry.c:2650
+#: src/lib/elm_entry.c:2653
msgid "Entry"
msgstr ""
ELM_CHECK_WIDTYPE(obj, widtype);
EINA_SAFETY_ON_NULL_RETURN(func);
- new_item_filter= _filter_new(func, data);
- if (!new_item_filter) return;
-
EINA_LIST_FOREACH(wd->filter_list, l, _item_filter)
{
if (_item_filter && ((_item_filter->callback_func == func) && (_item_filter->data == data)))
return;
}
}
+ new_item_filter= _filter_new(func, data);
+ if (!new_item_filter) return;
+
wd->filter_list = eina_list_append(wd->filter_list, new_item_filter);
}
char buf[1024];
if ((it->title_label) && (it->title_label[0]))
- edje_object_signal_emit(VIEW(it), "elm,state,title,show", "elm");
+ edje_object_signal_emit(VIEW(it), "elm,state,title_label,show", "elm");
else
- edje_object_signal_emit(VIEW(it), "elm,state,title,hide", "elm");
+ edje_object_signal_emit(VIEW(it), "elm,state,title_label,hide", "elm");
if ((it->subtitle_label) && (it->subtitle_label[0]))
edje_object_signal_emit(VIEW(it), "elm,state,subtitle,show", "elm");
eina_stringshare_replace(&nit->title_label, label);
snprintf(buf, sizeof(buf), "elm.text.title");
if (label)
- edje_object_signal_emit(VIEW(it), "elm,state,title,show", "elm");
+ edje_object_signal_emit(VIEW(it), "elm,state,title_label,show", "elm");
else
- edje_object_signal_emit(VIEW(it), "elm,state,title,hide", "elm");
+ edje_object_signal_emit(VIEW(it), "elm,state,title_label,hide", "elm");
//XXX: ACCESS
if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
elm_widget_tree_unfocusable_set(it->content, it->content_unfocusable);
- evas_object_smart_callback_call(WIDGET(it), SIG_TRANSITION_FINISHED, data);
-
if (sd->freeze_events)
evas_object_freeze_events_set(VIEW(it), EINA_FALSE);
+
+ evas_object_smart_callback_call(WIDGET(it), SIG_TRANSITION_FINISHED, data);
}
static void
{
EVAS_SMART_DATA_ALLOC(obj, Elm_Naviframe_Smart_Data);
- priv->dummy_edje = ELM_WIDGET_DATA(priv)->resize_obj =
- edje_object_add(evas_object_evas_get(obj));
-
ELM_WIDGET_CLASS(_elm_naviframe_parent_sc)->base.add(obj);
+ priv->dummy_edje = ELM_WIDGET_DATA(priv)->resize_obj;
priv->auto_pushed = EINA_TRUE;
priv->freeze_events = EINA_TRUE;
evas_object_show(VIEW(it));
elm_widget_resize_object_set(obj, VIEW(it));
+ evas_object_smart_member_add(sd->dummy_edje, obj);
if (prev_it)
{
title_label, prev_btn, next_btn, content, item_style);
if (!it) return NULL;
elm_widget_resize_object_set(obj, VIEW(it));
+ evas_object_smart_member_add(sd->dummy_edje, obj);
sd->stack = eina_inlist_prepend_relative
(sd->stack, EINA_INLIST_GET(it),
title_label, prev_btn, next_btn, content, item_style);
if (!it) return NULL;
elm_widget_resize_object_set(obj, VIEW(it));
+ evas_object_smart_member_add(sd->dummy_edje, obj);
/* let's share that whole logic, if it goes to the top */
if (elm_naviframe_top_item_get(obj) == after)
}
elm_widget_resize_object_set(obj, VIEW(prev_it));
+ evas_object_smart_member_add(sd->dummy_edje, obj);
evas_object_raise(VIEW(prev_it));
//XXX: ACCESS
sd->stack = eina_inlist_demote(sd->stack, EINA_INLIST_GET(nit));
elm_widget_resize_object_set(WIDGET(it), VIEW(nit));
+ evas_object_smart_member_add(sd->dummy_edje, WIDGET(it));
/* this was the previous top one */
prev_it = EINA_INLIST_CONTAINER_GET
static Evas_Object *
_action_button_get(Evas_Object *obj, unsigned int idx)
{
- unsigned int num = idx - 1;
Evas_Object *button = NULL;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd || !wd->button_count) return NULL;
- if (wd->buttons[num])
- button = wd->buttons[num]->btn;
+ if (wd->buttons[idx])
+ button = wd->buttons[idx]->btn;
return button;
}
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Evas_Object *content = NULL;
- char buff[3];
unsigned int i;
Widget_Data *wd = elm_widget_data_get(obj);
content = _title_icon_get(obj);
else if (!strncmp(part, "button", 6))
{
- part += 6;
- for (i = 0; i < ELM_POPUP_ACTION_BUTTON_MAX; i++)
- {
- snprintf(buff, sizeof(buff), "%u", i+1);
- if (!strncmp(part, buff, sizeof(buff)))
- {
- content = _action_button_get(obj, i+1);
- break;
- }
- }
+ i = atoi(part + 6) - 1;
+
+ if (i >= ELM_POPUP_ACTION_BUTTON_MAX)
+ goto err;
+
+ content = _action_button_get(obj, i);
}
else
- WRN("The part name is invalid! : popup=%p", obj);
+ goto err;
+ return content;
+err:
+ WRN("The part name is invalid! : popup=%p", obj);
return content;
}
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
+#include <sys/stat.h>
#include <Elementary.h>
#include "elm_priv.h"
#ifdef HAVE_MMAN_H
typedef struct _Tmp_Info Tmp_Info;
typedef struct _Saved_Type Saved_Type;
-typedef struct _Escape Escape;
+typedef struct _Cnp_Escape Cnp_Escape;
typedef struct _Dropable Dropable;
struct _Tmp_Info
Eina_Bool textreq: 1;
};
-struct _Escape
+struct _Cnp_Escape
{
const char *escape;
const char *value;
}
/* generate tmp name */
tmp = _tempfile_new(data->length);
+ if (!tmp) return 0;
memcpy(tmp->map, data->data, data->length);
munmap(tmp->map, data->length);
/* FIXME: Add to paste image data to clean up */
tmppath = getenv("TMP");
if (!tmppath) tmppath = P_tmpdir;
len = snprintf(NULL, 0, "%s/%sXXXXXX", tmppath, "elmcnpitem-");
- if (len < 0)
- {
- free(info);
- return NULL;
- }
+ if (len < 0) goto on_error;
len++;
info->filename = malloc(len);
- if (!info->filename)
- {
- free(info);
- return NULL;
- }
+ if (!info->filename) goto on_error;
snprintf(info->filename,len,"%s/%sXXXXXX", tmppath, "elmcnpitem-");
cur_umask = umask(S_IRWXO | S_IRWXG);
info->fd = mkstemp(info->filename);
umask(cur_umask);
+ if (info->fd < 0) goto on_error;
# ifdef __linux__
{
char *tmp;
}
# endif
cnp_debug("filename is %s\n", info->filename);
- if (size < 1)
- {
- /* Set map to NULL and return */
- info->map = NULL;
- info->len = 0;
- return info;
- }
+ if (size < 1) goto on_error;
/* Map it in */
if (ftruncate(info->fd, size))
{
perror("ftruncate");
- info->map = NULL;
- info->len = 0;
- return info;
+ goto on_error;
}
eina_mmap_safety_enabled_set(EINA_TRUE);
info->map = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED, info->fd, 0);
if (info->map == MAP_FAILED)
{
perror("mmap");
- info->map = NULL;
- info->len = 0;
+ goto on_error;
}
return info;
+
+ on_error:
+ if (info->fd >= 0) close(info->fd);
+ info->fd = -1;
+ /* Set map to NULL and return */
+ info->map = NULL;
+ info->len = 0;
+ free(info);
+ return NULL;
#else
(void) size;
return NULL;
return NULL;
if (!eina_strbuf_append(buf, str))
- return NULL;
+ {
+ eina_strbuf_free(buf);
+ return NULL;
+ }
while (EINA_TRUE)
{
{
ELM_IMAGE_DATA_GET(obj, sd);
- if (sd->edje) return;
+ if (sd->edje || !sd->preloading) return;
evas_object_image_preload(sd->img, disable);
sd->preloading = !disable;
+
+ if (disable)
+ {
+ if (sd->show && sd->img) evas_object_show(sd->img);
+ if (sd->prev_img)
+ {
+ evas_object_del(sd->prev_img);
+ sd->prev_img = NULL;
+ }
+ }
}
static void
static const char PAN_SMART_NAME[] = "elm_pan";
-#define ELM_PAN_DATA_GET(o, sd) \
- Elm_Pan_Smart_Data * sd = evas_object_smart_data_get(o)
-
-#define ELM_PAN_DATA_GET_OR_RETURN(o, ptr) \
- ELM_PAN_DATA_GET(o, ptr); \
- if (!ptr) \
- { \
- CRITICAL("No smart data for object %p (%s)", \
- o, evas_object_type_get(o)); \
- return; \
+#define ELM_PAN_DATA_GET_OR_RETURN(o, ptr) \
+ Elm_Pan_Smart_Data *ptr = evas_object_smart_data_get(o); \
+ if (!ptr) \
+ { \
+ CRITICAL("No smart data for object %p (%s)", \
+ o, evas_object_type_get(o)); \
+ return; \
}
-#define ELM_PAN_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
- ELM_PAN_DATA_GET(o, ptr); \
- if (!ptr) \
- { \
- CRITICAL("No smart data for object %p (%s)", \
- o, evas_object_type_get(o)); \
- return val; \
+#define ELM_PAN_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
+ Elm_Pan_Smart_Data *ptr = evas_object_smart_data_get(o); \
+ if (!ptr) \
+ { \
+ CRITICAL("No smart data for object %p (%s)", \
+ o, evas_object_type_get(o)); \
+ return val; \
}
static const char SIG_CHANGED[] = "changed";
Evas_Coord x,
Evas_Coord y)
{
- ELM_PAN_DATA_GET(obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(obj, psd);
/* we don't want the clipped smart object version here */
Evas_Coord w,
Evas_Coord h)
{
- ELM_PAN_DATA_GET(obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(obj, psd);
psd->w = w;
psd->h = h;
static void
_elm_pan_smart_show(Evas_Object *obj)
{
- ELM_PAN_DATA_GET(obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(obj, psd);
_elm_pan_parent_sc->show(obj);
static void
_elm_pan_smart_hide(Evas_Object *obj)
{
- ELM_PAN_DATA_GET(obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(obj, psd);
_elm_pan_parent_sc->hide(obj);
Evas_Coord x,
Evas_Coord y)
{
- ELM_PAN_DATA_GET(obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(obj, psd);
if ((x == psd->px) && (y == psd->py)) return;
psd->px = x;
Evas_Coord *x,
Evas_Coord *y)
{
- ELM_PAN_DATA_GET(obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(obj, psd);
if (x) *x = psd->px;
if (y) *y = psd->py;
Evas_Coord *x,
Evas_Coord *y)
{
- ELM_PAN_DATA_GET(obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(obj, psd);
if (x)
{
Evas_Coord *w,
Evas_Coord *h)
{
- ELM_PAN_DATA_GET(obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(obj, psd);
if (w) *w = psd->content_w;
if (h) *h = psd->content_h;
double x,
double y)
{
- ELM_PAN_DATA_GET(obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(obj, psd);
psd->gravity_x = x;
psd->gravity_y = y;
double *x,
double *y)
{
- ELM_PAN_DATA_GET(obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(obj, psd);
if (x) *x = psd->gravity_x;
if (y) *y = psd->gravity_y;
{
Evas_Coord w, h;
- ELM_PAN_DATA_GET(obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(obj, psd);
if (content == psd->content) return;
if (psd->content)
static const char SCROLL_SMART_NAME[] = "elm_scroll";
-#define ELM_SCROLL_IFACE_DATA_GET(o, sid) \
- Elm_Scrollable_Smart_Interface_Data * sid = \
- evas_object_smart_interface_data_get(o, &(ELM_SCROLLABLE_IFACE.base))
-
-#define ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(o, ptr) \
- ELM_SCROLL_IFACE_DATA_GET(o, ptr); \
- if (!ptr) \
- { \
- CRITICAL("No interface data for object %p (%s)", \
- o, evas_object_type_get(o)); \
- return; \
+#define ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(o, ptr) \
+ Elm_Scrollable_Smart_Interface_Data *ptr = \
+ evas_object_smart_interface_data_get(o, &(ELM_SCROLLABLE_IFACE.base)); \
+ if (!ptr) \
+ { \
+ CRITICAL("No interface data for object %p (%s)", \
+ o, evas_object_type_get(o)); \
+ return; \
}
-#define ELM_SCROLL_IFACE_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
- ELM_SCROLL_IFACE_DATA_GET(o, ptr); \
- if (!ptr) \
- { \
- CRITICAL("No interface data for object %p (%s)", \
- o, evas_object_type_get(o)); \
- return val; \
+#define ELM_SCROLL_IFACE_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
+ Elm_Scrollable_Smart_Interface_Data *ptr = \
+ evas_object_smart_interface_data_get(o, &(ELM_SCROLLABLE_IFACE.base)); \
+ if (!ptr) \
+ { \
+ CRITICAL("No interface data for object %p (%s)", \
+ o, evas_object_type_get(o)); \
+ return val; \
}
static void _elm_scroll_scroll_bar_size_adjust(
Evas_Coord x = 0, y = 0, mx = 0, my = 0, minx = 0, miny = 0;
if (!sid->edje_obj || !sid->pan_obj) return;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(sid->pan_obj, psd);
psd->api->pos_max_get(sid->pan_obj, &mx, &my);
psd->api->pos_min_get(sid->pan_obj, &minx, &miny);
{
if (!sid->pan_obj || !sid->edje_obj) return;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(sid->pan_obj, psd);
if ((sid->content) || (sid->extern_pan))
{
if (!sid->edje_obj || !sid->pan_obj) return;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(sid->pan_obj, psd);
if ((sid->down.dragged) || (sid->down.bounce_x_animator)
|| (sid->down.bounce_y_animator) || (sid->down.momentum_animator)
if (!sid->pan_obj) return 0;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN_VAL(sid->pan_obj, psd, 0);
_elm_scroll_content_viewport_size_get(obj, &w, NULL);
psd->api->content_size_get(sid->pan_obj, &cw, &ch);
if (!sid->pan_obj) return;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(sid->pan_obj, psd);
psd->api->content_size_get(sid->pan_obj, &cw, &ch);
if (!sid->pan_obj) return;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(sid->pan_obj, psd);
if (sid->freeze) return;
if ((!sid->bouncemex) && (!sid->bouncemey)) return;
if (!sid->pan_obj) return;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(sid->pan_obj, psd);
psd->api->pos_get(sid->pan_obj, x, y);
}
if (!sid->edje_obj || !sid->pan_obj) return;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(sid->pan_obj, psd);
// FIXME: allow for bounce outside of range
psd->api->pos_max_get(sid->pan_obj, &mx, &my);
Evas_Coord mx = 0, my = 0, cw = 0, ch = 0, px = 0, py = 0, nx, ny,
minx = 0, miny = 0, pw = 0, ph = 0, x = *_x, y = *_y;
- ELM_SCROLL_IFACE_DATA_GET(obj, sid);
+ ELM_SCROLL_IFACE_DATA_GET_OR_RETURN_VAL(obj, sid, EINA_FALSE);
if (!sid->pan_obj) return EINA_FALSE;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN_VAL(sid->pan_obj, psd, EINA_FALSE);
psd->api->pos_max_get(sid->pan_obj, &mx, &my);
psd->api->pos_min_get(sid->pan_obj, &minx, &miny);
{
Evas_Coord ww, wh, wx;
- ELM_SCROLL_IFACE_DATA_GET(obj, sid);
+ ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(obj, sid);
wx = sid->wx;
if (!sid->pan_obj) return ECORE_CALLBACK_CANCEL;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN_VAL(sid->pan_obj, psd, ECORE_CALLBACK_CANCEL);
t = ecore_loop_time_get();
dt = t - sid->down.anim_start;
if (!sid->pan_obj) return 0;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN_VAL(sid->pan_obj, psd, 0);
_elm_scroll_content_pos_get(sid->obj, &x, &y);
_elm_scroll_content_viewport_size_get(sid->obj, &w, &h);
if (!sid->pan_obj) return 0;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN_VAL(sid->pan_obj, psd, 0);
_elm_scroll_content_pos_get(sid->obj, &x, &y);
_elm_scroll_content_viewport_size_get(sid->obj, &w, &h);
if (!sid->pan_obj) return ECORE_CALLBACK_CANCEL;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN_VAL(sid->pan_obj, psd, ECORE_CALLBACK_CANCEL);
t = ecore_loop_time_get();
tt = (t - sid->scrollto.x.t_start) /
if (!sid->pan_obj) return EINA_FALSE;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN_VAL(sid->pan_obj, psd, EINA_FALSE);
t = ecore_loop_time_get();
tt = (t - sid->scrollto.y.t_start) /
if (!sid->pan_obj) return;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(sid->pan_obj, psd);
if (sid->freeze) return;
if (t_in <= 0.0)
if (!sid->pan_obj) return;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(sid->pan_obj, psd);
if (sid->freeze) return;
if (t_in <= 0.0)
if (!sid->pan_obj) return;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(sid->pan_obj, psd);
#ifdef SMOOTHDBG
if (_elm_scroll_smooth_debug) _elm_scroll_smooth_debug_shutdown();
if (!sid->pan_obj) return EINA_FALSE;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN_VAL(sid->pan_obj, psd, EINA_FALSE);
psd->api->pos_max_get(sid->pan_obj, &mx, &my);
psd->api->pos_min_get(sid->pan_obj, &minx, &miny);
if (!sid->pan_obj) return;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(sid->pan_obj, psd);
if (sid->down.dir_x) *x = sid->down.sx - (*x - sid->down.x);
else *x = sid->down.sx;
if (!sid->pan_obj) return;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(sid->pan_obj, psd);
ev = event_info;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
static void
_scroll_edje_object_attach(Evas_Object *obj)
{
- ELM_SCROLL_IFACE_DATA_GET(obj, sid);
+ ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(obj, sid);
evas_object_event_callback_add
(sid->edje_obj, EVAS_CALLBACK_RESIZE, _on_edje_resize, sid);
static void
_scroll_event_object_attach(Evas_Object *obj)
{
- ELM_SCROLL_IFACE_DATA_GET(obj, sid);
+ ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(obj, sid);
evas_object_event_callback_add
(sid->event_rect, EVAS_CALLBACK_MOUSE_WHEEL, _elm_scroll_wheel_event_cb,
static void
_scroll_edje_object_detach(Evas_Object *obj)
{
- ELM_SCROLL_IFACE_DATA_GET(obj, sid);
+ ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(obj, sid);
evas_object_event_callback_del_full
(sid->edje_obj, EVAS_CALLBACK_RESIZE, _on_edje_resize, sid);
static void
_scroll_event_object_detach(Evas_Object *obj)
{
- ELM_SCROLL_IFACE_DATA_GET(obj, sid);
+ ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(obj, sid);
evas_object_event_callback_del_full
(sid->event_rect, EVAS_CALLBACK_MOUSE_WHEEL, _elm_scroll_wheel_event_cb,
}
if (sid->pan_obj)
{
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(sid->pan_obj, psd);
psd->api->pos_min_get(sid->pan_obj, &minx, &miny);
psd->api->pos_get(sid->pan_obj, &px, &py);
if (!sid->pan_obj) return;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(sid->pan_obj, psd);
psd->api->content_size_get(sid->pan_obj, &w, &h);
if ((w != sid->content_info.w) || (h != sid->content_info.h))
edje_object_part_swallow(sid->edje_obj, "elm.swallow.content", o);
}
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(sid->pan_obj, psd);
evas_object_event_callback_add
(content, EVAS_CALLBACK_DEL, _elm_scroll_content_del_cb, sid);
if (!sid->pan_obj) return;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(sid->pan_obj, psd);
psd->api->content_size_get(sid->pan_obj, &cw, &ch);
if (pagenumber_h)
if (!sid->pan_obj) return;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(sid->pan_obj, psd);
psd->api->gravity_set(sid->pan_obj, x, y);
}
if (!sid->pan_obj) return;
- ELM_PAN_DATA_GET(sid->pan_obj, psd);
+ ELM_PAN_DATA_GET_OR_RETURN(sid->pan_obj, psd);
psd->api->gravity_get(sid->pan_obj, x, y);
}
static Eina_Bool
_elm_scroll_interface_add(Evas_Object *obj)
{
- ELM_SCROLL_IFACE_DATA_GET(obj, sid);
+ ELM_SCROLL_IFACE_DATA_GET_OR_RETURN_VAL(obj, sid, EINA_FALSE);
memset(sid, 0, sizeof(*sid));
static void
_elm_scroll_interface_del(Evas_Object *obj)
{
- ELM_SCROLL_IFACE_DATA_GET(obj, sid);
+ ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(obj, sid);
_elm_scroll_content_set(obj, NULL);
if (!sid->extern_pan) evas_object_del(sid->pan_obj);
(buf, sz, EINA_TRUE, _xml_route_dump_cb, &dump);
free(buf);
}
+ else
+ free(buf);
}
}
fclose(f);
if (it->separator)
{
prev = ELM_TOOLBAR_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
- it->prio.priority = prev->prio.priority;
+ if (prev) it->prio.priority = prev->prio.priority;
}
}
_transit_remove_dead_effects(Elm_Transit *transit)
{
Elm_Transit_Effect_Module *effect_module;
+ Eina_Inlist *ll;
- EINA_INLIST_FOREACH(transit->effect_list, effect_module)
+ EINA_INLIST_FOREACH_SAFE(transit->effect_list, ll, effect_module)
{
if (effect_module->deleted)
{
struct _Elm_Transit_Effect_Image_Animation
{
Eina_List *images;
+ unsigned int prev_idx;
};
static void
EINA_SAFETY_ON_NULL_RETURN(transit);
Eina_List *elist;
Evas_Object *obj;
- const char *type;
+ const char *type, *type_deprecated;
Elm_Transit_Effect_Image_Animation *image_animation = effect;
- unsigned int count = 0;
+ unsigned int idx = 0;
int len;
- type = eina_stringshare_add("elm_icon");
+ type = eina_stringshare_add("elm_image");
+ //FIXME: Remove later when elm_icon is cleared.
+ type_deprecated = eina_stringshare_add("elm_icon");
+
len = eina_list_count(image_animation->images);
if (len)
{
- count = floor(progress * len);
- EINA_LIST_FOREACH(transit->objs, elist, obj)
+ idx = floor(progress * len);
+ if (image_animation->prev_idx != idx)
{
- if (elm_widget_type_check(obj, type, __func__))
- elm_image_file_set(obj,
- eina_list_nth(image_animation->images, count),
- NULL);
+ EINA_LIST_FOREACH(transit->objs, elist, obj)
+ {
+ if (elm_widget_type_check(obj, type, __func__) ||
+ elm_widget_type_check(obj, type_deprecated, __func__))
+ {
+ const char *file = eina_list_nth(image_animation->images,
+ idx);
+
+ elm_image_file_set(obj, file, NULL);
+ elm_image_preload_disabled_set(obj, EINA_TRUE);
+ }
+ }
}
+ image_animation->prev_idx = idx;
}
eina_stringshare_del(type);
+ eina_stringshare_del(type_deprecated);
}
static Elm_Transit_Effect *
if (!image_animation) return NULL;
image_animation->images = images;
+ image_animation->prev_idx = -1;
return image_animation;
}
module_la_SOURCES = mod.c
-module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la
+module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la @EVIL_LIBS@
module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
pkgdir = $(libdir)/elementary/modules/access_output/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
module_la_SOURCES = mod.c
-module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la
+module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la @EVIL_LIBS@
module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
all: all-am
module_la_SOURCES = datetime_input_ctxpopup.c
-module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la
+module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la @EVIL_LIBS@ @LTLIBINTL@
module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
pkgdir = $(libdir)/elementary/modules/datetime_input_ctxpopup/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
module_la_SOURCES = datetime_input_ctxpopup.c
-module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la
+module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la @EVIL_LIBS@ @LTLIBINTL@
module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
all: all-am
module_la_SOURCES = mod.c
-module_la_LIBADD = $(top_builddir)/src/lib/libelementary.la
+module_la_LIBADD = $(top_builddir)/src/lib/libelementary.la @EVIL_LIBS@
module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
pkgdir = $(libdir)/elementary/modules/test_map/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
module_la_SOURCES = mod.c
-module_la_LIBADD = $(top_builddir)/src/lib/libelementary.la
+module_la_LIBADD = $(top_builddir)/src/lib/libelementary.la @EVIL_LIBS@
module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
all: all-am
projects / platform / upstream / elementary.git / commitdiff