Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary

diff --git a/data/xmls/elementary.xml b/data/xmls/elementary.xml
index 0f668ac..ce77bc5 100644 (file)
--- a/data/xmls/elementary.xml
+++ b/data/xmls/elementary.xml
@@ -17,10 +17,10 @@
         <Center x="10" y="30" z="20"/>
       </Rotation>
       <Color>
-        <ColorRed from="255" to="255" type="LINEAR"/>
-        <ColorGreen from="255" to="255" type="LINEAR"/>
+        <Red from="255" to="255" type="LINEAR"/>
+        <Green from="255" to="255" type="LINEAR"/>
         <ColorBlue from="255" to="255" type="LINEAR"/>
-        <ColorAlpha from="255" to="255" type="LINEAR"/>
+        <Alpha from="255" to="255" type="LINEAR"/>
       </Color>
        </Scene>
        <Scene title="second">
@@ -38,10 +38,10 @@
         <Center x="10" y="30" z="20"/>
       </Rotation>
       <Color>
-        <ColorRed from="255" to="255" type="LINEAR"/>
-        <ColorGreen from="255" to="255" type="LINEAR"/>
+        <Red from="255" to="255" type="LINEAR"/>
+        <Green from="255" to="255" type="LINEAR"/>
         <ColorBlue from="255" to="255" type="LINEAR"/>
-        <ColorAlpha from="255" to="255" type="LINEAR"/>
+        <Alpha from="255" to="255" type="LINEAR"/>
       </Color>
        </Scene>
        <Scene title="second">
@@ -59,10 +59,10 @@
         <Center x="10" y="30" z="20"/>
       </Rotation>
       <Color>
-        <ColorRed from="255" to="255" type="LINEAR"/>
-        <ColorGreen from="255" to="255" type="LINEAR"/>
+        <Red from="255" to="255" type="LINEAR"/>
+        <Green from="255" to="255" type="LINEAR"/>
         <ColorBlue from="255" to="255" type="LINEAR"/>
-        <ColorAlpha from="255" to="255" type="LINEAR"/>
+        <Alpha from="255" to="255" type="LINEAR"/>
       </Color>
        </Scene>
        <Scene title="second">
@@ -80,10 +80,10 @@
         <Center x="10" y="30" z="20"/>
       </Rotation>
       <Color>
-        <ColorRed from="255" to="255" type="LINEAR"/>
-        <ColorGreen from="255" to="255" type="LINEAR"/>
+        <Red from="255" to="255" type="LINEAR"/>
+        <Green from="255" to="255" type="LINEAR"/>
         <ColorBlue from="255" to="255" type="LINEAR"/>
-        <ColorAlpha from="255" to="255" type="LINEAR"/>
+        <Alpha from="255" to="255" type="LINEAR"/>
       </Color>
        </Scene>
        <Scene title="second">
@@ -101,10 +101,10 @@
         <Center x="10" y="30" z="20"/>
       </Rotation>
       <Color>
-        <ColorRed from="255" to="255" type="LINEAR"/>
-        <ColorGreen from="255" to="255" type="LINEAR"/>
+        <Red from="255" to="255" type="LINEAR"/>
+        <Green from="255" to="255" type="LINEAR"/>
         <ColorBlue from="255" to="255" type="LINEAR"/>
-        <ColorAlpha from="255" to="255" type="LINEAR"/>
+        <Alpha from="255" to="255" type="LINEAR"/>
       </Color>
        </Scene>
        <Scene title="second">
@@ -122,10 +122,10 @@
         <Center x="10" y="30" z="20"/>
       </Rotation>
       <Color>
-        <ColorRed from="255" to="255" type="LINEAR"/>
-        <ColorGreen from="255" to="255" type="LINEAR"/>
+        <Red from="255" to="255" type="LINEAR"/>
+        <Green from="255" to="255" type="LINEAR"/>
         <ColorBlue from="255" to="255" type="LINEAR"/>
-        <ColorAlpha from="255" to="255" type="LINEAR"/>
+        <Alpha from="255" to="255" type="LINEAR"/>
       </Color>
     </Scene>
   </Animation>
