naviframe - updated contents parts

diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc
index 1963e07..018ede4 100644 (file)
--- a/themes/widgets/naviframe.edc
+++ b/themes/widgets/naviframe.edc
@@ -134,7 +134,7 @@
                visible: 0;
             }
          }
-         part { name: "elm.swallow.optionheader";
+         part { name: "optionheader";
             type: SWALLOW;
             scale: 1;
             clip_to: "optionheader_clip";
@@ -152,8 +152,8 @@
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
                min: 0 NAVIFRAME_OH_PADDING_INC;
-               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader"; }
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader"; }
+               rel1 { relative: 0.0 1.0; to: "optionheader"; }
+               rel2 { relative: 1.0 1.0; to: "optionheader"; }
                fixed: 0 1;
                align: 0.0 0.0;
                visible: 0;
@@ -204,8 +204,8 @@
                min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
                align: 0 0.5;
-               rel1 { relative: 1.0 0.0; to: "elm.swallow.left_btn"; }
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.left_btn"; }
+               rel1 { relative: 1.0 0.0; to: "title_left_btn"; }
+               rel2 { relative: 1.0 1.0; to: "title_left_btn"; }
                visible: 0;
             }
          }
@@ -217,8 +217,8 @@
                min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "elm.swallow.more_btn"; }
-               rel2 { relative: 0.0 1.0; to: "elm.swallow.more_btn"; }
+               rel1 { relative: 0.0 0.0; to: "title_more_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_more_btn"; }
                visible: 0;
             }
          }
@@ -245,8 +245,8 @@
                min: 0 0;
                fixed: 1 0;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "elm.swallow.right_btn"; }
-               rel2 { relative: 0.0 1.0; to: "elm.swallow.right_btn"; }
+               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
                visible: 0;
             }
             description { state: "right_and_more_button" 0.0;
@@ -357,7 +357,7 @@
                 rel2 { to: "title_bg"; }
              }
          }
-         part { name: "elm.swallow.left_btn";
+         part { name: "title_left_btn";
             type: SWALLOW;
             scale: 1;
             clip_to: "title_clip";
@@ -369,7 +369,7 @@
                rel2 { relative: 1.0 1.0; to: "padding_before_left_btn"; }
             }
          }
-         part { name: "elm.swallow.right_btn";
+         part { name: "title_right_btn";
             type: SWALLOW;
             scale: 1;
             clip_to: "title_clip";
@@ -381,7 +381,7 @@
                rel2 { relative: 0.0 1.0; to: "padding_after_right_btn"; }
             }
          }
-         part { name: "elm.swallow.more_btn";
+         part { name: "title_more_btn";
             type: SWALLOW;
             scale: 1;
             clip_to: "title_clip";
@@ -401,8 +401,8 @@
                max: NAVIFRAME_OH_ARROW_SIZE_INC;
                fixed: 1 1;
                align: 0.5 0.0;
-               rel1 { relative: 0.0 1.025; to: "elm.swallow.more_btn"; }
-               rel2 { relative: 1.0 1.025; to: "elm.swallow.more_btn"; }
+               rel1 { relative: 0.0 1.025; to: "title_more_btn"; }
+               rel2 { relative: 1.0 1.025; to: "title_more_btn"; }
                image.normal: "00_winset_control_top_arrow.png";
                color: 255 255 255 0;
             }
@@ -467,7 +467,7 @@
                rel2.to: "elm.prev_btn_bg";
             }
          }
