updated for new naviframe ux

diff --git a/themes/groups/button.edc b/themes/groups/button.edc
index 965c733..d617e52 100644 (file)
--- a/themes/groups/button.edc
+++ b/themes/groups/button.edc
@@ -30,6 +30,7 @@
       alias: "elm/button/base/center";
       alias: "elm/button/base/icon_and_text/center";
       alias: "elm/button/base/nocontents/search_button";
+      alias: "elm/button/base/naviframe/title/default";
       images {
          image: "00_button_01_normal.png" COMP;
          image: "00_button_01_normal_press.png" COMP;
@@ -7271,6 +7272,479 @@
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
+/*   group { name: "elm/button/base/naviframe/title/default";
+      images {
+         image: "00_Title_btn.png" COMP;
+         image: "00_Title_btn_press.png" COMP;
+      }
+      script {
+         public button_state = BUTTON_STATE_ENABLED;
+      }
+      parts {
+         part { name: "button_image";
+            scale: 1;
+            description { state: "default" 0.0;
+               min: BUTTON_NAVIFRAME_TITLE_BUTTON_MIN_INC;
+               max: BUTTON_NAVIFRAME_TITLE_BUTTON_MIN_INC;
+               image {
+                  normal: "00_Title_btn.png";
+                  border: BUTTON_NAVIFRAME_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "00_Title_btn_press.png";
+               }
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "00_Title_btn_press.png";
+               }
+            }
+         }
+         part { name: "padding_left_top";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel2 {
+                  relative: 0.0 0.0;
+               }
+               min: BUTTON_NAVIFRAME_PADDING_MIN_INC;
+               fixed: 1 1;
+               visible: 0;
+            }
+         }
+         part { name: "bg";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: BUTTON_NAVIFRAME_BG_MIN_INC;
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_NAVIFRAME_VISIBLE_BG_MIN_INC;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_NAVIFRAME_ICONONLY_BG_MIN_INC;
+            }
+         }
+         part { name: "padding_right_bottom";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               align: 1.0 1.0;
+               rel1 {
+                  relative: 1.0 1.0;
+               }
+               min: BUTTON_NAVIFRAME_PADDING_MIN_INC;
+               fixed: 1 1;
+               visible: 0;
+            }
+         }
+         part { name: "icon_rect";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               min: 0 0;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
+               align: 0.0 0.5;
+            }
+            description { state: "visible" 0.0;
+               visible: 0;
+               min: BUTTON_NAVIFRAME_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+               relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
+               align: 0.0 0.5;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         part { name: "padding_after_icon";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0; //when only icon or no icon is there
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2 {
+                  to: "icon_rect";
+               }
+               fixed: 1 0;
+               min: 0 0;
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               visible: 0;
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2 {
+                  to: "icon_rect";
+               }
+               fixed: 1 0;
+               min: BUTTON_NAVIFRAME_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         part { name: "padding_before_text";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0; //when only icon or no icon is there
+               align: 1.0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.text";
+                  to_y: "padding_right_bottom";
+               }
+               fixed: 1 0;
+               min: BUTTON_NAVIFRAME_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+               visible: 0;
+            }
+         }
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               visible: 0;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
+               fixed: 1 0;
+            }
+            description { state: "visible" 0.0;
+               fixed: 1 0;
+               min: BUTTON_NAVIFRAME_VISIBLE_ICON_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_VISIBLE_ICON_MIN_MAX_INC;
+               align: 1.0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "padding_before_text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "padding_before_text";
+                  to_y: "padding_right_bottom";
+               }
+            }
+            description { state: "icononly" 0.0;
+               min: BUTTON_NAVIFRAME_ICONONLY_ICON_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_ICONONLY_ICON_MIN_MAX_INC;
+               align: 0.5 0.5;
+            }
+         }
+         part { name: "elm.text";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_after_icon";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
+               color: BUTTON_TEXT_NAVIFRAME_NORMAL_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: BUTTON_TEXT_NAVIFRAME_FONT_SIZE_INC;
+                  min: 0 0;
+                  max: 1 0;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: BUTTON_TEXT_NAVIFRAME_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+            }
+            description { state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               color: BUTTON_TEXT_NAVIFRAME_DISABLED_COLOR_INC;
+               visible: 1;
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: BUTTON_TEXT_NAVIFRAME_FOCUSED_COLOR_INC;
+            }
+         }
+         part { name: "over2";
+            type: RECT;
+            repeat_events: 1;
+            ignore_flags: ON_HOLD;
+            description { state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "over3";
+            type: RECT;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part { name: "disabler";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 0 0 0 0;
+               visible: 0;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+      }
+      programs {
+         program { name: "button_click";
+            signal: "mouse,down,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,press" "";
+            after: "button_click_anim";
+         }
+         program { name: "button_click_anim";
+            action: STATE_SET "clicked" 0.0;
+            target: "button_image";
+            after: "text_clicked";
+         }
+         program { name: "text_clicked";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 set_state(PART:"elm.text", "clicked", 0.0);
+            }
+         }
+         program { name: "button_unpress";
+            action: SIGNAL_EMIT "elm,action,unpress" "";
+         }
+         program { name: "button_mouseout_clicked";
+            signal: "mouse,up,1";
+            source: "over3";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (strcmp(st, "icononly"))
+                 {
+                    emit("elm,action,default,text,set", "");
+                    set_state(PART:"elm.text", "visible", 0.0);
+                 }
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"button_image", "default", 0.0);
+            }
+            after: button_unpress;
+         }
+         program { name: "button_unclick3";
+            signal: "mouse,clicked,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,click" "";
+         }
+         program { name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "icononly"))
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"icon_rect", "visible", 0.0);
+                    set_state(PART:"padding_after_icon", "visible", 0.0);
+                    set_state(PART:"bg", "visible", 0.0);
+                 }
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"elm.text", "visible", 0.0);
+               else
+                 set_state(PART:"elm.text", "disabled_visible", 0.0);
+            }
+         }
+         program { name: "text_hide";
+            signal: "elm,state,text,hidden";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"icon_rect", "icononly", 0.0);
+                    set_state(PART:"padding_after_icon", "icononly", 0.0);
+                    set_state(PART:"bg", "icononly", 0.0);
+                 }
+               set_state(PART:"elm.text", "default", 0.0);
+            }
+         }
+         program { name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"icon_rect", "visible", 0.0);
+                    set_state(PART:"padding_after_icon", "visible", 0.0);
+                    set_state(PART:"bg", "visible", 0.0);
+                 }
+               else
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"icon_rect", "icononly", 0.0);
+                    set_state(PART:"padding_after_icon", "icononly", 0.0);
+                    set_state(PART:"bg", "icononly", 0.0);
+                 }
+            }
+         }
+         program { name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+            target: "padding_after_icon";
+            target: "icon_rect";
+            target: "bg";
+         }
+         program { name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "button_image";
+            target: "disabler";
+            after: "disable_text";
+         }
+         program { name: "disable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 set_state(PART:"elm.text", "disabled_visible", 0.0);
+               else
+                 set_state(PART:"elm.text", "disabled", 0.0);
+               set_int(button_state, BUTTON_STATE_DISABLED);
+            }
+         }
+         program { name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+            target: "disabler";
+            after: "enable_text";
+         }
+         program { name: "enable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "disabled_visible"))
+                 set_state(PART:"elm.text", "visible", 0.0);
+               else
+                 set_state(PART:"elm.text", "default", 0.0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
+            }
+         }
+         program { name: "focused";
+            //signal: "elm,action,focus";
+            //source: "elm";
+            action: STATE_SET "focused" 0.0;
+            target: "button_image";
+            target: "elm.text";
+         }
+         program { name: "unfocused";
+            //signal: "elm,action,unfocus";
+            //source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+            after: "unfocus_text";
+         }
+         program { name: "unfocus_text";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.text";
+         }
+      }
+   }
+*/
+///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/controlbar/vertical";
       script {
          public button_state = BUTTON_STATE_ENABLED;

diff --git a/themes/groups/naviframe.edc b/themes/groups/naviframe.edc
index bc74153..6896c6b 100644 (file)
--- a/themes/groups/naviframe.edc
+++ b/themes/groups/naviframe.edc
@@ -20,10 +20,6 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  */
-
-///////////////////////////////////////////////////////////////////////////
-// Naviframe
-///////////////////////////////////////////////////////////////////////////
    group { name:"elm/naviframe/base/default";
       parts {
          part { name: "base";
@@ -42,6 +38,7 @@
       script {
          public oh_show = 0;     //optionheader show/hide
          public oh_close = 0;    //optionheader close/open
+         public cbar_bg = 0;     //Controlbar BG Show call count
       }
       parts {
          part { name: "title_clip";
@@ -67,18 +64,18 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_OH_CLOSED_H_INC;
+               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;
                inherit: "default" 0.0;
                min: 1 NAVIFRAME_OH_OPENED_H_INC;
+               visible: 1;
             }
             description { state: "hide" 0.0;
                inherit: "default" 0.0;
@@ -95,11 +92,11 @@
                rel1 { to: "optionheader_clip"; }
                rel2 { to: "optionheader_clip"; }
                image { normal: "naviframe_optionheader.png";
-                  border: 0 0 1 0;
+                  border: 0 0 4 0;
                }
             }
          }
-         part { name: "elm.swallow.optionheader.top.padding";
+         part { name: "optionheader_top_padding";
             type: RECT;
             scale: 1;
             clip_to: "optionheader_clip";
@@ -118,8 +115,8 @@
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
                min: 1 NAVIFRAME_OH_CONTENT_H_INC;
-               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader.top.padding"; }
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader.top.padding"; }
+               rel1 { relative: 0.0 1.0; to: "optionheader_top_padding"; }
+               rel2 { relative: 1.0 1.0; to: "optionheader_top_padding"; }
                fixed: 0 1;
                align: 0.0 0.0;
                visible: 0;
@@ -129,7 +126,7 @@
                visible: 1;
             }
          }
-         part { name: "elm.swallow.optionheader.bottom.padding";
+         part { name: "optionheader_bottom_padding";
             type: RECT;
             scale: 1;
             clip_to: "optionheader_clip";
@@ -158,17 +155,18 @@
                align: 0.0 0.0;
                rel1.relative: 0.0 1.0;
                rel1.to_y: "optionheader_bg";
-               rel2.relative: 1.0 1.0;
+               rel2.relative: 1.0 0.0;
+               rel2.to_y: "controlbar_bg";
             }
            description { state: "left" 0.0;
                inherit: "default" 0.0;
                rel1.relative: -1.0 1.0;
-               rel2.relative: 0.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 1.0;
+               rel2.relative: 2.0 0.0;
             }
          }
          part { name: "title_base";
@@ -179,63 +177,91 @@
                color: NAVIFRAME_TITLE_BG_COLOR_INC;
             }
          }
-         part { name: "elm.rect.pada";
+         part { name: "padding_before_left_btn";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_INDICATOR_W_INC 0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 { relative: 0.0 0.0; to: "title_base"; }
                rel2 { relative: 0.0 1.0; to: "title_base"; }
                visible: 0;
             }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: NAVIFRAME_PADDING_EXPANDED_INC 0;
+         }
+         part { name: "padding_after_left_btn";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               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"; }
+               visible: 0;
             }
          }
-         part { name: "separator_1";
+         part { name: "padding_after_right_btn";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               align: 1.0 0;
-               min: 1 0;
-               rel1 { relative: 0.0 0.2; to:"elm.rect.padb"; to: "title_base"; }
-               rel2 { relative: 0.0 0.8; to:"elm.rect.padb"; to: "title_base"; }
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
-               color: NAVIFRAME_TITLE_RIGHT_SEPARATOR_COLOR_INC;
+               align: 1.0 0.5;
+               rel1 { relative: 1.0 0.0; to: "title_base"; }
+               rel2 { relative: 1.0 1.0; to: "title_base"; }
+               visible: 0;
             }
          }
-         part { name: "separator_2";
+         part { name: "padding_before_right_btn";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               align: 1.0 0;
-               min: 1 0;
-               rel1 { relative: 0.0 0.0; to: "separator_1"; to: "title_base"; }
-               rel2 { relative: 0.0 1.0; to: "separator_1"; to: "title_base"; }
+               min: 0 0;
                fixed: 1 0;
-               color: NAVIFRAME_TITLE_LEFT_SEPARATOR_COLOR_INC;
+               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"; }
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
             }
          }
-         part { name: "elm.rect.padb";
+         part { name: "padding_before_more_btn";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_INDICATOR_W_INC 0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
                align: 1.0 0.5;
-               rel1 { relative: 1.0 0.0; to: "title_base"; }
-               rel2 { relative: 1.0 1.0; to: "title_base"; }
+               rel1 { relative: 0.0 0.0; to: "elm.swallow.more_btn"; }
+               rel2 { relative: 0.0 1.0; to: "elm.swallow.more_btn"; }
+               visible: 0;
+            }
+         }
+         part { name: "padding_before_text";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               align: 1.0 0.5;
+               rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; to_y: "title_base"; }
+               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; to_y: "title_base"; }
+               fixed: 1 0;
+               min: NAVIFRAME_ICON_PADDING_INC;
                visible: 0;
             }
          }
@@ -252,54 +278,92 @@
                }
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                align: 0.5 0.5;
-               rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; }
-               rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; }
+               rel1.to: "padding_after_left_btn";
+               rel1.relative: 1 0;
+               rel2.to: "padding_before_more_btn";
+               rel2.relative: 0 1;
+            }
+         }
+         part { name: "elm.swallow.icon";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               max: NAVIFRAME_ICON_SIZE_INC;
+               rel1 { relative: 0.0 0.0; to: "padding_before_text"; }
+               rel2 { relative: 0.0 1.0; to: "padding_before_text"; }
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               align: 1.0 0.5;
             }
          }
          part { name: "click_event_area";
              ignore_flags: ON_HOLD;
              description { state: "default" 0.0;
                 rel1 { to: "title_base"; }
-                rel2 { to: "elm.rect.padb"; relative: 0.0 1.0; }
+                rel2 { to: "title_base"; }
              }
          }
-         part { name: "elm.swallow.prev_btn";
+         part { name: "elm.swallow.left_btn";
             type: SWALLOW;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
+               min: 0 0;
+               fixed: 1 0;
                align: 0 0.5;
+               rel1 { relative: 1.0 0.0; to: "padding_before_left_btn"; }
+               rel2 { relative: 1.0 1.0; to: "padding_before_left_btn"; }
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                fixed: 1 1;
-               rel1 { relative: 0.0 0.0; to: "title_base"; }
-               rel2 { relative: 0.0 1.0; to: "title_base"; }
+               visible: 1;
             }
          }
-         part { name: "elm.swallow.icon";
+         part { name: "elm.swallow.right_btn";
             type: SWALLOW;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               max: NAVIFRAME_ICON_SIZE_INC;
-               rel1 { relative: 0.0 0.0; to: "padding_before_text"; }
-               rel2 { relative: 0.0 1.0; to: "padding_before_text"; }
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-               align: 1.0 0.5;
+               min: 0 0;
+               align: 1 0.5;
+               fixed: 1 0;
+               rel1 { relative: 0.0 0.0; to: "padding_after_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "padding_after_right_btn"; }
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               fixed: 1 1;
+               visible: 1;
             }
          }
-         part { name: "padding_before_text";
-            type: RECT;
+         part { name: "elm.swallow.more_btn";
+            type: SWALLOW;
             scale: 1;
-            mouse_events: 0;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; to_y: "title_base"; }
-               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; to_y: "title_base"; }
+               min: 0 0;
                fixed: 1 0;
-               min: NAVIFRAME_ICON_PADDING_INC;
+               align: 1 0.5;
+               rel1.to: "padding_before_right_btn";
+               rel1.relative: 0 0;
+               rel2.to: "padding_before_right_btn";
+               rel2.relative: 0 1;
                visible: 0;
             }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               visible: 1;
