nocontent - set bg color

naviframe - modified transition effect to full screen translation. (since the exist effect is not proper to new ux, i modified it temporary)

Change-Id: Ib7a13b5213982e785e122d53507a99be716d4f93

Conflicts:

	themes/inc/nbeat-black-hd-inc.edc
	themes/inc/nbeat-black-inc.edc
	themes/inc/nbeat-hd-inc.edc
	themes/inc/nbeat-inc.edc

Change-Id: If9843a8e74b38e9b90aff964432a4fc6861833b2

diff --git a/themes/groups/naviframe.edc b/themes/groups/naviframe.edc
index 6896c6b..090cfcc 100644 (file)
--- a/themes/groups/naviframe.edc
+++ b/themes/groups/naviframe.edc
@@ -25,6 +25,7 @@
          part { name: "base";
             mouse_events: 0;
             description { state: "default" 0.0;
+               visible: 0;
             }
          }
       }
@@ -41,6 +42,22 @@
          public cbar_bg = 0;     //Controlbar BG Show call count
       }
       parts {
+         part { name: "base";
+            type: RECT;
+            description { state: "default" 0.0;
+               visible: 0;
+            }
+            description { state: "left" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: -1.0 0.0;
+               rel2.relative: 0.0 1.0;
+            }
+            description { state: "right" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 1.0 0.0;
+               rel2.relative: 2.0 1.0;
+            }
+         }
          part { name: "title_clip";
             type: RECT;
             mouse_events: 0;
@@ -49,8 +66,8 @@
                min: 1 NAVIFRAME_TITLE_H_INC;
                align: 0.0 0.0;
                fixed: 0 1;
-               rel1 { relative: 0.0 0.0; }
-               rel2 { relative: 1.0 0.0; }
+               rel1 { relative: 0.0 0.0; to: "base"; }
+               rel2 { relative: 1.0 0.0; to: "base"; }
             }
             description { state: "hide" 0.0;
                inherit: "default" 0.0;
@@ -86,7 +103,6 @@
          }
          part { name: "optionheader_bg";
             type: IMAGE;
-            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                rel1 { to: "optionheader_clip"; }
@@ -142,8 +158,9 @@
             type: RECT;
             mouse_events: 0;
             description { state: "default" 0.0;
-               rel1.to_y: "optionheader_bg";
+               rel1.to: "optionheader_bg";
                rel1.relative: 0 1;
+               rel2.to_x: "optionheader_bg";
             }
          }
          part { name: "elm.swallow.content";
@@ -154,20 +171,11 @@
             description { state: "default" 0.0;
                align: 0.0 0.0;
                rel1.relative: 0.0 1.0;
-               rel1.to_y: "optionheader_bg";
+               rel1.to: "optionheader_bg";
                rel2.relative: 1.0 0.0;
+               rel2.to_x: "optionheader_bg";
                rel2.to_y: "controlbar_bg";
             }
-           description { state: "left" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: -1.0 1.0;
-               rel2.relative: 0.0 0.0;
-           }
-            description { state: "right" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 1.0 1.0;
-               rel2.relative: 2.0 0.0;
-            }
          }
          part { name: "title_base";
             type: RECT;
@@ -367,7 +375,6 @@
          }
          part { name: "optionheader_arrow";
             type: IMAGE;
-            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                min: NAVIFRAME_OH_ARROW_SIZE_INC;
@@ -456,19 +463,19 @@
          }
       }
       programs {
-         program { name: "content_new_pusehd";
+         program { name: "content_new_pushed";
             signal: "elm,state,new,pushed,internal";
             source: "";
             action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
+            target: "base";
             transition: DECELERATE 0.5;
             after: "show_finished";
          }
-         program { name: "content_cur_pusehd";
+         program { name: "content_cur_pushed";
             signal: "elm,state,cur,pushed,internal";
             source: "";
             action: STATE_SET "left" 0.0;
-            target: "elm.swallow.content";
+            target: "base";
             transition: DECELERATE 0.5;
             after: "pushed_finished";
          }
@@ -476,7 +483,7 @@
             signal: "elm,state,prev,popped,internal";
             source: "";
             action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
+            target: "base";
             transition: DECELERATE 0.5;
             after: "show_finished";
          }
@@ -484,7 +491,7 @@
             signal: "elm,state,cur,popped,internal";
             source: "";
             action: STATE_SET "right" 0.0;
-            target: "elm.swallow.content";
+            target: "base";
             transition: DECELERATE 0.5;
             after: "popped_finished";
          }
@@ -492,7 +499,7 @@
             signal: "elm,state,cur,pushed";
             source: "elm";
             script {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"base", "default", 0.0);
                emit("elm,state,cur,pushed,internal", "");
             }
          }
