[Merge conflict resolved]

[Naviframe, Search, Progressbar]: GUIv1.5 changes.
Change-Id: I69b3d57d7514798f31f85edfa67d65baea943c9a

diff --git a/themes/images/tizen-black-hd/00_winset_title_line.png b/themes/images/tizen-black-hd/00_winset_title_line.png
new file mode 100644 (file)
index 0000000..2be73aa
Binary files /dev/null and b/themes/images/tizen-black-hd/00_winset_title_line.png differ

diff --git a/themes/images/tizen-hd/00_winset_title_line.png b/themes/images/tizen-hd/00_winset_title_line.png
new file mode 100644 (file)
index 0000000..2be73aa
Binary files /dev/null and b/themes/images/tizen-hd/00_winset_title_line.png differ

diff --git a/themes/inc/tizen-black-hd-inc.edc b/themes/inc/tizen-black-hd-inc.edc
index dea27ac..337cdc8 100644 (file)
--- a/themes/inc/tizen-black-hd-inc.edc
+++ b/themes/inc/tizen-black-hd-inc.edc
@@ -27,28 +27,29 @@
 #define LAYOUT_INDICATOR_HEIGHT_INC 50
 #define LAYOUT_INDICATOR_COLOR_INC 0 0 0 255
 
-#define NAVIFRAME_TITLE_H_INC 100
-#define NAVIFRAME_SEGMENT_TITLE_H_INC 136
+#define NAVIFRAME_TITLE_H_INC 108
+#define NAVIFRAME_SEGMENT_TITLE_H_INC 124
 #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_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_PREV_BTN_BG_SIZE_INC 144
 #define NAVIFRAME_TEXT_PADDING_INC 144
 #define NAVIFRAME_NO_BUTTON_ICON_PADDING_INC 52
 #define NAVIFRAME_TEXT_PADDING_ICON_VISIBLE_INC 186
-#define NAVIFRAME_TITLE_SEGMENT_H_INC 74
-#define NAVIFRAME_TITLE_SEGMENT_FONT_SIZE_INC 28
+#define NAVIFRAME_TITLE_SEGMENT_H_INC 64
+#define NAVIFRAME_TITLE_SEGMENT_FONT_SIZE_INC 32
 #define NAVIFRAME_TITLE_SEGMENT_TEXT_H_INC 50
-#define NAVIFRAME_TITLE_FONT_SIZE_INC 36
+#define NAVIFRAME_TITLE_FONT_SIZE_INC 40
+#define NAVIFRAME_SUBTITLE_FONT_SIZE_INC 32
 #define NAVIFRAME_ICON_SIZE_INC 32 32
 #define NAVIFRAME_ICON_PADDING_INC 16 0
 #define NAVIFRAME_CONTROLBAR_BG_COLOR_INC 37 48 54 255
 #define NAVIFRAME_TITLE_TEXT_COLOR_INC 235 236 237 255
+#define NAVIFRAME_SUBTITLE_TEXT_COLOR_INC 235 236 237 255
 #define NAVIFRAME_TITLE_BG_COLOR_INC 50 65 74 255
 #define NAVIFRAME_OH_BORDER_INC 0 0 4 0
 

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 61f4065..9d6ae4a 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -27,28 +27,29 @@
 #define LAYOUT_INDICATOR_HEIGHT_INC 50
 #define LAYOUT_INDICATOR_COLOR_INC 0 0 0 255
 
-#define NAVIFRAME_TITLE_H_INC 100
-#define NAVIFRAME_SEGMENT_TITLE_H_INC 136
+#define NAVIFRAME_TITLE_H_INC 108
+#define NAVIFRAME_SEGMENT_TITLE_H_INC 124
 #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_ARROW_SIZE_INC 19 12
 #define NAVIFRAME_OH_OPENED_DOUBLE_H_INC 196
 #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_PREV_BTN_BG_SIZE_INC 144
 #define NAVIFRAME_TEXT_PADDING_INC 144
 #define NAVIFRAME_NO_BUTTON_ICON_PADDING_INC 52
 #define NAVIFRAME_TEXT_PADDING_ICON_VISIBLE_INC 186
-#define NAVIFRAME_TITLE_SEGMENT_H_INC 74
-#define NAVIFRAME_TITLE_SEGMENT_FONT_SIZE_INC 28
+#define NAVIFRAME_TITLE_SEGMENT_H_INC 64
+#define NAVIFRAME_TITLE_SEGMENT_FONT_SIZE_INC 32
 #define NAVIFRAME_TITLE_SEGMENT_TEXT_H_INC 50
-#define NAVIFRAME_TITLE_FONT_SIZE_INC 36
+#define NAVIFRAME_TITLE_FONT_SIZE_INC 40
+#define NAVIFRAME_SUBTITLE_FONT_SIZE_INC 32
 #define NAVIFRAME_ICON_SIZE_INC 32 32
 #define NAVIFRAME_ICON_PADDING_INC 16 0
 #define NAVIFRAME_CONTROLBAR_BG_COLOR_INC 100 85 66 255
 #define NAVIFRAME_TITLE_TEXT_COLOR_INC 73 44 7 255
+#define NAVIFRAME_SUBTITLE_TEXT_COLOR_INC 73 44 7 255
 #define NAVIFRAME_TITLE_BG_COLOR_INC 219 201 174 255
 #define NAVIFRAME_OH_BORDER_INC 0 0 4 0
 

diff --git a/themes/widgets/layout.edc b/themes/widgets/layout.edc
index 02da240..52010dd 100644 (file)
--- a/themes/widgets/layout.edc
+++ b/themes/widgets/layout.edc
@@ -200,82 +200,6 @@
          }
       }
    }
-   /*************************************************/
-   /* elm_layout -> searchbar style                 */
-   /* Below style will be deprecated soon           */
-   /*************************************************/
-   group { name: "elm/layout/application/searchbar";
-      parts {
-         part { name: "elm.swallow.bg";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-            }
-         }
-         part { name: "searchbar";
-            type: EXTERNAL;
-            source: "elm/searchbar";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 SEARCHBAR_H_INC;
-               fixed: 0 1;
-               align: 0.0 1.0;
-               rel2 {
-                  relative: 1.0 0.0;
-               }
-               params {
-                  //string: "label" "my test";
-                  bool: "cancel_button_animation" "1";
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               align: 0.0 0.0;
-            }
-         }
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to: "searchbar";
-               }
-            }
-         }
-      }
-      programs {
-         program { name: "show_searchbar";
-            signal: "elm,state,show,searchbar";
-            source: "elm";
-            action: STATE_SET "visible" 0.0;
-            target: "searchbar";
-         }
-         program { name: "show_searchbar_with_animation";
-            signal: "elm,state,show,searchbar,animation";
-            source: "elm";
-            action: STATE_SET "visible" 0.0;
-            transition: DECELERATE 0.3;
-            target: "searchbar";
-         }
-         program { name: "hide_searchbar";
-            signal: "elm,state,hide,searchbar";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "searchbar";
-         }
-         program { name: "hide_searchbar_with_animation";
-            signal: "elm,state,hide,searchbar,animation";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            transition: ACCELERATE 0.3;
-            target: "searchbar";
-         }
-      }
-   }
 
    /*************************************************/
    /* elm_layout -> searchbar style                 */

diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc
index 018ede4..f9ddc52 100644 (file)
--- a/themes/widgets/naviframe.edc
+++ b/themes/widgets/naviframe.edc
@@ -31,6 +31,7 @@
       images {
           image: "00_winset_control_top_bg.png" COMP;
           image: "00_winset_control_top_arrow.png" COMP;
+          image: "00_winset_title_line.png" COMP;
       }
       script {
          public oh_show = 0;     //optionheader show/hide
@@ -41,6 +42,7 @@
          public right_btn_visible = 0; //whether right btn is shown
          public more_btn_visible = 0; //whether more btn is shown
          public large_padded_center_align = 0; //large padding based on button size for center align for 1/2 buttons.
+         public subtitle_visible = 0; //whether subtitle is shown
       }
       parts {
          part { name: "base";
@@ -182,76 +184,58 @@
                rel2.to: "elm.swallow.content";
             }
          }