@@ -145,10 +145,10 @@
                        <Center x="0.5" y="0.5" z="0"/>
                </Rotation>
                <Color>
-                       <ColorRed from="255" to="255" type="LINEAR"/>
-                       <ColorGreen from="255" to="255" type="LINEAR"/>
+                       <Red from="255" to="255" type="LINEAR"/>
+                       <Green from="255" to="255" type="LINEAR"/>
                        <ColorBlue from="255" to="255" type="LINEAR"/>
-                       <ColorAlpha from="255" to="255" type="LINEAR"/>
+                       <Alpha from="255" to="255" type="LINEAR"/>
                </Color>
        </Scene>
   </Animation>
@@ -168,10 +168,10 @@
                        <Center x="0.5" y="0.5" z="0"/>
                </Rotation>
                <Color>
-                       <ColorRed from="255" to="255" type="LINEAR"/>
-                       <ColorGreen from="255" to="255" type="LINEAR"/>
+                       <Red from="255" to="255" type="LINEAR"/>
+                       <Green from="255" to="255" type="LINEAR"/>
                        <ColorBlue from="255" to="255" type="LINEAR"/>
-                       <ColorAlpha from="255" to="255" type="LINEAR"/>
+                       <Alpha from="255" to="255" type="LINEAR"/>
                </Color>
        </Scene>
   </Animation>
@@ -285,4 +285,384 @@
                </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/src/lib/elm_controlbar.c b/src/lib/elm_controlbar.c
index 6db993a..6eb73bf 100644 (file)
--- a/src/lib/elm_controlbar.c
+++ b/src/lib/elm_controlbar.c
@@ -77,6 +77,10 @@ struct _Widget_Data
    Eina_Bool selected_animation;
 
    Elm_Xml_Animator *xa;
+   Elm_Xml_Animator *vxa;
+
+   char *view_hide;
+   char *view_show;
 };
 
 struct _Elm_Controlbar_Item 
@@ -754,7 +758,6 @@ item_animation_effect(void *data)
    const Eina_List *l;
    Elm_Controlbar_Item * item;
    int rand;
-   Eina_Bool check;
   
    if(!wd->xa){
        wd->xa = elm_xml_animator_add(wd->object);
@@ -772,7 +775,7 @@ item_animation_effect(void *data)
             switch(rand)
               {
                case 0: 
-                  check = elm_xml_animator_object_add(wd->xa, item->base_item, "test", end_item_animation_effect, wd);
+                  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);
@@ -1144,6 +1147,28 @@ view_animation_down(Widget_Data *wd, Evas_Object *pre, Evas_Object *cur, void *d
 }
 
 static void 
+end_view_animation_effect(void *data, Evas_Object *obj)
+{
+   Widget_Data *wd = (Widget_Data *)data;
+   elm_xml_animator_object_del(wd->vxa, obj);
+   if(wd->pre_item) evas_object_hide(wd->pre_item->view);
+   if(wd->cur_item) elm_layout_content_set(wd->view, "elm.swallow.view", wd->cur_item->view);
+}
+
+static Eina_Bool
+_check_idler(void *data)
+{
+   printf("in idler\n");
+
+   Elm_Controlbar_Item *it = data;
+
+   Evas_Coord x, y, w, h;
+   evas_object_geometry_get(it->view, &x, &y, &w, &h);
+
+   return ECORE_CALLBACK_CANCEL;
+}
+
+static void 
 selected_box(Elm_Controlbar_Item * it) 
 {
    Widget_Data * wd = elm_widget_data_get(it->obj);
@@ -1155,6 +1180,11 @@ selected_box(Elm_Controlbar_Item * it)
 
    wd->cur_item = it;
 
+   if(!wd->vxa){
+       wd->vxa = elm_xml_animator_add(wd->object);
+       elm_xml_animator_file_set(wd->vxa, "/usr/share/xmls/elementary.xml");
+   }
+
    if(it->style == TABBAR){
 
        content = elm_layout_content_unset(wd->view, "elm.swallow.view");
@@ -1198,8 +1228,25 @@ selected_box(Elm_Controlbar_Item * it)
                end_selected_box(wd, it->view);
             }
 */         
-          if(wd->pre_item) evas_object_hide(wd->pre_item->view);
+          //if(wd->pre_item) evas_object_hide(wd->pre_item->view);
           elm_layout_content_set(wd->view, "elm.swallow.view", it->view);
+          //for test
+          evas_object_map_enable_set(it->view, EINA_TRUE);
+         
+          //evas_object_move(it->view, -480, 94);
+          //evas_object_resize(it->view, 480, 620);
+          //evas_object_show(it->view);
+
+          if(wd->pre_item && wd->pre_item != it)
+            {
+               if(wd->view_hide) 
+                 elm_xml_animator_object_add(wd->vxa, wd->pre_item->view, wd->view_hide, end_view_animation_effect, wd);
+               else
+                 evas_object_hide(wd->pre_item->view);
+               if(wd->view_show) elm_xml_animator_object_add(wd->vxa, it->view, wd->view_show, end_view_animation_effect, wd);
+            }
+
+          elm_xml_animator_run(wd->vxa);
 
 //        elm_layout_content_set(wd->view, "elm.swallow.view", it->view);
           //edje_object_part_swallow(wd->view, "elm.swallow.view", it->view);
@@ -1213,6 +1260,8 @@ selected_box(Elm_Controlbar_Item * it)
    }
 
    evas_object_smart_callback_call(it->obj, "clicked", it);
+
+   ecore_idler_add(_check_idler, it);
 }
 
 static void