@@ -500,7 +507,7 @@
             signal: "elm,state,new,pushed";
             source: "elm";
             script {
-               set_state(PART:"elm.swallow.content", "right", 0.0);
+               set_state(PART:"base", "right", 0.0);
                emit("elm,state,new,pushed,internal", "");
             }
          }
@@ -508,7 +515,7 @@
             signal: "elm,state,prev,popped";
             source: "elm";
             script {
-               set_state(PART:"elm.swallow.content", "left", 0.0);
+               set_state(PART:"base", "left", 0.0);
                emit("elm,state,prev,popped,internal", "");
             }
          }
@@ -516,7 +523,7 @@
             signal: "elm,state,cur,popped";
             source: "elm";
             script {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"base", "default", 0.0);
                emit("elm,state,cur,popped,internal", "");
             }
          }
@@ -524,7 +531,7 @@
             signal: "elm,state,visible";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
+            target: "base";
          }
          program { name: "title_show";
             signal: "elm,state,title,show";
@@ -728,8 +735,7 @@
          }
       }
    }
-
-group { name:"elm/naviframe/item/basic2/default";
+   group { name:"elm/naviframe/item/basic2/default";
       alias:"elm/naviframe/item/2line/default";
       images {
          image: "naviframe_optionheader.png" COMP;
@@ -741,6 +747,22 @@ group { name:"elm/naviframe/item/basic2/default";
          public cbar_bg = 0;     //Controlbar BG Show call count
       }
       parts {
+          part { name: "base";
+            type: RECT;
+            description { state: "default" 0.0;
+               visible: 0;
+            }
+            description { state: "left" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: -1.0 0.0;
+               rel2.relative: 0.0 1.0;
+            }
+            description { state: "right" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 1.0 0.0;
+               rel2.relative: 2.0 1.0;
+            }
+         }
          part { name: "title_clip";
             type: RECT;
             mouse_events: 0;
@@ -749,8 +771,8 @@ group { name:"elm/naviframe/item/basic2/default";
                min: 1 NAVIFRAME_TITLE_H_INC;
                align: 0.0 0.0;
                fixed: 0 1;
-               rel1 { relative: 0.0 0.0; }
-               rel2 { relative: 1.0 0.0; }
+               rel1 { relative: 0.0 0.0; to: "base"; }
+               rel2 { relative: 1.0 0.0; to: "base"; }
             }
             description { state: "hide" 0.0;
                inherit: "default" 0.0;
@@ -767,11 +789,9 @@ group { name:"elm/naviframe/item/basic2/default";
                min: 1 0;
                align: 0.5 0;
                fixed: 0 1;
-               rel1.to_x: "elm.swallow.content";
-               rel1.to_y: "title_clip";
+               rel1.to: "title_clip";
                rel1.relative: 0 1;
-               rel2.to_x: "elm.swallow.content";
-               rel2.to_y: "title_clip";
+               rel2.to: "title_clip";
                visible: 0;
             }
             description { state: "show" 0.0;
@@ -874,8 +894,9 @@ group { name:"elm/naviframe/item/basic2/default";
             type: RECT;
             mouse_events: 0;
             description { state: "default" 0.0;
-               rel1.to_y: "optionheader_bg";
+               rel1.to: "optionheader_bg";
                rel1.relative: 0 1;
+               rel2.to_x: "optionheader_bg";
             }
          }
          part { name: "elm.swallow.content";
@@ -886,20 +907,11 @@ group { name:"elm/naviframe/item/basic2/default";
             description { state: "default" 0.0;
                align: 0.0 0.0;
                rel1.relative: 0.0 1.0;
-               rel1.to_y: "optionheader_bg";
+               rel1.to: "optionheader_bg";
                rel2.relative: 1.0 0.0;
+               rel2.to_x: "optionheader_bg";
                rel2.to_y: "controlbar_bg";
             }
-           description { state: "left" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: -1.0 1.0;
-               rel2.relative: 0.0 0.0;
-           }
-            description { state: "right" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 1.0 1.0;
-               rel2.relative: 2.0 0.0;
-            }
          }
          part { name: "title_base";
             type: RECT;
@@ -1188,19 +1200,19 @@ group { name:"elm/naviframe/item/basic2/default";
          }
       }
       programs {
-         program { name: "content_new_pusehd";
+         program { name: "content_new_pushed";
             signal: "elm,state,new,pushed,internal";
             source: "";
             action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
+            target: "base";
             transition: DECELERATE 0.5;
             after: "show_finished";
          }
-         program { name: "content_cur_pusehd";
+         program { name: "content_cur_pushed";
             signal: "elm,state,cur,pushed,internal";
             source: "";
             action: STATE_SET "left" 0.0;
-            target: "elm.swallow.content";
+            target: "base";
             transition: DECELERATE 0.5;
             after: "pushed_finished";
          }
@@ -1208,7 +1220,7 @@ group { name:"elm/naviframe/item/basic2/default";
             signal: "elm,state,prev,popped,internal";
             source: "";
             action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
+            target: "base";
             transition: DECELERATE 0.5;
             after: "show_finished";
          }
@@ -1216,7 +1228,7 @@ group { name:"elm/naviframe/item/basic2/default";
             signal: "elm,state,cur,popped,internal";
             source: "";
             action: STATE_SET "right" 0.0;
-            target: "elm.swallow.content";
+            target: "base";
             transition: DECELERATE 0.5;
             after: "popped_finished";
          }
@@ -1224,7 +1236,7 @@ group { name:"elm/naviframe/item/basic2/default";
             signal: "elm,state,cur,pushed";
             source: "elm";
             script {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"base", "default", 0.0);
                emit("elm,state,cur,pushed,internal", "");
             }
          }
@@ -1232,7 +1244,7 @@ group { name:"elm/naviframe/item/basic2/default";
             signal: "elm,state,new,pushed";
             source: "elm";
             script {
-               set_state(PART:"elm.swallow.content", "right", 0.0);
+               set_state(PART:"base", "right", 0.0);
                emit("elm,state,new,pushed,internal", "");
             }
          }
@@ -1240,7 +1252,7 @@ group { name:"elm/naviframe/item/basic2/default";
             signal: "elm,state,prev,popped";
             source: "elm";
             script {
-               set_state(PART:"elm.swallow.content", "left", 0.0);
+               set_state(PART:"base", "left", 0.0);
                emit("elm,state,prev,popped,internal", "");
             }
          }
@@ -1248,7 +1260,7 @@ group { name:"elm/naviframe/item/basic2/default";
             signal: "elm,state,cur,popped";
             source: "elm";
             script {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"base", "default", 0.0);
                emit("elm,state,cur,popped,internal", "");
             }
          }
@@ -1471,6 +1483,22 @@ group { name:"elm/naviframe/item/basic2/default";
          public cbar_bg = 0;     //Controlbar BG Show call count
       }
       parts {
+         part { name: "base";
+            type: RECT;
+            description { state: "default" 0.0;
+               visible: 0;
+            }
+            description { state: "left" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: -1.0 0.0;
+               rel2.relative: 0.0 1.0;
+            }
+            description { state: "right" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 1.0 0.0;
+               rel2.relative: 2.0 1.0;
+            }
+         }
          part { name: "title_clip";
             type: RECT;
             mouse_events: 0;
@@ -1479,8 +1507,8 @@ group { name:"elm/naviframe/item/basic2/default";
                min: 1 NAVIFRAME_SEGMENT_TITLE_H_INC;
                align: 0.0 0.0;
                fixed: 0 1;
-               rel1 { relative: 0.0 0.0; }
-               rel2 { relative: 1.0 0.0; }
+               rel1 { relative: 0.0 0.0; to: "base"; }
+               rel2 { relative: 1.0 0.0; to: "base"; }
             }
             description { state: "hide" 0.0;
                inherit: "default" 0.0;
@@ -1493,8 +1521,9 @@ group { name:"elm/naviframe/item/basic2/default";
             type: RECT;
             mouse_events: 0;
             description { state: "default" 0.0;
-               rel1.to_y: "title_clip";
+               rel1.to: "title_clip";
                rel1.relative: 0 1;
+               rel2.to_x: "title_clip";
             }
          }
          part { name: "elm.swallow.content";
@@ -1505,20 +1534,11 @@ group { name:"elm/naviframe/item/basic2/default";
             description { state: "default" 0.0;
                align: 0.0 0.0;
                rel1.relative: 0.0 1.0;
-               rel1.to_y: "title_clip";
+               rel1.to: "title_clip";
                rel2.relative: 1.0 0.0;
+               rel2.to_x: "title_clip";
                rel2.to_y: "controlbar_bg";
             }
-           description { state: "left" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: -1.0 1.0;
-               rel2.relative: 0.0 0.0;
-           }
-            description { state: "right" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 1.0 1.0;
-               rel2.relative: 2.0 0.0;
-            }
          }
          part { name: "title_base";
             type: RECT;
@@ -1688,8 +1708,10 @@ group { name:"elm/naviframe/item/basic2/default";
                max: 999999 NAVIFRAME_TITLE_SEGMENT_H_INC;
                fixed: 0 1;
                align: 0.5 0;
+               rel1.to_x: "title_clip";
                rel1.to_y: "elm.text.title";
                rel1.relative: 0.28 1;
+               rel2.to_x: "title_clip";
                rel2.to_y: "elm.text.title";
                rel2.relative: 0.72 1;
             }
@@ -1703,8 +1725,10 @@ group { name:"elm/naviframe/item/basic2/default";
                max: 999999 NAVIFRAME_TITLE_SEGMENT_H_INC;
                fixed: 0 1;
                align: 0.5 0;
+               rel1.to_x: "title_clip";
                rel1.to_y: "elm.text.title";
                rel1.relative: 0.2 1;
+               rel2.to_x: "title_clip";
                rel2.to_y: "elm.text.title";
                rel2.relative: 0.8 1;
             }
@@ -1777,19 +1801,19 @@ group { name:"elm/naviframe/item/basic2/default";
          }
       }
       programs {
-         program { name: "content_new_pusehd";
+         program { name: "content_new_pushed";
             signal: "elm,state,new,pushed,internal";
             source: "";
             action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
+            target: "base";
             transition: DECELERATE 0.5;
             after: "show_finished";
          }
-         program { name: "content_cur_pusehd";
+         program { name: "content_cur_pushed";
             signal: "elm,state,cur,pushed,internal";
             source: "";
             action: STATE_SET "left" 0.0;
-            target: "elm.swallow.content";
+            target: "base";
             transition: DECELERATE 0.5;
             after: "pushed_finished";
          }
@@ -1797,7 +1821,7 @@ group { name:"elm/naviframe/item/basic2/default";
             signal: "elm,state,prev,popped,internal";
             source: "";
             action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
+            target: "base";
             transition: DECELERATE 0.5;
             after: "show_finished";
          }
@@ -1805,7 +1829,7 @@ group { name:"elm/naviframe/item/basic2/default";
             signal: "elm,state,cur,popped,internal";
             source: "";
             action: STATE_SET "right" 0.0;
-            target: "elm.swallow.content";
+            target: "base";
             transition: DECELERATE 0.5;
             after: "popped_finished";
          }
@@ -1813,7 +1837,7 @@ group { name:"elm/naviframe/item/basic2/default";
             signal: "elm,state,cur,pushed";
             source: "elm";
             script {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"base", "default", 0.0);
                emit("elm,state,cur,pushed,internal", "");
             }
          }
@@ -1821,7 +1845,7 @@ group { name:"elm/naviframe/item/basic2/default";
             signal: "elm,state,new,pushed";
             source: "elm";
             script {
-               set_state(PART:"elm.swallow.content", "right", 0.0);
+               set_state(PART:"base", "right", 0.0);
                emit("elm,state,new,pushed,internal", "");
             }
          }
@@ -1829,7 +1853,7 @@ group { name:"elm/naviframe/item/basic2/default";
             signal: "elm,state,prev,popped";
             source: "elm";
             script {
-               set_state(PART:"elm.swallow.content", "left", 0.0);
+               set_state(PART:"base", "left", 0.0);
                emit("elm,state,prev,popped,internal", "");
             }
          }
@@ -1837,7 +1861,7 @@ group { name:"elm/naviframe/item/basic2/default";
             signal: "elm,state,cur,popped";
             source: "elm";
             script {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"base", "default", 0.0);
                emit("elm,state,cur,popped,internal", "");
             }
          }
@@ -2045,7 +2069,7 @@ group { name:"elm/naviframe/item/basic2/default";
          }
       }
       programs {
-         program { name: "content_new_pusehd";
+         program { name: "content_new_pushed";
             signal: "elm,state,new,pushed,internal";
             source: "";
             action: STATE_SET "default" 0.0;
@@ -2053,7 +2077,7 @@ group { name:"elm/naviframe/item/basic2/default";
             transition: DECELERATE 0.5;
             after: "show_finished";
          }
-         program { name: "content_cur_pusehd";
+         program { name: "content_cur_pushed";
             signal: "elm,state,cur,pushed,internal";
             source: "";
             action: STATE_SET "left" 0.0;
@@ -2223,11 +2247,9 @@ group { name:"elm/naviframe/item/basic2/default";
                min: 1 0;
                align: 0.5 0;
                fixed: 0 1;
-               rel1.to_x: "elm.swallow.content";
-               rel1.to_y: "title_clip";
+               rel1.to: "title_clip";
                rel1.relative: 0 1;
-               rel2.to_x: "elm.swallow.content";
-               rel2.to_y: "title_clip";
+               rel2.to: "title_clip";
                visible: 0;
             }
             description { state: "show" 0.0;
@@ -2865,11 +2887,9 @@ group { name:"elm/naviframe/item/basic2/default";
                min: 1 0;
                align: 0.5 0;
                fixed: 0 1;
-               rel1.to_x: "elm.swallow.content";
-               rel1.to_y: "title_clip";
+               rel1.to: "title_clip";
                rel1.relative: 0 1;
-               rel2.to_x: "elm.swallow.content";
-               rel2.to_y: "title_clip";
+               rel2.to: "title_clip";
                visible: 0;
             }
             description { state: "show" 0.0;

diff --git a/themes/groups/nocontents.edc b/themes/groups/nocontents.edc
index 4050462..7d7b4e5 100644 (file)
--- a/themes/groups/nocontents.edc
+++ b/themes/groups/nocontents.edc
@@ -46,7 +46,7 @@
                visible: 1;
                rel1 { relative: 0.0 0.0;}
                rel2 { relative: 1.0 1.0;}
-               color: 0 0 0 0;
+               color: NOCONTENT_BG_COLOR_INC;
             }
          }
          part { name: "nocontents.image";

diff --git a/themes/inc/nbeat-black-hd-inc.edc b/themes/inc/nbeat-black-hd-inc.edc
index 81ecd58..0078930 100644 (file)
--- a/themes/inc/nbeat-black-hd-inc.edc
+++ b/themes/inc/nbeat-black-hd-inc.edc
@@ -914,6 +914,7 @@
 #define NOCONTENT_BASE_SEARCH_PADDING_INC    40
 #define NOCONTENT_IMAGE_REL1_WIDTH_HEIGHT_INC 0.282 0.294
 #define NOCONTENT_IMAGE_REL2_WIDTH_HEIGHT_INC 0.718 0.54
+#define NOCONTENT_BG_COLOR_INC               0 0 0 255
 
 #define ENTRY_TEXT_SIZE_INC 44
 #define ENTRY_TEXT_COLOR_INC "#FFFFFF"

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 42d25f4..465f4bb 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -903,6 +903,7 @@
 #define NOCONTENT_BASE_SEARCH_PADDING_INC    25
 #define NOCONTENT_IMAGE_REL1_WIDTH_HEIGHT_INC 0.294 0.288
 #define NOCONTENT_IMAGE_REL2_WIDTH_HEIGHT_INC 0.706 0.53
+#define NOCONTENT_BG_COLOR_INC               0 0 0 255
 
 #define ENTRY_TEXT_SIZE_INC 28
 #define ENTRY_TEXT_COLOR_INC "#FFFFFF"

diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index 00f1300..f3cf708 100644 (file)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -930,6 +930,7 @@
 #define NOCONTENT_BASE_SEARCH_PADDING_INC     40
 #define NOCONTENT_IMAGE_REL1_WIDTH_HEIGHT_INC 0.282 0.294
 #define NOCONTENT_IMAGE_REL2_WIDTH_HEIGHT_INC 0.718 0.54
+#define NOCONTENT_BG_COLOR_INC                249 249 249 255
 
 #define ENTRY_TEXT_SIZE_INC 44
 #define ENTRY_TEXT_COLOR_INC "#000000"

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index b2e0bbd..7ae6862 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -926,6 +926,7 @@
 #define NOCONTENT_BASE_SEARCH_PADDING_INC    25
 #define NOCONTENT_IMAGE_REL1_WIDTH_HEIGHT_INC 0.294 0.288
 #define NOCONTENT_IMAGE_REL2_WIDTH_HEIGHT_INC 0.706 0.53
+#define NOCONTENT_BG_COLOR_INC               249 249 249 255
 
 #define ENTRY_TEXT_SIZE_INC 28
 #define ENTRY_TEXT_COLOR_INC "#000000"