-         part { name: "elm.swallow.controlbar";
+         part { name: "controlbar";
             type: SWALLOW;
             scale: 1;
             clip_to: "controlbar_clip";
@@ -589,7 +589,7 @@
             }
          }
          program { name: "left_btn_show";
-            signal: "elm,state,elm.swallow.left_btn,show";
+            signal: "elm,state,title_left_btn,show";
             source: "elm";
             script {
                set_int(left_btn_visible, 1);
@@ -608,7 +608,7 @@
             }
          }
          program { name: "left_btn_hide";
-            signal: "elm,state,elm.swallow.left_btn,hide";
+            signal: "elm,state,title_left_btn,hide";
             source: "elm";
             script {
                set_int(left_btn_visible, 0);
@@ -631,7 +631,7 @@
             }
          }
          program { name: "right_btn_show";
-            signal: "elm,state,elm.swallow.right_btn,show";
+            signal: "elm,state,title_right_btn,show";
             source: "elm";
             script {
                set_int(right_btn_visible, 1);
@@ -656,7 +656,7 @@
             }
          }
          program { name: "right_btn_hide";
-            signal: "elm,state,elm.swallow.right_btn,hide";
+            signal: "elm,state,title_right_btn,hide";
             source: "elm";
             script {
                set_int(right_btn_visible, 0);
@@ -680,7 +680,7 @@
             }
          }
          program { name: "more_btn_show";
-            signal: "elm,state,elm.swallow.more_btn,show";
+            signal: "elm,state,title_more_btn,show";
             source: "elm";
             script {
                set_int(more_btn_visible, 1);
@@ -705,7 +705,7 @@
             }
          }
          program { name: "more_btn_hide";
-            signal: "elm,state,elm.swallow.more_btn,hide";
+            signal: "elm,state,title_more_btn,hide";
             source: "elm";
             script {
                set_int(more_btn_visible, 0);
@@ -751,14 +751,14 @@
             }
          }
          program { name: "controlbar_show";
-            signal: "elm,state,elm.swallow.controlbar,show";
+            signal: "elm,state,controlbar,show";
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,show", "elm");
             }
          }
          program { name: "controlbar_hide";
-            signal: "elm,state,elm.swallow.controlbar,hide";
+            signal: "elm,state,controlbar,hide";
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,hide", "elm");
@@ -782,7 +782,7 @@
             }
          }
          program { name: "optionheader_show";
-            signal: "elm,state,elm.swallow.optionheader,show";
+            signal: "elm,state,optionheader,show";
             source: "elm";
             script {
                set_state(PART:"optionheader_bg", "show", 0.0);
@@ -791,7 +791,7 @@
             }
          }
          program { name: "optionheader_hide";
-            signal: "elm,state,elm.swallow.optionheader,hide";
+            signal: "elm,state,optionheader,hide";
             source: "elm";
             script {
                set_state(PART:"optionheader_bg", "default", 0.0);
@@ -866,7 +866,7 @@
             source: "";
             script {
                emit("elm,state,prev_btn,show", "elm");
-               emit("elm,state,elm.swallow.controlbar,show", "elm");
+               emit("elm,state,controlbar,show", "elm");
             }
          }
          program { name: "controlbar_instant_close";
@@ -874,7 +874,7 @@
             source: "";
             script {
                emit("elm,state,prev_btn,hide", "elm");
-               emit("elm,state,elm.swallow.controlbar,hide", "elm");
+               emit("elm,state,controlbar,hide", "elm");
             }
          }
          program { name: "show_finished";
@@ -1002,7 +1002,7 @@
                visible: 0;
             }
          }
-         part { name: "elm.swallow.optionheader";
+         part { name: "optionheader";
             type: SWALLOW;
             scale: 1;
             clip_to: "optionheader_clip";
@@ -1014,39 +1014,39 @@
                align: 0.0 0.0;
             }
          }
-         part { name: "elm.swallow.optionheader.mid.padding";
+         part { name: "optionheader.mid.padding";
             type: RECT;
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
                min: 0 NAVIFRAME_OH_PADDING_INC;
-               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader"; }
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader"; }
+               rel1 { relative: 0.0 1.0; to: "optionheader"; }
+               rel2 { relative: 1.0 1.0; to: "optionheader"; }
                fixed: 0 1;
                align: 0.0 0.0;
                visible: 0;
             }
          }
-         part { name: "elm.swallow.optionheader2";
+         part { name: "optionheader2";
             type: SWALLOW;
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
                min: 0 NAVIFRAME_OH_CONTENT_H_INC;
-               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader.mid.padding";}
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader.mid.padding";}
+               rel1 { relative: 0.0 1.0; to: "optionheader.mid.padding";}
+               rel2 { relative: 1.0 1.0; to: "optionheader.mid.padding";}
                fixed: 0 1;
                align: 0.0 0.0;
             }
          }
-         part { name: "elm.swallow.optionheader.bottom.padding";
+         part { name: "optionheader.bottom.padding";
             type: RECT;
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
                min: 0 NAVIFRAME_OH_PADDING_INC;
-               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader2"; }
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader2"; }
+               rel1 { relative: 0.0 1.0; to: "optionheader2"; }
+               rel2 { relative: 1.0 1.0; to: "optionheader2"; }
                fixed: 0 1;
                align: 0.0 0.0;
                visible: 0;
@@ -1097,8 +1097,8 @@
                min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
                align: 0 0.5;
-               rel1 { relative: 1.0 0.0; to: "elm.swallow.left_btn"; }
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.left_btn"; }
+               rel1 { relative: 1.0 0.0; to: "title_left_btn"; }
+               rel2 { relative: 1.0 1.0; to: "title_left_btn"; }
                visible: 0;
             }
          }
@@ -1110,8 +1110,8 @@
                min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "elm.swallow.more_btn"; }
-               rel2 { relative: 0.0 1.0; to: "elm.swallow.more_btn"; }
+               rel1 { relative: 0.0 0.0; to: "title_more_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_more_btn"; }
                visible: 0;
             }
          }
@@ -1138,8 +1138,8 @@
                min: 0 0;
                fixed: 1 0;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "elm.swallow.right_btn"; }
-               rel2 { relative: 0.0 1.0; to: "elm.swallow.right_btn"; }
+               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
                visible: 0;
             }
             description { state: "right_and_more_button" 0.0;
@@ -1250,7 +1250,7 @@
                 rel2 { to: "title_bg"; }
              }
          }