+            }
          }
          part { name: "optionheader_arrow";
             type: IMAGE;
@@ -309,22 +373,87 @@
                min: NAVIFRAME_OH_ARROW_SIZE_INC;
                max: NAVIFRAME_OH_ARROW_SIZE_INC;
                fixed: 1 1;
-               align: 0.5 1;
-               visible: 0;
-               rel1.to_y: "optionheader_bg";
-               rel1.offset: 0 1;
-               rel2.relative: 1 0;
-               rel2.to_y: "optionheader_bg";
-               rel2.offset: -1 0;
+               align: 0.5 0;
+               rel1.to: "elm.swallow.more_btn";
+               rel1.relative: 0 1;
+               rel2.to: "elm.swallow.more_btn";
+               rel2.relative: 1 1;
                image {
-                  normal: "00_winset_control_top_arrow.png";
+                  normal: "naviframe_optionheader_arrow.png";
                }
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "controlbar_bg";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 0;
+               max: 999999 0;
+               fixed: 0 1;
+               align: 0.5 1;
+               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
+               visible: 0;
+               rel1.to_x: "elm.swallow.content";
+               rel2.to_x: "elm.swallow.content";
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               max: 999999 CONTROLBAR_SMALL_HEIGHT_INC;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.prev_btn";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               max: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               fixed: 1 1;
+               align: 0 1;
+               rel1.to: "controlbar_bg";
+               rel2.to: "controlbar_bg";
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               max: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.controlbar";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1.to: "elm.swallow.prev_btn";
+               rel1.relative: 1 0;
+               rel2.to: "padding_after_controlbar";
+               rel2.relative: 0 1;
+               visible: 0;
             }
             description { state: "show" 0.0;
                inherit: "default" 0.0;
                visible: 1;
             }
          }
+         part { name: "padding_after_controlbar";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               align: 1 1;
+               rel1.to: "controlbar_bg";
+               rel2.to: "controlbar_bg";
+               visible: 0;
+            }
+         }
       }
       programs {
          program { name: "content_new_pusehd";
@@ -420,17 +549,95 @@
             target: "title_clip";
             target: "optionheader_clip";
          }
-         program { name: "icon_show";
-            signal: "elm,state,elm.swallow.icon,show";
+         program { name: "prev_btn_show";
+            signal: "elm,state,prev_btn,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            script {
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
+            }
+         }
+         program { name: "prev_btn_hide";
+            signal: "elm,state,prev_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            script {
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
+            }
+         }
+         program { name: "left_btn_show";
+            signal: "elm,state,elm.swallow.left_btn,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            target: "elm.swallow.left_btn";
+         }
+         program { name: "left_btn_hide";
+            signal: "elm,state,elm.swallow.left_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.left_btn";
+         }
+         program { name: "right_btn_show";
+            signal: "elm,state,elm.swallow.right_btn,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            target: "elm.swallow.right_btn";
+         }
+         program { name: "right_btn_hide";
+            signal: "elm,state,elm.swallow.right_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.right_btn";
+         }
+         program { name: "more_btn_show";
+            signal: "elm,state,elm.swallow.more_btn,show";
             source: "elm";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.rect.pada";
+            action: STATE_SET "show" 0.0;
+            target: "elm.swallow.more_btn";
+            target: "padding_before_right_btn";
          }
-         program { name: "icon_hide";
-            signal: "elm,state,elm.swallow.icon,hide";
+         program { name: "more_btn_hide";
+            signal: "elm,state,elm.swallow.more_btn,hide";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "elm.rect.pada";
+            target: "elm.swallow.more_btn";
+            target: "padding_before_right_btn";
+         }
+         program { name: "controlbar_show";
+            signal: "elm,state,elm.swallow.controlbar,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            script {
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.controlbar", "show", 0.0);
+            }
+         }
+         program { name: "controlbar_hide";
+            signal: "elm,state,elm.swallow.controlbar,hide";
+            source: "elm";
+            script {
+               emit("elm,state,controlbar_bg,hide", "elm");
+               set_state(PART:"elm.swallow.controlbar", "default", 0.0);
+            }
+         }
+         program { name: "controlbar_bg_show";
+            signal: "elm,state,controlbar_bg,show";
+            source: "elm";
+            script {
+               set_state(PART:"controlbar_bg", "show", 0.0);
+               ++cbar_bg;
+            }
+         }
+         program { name: "controlbar_bg_hide";
+            signal: "elm,state,controlbar_bg,hide";
+            source: "elm";
+            script {
+               --cbar_bg;
+               if (cbar_bg < 1)
+                  set_state(PART:"controlbar_bg", "default", 0.0);
+            }
          }
          program { name: "optionheader_show";
             signal: "elm,state,elm.swallow.optionheader,show";
@@ -440,7 +647,6 @@
                set_state(PART:"optionheader_arrow", "show", 0.0);
                set_state(PART:"elm.swallow.optionheader", "show", 0.0);
                set_int(oh_show, 1);
-               emit("elm,state,optionheader_arrow,show", "");
             }
          }
          program { name: "optionheader_hide";
@@ -458,6 +664,7 @@
             source: "";
             action: STATE_SET "show" 0.0;
             target: "optionheader_clip";
+            target: "optionheader_arrow";
             target: "elm.swallow.optionheader";
             transition: LINEAR 0.2;
             after: "optionheader_open_set";
@@ -467,6 +674,7 @@
             source: "";
             action: STATE_SET "default" 0.0;
             target: "optionheader_clip";
+            target: "optionheader_arrow";
             target: "elm.swallow.optionheader";
             transition: LINEAR 0.2;
             after: "optionheader_close_set";
@@ -476,6 +684,7 @@
             source: "";
             action: STATE_SET "show" 0.0;
             target: "optionheader_clip";
+            target: "optionheader_arrow";
             target: "elm.swallow.optionheader";
             after: "optionheader_open_set";
          }
@@ -484,6 +693,7 @@
             source: "";
             action: STATE_SET "default" 0.0;
             target: "optionheader_clip";
+            target: "optionheader_arrow";
             target: "elm.swallow.optionheader";
             after: "optionheader_close_set";
          }
@@ -510,27 +720,16 @@
          program { name: "popped_finished";
             action: SIGNAL_EMIT "elm,action,popped,finished" "";
          }
-         program { name: "title_clicked_signal";
-            action: SIGNAL_EMIT "elm,action,title,clicked" "";
-         }
          program {
             name: "title_clicked";
             signal: "mouse,clicked,1";
             source: "click_event_area";
-            script {
-               if (get_int(oh_show) == 1) {
-                  if (get_int(oh_close) == 1) {
-                     emit("elm,state,optionheader,open", "");
-                  }else {
-                     emit("elm,state,optionheader,close", "");
-                  }
-               }//if
-            }//script
-            after: "title_clicked_signal";
+            action: SIGNAL_EMIT "elm,action,title,clicked" "";
          }
       }
    }
-   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;
@@ -539,6 +738,7 @@
       script {
          public oh_show = 0;     //optionheader show/hide
          public oh_close = 0;    //optionheader close/open
+         public cbar_bg = 0;     //Controlbar BG Show call count
       }
       parts {
          part { name: "title_clip";
@@ -564,7 +764,7 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_OH_CLOSED_H_INC;
+               min: 1 0;
                align: 0.5 0;
                fixed: 0 1;
                rel1.to_x: "elm.swallow.content";
@@ -572,10 +772,12 @@
                rel1.relative: 0 1;
                rel2.to_x: "elm.swallow.content";
                rel2.to_y: "title_clip";
+               visible: 0;
             }
             description { state: "show" 0.0;
                inherit: "default" 0.0;
                min: 1 NAVIFRAME_OH_OPENED_DOUBLE_H_INC;
+               visible: 1;
             }
             description { state: "hide" 0.0;
                inherit: "default" 0.0;
@@ -592,11 +794,11 @@
                rel1 { to: "optionheader_clip"; }
                rel2 { to: "optionheader_clip"; }
                image { normal: "naviframe_optionheader.png";
-                  border: 0 0 1 0;
+                  border: 0 0 4 0;
                }
             }
          }
-         part { name: "elm.swallow.optionheader.top.padding";
+         part { name: "optionheader_top_padding";
             type: RECT;
             scale: 1;
             clip_to: "optionheader_clip";
@@ -615,8 +817,8 @@
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
                min: 1 NAVIFRAME_OH_CONTENT_H_INC;
-               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader.top.padding"; }
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader.top.padding"; }
+               rel1 { relative: 0.0 1.0; to: "optionheader_top_padding"; }
+               rel2 { relative: 1.0 1.0; to: "optionheader_top_padding"; }
                fixed: 0 1;
                align: 0.0 0.0;
                visible: 0;
@@ -685,17 +887,18 @@
                align: 0.0 0.0;
                rel1.relative: 0.0 1.0;
                rel1.to_y: "optionheader_bg";
-               rel2.relative: 1.0 1.0;
+               rel2.relative: 1.0 0.0;
+               rel2.to_y: "controlbar_bg";
             }
            description { state: "left" 0.0;
                inherit: "default" 0.0;
                rel1.relative: -1.0 1.0;
-               rel2.relative: 0.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 1.0;
+               rel2.relative: 2.0 0.0;
             }
          }
          part { name: "title_base";
@@ -706,63 +909,91 @@
                color: NAVIFRAME_TITLE_BG_COLOR_INC;
             }
          }
-         part { name: "elm.rect.pada";
+         part { name: "padding_before_left_btn";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_INDICATOR_W_INC 0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 { relative: 0.0 0.0; to: "title_base"; }
                rel2 { relative: 0.0 1.0; to: "title_base"; }
                visible: 0;
             }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: NAVIFRAME_PADDING_EXPANDED_INC 0;
+         }
+         part { name: "padding_after_left_btn";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               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"; }
+               visible: 0;
             }
          }
-         part { name: "separator_1";
+         part { name: "padding_after_right_btn";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               align: 1.0 0;
-               min: 1 0;
-               rel1 { relative: 0.0 0.2; to:"elm.rect.padb"; to: "title_base"; }
-               rel2 { relative: 0.0 0.8; to:"elm.rect.padb"; to: "title_base"; }
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
-               color: NAVIFRAME_TITLE_RIGHT_SEPARATOR_COLOR_INC;
+               align: 1.0 0.5;
+               rel1 { relative: 1.0 0.0; to: "title_base"; }
+               rel2 { relative: 1.0 1.0; to: "title_base"; }
+               visible: 0;
             }
          }
-         part { name: "separator_2";
+         part { name: "padding_before_right_btn";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               align: 1.0 0;
-               min: 1 0;
-               rel1 { relative: 0.0 0.0; to: "separator_1"; to: "title_base"; }
-               rel2 { relative: 0.0 1.0; to: "separator_1"; to: "title_base"; }
+               min: 0 0;
                fixed: 1 0;
-               color: NAVIFRAME_TITLE_LEFT_SEPARATOR_COLOR_INC;
+               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"; }
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
             }
          }
-         part { name: "elm.rect.padb";
+         part { name: "padding_before_more_btn";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_INDICATOR_W_INC 0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
                align: 1.0 0.5;
-               rel1 { relative: 1.0 0.0; to: "title_base"; }
-               rel2 { relative: 1.0 1.0; to: "title_base"; }
+               rel1 { relative: 0.0 0.0; to: "elm.swallow.more_btn"; }
+               rel2 { relative: 0.0 1.0; to: "elm.swallow.more_btn"; }
+               visible: 0;
+            }
+         }
+         part { name: "padding_before_text";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               align: 1.0 0.5;
+               rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; to_y: "title_base"; }
+               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; to_y: "title_base"; }
+               fixed: 1 0;
+               min: NAVIFRAME_ICON_PADDING_INC;
                visible: 0;
             }
          }
@@ -779,29 +1010,13 @@
                }
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                align: 0.5 0.5;
-               rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; }
-               rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; }
+               rel1.to: "padding_after_left_btn";
+               rel1.relative: 1 0;
+               rel2.to: "padding_before_more_btn";
+               rel2.relative: 0 1;
             }
          }
-         part { name: "click_event_area";
-             ignore_flags: ON_HOLD;
-             description { state: "default" 0.0;
-                rel1 { to: "title_base"; }
-                rel2 { to: "elm.rect.padb"; relative: 0.0 1.0; }
-             }
-         }
-         part { name: "elm.swallow.prev_btn";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "title_clip";
-            description { state: "default" 0.0;
-               align: 0 0.5;
-               fixed: 1 1;
-               rel1 { relative: 0.0 0.0; to: "title_base"; }
-               rel2 { relative: 0.0 1.0; to: "title_base"; }
-            }
-         }
-         part { name: "elm.swallow.icon";
+         part { name: "elm.swallow.icon";
             type: SWALLOW;
             scale: 1;
             clip_to: "title_clip";
@@ -814,19 +1029,73 @@
                align: 1.0 0.5;
             }
          }
-         part { name: "padding_before_text";
-            type: RECT;
+         part { name: "click_event_area";
+             ignore_flags: ON_HOLD;
+             description { state: "default" 0.0;
+                rel1 { to: "title_base"; }
+                rel2 { to: "title_base"; }
+             }
+         }
+         part { name: "elm.swallow.left_btn";
+            type: SWALLOW;
             scale: 1;
-            mouse_events: 0;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; to_y: "title_base"; }
-               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; to_y: "title_base"; }
+               min: 0 0;
                fixed: 1 0;
-               min: NAVIFRAME_ICON_PADDING_INC;
+               align: 0 0.5;
+               rel1 { relative: 1.0 0.0; to: "padding_before_left_btn"; }
+               rel2 { relative: 1.0 1.0; to: "padding_before_left_btn"; }
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               fixed: 1 1;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.right_btn";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: 0 0;
+               align: 1 0.5;
+               fixed: 1 0;
+               rel1 { relative: 0.0 0.0; to: "padding_after_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "padding_after_right_btn"; }
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               fixed: 1 1;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.more_btn";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: 0 0;
+               fixed: 1 0;
+               align: 1 0.5;
+               rel1.to: "padding_before_right_btn";
+               rel1.relative: 0 0;
+               rel2.to: "padding_before_right_btn";
+               rel2.relative: 0 1;
                visible: 0;
             }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               visible: 1;
+            }
          }
          part { name: "optionheader_arrow";
             type: IMAGE;
@@ -836,22 +1105,87 @@
                min: NAVIFRAME_OH_ARROW_SIZE_INC;
                max: NAVIFRAME_OH_ARROW_SIZE_INC;
                fixed: 1 1;
-               align: 0.5 1;
-               visible: 0;
-               rel1.to_y: "optionheader_bg";
-               rel1.offset: 0 1;
-               rel2.relative: 1 0;
-               rel2.to_y: "optionheader_bg";
-               rel2.offset: -1 0;
+               align: 0.5 0;
+               rel1.to: "elm.swallow.more_btn";
+               rel1.relative: 0 1;
+               rel2.to: "elm.swallow.more_btn";
+               rel2.relative: 1 1;
                image {
-                  normal: "00_winset_control_top_arrow.png";
+                  normal: "naviframe_optionheader_arrow.png";
                }
+               color: 255 255 255 0 ;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+                color: 255 255 255 255;
+            }
+         }
+         part { name: "controlbar_bg";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 0;
+               max: 999999 0;
+               fixed: 0 1;
+               align: 0.5 1;
+               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
+               visible: 0;
+               rel1.to_x: "elm.swallow.content";
+               rel2.to_x: "elm.swallow.content";
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               max: 999999 CONTROLBAR_SMALL_HEIGHT_INC;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.prev_btn";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               max: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               fixed: 1 1;
+               align: 0 1;
+               rel1.to: "controlbar_bg";
+               rel2.to: "controlbar_bg";
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               max: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.controlbar";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1.to: "elm.swallow.prev_btn";
+               rel1.relative: 1 0;
+               rel2.to: "padding_after_controlbar";
+               rel2.relative: 0 1;
+               visible: 0;
             }
             description { state: "show" 0.0;
                inherit: "default" 0.0;
                visible: 1;
             }
          }