-         part { name: "padding_before_left_btn";
-            type: RECT;
-            mouse_events: 0;
+         part { name: "left_btn_separator";
+            type: IMAGE;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
-               fixed: 1 0;
+               min: 4 68;
+               fixed: 1 1;
                align: 0.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "title_bg"; }
-               rel2 { relative: 0.0 1.0; to: "title_bg"; }
-               visible: 0;
-            }
-         }
-         part { name: "padding_after_left_btn";
-            type: RECT;
-            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.5;
                rel1 { relative: 1.0 0.0; to: "title_left_btn"; }
                rel2 { relative: 1.0 1.0; to: "title_left_btn"; }
+               image.normal: "00_winset_title_line.png";
                visible: 0;
             }
-         }
-         part { name: "padding_before_more_btn";
-            type: RECT;
-            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: "title_more_btn"; }
-               rel2 { relative: 0.0 1.0; to: "title_more_btn"; }
-               visible: 0;
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
-         part { name: "padding_after_right_btn";
-            type: RECT;
-            mouse_events: 0;
+         part { name: "right_btn_separator";
+            type: IMAGE;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
-               fixed: 1 0;
+               min: 4 68;
+               fixed: 1 1;
                align: 1.0 0.5;
-               rel1 { relative: 1.0 0.0; to: "title_bg"; }
-               rel2 { relative: 1.0 1.0; to: "title_bg"; }
+               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
+               image.normal: "00_winset_title_line.png";
                visible: 0;
             }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
          }
-         part { name: "padding_before_right_btn";
-            type: RECT;
-            mouse_events: 0;
+         part { name: "more_btn_separator";
+            type: IMAGE;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: 0 0;
-               fixed: 1 0;
+               min: 4 68;
+               fixed: 1 1;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
-               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
+               rel1 { relative: 0.0 0.0; to: "title_more_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_more_btn"; }
+               image.normal: "00_winset_title_line.png";
                visible: 0;
             }
-            description { state: "right_and_more_button" 0.0;
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+               visible: 1;
             }
          }
          part { name: "padding_before_text";
@@ -261,8 +245,8 @@
             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_bg"; }
-               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; to_y: "title_bg"; }
+               rel1 { relative: 0.0 0.0; to: "elm.text.title"; }
+               rel2 { relative: 0.0 1.0; to: "elm.text.title"; }
                fixed: 1 0;
                min: NAVIFRAME_ICON_PADDING_INC;
                visible: 0;
@@ -274,7 +258,7 @@
             mouse_events: 0;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+               min: 0 0;
                fixed: 1 0;
                align: 0.0 0.0;
                rel1 { relative: 0.0 0.0; to: "title_bg"; }
@@ -300,7 +284,7 @@
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+               min: 0 0;
                fixed: 1 0;
                align: 1.0 0.5;
                rel1 { relative: 1.0 0.0; to: "title_bg"; }
@@ -326,13 +310,54 @@
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                align: 0.5 0.5;
                fixed: 1 0;
-               rel1 { relative: 1.0 0.0; to: "padding_center_text1"; }
-               rel2 { relative: 0.0 1.0; to: "padding_center_text2"; }
+               rel1 { relative: 1.0 0.0; to_x: "padding_center_text1"; to_y: "title_bg"; }
+               rel2 { relative: 0.0 1.0; to_x: "padding_center_text2"; to_y: "title_bg"; }
+            }
+            description { state: "right_and_more_button" 0.0;
+               inherit: "default" 0.0;
+               rel2 { relative: 0.0 1.0; to_x: "title_more_btn"; to_y: "title_bg"; }
+            }
+            description { state: "subtitle_is_set" 0.0;
+               inherit: "default" 0.0;
+               rel2 { relative: 0.0 0.7; to_x: "padding_center_text2"; to_y: "title_bg"; }
+            }
+            description { state: "subtitle_right_more_button_is_set" 0.0;
+               inherit: "default" 0.0;
+               rel2 { relative: 0.0 0.7; to_x: "title_more_btn"; to_y: "title_bg"; }
+            }
+         }
+         part { name: "elm.text.subtitle";
+            type: TEXT;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               text { font: "SLP:style=Medium";
+                  size: NAVIFRAME_SUBTITLE_FONT_SIZE_INC;
+                  min: 0 0;
+                  max: 1 0;
+                  align: 0.5 0.5;
+               }
+               color: NAVIFRAME_SUBTITLE_TEXT_COLOR_INC;
+               align: 0.5 0.5;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_center_text1";
+                  to_y: "elm.text.title";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "padding_center_text2";
+                  to_y: "elm.text.title";
+               }
             }
             description { state: "right_and_more_button" 0.0;
                inherit: "default" 0.0;
-               rel1 { relative: 1.0 0.0; to: "padding_after_left_btn"; }
-               rel2 { relative: 0.0 1.0; to: "padding_before_more_btn"; }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "title_more_btn";
+                  to_y: "elm.text.title";
+               }
             }
          }
          part { name: "elm.swallow.icon";
@@ -365,8 +390,8 @@
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                fixed: 1 1;
                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"; }
+               rel1 { relative: 0.0 0.0; to: "title_bg"; }
+               rel2 { relative: 0.0 1.0; to: "title_bg"; }
             }
          }
          part { name: "title_right_btn";
@@ -377,8 +402,8 @@
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                align: 1 0.5;
                fixed: 1 1;
-               rel1 { relative: 0.0 0.0; to: "padding_after_right_btn"; }
-               rel2 { relative: 0.0 1.0; to: "padding_after_right_btn"; }
+               rel1 { relative: 1.0 0.0; to: "title_bg"; }
+               rel2 { relative: 1.0 1.0; to: "title_bg"; }
             }
          }
          part { name: "title_more_btn";
@@ -389,8 +414,8 @@
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                fixed: 1 1;
                align: 1 0.5;
-               rel1 { relative: 0.0 0.0; to: "padding_before_right_btn"; }
-               rel2 { relative: 0.0 1.0; to: "padding_before_right_btn"; }
+               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
             }
          }
          part { name: "optionheader_arrow";
@@ -588,17 +613,44 @@
                set_state(PART:"elm.prev_btn_bg", "default", 0.0);
             }
          }