-         part { name: "elm.swallow.left_btn";
+         part { name: "title_left_btn";
             type: SWALLOW;
             scale: 1;
             clip_to: "title_clip";
@@ -1262,7 +1262,7 @@
                rel2 { relative: 1.0 1.0; to: "padding_before_left_btn"; }
             }
          }
-         part { name: "elm.swallow.right_btn";
+         part { name: "title_right_btn";
             type: SWALLOW;
             scale: 1;
             clip_to: "title_clip";
@@ -1274,7 +1274,7 @@
                rel2 { relative: 0.0 1.0; to: "padding_after_right_btn"; }
             }
          }
-         part { name: "elm.swallow.more_btn";
+         part { name: "title_more_btn";
             type: SWALLOW;
             scale: 1;
             clip_to: "title_clip";
@@ -1294,8 +1294,8 @@
                max: NAVIFRAME_OH_ARROW_SIZE_INC;
                fixed: 1 1;
                align: 0.5 0.0;
-               rel1 { relative: 0.0 1.025; to: "elm.swallow.more_btn"; }
-               rel2 { relative: 1.0 1.025; to: "elm.swallow.more_btn"; }
+               rel1 { relative: 0.0 1.025; to: "title_more_btn"; }
+               rel2 { relative: 1.0 1.025; to: "title_more_btn"; }
                image.normal: "00_winset_control_top_arrow.png";
                color: 255 255 255 0;
             }
@@ -1360,7 +1360,7 @@
                rel2.to: "elm.prev_btn_bg";
             }
          }
-         part { name: "elm.swallow.controlbar";
+         part { name: "controlbar";
             type: SWALLOW;
             scale: 1;
             clip_to: "controlbar_clip";
@@ -1481,7 +1481,7 @@
             }
          }
          program { name: "left_btn_show";
-            signal: "elm,state,elm.swallow.left_btn,show";
+            signal: "elm,state,title_left_btn,show";
             source: "elm";
             script {
                set_int(left_btn_visible, 1);
@@ -1500,7 +1500,7 @@
             }
          }
          program { name: "left_btn_hide";
-            signal: "elm,state,elm.swallow.left_btn,hide";
+            signal: "elm,state,title_left_btn,hide";
             source: "elm";
             script {
                set_int(left_btn_visible, 0);
@@ -1523,7 +1523,7 @@
             }
          }
          program { name: "right_btn_show";
-            signal: "elm,state,elm.swallow.right_btn,show";
+            signal: "elm,state,title_right_btn,show";
             source: "elm";
             script {
                set_int(right_btn_visible, 1);
@@ -1548,7 +1548,7 @@
             }
          }
          program { name: "right_btn_hide";
-            signal: "elm,state,elm.swallow.right_btn,hide";
+            signal: "elm,state,title_right_btn,hide";
             source: "elm";
             script {
                set_int(right_btn_visible, 0);
@@ -1572,7 +1572,7 @@
             }
          }
          program { name: "more_btn_show";
-            signal: "elm,state,elm.swallow.more_btn,show";
+            signal: "elm,state,title_more_btn,show";
             source: "elm";
             script {
                set_int(more_btn_visible, 1);
@@ -1597,7 +1597,7 @@
             }
          }
          program { name: "more_btn_hide";
-            signal: "elm,state,elm.swallow.more_btn,hide";
+            signal: "elm,state,title_more_btn,hide";
             source: "elm";
             script {
                set_int(more_btn_visible, 0);
@@ -1643,14 +1643,14 @@
             }
          }
          program { name: "controlbar_show";
-            signal: "elm,state,elm.swallow.controlbar,show";
+            signal: "elm,state,controlbar,show";
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,show", "elm");
             }
          }
          program { name: "controlbar_hide";
-            signal: "elm,state,elm.swallow.controlbar,hide";
+            signal: "elm,state,controlbar,hide";
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,hide", "elm");
@@ -1674,7 +1674,7 @@
             }
          }
          program { name: "optionheader_show";
-            signal: "elm,state,elm.swallow.optionheader,show";
+            signal: "elm,state,optionheader,show";
             source: "elm";
             script {
                set_state(PART:"optionheader_bg", "show", 0.0);
@@ -1683,7 +1683,7 @@
             }
          }
          program { name: "optionheader_hide";
-            signal: "elm,state,elm.swallow.optionheader,hide";
+            signal: "elm,state,optionheader,hide";
             source: "elm";
             script {
                set_state(PART:"optionheader_bg", "default", 0.0);
@@ -1758,7 +1758,7 @@
             source: "";
             script {
                emit("elm,state,prev_btn,show", "elm");
-               emit("elm,state,elm.swallow.controlbar,show", "elm");
+               emit("elm,state,controlbar,show", "elm");
             }
          }
          program { name: "controlbar_instant_close";
@@ -1766,7 +1766,7 @@
             source: "";
             script {
                emit("elm,state,prev_btn,hide", "elm");
-               emit("elm,state,elm.swallow.controlbar,hide", "elm");
+               emit("elm,state,controlbar,hide", "elm");
             }
          }
          program { name: "show_finished";
@@ -1880,8 +1880,8 @@
                min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
                align: 0.0 0.5;
-               rel1 { relative: 1.0 0.0; to: "elm.swallow.left_btn"; }
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.left_btn"; }
+               rel1 { relative: 1.0 0.0; to: "title_left_btn"; }
+               rel2 { relative: 1.0 1.0; to: "title_left_btn"; }
                visible: 0;
             }
          }
