[controlbar] delete for xml

[xml_animator] delete xml module

diff --git a/configure.ac b/configure.ac
index 765767e..7e31496 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -439,34 +439,6 @@ if test "x$want_elementary_ethumb" = "xyes" -a "x$have_elementary_ethumb" = "xno
 fi
 AC_SUBST(ELM_ETHUMB_DEF)
 
-ELM_LIBXML2_DEF="#undef"
-have_elementary_libxml2="no"
-want_elementary_libxml2="auto"
-AC_ARG_ENABLE([libxml-2.0],
-   [AC_HELP_STRING([--disable-libxml-2.0], [disable libxml-2.0 support. @<:@default=detect@:>@])],
-   [want_elementary_libxml2=$enableval], [])
-
-if test "x$want_elementary_libxml2" != "xno"; then
-    PKG_CHECK_MODULES([ELEMENTARY_LIBXML2],
-       [
-        libxml-2.0
-       ],
-       [
-        AC_DEFINE(HAVE_ELEMENTARY_LIBXML2, 1, [Libxml-2.0 support for Elementary])
-        have_elementary_libxml2="yes"
-        ELM_ETHUMB_DEF="#define"
-        requirement_elm="libxml-2.0 ${requirement_elm}"
-       ],
-       [have_elementary_libxml2="no"]
-    )
-else
-    have_elementary_libxml2="no"
-fi
-if test "x$want_elementary_libxml2" = "xyes" -a "x$have_elementary_libxml2" = "xno"; then
-    AC_MSG_ERROR(Libxml-2.0 support requested, but no libxml-2.0 found by pkg-config.])
-fi
-AC_SUBST(ELM_LIBXML2_DEF)
-
 ELM_DEBUG_DEF="#undef"
 want_elementary_debug="no"
 AC_ARG_ENABLE([debug],
@@ -517,7 +489,6 @@ data/themes/Makefile
 data/images/Makefile
 data/objects/Makefile
 data/desktop/Makefile
-data/xmls/Makefile
 data/edje_externals/Makefile
 config/Makefile
 config/default/Makefile

diff --git a/data/Makefile.am b/data/Makefile.am
index b3453dc..17807ed 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,3 @@
 AUTOMAKE_OPTIONS     = 1.4 foreign
 MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS              = themes images objects desktop edje_externals xmls
+SUBDIRS              = themes images objects desktop edje_externals

diff --git a/data/xmls/Makefile.am b/data/xmls/Makefile.am
deleted file mode 100644 (file)
index 374613f..0000000
--- a/data/xmls/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-4AUTOMAKE_OPTIONS     = 1.4 foreign
-MAINTAINERCLEANFILES = Makefile.in
-
-xmldir = $(datadir)/xmls
-xml_DATA = elementary.xml
-
-EXTRA_DIST = $(xml_DATA)

diff --git a/data/xmls/elementary.xml b/data/xmls/elementary.xml
deleted file mode 100644 (file)
index ce77bc5..0000000
--- a/data/xmls/elementary.xml
+++ /dev/null
@@ -1,668 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE AML SYSTEM "tree2.dtd">
-<AML>
-  <Animation title="test">
-    <Scene title="first">
-      <Time start="0" end="0.2"/>
-      <Location>
-        <CoordX standard="OBJECT" from="0" to="0" type="LINEAR"/>
-        <CoordY standard="OBJECT" from="0" to="-20" type="DECELERATE"/>
-        <CoordW standard="OBJECT" from="0" to="0" type="LINEAR"/>
-        <CoordH standard="OBJECT" from="0" to="0" type="LINEAR"/>
-      </Location>
-      <Rotation>
-        <AngleX from="0" to="0" type="LINEAR"/>
-        <AngleY from="0" to="0" type="LINEAR"/>
-        <AngleZ from="0" to="0" type="LINEAR"/>
-        <Center x="10" y="30" z="20"/>
-      </Rotation>
-      <Color>
-        <Red from="255" to="255" type="LINEAR"/>
-        <Green from="255" to="255" type="LINEAR"/>
-        <ColorBlue from="255" to="255" type="LINEAR"/>
-        <Alpha from="255" to="255" type="LINEAR"/>
-      </Color>
-       </Scene>
-       <Scene title="second">
-      <Time start="0" end="0.2"/>
-      <Location>
-        <CoordX standard="CURRENT" from="0" to="0" type="LINEAR"/>
-        <CoordY standard="CURRENT" from="0" to="20" type="ACCELERATE"/>
-        <CoordW standard="CURRENT" from="0" to="0" type="LINEAR"/>
-        <CoordH standard="CURRENT" from="0" to="0" type="LINEAR"/>
-      </Location>
-      <Rotation>
-        <AngleX from="0" to="0" type="LINEAR"/>
-        <AngleY from="0" to="0" type="LINEAR"/>
-        <AngleZ from="0" to="0" type="LINEAR"/>
-        <Center x="10" y="30" z="20"/>
-      </Rotation>
-      <Color>
-        <Red from="255" to="255" type="LINEAR"/>
-        <Green from="255" to="255" type="LINEAR"/>
-        <ColorBlue from="255" to="255" type="LINEAR"/>
-        <Alpha from="255" to="255" type="LINEAR"/>
-      </Color>
-       </Scene>
-       <Scene title="second">
-      <Time start="0" end="0.2"/>
-      <Location>
-        <CoordX standard="CURRENT" from="0" to="0" type="LINEAR"/>
-        <CoordY standard="CURRENT" from="0" to="-15" type="DECELERATE"/>
-        <CoordW standard="CURRENT" from="0" to="0" type="LINEAR"/>
-        <CoordH standard="CURRENT" from="0" to="0" type="LINEAR"/>
-      </Location>
-      <Rotation>
-        <AngleX from="0" to="0" type="LINEAR"/>
-        <AngleY from="0" to="0" type="LINEAR"/>
-        <AngleZ from="0" to="0" type="LINEAR"/>
-        <Center x="10" y="30" z="20"/>
-      </Rotation>
-      <Color>
-        <Red from="255" to="255" type="LINEAR"/>
-        <Green from="255" to="255" type="LINEAR"/>
-        <ColorBlue from="255" to="255" type="LINEAR"/>
-        <Alpha from="255" to="255" type="LINEAR"/>
-      </Color>
-       </Scene>
-       <Scene title="second">
-      <Time start="0" end="0.2"/>
-      <Location>
-        <CoordX standard="CURRENT" from="0" to="0" type="LINEAR"/>
-        <CoordY standard="CURRENT" from="0" to="15" type="ACCELERATE"/>
-        <CoordW standard="CURRENT" from="0" to="0" type="LINEAR"/>
-        <CoordH standard="CURRENT" from="0" to="0" type="LINEAR"/>
-      </Location>
-      <Rotation>
-        <AngleX from="0" to="0" type="LINEAR"/>
-        <AngleY from="0" to="0" type="LINEAR"/>
-        <AngleZ from="0" to="0" type="LINEAR"/>
-        <Center x="10" y="30" z="20"/>
-      </Rotation>
-      <Color>
-        <Red from="255" to="255" type="LINEAR"/>
-        <Green from="255" to="255" type="LINEAR"/>
-        <ColorBlue from="255" to="255" type="LINEAR"/>
-        <Alpha from="255" to="255" type="LINEAR"/>
-      </Color>
-       </Scene>
-       <Scene title="second">
-      <Time start="0" end="0.2"/>
-      <Location>
-        <CoordX standard="CURRENT" from="0" to="0" type="LINEAR"/>
-        <CoordY standard="CURRENT" from="0" to="-10" type="DECELERATE"/>
-        <CoordW standard="CURRENT" from="0" to="0" type="LINEAR"/>
-        <CoordH standard="CURRENT" from="0" to="0" type="LINEAR"/>
-      </Location>
-      <Rotation>
-        <AngleX from="0" to="0" type="LINEAR"/>
-        <AngleY from="0" to="0" type="LINEAR"/>
-        <AngleZ from="0" to="0" type="LINEAR"/>
-        <Center x="10" y="30" z="20"/>
-      </Rotation>
-      <Color>
-        <Red from="255" to="255" type="LINEAR"/>
-        <Green from="255" to="255" type="LINEAR"/>
-        <ColorBlue from="255" to="255" type="LINEAR"/>
-        <Alpha from="255" to="255" type="LINEAR"/>
-      </Color>
-       </Scene>
-       <Scene title="second">
-      <Time start="0" end="0.2"/>
-      <Location>
-        <CoordX standard="CURRENT" from="0" to="0" type="LINEAR"/>
-        <CoordY standard="CURRENT" from="0" to="10" type="ACCELERATE"/>
-        <CoordW standard="CURRENT" from="0" to="0" type="LINEAR"/>
-        <CoordH standard="CURRENT" from="0" to="0" type="LINEAR"/>
-      </Location>
-      <Rotation>
-        <AngleX from="0" to="0" type="LINEAR"/>
-        <AngleY from="0" to="0" type="LINEAR"/>
-        <AngleZ from="0" to="0" type="LINEAR"/>
-        <Center x="10" y="30" z="20"/>
-      </Rotation>
-      <Color>
-        <Red from="255" to="255" type="LINEAR"/>
-        <Green from="255" to="255" type="LINEAR"/>
-        <ColorBlue from="255" to="255" type="LINEAR"/>
-        <Alpha from="255" to="255" type="LINEAR"/>
-      </Color>
-    </Scene>
-  </Animation>
-  <Animation title="test2">
-       <Scene title="first">
-               <Time start="0" end="1.2"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordY standard="OBJECT" from="0" to="0" type="DECELERATE"/>
-                       <CoordW standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordH standard="OBJECT" from="0" to="0" type="LINEAR"/>
-               </Location>
-               <Rotation>
-                       <AngleX from="0" to="0" type="DECELERATE"/>
-                       <AngleY from="0" to="1080" type="DECELERATE"/>
-                       <AngleZ from="0" to="0" type="LINEAR"/>
-                       <Center x="0.5" y="0.5" z="0"/>
-               </Rotation>
-               <Color>
-                       <Red from="255" to="255" type="LINEAR"/>
-                       <Green from="255" to="255" type="LINEAR"/>
-                       <ColorBlue from="255" to="255" type="LINEAR"/>
-                       <Alpha from="255" to="255" type="LINEAR"/>
-               </Color>
-       </Scene>
-  </Animation>
-  <Animation title="test3">
-       <Scene title="first">
-               <Time start="0" end="1.2"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordY standard="OBJECT" from="0" to="0" type="DECELERATE"/>
-                       <CoordW standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordH standard="OBJECT" from="0" to="0" type="LINEAR"/>
-               </Location>
-               <Rotation>
-                       <AngleX from="0" to="1080" type="DECELERATE"/>
-                       <AngleY from="0" to="0" type="DECELERATE"/>
-                       <AngleZ from="0" to="0" type="LINEAR"/>
-                       <Center x="0.5" y="0.5" z="0"/>
-               </Rotation>
-               <Color>
-                       <Red from="255" to="255" type="LINEAR"/>
-                       <Green from="255" to="255" type="LINEAR"/>
-                       <ColorBlue from="255" to="255" type="LINEAR"/>
-                       <Alpha from="255" to="255" type="LINEAR"/>
-               </Color>
-       </Scene>
-  </Animation>
-  <Animation title="test4">
-       <Scene title="1">
-               <Time start="0" end="0.1"/>
-               <Rotation>
-                       <AngleX from="0" to="0" type="DECELERATE"/>
-                       <AngleY from="0" to="0" type="DECELERATE"/>
-                       <AngleZ from="0" to="-25" type="DECELERATE"/>
-                       <Center x="0" y="1.0" z="0"/>
-               </Rotation>
-       </Scene>
-       <Scene title="2">
-               <Time start="0" end="0.1"/>
-               <Rotation>
-                       <AngleX from="0" to="0" type="DECELERATE"/>
-                       <AngleY from="0" to="0" type="DECELERATE"/>
-                       <AngleZ from="-25" to="0" type="DECELERATE"/>
-                       <Center x="0" y="1.0" z="0"/>
-               </Rotation>
-       </Scene>
-       <Scene title="3">
-               <Time start="0" end="0.1"/>
-               <Rotation>
-                       <AngleX from="0" to="0" type="DECELERATE"/>
-                       <AngleY from="0" to="0" type="DECELERATE"/>
-                       <AngleZ from="0" to="20" type="DECELERATE"/>
-                       <Center x="1.0" y="1.0" z="0" attribute="RELATIVE"/>
-               </Rotation>
-       </Scene>
-       <Scene title="4">
-               <Time start="0" end="0.1"/>
-               <Rotation>
-                       <AngleX from="0" to="0" type="DECELERATE"/>
-                       <AngleY from="0" to="0" type="DECELERATE"/>
-                       <AngleZ from="20" to="0" type="DECELERATE"/>
-                       <Center x="1.0" y="1.0" z="0"/>
-               </Rotation>
-       </Scene>
-       <Scene title="5">
-               <Time start="0" end="0.1"/>
-               <Rotation>
-                       <AngleX from="0" to="0" type="DECELERATE"/>
-                       <AngleY from="0" to="0" type="DECELERATE"/>
-                       <AngleZ from="0" to="-15" type="DECELERATE"/>
-                       <Center x="0" y="1.0" z="0"/>
-               </Rotation>
-       </Scene>
-       <Scene title="6">
-               <Time start="0" end="0.1"/>
-               <Rotation>
-                       <AngleX from="0" to="0" type="DECELERATE"/>
-                       <AngleY from="0" to="0" type="DECELERATE"/>
-                       <AngleZ from="-15" to="0" type="DECELERATE"/>
-                       <Center x="0" y="1.0" z="0"/>
-               </Rotation>
-       </Scene>
-       <Scene title="7">
-               <Time start="0" end="0.1"/>
-               <Rotation>
-                       <AngleX from="0" to="0" type="DECELERATE"/>
-                       <AngleY from="0" to="0" type="DECELERATE"/>
-                       <AngleZ from="0" to="10" type="DECELERATE"/>
-                       <Center x="1.0" y="1.0" z="0"/>
-               </Rotation>
-       </Scene>
-       <Scene title="8">
-               <Time start="0" end="0.1"/>
-               <Rotation>
-                       <AngleX from="0" to="0" type="DECELERATE"/>
-                       <AngleY from="0" to="0" type="DECELERATE"/>
-                       <AngleZ from="10" to="0" type="DECELERATE"/>
-                       <Center x="1.0" y="1.0" z="0"/>
-               </Rotation>
-       </Scene>
-       <Scene title="9">
-               <Time start="0" end="0.1"/>
-               <Rotation>
-                       <AngleX from="0" to="0" type="DECELERATE"/>
-                       <AngleY from="0" to="0" type="DECELERATE"/>
-                       <AngleZ from="0" to="-5" type="DECELERATE"/>
-                       <Center x="0" y="1.0" z="0"/>
-               </Rotation>
-       </Scene>
-       <Scene title="10">
-               <Time start="0" end="0.1"/>
-               <Rotation>
-                       <AngleX from="0" to="0" type="DECELERATE"/>
-                       <AngleY from="0" to="0" type="DECELERATE"/>
-                       <AngleZ from="-5" to="0" type="DECELERATE"/>
-                       <Center x="0" y="1.0" z="0"/>
-               </Rotation>
-       </Scene>
-       <Scene title="11">
-               <Time start="0" end="0.1"/>
-               <Rotation>
-                       <AngleX from="0" to="0" type="DECELERATE"/>
-                       <AngleY from="0" to="0" type="DECELERATE"/>
-                       <AngleZ from="0" to="5" type="DECELERATE"/>
-                       <Center x="1.0" y="1.0" z="0"/>
-               </Rotation>
-       </Scene>
-               <Scene title="12">
-               <Time start="0" end="0.1"/>
-               <Rotation>
-                       <AngleX from="0" to="0" type="DECELERATE"/>
-                       <AngleY from="0" to="0" type="DECELERATE"/>
-                       <AngleZ from="5" to="0" type="DECELERATE"/>
-                       <Center x="1.0" y="1.0" z="0"/>
-               </Rotation>
-       </Scene>
-  </Animation>
-  <Animation title="translation-hide">
-       <Scene title="first">
-               <Time start="0" end="0.5"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="0" to="-480" type="DECELERATE"/>
-                       <CoordY standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordW standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordH standard="OBJECT" from="0" to="0" type="LINEAR"/>
-               </Location>
-               <Color>
-                       <Red from="255" to="255" type="LINEAR"/>
-                       <Green from="255" to="255" type="LINEAR"/>
-                       <Blue from="255" to="255" type="LINEAR"/>
-                       <Alpha from="255" to="255" type="LINEAR"/>
-               </Color>
-       </Scene>
-  </Animation>
-  <Animation title="translation-show">
-       <Scene title="first">
-               <Time start="0.0" end="0.5"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="480" to="0" type="DECELERATE"/>
-                       <CoordY standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordW standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordH standard="OBJECT" from="0" to="0" type="LINEAR"/>
-               </Location>
-               <Color>
-                       <Red from="255" to="255" type="LINEAR"/>
-                       <Green from="255" to="255" type="LINEAR"/>
-                       <Blue from="255" to="255" type="LINEAR"/>
-                       <Alpha from="255" to="255" type="LINEAR"/>
-               </Color>
-       </Scene>
-  </Animation>
-  <Animation title="flip1-hide">
-       <Scene title="first">
-               <Time start="0" end="0.3"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordY standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordW standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordH standard="OBJECT" from="0" to="0" type="LINEAR"/>
-               </Location>
-               <Rotation>
-                       <AngleX from="0" to="90" type="LINEAR"/>
-                       <AngleY from="0" to="0" type="LINEAR"/>
-                       <AngleZ from="0" to="0" type="LINEAR"/>
-                       <Center x="0.5" y="0.5" z="0"/>
-               </Rotation>
-               <Color>
-                       <Red from="255" to="255" type="LINEAR"/>
-                       <Green from="255" to="255" type="LINEAR"/>
-                       <ColorBlue from="255" to="255" type="LINEAR"/>
-                       <Alpha from="255" to="255" type="LINEAR"/>
-               </Color>
-       </Scene>
-  </Animation>
-  <Animation title="flip1-show">
-       <Scene title="first">
-               <Time start="0.3" end="0.6"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordY standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordW standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordH standard="OBJECT" from="0" to="0" type="LINEAR"/>
-               </Location>
-               <Rotation>
-                       <AngleX from="270" to="360" type="LINEAR"/>
-                       <AngleY from="0" to="0" type="LINEAR"/>
-                       <AngleZ from="0" to="0" type="LINEAR"/>
-                       <Center x="0.5" y="0.5" z="0"/>
-               </Rotation>
-               <Color>
-                       <Red from="255" to="255" type="LINEAR"/>
-                       <Green from="255" to="255" type="LINEAR"/>
-                       <ColorBlue from="255" to="255" type="LINEAR"/>
-                       <Alpha from="255" to="255" type="LINEAR"/>
-               </Color>
-       </Scene>
-  </Animation>
-  <Animation title="flip2-hide">
-       <Scene title="first">
-               <Time start="0" end="0.3"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordY standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordW standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordH standard="OBJECT" from="0" to="0" type="LINEAR"/>
-               </Location>
-               <Rotation>
-                       <AngleX from="0" to="0" type="LINEAR"/>
-                       <AngleY from="0" to="90" type="LINEAR"/>
-                       <AngleZ from="0" to="0" type="LINEAR"/>
-                       <Center x="0.5" y="0.5" z="0"/>
-               </Rotation>
-               <Color>
-                       <Red from="255" to="255" type="LINEAR"/>
-                       <Green from="255" to="255" type="LINEAR"/>
-                       <ColorBlue from="255" to="255" type="LINEAR"/>
-                       <Alpha from="255" to="255" type="LINEAR"/>
-               </Color>
-       </Scene>
-  </Animation>
-  <Animation title="flip2-show">
-       <Scene title="first">
-               <Time start="0.3" end="0.6"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordY standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordW standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordH standard="OBJECT" from="0" to="0" type="LINEAR"/>
-               </Location>
-               <Rotation>
-                       <AngleX from="0" to="0" type="LINEAR"/>
-                       <AngleY from="270" to="360" type="LINEAR"/>
-                       <AngleZ from="0" to="0" type="LINEAR"/>
-                       <Center x="0.5" y="0.5" z="0"/>
-               </Rotation>
-               <Color>
-                       <Red from="255" to="255" type="LINEAR"/>
-                       <Green from="255" to="255" type="LINEAR"/>
-                       <ColorBlue from="255" to="255" type="LINEAR"/>
-                       <Alpha from="255" to="255" type="LINEAR"/>
-               </Color>
-       </Scene>
-  </Animation>
-  <Animation title="drop-hide">
-       <Scene title="first">
-               <Time start="0.0" end="0.5"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordY standard="OBJECT" from="0" to="0" type="ACCELERATE"/>
-                       <CoordW standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordH standard="OBJECT" from="0" to="0" type="LINEAR"/>
-               </Location>
-               <Rotation>
-                       <AngleX from="0" to="90" type="LINEAR"/>
-                       <AngleY from="0" to="0" type="LINEAR"/>
-                       <AngleZ from="0" to="0" type="LINEAR"/>
-                       <Center x="0.5" y="1.0" z="0"/>
-               </Rotation>
-               <Color>
-                       <Red from="255" to="255" type="LINEAR"/>
-                       <Green from="255" to="255" type="LINEAR"/>
-                       <ColorBlue from="255" to="255" type="LINEAR"/>
-                       <Alpha from="255" to="255" type="LINEAR"/>
-               </Color>
-       </Scene>
-  </Animation>
-  <Animation title="drop-show">
-       <Scene title="first">
-               <Time start="0.0" end="0.5"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordY standard="OBJECT" from="-800" to="0" type="ACCELERATE"/>
-                       <CoordW standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordH standard="OBJECT" from="0" to="0" type="LINEAR"/>
-               </Location>
-       </Scene>
-       <Scene title="first">
-               <Time start="0.0" end="0.2"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordY standard="OBJECT" from="0" to="-80" type="DECELERATE"/>
-                       <CoordW standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordH standard="OBJECT" from="0" to="0" type="LINEAR"/>
-               </Location>
-       </Scene>
-       <Scene title="first">
-               <Time start="0.0" end="0.3"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordY standard="OBJECT" from="-80" to="0" type="ACCELERATE"/>
-                       <CoordW standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordH standard="OBJECT" from="0" to="0" type="LINEAR"/>
-               </Location>
-       </Scene>
-  </Animation>
-  <Animation title="push-hide">
-       <Scene title="first">
-               <Time start="0.0" end="0.7"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordY standard="OBJECT" from="0" to="0" type="ACCELERATE"/>
-                       <CoordW standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordH standard="OBJECT" from="0" to="0" type="LINEAR"/>
-               </Location>
-               <Rotation>
-                       <AngleX from="0" to="0" type="DECELERATE"/>
-                       <AngleY from="0" to="0" type="LINEAR"/>
-                       <AngleZ from="0" to="90" type="ACCELERATE"/>
-                       <Center x="0.0" y="0.0" z="0"/>
-               </Rotation>
-       </Scene>
-  </Animation>
-  <Animation title="push-show">
-  <Scene title="first">
-               <Time start="0.0" end="0.7"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordY standard="OBJECT" from="0" to="0" type="ACCELERATE"/>
-                       <CoordW standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordH standard="OBJECT" from="0" to="0" type="LINEAR"/>
-               </Location>
-               <Rotation>
-                       <AngleX from="0" to="0" type="DECELERATE"/>
-                       <AngleY from="0" to="0" type="LINEAR"/>
-                       <AngleZ from="-90" to="0" type="ACCELERATE"/>
-                       <Center x="0.0" y="0.0" z="0"/>
-               </Rotation>
-       </Scene>
-  </Animation>
-  <Animation title="rotation1-hide">
-       <Scene title="first">
-               <Time start="0.0" end="0.3"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="0" to="160" type="DECELERATE"/>
-                       <CoordY standard="OBJECT" from="0" to="230" type="DECELERATE"/>
-                       <CoordW standard="OBJECT" from="0" to="-320" type="DECELERATE"/>
-                       <CoordH standard="OBJECT" from="0" to="-460" type="DECELERATE"/>
-               </Location>
-               <Rotation>
-                       <AngleX from="0" to="0" type="DECELERATE"/>
-                       <AngleY from="0" to="0" type="DECELERATE"/>
-                       <AngleZ from="0" to="0" type="DECELERATE"/>
-                       <Center x="0.5" y="0.5" z="0.5"/>
-               </Rotation>
-               <Color>
-                       <Red from="255" to="255" type="LINEAR"/>
-                       <Green from="255" to="255" type="LINEAR"/>
-                       <ColorBlue from="255" to="255" type="LINEAR"/>
-                       <Alpha from="255" to="150" type="LINEAR"/>
-               </Color>
-       </Scene>
-  </Animation>
-  <Animation title="rotation1-show">
-    <Scene title="first">
-               <Time start="0.3" end="1.0"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="160" to="0" type="ACCELERATE"/>
-                       <CoordY standard="OBJECT" from="230" to="0" type="ACCELERATE"/>
-                       <CoordW standard="OBJECT" from="-320" to="0" type="ACCELERATE"/>
-                       <CoordH standard="OBJECT" from="-460" to="0" type="ACCELERATE"/>
-               </Location>
-               <Rotation>
-                       <AngleX from="0" to="0" type="ACCELERATE"/>
-                       <AngleY from="0" to="0" type="ACCELERATE"/>
-                       <AngleZ from="0" to="1080" type="ACCELERATE"/>
-                       <Center x="0.5" y="0.5" z="0.5"/>
-               </Rotation>
-               <Color>
-                       <Red from="255" to="255" type="LINEAR"/>
-                       <Green from="255" to="255" type="LINEAR"/>
-                       <ColorBlue from="255" to="255" type="LINEAR"/>
-                       <Alpha from="150" to="255" type="LINEAR"/>
-               </Color>
-       </Scene>
-  </Animation>
-  <Animation title="wave-hide">
-       <Scene title="first">
-               <Time start="0.0" end="0.5"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordY standard="OBJECT" from="0" to="0" type="ACCELERATE"/>
-                       <CoordW standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordH standard="OBJECT" from="0" to="0" type="LINEAR"/>
-               </Location>
-               <Rotation>
-                       <AngleX from="0" to="90" type="ACCELERATE"/>
-                       <AngleY from="0" to="0" type="ACCELERATE"/>
-                       <AngleZ from="0" to="0" type="ACCELERATE"/>
-                       <Center x="0.0" y="0.0" z="0"/>
-               </Rotation>
-       </Scene>
-  </Animation>
-  <Animation title="wave-show">
-  <Scene title="first">
-               <Time start="0.0" end="0.7"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordY standard="OBJECT" from="0" to="0" type="ACCELERATE"/>
-                       <CoordW standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordH standard="OBJECT" from="0" to="0" type="LINEAR"/>
-               </Location>
-               <Rotation>
-                       <AngleX from="90" to="0" type="ACCELERATE"/>
-                       <AngleY from="0" to="0" type="ACCELERATE"/>
-                       <AngleZ from="0" to="0" type="ACCELERATE"/>
-                       <Center x="1.0" y="1.0" z="0"/>
-               </Rotation>
-       </Scene>
-  </Animation>
-  <Animation title="card-hide">
-    <Scene title="first">
-               <Time start="0.0" end="0.3"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="0" to="0" type="LINEAR"/>
-                       <CoordY standard="OBJECT" from="0" to="155" type="LINEAR"/>
-                       <CoordW standard="OBJECT" from="0" to="-240" type="LINEAR"/>
-                       <CoordH standard="OBJECT" from="0" to="-310" type="LINEAR"/>
-               </Location>
-               <Rotation>
-                       <AngleX from="0" to="0" type="DECELERATE"/>
-                       <AngleY from="0" to="0" type="LINEAR"/>
-                       <AngleZ from="0" to="0" type="DECELERATE"/>
-                       <Center x="0.5" y="0.5" z="0.5"/>
-               </Rotation>
-               <Color>
-                       <Red from="255" to="255" type="LINEAR"/>
-                       <Green from="255" to="255" type="LINEAR"/>
-                       <ColorBlue from="255" to="255" type="LINEAR"/>
-                       <Alpha from="255" to="150" type="LINEAR"/>
-               </Color>
-       </Scene>
-       <Scene title="first">
-               <Time start="0.0" end="0.3"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="0" to="120" type="DECELERATE"/>
-                       <CoordY standard="OBJECT" from="155" to="232" type="DECELERATE"/>
-                       <CoordW standard="OBJECT" from="-240" to="-360" type="DECELERATE"/>
-                       <CoordH standard="OBJECT" from="-310" to="-465" type="DECELERATE"/>
-               </Location>
-               <Rotation>
-                       <AngleX from="0" to="0" type="DECELERATE"/>
-                       <AngleY from="0" to="0" type="DECELERATE"/>
-                       <AngleZ from="0" to="0" type="DECELERATE"/>
-                       <Center x="0.5" y="0.5" z="0.5"/>
-               </Rotation>
-               <Color>
-                       <Red from="255" to="255" type="LINEAR"/>
-                       <Green from="255" to="255" type="LINEAR"/>
-                       <ColorBlue from="255" to="255" type="LINEAR"/>
-                       <Alpha from="150" to="0" type="LINEAR"/>
-               </Color>
-       </Scene>
-  </Animation>
-  <Animation title="card-show">
-    <Scene title="first">
-               <Time start="0.0" end="0.3"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="240" to="240" type="ACCELERATE"/>
-                       <CoordY standard="OBJECT" from="232" to="155" type="ACCELERATE"/>
-                       <CoordW standard="OBJECT" from="-360" to="-240" type="ACCELERATE"/>
-                       <CoordH standard="OBJECT" from="-465" to="-310" type="ACCELERATE"/>
-               </Location>
-               <Rotation>
-                       <AngleX from="0" to="0" type="ACCELERATE"/>
-                       <AngleY from="0" to="0" type="ACCELERATE"/>
-                       <AngleZ from="0" to="0" type="ACCELERATE"/>
-                       <Center x="0.5" y="0.5" z="0.5"/>
-               </Rotation>
-               <Color>
-                       <Red from="255" to="255" type="LINEAR"/>
-                       <Green from="255" to="255" type="LINEAR"/>
-                       <ColorBlue from="255" to="255" type="LINEAR"/>
-                       <Alpha from="0" to="150" type="LINEAR"/>
-               </Color>
-       </Scene>
-       <Scene title="first">
-               <Time start="0.0" end="0.3"/>
-               <Location>
-                       <CoordX standard="OBJECT" from="240" to="0" type="ACCELERATE"/>
-                       <CoordY standard="OBJECT" from="155" to="0" type="ACCELERATE"/>
-                       <CoordW standard="OBJECT" from="-240" to="0" type="ACCELERATE"/>
-                       <CoordH standard="OBJECT" from="-310" to="0" type="ACCELERATE"/>
-               </Location>
-               <Rotation>
-                       <AngleX from="0" to="0" type="ACCELERATE"/>
-                       <AngleY from="0" to="0" type="ACCELERATE"/>
-                       <AngleZ from="0" to="0" type="ACCELERATE"/>
-                       <Center x="0.5" y="0.5" z="0.5"/>
-               </Rotation>
-               <Color>
-                       <Red from="255" to="255" type="LINEAR"/>
-                       <Green from="255" to="255" type="LINEAR"/>
-                       <ColorBlue from="255" to="255" type="LINEAR"/>
-                       <Alpha from="150" to="255" type="LINEAR"/>
-               </Color>
-       </Scene>
-  </Animation>
-</AML>

diff --git a/debian/control b/debian/control
index 9d5d548..91923dc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,14 @@ Section: x11
 Priority: optional
 Maintainer: Jaehwan Kim <jae.hwan.kim@samsung.com>, Chuneon Park <chuneon.park@samsung.com>, Juyung Seo <juyung.seo@samsung.com>, Myungjae Lee <mjae.lee@samsung.com>, Woohyun Jung <wh0705.jung@samsung.com>, Jihoon Kim <jihoon48.kim@samsung.com>, Jeonghyun Yun <jh0506.yun@samsung.com>
 Uploaders: Doyoun Kang <doyoun.kang@samsung.com>, Hyoyoung Chang <hyoyoung.chang@samsung.com>
-Build-Depends: debhelper (>= 6), cdbs, libecore-dev, libevas-dev, libeet-dev, libeet-bin, libedje-dev, pkg-config, libtool, libeina-dev, libefreet-dev, libethumb-dev, libxml2-dev
+Build-Depends: debhelper (>= 6), cdbs, libecore-dev, libevas-dev, libeet-dev, libeet-bin, libedje-dev, pkg-config, libtool, libeina-dev, libefreet-dev, libethumb-dev
 Standards-Version: 3.8.1
 Homepage: http://www.enlightenment.org
 
 Package: libelm-dev
 Section: libdevel
 Architecture: any
-Depends: libelm (= ${binary:Version}), libecore-dev, libevas-dev, libeet-dev, libedje-dev, libedbus-dev, libefreet-dev, libethumb-dev, libxml2-dev
+Depends: libelm (= ${binary:Version}), libecore-dev, libevas-dev, libeet-dev, libedje-dev, libedbus-dev, libefreet-dev, libethumb-dev
 Description: Elementary - a basic widget set that is easy to use based on EFL for mobile
  This package contains devel content.
 

diff --git a/debian/libelm.install b/debian/libelm.install
index 6f6e84f..f360d4e 100644 (file)
--- a/debian/libelm.install
+++ b/debian/libelm.install
@@ -4,6 +4,5 @@ debian/tmp/usr/lib/edje/*
 debian/tmp/usr/share/elementary/images/*
 debian/tmp/usr/share/elementary/objects/*
 debian/tmp/usr/share/elementary/themes/*
-debian/tmp/usr/share/xmls/*
 debian/tmp/usr/share/icons/elementary.png
 debian/tmp/usr/lib/elementary/*

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index d48fdf1..fabed9f 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -17,8 +17,7 @@ AM_CPPFLAGS = \
 @ELEMENTARY_WINCE_CFLAGS@ \
 @ELEMENTARY_EDBUS_CFLAGS@ \
 @ELEMENTARY_EFREET_CFLAGS@ \
-@ELEMENTARY_ETHUMB_CFLAGS@ \
-@ELEMENTARY_LIBXML2_CFLAGS@
+@ELEMENTARY_ETHUMB_CFLAGS@ 
 
 if ELEMENTARY_WINDOWS_BUILD
 AM_CPPFLAGS += -DELEMENTARY_BUILD
@@ -133,5 +132,5 @@ els_tooltip.c
 
 
 libelementary_la_CFLAGS =
-libelementary_la_LIBADD = @my_libs@ @dlopen_libs@ @ELEMENTARY_LIBS@ @ELEMENTARY_X_LIBS@ @ELEMENTARY_FB_LIBS@ @ELEMENTARY_SDL_LIBS@ @ELEMENTARY_WIN32_LIBS@ @ELEMENTARY_WINCE_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_ETHUMB_LIBS@ @ELEMENTARY_LIBXML2_LIBS@
+libelementary_la_LIBADD = @my_libs@ @dlopen_libs@ @ELEMENTARY_LIBS@ @ELEMENTARY_X_LIBS@ @ELEMENTARY_FB_LIBS@ @ELEMENTARY_SDL_LIBS@ @ELEMENTARY_WIN32_LIBS@ @ELEMENTARY_WINCE_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_ETHUMB_LIBS@
 libelementary_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@

diff --git a/src/lib/elm_controlbar.c b/src/lib/elm_controlbar.c
index 470fce8..9b3721e 100644 (file)
--- a/src/lib/elm_controlbar.c
+++ b/src/lib/elm_controlbar.c
@@ -59,8 +59,6 @@ struct _Widget_Data
    Eina_Bool init_animation;
    Eina_Bool selected_animation;
 
-   Elm_Xml_Animator *xa;
-   Elm_Xml_Animator *vxa;
 //   const char *view_hide;
 //   const char *view_show;
    const char *pressed_signal;
@@ -286,11 +284,6 @@ _del_hook(Evas_Object * obj)
         evas_object_del(wd->bg);
         wd->bg = NULL;
      }
-   if (wd->xa)
-     {
-        elm_xml_animator_del(wd->xa);
-        wd->xa = NULL;
-     }
    if (wd->effect_timer)
      {
         ecore_timer_del(wd->effect_timer);
@@ -453,13 +446,6 @@ move_object_with_animation(Evas_Object * obj, Evas_Coord x, Evas_Coord y,
    ad->timer = ecore_animator_add(mv_func, ad);
 }
 
-static void 
-end_item_animation_effect(void *data, Evas_Object *obj)
-{
-   Widget_Data *wd = (Widget_Data *)data;
-   elm_xml_animator_object_del(wd->xa, obj);
-}
-
 static Eina_Bool
 item_animation_effect(void *data)
 {
@@ -468,11 +454,6 @@ item_animation_effect(void *data)
    Elm_Controlbar_Item * item;
    int rand;
 
-   if(!wd->xa){
-        wd->xa = elm_xml_animator_add(wd->object);
-        elm_xml_animator_file_set(wd->xa, "/usr/share/xmls/elementary.xml");
-   }
-
    srand(time(NULL));
 
    EINA_LIST_FOREACH(wd->items, l, item)
@@ -484,16 +465,12 @@ item_animation_effect(void *data)
              switch(rand)
                {
                 case 0: 
-                   elm_xml_animator_object_add(wd->xa, item->base_item, "test", end_item_animation_effect, wd);
                    break;
                 case 1:
-                   elm_xml_animator_object_add(wd->xa, item->base_item, "test2", end_item_animation_effect, wd);
                    break;
                 case 2:
-                   elm_xml_animator_object_add(wd->xa, item->base_item, "test3", end_item_animation_effect, wd);
                    break;
                 case 3:
-                   elm_xml_animator_object_add(wd->xa, item->base_item, "test4", end_item_animation_effect, wd);
                    break;
                 default:
                    break;
@@ -502,8 +479,6 @@ item_animation_effect(void *data)
           }
      }
 
-   elm_xml_animator_run(wd->xa);
-
    return ECORE_CALLBACK_RENEW;
 }