@@ -1283,7 +1332,7 @@ pressed_box(Elm_Controlbar_Item * it)
           else if (it->style == TOOLBAR)
             {
        
-               //object_color_set(it->base, "elm.toolbar.pressed.color", "elm.swallow.icon");
+               object_color_set(it->base, "elm.toolbar.pressed.color", "elm.swallow.icon");
                edje_object_signal_emit(_EDJ(it->base), "elm,state,text_selected",
                                          "elm");
                }
@@ -3479,3 +3528,22 @@ elm_controlbar_item_animation_set(Evas_Object *obj, Eina_Bool auto_animation, Ei
    wd->selected_animation = selected_animation;
 }
 
+EAPI void
+elm_controlbar_view_animation_set(Evas_Object *obj, const char *hide, const char *show)
+{
+   Widget_Data * wd;
+   if (obj == NULL)
+     {
+       fprintf(stderr, "Invalid argument: controlbar object is NULL\n");
+       return;
+     }
+   wd = elm_widget_data_get(obj);
+   if (wd == NULL)
+     {
+       fprintf(stderr, "Cannot get smart data\n");
+       return;
+     }
+
+   wd->view_hide = eina_stringshare_add(hide);
+   wd->view_show = eina_stringshare_add(show);
+}

diff --git a/src/lib/elm_xml_animator.c b/src/lib/elm_xml_animator.c
index cbf7c95..77acf4e 100644 (file)
--- a/src/lib/elm_xml_animator.c
+++ b/src/lib/elm_xml_animator.c
@@ -137,8 +137,8 @@ current_time_get()
 }
 
 static void