@@ -1908,8 +1908,8 @@
                min: 0 0;
                fixed: 1 0;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "elm.swallow.right_btn"; }
-               rel2 { relative: 0.0 1.0; to: "elm.swallow.right_btn"; }
+               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
                visible: 0;
             }
             description { state: "show" 0.0;
@@ -1961,7 +1961,7 @@
                 rel2 { to: "title_bg"; }
              }
          }
-         part { name: "elm.swallow.left_btn";
+         part { name: "title_left_btn";
             type: SWALLOW;
             scale: 1;
             clip_to: "title_clip";
@@ -1977,7 +1977,7 @@
                rel2.to_y: "elm.text.title";
             }
          }
-         part { name: "elm.swallow.right_btn";
+         part { name: "title_right_btn";
             type: SWALLOW;
             scale: 1;
             clip_to: "title_clip";
@@ -1993,7 +1993,7 @@
                rel2.to_y: "elm.text.title";
             }
          }
-         part { name: "elm.swallow.segment2";
+         part { name: "segment2";
             type: "SWALLOW";
             scale: 1;
             clip_to: "title_clip";
@@ -2010,7 +2010,7 @@
                rel2.relative: 0.72 1;
             }
          }
-         part { name: "elm.swallow.segment3";
+         part { name: "segment3";
             type: "SWALLOW";
             scale: 1;
             clip_to: "title_clip";
@@ -2083,7 +2083,7 @@
               rel2.to: "elm.prev_btn_bg";
            }
         }
-        part { name: "elm.swallow.controlbar";
+        part { name: "controlbar";
            type: SWALLOW;
            scale: 1;
            clip_to: "controlbar_clip";
@@ -2193,14 +2193,14 @@
             }
          }
          program { name: "controlbar_show";
-            signal: "elm,state,elm.swallow.controlbar,show";
+            signal: "elm,state,controlbar,show";
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,show", "elm");
             }
          }
          program { name: "controlbar_hide";
-            signal: "elm,state,elm.swallow.controlbar,hide";
+            signal: "elm,state,controlbar,hide";
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,hide", "elm");
@@ -2242,7 +2242,7 @@
             source: "";
             script {
                emit("elm,state,prev_btn,show", "elm");
-               emit("elm,state,elm.swallow.controlbar,show", "elm");
+               emit("elm,state,controlbar,show", "elm");
             }
          }
          program { name: "controlbar_instant_close";
@@ -2250,7 +2250,7 @@
             source: "";
             script {
                emit("elm,state,prev_btn,hide", "elm");
-               emit("elm,state,elm.swallow.controlbar,hide", "elm");
+               emit("elm,state,controlbar,hide", "elm");
             }
          }
          program { name: "show_finished";
@@ -2370,7 +2370,7 @@
                rel2.to: "elm.prev_btn_bg";
             }
          }
-         part { name: "elm.swallow.controlbar";
+         part { name: "controlbar";
             type: SWALLOW;
             scale: 1;
             clip_to: "controlbar_clip";
@@ -2468,7 +2468,7 @@
             }
          }
          program { name: "controlbar_show";
-            signal: "elm,state,elm.swallow.controlbar,show";
+            signal: "elm,state,controlbar,show";
             source: "elm";
             action: STATE_SET "show" 0.0;
             script {
@@ -2476,7 +2476,7 @@
             }
          }
          program { name: "controlbar_hide";
-            signal: "elm,state,elm.swallow.controlbar,hide";
+            signal: "elm,state,controlbar,hide";
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,hide", "elm");
@@ -2518,7 +2518,7 @@
             source: "";
             script {
                emit("elm,state,prev_btn,show", "elm");
-               emit("elm,state,elm.swallow.controlbar,show", "elm");
+               emit("elm,state,controlbar,show", "elm");
             }
          }
          program { name: "controlbar_instant_close";
@@ -2526,7 +2526,7 @@
             source: "";
             script {
                emit("elm,state,prev_btn,hide", "elm");
-               emit("elm,state,elm.swallow.controlbar,hide", "elm");
+               emit("elm,state,controlbar,hide", "elm");
             }
          }
          program { name: "show_finished";
@@ -2638,7 +2638,7 @@
                visible: 0;
             }
          }
