projects / profile / ivi / efl-theme-tizen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dcc9ce8)
naviframe - updated transition signals
authorChunEon Park <chuneon.park@samsung.com>
Mon, 3 Oct 2011 10:45:02 +0000 (19:45 +0900)
committerChunEon Park <chuneon.park@samsung.com>
Mon, 3 Oct 2011 10:45:02 +0000 (19:45 +0900)
themes/groups/naviframe.edc patch | blob | history

diff --git a/themes/groups/naviframe.edc b/themes/groups/naviframe.edc
index 8072c44..a53c577 100644 (file)
--- a/themes/groups/naviframe.edc
+++ b/themes/groups/naviframe.edc
@@ -150,21 +150,16 @@
             clip_to: "content_clip";
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel1.relative: 1.0 1.0;
-               rel1.to_y: "optionheader_bg";
-               rel2.relative: 2.0 1.0;
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
                rel1.relative: 0.0 1.0;
+               rel1.to_y: "optionheader_bg";
                rel2.relative: 1.0 1.0;
             }
-            description { state: "pushed" 0.0;
+           description { state: "left" 0.0;
                inherit: "default" 0.0;
                rel1.relative: -1.0 1.0;
                rel2.relative: 0.0 1.0;
             }
-            description { state: "popped" 0.0;
+            description { state: "right" 0.0;
                inherit: "default" 0.0;
                rel1.relative: 1.0 1.0;
                rel2.relative: 2.0 1.0;
@@ -331,30 +326,70 @@
          }
       }
       programs {
-         program { name: "show";
-            signal: "elm,state,show";
-            source: "elm";
-            action: STATE_SET "show" 0.0;
+         program { name: "content_new_pusehd";
+            signal: "elm,state,new,pushed,internal";
+            source: "";
+            action: STATE_SET "default" 0.0;
             target: "elm.swallow.content";
             transition: DECELERATE 0.5;
             after: "show_finished";
          }
-         program { name: "pushed";
-            signal: "elm,state,pushed";
-            source: "elm";
-            action: STATE_SET "pushed" 0.0;
+         program { name: "content_cur_pusehd";
+            signal: "elm,state,cur,pushed,internal";
+            source: "";
+            action: STATE_SET "left" 0.0;
             target: "elm.swallow.content";
             transition: DECELERATE 0.5;
             after: "pushed_finished";
          }
-         program { name: "popped";
-            signal: "elm,state,popped";
-            source: "elm";
-            action: STATE_SET "popped" 0.0;
+         program { name: "content_prev_popped";
+            signal: "elm,state,prev,popped,internal";
+            source: "";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+            transition: DECELERATE 0.5;
+            after: "show_finished";
+         }
+         program { name: "content_cur_popped";
+            signal: "elm,state,cur,popped,internal";
+            source: "";
+            action: STATE_SET "right" 0.0;
             target: "elm.swallow.content";
             transition: DECELERATE 0.5;
             after: "popped_finished";
          }
+         program { name: "cur_pushed";
+            signal: "elm,state,cur,pushed";
+            source: "elm";
+            script {
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               emit("elm,state,cur,pushed,internal", "");
+            }
+         }
+         program { name: "new_pushed";
+            signal: "elm,state,new,pushed";
+            source: "elm";
+            script {
+               set_state(PART:"elm.swallow.content", "right", 0.0);
+               emit("elm,state,new,pushed,internal", "");
+            }
+         }
+         program { name: "prev_popped";
+            signal: "elm,state,prev,popped";
+            source: "elm";
+            script {
+               set_state(PART:"elm.swallow.content", "left", 0.0);
+               emit("elm,state,prev,popped,internal", "");
+            }
+         }
+         program { name: "cur_popped";
+            signal: "elm,state,cur,popped";
+            source: "elm";
+            script {
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               emit("elm,state,cur,popped,internal", "");
+            }
+         }
          program { name: "visible";
             signal: "elm,state,visible";
             source: "elm";
@@ -618,21 +653,16 @@
             clip_to: "content_clip";
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel1.relative: 1.0 1.0;
-               rel1.to_y: "optionheader_bg";
-               rel2.relative: 2.0 1.0;
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
                rel1.relative: 0.0 1.0;
+               rel1.to_y: "optionheader_bg";
                rel2.relative: 1.0 1.0;
             }
-            description { state: "pushed" 0.0;
+           description { state: "left" 0.0;
                inherit: "default" 0.0;
                rel1.relative: -1.0 1.0;
                rel2.relative: 0.0 1.0;
             }
-            description { state: "popped" 0.0;
+            description { state: "right" 0.0;
                inherit: "default" 0.0;
                rel1.relative: 1.0 1.0;
                rel2.relative: 2.0 1.0;
@@ -799,30 +829,70 @@
          }
       }
       programs {
-         program { name: "show";
-            signal: "elm,state,show";
-            source: "elm";
-            action: STATE_SET "show" 0.0;
+         program { name: "content_new_pusehd";
+            signal: "elm,state,new,pushed,internal";
+            source: "";
+            action: STATE_SET "default" 0.0;
             target: "elm.swallow.content";
             transition: DECELERATE 0.5;
             after: "show_finished";
          }
-         program { name: "pushed";
-            signal: "elm,state,pushed";
-            source: "elm";
-            action: STATE_SET "pushed" 0.0;
+         program { name: "content_cur_pusehd";
+            signal: "elm,state,cur,pushed,internal";
+            source: "";
+            action: STATE_SET "left" 0.0;
             target: "elm.swallow.content";
             transition: DECELERATE 0.5;
             after: "pushed_finished";
          }
-         program { name: "popped";
-            signal: "elm,state,popped";
-            source: "elm";
-            action: STATE_SET "popped" 0.0;
+         program { name: "content_prev_popped";
+            signal: "elm,state,prev,popped,internal";
+            source: "";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+            transition: DECELERATE 0.5;
+            after: "show_finished";
+         }
+         program { name: "content_cur_popped";
+            signal: "elm,state,cur,popped,internal";
+            source: "";
+            action: STATE_SET "right" 0.0;
             target: "elm.swallow.content";
             transition: DECELERATE 0.5;
             after: "popped_finished";
          }
+         program { name: "cur_pushed";
+            signal: "elm,state,cur,pushed";
+            source: "elm";
+            script {
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               emit("elm,state,cur,pushed,internal", "");
+            }
+         }
+         program { name: "new_pushed";
+            signal: "elm,state,new,pushed";
+            source: "elm";
+            script {
+               set_state(PART:"elm.swallow.content", "right", 0.0);
+               emit("elm,state,new,pushed,internal", "");
+            }
+         }
+         program { name: "prev_popped";
+            signal: "elm,state,prev,popped";
+            source: "elm";
+            script {
+               set_state(PART:"elm.swallow.content", "left", 0.0);
+               emit("elm,state,prev,popped,internal", "");
+            }
+         }
+         program { name: "cur_popped";
+            signal: "elm,state,cur,popped";
+            source: "elm";
+            script {
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               emit("elm,state,cur,popped,internal", "");
+            }
+         }
          program { name: "visible";
             signal: "elm,state,visible";
             source: "elm";
@@ -1063,7 +1133,7 @@
                rel2.relative: 1.0 1.0;
                visible: 0;
             }
-            description { state: "show" 0.0;
+           description { state: "show" 0.0;
                inherit: "default" 0.0;
                visible: 1;
             }
@@ -1230,22 +1300,29 @@
          }
       }
       programs {
-         program { name: "show";
-            signal: "elm,state,show";
+         program { name: "cur_pushed";
+            signal: "elm,state,cur,pushed";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+            after: "pushed_finished";
+         }
+         program { name: "new_pushed";
+            signal: "elm,state,new,pushed";
             source: "elm";
             action: STATE_SET "show" 0.0;
             target: "elm.swallow.content";
             after: "show_finished";
          }
-         program { name: "pushed";
-            signal: "elm,state,pushed";
+         program { name: "prev_popped";
+            signal: "elm,state,prev,popped";
             source: "elm";
-            action: STATE_SET "default" 0.0;
+            action: STATE_SET "show" 0.0;
             target: "elm.swallow.content";
-            after: "pushed_finished";
+            after: "show_finished";
          }
-         program { name: "popped";
-            signal: "elm,state,popped";
+         program { name: "cur_popped";
+            signal: "elm,state,cur,popped";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "elm.swallow.content";
@@ -1517,7 +1594,7 @@
                rel2.relative: 1.0 1.0;
                visible: 0;
             }
-            description { state: "show" 0.0;
+           description { state: "show" 0.0;
                inherit: "default" 0.0;
                visible: 1;
             }
@@ -1684,22 +1761,29 @@
          }
       }
       programs {
-         program { name: "show";
-            signal: "elm,state,show";
+         program { name: "cur_pushed";
+            signal: "elm,state,cur,pushed";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+            after: "pushed_finished";
+         }
+         program { name: "new_pushed";
+            signal: "elm,state,new,pushed";
             source: "elm";
             action: STATE_SET "show" 0.0;
             target: "elm.swallow.content";
             after: "show_finished";
          }
-         program { name: "pushed";
-            signal: "elm,state,pushed";
+         program { name: "prev_popped";
+            signal: "elm,state,prev,popped";
             source: "elm";
-            action: STATE_SET "default" 0.0;
+            action: STATE_SET "show" 0.0;
             target: "elm.swallow.content";
-            after: "pushed_finished";
+            after: "show_finished";
          }
-         program { name: "popped";
-            signal: "elm,state,popped";
+         program { name: "cur_popped";
+            signal: "elm,state,cur,popped";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "elm.swallow.content";
Domain: UI Framework / EFL;