+         part { name: "padding_after_controlbar";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               align: 1 1;
+               rel1.to: "controlbar_bg";
+               rel2.to: "controlbar_bg";
+               visible: 0;
+            }
+         }
       }
       programs {
          program { name: "content_new_pusehd";
@@ -947,17 +1281,95 @@
             target: "title_clip";
             target: "optionheader_clip";
          }
-         program { name: "icon_show";
-            signal: "elm,state,elm.swallow.icon,show";
+         program { name: "prev_btn_show";
+            signal: "elm,state,prev_btn,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            script {
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
+            }
+         }
+         program { name: "prev_btn_hide";
+            signal: "elm,state,prev_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            script {
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
+            }
+         }
+         program { name: "left_btn_show";
+            signal: "elm,state,elm.swallow.left_btn,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            target: "elm.swallow.left_btn";
+         }
+         program { name: "left_btn_hide";
+            signal: "elm,state,elm.swallow.left_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.left_btn";
+         }
+         program { name: "right_btn_show";
+            signal: "elm,state,elm.swallow.right_btn,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            target: "elm.swallow.right_btn";
+         }
+         program { name: "right_btn_hide";
+            signal: "elm,state,elm.swallow.right_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.right_btn";
+         }
+         program { name: "more_btn_show";
+            signal: "elm,state,elm.swallow.more_btn,show";
             source: "elm";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.rect.pada";
+            action: STATE_SET "show" 0.0;
+            target: "elm.swallow.more_btn";
+            target: "padding_before_right_btn";
          }
-         program { name: "icon_hide";
-            signal: "elm,state,elm.swallow.icon,hide";
+         program { name: "more_btn_hide";
+            signal: "elm,state,elm.swallow.more_btn,hide";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "elm.rect.pada";
+            target: "elm.swallow.more_btn";
+            target: "padding_before_right_btn";
+         }
+         program { name: "controlbar_show";
+            signal: "elm,state,elm.swallow.controlbar,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            script {
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.controlbar", "show", 0.0);
+            }
+         }
+         program { name: "controlbar_hide";
+            signal: "elm,state,elm.swallow.controlbar,hide";
+            source: "elm";
+            script {
+               emit("elm,state,controlbar_bg,hide", "elm");
+               set_state(PART:"elm.swallow.controlbar", "default", 0.0);
+            }
+         }
+         program { name: "controlbar_bg_show";
+            signal: "elm,state,controlbar_bg,show";
+            source: "elm";
+            script {
+               set_state(PART:"controlbar_bg", "show", 0.0);
+               ++cbar_bg;
+            }
+         }
+         program { name: "controlbar_bg_hide";
+            signal: "elm,state,controlbar_bg,hide";
+            source: "elm";
+            script {
+               --cbar_bg;
+               if (cbar_bg < 1)
+                  set_state(PART:"controlbar_bg", "default", 0.0);
+            }
          }
          program { name: "optionheader_show";
             signal: "elm,state,elm.swallow.optionheader,show";
@@ -968,7 +1380,6 @@
                set_state(PART:"elm.swallow.optionheader", "show", 0.0);
                set_state(PART:"elm.swallow.optionheader2", "show", 0.0);
                set_int(oh_show, 1);
-               emit("elm,state,optionheader_arrow,show", "");
             }
          }
          program { name: "optionheader_hide";
@@ -978,7 +1389,7 @@
                set_state(PART:"optionheader_clip", "default", 0.0);
                set_state(PART:"optionheader_arrow", "default", 0.0);
                set_state(PART:"elm.swallow.optionheader", "default", 0.0);
-               set_state(PART:"elm.swallow.optionheader2", "default", 0.0);
+               set_state(PART:"elm.swallow.optionheader2", "hide", 0.0);
                set_int(oh_show, 0);
             }
          }
@@ -987,6 +1398,7 @@
             source: "";
             action: STATE_SET "show" 0.0;
             target: "optionheader_clip";
+            target: "optionheader_arrow";
             target: "elm.swallow.optionheader";
             target: "elm.swallow.optionheader2";
             transition: LINEAR 0.2;
@@ -997,6 +1409,7 @@
             source: "";
             action: STATE_SET "default" 0.0;
             target: "optionheader_clip";
+            target: "optionheader_arrow";
             target: "elm.swallow.optionheader";
             target: "elm.swallow.optionheader2";
             transition: LINEAR 0.2;
@@ -1007,6 +1420,7 @@
             source: "";
             action: STATE_SET "show" 0.0;
             target: "optionheader_clip";
+            target: "optionheader_arrow";
             target: "elm.swallow.optionheader";
             target: "elm.swallow.optionheader2";
             after: "optionheader_open_set";
@@ -1016,6 +1430,7 @@
             source: "";
             action: STATE_SET "default" 0.0;
             target: "optionheader_clip";
+            target: "optionheader_arrow";
             target: "elm.swallow.optionheader";
             target: "elm.swallow.optionheader2";
             after: "optionheader_close_set";
@@ -1043,34 +1458,17 @@
          program { name: "popped_finished";
             action: SIGNAL_EMIT "elm,action,popped,finished" "";
          }
-         program { name: "title_clicked_signal";
-            action: SIGNAL_EMIT "elm,action,title,clicked" "";
-         }
          program {
             name: "title_clicked";
             signal: "mouse,clicked,1";
             source: "click_event_area";
-            script {
-               if (get_int(oh_show) == 1) {
-                  if (get_int(oh_close) == 1) {
-                     emit("elm,state,optionheader,open", "");
-                  }else {
-                     emit("elm,state,optionheader,close", "");
-                  }
-               }//if
-            }//script
-            after: "title_clicked_signal";
+            action: SIGNAL_EMIT "elm,action,title,clicked" "";
          }
       }
    }
-   group { name:"elm/naviframe/item/instant/default";
-      images {
-         image: "naviframe_optionheader.png" COMP;
-         image: "naviframe_optionheader_arrow.png" COMP;
-      }
+   group { name: "elm/naviframe/item/segment/default";
       script {
-         public oh_show = 0;     //optionheader show/hide
-         public oh_close = 0;    //optionheader close/open
+         public cbar_bg = 0;     //Controlbar BG Show call count
       }
       parts {
          part { name: "title_clip";
@@ -1078,7 +1476,7 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_TITLE_H_INC;
+               min: 1 NAVIFRAME_SEGMENT_TITLE_H_INC;
                align: 0.0 0.0;
                fixed: 0 1;
                rel1 { relative: 0.0 0.0; }
@@ -1091,87 +1489,11 @@
                fixed: 1 1;
             }
          }
-         part { name: "optionheader_clip";
-            type: RECT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 1 NAVIFRAME_OH_CLOSED_H_INC;
-               align: 0.5 0;
-               fixed: 0 1;
-               rel1 { to: "title_clip"; relative: 0 1; }
-               rel2 { to: "title_clip"; relative: 1 1; }
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               min: 1 NAVIFRAME_OH_OPENED_H_INC;
-            }
-            description { state: "hide" 0.0;
-               inherit: "default" 0.0;
-               min: 0 0;
-               max: 0 0;
-               fixed: 1 1;
-            }
-         }
-         part { name: "optionheader_bg";
-            type: IMAGE;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 { to: "optionheader_clip"; }
-               rel2 { to: "optionheader_clip"; }
-               image { normal: "naviframe_optionheader.png";
-                  border: 0 0 1 0;
-               }
-            }
-         }
-         part { name: "elm.swallow.optionheader.top.padding";
-            type: RECT;
-            scale: 1;
-            clip_to: "optionheader_clip";
-            description { state: "default" 0.0;
-               min: 1 NAVIFRAME_OH_PADDING_INC;
-               rel1 { relative: 0.0 0.0; to: "optionheader_bg"; }
-               rel2 { relative: 1.0 0.0; to: "optionheader_bg"; }
-               fixed: 0 1;
-               align: 0.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.swallow.optionheader";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "optionheader_clip";
-            description { state: "default" 0.0;
-               min: 1 NAVIFRAME_OH_CONTENT_H_INC;
-               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader.top.padding"; }
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader.top.padding"; }
-               fixed: 0 1;
-               align: 0.0 0.0;
-               visible: 0;
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "elm.swallow.optionheader.bottom.padding";
-            type: RECT;
-            scale: 1;
-            clip_to: "optionheader_clip";
-            description { state: "default" 0.0;
-               min: 1 NAVIFRAME_OH_PADDING_INC;
-               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader"; }
-               fixed: 0 1;
-               align: 0.0 0.0;
-               visible: 0;
-            }
-         }
          part { name: "content_clip";
             type: RECT;
             mouse_events: 0;
             description { state: "default" 0.0;
-               rel1.to_y: "optionheader_bg";
+               rel1.to_y: "title_clip";
                rel1.relative: 0 1;
             }
          }
@@ -1183,8 +1505,19 @@
             description { state: "default" 0.0;
                align: 0.0 0.0;
                rel1.relative: 0.0 1.0;
-               rel1.to_y: "optionheader_bg";
-               rel2.relative: 1.0 1.0;
+               rel1.to_y: "title_clip";
+               rel2.relative: 1.0 0.0;
+               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";
@@ -1195,174 +1528,318 @@
                color: NAVIFRAME_TITLE_BG_COLOR_INC;
             }
          }
-         part { name: "elm.rect.pada";
+         part { name: "padding_before_left_btn";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_INDICATOR_W_INC 0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 { relative: 0.0 0.0; to: "title_base"; }
                rel2 { relative: 0.0 1.0; to: "title_base"; }
                visible: 0;
             }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: NAVIFRAME_PADDING_EXPANDED_INC 0;
-            }
          }
-         part { name: "separator_1";
+         part { name: "padding_after_left_btn";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               align: 1.0 0;
-               min: 1 0;
-               rel1 { relative: 0.0 0.2; to:"elm.rect.padb"; to: "title_base"; }
-               rel2 { relative: 0.0 0.8; to:"elm.rect.padb"; to: "title_base"; }
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
-               color: NAVIFRAME_TITLE_RIGHT_SEPARATOR_COLOR_INC;
+               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"; }
+               visible: 0;
             }
          }
-         part { name: "separator_2";
+         part { name: "padding_after_right_btn";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               align: 1.0 0;
-               min: 1 0;
-               rel1 { relative: 0.0 0.0; to: "separator_1"; to: "title_base"; }
-               rel2 { relative: 0.0 1.0; to: "separator_1"; to: "title_base"; }
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
-               color: NAVIFRAME_TITLE_LEFT_SEPARATOR_COLOR_INC;
+               align: 1.0 0.5;
+               rel1 { relative: 1.0 0.0; to: "title_base"; }
+               rel2 { relative: 1.0 1.0; to: "title_base"; }
+               visible: 0;
             }
          }
-         part { name: "elm.rect.padb";
+         part { name: "padding_before_right_btn";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_INDICATOR_W_INC 0;
+               min: 0 0;
                fixed: 1 0;
                align: 1.0 0.5;
-               rel1 { relative: 1.0 0.0; to: "title_base"; }
-               rel2 { relative: 1.0 1.0; to: "title_base"; }
+               rel1 { relative: 0.0 0.0; to: "elm.swallow.right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "elm.swallow.right_btn"; }
                visible: 0;
             }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+            }
          }
-         part { name: "elm.text.title";
+         part { name: "padding_before_text";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               align: 1.0 0.5;
+               rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; to_y: "title_base"; }
+               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; to_y: "title_base"; }
+               fixed: 1 0;
+               min: NAVIFRAME_ICON_PADDING_INC;
+               visible: 0;
+            }
+         }
+         part { name: "elm.text.title";
             type: TEXT;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
                text { font: "SLP:style=Medium";
-                  size: NAVIFRAME_TITLE_FONT_SIZE_INC;
+                  size: NAVIFRAME_TITLE_SEGMENT_FONT_SIZE_INC;
                   min: 0 0;
                   max: 1 0;
                   align: 0.5 0.5;
                }
+               min: 0 NAVIFRAME_TITLE_SEGMENT_TEXT_H_INC;
+               max: 999999 NAVIFRAME_TITLE_SEGMENT_TEXT_H_INC;
+               fixed: 0 1;
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
-               align: 0.5 0.5;
-               rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; }
-               rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; }
+               align: 0.5 0;
+               rel1.to: "padding_before_left_btn";
+               rel1.relative: 1 0;
+               rel2.to: "padding_after_right_btn";
+               rel2.relative: 0 1;
             }
          }
          part { name: "click_event_area";
              ignore_flags: ON_HOLD;
              description { state: "default" 0.0;
                 rel1 { to: "title_base"; }
-                rel2 { to: "elm.rect.padb"; relative: 0.0 1.0; }
+                rel2 { to: "title_base"; }
              }
          }
-         part { name: "elm.swallow.prev_btn";
+         part { name: "elm.swallow.left_btn";
             type: SWALLOW;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               align: 0 0.5;
+               min: 0 0;
+               fixed: 1 0;
+               align: 0 0;
+               rel1.relative: 1.0 1.0;
+               rel1.to_x: "padding_before_left_btn";
+               rel1.to_y: "elm.text.title";
+               rel2.relative: 1.0 1.0;
+               rel2.to_x: "padding_before_left_btn";
+               rel2.to_y: "elm.text.title";
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                fixed: 1 1;
-               rel1 { relative: 0.0 0.0; to: "title_base"; }
-               rel2 { relative: 0.0 1.0; to: "title_base"; }
+               visible: 1;
             }
          }
-         part { name: "elm.swallow.icon";
+         part { name: "elm.swallow.right_btn";
             type: SWALLOW;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               max: NAVIFRAME_ICON_SIZE_INC;
-               rel1 { relative: 0.0 0.0; to: "padding_before_text"; }
-               rel2 { relative: 0.0 1.0; to: "padding_before_text"; }
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-               align: 1.0 0.5;
+               min: 0 0;
+               align: 1 0;
+               fixed: 1 0;
+               rel1.relative: 0.0 1.0;
+               rel1.to_x: "padding_after_right_btn";
+               rel1.to_y: "elm.text.title";
+               rel2.relative: 0.0 1.0;
+               rel2.to_x: "padding_after_right_btn";
+               rel2.to_y: "elm.text.title";
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               fixed: 1 1;
+               visible: 1;
             }
          }
-         part { name: "padding_before_text";
-            type: RECT;
+         part { name: "elm.swallow.segment2";
+            type: "SWALLOW";
             scale: 1;
-            mouse_events: 0;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; to_y: "title_base"; }
-               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; to_y: "title_base"; }
-               fixed: 1 0;
-               min: NAVIFRAME_ICON_PADDING_INC;
+               min: 0 NAVIFRAME_TITLE_SEGMENT_H_INC;
+               max: 999999 NAVIFRAME_TITLE_SEGMENT_H_INC;
+               fixed: 0 1;
+               align: 0.5 0;
+               rel1.to_y: "elm.text.title";
+               rel1.relative: 0.28 1;
+               rel2.to_y: "elm.text.title";
+               rel2.relative: 0.72 1;
+            }
+         }
+         part { name: "elm.swallow.segment3";
+            type: "SWALLOW";
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: 0 NAVIFRAME_TITLE_SEGMENT_H_INC;
+               max: 999999 NAVIFRAME_TITLE_SEGMENT_H_INC;
+               fixed: 0 1;
+               align: 0.5 0;
+               rel1.to_y: "elm.text.title";
+               rel1.relative: 0.2 1;
+               rel2.to_y: "elm.text.title";
+               rel2.relative: 0.8 1;
+            }
+         }
+         part { name: "controlbar_bg";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 0;
+               max: 999999 0;
+               fixed: 0 1;
+               align: 0.5 1;
+               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
                visible: 0;
+               rel1.to_x: "elm.swallow.content";
+               rel2.to_x: "elm.swallow.content";
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               max: 999999 CONTROLBAR_SMALL_HEIGHT_INC;
+               visible: 1;
             }
          }