-         part { name: "elm.swallow.optionheader";
+         part { name: "optionheader";
             type: SWALLOW;
             scale: 1;
             clip_to: "optionheader_clip";
@@ -2656,8 +2656,8 @@
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
                min: 0 NAVIFRAME_OH_PADDING_INC;
-               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader"; }
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader"; }
+               rel1 { relative: 0.0 1.0; to: "optionheader"; }
+               rel2 { relative: 1.0 1.0; to: "optionheader"; }
                fixed: 0 1;
                align: 0.0 0.0;
                visible: 0;
@@ -2706,8 +2706,8 @@
                min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
                align: 0 0.5;
-               rel1 { relative: 1.0 0.0; to: "elm.swallow.left_btn"; }
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.left_btn"; }
+               rel1 { relative: 1.0 0.0; to: "title_left_btn"; }
+               rel2 { relative: 1.0 1.0; to: "title_left_btn"; }
                visible: 0;
             }
          }
@@ -2719,8 +2719,8 @@
                min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "elm.swallow.more_btn"; }
-               rel2 { relative: 0.0 1.0; to: "elm.swallow.more_btn"; }
+               rel1 { relative: 0.0 0.0; to: "title_more_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_more_btn"; }
                visible: 0;
             }
          }
@@ -2747,8 +2747,8 @@
                min: 0 0;
                fixed: 1 0;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "elm.swallow.right_btn"; }
-               rel2 { relative: 0.0 1.0; to: "elm.swallow.right_btn"; }
+               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
                visible: 0;
             }
             description { state: "right_and_more_button" 0.0;
@@ -2859,7 +2859,7 @@
                 rel2 { to: "title_bg"; }
              }
          }
-         part { name: "elm.swallow.left_btn";
+         part { name: "title_left_btn";
             type: SWALLOW;
             scale: 1;
             clip_to: "title_clip";
@@ -2871,7 +2871,7 @@
                rel2 { relative: 1.0 1.0; to: "padding_before_left_btn"; }
             }
          }
-         part { name: "elm.swallow.right_btn";
+         part { name: "title_right_btn";
             type: SWALLOW;
             scale: 1;
             clip_to: "title_clip";
@@ -2883,7 +2883,7 @@
                rel2 { relative: 0.0 1.0; to: "padding_after_right_btn"; }
             }
          }
-         part { name: "elm.swallow.more_btn";
+         part { name: "title_more_btn";
             type: SWALLOW;
             scale: 1;
             clip_to: "title_clip";
@@ -2903,8 +2903,8 @@
                max: NAVIFRAME_OH_ARROW_SIZE_INC;
                fixed: 1 1;
                align: 0.5 0.0;
-               rel1 { relative: 0.0 1.025; to: "elm.swallow.more_btn"; }
-               rel2 { relative: 1.0 1.025; to: "elm.swallow.more_btn"; }
+               rel1 { relative: 0.0 1.025; to: "title_more_btn"; }
+               rel2 { relative: 1.0 1.025; to: "title_more_btn"; }
                image.normal: "00_winset_control_top_arrow.png";
                color: 255 255 255 0;
             }
@@ -2967,7 +2967,7 @@
               rel2.to: "elm.prev_btn_bg";
            }
         }