+         program { name: "subtitle_show";
+            signal: "elm,state,subtitle,show";
+            source: "elm";
+            script {
+               set_int(subtitle_visible, 1);
+               if (get_int(large_padded_center_align) == 0)
+                 set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+               else
+                 set_state(PART:"elm.text.title", "subtitle_is_set", 0.0);
+            }
+         }
+         program { name: "subtitle_hide";
+            signal: "elm,state,subtitle,hide";
+            source: "elm";
+            script {
+               set_int(subtitle_visible, 0);
+               if (get_int(large_padded_center_align) == 0)
+                 set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+               else
+                 set_state(PART:"elm.text.title", "default", 0.0);
+            }
+         }
          program { name: "left_btn_show";
             signal: "elm,state,title_left_btn,show";
             source: "elm";
             script {
                set_int(left_btn_visible, 1);
+               set_state(PART:"left_btn_separator", "visible", 0.0);
                if (get_int(icon_visible) == 1)
                  set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
                else
                  set_state(PART:"padding_center_text1", "visible", 0.0);
                if ((get_int(more_btn_visible) == 1) && (get_int(right_btn_visible) == 1)) {
-                  set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+                  if (get_int(subtitle_visible) == 1)
+                    set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+                  else
+                    set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+                  set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
                   set_int(large_padded_center_align, 0);
                }
                else {
@@ -612,6 +664,7 @@
             source: "elm";
             script {
                set_int(left_btn_visible, 0);
+               set_state(PART:"left_btn_separator", "default", 0.0);
                if ((get_int(more_btn_visible) == 0) && (get_int(right_btn_visible) == 0)) {
                   set_state(PART:"padding_center_text2", "default", 0.0);
                   set_int(large_padded_center_align, 0);
@@ -635,9 +688,13 @@
             source: "elm";
             script {
                set_int(right_btn_visible, 1);
+               set_state(PART:"right_btn_separator", "visible", 0.0);
                if (get_int(more_btn_visible) == 1) {
-                  set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
-                  set_state(PART:"padding_before_right_btn", "right_and_more_button", 0.0);
+                  if (get_int(subtitle_visible) == 1)
+                    set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+                  else
+                    set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+                  set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
                   set_int(large_padded_center_align, 0);
                }
                else {
@@ -660,7 +717,7 @@
             source: "elm";
             script {
                set_int(right_btn_visible, 0);
-               set_state(PART:"padding_before_right_btn", "default", 0.0);
+               set_state(PART:"right_btn_separator", "default", 0.0);
                if ((get_int(more_btn_visible) == 0) && (get_int(left_btn_visible) == 0)) {
                   set_state(PART:"padding_center_text2", "default", 0.0);
                   set_int(large_padded_center_align, 0);
@@ -684,9 +741,13 @@
             source: "elm";
             script {
                set_int(more_btn_visible, 1);
+               set_state(PART:"more_btn_separator", "visible", 0.0);
                if (get_int(right_btn_visible) == 1) {
-                  set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
-                  set_state(PART:"padding_before_right_btn", "right_and_more_button", 0.0);
+                  if (get_int(subtitle_visible) == 1)
+                    set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+                  else
+                    set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+                  set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
                   set_int(large_padded_center_align, 0);
                }
                else {
@@ -709,7 +770,7 @@
             source: "elm";
             script {
                set_int(more_btn_visible, 0);
-               set_state(PART:"padding_before_right_btn", "default", 0.0);
+               set_state(PART:"more_btn_separator", "default", 0.0);
                if ((get_int(right_btn_visible) == 0) && (get_int(left_btn_visible) == 0)) {
                   set_state(PART:"padding_center_text2", "default", 0.0);
                   set_int(large_padded_center_align, 0);
@@ -729,7 +790,7 @@
             }
          }
          program { name: "icon_show";
-            signal: "elm,state,elm.swallow.icon,show";
+            signal: "elm,state,icon,show";
             source: "elm";
             script {
                set_int(icon_visible, 1);
@@ -740,7 +801,7 @@
             }
          }
          program { name: "icon_hide";
-            signal: "elm,state,elm.swallow.icon,hide";
+            signal: "elm,state,icon,hide";
             source: "elm";
             script {
                set_int(icon_visible, 0);
@@ -899,6 +960,7 @@
       images {
          image: "00_winset_control_top_bg.png" COMP;
          image: "00_winset_control_top_arrow.png" COMP;
+         image: "00_winset_title_line.png" COMP;
       }
       script {
          public oh_show = 0;     //optionheader show/hide
@@ -909,6 +971,7 @@
          public right_btn_visible = 0; //whether right btn is shown
          public more_btn_visible = 0; //whether more btn is shown
          public large_padded_center_align = 0; //large padding based on button size for center align for 1/2 buttons.
+         public subtitle_visible = 0; //whether subtitle is shown
       }
       parts {
          part { name: "base";
@@ -1075,76 +1138,58 @@
                rel2.to: "elm.swallow.content";
             }
          }
-         part { name: "padding_before_left_btn";
-            type: RECT;
-            mouse_events: 0;
+         part { name: "left_btn_separator";
+            type: IMAGE;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
-               fixed: 1 0;
+               min: 4 68;
+               fixed: 1 1;
                align: 0.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "title_bg"; }
-               rel2 { relative: 0.0 1.0; to: "title_bg"; }
-               visible: 0;
-            }
-         }
-         part { name: "padding_after_left_btn";
-            type: RECT;
-            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.5;
                rel1 { relative: 1.0 0.0; to: "title_left_btn"; }
                rel2 { relative: 1.0 1.0; to: "title_left_btn"; }
+               image.normal: "00_winset_title_line.png";
                visible: 0;
             }
-         }
-         part { name: "padding_before_more_btn";
-            type: RECT;
-            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: "title_more_btn"; }
-               rel2 { relative: 0.0 1.0; to: "title_more_btn"; }
-               visible: 0;
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
-         part { name: "padding_after_right_btn";
-            type: RECT;
-            mouse_events: 0;
+         part { name: "right_btn_separator";
+            type: IMAGE;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
-               fixed: 1 0;
+               min: 4 68;
+               fixed: 1 1;
                align: 1.0 0.5;
-               rel1 { relative: 1.0 0.0; to: "title_bg"; }
-               rel2 { relative: 1.0 1.0; to: "title_bg"; }
+               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
+               image.normal: "00_winset_title_line.png";
                visible: 0;
             }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
          }
-         part { name: "padding_before_right_btn";
-            type: RECT;
-            mouse_events: 0;
+         part { name: "more_btn_separator";
+            type: IMAGE;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: 0 0;
-               fixed: 1 0;
+               min: 4 68;
+               fixed: 1 1;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
-               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
+               rel1 { relative: 0.0 0.0; to: "title_more_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_more_btn"; }
+               image.normal: "00_winset_title_line.png";
                visible: 0;
             }
-            description { state: "right_and_more_button" 0.0;
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+               visible: 1;
             }
          }
          part { name: "padding_before_text";
@@ -1154,8 +1199,8 @@
             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_bg"; }
-               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; to_y: "title_bg"; }
+               rel1 { relative: 0.0 0.0; to: "elm.text.title"; }
+               rel2 { relative: 0.0 1.0; to: "elm.text.title"; }
                fixed: 1 0;
                min: NAVIFRAME_ICON_PADDING_INC;
                visible: 0;
@@ -1167,7 +1212,7 @@
             mouse_events: 0;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+               min: 0 0;
                fixed: 1 0;
                align: 0.0 0.0;
                rel1 { relative: 0.0 0.0; to: "title_bg"; }
@@ -1193,7 +1238,7 @@
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+               min: 0 0;
                fixed: 1 0;
                align: 1.0 0.5;
                rel1 { relative: 1.0 0.0; to: "title_bg"; }
@@ -1219,13 +1264,54 @@
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                align: 0.5 0.5;
                fixed: 1 0;
-               rel1 { relative: 1.0 0.0; to: "padding_center_text1"; }
-               rel2 { relative: 0.0 1.0; to: "padding_center_text2"; }
+               rel1 { relative: 1.0 0.0; to_x: "padding_center_text1"; to_y: "title_bg"; }
+               rel2 { relative: 0.0 1.0; to_x: "padding_center_text2"; to_y: "title_bg"; }
+            }
+            description { state: "right_and_more_button" 0.0;
+               inherit: "default" 0.0;
+               rel2 { relative: 0.0 1.0; to_x: "title_more_btn"; to_y: "title_bg"; }
+            }
+            description { state: "subtitle_is_set" 0.0;
+               inherit: "default" 0.0;
+               rel2 { relative: 0.0 0.7; to_x: "padding_center_text2"; to_y: "title_bg"; }
+            }
+            description { state: "subtitle_right_more_button_is_set" 0.0;
+               inherit: "default" 0.0;
+               rel2 { relative: 0.0 0.7; to_x: "title_more_btn"; to_y: "title_bg"; }
+            }
+         }
+         part { name: "elm.text.subtitle";
+            type: TEXT;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               text { font: "SLP:style=Medium";
+                  size: NAVIFRAME_SUBTITLE_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;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_center_text1";
+                  to_y: "elm.text.title";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "padding_center_text2";
+                  to_y: "elm.text.title";
+               }
             }
             description { state: "right_and_more_button" 0.0;
                inherit: "default" 0.0;
-               rel1 { relative: 1.0 0.0; to: "padding_after_left_btn"; }
-               rel2 { relative: 0.0 1.0; to: "padding_before_more_btn"; }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "title_more_btn";
+                  to_y: "elm.text.title";
+               }
             }
          }
          part { name: "elm.swallow.icon";
@@ -1258,8 +1344,8 @@
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                fixed: 1 1;
                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"; }
+               rel1 { relative: 0.0 0.0; to: "title_bg"; }
+               rel2 { relative: 0.0 1.0; to: "title_bg"; }
             }
          }
          part { name: "title_right_btn";
@@ -1270,8 +1356,8 @@
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                align: 1 0.5;
                fixed: 1 1;
-               rel1 { relative: 0.0 0.0; to: "padding_after_right_btn"; }
-               rel2 { relative: 0.0 1.0; to: "padding_after_right_btn"; }
+               rel1 { relative: 1.0 0.0; to: "title_bg"; }
+               rel2 { relative: 1.0 1.0; to: "title_bg"; }
             }
          }
          part { name: "title_more_btn";
@@ -1280,10 +1366,10 @@
             clip_to: "title_clip";
             description { state: "default" 0.0;
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
-               fixed: 1 0;
+               fixed: 1 1;
                align: 1 0.5;
-               rel1 { relative: 0.0 0.0; to: "padding_before_right_btn"; }
-               rel2 { relative: 0.0 1.0; to: "padding_before_right_btn"; }
+               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
             }
          }
          part { name: "optionheader_arrow";
@@ -1328,8 +1414,8 @@
             type: RECT;
             mouse_events: 0;
             description { state: "default" 0.0;
-               rel1 { to: "controlbar_bg"; }
-               rel2 { to: "controlbar_bg"; }
+               rel1.to: "controlbar_bg";
+               rel2.to: "controlbar_bg";
             }
          }
          part { name: "elm.prev_btn_bg";
@@ -1365,6 +1451,7 @@
             scale: 1;
             clip_to: "controlbar_clip";
             description { state: "default" 0.0;
+               fixed: 1 1;
                rel1.to: "controlbar_bg";
                rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
             }
@@ -1480,17 +1567,44 @@
                set_state(PART:"elm.prev_btn_bg", "default", 0.0);
             }
          }
+         program { name: "subtitle_show";
+            signal: "elm,state,subtitle,show";
+            source: "elm";
+            script {
+               set_int(subtitle_visible, 1);
+               if (get_int(large_padded_center_align) == 0)
+                 set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+               else
+                 set_state(PART:"elm.text.title", "subtitle_is_set", 0.0);
+            }
+         }
+         program { name: "subtitle_hide";
+            signal: "elm,state,subtitle,hide";
+            source: "elm";
+            script {
+               set_int(subtitle_visible, 0);
+               if (get_int(large_padded_center_align) == 0)
+                 set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+               else
+                 set_state(PART:"elm.text.title", "default", 0.0);
+            }
+         }
          program { name: "left_btn_show";
             signal: "elm,state,title_left_btn,show";
             source: "elm";
             script {
                set_int(left_btn_visible, 1);
+               set_state(PART:"left_btn_separator", "visible", 0.0);
                if (get_int(icon_visible) == 1)
                  set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
                else
                  set_state(PART:"padding_center_text1", "visible", 0.0);
                if ((get_int(more_btn_visible) == 1) && (get_int(right_btn_visible) == 1)) {
-                  set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+                  if (get_int(subtitle_visible) == 1)
+                    set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+                  else
+                    set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+                  set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
                   set_int(large_padded_center_align, 0);
                }
                else {
@@ -1504,6 +1618,7 @@
             source: "elm";
             script {
                set_int(left_btn_visible, 0);
+               set_state(PART:"left_btn_separator", "default", 0.0);
                if ((get_int(more_btn_visible) == 0) && (get_int(right_btn_visible) == 0)) {
                   set_state(PART:"padding_center_text2", "default", 0.0);
                   set_int(large_padded_center_align, 0);
@@ -1527,9 +1642,13 @@
             source: "elm";
             script {
                set_int(right_btn_visible, 1);
+               set_state(PART:"right_btn_separator", "visible", 0.0);
                if (get_int(more_btn_visible) == 1) {
-                  set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
-                  set_state(PART:"padding_before_right_btn", "right_and_more_button", 0.0);
+                  if (get_int(subtitle_visible) == 1)
+                    set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+                  else
+                    set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+                  set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
                   set_int(large_padded_center_align, 0);
                }
                else {
@@ -1552,7 +1671,7 @@
             source: "elm";
             script {
                set_int(right_btn_visible, 0);
-               set_state(PART:"padding_before_right_btn", "default", 0.0);
+               set_state(PART:"right_btn_separator", "default", 0.0);
                if ((get_int(more_btn_visible) == 0) && (get_int(left_btn_visible) == 0)) {
                   set_state(PART:"padding_center_text2", "default", 0.0);
                   set_int(large_padded_center_align, 0);
@@ -1576,9 +1695,13 @@
             source: "elm";
             script {
                set_int(more_btn_visible, 1);
+               set_state(PART:"more_btn_separator", "visible", 0.0);
                if (get_int(right_btn_visible) == 1) {
-                  set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
-                  set_state(PART:"padding_before_right_btn", "right_and_more_button", 0.0);
+                  if (get_int(subtitle_visible) == 1)
+                    set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+                  else
+                    set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+                  set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
                   set_int(large_padded_center_align, 0);
                }
                else {
@@ -1601,7 +1724,7 @@
             source: "elm";
             script {
                set_int(more_btn_visible, 0);
-               set_state(PART:"padding_before_right_btn", "default", 0.0);
+               set_state(PART:"more_btn_separator", "default", 0.0);
                if ((get_int(right_btn_visible) == 0) && (get_int(left_btn_visible) == 0)) {
                   set_state(PART:"padding_center_text2", "default", 0.0);
                   set_int(large_padded_center_align, 0);
@@ -1621,7 +1744,7 @@
             }
          }
          program { name: "icon_show";
-            signal: "elm,state,elm.swallow.icon,show";
+            signal: "elm,state,icon,show";
             source: "elm";
             script {
                set_int(icon_visible, 1);
@@ -1632,7 +1755,7 @@
             }
          }
          program { name: "icon_hide";
-            signal: "elm,state,elm.swallow.icon,hide";
+            signal: "elm,state,icon,hide";
             source: "elm";
             script {
                set_int(icon_visible, 0);
@@ -1790,6 +1913,9 @@
       script {
          public cbar_bg = 0;     //Controlbar BG Show call count
       }
+      images {
+         image: "00_winset_title_line.png" COMP;
+      }
       parts {
          part { name: "base";
             type: RECT;
@@ -1857,64 +1983,40 @@
                rel2.to: "elm.swallow.content";
             }
          }
-         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_bg"; }
-               rel2 { relative: 0.0 1.0; to: "title_bg"; }
-               visible: 0;
-            }
-         }
-         part { name: "padding_after_left_btn";
-            type: RECT;
-            mouse_events: 0;
+         part { name: "left_btn_separator";
+            type: IMAGE;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
-               fixed: 1 0;
+               min: 4 68;
+               fixed: 1 1;
                align: 0.0 0.5;
                rel1 { relative: 1.0 0.0; to: "title_left_btn"; }
                rel2 { relative: 1.0 1.0; to: "title_left_btn"; }
+               image.normal: "00_winset_title_line.png";
                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_bg"; }
-               rel2 { relative: 1.0 1.0; to: "title_bg"; }
-               visible: 0;
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
-         part { name: "padding_before_right_btn";
-            type: RECT;
-            mouse_events: 0;
+         part { name: "right_btn_separator";
+            type: IMAGE;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: 0 0;
-               fixed: 1 0;
+               min: 4 68;
+               fixed: 1 1;
                align: 1.0 0.5;
                rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
                rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
+               image.normal: "00_winset_title_line.png";
                visible: 0;
             }
-            description { state: "show" 0.0;
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+               visible: 1;
             }
          }
          part { name: "padding_before_text";
@@ -1924,8 +2026,8 @@
             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_bg"; }
-               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; to_y: "title_bg"; }
+               rel1 { relative: 0.0 0.0; to: "elm.text.title"; }
+               rel2 { relative: 0.0 1.0; to: "elm.text.title"; }
                fixed: 1 0;
                min: NAVIFRAME_ICON_PADDING_INC;
                visible: 0;
@@ -1947,10 +2049,8 @@
                fixed: 1 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;
+               rel1.to: "title_bg";
+               rel2.to: "title_bg";
             }
          }
          part { name: "click_event_area";
@@ -1969,11 +2069,11 @@
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                fixed: 1 1;
                align: 0 0;
-               rel1.relative: 1.0 1.0;
-               rel1.to_x: "padding_before_left_btn";
+               rel1.relative: 0.0 1.0;
+               rel1.to_x: "title_bg";
                rel1.to_y: "elm.text.title";
                rel2.relative: 1.0 1.0;
-               rel2.to_x: "padding_before_left_btn";
+               rel2.to_x: "title_bg";
                rel2.to_y: "elm.text.title";
             }
          }
@@ -1985,11 +2085,10 @@
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                align: 1 0.0;
                fixed: 1 1;
-               rel1.relative: 0.0 1.0;
-               rel1.to_x: "padding_after_right_btn";
+               rel1.relative: 1.0 1.0;
+               rel1.to_x: "title_bg";
                rel1.to_y: "elm.text.title";
-               rel2.relative: 0.0 1.0;
-               rel2.to_x: "padding_after_right_btn";
+               rel2.to_x: "title_bg";
                rel2.to_y: "elm.text.title";
             }
          }
@@ -2088,6 +2187,7 @@
            scale: 1;
            clip_to: "controlbar_clip";
            description { state: "default" 0.0;
+              fixed: 1 1;
               rel1.to: "controlbar_bg";
               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
            }
@@ -2176,8 +2276,32 @@
             action: STATE_SET "hide" 0.0;
             target: "title_bg";
          }
-         program { name: "prev_btn_show";
-            signal: "elm,state,prev_btn,show";
+         program { name: "left_btn_show";
+            signal: "elm,state,title_left_btn,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "left_btn_separator";
+         }
+         program { name: "left_btn_hide";
+            signal: "elm,state,title_left_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "left_btn_separator";
+         }
+         program { name: "right_btn_show";
+            signal: "elm,state,title_right_btn,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "right_btn_separator";
+         }
+         program { name: "right_btn_hide";
+            signal: "elm,state,title_right_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "right_btn_separator";
+         }
+         program { name: "prev_btn_show";
+            signal: "elm,state,prev_btn,show";
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,show", "elm");
@@ -2375,6 +2499,7 @@
             scale: 1;
             clip_to: "controlbar_clip";
             description { state: "default" 0.0;
+               fixed: 1 1;
                rel1.to: "controlbar_bg";
                rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
             }
@@ -2552,6 +2677,7 @@
       images {
          image: "00_winset_control_top_bg.png" COMP;
          image: "00_winset_control_top_arrow.png" COMP;
+         image: "00_winset_title_line.png" COMP;
       }
       script {
          public oh_show = 0;     //optionheader show/hide
@@ -2562,6 +2688,7 @@
          public right_btn_visible = 0; //whether right btn is shown
          public more_btn_visible = 0; //whether more btn is shown
          public large_padded_center_align = 0; //large padding based on button size for center align for 1/2 buttons.
+         public subtitle_visible = 0; //whether subtitle is shown
       }
       parts {
          part { name: "title_bg";
@@ -2684,76 +2811,58 @@
                rel2.to: "elm.swallow.content";
             }
          }
-         part { name: "padding_before_left_btn";
-            type: RECT;
-            mouse_events: 0;
+         part { name: "left_btn_separator";
+            type: IMAGE;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
-               fixed: 1 0;
+               min: 4 68;
+               fixed: 1 1;
                align: 0.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "title_bg"; }
-               rel2 { relative: 0.0 1.0; to: "title_bg"; }
-               visible: 0;
-            }
-         }
-         part { name: "padding_after_left_btn";
-            type: RECT;
-            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.5;
                rel1 { relative: 1.0 0.0; to: "title_left_btn"; }
                rel2 { relative: 1.0 1.0; to: "title_left_btn"; }
+               image.normal: "00_winset_title_line.png";
                visible: 0;
             }
-         }
-         part { name: "padding_before_more_btn";
-            type: RECT;
-            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: "title_more_btn"; }
-               rel2 { relative: 0.0 1.0; to: "title_more_btn"; }
-               visible: 0;
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
-         part { name: "padding_after_right_btn";
-            type: RECT;
-            mouse_events: 0;
+         part { name: "right_btn_separator";
+            type: IMAGE;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
-               fixed: 1 0;
+               min: 4 68;
+               fixed: 1 1;
                align: 1.0 0.5;
-               rel1 { relative: 1.0 0.0; to: "title_bg"; }
-               rel2 { relative: 1.0 1.0; to: "title_bg"; }
+               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
+               image.normal: "00_winset_title_line.png";
                visible: 0;
             }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
          }
-         part { name: "padding_before_right_btn";
-            type: RECT;
-            mouse_events: 0;
+         part { name: "more_btn_separator";
+            type: IMAGE;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: 0 0;
-               fixed: 1 0;
+               min: 4 68;
+               fixed: 1 1;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
-               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
+               rel1 { relative: 0.0 0.0; to: "title_more_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_more_btn"; }
+               image.normal: "00_winset_title_line.png";
                visible: 0;
             }
-            description { state: "right_and_more_button" 0.0;
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+               visible: 1;
             }
          }
          part { name: "padding_before_text";
@@ -2763,8 +2872,8 @@
             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_bg"; }
-               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; to_y: "title_bg"; }
+               rel1 { relative: 0.0 0.0; to: "elm.text.title"; }
+               rel2 { relative: 0.0 1.0; to: "elm.text.title"; }
                fixed: 1 0;
                min: NAVIFRAME_ICON_PADDING_INC;
                visible: 0;
@@ -2776,7 +2885,7 @@
             mouse_events: 0;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+               min: 0 0;
                fixed: 1 0;
                align: 0.0 0.0;
                rel1 { relative: 0.0 0.0; to: "title_bg"; }
@@ -2802,7 +2911,7 @@
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+               min: 0 0;
                fixed: 1 0;
                align: 1.0 0.5;
                rel1 { relative: 1.0 0.0; to: "title_bg"; }
@@ -2828,13 +2937,54 @@
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                align: 0.5 0.5;
                fixed: 1 0;
-               rel1 { relative: 1.0 0.0; to: "padding_center_text1"; }
-               rel2 { relative: 0.0 1.0; to: "padding_center_text2"; }
+               rel1 { relative: 1.0 0.0; to_x: "padding_center_text1"; to_y: "title_bg"; }
+               rel2 { relative: 0.0 1.0; to_x: "padding_center_text2"; to_y: "title_bg"; }
             }
             description { state: "right_and_more_button" 0.0;
                inherit: "default" 0.0;
-               rel1 { relative: 1.0 0.0; to: "padding_after_left_btn"; }
-               rel2 { relative: 0.0 1.0; to: "padding_before_more_btn"; }
+               rel2 { relative: 0.0 1.0; to_x: "title_more_btn"; to_y: "title_bg"; }
+            }
+            description { state: "subtitle_is_set" 0.0;
+               inherit: "default" 0.0;
+               rel2 { relative: 0.0 0.7; to_x: "padding_center_text2"; to_y: "title_bg"; }
+            }
+            description { state: "subtitle_right_more_button_is_set" 0.0;
+               inherit: "default" 0.0;
+               rel2 { relative: 0.0 0.7; to_x: "title_more_btn"; to_y: "title_bg"; }
+            }
+         }
+         part { name: "elm.text.subtitle";
+            type: TEXT;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               text { font: "SLP:style=Medium";
+                  size: NAVIFRAME_SUBTITLE_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;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_center_text1";
+                  to_y: "elm.text.title";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "padding_center_text2";
+                  to_y: "elm.text.title";
+               }
+            }
+            description { state: "right_and_more_button" 0.0;
+               inherit: "default" 0.0;
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "title_more_btn";
+                  to_y: "elm.text.title";
+               }
             }
          }
          part { name: "elm.swallow.icon";
@@ -2867,8 +3017,8 @@
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                fixed: 1 1;
                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"; }
+               rel1 { relative: 0.0 0.0; to: "title_bg"; }
+               rel2 { relative: 0.0 1.0; to: "title_bg"; }
             }
          }
          part { name: "title_right_btn";
@@ -2879,8 +3029,8 @@
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                align: 1 0.5;
                fixed: 1 1;
-               rel1 { relative: 0.0 0.0; to: "padding_after_right_btn"; }
-               rel2 { relative: 0.0 1.0; to: "padding_after_right_btn"; }
+               rel1 { relative: 1.0 0.0; to: "title_bg"; }
+               rel2 { relative: 1.0 1.0; to: "title_bg"; }
             }
          }
          part { name: "title_more_btn";
@@ -2891,8 +3041,8 @@
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                fixed: 1 1;
                align: 1 0.5;
-               rel1 { relative: 0.0 0.0; to: "padding_before_right_btn"; }
-               rel2 { relative: 0.0 1.0; to: "padding_before_right_btn"; }
+               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
             }
          }
          part { name: "optionheader_arrow";
@@ -2935,8 +3085,8 @@
             type: RECT;
             mouse_events: 0;
             description { state: "default" 0.0;
-               rel1 { to: "controlbar_bg"; }
-               rel2 { to: "controlbar_bg"; }
+               rel1.to: "controlbar_bg";
+               rel2.to: "controlbar_bg";
             }
          }
          part { name: "elm.prev_btn_bg";
@@ -3037,17 +3187,44 @@
                set_state(PART:"elm.prev_btn_bg", "default", 0.0);
             }
          }
+         program { name: "subtitle_show";
+            signal: "elm,state,subtitle,show";
+            source: "elm";
+            script {
+               set_int(subtitle_visible, 1);
+               if (get_int(large_padded_center_align) == 0)
+                 set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+               else
+                 set_state(PART:"elm.text.title", "subtitle_is_set", 0.0);
+            }
+         }
+         program { name: "subtitle_hide";
+            signal: "elm,state,subtitle,hide";
+            source: "elm";
+            script {
+               set_int(subtitle_visible, 0);
+               if (get_int(large_padded_center_align) == 0)
+                 set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+               else
+                 set_state(PART:"elm.text.title", "default", 0.0);
+            }
+         }
          program { name: "left_btn_show";
             signal: "elm,state,title_left_btn,show";
             source: "elm";
             script {
                set_int(left_btn_visible, 1);
+               set_state(PART:"left_btn_separator", "visible", 0.0);
                if (get_int(icon_visible) == 1)
                  set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
                else
                  set_state(PART:"padding_center_text1", "visible", 0.0);
                if ((get_int(more_btn_visible) == 1) && (get_int(right_btn_visible) == 1)) {
-                  set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+                  if (get_int(subtitle_visible) == 1)
+                    set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+                  else
+                    set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+                  set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
                   set_int(large_padded_center_align, 0);
                }
                else {
@@ -3061,6 +3238,7 @@
             source: "elm";
             script {
                set_int(left_btn_visible, 0);
+               set_state(PART:"left_btn_separator", "default", 0.0);
                if ((get_int(more_btn_visible) == 0) && (get_int(right_btn_visible) == 0)) {
                   set_state(PART:"padding_center_text2", "default", 0.0);
                   set_int(large_padded_center_align, 0);
@@ -3080,13 +3258,17 @@
             }
          }
          program { name: "right_btn_show";
-            signal: "elm,state,tltle_right_btn,show";
+            signal: "elm,state,title_right_btn,show";
             source: "elm";
             script {
                set_int(right_btn_visible, 1);
+               set_state(PART:"right_btn_separator", "visible", 0.0);
                if (get_int(more_btn_visible) == 1) {
-                  set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
-                  set_state(PART:"padding_before_right_btn", "right_and_more_button", 0.0);
+                  if (get_int(subtitle_visible) == 1)
+                    set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+                  else
+                    set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+                  set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
                   set_int(large_padded_center_align, 0);
                }
                else {
@@ -3109,7 +3291,7 @@
             source: "elm";
             script {
                set_int(right_btn_visible, 0);
-               set_state(PART:"padding_before_right_btn", "default", 0.0);
+               set_state(PART:"right_btn_separator", "default", 0.0);
                if ((get_int(more_btn_visible) == 0) && (get_int(left_btn_visible) == 0)) {
                   set_state(PART:"padding_center_text2", "default", 0.0);
                   set_int(large_padded_center_align, 0);
@@ -3133,9 +3315,13 @@
             source: "elm";
             script {
                set_int(more_btn_visible, 1);
+               set_state(PART:"more_btn_separator", "visible", 0.0);
                if (get_int(right_btn_visible) == 1) {
-                  set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
-                  set_state(PART:"padding_before_right_btn", "right_and_more_button", 0.0);
+                  if (get_int(subtitle_visible) == 1)
+                    set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+                  else
+                    set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+                  set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
                   set_int(large_padded_center_align, 0);
                }
                else {
@@ -3158,7 +3344,7 @@
             source: "elm";
             script {
                set_int(more_btn_visible, 0);
-               set_state(PART:"padding_before_right_btn", "default", 0.0);
+               set_state(PART:"more_btn_separator", "default", 0.0);
                if ((get_int(right_btn_visible) == 0) && (get_int(left_btn_visible) == 0)) {
                   set_state(PART:"padding_center_text2", "default", 0.0);
                   set_int(large_padded_center_align, 0);
@@ -3178,7 +3364,7 @@
             }
          }
          program { name: "icon_show";
-            signal: "elm,state,elm.swallow.icon,show";
+            signal: "elm,state,icon,show";
             source: "elm";
             script {
                set_int(icon_visible, 1);
@@ -3189,7 +3375,7 @@
             }
          }
          program { name: "icon_hide";
-            signal: "elm,state,elm.swallow.icon,hide";
+            signal: "elm,state,icon,hide";
             source: "elm";
             script {
                set_int(icon_visible, 0);
@@ -3349,6 +3535,7 @@
       images {
          image: "00_winset_control_top_bg.png" COMP;
          image: "00_winset_control_top_arrow.png" COMP;
+         image: "00_winset_title_line.png" COMP;
       }
       script {
          public oh_show = 0;     //optionheader show/hide
@@ -3359,6 +3546,7 @@
          public right_btn_visible = 0; //whether right btn is shown
          public more_btn_visible = 0; //whether more btn is shown
          public large_padded_center_align = 0; //large padding based on button size for center align for 1/2 buttons.
+         public subtitle_visible = 0; //whether subtitle is shown
       }
       parts {
          part { name: "title_bg";
@@ -3506,76 +3694,58 @@
                rel2.to: "elm.swallow.content";
             }
          }
-         part { name: "padding_before_left_btn";
-            type: RECT;
-            mouse_events: 0;
+         part { name: "left_btn_separator";
+            type: IMAGE;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
-               fixed: 1 0;
+               min: 4 68;
+               fixed: 1 1;
                align: 0.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "title_bg"; }
-               rel2 { relative: 0.0 1.0; to: "title_bg"; }
-               visible: 0;
-            }
-         }
-         part { name: "padding_after_left_btn";
-            type: RECT;
-            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.5;
                rel1 { relative: 1.0 0.0; to: "title_left_btn"; }
                rel2 { relative: 1.0 1.0; to: "title_left_btn"; }
+               image.normal: "00_winset_title_line.png";
                visible: 0;
             }
-         }
-         part { name: "padding_before_more_btn";
-            type: RECT;
-            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: "title_more_btn"; }
-               rel2 { relative: 0.0 1.0; to: "title_more_btn"; }
-               visible: 0;
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
-         part { name: "padding_after_right_btn";
-            type: RECT;
-            mouse_events: 0;
+         part { name: "right_btn_separator";
+            type: IMAGE;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
-               fixed: 1 0;
+               min: 4 68;
+               fixed: 1 1;
                align: 1.0 0.5;
-               rel1 { relative: 1.0 0.0; to: "title_bg"; }
-               rel2 { relative: 1.0 1.0; to: "title_bg"; }
+               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
+               image.normal: "00_winset_title_line.png";
                visible: 0;
             }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
          }
-         part { name: "padding_before_right_btn";
-            type: RECT;
-            mouse_events: 0;
+         part { name: "more_btn_separator";
+            type: IMAGE;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: 0 0;
-               fixed: 1 0;
+               min: 4 68;
+               fixed: 1 1;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
-               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
+               rel1 { relative: 0.0 0.0; to: "title_more_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_more_btn"; }
+               image.normal: "00_winset_title_line.png";
                visible: 0;
             }
-            description { state: "right_and_more_button" 0.0;
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+               visible: 1;
             }
          }
          part { name: "padding_before_text";
@@ -3585,8 +3755,8 @@
             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_bg"; }
-               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; to_y: "title_bg"; }
+               rel1 { relative: 0.0 0.0; to: "elm.text.title"; }
+               rel2 { relative: 0.0 1.0; to: "elm.text.title"; }
                fixed: 1 0;
                min: NAVIFRAME_ICON_PADDING_INC;
                visible: 0;
@@ -3598,7 +3768,7 @@
             mouse_events: 0;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+               min: 0 0;
                fixed: 1 0;
                align: 0.0 0.0;
                rel1 { relative: 0.0 0.0; to: "title_bg"; }
@@ -3624,7 +3794,7 @@
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+               min: 0 0;
                fixed: 1 0;
                align: 1.0 0.5;
                rel1 { relative: 1.0 0.0; to: "title_bg"; }
@@ -3650,13 +3820,54 @@
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                align: 0.5 0.5;
                fixed: 1 0;
-               rel1 { relative: 1.0 0.0; to: "padding_center_text1"; }
-               rel2 { relative: 0.0 1.0; to: "padding_center_text2"; }
+               rel1 { relative: 1.0 0.0; to_x: "padding_center_text1"; to_y: "title_bg"; }
+               rel2 { relative: 0.0 1.0; to_x: "padding_center_text2"; to_y: "title_bg"; }
             }
             description { state: "right_and_more_button" 0.0;
                inherit: "default" 0.0;
-               rel1 { relative: 1.0 0.0; to: "padding_after_left_btn"; }
-               rel2 { relative: 0.0 1.0; to: "padding_before_more_btn"; }
+               rel2 { relative: 0.0 1.0; to_x: "title_more_btn"; to_y: "title_bg"; }
+            }
+            description { state: "subtitle_is_set" 0.0;
+               inherit: "default" 0.0;
+               rel2 { relative: 0.0 0.7; to_x: "padding_center_text2"; to_y: "title_bg"; }
+            }
+            description { state: "subtitle_right_more_button_is_set" 0.0;
+               inherit: "default" 0.0;
+               rel2 { relative: 0.0 0.7; to_x: "title_more_btn"; to_y: "title_bg"; }
+            }
+         }
+         part { name: "elm.text.subtitle";
+            type: TEXT;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               text { font: "SLP:style=Medium";
+                  size: NAVIFRAME_SUBTITLE_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;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_center_text1";
+                  to_y: "elm.text.title";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "padding_center_text2";
+                  to_y: "elm.text.title";
+               }
+            }
+            description { state: "right_and_more_button" 0.0;
+               inherit: "default" 0.0;
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "title_more_btn";
+                  to_y: "elm.text.title";
+               }
             }
          }
          part { name: "elm.swallow.icon";
@@ -3689,8 +3900,8 @@
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                fixed: 1 1;
                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"; }
+               rel1 { relative: 0.0 0.0; to: "title_bg"; }
+               rel2 { relative: 0.0 1.0; to: "title_bg"; }
             }
          }
          part { name: "title_right_btn";
@@ -3701,8 +3912,8 @@
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                align: 1 0.5;
                fixed: 1 1;
-               rel1 { relative: 0.0 0.0; to: "padding_after_right_btn"; }
-               rel2 { relative: 0.0 1.0; to: "padding_after_right_btn"; }
+               rel1 { relative: 1.0 0.0; to: "title_bg"; }
+               rel2 { relative: 1.0 1.0; to: "title_bg"; }
             }
          }
          part { name: "title_more_btn";
@@ -3711,10 +3922,10 @@
             clip_to: "title_clip";
             description { state: "default" 0.0;
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
-               fixed: 1 0;
+               fixed: 1 1;
                align: 1 0.5;
-               rel1 { relative: 0.0 0.0; to: "padding_before_right_btn"; }
-               rel2 { relative: 0.0 1.0; to: "padding_before_right_btn"; }
+               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
             }
          }
          part { name: "optionheader_arrow";
@@ -3757,8 +3968,8 @@
             type: RECT;
             mouse_events: 0;
             description { state: "default" 0.0;
-               rel1 { to: "controlbar_bg"; }
-               rel2 { to: "controlbar_bg"; }
+               rel1.to: "controlbar_bg";
+               rel2.to: "controlbar_bg";
             }
          }
          part { name: "elm.prev_btn_bg";
@@ -3859,17 +4070,44 @@
                set_state(PART:"elm.prev_btn_bg", "default", 0.0);
             }
          }
+         program { name: "subtitle_show";
+            signal: "elm,state,subtitle,show";
+            source: "elm";
+            script {
+               set_int(subtitle_visible, 1);
+               if (get_int(large_padded_center_align) == 0)
+                 set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+               else
+                 set_state(PART:"elm.text.title", "subtitle_is_set", 0.0);
+            }
+         }
+         program { name: "subtitle_hide";
+            signal: "elm,state,subtitle,hide";
+            source: "elm";
+            script {
+               set_int(subtitle_visible, 0);
+               if (get_int(large_padded_center_align) == 0)
+                 set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+               else
+                 set_state(PART:"elm.text.title", "default", 0.0);
+            }
+         }
          program { name: "left_btn_show";
             signal: "elm,state,title_left_btn,show";
             source: "elm";
             script {
                set_int(left_btn_visible, 1);
+               set_state(PART:"left_btn_separator", "visible", 0.0);
                if (get_int(icon_visible) == 1)
                  set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
                else
                  set_state(PART:"padding_center_text1", "visible", 0.0);
                if ((get_int(more_btn_visible) == 1) && (get_int(right_btn_visible) == 1)) {
-                  set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+                  if (get_int(subtitle_visible) == 1)
+                    set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+                  else
+                    set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+                  set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
                   set_int(large_padded_center_align, 0);
                }
                else {
@@ -3883,6 +4121,7 @@
             source: "elm";
             script {
                set_int(left_btn_visible, 0);
+               set_state(PART:"left_btn_separator", "default", 0.0);
                if ((get_int(more_btn_visible) == 0) && (get_int(right_btn_visible) == 0)) {
                   set_state(PART:"padding_center_text2", "default", 0.0);
                   set_int(large_padded_center_align, 0);
@@ -3906,9 +4145,13 @@
             source: "elm";
             script {
                set_int(right_btn_visible, 1);
+               set_state(PART:"right_btn_separator", "visible", 0.0);
                if (get_int(more_btn_visible) == 1) {
-                  set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
-                  set_state(PART:"padding_before_right_btn", "right_and_more_button", 0.0);
+                  if (get_int(subtitle_visible) == 1)
+                    set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+                  else
+                    set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+                  set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
                   set_int(large_padded_center_align, 0);
                }
                else {
@@ -3931,7 +4174,7 @@
             source: "elm";
             script {
                set_int(right_btn_visible, 0);
-               set_state(PART:"padding_before_right_btn", "default", 0.0);
+               set_state(PART:"right_btn_separator", "default", 0.0);
                if ((get_int(more_btn_visible) == 0) && (get_int(left_btn_visible) == 0)) {
                   set_state(PART:"padding_center_text2", "default", 0.0);
                   set_int(large_padded_center_align, 0);
@@ -3955,9 +4198,13 @@
             source: "elm";
             script {
                set_int(more_btn_visible, 1);
+               set_state(PART:"more_btn_separator", "visible", 0.0);
                if (get_int(right_btn_visible) == 1) {
-                  set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
-                  set_state(PART:"padding_before_right_btn", "right_and_more_button", 0.0);
+                  if (get_int(subtitle_visible) == 1)
+                    set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+                  else
+                    set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+                  set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
                   set_int(large_padded_center_align, 0);
                }
                else {
@@ -3980,7 +4227,7 @@
             source: "elm";
             script {
                set_int(more_btn_visible, 0);
-               set_state(PART:"padding_before_right_btn", "default", 0.0);
+               set_state(PART:"more_btn_separator", "default", 0.0);
                if ((get_int(right_btn_visible) == 0) && (get_int(left_btn_visible) == 0)) {
                   set_state(PART:"padding_center_text2", "default", 0.0);
                   set_int(large_padded_center_align, 0);
@@ -4000,7 +4247,7 @@
             }
          }
          program { name: "icon_show";
-            signal: "elm,state,elm.swallow.icon,show";
+            signal: "elm,state,icon,show";
             source: "elm";
             script {
                set_int(icon_visible, 1);
@@ -4011,7 +4258,7 @@
             }
          }
          program { name: "icon_hide";
-            signal: "elm,state,elm.swallow.icon,hide";
+            signal: "elm,state,icon,hide";
             source: "elm";
             script {
                set_int(icon_visible, 0);
@@ -4169,6 +4416,9 @@
       script {
          public cbar_bg = 0;     //Controlbar BG Show call count
       }
+      images {
+         image: "00_winset_title_line.png" COMP;
+      }
       parts {
          part { name: "title_bg";
             type: RECT;
@@ -4217,64 +4467,40 @@
                rel2.to: "elm.swallow.content";
             }
          }
-         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_bg"; }
-               rel2 { relative: 0.0 1.0; to: "title_bg"; }
-               visible: 0;
-            }
-         }
-         part { name: "padding_after_left_btn";
-            type: RECT;
-            mouse_events: 0;
+         part { name: "left_btn_separator";
+            type: IMAGE;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
-               fixed: 1 0;
+               min: 4 68;
+               fixed: 1 1;
                align: 0.0 0.5;
                rel1 { relative: 1.0 0.0; to: "title_left_btn"; }
                rel2 { relative: 1.0 1.0; to: "title_left_btn"; }
+               image.normal: "00_winset_title_line.png";
                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_bg"; }
-               rel2 { relative: 1.0 1.0; to: "title_bg"; }
-               visible: 0;
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
-         part { name: "padding_before_right_btn";
-            type: RECT;
-            mouse_events: 0;
+         part { name: "right_btn_separator";
+            type: IMAGE;
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: 0 0;
-               fixed: 1 0;
+               min: 4 68;
+               fixed: 1 1;
                align: 1.0 0.5;
                rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
                rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
+               image.normal: "00_winset_title_line.png";
                visible: 0;
             }
-            description { state: "show" 0.0;
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+               visible: 1;
             }
          }
          part { name: "padding_before_text";
@@ -4284,8 +4510,8 @@
             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_bg"; }
-               rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; to_y: "title_bg"; }
+               rel1 { relative: 0.0 0.0; to: "elm.text.title"; }
+               rel2 { relative: 0.0 1.0; to: "elm.text.title"; }
                fixed: 1 0;
                min: NAVIFRAME_ICON_PADDING_INC;
                visible: 0;
@@ -4307,10 +4533,8 @@
                fixed: 1 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;
+               rel1.to: "title_bg";
+               rel2.to: "title_bg";
             }
          }
          part { name: "click_event_area";
@@ -4329,11 +4553,10 @@
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                fixed: 1 1;
                align: 0 0;
-               rel1.relative: 1.0 1.0;
-               rel1.to_x: "padding_before_left_btn";
+               rel1.relative: 0.0 1.0;
+               rel1.to_x: "title_bg";
                rel1.to_y: "elm.text.title";
-               rel2.relative: 1.0 1.0;
-               rel2.to_x: "padding_before_left_btn";
+               rel2.to_x: "title_bg";
                rel2.to_y: "elm.text.title";
             }
          }
@@ -4345,11 +4568,11 @@
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                align: 1 0.0;
                fixed: 1 1;
-               rel1.relative: 0.0 1.0;
-               rel1.to_x: "padding_after_right_btn";
+               rel1.relative: 1.0 1.0;
+               rel1.to_x: "title_bg";
                rel1.to_y: "elm.text.title";
-               rel2.relative: 0.0 1.0;
-               rel2.to_x: "padding_after_right_btn";
+               rel2.relative: 1.0 1.0;
+               rel2.to_x: "title_bg";
                rel2.to_y: "elm.text.title";
             }
          }
@@ -4363,8 +4586,10 @@
                fixed: 0 1;
                align: 0.5 0;
                rel1.to_y: "elm.text.title";
+               rel1.to_x: "title_bg";
                rel1.relative: 0.28 1;
                rel2.to_y: "elm.text.title";
+               rel2.to_x: "title_bg";
                rel2.relative: 0.72 1;
             }
          }
@@ -4379,7 +4604,9 @@
                align: 0.5 0;
                rel1.to_y: "elm.text.title";
                rel1.relative: 0.2 1;
+               rel1.to_x: "title_bg";
                rel2.to_y: "elm.text.title";
+               rel2.to_x: "title_bg";
                rel2.relative: 0.8 1;
             }
          }
@@ -4442,6 +4669,7 @@
            scale: 1;
            clip_to: "controlbar_clip";
            description { state: "default" 0.0;
+              fixed: 1 1;
               rel1.to: "controlbar_bg";
               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
            }
@@ -4480,6 +4708,30 @@
             action: STATE_SET "hide" 0.0;
             target: "title_clip";
          }
+         program { name: "left_btn_show";
+            signal: "elm,state,title_left_btn,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "left_btn_separator";
+         }
+         program { name: "left_btn_hide";
+            signal: "elm,state,title_left_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "left_btn_separator";
+         }
+         program { name: "right_btn_show";
+            signal: "elm,state,title_right_btn,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "right_btn_separator";
+         }
+         program { name: "right_btn_hide";
+            signal: "elm,state,title_right_btn,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "right_btn_separator";
+         }
          program { name: "prev_btn_show";
             signal: "elm,state,prev_btn,show";
             source: "elm";
@@ -4499,7 +4751,6 @@
          program { name: "controlbar_show";
             signal: "elm,state,controlbar,show";
             source: "elm";
-            action: STATE_SET "show" 0.0;
             script {
                emit("elm,state,controlbar_bg,show", "elm");
             }
@@ -4575,6 +4826,7 @@
          }
       }
    }
+
    group { name: "elm/naviframe/item/tabbar/instant/default";
       script {
          public cbar_bg = 0;     //Controlbar BG Show call count
@@ -4659,6 +4911,7 @@
            scale: 1;
            clip_to: "controlbar_clip";
            description { state: "default" 0.0;
+              fixed: 1 1;
               rel1.to: "controlbar_bg";
               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
            }