-         part { name: "optionheader_arrow";
-            type: IMAGE;
-            mouse_events: 0;
+         part { name: "elm.swallow.prev_btn";
+            type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: NAVIFRAME_OH_ARROW_SIZE_INC;
-               max: NAVIFRAME_OH_ARROW_SIZE_INC;
+               min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               max: 0 CONTROLBAR_SMALL_HEIGHT_INC;
                fixed: 1 1;
-               align: 0.5 1;
+               align: 0 1;
+               rel1.to: "controlbar_bg";
+               rel2.to: "controlbar_bg";
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               max: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.controlbar";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1.to: "elm.swallow.prev_btn";
+               rel1.relative: 1 0;
+               rel2.to: "padding_after_controlbar";
+               rel2.relative: 0 1;
                visible: 0;
-               rel1.relative: 0 0;
-               rel1.to: "optionheader_bg";
-               rel1.offset: 0 1;
-               rel2.relative: 1 0;
-               rel2.to: "optionheader_bg";
-               rel2.offset: -1 0;
-               image {
-                  normal: "00_winset_control_top_arrow.png";
-               }
             }
             description { state: "show" 0.0;
                inherit: "default" 0.0;
                visible: 1;
             }
          }
+         part { name: "padding_after_controlbar";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               align: 1 1;
+               rel1.to: "controlbar_bg";
+               rel2.to: "controlbar_bg";
+               visible: 0;
+            }
+         }
       }
       programs {
+         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: "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: "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";
-            action: SIGNAL_EMIT "elm,action,pushed,finished" "";
+            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";
-            action: SIGNAL_EMIT "elm,action,show,finished" "";
+            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";
-            action: SIGNAL_EMIT "elm,action,show,finished" "";
+            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";
-            action: SIGNAL_EMIT "elm,action,popped,finished" "";
+            script {
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               emit("elm,state,cur,popped,internal", "");
+            }
          }
          program { name: "visible";
             signal: "elm,state,visible";
@@ -1373,129 +1850,343 @@
          program { name: "title_show";
             signal: "elm,state,title,show";
             source: "elm";
-            script {
-               set_state(PART:"title_clip", "default", 0.0);
-               if (get_int(oh_show) == 1) {
-                  if (get_int(oh_close) == 1) {
-                     emit("elm,state,optionheader,instant_close", "");
-                  }else {
-                     emit("elm,state,optionheader,instant_open", "");
-                  }
-               }
-               else
-                 set_state(PART:"optionheader_clip", "default", 0.0);
-            }
+            action: STATE_SET "show" 0.0;
+            target: "title_clip";
          }
          program { name: "title_hide";
             signal: "elm,state,title,hide";
             source: "elm";
             action: STATE_SET "hide" 0.0;
             target: "title_clip";
-            target: "optionheader_clip";
-         }
-         program { name: "icon_show";
-            signal: "elm,state,elm.swallow.icon,show";
-            source: "elm";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.rect.pada";
          }
-         program { name: "icon_hide";
-            signal: "elm,state,elm.swallow.icon,hide";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.rect.pada";
-         }
-         program { name: "optionheader_show";
-            signal: "elm,state,elm.swallow.optionheader,show";
+         program { name: "prev_btn_show";
+            signal: "elm,state,prev_btn,show";
             source: "elm";
+            action: STATE_SET "show" 0.0;
             script {
-               set_state(PART:"optionheader_clip", "show", 0.0);
-               set_state(PART:"optionheader_arrow", "show", 0.0);
-               set_state(PART:"elm.swallow.optionheader", "show", 0.0);
-               set_int(oh_show, 1);
-               emit("elm,state,optionheader_arrow,show", "");
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
             }
          }
-         program { name: "optionheader_hide";
-            signal: "elm,state,elm.swallow.optionheader,hide";
+         program { name: "prev_btn_hide";
+            signal: "elm,state,prev_btn,hide";
             source: "elm";
+            action: STATE_SET "default" 0.0;
             script {
-               set_state(PART:"optionheader_clip", "default", 0.0);
-               set_state(PART:"optionheader_arrow", "default", 0.0);
-               set_state(PART:"elm.swallow.optionheader", "default", 0.0);
-               set_int(oh_show, 0);
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
             }
          }
-         program { name: "optionheader_open";
-            signal: "elm,state,optionheader,open";
-            source: "";
+         program { name: "left_btn_show";
+            signal: "elm,state,elm.swallow.left_btn,show";
+            source: "elm";
             action: STATE_SET "show" 0.0;
-            target: "optionheader_clip";
-            target: "elm.swallow.optionheader";
-            transition: LINEAR 0.2;
-            after: "optionheader_open_set";
+            target: "elm.swallow.left_btn";
          }
-         program { name: "optionheader_close";
-            signal: "elm,state,optionheader,close";
-            source: "";
+         program { name: "left_btn_hide";
+            signal: "elm,state,elm.swallow.left_btn,hide";
+            source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "optionheader_clip";
-            target: "elm.swallow.optionheader";
-            transition: LINEAR 0.2;
-            after: "optionheader_close_set";
+            target: "elm.swallow.left_btn";
          }
-         program { name: "optionheader_instant_open";
-            signal: "elm,state,optionheader,instant_open";
-            source: "";
+         program { name: "right_btn_show";
+            signal: "elm,state,elm.swallow.right_btn,show";
+            source: "elm";
             action: STATE_SET "show" 0.0;
-            target: "optionheader_clip";
-            target: "elm.swallow.optionheader";
-            after: "optionheader_open_set";
+            target: "elm.swallow.right_btn";
          }
-         program { name: "optionheader_instant_close";
-            signal: "elm,state,optionheader,instant_close";
-            source: "";
+         program { name: "right_btn_hide";
+            signal: "elm,state,elm.swallow.right_btn,hide";
+            source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "optionheader_clip";
-            target: "elm.swallow.optionheader";
-            after: "optionheader_close_set";
+            target: "elm.swallow.right_btn";
          }
-         program { name: "optionheader_close_set";
-            signal: "elm,state,optionheader,close_set";
-            source: "";
+         program { name: "controlbar_show";
+            signal: "elm,state,elm.swallow.controlbar,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
             script {
-               set_int(oh_close, 1);
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.controlbar", "show", 0.0);
             }
          }
-         program { name: "optionheader_open_set";
-            signal: "elm,state,optionheader,open_set";
-            source: "";
+         program { name: "controlbar_hide";
+            signal: "elm,state,elm.swallow.controlbar,hide";
+            source: "elm";
             script {
-               set_int(oh_close, 0);
+               emit("elm,state,controlbar_bg,hide", "elm");
+               set_state(PART:"elm.swallow.controlbar", "default", 0.0);
             }
          }
-         program { name: "title_clicked_signal";
-            action: SIGNAL_EMIT "elm,action,title,clicked" "";
+         program { name: "controlbar_bg_show";
+            signal: "elm,state,controlbar_bg,show";
+            source: "elm";
+            script {
+               set_state(PART:"controlbar_bg", "show", 0.0);
+               ++cbar_bg;
+            }
+         }
+         program { name: "controlbar_bg_hide";
+            signal: "elm,state,controlbar_bg,hide";
+            source: "elm";
+            script {
+               --cbar_bg;
+               if (cbar_bg < 1)
+                  set_state(PART:"controlbar_bg", "default", 0.0);
+            }
+         }
+         program { name: "show_finished";
+            action: SIGNAL_EMIT "elm,action,show,finished" "";
+         }
+         program { name: "pushed_finished";
+            action: SIGNAL_EMIT "elm,action,pushed,finished" "";
+         }
+         program { name: "popped_finished";
+            action: SIGNAL_EMIT "elm,action,popped,finished" "";
          }
          program {
             name: "title_clicked";
             signal: "mouse,clicked,1";
             source: "click_event_area";
-            script {
-               if (get_int(oh_show) == 1) {
-                  if (get_int(oh_close) == 1) {
-                     emit("elm,state,optionheader,open", "");
-                  }else {
-                     emit("elm,state,optionheader,close", "");
-                  }
-               }//if
-            }//script
-            after: "title_clicked_signal";
+            action: SIGNAL_EMIT "elm,action,title,clicked" "";
          }
       }
    }
-
-   group { name:"elm/naviframe/item/instant2/default";
+   group { name: "elm/naviframe/item/tabbar/default";
+      script {
+         public cbar_bg = 0;     //Controlbar BG Show call count
+      }
+      parts {
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
+            scale: 1;
+            repeat_events: 0;
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel2.relative: 1.0 0.0;
+               rel2.to_y: "controlbar_bg";
+            }
+           description { state: "left" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: -1.0 0.0;
+               rel2.relative: 0.0 0.0;
+           }
+            description { state: "right" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 1.0 0.0;
+               rel2.relative: 2.0 0.0;
+            }
+         }
+         part { name: "controlbar_bg";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 0;
+               max: 999999 0;
+               fixed: 0 1;
+               align: 0.5 1;
+               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
+               visible: 0;
+               rel1.to_x: "elm.swallow.content";
+               rel2.to_x: "elm.swallow.content";
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               max: 999999 CONTROLBAR_SMALL_HEIGHT_INC;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.prev_btn";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               max: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               fixed: 1 1;
+               align: 0 1;
+               rel1.to: "controlbar_bg";
+               rel2.to: "controlbar_bg";
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               max: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.controlbar";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1.to: "elm.swallow.prev_btn";
+               rel1.relative: 1 0;
+               rel2.to: "padding_after_controlbar";
+               rel2.relative: 0 1;
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "padding_after_controlbar";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               align: 1 1;
+               rel1.to: "controlbar_bg";
+               rel2.to: "controlbar_bg";
+               visible: 0;
+            }
+         }
+      }
+      programs {
+         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: "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: "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";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+         }
+         program { name: "prev_btn_show";
+            signal: "elm,state,prev_btn,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            script {
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
+            }
+         }
+         program { name: "prev_btn_hide";
+            signal: "elm,state,prev_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            script {
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
+            }
+         }
+         program { name: "controlbar_show";
+            signal: "elm,state,elm.swallow.controlbar,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            script {
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.controlbar", "show", 0.0);
+            }
+         }
+         program { name: "controlbar_hide";
+            signal: "elm,state,elm.swallow.controlbar,hide";
+            source: "elm";
+            script {
+               emit("elm,state,controlbar_bg,hide", "elm");
+               set_state(PART:"elm.swallow.controlbar", "default", 0.0);
+            }
+         }
+         program { name: "controlbar_bg_show";
+            signal: "elm,state,controlbar_bg,show";
+            source: "elm";
+            script {
+               set_state(PART:"controlbar_bg", "show", 0.0);
+               ++cbar_bg;
+            }
+         }
+         program { name: "controlbar_bg_hide";
+            signal: "elm,state,controlbar_bg,hide";
+            source: "elm";
+            script {
+               --cbar_bg;
+               if (cbar_bg < 1)
+                  set_state(PART:"controlbar_bg", "default", 0.0);
+            }
+         }
+         program { name: "show_finished";
+            action: SIGNAL_EMIT "elm,action,show,finished" "";
+         }
+         program { name: "pushed_finished";
+            action: SIGNAL_EMIT "elm,action,pushed,finished" "";
+         }
+         program { name: "popped_finished";
+            action: SIGNAL_EMIT "elm,action,popped,finished" "";
+         }
+         program {
+            name: "title_clicked";
+            signal: "mouse,clicked,1";
+            source: "click_event_area";
+            action: SIGNAL_EMIT "elm,action,title,clicked" "";
+         }
+      }
+   }
+   group { name:"elm/naviframe/item/basic/instant/default";
+      alias:"elm/naviframe/item/1line/instant/default";
+      alias:"elm/naviframe/item/instant/default";
       images {
          image: "naviframe_optionheader.png" COMP;
          image: "naviframe_optionheader_arrow.png" COMP;
@@ -1503,6 +2194,7 @@
       script {
          public oh_show = 0;     //optionheader show/hide
          public oh_close = 0;    //optionheader close/open
+         public cbar_bg = 0;     //Controlbar BG Show call count
       }
       parts {
          part { name: "title_clip";
@@ -1528,15 +2220,20 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 1 NAVIFRAME_OH_CLOSED_H_INC;
+               min: 1 0;
                align: 0.5 0;
                fixed: 0 1;
-               rel1 { to: "title_clip"; relative: 0 1; }
-               rel2 { to: "title_clip"; relative: 1 1; }
+               rel1.to_x: "elm.swallow.content";
+               rel1.to_y: "title_clip";
+               rel1.relative: 0 1;
+               rel2.to_x: "elm.swallow.content";
+               rel2.to_y: "title_clip";
+               visible: 0;
             }
             description { state: "show" 0.0;
                inherit: "default" 0.0;
-               min: 1 NAVIFRAME_OH_OPENED_DOUBLE_H_INC;
+               min: 1 NAVIFRAME_OH_OPENED_H_INC;
+               visible: 1;
             }
             description { state: "hide" 0.0;
                inherit: "default" 0.0;
@@ -1553,11 +2250,11 @@
                rel1 { to: "optionheader_clip"; }
                rel2 { to: "optionheader_clip"; }
                image { normal: "naviframe_optionheader.png";
-                  border: 0 0 1 0;
+                  border: 0 0 4 0;
                }
             }
          }
-         part { name: "elm.swallow.optionheader.top.padding";
+         part { name: "optionheader_top_padding";
             type: RECT;
             scale: 1;
             clip_to: "optionheader_clip";
@@ -1576,8 +2273,8 @@
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
                min: 1 NAVIFRAME_OH_CONTENT_H_INC;
-               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader.top.padding"; }
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader.top.padding"; }
+               rel1 { relative: 0.0 1.0; to: "optionheader_top_padding"; }
+               rel2 { relative: 1.0 1.0; to: "optionheader_top_padding"; }
                fixed: 0 1;
                align: 0.0 0.0;
                visible: 0;
@@ -1587,44 +2284,13 @@
                visible: 1;
             }
          }
-
-         part { name: "elm.swallow.optionheader.mid.padding";
+         part { name: "optionheader_bottom_padding";
             type: RECT;
             scale: 1;
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
                min: 1 NAVIFRAME_OH_PADDING_INC;
                rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader"; }
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader"; }
-               fixed: 0 1;
-               align: 0.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.swallow.optionheader2";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "optionheader_clip";
-            description { state: "default" 0.0;
-               min: 1 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";}
-               fixed: 0 1;
-               align: 0.0 0.0;
-               visible: 0;
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "elm.swallow.optionheader.bottom.padding";
-            type: RECT;
-            scale: 1;
-            clip_to: "optionheader_clip";
-            description { state: "default" 0.0;
-               min: 1 NAVIFRAME_OH_PADDING_INC;
-               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader2"; }
                fixed: 0 1;
                align: 0.0 0.0;
                visible: 0;
@@ -1647,7 +2313,8 @@
                align: 0.0 0.0;
                rel1.relative: 0.0 1.0;
                rel1.to_y: "optionheader_bg";
-               rel2.relative: 1.0 1.0;
+               rel2.relative: 1.0 0.0;
+               rel2.to_y: "controlbar_bg";
             }
          }
          part { name: "title_base";
@@ -1658,99 +2325,111 @@
                color: NAVIFRAME_TITLE_BG_COLOR_INC;
             }
          }
-         part { name: "elm.rect.pada";
+         part { name: "padding_before_left_btn";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_INDICATOR_W_INC 0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 { relative: 0.0 0.0; to: "title_base"; }
                rel2 { relative: 0.0 1.0; to: "title_base"; }
                visible: 0;
             }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: NAVIFRAME_PADDING_EXPANDED_INC 0;
-            }
          }
-         part { name: "separator_1";
+         part { name: "padding_after_left_btn";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               align: 1.0 0;
-               min: 1 0;
-               rel1 { relative: 0.0 0.2; to:"elm.rect.padb"; to: "title_base"; }
-               rel2 { relative: 0.0 0.8; to:"elm.rect.padb"; to: "title_base"; }
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
-               color: NAVIFRAME_TITLE_RIGHT_SEPARATOR_COLOR_INC;
+               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"; }
+               visible: 0;
             }
          }
-         part { name: "separator_2";
+         part { name: "padding_after_right_btn";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               align: 1.0 0;
-               min: 1 0;
-               rel1 { relative: 0.0 0.0; to: "separator_1"; to: "title_base"; }
-               rel2 { relative: 0.0 1.0; to: "separator_1"; to: "title_base"; }
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
-               color: NAVIFRAME_TITLE_LEFT_SEPARATOR_COLOR_INC;
+               align: 1.0 0.5;
+               rel1 { relative: 1.0 0.0; to: "title_base"; }
+               rel2 { relative: 1.0 1.0; to: "title_base"; }
+               visible: 0;
             }
          }
-         part { name: "elm.rect.padb";
+         part { name: "padding_before_right_btn";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_INDICATOR_W_INC 0;
+               min: 0 0;
                fixed: 1 0;
                align: 1.0 0.5;
-               rel1 { relative: 1.0 0.0; to: "title_base"; }
-               rel2 { relative: 1.0 1.0; to: "title_base"; }
+               rel1 { relative: 0.0 0.0; to: "elm.swallow.right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "elm.swallow.right_btn"; }
                visible: 0;
             }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+            }
          }
-         part { name: "elm.text.title";
-            type: TEXT;
+         part { name: "padding_before_more_btn";
+            type: RECT;
+            mouse_events: 0;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               text { font: "SLP:style=Medium";
-                  size: NAVIFRAME_TITLE_FONT_SIZE_INC;
-                  min: 0 0;
-                  max: 1 0;
-                  align: 0.5 0.5;
-               }
-               color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
-               align: 0.5 0.5;
-               rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; }
-               rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; }
+               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"; }
+               visible: 0;
             }
          }
-         part { name: "click_event_area";
-             ignore_flags: ON_HOLD;
-             description { state: "default" 0.0;
-                rel1 { to: "title_base"; }
-                rel2 { to: "elm.rect.padb"; relative: 0.0 1.0; }
-             }
+         part { name: "padding_before_text";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               align: 1.0 0.5;
+               rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; to_y: "title_base"; }
+               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; to_y: "title_base"; }
+               fixed: 1 0;
+               min: NAVIFRAME_ICON_PADDING_INC;
+               visible: 0;
+            }
          }
-         part { name: "elm.swallow.prev_btn";
-            type: SWALLOW;
+         part { name: "elm.text.title";
+            type: TEXT;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               align: 0 0.5;
-               fixed: 1 1;
-               rel1 { relative: 0.0 0.0; to: "title_base"; }
-               rel2 { relative: 0.0 1.0; to: "title_base"; }
+               text { font: "SLP:style=Medium";
+                  size: NAVIFRAME_TITLE_FONT_SIZE_INC;
+                  min: 0 0;
+                  max: 1 0;
+                  align: 0.5 0.5;
+               }
+               color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
+               align: 0.5 0.5;
+               rel1.to: "padding_after_left_btn";
+               rel1.relative: 1 0;
+               rel2.to: "padding_before_more_btn";
+               rel2.relative: 0 1;
             }
          }
          part { name: "elm.swallow.icon";
@@ -1766,19 +2445,73 @@
                align: 1.0 0.5;
             }
          }