-        part { name: "elm.swallow.controlbar";
+        part { name: "controlbar";
            type: SWALLOW;
            scale: 1;
            clip_to: "controlbar_clip";
@@ -3038,7 +3038,7 @@
             }
          }
          program { name: "left_btn_show";
-            signal: "elm,state,elm.swallow.left_btn,show";
+            signal: "elm,state,title_left_btn,show";
             source: "elm";
             script {
                set_int(left_btn_visible, 1);
@@ -3057,7 +3057,7 @@
             }
          }
          program { name: "left_btn_hide";
-            signal: "elm,state,elm.swallow.left_btn,hide";
+            signal: "elm,state,title_left_btn,hide";
             source: "elm";
             script {
                set_int(left_btn_visible, 0);
@@ -3080,7 +3080,7 @@
             }
          }
          program { name: "right_btn_show";
-            signal: "elm,state,elm.swallow.right_btn,show";
+            signal: "elm,state,tltle_right_btn,show";
             source: "elm";
             script {
                set_int(right_btn_visible, 1);
@@ -3105,7 +3105,7 @@
             }
          }
          program { name: "right_btn_hide";
-            signal: "elm,state,elm.swallow.right_btn,hide";
+            signal: "elm,state,title_right_btn,hide";
             source: "elm";
             script {
                set_int(right_btn_visible, 0);
@@ -3129,7 +3129,7 @@
             }
          }
          program { name: "more_btn_show";
-            signal: "elm,state,elm.swallow.more_btn,show";
+            signal: "elm,state,title_more_btn,show";
             source: "elm";
             script {
                set_int(more_btn_visible, 1);
@@ -3154,7 +3154,7 @@
             }
          }
          program { name: "more_btn_hide";
-            signal: "elm,state,elm.swallow.more_btn,hide";
+            signal: "elm,state,title_more_btn,hide";
             source: "elm";
             script {
                set_int(more_btn_visible, 0);
@@ -3200,14 +3200,14 @@
             }
          }
          program { name: "controlbar_show";
-            signal: "elm,state,elm.swallow.controlbar,show";
+            signal: "elm,state,controlbar,show";
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,show", "elm");
             }
          }
          program { name: "controlbar_hide";
-            signal: "elm,state,elm.swallow.controlbar,hide";
+            signal: "elm,state,controlbar,hide";
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,hide", "elm");
@@ -3231,7 +3231,7 @@
             }
          }
          program { name: "optionheader_show";
-            signal: "elm,state,elm.swallow.optionheader,show";
+            signal: "elm,state,optionheader,show";
             source: "elm";
             script {
                set_state(PART:"optionheader_bg", "show", 0.0);
@@ -3240,7 +3240,7 @@
             }
          }
          program { name: "optionheader_hide";
-            signal: "elm,state,elm.swallow.optionheader,hide";
+            signal: "elm,state,optionheader,hide";
             source: "elm";
             script {
                set_state(PART:"optionheader_bg", "default", 0.0);
@@ -3315,7 +3315,7 @@
             source: "";
             script {
                emit("elm,state,prev_btn,show", "elm");
-               emit("elm,state,elm.swallow.controlbar,show", "elm");
+               emit("elm,state,controlbar,show", "elm");
             }
          }
          program { name: "controlbar_instant_close";
@@ -3323,7 +3323,7 @@
             source: "";
             script {
                emit("elm,state,prev_btn,hide", "elm");
-               emit("elm,state,elm.swallow.controlbar,hide", "elm");
+               emit("elm,state,controlbar,hide", "elm");
             }
          }
          program { name: "show_finished";
@@ -3435,7 +3435,7 @@
                visible: 0;
             }
          }
-         part { name: "elm.swallow.optionheader";
+         part { name: "optionheader";
             type: SWALLOW;
             scale: 1;
             clip_to: "optionheader_clip";
@@ -3447,39 +3447,39 @@
                align: 0.0 0.0;
             }
          }
-         part { name: "elm.swallow.optionheader.mid.padding";
+         part { name: "optionheader.mid.padding";
             type: RECT;
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
                min: 0 NAVIFRAME_OH_PADDING_INC;
-               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader"; }
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader"; }
+               rel1 { relative: 0.0 1.0; to: "optionheader"; }
+               rel2 { relative: 1.0 1.0; to: "optionheader"; }
                fixed: 0 1;
                align: 0.0 0.0;
                visible: 0;
             }
          }
-         part { name: "elm.swallow.optionheader2";
+         part { name: "optionheader2";
             type: SWALLOW;
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
                min: 0 NAVIFRAME_OH_CONTENT_H_INC;
-               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader.mid.padding";}
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader.mid.padding";}
+               rel1 { relative: 0.0 1.0; to: "optionheader.mid.padding";}
+               rel2 { relative: 1.0 1.0; to: "optionheader.mid.padding";}
                fixed: 0 1;
                align: 0.0 0.0;
             }
          }
-         part { name: "elm.swallow.optionheader.bottom.padding";
+         part { name: "optionheader.bottom.padding";
             type: RECT;
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
                min: 0 NAVIFRAME_OH_PADDING_INC;
-               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader2"; }
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader2"; }
+               rel1 { relative: 0.0 1.0; to: "optionheader2"; }
+               rel2 { relative: 1.0 1.0; to: "optionheader2"; }
                fixed: 0 1;
                align: 0.0 0.0;
                visible: 0;
@@ -3528,8 +3528,8 @@
                min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
                align: 0 0.5;
-               rel1 { relative: 1.0 0.0; to: "elm.swallow.left_btn"; }
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.left_btn"; }
+               rel1 { relative: 1.0 0.0; to: "title_left_btn"; }
+               rel2 { relative: 1.0 1.0; to: "title_left_btn"; }
                visible: 0;
             }
          }
@@ -3541,8 +3541,8 @@
                min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "elm.swallow.more_btn"; }
-               rel2 { relative: 0.0 1.0; to: "elm.swallow.more_btn"; }
+               rel1 { relative: 0.0 0.0; to: "title_more_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_more_btn"; }
                visible: 0;
             }
          }
@@ -3569,8 +3569,8 @@
                min: 0 0;
                fixed: 1 0;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "elm.swallow.right_btn"; }
-               rel2 { relative: 0.0 1.0; to: "elm.swallow.right_btn"; }
+               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
                visible: 0;
             }
             description { state: "right_and_more_button" 0.0;
@@ -3681,7 +3681,7 @@
                 rel2 { to: "title_bg"; }
              }
          }
