Merge branch '2.0_beta' of ssh://112.106.1.251:29418/framework/uifw/edje into 2.0_beta

edje - revert edje map code temporarily.

need to update image object when it's swallow part have a map enabled.

evas doens't support image object hooking.

so this feature will be fixed along with evas soon.

Change-Id: I7a12b3dab20b7d3103af31b4cefb245ca2774931

edje - revert edje map code temporarily.

need to update image object when it's swallow part have a map enabled.

evas doens't support image object hooking.

so this feature will be fixed along with evas soon.

Change-Id: I7a12b3dab20b7d3103af31b4cefb245ca2774931

package upload

package upload

edje - fixe the uv mapping correctly in case of image swallowed case

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@75241 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

Fix build error for clip_to

Package Upload

Package Upload

Change-Id: I05a7cf81967d1ce1ad6d47076d6ea0b585ed66f7

Merge remote-tracking branch 'slp/intefl/svn_merge'

Conflicts:
ChangeLog
src/bin/edje_cc.c
src/lib/edje_entry.c
src/lib/edje_util.c

Revert "Revert "upstream merge""

This reverts commit b0b3686f6acede73c0d7dc0f2cc4cfcac3c6038c.

Conflicts:

AUTHORS
ChangeLog

Revert "Revert "Upstrem merge""

This reverts commit 0d94471f81cd84ae1698db1c8a13c9cf7897adbf.

Conflicts:

AUTHORS
ChangeLog

EFL core migration @74702
Merge remote-tracking branch 'origin/upstream' into HEAD

Conflicts:
ChangeLog
configure.ac
src/bin/edje_cc.c
src/bin/edje_cc_handlers.c
src/lib/edje_entry.c
src/lib/edje_multisense.c

package upload

Change-Id: I7ddd98167e45ccdc9b2f7f43e2966ec242fe09fa

package upload

Change-Id: I7aed5a24e713bea06748d086ce0fbb9d899c8971

fix error of cannot move cursor (P120724-5953 on PLM)

Change-Id: Ia2a43617595c5cfea6be91d6a7de6140e92bc052

Change format as guide of Mr. Woohyun Jung.

edje log: fix some progname leftovers.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@74702 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

fix edje error reporting for once and for all.

edje error was a mess. First someone (maybe myself) added eina log,
then people changed it to be a mix with printf()... then they replaced
eina_log with printf() + colors so it would be less verbose.

It's fixed now! Using eina log infrastructure.

If all that is wanted is specific messages for edje_cc domain, do it
with a specific log print function (eina_log_print_cb_set()). I made
it produce messages in the format:

    <levelcolor><progname>: <levelprefix><message>

Where:
 - levelcolor is defined by eina_log (I hacked the win32 version,
   since no public api to resolve level to color).
 - levelprefix is "Error. " or "Warning. " to cope with traditional
   output.

If it does not look as you wanted, let me know before stuffing some
printf() again.

Bonus point: reduced 2 global variables (progname and verbose),
removed lots of code.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@74701 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

eina: cleanup eina_file_map_lines API before release.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@74618 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

package upload

Change-Id: Ica893868073d7beb6bf0551d7b5ac65c87d18061

Edje Entry: Fix bug of selection handler is displayed below IME (S1-6273 on JIRA)

Change-Id: I30356fef9c5dfa271dd3e2b7ae8821599ee3ad4e

edje: Reduce potential reentrant issue when using edje_object_signal_emit.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@74539 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: try to make windows happier.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@74538 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: compile again on windows.

Patch half Vincent, half myself.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@74537 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

Package Upload

Edje text classes: Fixed issues with textblock and some inconsistency.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73601 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

Conflicts:

ChangeLog

Edje textblock: Fixed bug with applying text class size.

Happens when text size is updated, but font is not.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73600 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

Conflicts:

ChangeLog

edje_cc shouldnt be using eina-log for almost all its err/wrn/inf
stuff as this is actual user output and done:
  file.c:242 error in blah.edc:232
is just confusing as all heck.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@74424 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

Revert "Upstrem merge"

This reverts commit a15299a01c0c89d7ed33391c911eb8b2ad2020d2, reversing
changes made to 9d1ba0d03223a3017d2d0251dcaefb1f66ff879b.

Conflicts:

packaging/edje.spec

Revert "upstream merge"

This reverts commit c1608e664b37492af3a56d60dc4cba309eb4e99f, reversing
changes made to d393f86867ac227f0b07eb70b7ffc7decbb286fa.

Conflicts:

packaging/edje.spec

Revert "Edje textblock: Fixed bug with applying text class size."

This reverts commit 01fea64d668467dadeda2e8d2f7941540af54a44.

Revert "Edje text classes: Fixed issues with textblock and some inconsistency."

This reverts commit 1767815bee458fcd02d7ccf7700e810cea2eeb57.

Revert "Merge "Temporary Reset for sync with current OBS""

This reverts commit 28ba653bb0a6dfe6e2e9c7f2243aa8be63c237b4, reversing
changes made to c726b6eeadc533d9628c120d4f47b194d9c6fe0b.

Merge "Temporary Reset for sync with current OBS"

Temporary Reset for sync with current OBS

package upload

edje edje_cc_handlers.c: Fixed typo pointed out by PrinceAMD-(Deon Thomas)

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@74346 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

fix entry shift selection extend with mouse.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@74338 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje/edje_entry : Only MOUSE_UP should reset character.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@74312 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje - updated AUTHORS

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@74315 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje/edje_entry : Only MOUSE_UP should reset character.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@74312 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