-         part { name: "padding_before_text";
-            type: RECT;
+         part { name: "click_event_area";
+             ignore_flags: ON_HOLD;
+             description { state: "default" 0.0;
+                rel1 { to: "title_base"; }
+                rel2 { to: "title_base"; }
+             }
+         }
+         part { name: "elm.swallow.left_btn";
+            type: SWALLOW;
             scale: 1;
-            mouse_events: 0;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; to_y: "title_base"; }
-               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; to_y: "title_base"; }
+               min: 0 0;
                fixed: 1 0;
-               min: NAVIFRAME_ICON_PADDING_INC;
+               align: 0 0.5;
+               rel1 { relative: 1.0 0.0; to: "padding_before_left_btn"; }
+               rel2 { relative: 1.0 1.0; to: "padding_before_left_btn"; }
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               fixed: 1 1;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.right_btn";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: 0 0;
+               align: 1 0.5;
+               fixed: 1 0;
+               rel1 { relative: 0.0 0.0; to: "padding_after_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "padding_after_right_btn"; }
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               fixed: 1 1;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.more_btn";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: 0 0;
+               fixed: 1 0;
+               align: 1 0.5;
+               rel1.to: "padding_before_right_btn";
+               rel1.relative: 0 0;
+               rel2.to: "padding_before_right_btn";
+               rel2.relative: 0 1;
                visible: 0;
             }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               visible: 1;
+            }
          }
          part { name: "optionheader_arrow";
             type: IMAGE;
@@ -1788,50 +2521,108 @@
                min: NAVIFRAME_OH_ARROW_SIZE_INC;
                max: NAVIFRAME_OH_ARROW_SIZE_INC;
                fixed: 1 1;
-               align: 0.5 1;
-               visible: 0;
-               rel1.relative: 0 0;
-               rel1.to: "optionheader_bg";
-               rel1.offset: 0 1;
-               rel2.relative: 1 0;
-               rel2.to: "optionheader_bg";
-               rel2.offset: -1 0;
+               align: 0.5 0;
+               rel1.to: "elm.swallow.more_btn";
+               rel1.relative: 0 1;
+               rel2.to: "elm.swallow.more_btn";
+               rel2.relative: 1 1;
                image {
-                  normal: "00_winset_control_top_arrow.png";
+                  normal: "naviframe_optionheader_arrow.png";
                }
+               color: 255 255 255 0 ;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+                color: 255 255 255 255;
+            }
+         }
+         part { name: "controlbar_bg";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 0;
+               max: 999999 0;
+               fixed: 0 1;
+               align: 0.5 1;
+               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
+               visible: 0;
+               rel1.to_x: "elm.swallow.content";
+               rel2.to_x: "elm.swallow.content";
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               max: 999999 CONTROLBAR_SMALL_HEIGHT_INC;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.prev_btn";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               max: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               fixed: 1 1;
+               align: 0 1;
+               rel1.to: "controlbar_bg";
+               rel2.to: "controlbar_bg";
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               max: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.controlbar";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1.to: "elm.swallow.prev_btn";
+               rel1.relative: 1 0;
+               rel2.to: "padding_after_controlbar";
+               rel2.relative: 0 1;
+               visible: 0;
             }
             description { state: "show" 0.0;
                inherit: "default" 0.0;
                visible: 1;
             }
          }
+         part { name: "padding_after_controlbar";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               align: 1 1;
+               rel1.to: "controlbar_bg";
+               rel2.to: "controlbar_bg";
+               visible: 0;
+            }
+         }
       }
       programs {
          program { name: "cur_pushed";
             signal: "elm,state,cur,pushed";
             source: "elm";
-            action: SIGNAL_EMIT "elm,action,pushed,finished" "";
+            after: "pushed_finished";
          }
          program { name: "new_pushed";
             signal: "elm,state,new,pushed";
             source: "elm";
-            action: SIGNAL_EMIT "elm,action,show,finished" "";
+            after: "show_finished";
          }
          program { name: "prev_popped";
             signal: "elm,state,prev,popped";
             source: "elm";
-            action: SIGNAL_EMIT "elm,action,show,finished" "";
+            after: "show_finished";
          }
          program { name: "cur_popped";
             signal: "elm,state,cur,popped";
             source: "elm";
-            action: SIGNAL_EMIT "elm,action,popped,finished" "";
-         }
-         program { name: "visible";
-            signal: "elm,state,visible";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
+            after: "popped_finished";
          }
          program { name: "title_show";
             signal: "elm,state,title,show";
@@ -1856,17 +2647,95 @@
             target: "title_clip";
             target: "optionheader_clip";
          }
-         program { name: "icon_show";
-            signal: "elm,state,elm.swallow.icon,show";
+         program { name: "prev_btn_show";
+            signal: "elm,state,prev_btn,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            script {
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
+            }
+         }
+         program { name: "prev_btn_hide";
+            signal: "elm,state,prev_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            script {
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
+            }
+         }
+         program { name: "left_btn_show";
+            signal: "elm,state,elm.swallow.left_btn,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            target: "elm.swallow.left_btn";
+         }
+         program { name: "left_btn_hide";
+            signal: "elm,state,elm.swallow.left_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.left_btn";
+         }
+         program { name: "right_btn_show";
+            signal: "elm,state,elm.swallow.right_btn,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            target: "elm.swallow.right_btn";
+         }
+         program { name: "right_btn_hide";
+            signal: "elm,state,elm.swallow.right_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.right_btn";
+         }
+         program { name: "more_btn_show";
+            signal: "elm,state,elm.swallow.more_btn,show";
             source: "elm";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.rect.pada";
+            action: STATE_SET "show" 0.0;
+            target: "elm.swallow.more_btn";
+            target: "padding_before_right_btn";
          }
-         program { name: "icon_hide";
-            signal: "elm,state,elm.swallow.icon,hide";
+         program { name: "more_btn_hide";
+            signal: "elm,state,elm.swallow.more_btn,hide";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "elm.rect.pada";
+            target: "elm.swallow.more_btn";
+            target: "padding_before_right_btn";
+         }
+         program { name: "controlbar_show";
+            signal: "elm,state,elm.swallow.controlbar,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            script {
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.controlbar", "show", 0.0);
+            }
+         }
+         program { name: "controlbar_hide";
+            signal: "elm,state,elm.swallow.controlbar,hide";
+            source: "elm";
+            script {
+               emit("elm,state,controlbar_bg,hide", "elm");
+               set_state(PART:"elm.swallow.controlbar", "default", 0.0);
+            }
+         }
+         program { name: "controlbar_bg_show";
+            signal: "elm,state,controlbar_bg,show";
+            source: "elm";
+            script {
+               set_state(PART:"controlbar_bg", "show", 0.0);
+               ++cbar_bg;
+            }
+         }
+         program { name: "controlbar_bg_hide";
+            signal: "elm,state,controlbar_bg,hide";
+            source: "elm";
+            script {
+               --cbar_bg;
+               if (cbar_bg < 1)
+                  set_state(PART:"controlbar_bg", "default", 0.0);
+            }
          }
          program { name: "optionheader_show";
             signal: "elm,state,elm.swallow.optionheader,show";
@@ -1875,9 +2744,7 @@
                set_state(PART:"optionheader_clip", "show", 0.0);
                set_state(PART:"optionheader_arrow", "show", 0.0);
                set_state(PART:"elm.swallow.optionheader", "show", 0.0);
-               set_state(PART:"elm.swallow.optionheader2", "show", 0.0);
                set_int(oh_show, 1);
-               emit("elm,state,optionheader_arrow,show", "");
             }
          }
          program { name: "optionheader_hide";
@@ -1887,7 +2754,6 @@
                set_state(PART:"optionheader_clip", "default", 0.0);
                set_state(PART:"optionheader_arrow", "default", 0.0);
                set_state(PART:"elm.swallow.optionheader", "default", 0.0);
-               set_state(PART:"elm.swallow.optionheader2", "default", 0.0);
                set_int(oh_show, 0);
             }
          }
@@ -1896,8 +2762,8 @@
             source: "";
             action: STATE_SET "show" 0.0;
             target: "optionheader_clip";
+            target: "optionheader_arrow";
             target: "elm.swallow.optionheader";
-            target: "elm.swallow.optionheader2";
             transition: LINEAR 0.2;
             after: "optionheader_open_set";
          }
@@ -1906,8 +2772,8 @@
             source: "";
             action: STATE_SET "default" 0.0;
             target: "optionheader_clip";
+            target: "optionheader_arrow";
             target: "elm.swallow.optionheader";
-            target: "elm.swallow.optionheader2";
             transition: LINEAR 0.2;
             after: "optionheader_close_set";
          }
@@ -1916,8 +2782,8 @@
             source: "";
             action: STATE_SET "show" 0.0;
             target: "optionheader_clip";
+            target: "optionheader_arrow";
             target: "elm.swallow.optionheader";
-            target: "elm.swallow.optionheader2";
             after: "optionheader_open_set";
          }
          program { name: "optionheader_instant_close";
@@ -1925,8 +2791,8 @@
             source: "";
             action: STATE_SET "default" 0.0;
             target: "optionheader_clip";
+            target: "optionheader_arrow";
             target: "elm.swallow.optionheader";
-            target: "elm.swallow.optionheader2";
             after: "optionheader_close_set";
          }
          program { name: "optionheader_close_set";
@@ -1943,23 +2809,1297 @@
                set_int(oh_close, 0);
             }
          }
-         program { name: "title_clicked_signal";
-            action: SIGNAL_EMIT "elm,action,title,clicked" "";
+         program { name: "show_finished";
+            action: SIGNAL_EMIT "elm,action,show,finished" "";
+         }
+         program { name: "pushed_finished";
+            action: SIGNAL_EMIT "elm,action,pushed,finished" "";
+         }
+         program { name: "popped_finished";
+            action: SIGNAL_EMIT "elm,action,popped,finished" "";
          }
          program {
             name: "title_clicked";
             signal: "mouse,clicked,1";
             source: "click_event_area";
-            script {
-               if (get_int(oh_show) == 1) {
-                  if (get_int(oh_close) == 1) {
-                     emit("elm,state,optionheader,open", "");
-                  }else {
-                     emit("elm,state,optionheader,close", "");
-                  }
-               }//if
-            }//script
-            after: "title_clicked_signal";
+            action: SIGNAL_EMIT "elm,action,title,clicked" "";
          }
       }
    }