-         part { name: "elm.swallow.left_btn";
+         part { name: "title_left_btn";
             type: SWALLOW;
             scale: 1;
             clip_to: "title_clip";
@@ -3693,7 +3693,7 @@
                rel2 { relative: 1.0 1.0; to: "padding_before_left_btn"; }
             }
          }
-         part { name: "elm.swallow.right_btn";
+         part { name: "title_right_btn";
             type: SWALLOW;
             scale: 1;
             clip_to: "title_clip";
@@ -3705,7 +3705,7 @@
                rel2 { relative: 0.0 1.0; to: "padding_after_right_btn"; }
             }
          }
-         part { name: "elm.swallow.more_btn";
+         part { name: "title_more_btn";
             type: SWALLOW;
             scale: 1;
             clip_to: "title_clip";
@@ -3725,8 +3725,8 @@
                max: NAVIFRAME_OH_ARROW_SIZE_INC;
                fixed: 1 1;
                align: 0.5 0.0;
-               rel1 { relative: 0.0 1.025; to: "elm.swallow.more_btn"; }
-               rel2 { relative: 1.0 1.025; to: "elm.swallow.more_btn"; }
+               rel1 { relative: 0.0 1.025; to: "title_more_btn"; }
+               rel2 { relative: 1.0 1.025; to: "title_more_btn"; }
                image.normal: "00_winset_control_top_arrow.png";
                color: 255 255 255 0;
             }
@@ -3789,7 +3789,7 @@
               rel2.to: "elm.prev_btn_bg";
            }
         }
-        part { name: "elm.swallow.controlbar";
+        part { name: "controlbar";
            type: SWALLOW;
            scale: 1;
            clip_to: "controlbar_clip";
@@ -3860,7 +3860,7 @@
             }
          }
          program { name: "left_btn_show";
-            signal: "elm,state,elm.swallow.left_btn,show";
+            signal: "elm,state,title_left_btn,show";
             source: "elm";
             script {
                set_int(left_btn_visible, 1);
@@ -3879,7 +3879,7 @@
             }
          }
          program { name: "left_btn_hide";
-            signal: "elm,state,elm.swallow.left_btn,hide";
+            signal: "elm,state,title_left_btn,hide";
             source: "elm";
             script {
                set_int(left_btn_visible, 0);
@@ -3902,7 +3902,7 @@
             }
          }
          program { name: "right_btn_show";
-            signal: "elm,state,elm.swallow.right_btn,show";
+            signal: "elm,state,title_right_btn,show";
             source: "elm";
             script {
                set_int(right_btn_visible, 1);
@@ -3927,7 +3927,7 @@
             }
          }
          program { name: "right_btn_hide";
-            signal: "elm,state,elm.swallow.right_btn,hide";
+            signal: "elm,state,title_right_btn,hide";
             source: "elm";
             script {
                set_int(right_btn_visible, 0);
@@ -3951,7 +3951,7 @@
             }
          }
          program { name: "more_btn_show";
-            signal: "elm,state,elm.swallow.more_btn,show";
+            signal: "elm,state,title_more_btn,show";
             source: "elm";
             script {
                set_int(more_btn_visible, 1);
@@ -3976,7 +3976,7 @@
             }
          }
          program { name: "more_btn_hide";
-            signal: "elm,state,elm.swallow.more_btn,hide";
+            signal: "elm,state,title_more_btn,hide";
             source: "elm";
             script {
                set_int(more_btn_visible, 0);
@@ -4022,14 +4022,14 @@
             }
          }
          program { name: "controlbar_show";
-            signal: "elm,state,elm.swallow.controlbar,show";
+            signal: "elm,state,controlbar,show";
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,show", "elm");
             }
          }
          program { name: "controlbar_hide";
-            signal: "elm,state,elm.swallow.controlbar,hide";
+            signal: "elm,state,controlbar,hide";
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,hide", "elm");
@@ -4053,7 +4053,7 @@
             }
          }
          program { name: "optionheader_show";
-            signal: "elm,state,elm.swallow.optionheader,show";
+            signal: "elm,state,optionheader,show";
             source: "elm";
             script {
                set_state(PART:"optionheader_bg", "show", 0.0);
@@ -4062,7 +4062,7 @@
             }
          }
          program { name: "optionheader_hide";
-            signal: "elm,state,elm.swallow.optionheader,hide";
+            signal: "elm,state,optionheader,hide";
             source: "elm";
             script {
                set_state(PART:"optionheader_bg", "default", 0.0);
@@ -4137,7 +4137,7 @@
             source: "";
             script {
                emit("elm,state,prev_btn,show", "elm");
-               emit("elm,state,elm.swallow.controlbar,show", "elm");
+               emit("elm,state,controlbar,show", "elm");
             }
          }
          program { name: "controlbar_instant_close";
@@ -4145,7 +4145,7 @@
             source: "";
             script {
                emit("elm,state,prev_btn,hide", "elm");
-               emit("elm,state,elm.swallow.controlbar,hide", "elm");
+               emit("elm,state,controlbar,hide", "elm");
             }
          }
          program { name: "show_finished";
@@ -4240,8 +4240,8 @@
                min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
                align: 0.0 0.5;
-               rel1 { relative: 1.0 0.0; to: "elm.swallow.left_btn"; }
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.left_btn"; }
+               rel1 { relative: 1.0 0.0; to: "title_left_btn"; }
+               rel2 { relative: 1.0 1.0; to: "title_left_btn"; }
                visible: 0;
             }
          }