If there's a filter and a program running don't execute another one.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@74249 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

Package Upload

edje: remove dead code.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@74199 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje/edje_entry : Just fixed a comment.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@74168 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

and actually command (m4 style dnl) the multisense stuff for release.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@74052 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

make multisense off by default as it's not ready yet.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@74050 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

Edje text classes: Fixed issues with textblock and some inconsistency.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73601 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

Edje textblock: Fixed bug with applying text class size.

Happens when text size is updated, but font is not.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73600 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

fix minor version defines to be at 1.6 (in sync now) ready for going
to 7 on release.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73906 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: Fix multisense shutdown and shut up ecore thread shutdown.
Patch from cedric during the korean e17 meeting. Thanks!

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73841 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: stop compilation when clipping to a non RECT part.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73801 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: fix a small memory leak during compilation.

NOTE: use stringshare all over the place !

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73796 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

add docs -> rect parts only for clip_to

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73785 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: warn at compile time about forgotten image.

NOTE: You need to enable at least Eina_Log warning level
to see them.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73784 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

Edje text_class: Unified the _object_text_class_set code a bit more.

There were two code paths, with one missing a couple of calls. Now there's
less code duplication and less bugs.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73604 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

Edje text_classes: Fixed usage of stringshare_replace.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73603 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

Edje text classes: Fixed issues with textblock and some inconsistency.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73601 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

Edje textblock: Fixed bug with applying text class size.

Happens when text size is updated, but font is not.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73600 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: cleanup and make limit per description work.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73562 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: little bug fixes when rp could have been already destroyed.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73556 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje edje_cc_handlers.c: More documentation on image fill. Patch by
Anisse Astier <anisse@astier.eu>

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73548 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: correct more typos in edc doc

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73525 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: doc typo

val 2 and val 2 were on a boat, val 2 jumps out. Where is val 1?

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73523 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: a little more doc for image set.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73499 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

update all versions in @sincs, README's and configure.ac's etc. to
reflect a unified release version, for now 1.6.99.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73498 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje edje_cc_handlers.c: More description. Patch by Anisse Astier
<anisse@astier.eu>

On Mon, Jul 9, 2012 at 7:09 AM, Anisse Astier <anisse@astier.eu> wrote:
> Trying to make the description more explicit

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73478 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: bad typo in example code

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73458 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

no need for that ERR msg. :)

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73449 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

printf--

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73447 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

printf--

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73437 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje_cc -> nothreads means we should avoid evas preload too.. grrr.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73436 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

thats it. threads off in edje_cc by default. we need to focus on
stability now.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73432 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: Unb0rk Embryo set_state()

De Morgan is your friend.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73426 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: Make state index optional

This shouldn't break stuff, just make things easier.  Think of all that lost
time " 0.0".  Not anymore.  Not even in Embryo scripts.  Indexes should only
be provided when you need them (which is quite rare).

Note that if you use ``set_state("new state")'' in your Embryo scripts, the
produced .edj files will be incompatible with older versions of Edje.  This
backwards incompatibility only applies to Embryo scripts; edje_cc will
generate a ``0.0'' value if the index is omitted from state declarations and
programs.

Sachiel said this patch was OK; our benevolent release manager acked as
well. Blame them if this breaks stuff.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73424 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: multisense

Add a key in edje.pc to help third-party applications detect if the library
has been compiled with multisense support. This will be eventually reverted
if multisense becomes a requirement for edje. For the time being, people can
check multisense availability by "pkg-config edje --variable=multisense".

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73324 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

fix reallyu minor thing - border_scale_by wasnt interpolated.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73289 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

unbork edje-lua on 5.2

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73240 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

From: "daniel.zaoui@samsung.com" <daniel.zaoui@samsung.com>
Subject: [E-devel] Patch for Edje: added const to obj parameter of
edje_object_part_table_child_get

The obj parameter is used only for read access so the const can be
added to its type.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73231 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

Edje entry: Fixed anchor update with user insert.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@73211 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

upstream merge
Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
ChangeLog

Change-Id: Ibbc9edff80b75a0e3d76bfdfc0e9d0b8d44b4258

tom - can u take thgis textblock fit code and run with it and polish
it to be nice and try and "fit" as best as possible? entries dont do it.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@72992 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: Align coverage generation with all others

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@72947 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: Pass in coverage ld flags for all programs in src/bin as well

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@72929 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: destroy child and group correctly.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@72838 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

unused--

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@72780 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: forgottten @since.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@72768 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: implement per part limit.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@72767 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: Resistance is futile. The B0rk.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@72754 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: improve use of aliases

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@72732 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

update spec

edje: oops forgotten data description.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@72679 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

fix a crash when edje parent is null from _edje_fetch

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@72585 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

use bin prefix for embryo_cc in edje_cc.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@72580 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

edje: fix previous breakage with auto unswallow.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@72563 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

Upstrem merge
Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
ChangeLog
src/bin/edje_cc.c
src/lib/edje_multisense.c

Change-Id: Ifbfee1960a076241711ffc4560d9b806f8cab53f

edje: add accessibility flags and API.

Patch by Kim Shinwoo <kimcinoo.efl@gmail.com>

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@72521 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

Edje entry: Set start and end correctly when deleting word backwards.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@72400 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

Edje entry: range_del_emit - only emit if there was a non-empty range.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@72399 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

tone down memprool size chunks.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@72251 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33