+   group { name:"elm/naviframe/item/basic2/instant/default";
+      alias:"elm/naviframe/item/2line/instant/default";
+      alias:"elm/naviframe/item/instant2/default";
+      images {
+         image: "naviframe_optionheader.png" COMP;
+         image: "naviframe_optionheader_arrow.png" COMP;
+      }
+      script {
+         public oh_show = 0;     //optionheader show/hide
+         public oh_close = 0;    //optionheader close/open
+         public cbar_bg = 0;     //Controlbar BG Show call count
+      }
+      parts {
+         part { name: "title_clip";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               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; }
+            }
+            description { state: "hide" 0.0;
+               inherit: "default" 0.0;
+               min: 0 0;
+               max: 0 0;
+               fixed: 1 1;
+            }
+         }
+         part { name: "optionheader_clip";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 1 0;
+               align: 0.5 0;
+               fixed: 0 1;
+               rel1.to_x: "elm.swallow.content";
+               rel1.to_y: "title_clip";
+               rel1.relative: 0 1;
+               rel2.to_x: "elm.swallow.content";
+               rel2.to_y: "title_clip";
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: 1 NAVIFRAME_OH_OPENED_DOUBLE_H_INC;
+               visible: 1;
+            }
+            description { state: "hide" 0.0;
+               inherit: "default" 0.0;
+               min: 0 0;
+               max: 0 0;
+               fixed: 1 1;
+            }
+         }
+         part { name: "optionheader_bg";
+            type: IMAGE;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1 { to: "optionheader_clip"; }
+               rel2 { to: "optionheader_clip"; }
+               image { normal: "naviframe_optionheader.png";
+                  border: 0 0 4 0;
+               }
+            }
+         }
+         part { name: "optionheader_top_padding";
+            type: RECT;
+            scale: 1;
+            clip_to: "optionheader_clip";
+            description { state: "default" 0.0;
+               min: 1 NAVIFRAME_OH_PADDING_INC;
+               rel1 { relative: 0.0 0.0; to: "optionheader_bg"; }
+               rel2 { relative: 1.0 0.0; to: "optionheader_bg"; }
+               fixed: 0 1;
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.swallow.optionheader";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "optionheader_clip";
+            description { state: "default" 0.0;
+               min: 1 NAVIFRAME_OH_CONTENT_H_INC;
+               rel1 { relative: 0.0 1.0; to: "optionheader_top_padding"; }
+               rel2 { relative: 1.0 1.0; to: "optionheader_top_padding"; }
+               fixed: 0 1;
+               align: 0.0 0.0;
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.optionheader.mid.padding";
+            type: RECT;
+            scale: 1;
+            clip_to: "optionheader_clip";
+            description { state: "default" 0.0;
+               min: 1 NAVIFRAME_OH_PADDING_INC;
+               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader"; }
+               rel2 { relative: 1.0 1.0; to: "elm.swallow.optionheader"; }
+               fixed: 0 1;
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.swallow.optionheader2";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "optionheader_clip";
+            description { state: "default" 0.0;
+               min: 1 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";}
+               fixed: 0 1;
+               align: 0.0 0.0;
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.optionheader.bottom.padding";
+            type: RECT;
+            scale: 1;
+            clip_to: "optionheader_clip";
+            description { state: "default" 0.0;
+               min: 1 NAVIFRAME_OH_PADDING_INC;
+               rel1 { relative: 0.0 1.0; to: "elm.swallow.optionheader2"; }
+               fixed: 0 1;
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "content_clip";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1.to_y: "optionheader_bg";
+               rel1.relative: 0 1;
+            }
+         }
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
+            scale: 1;
+            repeat_events: 0;
+            clip_to: "content_clip";
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1.relative: 0.0 1.0;
+               rel1.to_y: "optionheader_bg";
+               rel2.relative: 1.0 0.0;
+               rel2.to_y: "controlbar_bg";
+            }
+         }
+         part { name: "title_base";
+            type: RECT;
+            description { state: "default" 0.0;
+               rel1 { to: "title_clip"; }
+               rel2 { to: "title_clip"; }
+               color: NAVIFRAME_TITLE_BG_COLOR_INC;
+            }
+         }
+         part { name: "padding_before_left_btn";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 { relative: 0.0 0.0; to: "title_base"; }
+               rel2 { relative: 0.0 1.0; to: "title_base"; }
+               visible: 0;
+            }
+         }
+         part { name: "padding_after_left_btn";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               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"; }
+               visible: 0;
+            }
+         }
+         part { name: "padding_after_right_btn";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+               fixed: 1 0;
+               align: 1.0 0.5;
+               rel1 { relative: 1.0 0.0; to: "title_base"; }
+               rel2 { relative: 1.0 1.0; to: "title_base"; }
+               visible: 0;
+            }
+         }
+         part { name: "padding_before_right_btn";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               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"; }
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+            }
+         }
+         part { name: "padding_before_more_btn";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               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"; }
+               visible: 0;
+            }
+         }
+         part { name: "padding_before_text";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               align: 1.0 0.5;
+               rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; to_y: "title_base"; }
+               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; to_y: "title_base"; }
+               fixed: 1 0;
+               min: NAVIFRAME_ICON_PADDING_INC;
+               visible: 0;
+            }
+         }
+         part { name: "elm.text.title";
+            type: TEXT;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               text { font: "SLP:style=Medium";
+                  size: NAVIFRAME_TITLE_FONT_SIZE_INC;
+                  min: 0 0;
+                  max: 1 0;
+                  align: 0.5 0.5;
+               }
+               color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
+               align: 0.5 0.5;
+               rel1.to: "padding_after_left_btn";
+               rel1.relative: 1 0;
+               rel2.to: "padding_before_more_btn";
+               rel2.relative: 0 1;
+            }
+         }
+         part { name: "elm.swallow.icon";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               max: NAVIFRAME_ICON_SIZE_INC;
+               rel1 { relative: 0.0 0.0; to: "padding_before_text"; }
+               rel2 { relative: 0.0 1.0; to: "padding_before_text"; }
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               align: 1.0 0.5;
+            }
+         }
+         part { name: "click_event_area";
+             ignore_flags: ON_HOLD;
+             description { state: "default" 0.0;
+                rel1 { to: "title_base"; }
+                rel2 { to: "title_base"; }
+             }
+         }
+         part { name: "elm.swallow.left_btn";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: 0 0;
+               fixed: 1 0;
+               align: 0 0.5;
+               rel1 { relative: 1.0 0.0; to: "padding_before_left_btn"; }
+               rel2 { relative: 1.0 1.0; to: "padding_before_left_btn"; }
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               fixed: 1 1;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.right_btn";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: 0 0;
+               align: 1 0.5;
+               fixed: 1 0;
+               rel1 { relative: 0.0 0.0; to: "padding_after_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "padding_after_right_btn"; }
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               fixed: 1 1;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.more_btn";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: 0 0;
+               fixed: 1 0;
+               align: 1 0.5;
+               rel1.to: "padding_before_right_btn";
+               rel1.relative: 0 0;
+               rel2.to: "padding_before_right_btn";
+               rel2.relative: 0 1;
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               visible: 1;
+            }
+         }
+         part { name: "optionheader_arrow";
+            type: IMAGE;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_OH_ARROW_SIZE_INC;
+               max: NAVIFRAME_OH_ARROW_SIZE_INC;
+               fixed: 1 1;
+               align: 0.5 0;
+               rel1.to: "elm.swallow.more_btn";
+               rel1.relative: 0 1;
+               rel2.to: "elm.swallow.more_btn";
+               rel2.relative: 1 1;
+               image {
+                  normal: "naviframe_optionheader_arrow.png";
+               }
+               color: 255 255 255 0 ;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+                color: 255 255 255 255;
+            }
+         }
+         part { name: "controlbar_bg";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 0;
+               max: 999999 0;
+               fixed: 0 1;
+               align: 0.5 1;
+               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
+               visible: 0;
+               rel1.to_x: "elm.swallow.content";
+               rel2.to_x: "elm.swallow.content";
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               max: 999999 CONTROLBAR_SMALL_HEIGHT_INC;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.prev_btn";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               max: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               fixed: 1 1;
+               align: 0 1;
+               rel1.to: "controlbar_bg";
+               rel2.to: "controlbar_bg";
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               max: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.controlbar";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1.to: "elm.swallow.prev_btn";
+               rel1.relative: 1 0;
+               rel2.to: "padding_after_controlbar";
+               rel2.relative: 0 1;
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "padding_after_controlbar";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               align: 1 1;
+               rel1.to: "controlbar_bg";
+               rel2.to: "controlbar_bg";
+               visible: 0;
+            }
+         }
+      }
+      programs {
+         program { name: "cur_pushed";
+            signal: "elm,state,cur,pushed";
+            source: "elm";
+            after: "pushed_finished";
+         }
+         program { name: "new_pushed";
+            signal: "elm,state,new,pushed";
+            source: "elm";
+            after: "show_finished";
+         }
+         program { name: "prev_popped";
+            signal: "elm,state,prev,popped";
+            source: "elm";
+            after: "show_finished";
+         }
+         program { name: "cur_popped";
+            signal: "elm,state,cur,popped";
+            source: "elm";
+            after: "popped_finished";
+         }
+         program { name: "title_show";
+            signal: "elm,state,title,show";
+            source: "elm";
+            script {
+               set_state(PART:"title_clip", "default", 0.0);
+               if (get_int(oh_show) == 1) {
+                  if (get_int(oh_close) == 1) {
+                     emit("elm,state,optionheader,instant_close", "");
+                  }else {
+                     emit("elm,state,optionheader,instant_open", "");
+                  }
+               }
+               else
+                 set_state(PART:"optionheader_clip", "default", 0.0);
+            }
+         }
+         program { name: "title_hide";
+            signal: "elm,state,title,hide";
+            source: "elm";
+            action: STATE_SET "hide" 0.0;
+            target: "title_clip";
+            target: "optionheader_clip";
+         }
+         program { name: "prev_btn_show";
+            signal: "elm,state,prev_btn,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            script {
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
+            }
+         }
+         program { name: "prev_btn_hide";
+            signal: "elm,state,prev_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            script {
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
+            }
+         }
+         program { name: "left_btn_show";
+            signal: "elm,state,elm.swallow.left_btn,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            target: "elm.swallow.left_btn";
+         }
+         program { name: "left_btn_hide";
+            signal: "elm,state,elm.swallow.left_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.left_btn";
+         }
+         program { name: "right_btn_show";
+            signal: "elm,state,elm.swallow.right_btn,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            target: "elm.swallow.right_btn";
+         }
+         program { name: "right_btn_hide";
+            signal: "elm,state,elm.swallow.right_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.right_btn";
+         }
+         program { name: "more_btn_show";
+            signal: "elm,state,elm.swallow.more_btn,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            target: "elm.swallow.more_btn";
+            target: "padding_before_right_btn";
+         }
+         program { name: "more_btn_hide";
+            signal: "elm,state,elm.swallow.more_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.more_btn";
+            target: "padding_before_right_btn";
+         }
+         program { name: "controlbar_show";
+            signal: "elm,state,elm.swallow.controlbar,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            script {
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.controlbar", "show", 0.0);
+            }
+         }
+         program { name: "controlbar_hide";
+            signal: "elm,state,elm.swallow.controlbar,hide";
+            source: "elm";
+            script {
+               emit("elm,state,controlbar_bg,hide", "elm");
+               set_state(PART:"elm.swallow.controlbar", "default", 0.0);
+            }
+         }
+         program { name: "controlbar_bg_show";
+            signal: "elm,state,controlbar_bg,show";
+            source: "elm";
+            script {
+               set_state(PART:"controlbar_bg", "show", 0.0);
+               ++cbar_bg;
+            }
+         }
+         program { name: "controlbar_bg_hide";
+            signal: "elm,state,controlbar_bg,hide";
+            source: "elm";
+            script {
+               --cbar_bg;
+               if (cbar_bg < 1)
+                  set_state(PART:"controlbar_bg", "default", 0.0);
+            }
+         }
+         program { name: "optionheader_show";
+            signal: "elm,state,elm.swallow.optionheader,show";
+            source: "elm";
+            script {
+               set_state(PART:"optionheader_clip", "show", 0.0);
+               set_state(PART:"optionheader_arrow", "show", 0.0);
+               set_state(PART:"elm.swallow.optionheader", "show", 0.0);
+               set_state(PART:"elm.swallow.optionheader2", "show", 0.0);
+               set_int(oh_show, 1);
+            }
+         }
+         program { name: "optionheader_hide";
+            signal: "elm,state,elm.swallow.optionheader,hide";
+            source: "elm";
+            script {
+               set_state(PART:"optionheader_clip", "default", 0.0);
+               set_state(PART:"optionheader_arrow", "default", 0.0);
+               set_state(PART:"elm.swallow.optionheader", "default", 0.0);
+               set_state(PART:"elm.swallow.optionheader2", "hide", 0.0);
+               set_int(oh_show, 0);
+            }
+         }
+         program { name: "optionheader_open";
+            signal: "elm,state,optionheader,open";
+            source: "";
+            action: STATE_SET "show" 0.0;
+            target: "optionheader_clip";
+            target: "optionheader_arrow";
+            target: "elm.swallow.optionheader";
+            target: "elm.swallow.optionheader2";
+            transition: LINEAR 0.2;
+            after: "optionheader_open_set";
+         }
+         program { name: "optionheader_close";
+            signal: "elm,state,optionheader,close";
+            source: "";
+            action: STATE_SET "default" 0.0;
+            target: "optionheader_clip";
+            target: "optionheader_arrow";
+            target: "elm.swallow.optionheader";
+            target: "elm.swallow.optionheader2";
+            transition: LINEAR 0.2;
+            after: "optionheader_close_set";
+         }
+         program { name: "optionheader_instant_open";
+            signal: "elm,state,optionheader,instant_open";
+            source: "";
+            action: STATE_SET "show" 0.0;
+            target: "optionheader_clip";
+            target: "optionheader_arrow";
+            target: "elm.swallow.optionheader";
+            target: "elm.swallow.optionheader2";
+            after: "optionheader_open_set";
+         }
+         program { name: "optionheader_instant_close";
+            signal: "elm,state,optionheader,instant_close";
+            source: "";
+            action: STATE_SET "default" 0.0;
+            target: "optionheader_clip";
+            target: "optionheader_arrow";
+            target: "elm.swallow.optionheader";
+            target: "elm.swallow.optionheader2";
+            after: "optionheader_close_set";
+         }
+         program { name: "optionheader_close_set";
+            signal: "elm,state,optionheader,close_set";
+            source: "";
+            script {
+               set_int(oh_close, 1);
+            }
+         }
+         program { name: "optionheader_open_set";
+            signal: "elm,state,optionheader,open_set";
+            source: "";
+            script {
+               set_int(oh_close, 0);
+            }
+         }
+         program { name: "show_finished";
+            action: SIGNAL_EMIT "elm,action,show,finished" "";
+         }
+         program { name: "pushed_finished";
+            action: SIGNAL_EMIT "elm,action,pushed,finished" "";
+         }
+         program { name: "popped_finished";
+            action: SIGNAL_EMIT "elm,action,popped,finished" "";
+         }
+         program {
+            name: "title_clicked";
+            signal: "mouse,clicked,1";
+            source: "click_event_area";
+            action: SIGNAL_EMIT "elm,action,title,clicked" "";
+         }
+      }
+   }
+   group { name: "elm/naviframe/item/segment/instant/default";
+      script {
+         public cbar_bg = 0;     //Controlbar BG Show call count
+      }
+      parts {
+         part { name: "title_clip";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               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; }
+            }
+            description { state: "hide" 0.0;
+               inherit: "default" 0.0;
+               min: 0 0;
+               max: 0 0;
+               fixed: 1 1;
+            }
+         }
+         part { name: "content_clip";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1.to_y: "title_clip";
+               rel1.relative: 0 1;
+            }
+         }
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
+            scale: 1;
+            repeat_events: 0;
+            clip_to: "content_clip";
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1.relative: 0.0 1.0;
+               rel1.to_y: "title_clip";
+               rel2.relative: 1.0 0.0;
+               rel2.to_y: "controlbar_bg";
+            }
+        }
+         part { name: "title_base";
+            type: RECT;
+            description { state: "default" 0.0;
+               rel1 { to: "title_clip"; }
+               rel2 { to: "title_clip"; }
+               color: NAVIFRAME_TITLE_BG_COLOR_INC;
+            }
+         }
+         part { name: "padding_before_left_btn";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 { relative: 0.0 0.0; to: "title_base"; }
+               rel2 { relative: 0.0 1.0; to: "title_base"; }
+               visible: 0;
+            }
+         }
+         part { name: "padding_after_left_btn";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               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"; }
+               visible: 0;
+            }
+         }
+         part { name: "padding_after_right_btn";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+               fixed: 1 0;
+               align: 1.0 0.5;
+               rel1 { relative: 1.0 0.0; to: "title_base"; }
+               rel2 { relative: 1.0 1.0; to: "title_base"; }
+               visible: 0;
+            }
+         }
+         part { name: "padding_before_right_btn";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               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"; }
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+            }
+         }
+         part { name: "padding_before_text";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               align: 1.0 0.5;
+               rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; to_y: "title_base"; }
+               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; to_y: "title_base"; }
+               fixed: 1 0;
+               min: NAVIFRAME_ICON_PADDING_INC;
+               visible: 0;
+            }
+         }
+         part { name: "elm.text.title";
+            type: TEXT;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               text { font: "SLP:style=Medium";
+                  size: NAVIFRAME_TITLE_SEGMENT_FONT_SIZE_INC;
+                  min: 0 0;
+                  max: 1 0;
+                  align: 0.5 0.5;
+               }
+               min: 0 NAVIFRAME_TITLE_SEGMENT_TEXT_H_INC;
+               max: 999999 NAVIFRAME_TITLE_SEGMENT_TEXT_H_INC;
+               fixed: 0 1;
+               color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
+               align: 0.5 0;
+               rel1.to: "padding_before_left_btn";
+               rel1.relative: 1 0;
+               rel2.to: "padding_after_right_btn";
+               rel2.relative: 0 1;
+            }
+         }
+         part { name: "click_event_area";
+             ignore_flags: ON_HOLD;
+             description { state: "default" 0.0;
+                rel1 { to: "title_base"; }
+                rel2 { to: "title_base"; }
+             }
+         }
+         part { name: "elm.swallow.left_btn";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: 0 0;
+               fixed: 1 0;
+               align: 0 0;
+               rel1.relative: 1.0 1.0;
+               rel1.to_x: "padding_before_left_btn";
+               rel1.to_y: "elm.text.title";
+               rel2.relative: 1.0 1.0;
+               rel2.to_x: "padding_before_left_btn";
+               rel2.to_y: "elm.text.title";
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               fixed: 1 1;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.right_btn";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: 0 0;
+               align: 1 0;
+               fixed: 1 0;
+               rel1.relative: 0.0 1.0;
+               rel1.to_x: "padding_after_right_btn";
+               rel1.to_y: "elm.text.title";
+               rel2.relative: 0.0 1.0;
+               rel2.to_x: "padding_after_right_btn";
+               rel2.to_y: "elm.text.title";
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+               fixed: 1 1;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.segment2";
+            type: "SWALLOW";
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: 0 NAVIFRAME_TITLE_SEGMENT_H_INC;
+               max: 999999 NAVIFRAME_TITLE_SEGMENT_H_INC;
+               fixed: 0 1;
+               align: 0.5 0;
+               rel1.to_y: "elm.text.title";
+               rel1.relative: 0.28 1;
+               rel2.to_y: "elm.text.title";
+               rel2.relative: 0.72 1;
+            }
+         }
+         part { name: "elm.swallow.segment3";
+            type: "SWALLOW";
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: 0 NAVIFRAME_TITLE_SEGMENT_H_INC;
+               max: 999999 NAVIFRAME_TITLE_SEGMENT_H_INC;
+               fixed: 0 1;
+               align: 0.5 0;
+               rel1.to_y: "elm.text.title";
+               rel1.relative: 0.2 1;
+               rel2.to_y: "elm.text.title";
+               rel2.relative: 0.8 1;
+            }
+         }
+         part { name: "controlbar_bg";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 0;
+               max: 999999 0;
+               fixed: 0 1;
+               align: 0.5 1;
+               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
+               visible: 0;
+               rel1.to_x: "elm.swallow.content";
+               rel2.to_x: "elm.swallow.content";
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               max: 999999 CONTROLBAR_SMALL_HEIGHT_INC;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.prev_btn";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               max: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               fixed: 1 1;
+               align: 0 1;
+               rel1.to: "controlbar_bg";
+               rel2.to: "controlbar_bg";
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               max: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.controlbar";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1.to: "elm.swallow.prev_btn";
+               rel1.relative: 1 0;
+               rel2.to: "padding_after_controlbar";
+               rel2.relative: 0 1;
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "padding_after_controlbar";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               align: 1 1;
+               rel1.to: "controlbar_bg";
+               rel2.to: "controlbar_bg";
+               visible: 0;
+            }
+         }
+      }
+      programs {
+         program { name: "cur_pushed";
+            signal: "elm,state,cur,pushed";
+            source: "elm";
+            after: "pushed_finished";
+         }
+         program { name: "new_pushed";
+            signal: "elm,state,new,pushed";
+            source: "elm";
+            after: "show_finished";
+         }
+         program { name: "prev_popped";
+            signal: "elm,state,prev,popped";
+            source: "elm";
+            after: "show_finished";
+         }
+         program { name: "cur_popped";
+            signal: "elm,state,cur,popped";
+            source: "elm";
+            after: "popped_finished";
+         }
+         program { name: "title_show";
+            signal: "elm,state,title,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            target: "title_clip";
+         }
+         program { name: "title_hide";
+            signal: "elm,state,title,hide";
+            source: "elm";
+            action: STATE_SET "hide" 0.0;
+            target: "title_clip";
+         }
+         program { name: "prev_btn_show";
+            signal: "elm,state,prev_btn,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            script {
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
+            }
+         }
+         program { name: "prev_btn_hide";
+            signal: "elm,state,prev_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            script {
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
+            }
+         }
+         program { name: "left_btn_show";
+            signal: "elm,state,elm.swallow.left_btn,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            target: "elm.swallow.left_btn";
+         }
+         program { name: "left_btn_hide";
+            signal: "elm,state,elm.swallow.left_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.left_btn";
+         }
+         program { name: "right_btn_show";
+            signal: "elm,state,elm.swallow.right_btn,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            target: "elm.swallow.right_btn";
+         }
+         program { name: "right_btn_hide";
+            signal: "elm,state,elm.swallow.right_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.right_btn";
+         }
+         program { name: "controlbar_show";
+            signal: "elm,state,elm.swallow.controlbar,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            script {
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.controlbar", "show", 0.0);
+            }
+         }
+         program { name: "controlbar_hide";
+            signal: "elm,state,elm.swallow.controlbar,hide";
+            source: "elm";
+            script {
+               emit("elm,state,controlbar_bg,hide", "elm");
+               set_state(PART:"elm.swallow.controlbar", "default", 0.0);
+            }
+         }
+         program { name: "controlbar_bg_show";
+            signal: "elm,state,controlbar_bg,show";
+            source: "elm";
+            script {
+               set_state(PART:"controlbar_bg", "show", 0.0);
+               ++cbar_bg;
+            }
+         }
+         program { name: "controlbar_bg_hide";
+            signal: "elm,state,controlbar_bg,hide";
+            source: "elm";
+            script {
+               --cbar_bg;
+               if (cbar_bg < 1)
+                  set_state(PART:"controlbar_bg", "default", 0.0);
+            }
+         }
+         program { name: "show_finished";
+            action: SIGNAL_EMIT "elm,action,show,finished" "";
+         }
+         program { name: "pushed_finished";
+            action: SIGNAL_EMIT "elm,action,pushed,finished" "";
+         }
+         program { name: "popped_finished";
+            action: SIGNAL_EMIT "elm,action,popped,finished" "";
+         }
+         program {
+            name: "title_clicked";
+            signal: "mouse,clicked,1";
+            source: "click_event_area";
+            action: SIGNAL_EMIT "elm,action,title,clicked" "";
+         }
+      }
+   }
+   group { name: "elm/naviframe/item/tabbar/instant/default";
+      script {
+         public cbar_bg = 0;     //Controlbar BG Show call count
+      }
+      parts {
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
+            scale: 1;
+            repeat_events: 0;
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel2.relative: 1.0 0.0;
+               rel2.to_y: "controlbar_bg";
+            }
+         }
+         part { name: "controlbar_bg";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 0;
+               max: 999999 0;
+               fixed: 0 1;
+               align: 0.5 1;
+               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
+               visible: 0;
+               rel1.to_x: "elm.swallow.content";
+               rel2.to_x: "elm.swallow.content";
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               max: 999999 CONTROLBAR_SMALL_HEIGHT_INC;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.prev_btn";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               max: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+               fixed: 1 1;
+               align: 0 1;
+               rel1.to: "controlbar_bg";
+               rel2.to: "controlbar_bg";
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               max: NAVIFRAME_PREV_BTN_W_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.controlbar";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1.to: "elm.swallow.prev_btn";
+               rel1.relative: 1 0;
+               rel2.to: "padding_after_controlbar";
+               rel2.relative: 0 1;
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "padding_after_controlbar";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               align: 1 1;
+               rel1.to: "controlbar_bg";
+               rel2.to: "controlbar_bg";
+               visible: 0;
+            }
+         }
+      }
+      programs {
+         program { name: "cur_pushed";
+            signal: "elm,state,cur,pushed";
+            source: "elm";
+            after: "pushed_finished";
+         }
+         program { name: "new_pushed";
+            signal: "elm,state,new,pushed";
+            source: "elm";
+            after: "show_finished";
+         }
+         program { name: "prev_popped";
+            signal: "elm,state,prev,popped";
+            source: "elm";
+            after: "show_finished";
+         }
+         program { name: "cur_popped";
+            signal: "elm,state,cur,popped";
+            source: "elm";
+            after: "popped_finished";
+         }
+         program { name: "prev_btn_show";
+            signal: "elm,state,prev_btn,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            script {
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
+            }
+         }
+         program { name: "prev_btn_hide";
+            signal: "elm,state,prev_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            script {
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
+            }
+         }
+         program { name: "controlbar_show";
+            signal: "elm,state,elm.swallow.controlbar,show";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            script {
+               emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.swallow.controlbar", "show", 0.0);
+            }
+         }
+         program { name: "controlbar_hide";
+            signal: "elm,state,elm.swallow.controlbar,hide";
+            source: "elm";
+            script {
+               emit("elm,state,controlbar_bg,hide", "elm");
+               set_state(PART:"elm.swallow.controlbar", "default", 0.0);
+            }
+         }
+         program { name: "controlbar_bg_show";
+            signal: "elm,state,controlbar_bg,show";
+            source: "elm";
+            script {
+               set_state(PART:"controlbar_bg", "show", 0.0);
+               ++cbar_bg;
+            }
+         }
+         program { name: "controlbar_bg_hide";
+            signal: "elm,state,controlbar_bg,hide";
+            source: "elm";
+            script {
+               --cbar_bg;
+               if (cbar_bg < 1)
+                  set_state(PART:"controlbar_bg", "default", 0.0);
+            }
+         }
+         program { name: "show_finished";
+            action: SIGNAL_EMIT "elm,action,show,finished" "";
+         }
+         program { name: "pushed_finished";
+            action: SIGNAL_EMIT "elm,action,pushed,finished" "";
+         }
+         program { name: "popped_finished";
+            action: SIGNAL_EMIT "elm,action,popped,finished" "";
+         }
+         program {
+            name: "title_clicked";
+            signal: "mouse,clicked,1";
+            source: "click_event_area";
+            action: SIGNAL_EMIT "elm,action,title,clicked" "";
+         }
+      }
+   }
+