@@ -4268,8 +4268,8 @@
                min: 0 0;
                fixed: 1 0;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "elm.swallow.right_btn"; }
-               rel2 { relative: 0.0 1.0; to: "elm.swallow.right_btn"; }
+               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
                visible: 0;
             }
             description { state: "show" 0.0;
@@ -4321,7 +4321,7 @@
                 rel2 { to: "title_bg"; }
              }
          }
-         part { name: "elm.swallow.left_btn";
+         part { name: "title_left_btn";
             type: SWALLOW;
             scale: 1;
             clip_to: "title_clip";
@@ -4337,7 +4337,7 @@
                rel2.to_y: "elm.text.title";
             }
          }
-         part { name: "elm.swallow.right_btn";
+         part { name: "title_right_btn";
             type: SWALLOW;
             scale: 1;
             clip_to: "title_clip";
@@ -4353,7 +4353,7 @@
                rel2.to_y: "elm.text.title";
             }
          }
-         part { name: "elm.swallow.segment2";
+         part { name: "segment2";
             type: "SWALLOW";
             scale: 1;
             clip_to: "title_clip";
@@ -4368,7 +4368,7 @@
                rel2.relative: 0.72 1;
             }
          }
-         part { name: "elm.swallow.segment3";
+         part { name: "segment3";
             type: "SWALLOW";
             scale: 1;
             clip_to: "title_clip";
@@ -4437,7 +4437,7 @@
               rel2.to: "elm.prev_btn_bg";
            }
         }
-        part { name: "elm.swallow.controlbar";
+        part { name: "controlbar";
            type: SWALLOW;
            scale: 1;
            clip_to: "controlbar_clip";
@@ -4497,7 +4497,7 @@
             }
          }
          program { name: "controlbar_show";
-            signal: "elm,state,elm.swallow.controlbar,show";
+            signal: "elm,state,controlbar,show";
             source: "elm";
             action: STATE_SET "show" 0.0;
             script {
@@ -4505,7 +4505,7 @@
             }
          }
          program { name: "controlbar_hide";
-            signal: "elm,state,elm.swallow.controlbar,hide";
+            signal: "elm,state,controlbar,hide";
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,hide", "elm");
@@ -4547,7 +4547,7 @@
             source: "";
             script {
                emit("elm,state,prev_btn,show", "elm");
-               emit("elm,state,elm.swallow.controlbar,show", "elm");
+               emit("elm,state,controlbar,show", "elm");
             }
          }
          program { name: "controlbar_instant_close";
@@ -4555,7 +4555,7 @@
             source: "";
             script {
                emit("elm,state,prev_btn,hide", "elm");
-               emit("elm,state,elm.swallow.controlbar,hide", "elm");
+               emit("elm,state,controlbar,hide", "elm");
             }
          }
          program { name: "show_finished";
@@ -4654,7 +4654,7 @@
               rel2.to: "elm.prev_btn_bg";
            }
         }
-        part { name: "elm.swallow.controlbar";
+        part { name: "controlbar";
            type: SWALLOW;
            scale: 1;
            clip_to: "controlbar_clip";
@@ -4702,7 +4702,7 @@
             }
          }
          program { name: "controlbar_show";
-            signal: "elm,state,elm.swallow.controlbar,show";
+            signal: "elm,state,controlbar,show";
             source: "elm";
             action: STATE_SET "show" 0.0;
             script {
@@ -4710,7 +4710,7 @@
             }
          }
          program { name: "controlbar_hide";
-            signal: "elm,state,elm.swallow.controlbar,hide";
+            signal: "elm,state,controlbar,hide";
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,hide", "elm");
@@ -4752,7 +4752,7 @@
             source: "";
             script {
                emit("elm,state,prev_btn,show", "elm");
-               emit("elm,state,elm.swallow.controlbar,show", "elm");
+               emit("elm,state,controlbar,show", "elm");
             }
          }
          program { name: "controlbar_instant_close";
@@ -4760,7 +4760,7 @@
             source: "";
             script {
                emit("elm,state,prev_btn,hide", "elm");
-               emit("elm,state,elm.swallow.controlbar,hide", "elm");
+               emit("elm,state,controlbar,hide", "elm");
             }
          }
          program { name: "show_finished";