-set_evas_map_3d(Evas_Object * obj, Evas_Coord x, Evas_Coord y, Evas_Coord w,
-            Evas_Coord h, double dx, double dy, double dz, Evas_Coord cx, Evas_Coord cy, Evas_Coord cz) 
+set_evas_map_3d(Evas_Object * obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, double zoomw, double zoomh,
+             double dx, double dy, double dz, Evas_Coord cx, Evas_Coord cy, Evas_Coord cz) 
 {
    if (obj == NULL)
      {
@@ -149,10 +149,11 @@ set_evas_map_3d(Evas_Object * obj, Evas_Coord x, Evas_Coord y, Evas_Coord w,
       return;
 //     printf("map >> x : %d y : %d w : %d h : %d\n", x, y, w, h); 
    evas_map_smooth_set(map, EINA_TRUE);
-   evas_map_util_points_populate_from_object_full(map, obj, 0);
+//   evas_map_util_points_populate_from_object_full(map, obj, 0);
    evas_object_map_enable_set(obj, EINA_TRUE);
    evas_map_util_3d_perspective(map, x + w / 2, y + h / 2, 0, w * 10);
    evas_map_util_points_populate_from_geometry(map, x, y, w, h, 0);
+   evas_map_util_zoom(map, zoomw, zoomh, x, y);
    evas_map_util_3d_rotate(map, dx, dy, dz, cx, cy, cz);
    evas_object_map_set(obj, map);
    evas_map_free(map);
@@ -195,11 +196,8 @@ get_value_by_standard(Standard_Type type, int object_value, int current, int deg
 
 
 static void
-get_value_by_attribute(Attribute_Type type, Evas_Object *obj, double x, double y, double z, int *cx, int *cy, int *cz)
+get_value_by_attribute(Attribute_Type type, Evas_Coord w, Evas_Coord h, double x, double y, double z, int *cx, int *cy, int *cz)
 {
-       Evas_Coord w, h;
-       evas_object_geometry_get(obj, NULL, NULL, &w, &h);
-
        switch(type)
        {
                case ATTRIBUTE_TYPE_RELATIVE:
@@ -238,19 +236,24 @@ move_evas_map(void *data)
    double t;
    double amount;
 
+   int x, y, w, h;
    int dx, dy, dw, dh;
    int sfx, sfy, sfw, sfh;
    int stx, sty, stw, sth;
-   double dax, day, daz;
-
    int px, py, pw, ph;
-   double pax, pay, paz;
+   double zoomw, zoomh;
 
-   int x, y, w, h;
    double ax, ay, az;
+   double dax, day, daz;
+   double pax, pay, paz;
 
    int cx, cy, cz;
 
+   int r, g, b, a;
+   int dr, dg, db, da;
+   int pr, pg, pb, pa;
+
+
    Animation_Data * ad = (Animation_Data *) data;
    t = ELM_MAX(0.0, current_time_get() - ad->start_time) / 1000;
 
@@ -273,7 +276,7 @@ move_evas_map(void *data)
 
 //   printf("%d %d %d %d :: %d %d %d %d\n", sfx, sfy, sfw, sfh, stx, sty, stw, sth);
    if(t < ad->start) {
-          set_evas_map_3d(ad->obj, sfx, sfy, sfw, sfh, ad->AngleX->from, ad->AngleY->from, ad->AngleZ->from, ad->CoordX->from + ad->Center_x, ad->CoordY->from + ad->Center_y, ad->Center_z);
+          set_evas_map_3d(ad->obj, sfx, sfy, sfw, sfh, 1.0, 1.0, ad->AngleX->from, ad->AngleY->from, ad->AngleZ->from, ad->CoordX->from + ad->Center_x, ad->CoordY->from + ad->Center_y, ad->Center_z);
           return ECORE_CALLBACK_RENEW;
    }
    else t -= ad->start;
@@ -285,6 +288,10 @@ move_evas_map(void *data)
    dax = ad->AngleX->to - ad->AngleX->from;
    day = ad->AngleY->to - ad->AngleY->from;
    daz = ad->AngleZ->to - ad->AngleZ->from;
+   dr = ad->Red->to - ad->Red->from;
+   dg = ad->Green->to - ad->Green->from;
+   db = ad->Blue->to - ad->Blue->from;
+   da = ad->Alpha->to - ad->Alpha->from;
 
    if (t <= ad->duration)
      {
@@ -296,6 +303,10 @@ move_evas_map(void *data)
                 ax = get_value_by_type(ad->AngleX->type, amount, dax);
                 ay = get_value_by_type(ad->AngleY->type, amount, day);
                 az = get_value_by_type(ad->AngleZ->type, amount, daz);
+                r = get_value_by_type(ad->Red->type, amount, dr);
+                g = get_value_by_type(ad->Green->type, amount, dg);
+                b = get_value_by_type(ad->Blue->type, amount, db);
+                a = get_value_by_type(ad->Alpha->type, amount, da);
      }
    else
      {
@@ -306,6 +317,10 @@ move_evas_map(void *data)
        ax = dax;
        ay = day;
        az = daz;
+       r = dr;
+       g = dg;
+       b = db;
+       a = da;
      }
 
    // standard chek
@@ -313,21 +328,28 @@ move_evas_map(void *data)
    py = sfy + y;
    pw = sfw + w;
    ph = sfh + h;
+   zoomw = (double)pw/(double)tw;
+   zoomh = (double)ph/(double)th;
    pax = ad->AngleX->from + ax;
    pay = ad->AngleY->from + ay;
    paz = ad->AngleZ->from + az;
+   pr = ad->Red->from + r;
+   pg = ad->Green->from + g;
+   pb = ad->Blue->from + b;
+   pa = ad->Alpha->from + a;
 
-   get_value_by_attribute(ad->Center_type, ad->obj, ad->Center_x, ad->Center_y, ad->Center_z, &cx, &cy, &cz);
+   get_value_by_attribute(ad->Center_type, pw, ph, ad->Center_x, ad->Center_y, ad->Center_z, &cx, &cy, &cz);
   
-   if (x == dx && y == dy && w == dw && h == dh && ax == dax && ay == day && az == daz)
+   if (x == dx && y == dy && w == dw && h == dh && ax == dax && ay == day && az == daz && r == dr && g == dg && b == db && a == da)
      {
        if(ad->timer)
        {
                ecore_animator_del(ad->timer);
                ad->timer = NULL;
        }
-//     printf("px : %d py : %d pw : %d ph : %d\n", px, py, pw, ph); 
-       set_evas_map_3d(ad->obj, px, py, pw, ph, pax, pay, paz, px + cx, py + cy, cz);
+       //printf("px : %d py : %d pw : %d ph : %d\n", px, py, pw, ph); 
+       set_evas_map_3d(ad->obj, px, py, tw, th, zoomw, zoomh, pax, pay, paz, px + cx, py + cy, cz);
+       evas_object_color_set(ad->obj, pr, pg, pb, pa);
 
        if(ad->end_func == move_continue){
                next_ad = (Animation_Data *)ad->data;
@@ -340,8 +362,9 @@ move_evas_map(void *data)
                }
        }
        if (ad->end_func != NULL)
-          ad->end_func(ad->data, ad->obj);
-       ecore_idler_add(set_evas_map_disable, ad->obj);
+               ad->end_func(ad->data, ad->obj);
+       if(ad->end_func != move_continue)
+               ecore_idler_add(set_evas_map_disable, ad->obj);
        
        return ECORE_CALLBACK_CANCEL;
      }
@@ -352,8 +375,9 @@ move_evas_map(void *data)
 //     evas_object_resize(rect, 1, 1);
 //     evas_object_move(rect, px, py);
 //     evas_object_show(rect);
-//     printf(" >>>> px : %d py : %d pw : %d ph : %d\n", px, py, pw, ph); 
-       set_evas_map_3d(ad->obj, px, py, pw, ph, pax, pay, paz, px + cx, py + cy, cz);
+       //printf(" >>>> px : %d py : %d pw : %d ph : %d\n", px, py, pw, ph); 
+       set_evas_map_3d(ad->obj, px, py, tw, th, zoomw, zoomh, pax, pay, paz, px + cx, py + cy, cz);
+       evas_object_color_set(ad->obj, pr, pg, pb, pa);
      }
    return ECORE_CALLBACK_RENEW;
 }
@@ -434,6 +458,19 @@ get_attribute_type(char *str)
        return ATTRIBUTE_TYPE_RELATIVE;
 }
 
+static void
+init_animation_data(Animation_Data *ad)
+{
+       ad->Red->from = 255;
+       ad->Green->from = 255;
+       ad->Blue->from = 255;
+       ad->Alpha->from = 255;
+       ad->Red->to = 255;
+       ad->Green->to = 255;
+       ad->Blue->to = 255;
+       ad->Alpha->to = 255;
+}
+
 static Eina_List *
 save_animation_data(Eina_List *list, xmlDocPtr doc, xmlNodePtr cur)
 {
@@ -486,6 +523,8 @@ save_animation_data(Eina_List *list, xmlDocPtr doc, xmlNodePtr cur)
                                        ad->Blue = (Color_Data *) calloc(1, sizeof(Color_Data));
                                        ad->Alpha = (Color_Data *) calloc(1, sizeof(Color_Data));
 
+                                       init_animation_data(ad);
+
                                        al->scene_list = eina_list_append(al->scene_list, ad);
 
                                        if ( cur->properties != NULL)  {