diff --git a/themes/images/nbeat-black-hd/00_Title_btn.png b/themes/images/nbeat-black-hd/00_Title_btn.png
new file mode 100755 (executable)
index 0000000..96ceb62
Binary files /dev/null and b/themes/images/nbeat-black-hd/00_Title_btn.png differ

diff --git a/themes/images/nbeat-black-hd/00_Title_btn_press.png b/themes/images/nbeat-black-hd/00_Title_btn_press.png
new file mode 100755 (executable)
index 0000000..eb786fd
Binary files /dev/null and b/themes/images/nbeat-black-hd/00_Title_btn_press.png differ

diff --git a/themes/images/nbeat-black-hd/navibar_item_separator.png b/themes/images/nbeat-black-hd/navibar_item_separator.png
index e90f19c..5e06ea0 100644 (file)
Binary files a/themes/images/nbeat-black-hd/navibar_item_separator.png and b/themes/images/nbeat-black-hd/navibar_item_separator.png differ

diff --git a/themes/images/nbeat-black-hd/naviframe_optionheader_arrow.png b/themes/images/nbeat-black-hd/naviframe_optionheader_arrow.png
index de84372..ef7c585 100644 (file)
Binary files a/themes/images/nbeat-black-hd/naviframe_optionheader_arrow.png and b/themes/images/nbeat-black-hd/naviframe_optionheader_arrow.png differ

diff --git a/themes/images/nbeat-black/00_Title_btn.png b/themes/images/nbeat-black/00_Title_btn.png
new file mode 100755 (executable)
index 0000000..4b478e7
Binary files /dev/null and b/themes/images/nbeat-black/00_Title_btn.png differ

diff --git a/themes/images/nbeat-black/00_Title_btn_press.png b/themes/images/nbeat-black/00_Title_btn_press.png
new file mode 100755 (executable)
index 0000000..bab2373
Binary files /dev/null and b/themes/images/nbeat-black/00_Title_btn_press.png differ

diff --git a/themes/images/nbeat-hd/00_Title_btn.png b/themes/images/nbeat-hd/00_Title_btn.png
new file mode 100644 (file)
index 0000000..20d3e3b
Binary files /dev/null and b/themes/images/nbeat-hd/00_Title_btn.png differ

diff --git a/themes/images/nbeat-hd/00_Title_btn_press.png b/themes/images/nbeat-hd/00_Title_btn_press.png
new file mode 100644 (file)
index 0000000..6e364e8
Binary files /dev/null and b/themes/images/nbeat-hd/00_Title_btn_press.png differ

diff --git a/themes/images/nbeat-hd/naviframe_optionheader_arrow.png b/themes/images/nbeat-hd/naviframe_optionheader_arrow.png
index 2f1f651..f679c14 100644 (file)
Binary files a/themes/images/nbeat-hd/naviframe_optionheader_arrow.png and b/themes/images/nbeat-hd/naviframe_optionheader_arrow.png differ

diff --git a/themes/images/nbeat/00_Title_btn.png b/themes/images/nbeat/00_Title_btn.png
new file mode 100644 (file)
index 0000000..169f93c
Binary files /dev/null and b/themes/images/nbeat/00_Title_btn.png differ

diff --git a/themes/images/nbeat/00_Title_btn_press.png b/themes/images/nbeat/00_Title_btn_press.png
new file mode 100644 (file)
index 0000000..57030f3
Binary files /dev/null and b/themes/images/nbeat/00_Title_btn_press.png differ

diff --git a/themes/inc/nbeat-black-hd-inc.edc b/themes/inc/nbeat-black-hd-inc.edc
index 80e1367..7e9c739 100644 (file)
--- a/themes/inc/nbeat-black-hd-inc.edc
+++ b/themes/inc/nbeat-black-hd-inc.edc
@@ -32,23 +32,26 @@
 #define LAYOUT_INDICATOR_HEIGHT_INC 50
 #define LAYOUT_INDICATOR_COLOR_INC 0 0 0 255
 
-#define NAVIFRAME_TITLE_H_INC 90
-#define NAVIFRAME_OH_CLOSED_H_INC 8
+#define NAVIFRAME_TITLE_H_INC 100
+#define NAVIFRAME_SEGMENT_TITLE_H_INC 136
 #define NAVIFRAME_OH_OPENED_H_INC 106
 #define NAVIFRAME_OH_CONTENT_H_INC 74
 #define NAVIFRAME_OH_PADDING_INC 16
+#define NAVIFRAME_OH_ARROW_SIZE_INC 19 12
 #define NAVIFRAME_OH_OPENED_DOUBLE_H_INC 196
-#define NAVIFRAME_OH_SHADOW_H_INC 0
-#define NAVIFRAME_INDICATOR_W_INC 128
-#define NAVIFRAME_PADDING_EXPANDED_INC 160
+#define NAVIFRAME_PREV_BTN_W_INC 124
+#define NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 10
+#define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 124 80
+#define NAVIFRAME_TITLE_SEGMENT_H_INC 74
+#define NAVIFRAME_TITLE_SEGMENT_FONT_SIZE_INC 28
+#define NAVIFRAME_TITLE_SEGMENT_TEXT_H_INC 50
 #define NAVIFRAME_TITLE_FONT_SIZE_INC 36
 #define NAVIFRAME_ICON_SIZE_INC 32 32
 #define NAVIFRAME_ICON_PADDING_INC 16 0
-#define NAVIFRAME_OH_ARROW_SIZE_INC 19 14
+#define NAVIFRAME_CONTROLBAR_PADDING_INC 5
+#define NAVIFRAME_CONTROLBAR_BG_COLOR_INC 37 48 54 255
 #define NAVIFRAME_TITLE_TEXT_COLOR_INC 235 236 237 255
 #define NAVIFRAME_TITLE_BG_COLOR_INC 50 65 74 255
-#define NAVIFRAME_TITLE_LEFT_SEPARATOR_COLOR_INC 0 15 30 255
-#define NAVIFRAME_TITLE_RIGHT_SEPARATOR_COLOR_INC 69 87 94 255
 
 #define NAVIBAR_TITLE_TEXT_COLOR_INC 235 236 237 255
 #define NAVIBAR_TITLE_BG_COLOR_INC 50 65 74 255
@@ -371,6 +374,11 @@
 #define BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC 249 249 249 255
 #define BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC 108 115 118 255
 
+#define BUTTON_TEXT_NAVIFRAME_NORMAL_COLOR_INC 211 211 211 255
+#define BUTTON_TEXT_NAVIFRAME_PRESSED_COLOR_INC 249 249 249 255
+#define BUTTON_TEXT_NAVIFRAME_FOCUSED_COLOR_INC 249 249 249 255
+#define BUTTON_TEXT_NAVIFRAME_DISABLED_COLOR_INC 211 211 211 255
+
 #define BUTTON_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC 255 255 255 255
 #define BUTTON_POPUP_BUTTON_TEXT_PRESSED_COLOR_INC 255 255 255 255
 #define BUTTON_POPUP_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 255
@@ -520,6 +528,18 @@
 #define BUTTON_NAVIBAR_RIGHT_SWALLOW_ICONONLY_MIN_MAX_INC 38 38
 #define BUTTON_NAVIBAR_RIGHT_TEXT_FONT_SIZE_INC 32
 
+#define BUTTON_NAVIFRAME_BG_MIN_INC 124 74
+#define BUTTON_NAVIFRAME_VISIBLE_BG_MIN_INC 124 74
+#define BUTTON_NAVIFRAME_ICONONLY_BG_MIN_INC 74 74
+#define BUTTON_NAVIFRAME_BG_BORDER_INC 5 5 5 5
+#define BUTTON_NAVIFRAME_PADDING_MIN_INC 5 5
+#define BUTTON_NAVIFRAME_VISIBLE_ICON_RECT_MIN_MAX_INC 38 38
+#define BUTTON_NAVIFRAME_VISIBLE_PADDING_ICON_TEXT_MIN_INC 10 0
+#define BUTTON_NAVIFRAME_VISIBLE_ICON_MIN_MAX_INC 38 38
+#define BUTTON_NAVIFRAME_ICONONLY_ICON_MIN_MAX_INC 38 38
+#define BUTTON_TEXT_NAVIFRAME_FONT_SIZE_INC 28
+#define BUTTON_NAVIFRAME_TITLE_BUTTON_MIN_INC 124 74
+
 #define BUTTON_TICKERNOTI_BG_MIN_INC 54 54
 #define BUTTON_TICKERNOTI_VISIBLE_BG_MIN_INC 62 34
 #define BUTTON_TICKERNOTI_ICONONLY_BG_MIN_INC 54 54

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index c4e840e..3052bb6 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -33,21 +33,25 @@
 #define LAYOUT_INDICATOR_COLOR_INC 0 0 0 255
 
 #define NAVIFRAME_TITLE_H_INC 50
-#define NAVIFRAME_OH_CLOSED_H_INC 5
-#define NAVIFRAME_OH_OPENED_H_INC 65
+#define NAVIFRAME_SEGMENT_TITLE_H_INC 89
+#define NAVIFRAME_OH_OPENED_H_INC 70
 #define NAVIFRAME_OH_CONTENT_H_INC 45
 #define NAVIFRAME_OH_PADDING_INC 10
+#define NAVIFRAME_OH_ARROW_SIZE_INC 12 8
 #define NAVIFRAME_OH_OPENED_DOUBLE_H_INC 120
-#define NAVIFRAME_INDICATOR_W_INC 80
-#define NAVIFRAME_PADDING_EXPANDED_INC 102
-#define NAVIFRAME_TITLE_FONT_SIZE_INC 22
+#define NAVIFRAME_PREV_BTN_W_INC 82
+#define NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 6
+#define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 82 53
+#define NAVIFRAME_TITLE_SEGMENT_H_INC 49
+#define NAVIFRAME_TITLE_SEGMENT_FONT_SIZE_INC 18
+#define NAVIFRAME_TITLE_SEGMENT_TEXT_H_INC 33
+#define NAVIFRAME_TITLE_FONT_SIZE_INC 24
 #define NAVIFRAME_ICON_SIZE_INC 20 20
 #define NAVIFRAME_ICON_PADDING_INC 10 0
-#define NAVIFRAME_OH_ARROW_SIZE_INC 15 11
-#define NAVIFRAME_TITLE_TEXT_COLOR_INC 235 236 237 255
-#define NAVIFRAME_TITLE_BG_COLOR_INC 50 65 74 255
-#define NAVIFRAME_TITLE_LEFT_SEPARATOR_COLOR_INC 0 15 30 255
-#define NAVIFRAME_TITLE_RIGHT_SEPARATOR_COLOR_INC 69 87 94 255
+#define NAVIFRAME_CONTROLBAR_PADDING_INC 3
+#define NAVIFRAME_CONTROLBAR_BG_COLOR_INC 31 31 31 255
+#define NAVIFRAME_TITLE_TEXT_COLOR_INC 249 249 249 255
+#define NAVIFRAME_TITLE_BG_COLOR_INC 108 108 108 255
 
 #define NAVIBAR_TITLE_TEXT_COLOR_INC 235 236 237 255
 #define NAVIBAR_TITLE_BG_COLOR_INC 50 65 74 255
@@ -356,6 +360,11 @@
 #define BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC 249 249 249 255
 #define BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC 108 115 118 255
 
+#define BUTTON_TEXT_NAVIFRAME_NORMAL_COLOR_INC 249 249 249 255
+#define BUTTON_TEXT_NAVIFRAME_PRESSED_COLOR_INC 249 249 249 255
+#define BUTTON_TEXT_NAVIFRAME_FOCUSED_COLOR_INC 249 249 249 255
+#define BUTTON_TEXT_NAVIFRAME_DISABLED_COLOR_INC 108 115 118 255
+
 #define BUTTON_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC 255 255 255 255
 #define BUTTON_POPUP_BUTTON_TEXT_PRESSED_COLOR_INC 255 255 255 255
 #define BUTTON_POPUP_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 255
@@ -505,6 +514,18 @@
 #define BUTTON_NAVIBAR_RIGHT_SWALLOW_ICONONLY_MIN_MAX_INC 30 30
 #define BUTTON_NAVIBAR_RIGHT_TEXT_FONT_SIZE_INC 20
 
+#define BUTTON_NAVIFRAME_BG_MIN_INC 100 42
+#define BUTTON_NAVIFRAME_VISIBLE_BG_MIN_INC 100 42
+#define BUTTON_NAVIFRAME_ICONONLY_BG_MIN_INC 42 42
+#define BUTTON_NAVIFRAME_BG_BORDER_INC 4 4 3 3
+#define BUTTON_NAVIFRAME_PADDING_MIN_INC 5 5
+#define BUTTON_NAVIFRAME_VISIBLE_ICON_RECT_MIN_MAX_INC 24 24
+#define BUTTON_NAVIFRAME_VISIBLE_PADDING_ICON_TEXT_MIN_INC 8 0
+#define BUTTON_NAVIFRAME_VISIBLE_ICON_MIN_MAX_INC 24 24
+#define BUTTON_NAVIFRAME_ICONONLY_ICON_MIN_MAX_INC 30 30
+#define BUTTON_TEXT_NAVIFRAME_FONT_SIZE_INC 20
+#define BUTTON_NAVIFRAME_TITLE_BUTTON_MIN_INC 100 42
+
 #define BUTTON_TICKERNOTI_BG_MIN_INC 34 34
 #define BUTTON_TICKERNOTI_VISIBLE_BG_MIN_INC 42 34
 #define BUTTON_TICKERNOTI_ICONONLY_BG_MIN_INC 34 34

diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index 20589eb..df4ccf5 100644 (file)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -32,22 +32,26 @@
 #define LAYOUT_INDICATOR_HEIGHT_INC 50
 #define LAYOUT_INDICATOR_COLOR_INC 0 0 0 255
 
-#define NAVIFRAME_TITLE_H_INC 90
-#define NAVIFRAME_OH_CLOSED_H_INC 8
+#define NAVIFRAME_TITLE_H_INC 100
+#define NAVIFRAME_SEGMENT_TITLE_H_INC 136
 #define NAVIFRAME_OH_OPENED_H_INC 106
 #define NAVIFRAME_OH_CONTENT_H_INC 74
 #define NAVIFRAME_OH_PADDING_INC 16
+#define NAVIFRAME_OH_ARROW_SIZE_INC 19 14
 #define NAVIFRAME_OH_OPENED_DOUBLE_H_INC 196
-#define NAVIFRAME_INDICATOR_W_INC 128
-#define NAVIFRAME_PADDING_EXPANDED_INC 160
+#define NAVIFRAME_PREV_BTN_W_INC 124
+#define NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 10
+#define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 124 80
+#define NAVIFRAME_TITLE_SEGMENT_H_INC 74
+#define NAVIFRAME_TITLE_SEGMENT_FONT_SIZE_INC 28
+#define NAVIFRAME_TITLE_SEGMENT_TEXT_H_INC 50
 #define NAVIFRAME_TITLE_FONT_SIZE_INC 36
 #define NAVIFRAME_ICON_SIZE_INC 32 32
 #define NAVIFRAME_ICON_PADDING_INC 16 0
-#define NAVIFRAME_OH_ARROW_SIZE_INC 19 14
+#define NAVIFRAME_CONTROLBAR_PADDING_INC 5
+#define NAVIFRAME_CONTROLBAR_BG_COLOR_INC 100 85 66 255
 #define NAVIFRAME_TITLE_TEXT_COLOR_INC 73 44 7 255
 #define NAVIFRAME_TITLE_BG_COLOR_INC 219 201 174 255
-#define NAVIFRAME_TITLE_LEFT_SEPARATOR_COLOR_INC 164 151 130 255
-#define NAVIFRAME_TITLE_RIGHT_SEPARATOR_COLOR_INC 238 223 194 255
 
 #define NAVIBAR_TITLE_TEXT_COLOR_INC 73 44 7 255
 #define NAVIBAR_TITLE_BG_COLOR_INC 219 201 174 255
@@ -380,6 +384,11 @@
 #define BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC 255 255 255 255
 #define BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC 185 185 185 255
 
+#define BUTTON_TEXT_NAVIFRAME_NORMAL_COLOR_INC 78 73 69 255
+#define BUTTON_TEXT_NAVIFRAME_PRESSED_COLOR_INC 255 255 255 255
+#define BUTTON_TEXT_NAVIFRAME_FOCUSED_COLOR_INC 255 255 255 255
+#define BUTTON_TEXT_NAVIFRAME_DISABLED_COLOR_INC 185 185 185 255
+
 #define BUTTON_ICON_TEXT_NORMAL_COLOR_INC 90 73 40 255
 #define BUTTON_ICON_TEXT_PRESSED_COLOR_INC 255 255 255 255
 #define BUTTON_ICON_TEXT_FOCUSED_COLOR_INC 255 255 255 255
@@ -534,6 +543,18 @@
 #define BUTTON_NAVIBAR_RIGHT_SWALLOW_ICONONLY_MIN_MAX_INC 38 38
 #define BUTTON_NAVIBAR_RIGHT_TEXT_FONT_SIZE_INC 32
 
+#define BUTTON_NAVIFRAME_BG_MIN_INC 124 74
+#define BUTTON_NAVIFRAME_VISIBLE_BG_MIN_INC 124 74
+#define BUTTON_NAVIFRAME_ICONONLY_BG_MIN_INC 74 74
+#define BUTTON_NAVIFRAME_BG_BORDER_INC 5 5 5 5
+#define BUTTON_NAVIFRAME_PADDING_MIN_INC 5 5
+#define BUTTON_NAVIFRAME_VISIBLE_ICON_RECT_MIN_MAX_INC 38 38
+#define BUTTON_NAVIFRAME_VISIBLE_PADDING_ICON_TEXT_MIN_INC 10 0
+#define BUTTON_NAVIFRAME_VISIBLE_ICON_MIN_MAX_INC 38 38
+#define BUTTON_NAVIFRAME_ICONONLY_ICON_MIN_MAX_INC 38 38
+#define BUTTON_TEXT_NAVIFRAME_FONT_SIZE_INC 28
+#define BUTTON_NAVIFRAME_TITLE_BUTTON_MIN_INC 124 74
+
 #define BUTTON_TICKERNOTI_BG_MIN_INC 54 54
 #define BUTTON_TICKERNOTI_VISIBLE_BG_MIN_INC 62 34
 #define BUTTON_TICKERNOTI_ICONONLY_BG_MIN_INC 54 54

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index f75c1e4..4274c56 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -32,22 +32,26 @@
 #define LAYOUT_INDICATOR_HEIGHT_INC 34
 #define LAYOUT_INDICATOR_COLOR_INC 0 0 0 255
 
-#define NAVIFRAME_TITLE_H_INC 50
-#define NAVIFRAME_OH_CLOSED_H_INC 5
-#define NAVIFRAME_OH_OPENED_H_INC 65
-#define NAVIFRAME_OH_CONTENT_H_INC 45
+#define NAVIFRAME_TITLE_H_INC 67
+#define NAVIFRAME_SEGMENT_TITLE_H_INC 91
+#define NAVIFRAME_OH_OPENED_H_INC 71
+#define NAVIFRAME_OH_CONTENT_H_INC 49
 #define NAVIFRAME_OH_PADDING_INC 10
-#define NAVIFRAME_OH_OPENED_DOUBLE_H_INC 120
-#define NAVIFRAME_INDICATOR_W_INC 80
-#define NAVIFRAME_PADDING_EXPANDED_INC 102
-#define NAVIFRAME_TITLE_FONT_SIZE_INC 22
-#define NAVIFRAME_ICON_SIZE_INC 20 20
+#define NAVIFRAME_OH_ARROW_SIZE_INC 12 9
+#define NAVIFRAME_OH_OPENED_DOUBLE_H_INC 131
+#define NAVIFRAME_PREV_BTN_W_INC 83
+#define NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 6
+#define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 50 53
+#define NAVIFRAME_TITLE_SEGMENT_H_INC 49
+#define NAVIFRAME_TITLE_SEGMENT_FONT_SIZE_INC 18
+#define NAVIFRAME_TITLE_SEGMENT_TEXT_H_INC 33
+#define NAVIFRAME_TITLE_FONT_SIZE_INC 24
+#define NAVIFRAME_ICON_SIZE_INC 21 21
 #define NAVIFRAME_ICON_PADDING_INC 10 0
-#define NAVIFRAME_OH_ARROW_SIZE_INC 15 11
+#define NAVIFRAME_CONTROLBAR_PADDING_INC 3
+#define NAVIFRAME_CONTROLBAR_BG_COLOR_INC 100 85 66 255
 #define NAVIFRAME_TITLE_TEXT_COLOR_INC 73 44 7 255
 #define NAVIFRAME_TITLE_BG_COLOR_INC 219 201 174 255
-#define NAVIFRAME_TITLE_LEFT_SEPARATOR_COLOR_INC 164 151 130 255
-#define NAVIFRAME_TITLE_RIGHT_SEPARATOR_COLOR_INC 238 223 194 255
 
 #define NAVIBAR_TITLE_TEXT_COLOR_INC 73 44 7 255
 #define NAVIBAR_TITLE_BG_COLOR_INC 219 201 174 255
@@ -380,6 +384,11 @@
 #define BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC 255 255 255 255
 #define BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC 185 185 185 255
 
+#define BUTTON_TEXT_NAVIFRAME_NORMAL_COLOR_INC 78 73 69 255
+#define BUTTON_TEXT_NAVIFRAME_PRESSED_COLOR_INC 255 255 255 255
+#define BUTTON_TEXT_NAVIFRAME_FOCUSED_COLOR_INC 255 255 255 255
+#define BUTTON_TEXT_NAVIFRAME_DISABLED_COLOR_INC 185 185 185 255
+
 #define BUTTON_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC 53 45 39 255
 #define BUTTON_POPUP_BUTTON_TEXT_PRESSED_COLOR_INC 255 255 255 255
 #define BUTTON_POPUP_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 255
@@ -529,6 +538,18 @@
 #define BUTTON_NAVIBAR_RIGHT_SWALLOW_ICONONLY_MIN_MAX_INC 30 30
 #define BUTTON_NAVIBAR_RIGHT_TEXT_FONT_SIZE_INC 20
 
+#define BUTTON_NAVIFRAME_BG_MIN_INC 100 42
+#define BUTTON_NAVIFRAME_VISIBLE_BG_MIN_INC 100 42
+#define BUTTON_NAVIFRAME_ICONONLY_BG_MIN_INC 42 42
+#define BUTTON_NAVIFRAME_BG_BORDER_INC 4 4 3 3
+#define BUTTON_NAVIFRAME_PADDING_MIN_INC 5 5
+#define BUTTON_NAVIFRAME_VISIBLE_ICON_RECT_MIN_MAX_INC 24 24
+#define BUTTON_NAVIFRAME_VISIBLE_PADDING_ICON_TEXT_MIN_INC 8 0
+#define BUTTON_NAVIFRAME_VISIBLE_ICON_MIN_MAX_INC 24 24
+#define BUTTON_NAVIFRAME_ICONONLY_ICON_MIN_MAX_INC 30 30
+#define BUTTON_TEXT_NAVIFRAME_FONT_SIZE_INC 20
+#define BUTTON_NAVIFRAME_TITLE_BUTTON_MIN_INC 100 42
+
 #define BUTTON_TICKERNOTI_BG_MIN_INC 34 34
 #define BUTTON_TICKERNOTI_VISIBLE_BG_MIN_INC 42 34
 #define BUTTON_TICKERNOTI_ICONONLY_BG_MIN_INC 34 34