Merge "[Progressbar] issue image getting invisible for list progressbar. fixed."
authorPrince Kr Dubey <prince.dubey@samsung.com>
Tue, 29 Mar 2011 05:22:38 +0000 (14:22 +0900)
committerGerrit Code Review <git@Maetan>
Tue, 29 Mar 2011 05:22:38 +0000 (14:22 +0900)
33 files changed:
debian/changelog
themes/groups/button.edc
themes/groups/controlbar.edc
themes/groups/ctxpopup.edc
themes/groups/genlist/genlist_edit.edc
themes/groups/genlist/genlist_group_title.edc
themes/groups/genlist/genlist_macro.edc
themes/groups/genlist/genlist_styles.edc
themes/groups/genlist/genlist_sweep.edc
themes/groups/index.edc
themes/groups/layout.edc
themes/groups/navigationbar.edc
themes/groups/navigationbar_ex.edc
themes/groups/segmentedcontrol.edc
themes/images/nbeat-black/00_winset_btn_sge_body.png [new file with mode: 0644]
themes/images/nbeat-black/00_winset_btn_sge_body_normal_centre.png [new file with mode: 0644]
themes/images/nbeat-black/00_winset_btn_sge_body_normal_left.png [new file with mode: 0644]
themes/images/nbeat-black/00_winset_btn_sge_body_normal_right.png [new file with mode: 0644]
themes/images/nbeat-black/00_winset_btn_sge_body_press_center.png [new file with mode: 0644]
themes/images/nbeat-black/00_winset_btn_sge_body_press_left.png [new file with mode: 0644]
themes/images/nbeat-black/00_winset_btn_sge_body_press_right.png [new file with mode: 0644]
themes/images/nbeat-black/navibar_item_separator.png [new file with mode: 0644]
themes/images/nbeat/00_winset_btn_sge_body.png [new file with mode: 0644]
themes/images/nbeat/00_winset_btn_sge_body_normal_centre.png [new file with mode: 0644]
themes/images/nbeat/00_winset_btn_sge_body_normal_left.png [new file with mode: 0644]
themes/images/nbeat/00_winset_btn_sge_body_normal_right.png [new file with mode: 0644]
themes/images/nbeat/00_winset_btn_sge_body_press_center.png [new file with mode: 0644]
themes/images/nbeat/00_winset_btn_sge_body_press_left.png [new file with mode: 0644]
themes/images/nbeat/00_winset_btn_sge_body_press_right.png [new file with mode: 0644]
themes/images/nbeat/navibar_item_separator.png [new file with mode: 0644]
themes/inc/nbeat-black-inc.edc
themes/inc/nbeat-inc.edc
themes/nbeat.edc

index f460a2f..32d8074 100644 (file)
@@ -1,3 +1,27 @@
+nbeat-theme (0.1.1-14) unstable; urgency=low
+
+  * Package upload
+  * Git: 165.213.180.234:slp/pkgs/n/nbeat-theme
+  * Tag: nbeat-theme_0.1.1-14
+
+ -- ChunEon Park <chuneon.park@samsung.com>  Mon, 28 Mar 2011 12:21:01 +0900
+
+nbeat-theme (0.1.1-13) unstable; urgency=low
+
+  * Package upload
+  * Git: 165.213.180.234:slp/pkgs/n/nbeat-theme
+  * Tag: nbeat-theme_0.1.1-13
+
+ -- ChunEon Park <chuneon.park@samsung.com>  Fri, 25 Mar 2011 11:55:31 +0900
+
+nbeat-theme (0.1.1-12) unstable; urgency=low
+
+  * Package upload
+  * Git: 165.213.180.234:slp/pkgs/n/nbeat-theme
+  * Tag: nbeat-theme_0.1.1-12
+
+ -- Jaehwan Kim <jae.hwan.kim@samsung.com>  Thu, 24 Mar 2011 20:39:31 +0900
+
 nbeat-theme (0.1.1-11) unstable; urgency=low
 
   * Upload Package
index 83cf21f..3df4663 100644 (file)
       }
    }
 
-///////////////////////////////////////////////////////////////////////////////////////
+   ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/navigationbar_functionbutton/default";
       script {
          public button_state = 0; //0:enabled, 1: disabled
                text {
                   font: "SLP:style=Medium";
                   size: 20;
-                  min:  1 0;
+                  min:  0 0;
                   align: 0.5 0.5;
                }
             }
       }
    }
 
-   ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/navigationbar_functionbutton/title_ellipsize";
-      alias: "elm/button/base/navigationbar_functionbutton/extended_fnbtn_top_style";
-      alias: "elm/button/base/navigationbar_functionbutton/center_titleobj";
-      alias: "elm/button/base/navigationbar_functionbutton/title_transparent_ellipsize";
+///////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/edit";
+      alias: "elm/button/base/navigationbar_functionbutton/edit";
       script {
          public button_state = 0; //0:enabled, 1: disabled
       }
                text {
                   font: "SLP:style=Medium";
                   size: 20;
-                  min:  0 0;
+                  min:  1 0;
                   align: 0.5 0.5;
                }
             }
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/edit";
-      alias: "elm/button/base/navigationbar_functionbutton/edit";
+   group { name: "elm/button/base/popup_button/default";
+      alias: "elm/button/base/popup_button/menustyle";
+      alias: "elm/button/base/popup_button/liststyle";
+      alias: "elm/button/base/popup_button/volumebarstyle";
+      alias: "elm/button/base/popup_button/customstyle";
+      images {
+         image: "00_button_popup_normal.png" COMP;
+         image: "00_button_popup_press.png" COMP;
+         image: "00_button_popup_focus.png" COMP;
+         image: "00_button_popup_dim.png" COMP;
+      }
       script {
          public button_state = 0; //0:enabled, 1: disabled
       }
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 16 50;
+               min: 18 46;
+               max: 400 46;
+               image {
+                  normal: "00_button_popup_normal.png";
+                  border: 4 4 4 4;
+                  border_scale: 1;
+               }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
+               image.normal: "00_button_popup_press.png";
             }
             description { state: "disabled" 0.0;
                inherit:  "default" 0.0;
+               image.normal: "00_button_popup_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
+               image.normal: "00_button_popup_focus.png";
             }
          }
-         part {
-            name: "padding_left";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 0.0 1.0;
-               min: 2 2;
-               fixed: 1 0;
-               color: 0 0 0 0;
-            }
+      part {
+         name: "padding_left";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            align: 0.0 0.0;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 0.0 1.0;
+            min: 10 5;
+            fixed: 1 0;
+            color: 0 0 0 0;
          }
-         part {name: "padding_after_right";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1 0;
-               min: 1 0;
-               rel1 { relative: 1 0.2; }
-               rel2 { relative: 1 0.8; }
-               fixed: 1 0;
-               color: 238 223 194 255;
-            }
+      }
+      part {
+         name: "padding_right";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            align: 1.0 0.0;
+            rel1.relative: 1.0 0.0;
+            rel2.relative: 1.0 1.0;
+            min: 10 5;
+            fixed: 1 0;
+            color: 0 0 0 0;
          }
-         part {name: "padding_right";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1 0;
-               min: 1 0;
-               rel1 { relative: 0 0; to: "padding_after_right"; }
-               rel2 { relative: 0 1; to: "padding_after_right"; }
-               fixed: 1 0;
-               color: 164 151 130 255;
-            }
+      }
+      part {
+         name: "padding_top";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            align: 0.0 0.0;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 0.0;
+            min: 5 10;
+            fixed: 0 1;
+            color: 0 0 0 0;
          }
-         part {
-            name: "padding_top";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 1.0 0.0;
-               min: 2 2;
-               fixed: 0 1;
-               color: 0 0 0 0;
-            }
+      }
+      part {
+         name: "padding_bottom";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            align: 1.0 1.0;
+            rel1.relative: 0.0 1.0;
+            rel2.relative: 1.0 1.0;
+            min: 5 10;
+            fixed: 0 1;
+            color: 0 0 0 0;
          }
-         part {
-            name: "padding_bottom";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 0.0 1.0;
-               rel2.relative: 1.0 1.0;
-               min: 2 2;
-               fixed: 0 1;
-               color: 0 0 0 0;
-            }
+      }
+      part {
+         name: "icon_rect";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            visible: 1;
+            min: 0 40;
+            fixed: 1 0;
+            rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
+            rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
+            align: 0.0 0.5;
+            color: 0 0 0 0;
          }
-         part {
-            name: "icon_rect";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 1;
-               min: 0 40;
-               fixed: 1 0;
-               rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
-               align: 0.0 0.5;
-               color: 0 0 0 0;
-            }
+      }
+      part {
+         name: "padding_icon_text";
+         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 { relative: 1.0 1.0; to: "icon_rect"; }
+            fixed: 1 0;
+            min: 0 0;
+            color: 0 0 0 0;
          }
-         part {
-            name: "padding_icon_text";
-            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 { relative: 1.0 1.0; to: "icon_rect"; }
-               fixed: 1 0;
-               min: 0 0;
-               color: 0 0 0 0;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "visible" 0.0; //when icon is visible
-               align: 0.0 0.0;
-               rel1 { relative: 1.0 0.0; to: "icon_rect"; }
-               rel2 { relative: 1.0 1.0; to: "icon_rect"; }
-               fixed: 1 0;
-               min: 5 0;
-               color: 0 0 0 0;
-            }
+         description { state: "icononly" 0.0;
+            inherit: "default" 0.0;
          }
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
-               fixed: 1 0;
-            }
-            description { state: "visible" 0.0;
-               fixed: 1 0;
-               visible: 1;
-               align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-            }
-            description { state: "icononly" 0.0;;
-               visible: 1;
-               min: 40 40;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
-               align: 0.5 0.5;
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXT;
-            //effect: SHADOW;
-            mouse_events:  0;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1 { relative: 1.0 1.0; to_x: "padding_icon_text"; to_y: "padding_top"; }
-               rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y:"padding_bottom"; }
-               align: 0.5 0.5;
-               color: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_NORMAL_SHADOW_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: 20;
-                  min:  1 0;
-                  align: 0.5 0.5;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 80 40;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_PRESSED_COLOR_INC;
-               color2: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_PRESSED_SHADOW_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 0 0 0 128;
-               color3: 0 0 0 0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_DISABLED_COLOR_INC;
-               color2: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_DISABLED_SHADOW_COLOR_INC;
-               color3: 0 0 0 0;
-               visible: 1;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_FOCUSED_COLOR_INC;
-               color2: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_FOCUSED_SHADOW_COLOR_INC;
-            }
-         }
-         part { name: "over2";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit:  "default" 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "over3";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-            }
-         }
-         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) !=1)
-                  set_state(PART:"button_image", "default", 0.0);
-            }
-            after: button_unpress;
-         }
-         program { name: "button_click2";
-            signal: "mouse,down,1";
-            source: "over3";
-            action: STATE_SET "clicked" 0.0;
-            target: "over3";
-         }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over3";
-            action: STATE_SET "default" 0.0;
-            target: "over3";
-         }
-         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:"padding_icon_text", "visible", 0.0);
-               }
-               set_state(PART:"elm.text", "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:"padding_icon_text", "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:"padding_icon_text", "visible", 0.0);
-               }
-               else
-               {
-                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                  set_state(PART:"padding_icon_text", "icononly", 0.0);
-               }
-            }
-         }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "button_image";
-            target: "over2";
-            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, 1);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "over2";
-            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, 0);
-               }
-         }
-         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/popup_button/default";
-      alias: "elm/button/base/popup_button/menustyle";
-      alias: "elm/button/base/popup_button/liststyle";
-      alias: "elm/button/base/popup_button/volumebarstyle";
-      alias: "elm/button/base/popup_button/customstyle";
-      images {
-         image: "00_button_popup_normal.png" COMP;
-         image: "00_button_popup_press.png" COMP;
-         image: "00_button_popup_focus.png" COMP;
-         image: "00_button_popup_dim.png" COMP;
-      }
-      script {
-         public button_state = 0; //0:enabled, 1: disabled
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 18 46;
-               max: 400 46;
-               image {
-                  normal: "00_button_popup_normal.png";
-                  border: 4 4 4 4;
-                  border_scale: 1;
-               }
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_popup_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit:  "default" 0.0;
-               image.normal: "00_button_popup_dim.png";
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_popup_focus.png";
-            }
-         }
-      part {
-         name: "padding_left";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 0.0 1.0;
-            min: 10 5;
-            fixed: 1 0;
-            color: 0 0 0 0;
-         }
-      }
-      part {
-         name: "padding_right";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            align: 1.0 0.0;
-            rel1.relative: 1.0 0.0;
-            rel2.relative: 1.0 1.0;
-            min: 10 5;
-            fixed: 1 0;
-            color: 0 0 0 0;
-         }
-      }
-      part {
-         name: "padding_top";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            min: 5 10;
-            fixed: 0 1;
-            color: 0 0 0 0;
-         }
-      }
-      part {
-         name: "padding_bottom";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            align: 1.0 1.0;
-            rel1.relative: 0.0 1.0;
-            rel2.relative: 1.0 1.0;
-            min: 5 10;
-            fixed: 0 1;
-            color: 0 0 0 0;
-         }
-      }
-      part {
-         name: "icon_rect";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            visible: 1;
-            min: 0 40;
-            fixed: 1 0;
-            rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
-            rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
-            align: 0.0 0.5;
-            color: 0 0 0 0;
-         }
-      }
-      part {
-         name: "padding_icon_text";
-         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 { relative: 1.0 1.0; to: "icon_rect"; }
-            fixed: 1 0;
-            min: 0 0;
-            color: 0 0 0 0;
-         }
-         description { state: "icononly" 0.0;
-            inherit: "default" 0.0;
-         }
-         description { state: "visible" 0.0; //when icon is visible
-            align: 0.0 0.0;
-            rel1 { relative: 1.0 0.0; to: "icon_rect"; }
-            rel2 { relative: 1.0 1.0; to: "icon_rect"; }
-            fixed: 1 0;
-            min: 10 0;
-            color: 0 0 0 0;
+         description { state: "visible" 0.0; //when icon is visible
+            align: 0.0 0.0;
+            rel1 { relative: 1.0 0.0; to: "icon_rect"; }
+            rel2 { relative: 1.0 1.0; to: "icon_rect"; }
+            fixed: 1 0;
+            min: 10 0;
+            color: 0 0 0 0;
          }
       }
       part { name: "elm.swallow.content";
                max: 46 46;
                image {
                   normal: "00_button_EditStyle.png";
-                  border: 8 0 3 3;
-                  border_scale: 1;
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_EditStyle_press.png";
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_EditStyle_dim.png";
-            }
-         }
-         part { name: "button_center_part";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 46 46;
-               max: 46 46;
-               image {
-                  normal: "00_button_icon_expand.png";
-                  border: 8 0 3 3;
-                  border_scale: 1;
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_icon_expand_press.png";
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 255 255 255 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 0;
-            }
-         }
-         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: "over1";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            target: "button_center_part";
-         }
-         program { name: "button_unclick";
-            signal: "mouse,up,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-            after: "button_unclick_anim";
-         }
-         program { name: "button_unclick_anim";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "button_center_part";
-         }
-         program { name: "button_click2";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: STATE_SET "clicked" 0.0;
-            target: "over2";
-         }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: STATE_SET "default" 0.0;
-            target: "over1";
-            after: "button_unclick3";
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-      }
-   }
-
-   group { name: "elm/button/base/icon_expand/extended";
-      images {
-         image: "00_button_icon_expand.png" COMP;
-         image: "00_button_icon_expand_press.png" COMP;
-         image: "00_button_EditStyle.png" COMP;
-         image: "00_button_EditStyle_press.png" COMP;
-         image: "00_button_EditStyle_dim.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 46 46;
-               max: 46 46;
-               image {
-                  normal: "00_button_EditStyle.png";
+                  border: 8 0 3 3;
+                  border_scale: 1;
                }
             }
             description {
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
-               min: 60 75;
-               max: 60 75;
                color: 0 0 0 0;
             }
          }
       }
    }
 
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/rename";
+   group { name: "elm/button/base/icon_expand/extended";
       images {
-         image: "00_button_rename.png" COMP;
-         image: "00_button_rename_press.png" COMP;
-         image: "00_button_rename_dim.png" COMP;
+         image: "00_button_icon_expand.png" COMP;
+         image: "00_button_icon_expand_press.png" COMP;
+         image: "00_button_EditStyle.png" COMP;
+         image: "00_button_EditStyle_press.png" COMP;
+         image: "00_button_EditStyle_dim.png" COMP;
       }
       parts {
          part { name: "button_image";
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 40 40;
-               max: 40 40;
+               min: 46 46;
+               max: 46 46;
                image {
-                  normal: "00_button_rename.png";
+                  normal: "00_button_EditStyle.png";
                }
             }
             description {
                state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_rename_press.png";
+               image.normal: "00_button_EditStyle_press.png";
             }
             description {
                state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_rename_dim.png";
+               image.normal: "00_button_EditStyle_dim.png";
+            }
+         }
+         part { name: "button_center_part";
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 46 46;
+               max: 46 46;
+               image {
+                  normal: "00_button_icon_expand.png";
+                  border: 8 0 3 3;
+                  border_scale: 1;
+               }
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_icon_expand_press.png";
             }
          }
          part { name: "over1";
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
+               min: 60 75;
+               max: 60 75;
                color: 0 0 0 0;
             }
          }
          program { name: "button_click_anim";
             action: STATE_SET "clicked" 0.0;
             target: "button_image";
+            target: "button_center_part";
          }
          program { name: "button_unclick";
             signal: "mouse,up,1";
          program { name: "button_unclick_anim";
             action: STATE_SET "default" 0.0;
             target: "button_image";
+            target: "button_center_part";
          }
          program { name: "button_click2";
             signal: "mouse,down,1";
       }
    }
 
-   group { name: "elm/button/base/rename/extended";
+///////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/rename";
       images {
          image: "00_button_rename.png" COMP;
          image: "00_button_rename_press.png" COMP;
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
-               min: 60 75;
-               max: 60 75;
                color: 0 0 0 0;
             }
          }
       }
    }
 
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/warning";
+   group { name: "elm/button/base/rename/extended";
       images {
-         image: "00_button_warning.png" COMP;
-         image: "00_button_warning_press.png" COMP;
-         image: "00_button_warning_dim.png" COMP;
+         image: "00_button_rename.png" COMP;
+         image: "00_button_rename_press.png" COMP;
+         image: "00_button_rename_dim.png" COMP;
       }
       parts {
          part { name: "button_image";
                min: 40 40;
                max: 40 40;
                image {
-                  normal: "00_button_warning.png";
+                  normal: "00_button_rename.png";
                }
             }
             description {
                state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_warning_press.png";
+               image.normal: "00_button_rename_press.png";
             }
             description {
                state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_warning_dim.png";
+               image.normal: "00_button_rename_dim.png";
             }
          }
          part { name: "over1";
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
+               min: 60 75;
+               max: 60 75;
                color: 0 0 0 0;
             }
          }
       }
    }
 
-   group { name: "elm/button/base/warning/extended";
+///////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/warning";
       images {
          image: "00_button_warning.png" COMP;
          image: "00_button_warning_press.png" COMP;
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
-               min: 60 75;
-               max: 60 75;
                color: 0 0 0 0;
             }
          }
       }
    }
 
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/info";
+   group { name: "elm/button/base/warning/extended";
       images {
-         image: "00_button_info.png" COMP;
-         image: "00_button_info_press.png" COMP;
-         image: "00_button_info_dim.png" COMP;
+         image: "00_button_warning.png" COMP;
+         image: "00_button_warning_press.png" COMP;
+         image: "00_button_warning_dim.png" COMP;
       }
       parts {
          part { name: "button_image";
                min: 40 40;
                max: 40 40;
                image {
-                  normal: "00_button_info.png";
+                  normal: "00_button_warning.png";
                }
             }
             description {
                state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_info_press.png";
+               image.normal: "00_button_warning_press.png";
             }
             description {
                state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_info_dim.png";
+               image.normal: "00_button_warning_dim.png";
             }
          }
          part { name: "over1";
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
+               min: 60 75;
+               max: 60 75;
                color: 0 0 0 0;
             }
          }
       }
    }
 
-   group { name: "elm/button/base/info/extended";
+///////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/info";
       images {
          image: "00_button_info.png" COMP;
          image: "00_button_info_press.png" COMP;
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
-               min: 60 75;
-               max: 60 75;
                color: 0 0 0 0;
             }
          }
       }
    }
 
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/call";
+   group { name: "elm/button/base/info/extended";
       images {
-         image: "00_button_call.png" COMP;
-         image: "00_button_call_press.png" COMP;
-         image: "00_button_call_dim.png" COMP;
+         image: "00_button_info.png" COMP;
+         image: "00_button_info_press.png" COMP;
+         image: "00_button_info_dim.png" COMP;
       }
       parts {
          part { name: "button_image";
                min: 40 40;
                max: 40 40;
                image {
-                  normal: "00_button_call.png";
+                  normal: "00_button_info.png";
                }
             }
             description {
                state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_call_press.png";
+               image.normal: "00_button_info_press.png";
             }
             description {
                state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_call_dim.png";
+               image.normal: "00_button_info_dim.png";
             }
          }
          part { name: "over1";
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
+               min: 60 75;
+               max: 60 75;
                color: 0 0 0 0;
             }
          }
          }
          program { name: "enable";
             signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/navigationbar_functionbutton/multiline_title_subtitle";
-      script {
-         public button_state = 0; //0:enabled, 1: disabled
-      }
-      styles{
-         style { name: "btn_back_navi_style";
-            base: "font=SLP:style=Medium font_size=18 align=center color=#ffffff wrap=char";
-            tag:  "br" "\n";
-            tag:  "ps" "ps";
-            tag:  "hilight" "+ font=SLP:style=Bold";
-            tag:  "b" "+ font=SLP:style=Bold";
-            tag:  "tab" "\t";
-         }
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 16 50;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "disabled" 0.0;
-               inherit:  "default" 0.0;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-            }
-         }
-         part {
-            name: "padding_left";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 0.0 1.0;
-               min: 2 2;
-               fixed: 1 0;
-               color: 0 0 0 0;
-            }
-         }
-         part {name: "padding_after_right";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1 0;
-               min: 1 0;
-               rel1 { relative: 1 0.2; }
-               rel2 { relative: 1 0.8; }
-               fixed: 1 0;
-               color: 238 223 194 255;
-            }
-         }
-         part {name: "padding_right";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1 0;
-               min: 1 0;
-               rel1 { relative: 0 0; to: "padding_after_right"; }
-               rel2 { relative: 0 1; to: "padding_after_right"; }
-               fixed: 1 0;
-               color: 164 151 130 255;
-            }
-         }
-         part {
-            name: "padding_top";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 1.0 0.0;
-               min: 2 2;
-               fixed: 0 1;
-               color: 0 0 0 0;
-            }
-         }
-         part {
-            name: "padding_bottom";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 0.0 1.0;
-               rel2.relative: 1.0 1.0;
-               min: 2 2;
-               fixed: 0 1;
-               color: 0 0 0 0;
-            }
-         }
-         part {
-            name: "icon_rect";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 1;
-               min: 0 40;
-               fixed: 1 0;
-               rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
-               align: 0.0 0.5;
-               color: 0 0 0 0;
-            }
-         }
-         part {
-            name: "padding_icon_text";
-            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 { relative: 1.0 1.0; to: "icon_rect"; }
-               fixed: 1 0;
-               min: 0 0;
-               color: 0 0 0 0;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "visible" 0.0; //when icon is visible
-               align: 0.0 0.0;
-               rel1 { relative: 1.0 0.0; to: "icon_rect"; }
-               rel2 { relative: 1.0 1.0; to: "icon_rect"; }
-               fixed: 1 0;
-               min: 5 0;
-               color: 0 0 0 0;
-            }
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disabler";
+            target: "button_image";
          }
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/call";
+      images {
+         image: "00_button_call.png" COMP;
+         image: "00_button_call_press.png" COMP;
+         image: "00_button_call_dim.png" COMP;
+      }
+      parts {
+         part { name: "button_image";
+            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               visible: 0;
-               align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
-               fixed: 1 0;
-            }
-            description { state: "visible" 0.0;
-               fixed: 1 0;
-               visible: 1;
-               align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-            }
-            description { state: "icononly" 0.0;;
-               visible: 1;
                min: 40 40;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
-               align: 0.5 0.5;
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            //effect: SHADOW;
-            mouse_events:  0;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1 { relative: 1.0 1.0; to_x: "padding_icon_text"; to_y: "padding_top"; }
-               rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y:"padding_bottom"; }
-               align: 0.5 0.5;
-               color: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_NORMAL_SHADOW_COLOR_INC;
-               text {
-                  style: "btn_back_navi_style";
-                  min:  0 0;
-                  max: 0 1;
+               max: 40 40;
+               image {
+                  normal: "00_button_call.png";
                }
             }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 80 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_PRESSED_COLOR_INC;
-               color2: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_PRESSED_SHADOW_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 0 0 0 128;
-               color3: 0 0 0 0;
-            }
-            description { state: "disabled_visible" 0.0;
+            description {
+               state: "clicked" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_DISABLED_COLOR_INC;
-               color2: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_DISABLED_SHADOW_COLOR_INC;
-               color3: 0 0 0 0;
-               visible: 1;
+               image.normal: "00_button_call_press.png";
             }
-            description { state: "focused" 0.0;
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_FOCUSED_COLOR_INC;
-               color2: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_FOCUSED_SHADOW_COLOR_INC;
+               image.normal: "00_button_call_dim.png";
             }
          }
-         part { name: "over2";
+         part { name: "over1";
             type: RECT;
             mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
                color: 0 0 0 0;
             }
-            description { state: "disabled" 0.0;
-               inherit:  "default" 0.0;
-               visible: 0;
-            }
          }
-         part { name: "over3";
-            type: RECT;
+         part { name: "over2";
             mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
-               color: 0 0 0 0;
+               color: 255 255 255 0;
             }
             description { state: "clicked" 0.0;
                inherit:  "default" 0.0;
                visible: 1;
+               color: 255 255 255 0;
             }
          }
          part { name: "disabler";
       programs {
          program { name: "button_click";
             signal: "mouse,down,1";
-            source: "over2";
+            source: "over1";
             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";
+         program { name: "button_unclick";
+            signal: "mouse,up,1";
+            source: "over2";
             action: SIGNAL_EMIT "elm,action,unpress" "";
+            after: "button_unclick_anim";
          }
-         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) !=1)
-                  set_state(PART:"button_image", "default", 0.0);
-            }
-            after: button_unpress;
+         program { name: "button_unclick_anim";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
          }
          program { name: "button_click2";
             signal: "mouse,down,1";
-            source: "over3";
+            source: "over2";
             action: STATE_SET "clicked" 0.0;
-            target: "over3";
+            target: "over2";
          }
          program { name: "button_unclick2";
             signal: "mouse,clicked,1";
-            source: "over3";
+            source: "over1";
             action: STATE_SET "default" 0.0;
-            target: "over3";
+            target: "over1";
+            after: "button_unclick3";
          }
          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:"padding_icon_text", "visible", 0.0);
-               }
-               set_state(PART:"elm.text", "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:"padding_icon_text", "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:"padding_icon_text", "visible", 0.0);
-               }
-               else
-               {
-                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                  set_state(PART:"padding_icon_text", "icononly", 0.0);
-               }
-            }
-         }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
-         }
          program { name: "disable";
             signal: "elm,state,disabled";
             source: "elm";
             action: STATE_SET "disabled" 0.0;
-            target: "button_image";
-            target: "over2";
             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, 1);
-            }
+            target: "button_image";
          }
          program { name: "enable";
             signal: "elm,state,enabled";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "over2";
             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, 0);
-            }
-         }
-         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/navigationbar_backbutton/default";
-      alias: "elm/button/base/navigationbar_backbutton/title_ellipsize";
-      alias: "elm/button/base/navigationbar_backbutton/extended_fnbtn_top_style";
-      alias: "elm/button/base/navigationbar_backbutton/center_titleobj";
-      alias: "elm/button/base/navigationbar_backbutton/title_transparent_ellipsize";
-      alias: "elm/button/base/navigationbar_backbutton/multiline_title_subtitle";
       images {
          image: "00_winset_btn_prev.png" COMP;
          image: "00_winset_btn_prev_press.png" COMP;
index ae5bb93..2024f0d 100644 (file)
 // controlbar icon
 ///////////////////////////////////////////////////////////////////////////////////////
 
-       group { name: "elm/icon/controlbar_albums/default"; min: 40 40; 
-               images.image: "00_winset_tab_icon_albums.png" COMP; 
-               parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; 
-                       aspect_preference: BOTH; image.normal: "00_winset_tab_icon_albums.png"; } } } } 
+       group { name: "elm/icon/controlbar_albums/default"; min: 40 40;
+               images.image: "00_winset_tab_icon_albums.png" COMP;
+               parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0;
+                       aspect_preference: BOTH; image.normal: "00_winset_tab_icon_albums.png"; } } } }
 
-       group { name: "elm/icon/controlbar_artists/default"; min: 40 40; 
-               images.image: "00_winset_tab_icon_artists.png" COMP; 
-               parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; 
-                       aspect_preference: BOTH; image.normal: "00_winset_tab_icon_artists.png"; } } } } 
+       group { name: "elm/icon/controlbar_artists/default"; min: 40 40;
+               images.image: "00_winset_tab_icon_artists.png" COMP;
+               parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0;
+                       aspect_preference: BOTH; image.normal: "00_winset_tab_icon_artists.png"; } } } }
 
-       group { name: "elm/icon/controlbar_songs/default"; min: 40 40; 
-               images.image: "00_winset_tab_icon_songs.png" COMP; 
-               parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; 
-                       aspect_preference: BOTH; image.normal: "00_winset_tab_icon_songs.png"; } } } } 
+       group { name: "elm/icon/controlbar_songs/default"; min: 40 40;
+               images.image: "00_winset_tab_icon_songs.png" COMP;
+               parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0;
+                       aspect_preference: BOTH; image.normal: "00_winset_tab_icon_songs.png"; } } } }
 
-       group { name: "elm/icon/controlbar_more/default"; min: 40 40; 
-               images.image: "00_winset_tab_icon_more.png" COMP; 
-               parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; 
-                       aspect_preference: BOTH; image.normal: "00_winset_tab_icon_more.png"; } } } } 
+       group { name: "elm/icon/controlbar_more/default"; min: 40 40;
+               images.image: "00_winset_tab_icon_more.png" COMP;
+               parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0;
+                       aspect_preference: BOTH; image.normal: "00_winset_tab_icon_more.png"; } } } }
 
-       group { name: "elm/icon/controlbar_playlist/default"; min: 40 40; 
-               images.image: "00_winset_tab_icon_playlist.png" COMP; 
-               parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; 
-                       aspect_preference: BOTH; image.normal: "00_winset_tab_icon_playlist.png"; } } } } 
+       group { name: "elm/icon/controlbar_playlist/default"; min: 40 40;
+               images.image: "00_winset_tab_icon_playlist.png" COMP;
+               parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0;
+                       aspect_preference: BOTH; image.normal: "00_winset_tab_icon_playlist.png"; } } } }
 
-       group { name: "elm/icon/controlbar_contacts/default"; min: 40 40; 
-               images.image: "00_winset_tab_icon_contacts.png" COMP; 
-               parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; 
-                       aspect_preference: BOTH; image.normal: "00_winset_tab_icon_contacts.png"; } } } } 
+       group { name: "elm/icon/controlbar_contacts/default"; min: 40 40;
+               images.image: "00_winset_tab_icon_contacts.png" COMP;
+               parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0;
+                       aspect_preference: BOTH; image.normal: "00_winset_tab_icon_contacts.png"; } } } }
 
-       group { name: "elm/icon/controlbar_dialer/default"; min: 40 40; 
-               images.image: "00_winset_tab_icon_dialer.png" COMP; 
-               parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; 
-                       aspect_preference: BOTH; image.normal: "00_winset_tab_icon_dialer.png"; } } } } 
+       group { name: "elm/icon/controlbar_dialer/default"; min: 40 40;
+               images.image: "00_winset_tab_icon_dialer.png" COMP;
+               parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0;
+                       aspect_preference: BOTH; image.normal: "00_winset_tab_icon_dialer.png"; } } } }
 
-       group { name: "elm/icon/controlbar_favorites/default"; min: 40 40; 
-               images.image: "00_winset_tab_icon_favorites.png" COMP; 
-               parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; 
-                       aspect_preference: BOTH; image.normal: "00_winset_tab_icon_favorites.png"; } } } } 
+       group { name: "elm/icon/controlbar_favorites/default"; min: 40 40;
+               images.image: "00_winset_tab_icon_favorites.png" COMP;
+               parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0;
+                       aspect_preference: BOTH; image.normal: "00_winset_tab_icon_favorites.png"; } } } }
 
-       group { name: "elm/icon/controlbar_logs/default"; min: 40 40; 
-               images.image: "00_winset_tab_icon_logs.png" COMP; 
-               parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; 
-                       aspect_preference: BOTH; image.normal: "00_winset_tab_icon_logs.png"; } } } } 
+       group { name: "elm/icon/controlbar_logs/default"; min: 40 40;
+               images.image: "00_winset_tab_icon_logs.png" COMP;
+               parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0;
+                       aspect_preference: BOTH; image.normal: "00_winset_tab_icon_logs.png"; } } } }
 
 ////////////////////////////////////////////////////////////////////////////////////////
 // controlbar
@@ -79,7 +79,7 @@
 
        group{
                name: "elm/controlbar/base/default";
-               
+
                parts{
                        part{
                                name: "bg_rect";
                                }
                                description{
                                        state: "large" 0.0;
-                                       min: 0 TAB_BAR_H;
+                                       min: 0 CONTROLBAR_LARGE_H;
                                        fixed: 0 1;
                                        align: 0.5 1.0;
                                        rel1 {relative: 0.0 1.0; offset: 0 -1;}
                                }
                                description{
                                        state: "small" 0.0;
-                                       min: 0 TOOL_BAR_H;
+                                       min: 0 CONTROLBAR_SMALL_H;
                                        fixed: 0 1;
                                        align: 0.5 1.0;
                                        rel1 {relative: 0.0 1.0; offset: 0 -1;}
                                }
                                description{
                                        state: "left" 0.0;
-                                       min: TAB_BAR_H 0;
+                                       min: CONTROLBAR_W 0;
                                        fixed: 1 0;
                                        align: 0.0 0.5;
                                        rel1 {relative: 0.0 0.0; offset: 0 0;}
                                }
                                description{
                                        state: "right" 0.0;
-                                       min: TAB_BAR_H 0;
+                                       min: CONTROLBAR_W 0;
                                        fixed: 1 0;
                                        align: 1.0 0.5;
                                        rel1 {relative: 1.0 0.0; offset: -1 0;}
                                        rel2 {relative: 1.0 1.0; offset: -1 -1;}
                                }
-                       }       
+                       }
                        part{
                                name: "elm.swallow.items";
                                type: SWALLOW;
                                        rel1 {relative: 0.0 0.0; offset: 0 0;}
                                        rel2 {relative: 1.0 1.0; offset: -1 -1;}
                                        image.normal: "00_winset_control_toolbar_bg.png";
-                                       color: 255 255 255 255; 
+                                       color: 255 255 255 255;
                                }
                                description{
                                        state: "tabbar" 0.0;
                        }
                }
        }
-       
+
        group{
                name: "elm/controlbar/item_bg/default";
                images{
                        image: "00_winset_tab_focus_left.png" COMP;
                        image: "00_winset_tab_focus_right.png" COMP;
                }
-               
+
                parts{
                        part{
                                name: "bg_rect";
                                mouse_events: 1;
                                description{
                                        state: "default" 0.0;
-                                       min: 0 TOOL_BAR_H;
+                                       min: 0 CONTROLBAR_SMALL_H;
                                        rel1 {relative: 0.0 0.0; offset: 0 0;}
                                        rel2 {relative: 1.0 1.0; offset: -1 -1;}
                                        color: 0 0 0 0;
                                }
                        }
                        part{
-                               name: "elm.swallow.icon_shadow";
-                               type: SWALLOW;
-                               scale: 1;
-                               mouse_events:1;
-                               description{
-                                       state: "default" 0.0;
-                                       min: 44 44;
-                                       max: 44 44;
-                                       fixed: 1 1;
-                                       visible: 0;
-                                       rel1{offset: 2 2; to: "elm.swallow.icon";}
-                                       rel2{offset: 2 2; to: "elm.swallow.icon";}
-                               }
-                               description{
-                                       state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible: 1;
-                               }
-                       }
-                       part{
                                name: "elm.swallow.icon";
                                type: SWALLOW;
                                scale: 1;
                                        rel1 {relative: 0.5 0.6; }
                                        rel2 {relative: 0.5 1.0; }
                                }
-                       }       
+                       }
                }
 
                programs {
                                target: "elm.swallow.text";
                                target: "elm.swallow.icon";
                        }
-                       program {
-                               name: "shadow_show";
-                               signal: "elm,state,shadow_show";
-                               source: "elm";
-                               action: STATE_SET "show" 0.0;
-                               target: "elm.swallow.icon_shadow";
-                               target: "elm.swallow.text_shadow";
-                       }
-                       program {
-                               name: "shadow_hide";
-                               signal: "elm,state,shadow_hide";
-                               source: "elm";
-                               action: STATE_SET "default" 0.0;
-                               target: "elm.swallow.icon_shadow";
-                               target: "elm.swallow.text_shadow";
-                       }
                }
        }
 
                        }
                }
        }
-       
+
        group{
                name: "elm/controlbar/base/navigationbar";
-               
+
                parts{
                        part{
                                name: "bg_rect";
                                }
                                description{
                                        state: "large" 0.0;
-                                       min: 0 TAB_BAR_H;
+                                       min: 0 CONTROLBAR_LARGE_H;
                                        fixed: 0 1;
                                        align: 0.5 1.0;
                                        rel1 {relative: 0.0 1.0; offset: 0 -1;}
                                }
                                description{
                                        state: "small" 0.0;
-                                       min: 0 TOOL_BAR_H;
+                                       min: 0 CONTROLBAR_SMALL_H;
                                        fixed: 0 1;
                                        align: 0.5 1.0;
                                        rel1 {relative: 0.0 1.0; offset: 0 -1;}
                                }
                                description{
                                        state: "left" 0.0;
-                                       min: TAB_BAR_H 0;
+                                       min: CONTROLBAR_W 0;
                                        fixed: 1 0;
                                        align: 0.0 0.5;
                                        rel1 {relative: 0.0 0.0; offset: 0 0;}
                                }
                                description{
                                        state: "right" 0.0;
-                                       min: TAB_BAR_H 0;
+                                       min: CONTROLBAR_W 0;
                                        fixed: 1 0;
                                        align: 1.0 0.5;
                                        rel1 {relative: 1.0 0.0; offset: -1 0;}
                                        rel2 {relative: 1.0 1.0; offset: -1 -1;}
                                }
-                       }       
+                       }
                        part{
                                name: "elm.swallow.items";
                                type: SWALLOW;
        group{
                name: "elm/controlbar/background/navigationbar";
 
-               images{
-                       image: "00_winset_control_top_bg.png" COMP;
-                       image: "00_winset_control_tabbar_bg.png" COMP;
-                       image: "00_winset_control_tabbar_left_bg.png" COMP;
-                       image: "00_winset_control_tabbar_right_bg.png" COMP;
-               }
-
                parts{
                        part{
                                name: "bg_image";
-                               type: IMAGE;
-                               scale: 1;
-                               mouse_events:0;
-                               description{
-                                       state: "default" 0.0;
-                                       rel1 {relative: 0.0 0.0; offset: 0 0;}
-                                       rel2 {relative: 1.0 1.0; offset: -1 -1;}
-                                       image.normal: "00_winset_control_top_bg.png";
-                                       image.border: 1 1 2 6;
-                                       color: 255 255 255 255; 
-                               }
-                               description{
-                                       state: "tabbar" 0.0;
-                                       inherit: "default" 0.0;
-                                       image.normal: "00_winset_control_tabbar_bg.png";
-                               }
-                               description{
-                                       state: "tabbar_left" 0.0;
-                                       inherit: "default" 0.0;
-                                       image.normal: "00_winset_control_tabbar_left_bg.png";
-                               }
-                               description{
-                                       state: "tabbar_right" 0.0;
-                                       inherit: "default" 0.0;
-                                       image.normal: "00_winset_control_tabbar_right_bg.png";
-                               }
-                       }
-               }
-               programs {
-                       program {
-                               name: "tabbar_bg";
-                               signal: "elm,state,tabbar";
-                               source: "elm";
-                               action: STATE_SET "tabbar" 0.0;
-                               target: "bg_image";
-                       }
-                       program {
-                               name: "toolbar_bg";
-                               signal: "elm,state,toolbar";
-                               source: "elm";
-                               action: STATE_SET "default" 0.0;
-                               target: "bg_image";
-                       }
-                       program {
-                               name: "tabbar_left_bg";
-                               signal: "elm,state,tabbar_left";
-                               source: "elm";
-                               action: STATE_SET "tabbar_left" 0.0;
-                               target: "bg_image";
-                       }
-                       program {
-                               name: "tabbar_right_bg";
-                               signal: "elm,state,tabbar_right";
-                               source: "elm";
-                               action: STATE_SET "tabbar_right" 0.0;
-                               target: "bg_image";
-                       }
-               }
-       }
-
-       group{
-               name: "elm/controlbar/base/navigationbar_noshadow";
-               
-               parts{
-                       part{
-                               name: "bg_rect";
                                type: RECT;
                                scale: 1;
                                mouse_events:0;
                                        state: "default" 0.0;
                                        rel1 {relative: 0.0 0.0; offset: 0 0;}
                                        rel2 {relative: 1.0 1.0; offset: -1 -1;}
-                                       color: 0 0 0 0;
-                               }
-                       }
-                       part{
-                               name: "bg_image";
-                               type: SWALLOW;
-                               scale: 1;
-                               mouse_events:0;
-                               description{
-                                       state: "default" 0.0;
-                                       rel1 {relative: 0.0 0.0; offset: 0 0;}
-                                       rel2 {relative: 1.0 1.0; offset: -1 -1;}
-                               }
-                               description{
-                                       state: "large" 0.0;
-                                       min: 0 TAB_BAR_H;
-                                       fixed: 0 1;
-                                       align: 0.5 1.0;
-                                       rel1 {relative: 0.0 1.0; offset: 0 -1;}
-                                       rel2 {relative: 1.0 1.0; offset: -1 -1;}
-                               }
-                               description{
-                                       state: "small" 0.0;
-                                       min: 0 TOOL_BAR_H;
-                                       fixed: 0 1;
-                                       align: 0.5 1.0;
-                                       rel1 {relative: 0.0 1.0; offset: 0 -1;}
-                                       rel2 {relative: 1.0 1.0; offset: -1 -1;}
-                               }
-                               description{
-                                       state: "left" 0.0;
-                                       min: TAB_BAR_H 0;
-                                       fixed: 1 0;
-                                       align: 0.0 0.5;
-                                       rel1 {relative: 0.0 0.0; offset: 0 0;}
-                                       rel2 {relative: 0.0 1.0; offset: 0 -1;}
-                               }
-                               description{
-                                       state: "right" 0.0;
-                                       min: TAB_BAR_H 0;
-                                       fixed: 1 0;
-                                       align: 1.0 0.5;
-                                       rel1 {relative: 1.0 0.0; offset: -1 0;}
-                                       rel2 {relative: 1.0 1.0; offset: -1 -1;}
-                               }
-                       }       
-                       part{
-                               name: "elm.swallow.items";
-                               type: SWALLOW;
-                               scale: 1;
-                               description{
-                                       state: "default" 0.0;
-                                       rel1 {relative: 0.0 0.0; offset: 5 0; to: "bg_image";}
-                                       rel2 {relative: 1.0 1.0; offset: -6 -1; to: "bg_image";}
-                               }
-                       }
-               }
-               programs{
-                       program{
-                               name: "default";
-                               signal: "elm,state,default";
-                               source: "elm";
-                               action: STATE_SET "default" 0.0;
-                               target: "bg_image";
-                       }
-                       program{
-                               name: "large";
-                               signal: "elm,state,large";
-                               source: "elm";
-                               action: STATE_SET "large" 0.0;
-                               target: "bg_image";
-                       }
-                       program{
-                               name: "small";
-                               signal: "elm,state,small";
-                               source: "elm";
-                               action: STATE_SET "small" 0.0;
-                               target: "bg_image";
-                       }
-                       program{
-                               name: "left";
-                               signal: "elm,state,left";
-                               source: "elm";
-                               action: STATE_SET "left" 0.0;
-                               target: "bg_image";
-                       }
-                       program{
-                               name: "right";
-                               signal: "elm,state,right";
-                               source: "elm";
-                               action: STATE_SET "right" 0.0;
-                               target: "bg_image";
-                       }
-               }
-       }
-
-       group{
-               name: "elm/controlbar/background/navigationbar_noshadow";
-
-               images{
-                       image: "00_winset_control_top_noshadow_bg.png" COMP;
-                       image: "00_winset_control_tabbar_bg.png" COMP;
-                       image: "00_winset_control_tabbar_left_bg.png" COMP;
-                       image: "00_winset_control_tabbar_right_bg.png" COMP;
-               }
-
-               parts{
-                       part{
-                               name: "bg_image";
-                               type: IMAGE;
-                               scale: 1;
-                               mouse_events:0;
-                               description{
-                                       state: "default" 0.0;
-                                       rel1 {relative: 0.0 0.0; offset: 0 0;}
-                                       rel2 {relative: 1.0 1.0; offset: -1 -1;}
-                                       image.normal: "00_winset_control_top_noshadow_bg.png";
-                                       image.border: 1 1 0 0;
-                                       color: 255 255 255 255; 
+                                       color: 255 255 255 0;
                                }
                                description{
                                        state: "tabbar" 0.0;
                                        inherit: "default" 0.0;
-                                       image.normal: "00_winset_control_tabbar_bg.png";
                                }
                                description{
                                        state: "tabbar_left" 0.0;
                                        inherit: "default" 0.0;
-                                       image.normal: "00_winset_control_tabbar_left_bg.png";
                                }
                                description{
                                        state: "tabbar_right" 0.0;
                                        inherit: "default" 0.0;
-                                       image.normal: "00_winset_control_tabbar_right_bg.png";
                                }
                        }
                }
              tag:  "tab" "\t";
           }
        }
-       
+
        group { name: "elm/label/base/controlbar";
       data.item: "default_font_size" "18";
       data.item: "min_font_size" "14";
       data.item: "max_font_size" "60";
-      
+
       parts {
                 part { name: "label.swallow.background";
                        type: SWALLOW;
            description { state: "default" 0.0;
                // FIXME : fixed for multiline ellipsis.
                //         does it need to make another ellipsis style? 
-              fixed: 0 1; 
+              fixed: 0 1;
               text {
                  style: "controlbar_textblock_style";
                  min: 0 1;
            description { state: "wordwrap_mode" 0.0;
                // FIXME : fixed for multiline ellipsis.
                //         does it need to make another ellipsis style? 
-              fixed: 0 1; 
+              fixed: 0 1;
               text {
                  style: "controlbar_textblock_wordwrap_style";
                  min: 0 1;
index 317c119..84e4068 100644 (file)
                                        color: CTXPOPUP_FONT_COLOR;
                                        text {
                                                font: "SLP:style=Roman";
-                                               size: 34;
+                                               size: 24;
                                                align: 0.5 0.5;
                                                min: 1 1;
                                        }
                                        color: CTXPOPUP_FONT_COLOR;
                                        text {
                                                font: "SLP:style=Roman";
-                                               size: 30;
+                                               size: 20;
                                                align: 0.0 0.5;
                                                min: 1 1;
                                        }
index e57f795..1f453fb 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  NBeat-theme
+ *  Beat-theme
  *
  * Copyright (c) 2000 - 2010 Samsung Electronics Co., Ltd.
  *
  * vim:ts=3
  */        
 
-   group { name: "elm/genlist/item/edit_default/default";
-      alias: "elm/genlist/item_odd/edit_default/default";
-      alias: "elm/genlist/item_compress/edit_default/default";
-      alias: "elm/genlist/item_compress_odd/edit_default/default";
+   #define EDIT_ICON_WIDTH 26
+   #define EDIT_ICON_HEIGHT 26
+   #define GENLIST_EDIT_CHECKBOX_WIDTH    EDIT_ICON_WIDTH
+   #define GENLIST_EDIT_CHECKBOX_HEIGHT   EDIT_ICON_HEIGHT
 
-      data.item: "edit_icons" "elm.edit.icon.1 elm.edit.icon.2";
-      data.item: "icon_width" 60;
+   group { name: "elm/genlist/item/edit_control/default";
+      alias: "elm/genlist/item_odd/edit_control/default";
+      alias: "elm/genlist/item_compress/edit_control/default";
+      alias: "elm/genlist/item_compress_odd/edit_control/default";
+
+      data.item: "reorder" "reorder_icon";
+      data.item: "insert" "insert_icon";
+      data.item: "delete" "select_icon";
+      data.item: "del_confirm" "elm.icon.del_confirm";
+      data.item: "icon_width" 50;
+      data.item: "del_button_style" "custom/red";
+      data.item: "icons" "elm.swallow.end";
+      data.item: "rename" "elm.swallow.edit_field_1line elm.swallow.edit_field_2line";
       
       images {
+         image: "00_check_bg.png" COMP;
+         image: "00_check_checking.png" COMP;
          image: "01_list_reorder_bg_above.png" COMP;
          image: "01_list_reorder_bg_below.png" COMP;
+         image: "00_list_group_edit_field_middle.png" COMP;
+         image: "00_reorder_group_list_bg.png" COMP;
+         image: "00_list_body_bg.png" COMP;
       }
       parts {
          part { name: "base";
@@ -51,9 +67,8 @@
          }
          BEAT_GENLIST_PART_PADDING_TOP( 0 )
          BEAT_GENLIST_PART_PADDING_BOTTOM( 0 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
 
-         part { name: "elm.padding.reorder";
+         part { name: "elm.padding.left";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                fixed: 1 0;
             }
          }
+
+         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+
+         part { name: "reorder_left_image";
+            clip_to: "disclip";
+            mouse_events: 1;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 15 0;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.bottom";
+               }
+               image.normal: "00_list_body_bg.png";
+            }
+            description { state: "reorder" 0.0;
+               inherit: "default" 0.0;
+               min: 15 0;
+               fixed: 1 0;
+               image.border: 0 0 13 13;
+               image.normal: "00_reorder_group_list_bg.png";
+            }
+         }
+
          part { name: "elm.edit_bg";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.reorder";
+                  to_x: "reorder_left_image";
                   to_y: "elm.padding.top";
                }
                rel2 {
              color: GENLIST_PART_BG_COLOR_INC;
             }
          }
-         part { name: "elm.padding.icon1.left";
-            type: RECT;
+
+         part { name: "check_bg";
+            clip_to: "disclip";
+            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 10 0;
-               fixed: 1 0;
                visible: 0;
+               min: 0 26;
+               fixed: 1 1;
+               align: 0.0 0.5;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.reorder";
+                  relative: 1.0 0.5;
+                  to_x: "reorder_left_image";
+                  to_y: "base";
                }
-               rel2.to_x: "elm.padding.reorder";
-               align: 0.0 0.0;
+               rel2 {
+                  relative: 1.0 0.5;
+                  to_x: "reorder_left_image";
+                  to_y: "base";
+               }
+               image.normal: "00_check_bg.png";
+            }
+            description { state: "enabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               min: 26 26;
+
             }
          }
 
-        part { name: "elm.edit.icon.1";
+         part { name: "check_checking";
             clip_to: "disclip";
-            type: SWALLOW;
+            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
+               visible: 0;
                min: 26 26;
-               max: 26 26;
                fixed: 1 1;
                align: 0.0 0.5;
                rel1 {
-                  relative: 1.0 1.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.icon1.left";
-                  to_y: "elm.padding.top";
+                  relative: 1.0 0.5;
+                  to_x: "reorder_left_image";
+                  to_y: "base";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.icon1.left";
-                  to_y: "elm.padding.bottom";
+                  relative: 1.0 0.5;
+                  to_x: "reorder_left_image";
+                  to_y: "base";
                }
+               image.normal: "00_check_checking.png";
             }
+            description { state: "on_uncheck" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+            description { state: "on_check" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }            
          }
-         
-         part { name: "elm.padding.icon1.right";
+
+         part { name: "check_bg_touch_area";
             type: RECT;
+            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 10 0;
+               min: (GENLIST_EDIT_CHECKBOX_WIDTH+10) 0;
                fixed: 1 0;
-               visible: 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.edit.icon.1";
-               }
-               rel2.to_x: "elm.edit.icon.1";
-               align: 0.0 0.0;
+               align: 0 0.5;
+               rel1 { relative: 0 0; to_x: "check_bg"; }
+               rel2 { relative: 0 1; to_x: "check_bg"; }
+               color: 0 0 0 0;
             }
          }
 
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
+                  to_x: "check_bg";
                   to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.2 0.0;
-                  to_x: "elm.edit.icon.2";
+                  to_x: "elm.swallow.end";
                   to_y: "elm.padding.bottom";
                }
             }
              inherit: "default" 0.0;
              visible: 0;
           }
-          description { state: "renamed" 0.0;
-             inherit: "default" 0.0;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon1.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 1.3 0.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
-               }
-            }
-         }
+        }
 
-       part { name: "elm.edit.icon.2";
-          clip_to: "disclip";
+       part { name: "elm.swallow.end";
           type: SWALLOW;
           scale: 1;
           description { state: "default" 0.0;
                 to_x: "elm.padding.right";
              }
           }
-          description { state: "disabled" 0.0;
+          description { state: "disable" 0.0;
              inherit: "default" 0.0;
              visible: 0;
           }
        }
 
+       part { name: "elm.swallow.edit_field_bg";
+         type: IMAGE;
+        mouse_events: 1;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            color: 255 255 255 0;
+            rel1 {
+              relative: 1.0 0.0;
+              to_x: "check_bg";
+              offset: 0 1;
+            }
+            rel2 {
+              relative: 1.0 1.0;
+              offset: -1 -6;
+            }
+            image.border: 13 13 9 9;
+            image.normal: "00_list_group_edit_field_middle.png";
+         }
+         description { state: "enabled" 0.0;
+             inherit: "default" 0.0;
+             visible: 1;
+             color: 255 255 255 255;
+          }
+       }
+
+       part { name: "elm.swallow.edit_field_1line";
+         type: SWALLOW;
+         mouse_events: 1;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            rel1 {
+               relative: 1.0 0.0;
+               to_x: "check_bg";
+               offset: 0 1;
+            }
+            rel2 {
+               relative: 0.98 1.0;
+            }
+          }
+          description { state: "enabled" 0.0;
+             inherit: "default" 0.0;
+             visible: 1;
+          }
+       }
+
        part { name: "bottom_line";
           type: RECT;
           clip_to: "disclip";
              min: 0 0;
              fixed: 0 1;
              visible: 1;
-             color: GENLIST_PART_BOTTOM_LINE_INC;
+             color: GENLIST_EDIT_PART_LINE_INC;
              rel1 {
                 relative: 0.0 1.0;
-                to_x: "elm.edit_bg";
+                to_x: "check_bg";
                 offset: 0 -1;
              }
           }
              visible: 1;
           }
        }
+
        BEAT_GENLIST_PART_DISCLIP
       }
       programs {
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
 
          // reorder signal
          program { name: "reorder_enable";
             signal: "elm,state,reorder_enable";
             source: "elm";
             action: STATE_SET "reorder" 0.0;
-            target: "elm.padding.reorder";
+            target: "reorder_left_image";
+            target: "elm.padding.left";
             target: "bottom_line";
          }
          program { name: "reorder_disable";
             signal: "elm,state,reorder_disable";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "elm.padding.reorder";
+            target: "reorder_left_image";
+            target: "elm.padding.left";
             target: "bottom_line";
          }
-
          program { name: "reorder_enable_effect";
             signal: "elm,state,reorder_enable_effect";
             source: "elm";
             action: STATE_SET "reorder" 0.0;
-            transition: DECELERATE 0.5;
-            target: "elm.padding.reorder";
-            target: "bottom_line";
-          }
+            target: "reorder_left_image";
+            after: "reorder_enable_padding_effect";
+         }
          program { name: "reorder_disable_effect";
             signal: "elm,state,reorder_disable_effect";
             source: "elm";
             action: STATE_SET "default" 0.0;
+            target: "reorder_left_image";
+            after: "reorder_disable_padding_effect";
+         }
+         program { name: "reorder_enable_padding_effect";
+            source: "elm";
+            action: STATE_SET "reorder" 0.0;
             transition: DECELERATE 0.5;
-            target: "elm.padding.reorder";
-            target: "bottom_line";            
-          }
+            target: "elm.padding.left";
+            target: "bottom_line";
+         }
+         program { name: "reorder_disable_padding_effect";
+            signal: "elm,state,reorder_disable";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "elm.padding.left";
+            target: "bottom_line";
+         }
+
+         // checkbox
+         program {
+            name:    "on_select";
+            signal:  "mouse,clicked,1";
+            source:  "check_bg_touch_area";
+            action:  SIGNAL_EMIT "elm,action,item,select" "elm";
+         }
+         program {
+            name:    "enable_select_mode";
+            signal:  "elm,state,sel,enable";
+            source:  "elm";
+            action:  STATE_SET "enabled" 0.0;
+            target:  "check_bg";
+         }
+         program {
+            name:    "disable_select_mode";
+            signal:  "elm,state,sel,disable";
+            source:  "elm";
+            action:  STATE_SET "default" 0.0;
+            target:  "check_bg";
+         }
+         program {
+            name:    "enable_select_effect_mode";
+            signal:  "elm,state,sel,enable_effect";
+            source:  "elm";
+            action:  STATE_SET "enabled" 0.0;
+            transition: DECELERATE 0.5;
+            target:  "check_bg";
+         }
+         program {
+            name:    "disable_select_effect_mode";
+            signal:  "elm,state,sel,disable_effect";
+            source:  "elm";
+            action:  STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target:  "check_bg";
+         }
+         program {
+            name:    "enable_delete";
+            signal:  "elm,state,sel_uncheck";
+            source:  "elm";
+            action:  STATE_SET "on_uncheck" 0.0;
+            target:  "check_checking";
+         }
+         program {
+            name:    "select_icon_check_mode";
+            signal:  "elm,state,sel_check";
+            source:  "elm";
+            action:  STATE_SET "on_check" 0.0;
+            target:  "check_checking";
+         }
+
         // reorder glow
         program {
             name:    "show_reorder_glow";
         // rename
         program {
             name:    "enable_rename_mode";
-            signal:  "elm,state,rename,enabled";
+            signal:  "elm,state,rename,enable";
             source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "elm.edit.icon.2";
-            after:   "enable_rename_mode_next";
-        }
-        program {
-            name:    "enable_rename_mode_next";
-            action:  STATE_SET "renamed" 0.0;
-//            transition: DECELERATE 0.5;
-            target:  "original_edc";
+            action:  STATE_SET "enabled" 0.0;
+            transition: DECELERATE 0.3;
+            target:  "elm.swallow.edit_field_bg";
+            target:  "elm.swallow.edit_field_1line";
         }
         program {
             name:    "disable_rename_mode";
-            signal:  "elm,state,rename,disabled";
+            signal:  "elm,state,rename,disable";
             source:  "elm";
             action:  STATE_SET "default" 0.0;
-//            transition: DECELERATE 0.5;
-            target:  "original_edc";
-            target:  "elm.edit.icon.2";
+            transition: DECELERATE 0.3;
+            target:  "elm.swallow.edit_field_bg";
+            target:  "elm.swallow.edit_field_1line";
         }
       }
    }
 
-  group { name: "elm/genlist/item/select_all/default";
+   group { name: "elm/genlist/item/select_all/default";
       alias: "elm/genlist/item_odd/select_all/default";
       alias: "elm/genlist/item_compress/select_all/default";
       alias: "elm/genlist/item_compress_odd/select_all/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text";
-      data.item: "icons" "elm.icon";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
+
       parts {
          part { name: "base";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: 0 70;
-               color: 239 237 230 255;
+               color: GENLIST_PART_BG_COLOR_INC;
             }
          }
+
          part { name: "bg";
             type: RECT;
             clip_to: "disclip";
             repeat_events: 0;
             mouse_events: 0;
-            description { state: "default" 0.0; 
-               color: 239 237 230 255;
+            description { state: "default" 0.0;
+               color: GENLIST_PART_SELECT_ALL_BG_COLOR_INC; 
             }
          }
+
          BEAT_GENLIST_PART_BG_IMAGE
          BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 15 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 15 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 15 )
+         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
          BEAT_GENLIST_PART_PADDING_RIGHT( 15 )
-
-         part { name: "elm.padding.icon.right";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 15 0;
-               fixed: 1 0;
-               visible: 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon";
-               }
-               rel2.to_x: "elm.icon";
-               align: 0.0 0.0;
-            }
-         }
-         part { name: "elm.icon";
+         part { name: "elm.swallow.end";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: 50 50;
-               max: 50 50;
-               fixed: 1 1;
-               align: 0.0 0.0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
-               }
+               fixed: 1 0;
+               align: 1.0 0.5;
+               rel1.to_x: "elm.padding.right";
                rel2 {
-                  relative: 1.0 0.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.bottom";
+                  relative: 0.0  1.0;
+                  to_x: "elm.padding.right";
                }
             }
          }
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               align: 0.0 0.0;
                rel1 {
-                  relative: 1.0 1.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.icon.right";
-                  to_y: "elm.padding.top";
+                  relative: 1.0  0.0;
+                  offset: 20 0;
+                  to_x: "check_bg";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
+                  to_x: "elm.swallow.end";
+                  relative: 0.0  1.0;
+                  offset:   20   0;
                }
                color: GENLIST_PART_TEXT_COLOR_INC;
                text {
                   size: 32;
                   min: 0 1;
                   align: 0.0 0.5;
+                  text: "Select All";
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
+               color: 225 225 225 255;
             }
          }
-       BEAT_GENLIST_PART_DISCLIP
-      }
-      programs {
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text";
+         part { name: "check_bg";
+            clip_to: "disclip";
+            mouse_events: 1;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 26 26;
+               fixed: 1 1;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1.0 0.5;
+                  to_x: "elm.padding.left";
+                  to_y: "base";
+               }
+               rel2 {
+                  relative: 1.0 0.5;
+                  to_x: "elm.padding.left";
+                  to_y: "base";
+               }
+               image.normal: "00_check_bg.png";
+            }
          }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            transition: LINEAR 0.1;
+
+         part { name: "check_checking";
+            clip_to: "disclip";
+            mouse_events: 1;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               min: 26 26;
+               fixed: 1 1;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1.0 0.5;
+                  to_x: "elm.padding.left";
+                  to_y: "base";
+               }
+               rel2 {
+                  relative: 1.0 0.5;
+                  to_x: "elm.padding.left";
+                  to_y: "base";
+               }
+               image.normal: "00_check_checking.png";
+            }
+            description { state: "on_uncheck" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+            description { state: "on_check" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
          }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
+
+         part { name: "check_bg_touch_area";
+            type: RECT;
+            mouse_events: 1;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: (GENLIST_EDIT_CHECKBOX_WIDTH+10) 0;
+               fixed: 1 0;
+               align: 0 0.5;
+               rel1 { relative: 0 0; to_x: "check_bg"; }
+               rel2 { relative: 0 1; to_x: "check_bg"; }
+               color: 0 0 0 0;
+            }
          }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
+
+         BEAT_GENLIST_PART_DISCLIP
+      }
+      programs {
+        program {
+           name:    "enable_select_check";
+           signal:  "elm,state,sel_check";
+           source:  "elm";
+           action:  STATE_SET "on_check" 0.0;
+           target:  "check_checking";
+        }   
+        program {
+           name:    "enable_select_uncheck";
+           signal:  "elm,state,sel_uncheck";
+           source:  "elm";
+           action:  STATE_SET "on_uncheck" 0.0;
+           target:  "check_checking";
+        }
+         program {
+            name:    "on_mouse_click";
+            signal:  "mouse,click,1";
+            source:  "check_bg_touch_area";
+            action:  SIGNAL_EMIT "elm,action,select,click" "elm";
          }
       }
    }
index b0b433f..5d8cac1 100644 (file)
       }
    }
 
+   /////////// will be removed ////////
    group { name : "elm/genlist/item/grouptitle.dialogue/default";
       alias: "elm/genlist/item_odd/grouptitle.dialogue/default";
       alias: "elm/genlist/item_compress/grouptitle.dialogue/default";
          }
       }
    }
+   /////////////////////////////////////////////////
index fe6c499..1759fdf 100644 (file)
                color: 0 0 0 0; \
             } \
          }
-
-#define BEAT_GENLIST_PROGRAM_RENAME \
-         program { name: "rename_enabled"; \
-            signal: "elm,state,rename,enabled"; \
-            source: "elm"; \
-            action: STATE_SET "rename_enabled" 0.0; \
-            target: "elm.text"; \
-            target: "elm.edit.rename"; \
-         } \
-         program { name: "rename_disabled"; \
-            signal: "elm,state,rename,disabled"; \
-            source: "elm"; \
-            action: STATE_SET "default" 0.0; \
-            target: "elm.text"; \
-            target: "elm.edit.rename"; \
-         }
index 2270758..baabaed 100644 (file)
       }
    }
 
+   group { name: "elm/genlist/item/1icon/default";
+      alias: "elm/genlist/item_odd/1icon/default";
+      alias: "elm/genlist/item_compress/1icon/default";
+      alias: "elm/genlist/item_compress_odd/1icon/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "icons" "elm.icon";
+
+      parts {
+         part { name: "base";
+            type: RECT;
+            repeat_events: 1;
+            scale: 1;
+            description { state: "default" 0.0;
+               color: GENLIST_PART_BG_COLOR_INC;
+            }
+         }
+         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
+         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         BEAT_GENLIST_PART_BOTTOM_LINE
+         part { name: "elm.icon";
+           clip_to: "disclip";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+               }
+            }
+         }
+         BEAT_GENLIST_PART_DISCLIP
+      }
+      programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         program { name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program { name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+         program { name: "go_editing";
+            signal: "elm,state,editing";
+            source: "elm";
+            action: STATE_SET "editing" 0.0;
+            target: "elm.padding.right";
+         }
+         program { name: "go_viewing";
+            signal: "elm,state,viewing";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.padding.right";
+         }
+      }
+   }
+
    group { name: "elm/genlist/item/1text/default";
       alias: "elm/genlist/item_odd/1text/default";
       alias: "elm/genlist/item/1line_textonly/default";
       alias: "elm/genlist/item_odd/1line_textonly/default";
       alias: "elm/genlist/item_compress/1line_textonly/default";
       alias: "elm/genlist/item_compress_odd/1line_textonly/default";
-      alias: "elm/genlist/item_compress/1text/default";
-      alias: "elm/genlist/item_compress_odd/1text/default";
 
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text";
-      data.item: "renames" "elm.edit.rename";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            description { state: "rename_enabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.edit.rename";
-            clip_to: "disclip";
-            type: SWALLOW;
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0  0.5;
-                  offset: 0 0;
-                  to_x: "elm.padding.left";
-               }
-               rel2 {
-                  relative: 0.0  0.5;
-                  offset:   0   0;
-                  to_x: "elm.padding.right";
-               }
-            }
-            description { state: "rename_enabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
          }
          BEAT_GENLIST_PART_DISCLIP
       }
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME
       }
    }
 
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text";
       data.item: "icons" "elm.icon";
-      data.item: "renames" "elm.edit.rename";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            description { state: "rename_enabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.edit.rename";
-            clip_to: "disclip";
-            type: SWALLOW;
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               align: 0.0 0.0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.icon.left";
-                  to_y: "elm.padding.bottom";
-               }
-            }
-            description { state: "rename_enabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
          }
        BEAT_GENLIST_PART_DISCLIP
       }
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME
       }
    }
 
       }
    }
 
-   group { name: "elm/genlist/item/1text.3icon/default";
-      alias: "elm/genlist/item_odd/1text.3icon/default";
-      alias: "elm/genlist/item_compress/1text.3icon/default";
-      alias: "elm/genlist/item_compress_odd/1text.3icon/default";
+   group { name: "elm/genlist/item/1text.2icon.3/default";
+      alias: "elm/genlist/item_odd/1text.2icon.3/default";
+      alias: "elm/genlist/item_compress/1text.2icon.3/default";
+      alias: "elm/genlist/item_compress_odd/1text.2icon.3/default";
 
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text";
-      data.item: "icons" "elm.icon.1 elm.icon.2 elm.icon.3";
+      data.item: "icons" "elm.icon.1 elm.icon.2";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
          BEAT_GENLIST_PART_PADDING_LEFT( 10 )
          BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
 
-         part { name: "elm.padding.icon1.right";
+         part { name: "elm.padding.icon1.left";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                fixed: 1 0;
                visible: 0;
                rel1 {
-                  relative: 1.0 0.0;
+                  relative: 0.0 0.0;
                   to_x: "elm.icon.1";
                }
                rel2.to_x: "elm.icon.1";
-               align: 0.0 0.0;
+               align: 1.0 0.0;
             }
          }
          part { name: "elm.icon.1";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: 26 26;
-               max: 26 26;
-               fixed: 1 1;
-               align: 0.0 0.5;
+               align: 1.0 0.5;
                rel1 {
-                  relative: 1.0 1.0;
+                  relative: 0.0 1.0;
                   offset: 0 0;
-                  to_x: "elm.padding.left";
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 1.0 0.0;
+                  relative: 0.0 0.0;
                   offset: 0 0;
-                  to_x: "elm.padding.left";
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
             }
          }
-         part { name: "elm.padding.icon2.right";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 10 0;
-               fixed: 1 0;
-               visible: 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.2";
-               }
-               rel2.to_x: "elm.icon.2";
-               align: 0.0 0.0;
-            }
-         }
          part { name: "elm.icon.2";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: 40 40;
-               max: 40 40;
+               min: 20 20;
+               max: 20 20;
                fixed: 1 1;
                align: 0.0 0.5;
                rel1 {
                   relative: 1.0 1.0;
                   offset: 0 0;
-                  to_x: "elm.padding.icon1.right";
+                  to_x: "elm.padding.text.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 1.0 0.0;
                   offset: 0 0;
-                  to_x: "elm.padding.icon1.right";
+                  to_x: "elm.padding.text.right";
                   to_y: "elm.padding.bottom";
                }
             }
          }
-         part { name: "elm.padding.icon3.left";
+         part { name: "elm.padding.text.right";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                fixed: 1 0;
                visible: 0;
                rel1 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.icon.3";
-               }
-               rel2.to_x: "elm.icon.3";
-               align: 1.0 0.0;
-            }
-         }
-         part { name: "elm.icon.3";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               align: 1.0 0.5;
-               rel1 {
-                  relative: 0.0 1.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
+                  relative: 1.0 0.0;
+                  to_x: "elm.text";
                }
+               rel2.to_x: "elm.text";
+               align: 0.0 0.0;
             }
          }
          part { name: "elm.text";
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
+               min: 0 0;
+               fixed: 1 0;
                align: 0.0 0.0;
                rel1 {
                   relative: 1.0 1.0;
                   offset: 0 0;
-                  to_x: "elm.padding.icon2.right";
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 0.0;
+                  relative: 1.0 0.0;
                   offset: 0 0;
-                  to_x: "elm.padding.icon3.left";
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.bottom";
                }
                color: GENLIST_PART_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
                   size: 28;
-                  min: 0 1;
+                  min: 1 1;
                   align: 0.0 0.5;
                }
             }
       }
    }
 
-   group { name: "elm/genlist/item/1text.3icon.2/default";
-      alias: "elm/genlist/item_odd/1text.3icon.2/default";
-      alias: "elm/genlist/item_compress/1text.3icon.2/default";
-      alias: "elm/genlist/item_compress_odd/1text.3icon.2/default";
+   group { name: "elm/genlist/item/1text.3icon/default";
+      alias: "elm/genlist/item_odd/1text.3icon/default";
+      alias: "elm/genlist/item_compress/1text.3icon/default";
+      alias: "elm/genlist/item_compress_odd/1text.3icon/default";
 
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
                }
             }
          }
-         part { name: "elm.padding.icon2.left";
+         part { name: "elm.padding.icon2.right";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                fixed: 1 0;
                visible: 0;
                rel1 {
-                  relative: 0.0 0.0;
+                  relative: 1.0 0.0;
                   to_x: "elm.icon.2";
                }
                rel2.to_x: "elm.icon.2";
                min: 40 40;
                max: 40 40;
                fixed: 1 1;
-               align: 1.0 0.5;
+               align: 0.0 0.5;
                rel1 {
-                  relative: 0.0 1.0;
+                  relative: 1.0 1.0;
                   offset: 0 0;
-                  to_x: "elm.padding.icon3.left";
+                  to_x: "elm.padding.icon1.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 0.0;
+                  relative: 1.0 0.0;
                   offset: 0 0;
-                  to_x: "elm.padding.icon3.left";
+                  to_x: "elm.padding.icon1.right";
                   to_y: "elm.padding.bottom";
                }
             }
                rel1 {
                   relative: 1.0 1.0;
                   offset: 0 0;
-                  to_x: "elm.padding.icon1.right";
+                  to_x: "elm.padding.icon2.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 0.0;
                   offset: 0 0;
-                  to_x: "elm.padding.icon2.left";
+                  to_x: "elm.padding.icon3.left";
                   to_y: "elm.padding.bottom";
                }
                color: GENLIST_PART_TEXT_COLOR_INC;
       }
    }
 
-   group { name: "elm/genlist/item/2text.1icon/default";
-      alias: "elm/genlist/item_odd/2text.1icon/default";
-      alias: "elm/genlist/item_compress/2text.1icon/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon/default";
+   group { name: "elm/genlist/item/1text.3icon.2/default";
+      alias: "elm/genlist/item_odd/1text.3icon.2/default";
+      alias: "elm/genlist/item_compress/1text.3icon.2/default";
+      alias: "elm/genlist/item_compress_odd/1text.3icon.2/default";
 
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "labels" "elm.text.1 elm.text.2";
-      data.item: "icons" "elm.icon";
+      data.item: "labels" "elm.text";
+      data.item: "icons" "elm.icon.1 elm.icon.2 elm.icon.3";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
          BEAT_GENLIST_PART_PADDING_LEFT( 10 )
          BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
 
-         part { name: "elm.padding.icon.right";
+         part { name: "elm.padding.icon1.right";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                visible: 0;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.icon";
+                  to_x: "elm.icon.1";
                }
-               rel2.to_x: "elm.icon";
+               rel2.to_x: "elm.icon.1";
                align: 0.0 0.0;
             }
          }
-         part { name: "elm.icon";
+         part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: 40 40;
-               max: 40 40;
+               min: 26 26;
+               max: 26 26;
                fixed: 1 1;
-               align: 0.0 0.0;
+               align: 0.0 0.5;
                rel1 {
                   relative: 1.0 1.0;
                   offset: 0 0;
                }
             }
          }
-         part { name: "elm.text.1";
-            clip_to: "disclip";
+         part { name: "elm.padding.icon2.left";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 10 0;
+               fixed: 1 0;
+               visible: 0;
+               rel1 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.icon.2";
+               }
+               rel2.to_x: "elm.icon.2";
+               align: 0.0 0.0;
+            }
+         }
+         part { name: "elm.icon.2";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 40 40;
+               max: 40 40;
+               fixed: 1 1;
+               align: 1.0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.icon3.left";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.icon3.left";
+                  to_y: "elm.padding.bottom";
+               }
+            }
+         }
+         part { name: "elm.padding.icon3.left";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 10 0;
+               fixed: 1 0;
+               visible: 0;
+               rel1 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.icon.3";
+               }
+               rel2.to_x: "elm.icon.3";
+               align: 1.0 0.0;
+            }
+         }
+         part { name: "elm.icon.3";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               align: 1.0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
+               }
+            }
+         }
+         part { name: "elm.text";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.icon1.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.padding.bottom";
+               }
+               color: GENLIST_PART_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: 28;
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
+            }
+         }
+       BEAT_GENLIST_PART_DISCLIP
+      }
+      programs {
+         program { name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg_image";
+            target: "elm.text";
+         }
+         program { name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg_image";
+            target: "elm.text";
+            transition: LINEAR 0.1;
+         }
+         program { name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program { name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+      }
+   }
+
+   group { name: "elm/genlist/item/2text.1icon/default";
+      alias: "elm/genlist/item_odd/2text.1icon/default";
+      alias: "elm/genlist/item_compress/2text.1icon/default";
+      alias: "elm/genlist/item_compress_odd/2text.1icon/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "labels" "elm.text.1 elm.text.2";
+      data.item: "icons" "elm.icon";
+      images {
+         image: "00_list_bar_press_1x80.png" COMP;
+      }
+      parts {
+         BEAT_GENLIST_PART_BASE( 70 )
+         BEAT_GENLIST_PART_BG_IMAGE
+         BEAT_GENLIST_PART_BOTTOM_LINE
+         BEAT_GENLIST_PART_PADDING_TOP( 10 )
+         BEAT_GENLIST_PART_PADDING_BOTTOM( 10 )
+         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
+         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+
+         part { name: "elm.padding.icon.right";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 10 0;
+               fixed: 1 0;
+               visible: 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon";
+               }
+               rel2.to_x: "elm.icon";
+               align: 0.0 0.0;
+            }
+         }
+         part { name: "elm.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 40 40;
+               max: 40 40;
+               fixed: 1 1;
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.bottom";
+               }
+            }
+         }
+         part { name: "elm.text.1";
+            clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
       }
    }
 
-   group { name: "elm/genlist/item/3text/default";
-      alias: "elm/genlist/item_odd/3text/default";
-      alias: "elm/genlist/item_compress/3text/default";
-      alias: "elm/genlist/item_compress_odd/3text/default";
+   group { name: "elm/genlist/item/2text.3icon/default";
+      alias: "elm/genlist/item_odd/2text.3icon/default";
+      alias: "elm/genlist/item_compress/2text.3icon/default";
+      alias: "elm/genlist/item_compress_odd/2text.3icon/default";
 
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "labels" "elm.text.1 elm.text.2 elm.text.3";
+      data.item: "labels" "elm.text.1 elm.text.2";
+      data.item: "icons" "elm.icon.1 elm.icon.2 elm.icon.3";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
          BEAT_GENLIST_PART_PADDING_LEFT( 10 )
          BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
 
-         part { name: "elm.text.1";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
+         part { name: "elm.padding.icon1.left";
+            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 38;
-               fixed: 0 1;
-               align: 0 0;
+               min: 10 0;
+               fixed: 1 0;
+               visible: 0;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               color: GENLIST_PART_TEXT_COLOR_INC;
-               text {
-                  font: "SLP:style=Roman";
-                  size: 28;
-                  min: 0 1;
-                  align: 0.0 0.5;
+                  relative: 0.0 0.0;
+                  to_x: "elm.text.1";
                }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
+               rel2.to_x: "elm.text.1";
+               align: 1.0 0.0;
             }
          }
-         part { name: "elm.text.2";
+         part { name: "elm.icon.1";
             clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
+            type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
+               min: 20 20;
+               max: 20 20;
+               fixed: 1 1;
+               align: 0.0 0.5;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.text.1";
+                  offset: 0 0;
+                  to_x: "elm.padding.icon1.left";
+                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 0.0;
+                  relative: 1.0 1.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.icon1.left";
+                  to_y: "elm.text.1";
+               }
+            }
+         }
+         part { name: "elm.padding.icon2.right";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 10 0;
+               fixed: 1 0;
+               visible: 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon.2";
+               }
+               rel2.to_x: "elm.icon.2";
+               align: 0.0 0.0;
+            }
+         }
+         part { name: "elm.icon.2";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 20 20;
+               max: 20 20;
+               fixed: 1 1;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.text.1";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.bottom";
+               }
+            }
+         }
+         part { name: "elm.padding.icon3.left";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 10 0;
+               fixed: 1 0;
+               visible: 0;
+               rel1 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.icon.3";
+               }
+               rel2.to_x: "elm.icon.3";
+               align: 1.0 0.0;
+            }
+         }
+         part { name: "elm.icon.3";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               align: 1.0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
                   offset: 0 0;
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_PART_SUB_TEXT_COLOR_INC;
+            }
+         }
+         part { name: "elm.text.1";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 38;
+               fixed: 1 1;
+               align: 0 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
+               }
+               color: GENLIST_PART_TEXT_COLOR_INC;
                text {
-                  font: "SLP:style=Medium";
-                  size: 20;
-                  min: 0 1;
+                  font: "SLP:style=Roman";
+                  size: 28;
+                  min: 1 1;
                   align: 0.0 0.5;
                }
             }
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
          }
-         part { name: "elm.text.3";
+         part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               align: 1 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
+                  to_x: "elm.padding.icon2.right";
+                  to_y: "elm.text.1";
                }
                rel2 {
-                  relative: 0.0 1.0;
+                  relative: 0.0 0.0;
                   offset: 0 0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.text.1";
+                  to_y: "elm.padding.bottom";
                }
                color: GENLIST_PART_SUB_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 20;
                   min: 0 1;
-                  align: 1.0 0.5;
+                  align: 0.0 0.5;
                }
             }
             description { state: "selected" 0.0;
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
-            target: "elm.text.3";
          }
          program { name: "go_passive";
             signal: "elm,state,unselected";
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
-            target: "elm.text.3";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
       }
    }
 
-   group { name: "elm/genlist/item/2text.3/default";
-      alias: "elm/genlist/item_odd/2text.3/default";
-      alias: "elm/genlist/item_compress/2text.3/default";
-      alias: "elm/genlist/item_compress_odd/2text.3/default";
+   group { name: "elm/genlist/item/3text/default";
+      alias: "elm/genlist/item_odd/3text/default";
+      alias: "elm/genlist/item_compress/3text/default";
+      alias: "elm/genlist/item_compress_odd/3text/default";
 
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "labels" "elm.text.1 elm.text.2";
-      data.item: "renames" "elm.edit.rename";
+      data.item: "labels" "elm.text.1 elm.text.2 elm.text.3";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
             description { state: "default" 0.0;
                min: 0 38;
                fixed: 0 1;
-               align: 0 1;
+               align: 0 0;
                rel1 {
-                  relative: 1.0 0.0;
+                  relative: 1.0 1.0;
                   to_x: "elm.padding.left";
-                  to_y: "elm.padding.bottom";
+                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 0.0;
+                  relative: 0.0 1.0;
                   offset: 0 0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
+                  to_y: "elm.padding.top";
                }
                color: GENLIST_PART_TEXT_COLOR_INC;
                text {
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            description { state: "rename_enabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               align: 0 1;
                rel1 {
                   relative: 1.0 1.0;
                   to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
+                  to_y: "elm.text.1";
                }
                rel2 {
                   relative: 0.0 0.0;
                   offset: 0 0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.text.1";
+                  to_y: "elm.padding.bottom";
                }
                color: GENLIST_PART_SUB_TEXT_COLOR_INC;
                text {
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
          }
-         part { name: "elm.edit.rename";
+         part { name: "elm.text.3";
             clip_to: "disclip";
-            type: SWALLOW;
-            mouse_events: 1;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               visible: 0;
-               min: 0 38;
-               fixed: 0 1;
-               align: 0 1;
+               align: 1 1;
                rel1 {
-                  relative: 1.0 0.0;
+                  relative: 1.0 1.0;
                   to_x: "elm.padding.left";
-                  to_y: "elm.padding.bottom";
+                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 0.0;
+                  relative: 0.0 1.0;
                   offset: 0 0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
+                  to_y: "elm.text.1";
+               }
+               color: GENLIST_PART_SUB_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: 20;
+                  min: 0 1;
+                  align: 1.0 0.5;
                }
             }
-            description { state: "rename_enabled" 0.0;
+            description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
          }
          BEAT_GENLIST_PART_DISCLIP
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
+            target: "elm.text.3";
          }
          program { name: "go_passive";
             signal: "elm,state,unselected";
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
+            target: "elm.text.3";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         program { name: "rename_enabled";
-            signal: "elm,state,rename,enabled";
-            source: "elm";
-            action: STATE_SET "rename_enabled" 0.0;
-            target: "elm.text.1";
-            target: "elm.edit.rename";
-         }
-         program { name: "rename_disabled";
-            signal: "elm,state,rename,disabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text.1";
-            target: "elm.edit.rename";
-         }
       }
    }
 
-   group { name: "elm/genlist/item/2line_icontext/default";
-      alias: "elm/genlist/item_odd/2line_icontext/default";
-      alias: "elm/genlist/item_compress/2line_icontext/default";
-      alias: "elm/genlist/item_compress_odd/2line_icontext/default";
+   group { name: "elm/genlist/item/2text.3/default";
+      alias: "elm/genlist/item_odd/2text.3/default";
+      alias: "elm/genlist/item_compress/2text.3/default";
+      alias: "elm/genlist/item_compress_odd/2text.3/default";
 
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "labels" "elm.text elm.text.sub";
-      data.item: "icons" "elm.icon";
+      data.item: "labels" "elm.text.1 elm.text.2";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
          BEAT_GENLIST_PART_PADDING_LEFT( 10 )
          BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
 
-         part { name: "elm.icon";
+         part { name: "elm.text.1";
             clip_to: "disclip";
-            type: SWALLOW;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 50 50;
-               max: 50 50;
-               fixed: 1 1;
-               align: 0.0 0.5;
+               min: 0 38;
+               fixed: 0 1;
+               align: 0 1;
                rel1 {
                   relative: 1.0 0.0;
                   to_x: "elm.padding.left";
+                  to_y: "elm.padding.bottom";
                }
                rel2 {
+                  relative: 0.0 0.0;
                   offset: 0 0;
-                  to_x: "elm.padding.left";
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
+               }
+               color: GENLIST_PART_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: 28;
+                  min: 0 1;
+                  align: 0.0 0.5;
                }
             }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
+            }
          }
-         part { name: "elm.padding.icon.right";
-            type: RECT;
+         part { name: "elm.text.2";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 10 0;
-               fixed: 1 0;
-               visible: 0;
+               align: 0 1;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
                }
-               rel2.to_x: "elm.icon";
-               align: 0.0 0.0;
+               rel2 {
+                  relative: 0.0 0.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.text.1";
+               }
+               color: GENLIST_PART_SUB_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: 20;
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
          }
-         part { name: "elm.text";
+         BEAT_GENLIST_PART_DISCLIP
+      }
+      programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         program { name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg_image";
+            target: "elm.text.1";
+            target: "elm.text.2";
+         }
+         program { name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg_image";
+            target: "elm.text.1";
+            target: "elm.text.2";
+            transition: LINEAR 0.1;
+         }
+         program { name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program { name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+      }
+   }
+
+   group { name: "elm/genlist/item/2text.1icon.5/default";
+      alias: "elm/genlist/item_odd/2text.1icon.5/default";
+      alias: "elm/genlist/item_compress/2text.1icon.5/default";
+      alias: "elm/genlist/item_compress_odd/2text.1icon.5/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "labels" "elm.text.1 elm.text.2";
+      data.item: "icons" "elm.icon";
+      images {
+         image: "00_list_bar_press_1x80.png" COMP;
+      }
+      parts {
+         BEAT_GENLIST_PART_BASE( 80 )
+         BEAT_GENLIST_PART_BG_IMAGE
+         BEAT_GENLIST_PART_BOTTOM_LINE
+         BEAT_GENLIST_PART_PADDING_TOP( 6 )
+         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
+         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
+         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+
+         part { name: "elm.padding.icon.left";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 10 0;
+               fixed: 1 0;
+               visible: 0;
+               rel1 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.icon";
+               }
+               rel2.to_x: "elm.icon";
+               align: 1.0 0.0;
+            }
+         }
+         part { name: "elm.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               align: 1.0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
+               }
+            }
+         }
+         part { name: "elm.text.1";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 38;
+               fixed: 0 1;
+               align: 0 1;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.bottom";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.icon.left";
+                  to_y: "elm.padding.bottom";
+               }
+               color: GENLIST_PART_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: 28;
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
+            }
+         }
+         part { name: "elm.text.2";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               align: 0 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.icon.left";
+                  to_y: "elm.text.1";
+               }
+               color: GENLIST_PART_SUB_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: 20;
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
+            }
+         }
+         BEAT_GENLIST_PART_DISCLIP
+      }
+      programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         program { name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg_image";
+            target: "elm.text.1";
+            target: "elm.text.2";
+         }
+         program { name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg_image";
+            target: "elm.text.1";
+            target: "elm.text.2";
+            transition: LINEAR 0.1;
+         }
+         program { name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program { name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+      }
+   }
+
+   group { name: "elm/genlist/item/2line_icontext/default";
+      alias: "elm/genlist/item_odd/2line_icontext/default";
+      alias: "elm/genlist/item_compress/2line_icontext/default";
+      alias: "elm/genlist/item_compress_odd/2line_icontext/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "labels" "elm.text elm.text.sub";
+      data.item: "icons" "elm.icon";
+      images {
+         image: "00_list_bar_press_1x80.png" COMP;
+      }
+      parts {
+         BEAT_GENLIST_PART_BASE( 80 )
+         BEAT_GENLIST_PART_BG_IMAGE
+         BEAT_GENLIST_PART_BOTTOM_LINE
+         BEAT_GENLIST_PART_PADDING_TOP( 6 )
+         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
+         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
+         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+
+         part { name: "elm.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 50 50;
+               max: 50 50;
+               fixed: 1 1;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
+               }
+               rel2 {
+                  offset: 0 0;
+                  to_x: "elm.padding.left";
+               }
+            }
+         }
+         part { name: "elm.padding.icon.right";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 10 0;
+               fixed: 1 0;
+               visible: 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon";
+               }
+               rel2.to_x: "elm.icon";
+               align: 0.0 0.0;
+            }
+         }
+         part { name: "elm.text";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 38;
+               fixed: 0 1;
+               align: 0 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
+               }
+               color: GENLIST_PART_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: 28;
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
+            }
+         }
+         part { name: "elm.text.sub";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 30;
+               fixed: 0 1;
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon.right";
+                  to_y: "elm.text";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.text";
+               }
+               color: GENLIST_PART_SUB_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: 20;
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
+            }
+         }
+       BEAT_GENLIST_PART_DISCLIP
+      }
+      programs {
+         program { name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg_image";
+            target: "elm.text";
+            target: "elm.text.sub";
+         }
+         program { name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg_image";
+            target: "elm.text";
+            target: "elm.text.sub";
+            transition: LINEAR 0.1;
+         }
+         program { name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program { name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+      }
+   }
+
+   group { name: "elm/genlist/item/2line_textonly3/default";
+      alias: "elm/genlist/item_odd/2line_textonly3/default";
+      alias: "elm/genlist/item_compress/2line_textonly3/default";
+      alias: "elm/genlist/item_compress_odd/2line_textonly3/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "labels" "elm.text elm.text.sub";
+      images {
+         image: "00_list_bar_press_1x80.png" COMP;
+      }
+      parts {
+         BEAT_GENLIST_PART_BASE( 80 )
+         BEAT_GENLIST_PART_BG_IMAGE
+         BEAT_GENLIST_PART_BOTTOM_LINE
+         BEAT_GENLIST_PART_PADDING_TOP( 6 )
+         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
+         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
+         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+
+         part { name: "elm.text";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 30;
+               fixed: 0 1;
+               align: 0 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
+               }
+               color: GENLIST_PART_SUB_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: 20;
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
+            }
+         }
+         part { name: "elm.text.sub";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.text";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
+               }
+               color: GENLIST_PART_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: 28;
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
+            }
+         }
+         BEAT_GENLIST_PART_DISCLIP
+      }
+      programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         program { name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg_image";
+            target: "elm.text";
+         }
+         program { name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg_image";
+            target: "elm.text";
+            transition: LINEAR 0.1;
+         }
+         program { name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program { name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+      }
+   }
+
+   group { name: "elm/genlist/item_compress/multiline/2text/default";
+      alias: "elm/genlist/item_compress_odd/multiline/2text/default";
+      alias: "elm/genlist/item_compress/multiline.2text/default";
+      alias: "elm/genlist/item_compress_odd/multiline.2text/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "labels" "elm.text.1 elm.text.2";
+      styles {
+        style { name: "genlist_textblock_sub_style";
+          base: "font=SLP:style=Regular font_size=22 color=#6C6C6C wrap=char text_class=list_item";
+          tag:  "br" "\n";
+          tag:  "ps" "ps";
+          tag:  "tab" "\t";
+        }
+        style { name: "genlist_textblock_sub_selected_style";
+          base: "font=SLP:style=Regular font_size=22 color=#FFFFFF wrap=char text_class=list_item";
+          tag:  "br" "\n";
+          tag:  "ps" "ps";
+          tag:  "tab" "\t";
+        }
+      }
+      parts {
+         part { name: "base";
+            type: RECT;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               color: 249 249 249 255;
+            }
+         }
+         BEAT_GENLIST_PART_BG_IMAGE
+         BEAT_GENLIST_PART_BOTTOM_LINE
+         BEAT_GENLIST_PART_PADDING_TOP( 10 )
+         BEAT_GENLIST_PART_PADDING_BOTTOM( 11 )
+         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
+         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+
+         part { name: "elm.text.1";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 38;
+               fixed: 0 1;
+               align: 0 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
+               }
+               color: GENLIST_PART_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Regular";
+                  size: 26;
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
+            }
+         }
+         part { name: "elm.text.2";
+            clip_to: "disclip";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.text.1";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
+               }
+               text {
+                  style: "genlist_textblock_sub_style";
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_textblock_sub_selected_style";
+            }
+         }
+         BEAT_GENLIST_PART_DISCLIP
+      }
+      programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         program { name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg_image";
+            target: "elm.text.1";
+            target: "elm.text.2";
+         }
+         program { name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg_image";
+            target: "elm.text.1";
+            target: "elm.text.2";
+            transition: LINEAR 0.1;
+         }
+         program { name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program { name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+      }
+   }
+
+   group { name: "elm/genlist/item/readmessage/default";
+      alias: "elm/genlist/item_odd/readmessage/default";
+      alias: "elm/genlist/item_compress/readmessage/default";
+      alias: "elm/genlist/item_compress_odd/readmessage/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "icons" "elm.icon";
+      parts {
+         part { name: "base";
+            type: RECT;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               color: 242 238 233 255;
+            }
+         }
+         part { name: "elm.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               //rel1 { relative: 0.0 1.0; to_y: "elm.rect.top.pad"; }
+               rel2 {
+                  relative: 0.76 0.0;
+                  to_y: "elm.padding.bottom";
+               }
+            }
+         }
+         BEAT_GENLIST_PART_PADDING_BOTTOM( 15 )
+         BEAT_GENLIST_PART_DISCLIP
+      }
+      programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         /*program { name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg_image";
+         }
+         program { name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg_image";
+            transition: LINEAR 0.1;
+         }*/
+         program { name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program { name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+      }
+   }
+
+   group { name: "elm/genlist/item/sentmessage/default";
+      alias: "elm/genlist/item_odd/sentmessage/default";
+      alias: "elm/genlist/item_compress/sentmessage/default";
+      alias: "elm/genlist/item_compress_odd/sentmessage/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "icons" "elm.icon";
+      parts {
+         part { name: "base";
+            type: RECT;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               color: 242 238 233 255;
+            }
+         }
+         part { name: "elm.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1.relative: 0.24 0.0; //to_y: "elm.rect.top.pad"; }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_y: "elm.padding.bottom";
+               }
+            }
+         }
+         BEAT_GENLIST_PART_PADDING_BOTTOM( 15 )
+         BEAT_GENLIST_PART_DISCLIP
+      }
+      programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         /*program { name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg_image";
+         }
+         program { name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg_image";
+            transition: LINEAR 0.1;
+         }*/
+         program { name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program { name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+      }
+   }
+
+   group { name : "elm/genlist/item/dialogue/title/default";
+      alias: "elm/genlist/item_odd/dialogue/title/default";
+      alias: "elm/genlist/item_compress/dialogue/title/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/title/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "labels" "elm.text";
+      data.item: "treesize" "20";
+
+      parts {
+         BEAT_GENLIST_PART_DIALOGUE_BASE( 41 )
+         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
+         BEAT_GENLIST_PART_BOTTOM_LINE
+         part { name: "elm.text";
+            type: TEXT;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1 {
+                  relative: 1.0 0.5;
+                  to_x: "elm.padding.left";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+               }
+               color: 156 156 156 255;
+               text {
+                  font: "SLP:style=Medium";
+                  size: 18;
+                  min: 0 1;
+                  align: 0.0 0.0;
+               }
+            }
+         }
+         BEAT_GENLIST_PART_DIALOGUE_PADDING_RIGHT( 10 )
+         BEAT_GENLIST_PART_DISCLIP
+      }
+      programs {
+         program { name: "go_editing";
+            signal: "elm,state,editing";
+            source: "elm";
+            action: STATE_SET "editing" 0.0;
+            target: "elm.padding.right";
+         }
+         program { name: "go_viewing";
+            signal: "elm,state,viewing";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.padding.right";
+         }
+      }
+   }
+
+   group { name : "elm/genlist/item/dialogue/seperator/default";
+      alias: "elm/genlist/item_odd/dialogue/seperator/default";
+      alias: "elm/genlist/item_compress/dialogue/seperator/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/seperator/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "treesize" "20";
+
+      parts {
+         BEAT_GENLIST_PART_DIALOGUE_BASE( 21 )
+         BEAT_GENLIST_PART_BOTTOM_LINE
+         BEAT_GENLIST_PART_DIALOGUE_PADDING_RIGHT( 10 )
+         BEAT_GENLIST_PART_DISCLIP
+      }
+      programs {
+         program { name: "go_editing";
+            signal: "elm,state,editing";
+            source: "elm";
+            action: STATE_SET "editing" 0.0;
+            target: "elm.padding.right";
+         }
+         program { name: "go_viewing";
+            signal: "elm,state,viewing";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.padding.right";
+         }
+      }
+   }
+
+   group { name : "elm/genlist/item/dialogue/seperator.2/default";
+      alias: "elm/genlist/item_odd/dialogue/seperator.2/default";
+      alias: "elm/genlist/item_compress/dialogue/seperator.2/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/seperator.2/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "treesize" "20";
+
+      parts {
+         BEAT_GENLIST_PART_DIALOGUE_BASE( 11 )
+         BEAT_GENLIST_PART_DIALOGUE_PADDING_RIGHT( 10 )
+         BEAT_GENLIST_PART_BOTTOM_LINE
+         BEAT_GENLIST_PART_DISCLIP
+      }
+      programs {
+         program { name: "go_editing";
+            signal: "elm,state,editing";
+            source: "elm";
+            action: STATE_SET "editing" 0.0;
+            target: "elm.padding.right";
+         }
+         program { name: "go_viewing";
+            signal: "elm,state,viewing";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.padding.right";
+         }
+      }
+   }
+
+   group { name : "elm/genlist/item/dialogue/seperator.3/default";
+      alias: "elm/genlist/item_odd/dialogue/seperator.3/default";
+      alias: "elm/genlist/item_compress/dialogue/seperator.3/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/seperator.3/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "treesize" "20";
+
+      parts {
+         BEAT_GENLIST_PART_DIALOGUE_BASE( 20 )
+         BEAT_GENLIST_PART_DIALOGUE_PADDING_RIGHT( 10 )
+      }
+      programs {
+         program { name: "go_editing";
+            signal: "elm,state,editing";
+            source: "elm";
+            action: STATE_SET "editing" 0.0;
+            target: "elm.padding.right";
+         }
+         program { name: "go_viewing";
+            signal: "elm,state,viewing";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.padding.right";
+         }
+      }
+   }
+
+   group { name : "elm/genlist/item/dialogue/seperator.4/default";
+      alias: "elm/genlist/item_odd/dialogue/seperator.4/default";
+      alias: "elm/genlist/item_compress/dialogue/seperator.4/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/seperator.4/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "treesize" "20";
+
+      parts {
+         BEAT_GENLIST_PART_DIALOGUE_BASE( 10 )
+         BEAT_GENLIST_PART_DIALOGUE_PADDING_RIGHT( 10 )
+      }
+      programs {
+         program { name: "go_editing";
+            signal: "elm,state,editing";
+            source: "elm";
+            action: STATE_SET "editing" 0.0;
+            target: "elm.padding.right";
+         }
+         program { name: "go_viewing";
+            signal: "elm,state,viewing";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.padding.right";
+         }
+      }
+   }
+
+   group { name: "elm/genlist/item/dialogue/bg/1icon/default";
+      alias: "elm/genlist/item_odd/dialogue/bg/1icon/default";
+      alias: "elm/genlist/item_compress/dialogue/bg/1icon/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/bg/1icon/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "icons" "elm.icon";
+
+      parts {
+         part { name: "base";
+            type: RECT;
+            repeat_events: 1;
+            scale: 1;
+            description { state: "default" 0.0;
+               color: 242 238 233 255;
+            }
+         }
+         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
+         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         BEAT_GENLIST_PART_BOTTOM_LINE
+         part { name: "elm.icon";
+           clip_to: "disclip";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+               }
+            }
+         }
+         BEAT_GENLIST_PART_DISCLIP
+      }
+      programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         program { name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program { name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+         program { name: "go_editing";
+            signal: "elm,state,editing";
+            source: "elm";
+            action: STATE_SET "editing" 0.0;
+            target: "elm.padding.right";
+         }
+         program { name: "go_viewing";
+            signal: "elm,state,viewing";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.padding.right";
+         }
+      }
+   }
+
+   group { name: "elm/genlist/item/dialogue/bg/1icon.2/default";
+      alias: "elm/genlist/item_odd/dialogue/bg/1icon.2/default";
+      alias: "elm/genlist/item_compress/dialogue/bg/1icon.2/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/bg/1icon.2/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "icons" "elm.icon";
+
+      parts {
+         part { name: "base";
+            type: RECT;
+            repeat_events: 1;
+            scale: 1;
+            description { state: "default" 0.0;
+               color: 242 238 233 255;
+            }
+         }
+         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
+         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         part { name: "elm.icon";
+           clip_to: "disclip";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+               }
+            }
+         }
+         BEAT_GENLIST_PART_DISCLIP
+      }
+      programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         program { name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program { name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+         program { name: "go_editing";
+            signal: "elm,state,editing";
+            source: "elm";
+            action: STATE_SET "editing" 0.0;
+            target: "elm.padding.right";
+         }
+         program { name: "go_viewing";
+            signal: "elm,state,viewing";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.padding.right";
+         }
+      }
+   }
+
+   group { name: "elm/genlist/item/dialogue/1text/default";
+      alias: "elm/genlist/item_odd/dialogue/1text/default";
+      alias: "elm/genlist/item_compress/dialogue/1text/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/1text/default";
+
+      alias: "elm/genlist/item/dialogue.1text/default";
+      alias: "elm/genlist/item_odd/dialogue.1text/default";
+      alias: "elm/genlist/item_compress/dialogue.1text/default";
+      alias: "elm/genlist/item_compress_odd/dialogue.1text/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "labels" "elm.text";
+
+      parts {
+         BEAT_GENLIST_PART_BASE( 71 )
+         BEAT_GENLIST_PART_BG_IMAGE
+         BEAT_GENLIST_PART_BOTTOM_LINE
+         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
+         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         part { name: "elm.text";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1 {
+                  relative: 1.0  0.0;
+                  to_x: "elm.padding.left";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+               }
+               color: GENLIST_PART_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: 28;
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
+            }
+         }
+         BEAT_GENLIST_PART_DISCLIP
+      }
+      programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         program { name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg_image";
+            target: "elm.text";
+         }
+         program { name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg_image";
+            target: "elm.text";
+            transition: LINEAR 0.1;
+         }
+         program { name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program { name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+      }
+   }
+
+   group { name: "elm/genlist/item/dialogue/1text.1icon/default";
+      alias: "elm/genlist/item_odd/dialogue/1text.1icon/default";
+      alias: "elm/genlist/item_compress/dialogue/1text.1icon/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/1text.1icon/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "labels" "elm.text";
+      data.item: "icons" "elm.icon";
+      parts {
+         BEAT_GENLIST_PART_BASE( 71 )
+         BEAT_GENLIST_PART_BG_IMAGE
+         BEAT_GENLIST_PART_BOTTOM_LINE
+         BEAT_GENLIST_PART_PADDING_TOP( 10 )
+         BEAT_GENLIST_PART_PADDING_BOTTOM( 10 )
+         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
+         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         BEAT_GENLIST_PART_DIALOGUE_ITEM
+
+         part { name: "elm.padding.icon.left";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 10 0;
+               fixed: 1 0;
+               visible: 0;
+               rel1 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.icon";
+               }
+               rel2.to_x: "elm.icon";
+               align: 1.0 0.0;
+            }
+         }
+         part { name: "elm.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               align: 1.0 0.5;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
+               }
+            }
+         }
+         part { name: "elm.text";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.icon.left";
+               }
+               color: GENLIST_PART_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: 28;
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
+            }
+         }
+       BEAT_GENLIST_PART_DISCLIP
+      }
+      programs {
+         program { name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg_image";
+            target: "elm.text";
+         }
+         program { name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg_image";
+            target: "elm.text";
+            transition: LINEAR 0.1;
+         }
+         program { name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program { name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+      }
+   }
+
+   group { name: "elm/genlist/item/dialogue/1text.1icon.2/default";
+      alias: "elm/genlist/item_odd/dialogue/1text.1icon.2/default";
+      alias: "elm/genlist/item_compress/dialogue/1text.1icon.2/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/1text.1icon.2/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "labels" "elm.text";
+      data.item: "icons" "elm.icon";
+      parts {
+         BEAT_GENLIST_PART_BASE( 71 )
+         BEAT_GENLIST_PART_BG_IMAGE
+         BEAT_GENLIST_PART_BOTTOM_LINE
+         BEAT_GENLIST_PART_PADDING_TOP( 10 )
+         BEAT_GENLIST_PART_PADDING_BOTTOM( 10 )
+         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
+         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         BEAT_GENLIST_PART_DIALOGUE_ITEM
+
+         part { name: "elm.padding.icon.right";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 10 0;
+               fixed: 1 0;
+               visible: 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon";
+               }
+               rel2.to_x: "elm.icon";
+               align: 0.0 0.0;
+            }
+         }
+         part { name: "elm.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 40 40;
+               max: 40 40;
+               fixed: 1 1;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.bottom";
+               }
+            }
+         }
+         part { name: "elm.text";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.icon.right";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+               }
+               color: GENLIST_PART_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: 28;
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
+            }
+         }
+         BEAT_GENLIST_PART_DISCLIP
+      }
+      programs {
+         program { name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg_image";
+            target: "elm.text";
+         }
+         program { name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg_image";
+            target: "elm.text";
+            transition: LINEAR 0.1;
+         }
+         program { name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program { name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+      }
+   }
+
+   group { name: "elm/genlist/item/dialogue/2text/default";
+      alias: "elm/genlist/item_odd/dialogue/2text/default";
+      alias: "elm/genlist/item_compress/dialogue/2text/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/2text/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "labels" "elm.text.1 elm.text.2";
+      parts {
+         BEAT_GENLIST_PART_BASE( 71 )
+         BEAT_GENLIST_PART_BG_IMAGE
+         BEAT_GENLIST_PART_BOTTOM_LINE
+         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
+         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         BEAT_GENLIST_PART_DIALOGUE_ITEM
+
+         part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 38;
-               fixed: 0 1;
-               align: 0 0;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.right";
-                  to_y: "elm.padding.top";
+                  relative: 1.0  0.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.left";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  offset: 0 0;
+                  relative: 0.0  1.0;
+                  offset:   0   0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
                }
                color: GENLIST_PART_TEXT_COLOR_INC;
                text {
-                  font: "SLP:style=Roman";
+                  font: "SLP:style=Regular";
                   size: 28;
                   min: 0 1;
                   align: 0.0 0.5;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
          }
-         part { name: "elm.text.sub";
+         part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 30;
-               fixed: 0 1;
-               align: 0.0 0.0;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.right";
-                  to_y: "elm.text";
+                  relative: 1.0  0.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.left";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  offset: 0 0;
+                  relative: 0.0  1.0;
+                  offset:   0   0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.text";
                }
                color: GENLIST_PART_SUB_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 20;
                   min: 0 1;
-                  align: 0.0 0.5;
+                  align: 1.0 0.5;
                }
             }
             description { state: "selected" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
          }
-       BEAT_GENLIST_PART_DISCLIP
+         BEAT_GENLIST_PART_DISCLIP
       }
       programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
          program { name: "go_active";
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
             target: "bg_image";
-            target: "elm.text";
-            target: "elm.text.sub";
+            target: "elm.text.1";
+            target: "elm.text.2";
          }
          program { name: "go_passive";
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "bg_image";
-            target: "elm.text";
-            target: "elm.text.sub";
+            target: "elm.text.1";
+            target: "elm.text.2";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
       }
    }
 
-   group { name: "elm/genlist/item/2line_textonly3/default";
-      alias: "elm/genlist/item_odd/2line_textonly3/default";
-      alias: "elm/genlist/item_compress/2line_textonly3/default";
-      alias: "elm/genlist/item_compress_odd/2line_textonly3/default";
+   group { name: "elm/genlist/item/dialogue/2text.2/default";
+      alias: "elm/genlist/item_odd/dialogue/2text.2/default";
+      alias: "elm/genlist/item_compress/dialogue/2text.2/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/2text.2/default";
 
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "labels" "elm.text elm.text.sub";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
+      data.item: "labels" "elm.text.1 elm.text.2";
       parts {
-         BEAT_GENLIST_PART_BASE( 80 )
+         BEAT_GENLIST_PART_BASE( 81 )
          BEAT_GENLIST_PART_BG_IMAGE
          BEAT_GENLIST_PART_BOTTOM_LINE
          BEAT_GENLIST_PART_PADDING_TOP( 6 )
          BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
+         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
          BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         BEAT_GENLIST_PART_DIALOGUE_ITEM
 
-         part { name: "elm.text";
+         part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 30;
+               min: 0 38;
                fixed: 0 1;
                align: 0 0;
                rel1 {
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.top";
                }
-               color: GENLIST_PART_SUB_TEXT_COLOR_INC;
+               color: GENLIST_PART_TEXT_COLOR_INC;
                text {
-                  font: "SLP:style=Medium";
-                  size: 20;
+                  font: "SLP:style=Regular";
+                  size: 28;
                   min: 0 1;
                   align: 0.0 0.5;
                }
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
          }
-         part { name: "elm.text.sub";
+         part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
                rel1 {
                   relative: 1.0 1.0;
                   to_x: "elm.padding.left";
-                  to_y: "elm.text";
+                  to_y: "elm.text.1";
                }
                rel2 {
                   relative: 0.0 0.0;
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_PART_TEXT_COLOR_INC;
+               color: GENLIST_PART_SUB_TEXT_COLOR_INC;
                text {
-                  font: "SLP:style=Roman";
-                  size: 28;
+                  font: "SLP:style=Medium";
+                  size: 20;
                   min: 0 1;
                   align: 0.0 0.5;
                }
             source: "elm";
             action: STATE_SET "selected" 0.0;
             target: "bg_image";
-            target: "elm.text";
+            target: "elm.text.1";
+            target: "elm.text.2";
          }
          program { name: "go_passive";
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "bg_image";
-            target: "elm.text";
+            target: "elm.text.1";
+            target: "elm.text.2";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
       }
    }
 
-   group { name: "elm/genlist/item_compress/multiline.2text/default";
-      alias: "elm/genlist/item_compress_odd/multiline.2text/default";
+   group { name: "elm/genlist/item/dialogue/2text.3/default";
+      alias: "elm/genlist/item_odd/dialogue/2text.3/default";
+      alias: "elm/genlist/item_compress/dialogue/2text.3/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/2text.3/default";
 
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text.1 elm.text.2";
-      styles {
-        style { name: "genlist_textblock_sub_style";
-          base: "font=SLP:style=Regular font_size=22 color=#6C6C6C wrap=char text_class=list_item";
-          tag:  "br" "\n";
-          tag:  "ps" "ps";
-          tag:  "tab" "\t";
-        }
-        style { name: "genlist_textblock_sub_selected_style";
-          base: "font=SLP:style=Regular font_size=22 color=#FFFFFF wrap=char text_class=list_item";
-          tag:  "br" "\n";
-          tag:  "ps" "ps";
-          tag:  "tab" "\t";
-        }
-      }
       parts {
-         part { name: "base";
-            type: RECT;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 249 249 249 255;
-            }
-         }
+         BEAT_GENLIST_PART_BASE( 81 )
          BEAT_GENLIST_PART_BG_IMAGE
          BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 10 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 11 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
+         BEAT_GENLIST_PART_PADDING_TOP( 6 )
+         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
+         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
          BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         BEAT_GENLIST_PART_DIALOGUE_ITEM
 
          part { name: "elm.text.1";
             clip_to: "disclip";
             description { state: "default" 0.0;
                min: 0 38;
                fixed: 0 1;
-               align: 0 0;
+               align: 0 1;
                rel1 {
-                  relative: 1.0 1.0;
+                  relative: 1.0 0.0;
                   to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
+                  to_y: "elm.padding.bottom";
                }
                rel2 {
-                  relative: 0.0 1.0;
+                  relative: 0.0 0.0;
                   offset: 0 0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
+                  to_y: "elm.padding.bottom";
                }
                color: GENLIST_PART_TEXT_COLOR_INC;
                text {
-                  font: "SLP:style=Regular";
-                  size: 26;
+                  font: "SLP:style=Roman";
+                  size: 28;
                   min: 0 1;
                   align: 0.0 0.5;
                }
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
-            type: TEXTBLOCK;
+            type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
+               align: 0 1;
                rel1 {
                   relative: 1.0 1.0;
                   to_x: "elm.padding.left";
-                  to_y: "elm.text.1";
+                  to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 0.0;
                   offset: 0 0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
+                  to_y: "elm.text.1";
                }
+               color: GENLIST_PART_SUB_TEXT_COLOR_INC;
                text {
-                  style: "genlist_textblock_sub_style";
+                  font: "SLP:style=Medium";
+                  size: 20;
                   min: 0 1;
                   align: 0.0 0.5;
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_textblock_sub_selected_style";
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
          }
          BEAT_GENLIST_PART_DISCLIP
       }
    }
 
-   group { name: "elm/genlist/item/readmessage/default";
-      alias: "elm/genlist/item_odd/readmessage/default";
-      alias: "elm/genlist/item_compress/readmessage/default";
-      alias: "elm/genlist/item_compress_odd/readmessage/default";
+   group { name: "elm/genlist/item/dialogue/2text.1icon/default";
+      alias: "elm/genlist/item_odd/dialogue/2text.1icon/default";
+      alias: "elm/genlist/item_compress/dialogue/2text.1icon/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon/default";
 
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
+      data.item: "labels" "elm.text.1 elm.text.2";
       data.item: "icons" "elm.icon";
       parts {
-         part { name: "base";
+         BEAT_GENLIST_PART_BASE( 71 )
+         BEAT_GENLIST_PART_BG_IMAGE
+         BEAT_GENLIST_PART_BOTTOM_LINE
+         BEAT_GENLIST_PART_PADDING_TOP( 10 )
+         BEAT_GENLIST_PART_PADDING_BOTTOM( 10 )
+         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
+         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         BEAT_GENLIST_PART_DIALOGUE_ITEM
+
+         part { name: "elm.padding.icon.right";
             type: RECT;
-            repeat_events: 1;
+            scale: 1;
             description { state: "default" 0.0;
-               color: 242 238 233 255;
+               min: 10 0;
+               fixed: 1 0;
+               visible: 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon";
+               }
+               rel2.to_x: "elm.icon";
+               align: 0.0 0.0;
+            }
+         }
+         part { name: "elm.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 40 40;
+               max: 40 40;
+               fixed: 1 1;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.bottom";
+               }
+            }
+         }
+         part { name: "elm.text.1";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.icon.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
+               }
+               color: GENLIST_PART_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: 28;
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
          }
-         part { name: "elm.icon";
+         part { name: "elm.text.2";
             clip_to: "disclip";
-            type: SWALLOW;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               //rel1 { relative: 0.0 1.0; to_y: "elm.rect.top.pad"; }
+               rel1 {
+                  relative: 1.0  0.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.left";
+               }
                rel2 {
-                  relative: 0.76 0.0;
-                  to_y: "elm.padding.bottom";
+                  relative: 0.0  1.0;
+                  offset:   0   0;
+                  to_x: "elm.padding.right";
+               }
+               color: GENLIST_PART_SUB_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: 20;
+                  min: 0 1;
+                  align: 1.0 0.5;
                }
             }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
+            }
          }
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 15 )
-         BEAT_GENLIST_PART_DISCLIP
+       BEAT_GENLIST_PART_DISCLIP
       }
       programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
-         /*program { name: "go_active";
+         program { name: "go_active";
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
             target: "bg_image";
+            target: "elm.text.1";
+            target: "elm.text.2";
          }
          program { name: "go_passive";
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "bg_image";
+            target: "elm.text.1";
+            target: "elm.text.2";
             transition: LINEAR 0.1;
-         }*/
+         }
          program { name: "go_disabled";
             signal: "elm,state,disabled";
             source: "elm";
       }
    }
 
-   group { name: "elm/genlist/item/sentmessage/default";
-      alias: "elm/genlist/item_odd/sentmessage/default";
-      alias: "elm/genlist/item_compress/sentmessage/default";
-      alias: "elm/genlist/item_compress_odd/sentmessage/default";
+   group { name: "elm/genlist/item/dialogue/2text.1icon.2/default";
+      alias: "elm/genlist/item_odd/dialogue/2text.1icon.2/default";
+      alias: "elm/genlist/item_compress/dialogue/2text.1icon.2/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.2/default";
 
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
+      data.item: "labels" "elm.text.1 elm.text.2";
       data.item: "icons" "elm.icon";
       parts {
-         part { name: "base";
+         BEAT_GENLIST_PART_BASE( 81 )
+         BEAT_GENLIST_PART_BG_IMAGE
+         BEAT_GENLIST_PART_BOTTOM_LINE
+         BEAT_GENLIST_PART_PADDING_TOP( 6 )
+         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
+         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
+         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         BEAT_GENLIST_PART_DIALOGUE_ITEM
+
+         part { name: "elm.padding.icon.left";
             type: RECT;
-            repeat_events: 1;
+            scale: 1;
             description { state: "default" 0.0;
-               color: 242 238 233 255;
+               min: 10 0;
+               fixed: 1 0;
+               visible: 0;
+               rel1 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.icon";
+               }
+               rel2.to_x: "elm.icon";
+               align: 1.0 0.0;
             }
          }
          part { name: "elm.icon";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               rel1.relative: 0.24 0.0; //to_y: "elm.rect.top.pad"; }
+               align: 1.0 0.5;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.0 1.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
+               }
                rel2 {
-                  relative: 1.0 0.0;
+                  relative: 0.0 0.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
             }
          }
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 15 )
-         BEAT_GENLIST_PART_DISCLIP
-      }
-      programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
-         /*program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            transition: LINEAR 0.1;
-         }*/
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-      }
-   }
-
-   group { name: "elm/genlist/item/dialogue.1text/default";
-      alias: "elm/genlist/item_odd/dialogue.1text/default";
-      alias: "elm/genlist/item_compress/dialogue.1text/default";
-      alias: "elm/genlist/item_compress_odd/dialogue.1text/default";
-
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "labels" "elm.text";
-
-      parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
-         part { name: "elm.text";
+         part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
+               min: 0 38;
+               fixed: 0 1;
+               align: 0 0;
                rel1 {
-                  relative: 1.0  0.0;
+                  relative: 1.0 1.0;
                   to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  offset: 0 0;
+                  to_x: "elm.padding.icon.left";
+                  to_y: "elm.padding.top";
                }
                color: GENLIST_PART_TEXT_COLOR_INC;
                text {
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
          }
+         part { name: "elm.text.2";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.text.1";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.icon.left";
+                  to_y: "elm.padding.bottom";
+               }
+               color: GENLIST_PART_SUB_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: 20;
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
+            }
+         }
          BEAT_GENLIST_PART_DISCLIP
       }
       programs {
             source: "elm";
             action: STATE_SET "selected" 0.0;
             target: "bg_image";
-            target: "elm.text";
+            target: "elm.text.1";
+            target: "elm.text.2";
          }
          program { name: "go_passive";
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "bg_image";
-            target: "elm.text";
+            target: "elm.text.1";
+            target: "elm.text.2";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
          }
       }
    }
-   group { name: "elm/genlist/item/dialogue.1title.1text/default";
+
+   group { name: "elm/genlist/item/dialogue/1title.1text/default";
+      alias: "elm/genlist/item_odd/dialogue/1title.1text/default";
+      alias: "elm/genlist/item_compress/dialogue/1title.1text/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/1title.1text/default";
+
+      alias: "elm/genlist/item/dialogue.1title.1text/default";
       alias: "elm/genlist/item_odd/dialogue.1title.1text/default";
       alias: "elm/genlist/item_compress/dialogue.1title.1text/default";
       alias: "elm/genlist/item_compress_odd/dialogue.1title.1text/default";
          }
       }
    }
+
+   ///////// will be removed /////////
    group { name: "elm/genlist/item/dialogue.1title.1text.2/default";
       alias: "elm/genlist/item_odd/dialogue.1title.1text.2/default";
       alias: "elm/genlist/item_compress/dialogue.1title.1text.2/default";
          }
       }
    }
-   group { name: "elm/genlist/item/dialogue.1title.4text/default";
+   ///////////////////////////
+
+   group { name: "elm/genlist/item/dialogue/1title.4text/default";
+      alias: "elm/genlist/item_odd/dialogue/1title.4text/default";
+      alias: "elm/genlist/item_compress/dialogue/1title.4text/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/1title.4text/default";
+
+      alias: "elm/genlist/item/dialogue.1title.4text/default";
       alias: "elm/genlist/item_odd/dialogue.1title.4text/default";
       alias: "elm/genlist/item_compress/dialogue.1title.4text/default";
       alias: "elm/genlist/item_compress_odd/dialogue.1title.4text/default";
          }
       }
    }
-   group { name: "elm/genlist/item/dialogue.1icon.2text/default";
+
+   group { name: "elm/genlist/item/dialogue/1icon.2text/default";
+      alias: "elm/genlist/item_odd/dialogue/1icon.2text/default";
+      alias: "elm/genlist/item_compress/dialogue/1icon.2text/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/1icon.2text/default";
+
+      alias: "elm/genlist/item/dialogue.1icon.2text/default";
       alias: "elm/genlist/item_odd/dialogue.1icon.2text/default";
       alias: "elm/genlist/item_compress/dialogue.1icon.2text/default";
       alias: "elm/genlist/item_compress_odd/dialogue.1icon.2text/default";
                fixed: 0 1;
                color: GENLIST_PART_BOTTOM_LINE_INC;
                rel1 { 
-                  //relative: 1.0 0.0;
                   relative: 0.0 1.0;
                   to_x: "elm.base.text";
                }
          }
       }
    }
-   group { name: "elm/genlist/item/dialogue.3icon/default";
+
+
+   group { name: "elm/genlist/item/dialogue/bg/3icon/default";
+      alias: "elm/genlist/item_odd/dialogue/bg/3icon/default";
+      alias: "elm/genlist/item_compress/dialogue/bg/3icon/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/bg/3icon/default";
+
+      alias: "elm/genlist/item/dialogue.3icon/default";
       alias: "elm/genlist/item_odd/dialogue.3icon/default";
       alias: "elm/genlist/item_compress/dialogue.3icon/default";
       alias: "elm/genlist/item_compress_odd/dialogue.3icon/default";
 
       parts {
          BEAT_GENLIST_PART_DIALOGUE_BASE( 46 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_PADDING_RIGHT( 10 )
          part { name: "elm.icon.1";
            clip_to: "disclip";
             type: SWALLOW;
             description { state: "default" 0.0;
-               min: 146 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.padding.right";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-               }
-               align: 1.0 0.5;
-            }
-         }
-         part { name: "elm.padding.icon.1.left";
-           clip_to: "disclip";
-            type: RECT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 10 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.icon.1";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.1";
-               }
-               visible: 0;
-               align: 1.0 0.5;
+               rel1.relative: 0.021 0.0;
+               rel2.relative: 0.327 1.0;
             }
          }
          part { name: "elm.icon.2";
            clip_to: "disclip";
             type: SWALLOW;
             description { state: "default" 0.0;
-               min: 146 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.padding.icon.1.left";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon.1.left";
-               }
-               align: 1.0 0.5;
-            }
-         }
-         part { name: "elm.padding.icon.2.left";
-           clip_to: "disclip";
-            type: RECT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 10 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.icon.2";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.2";
-               }
-               visible: 0;
-               align: 1.0 0.5;
+               rel1.relative: 0.348 0.0;
+               rel2.relative: 0.652 1.0;
             }
          }
          part { name: "elm.icon.3";
            clip_to: "disclip";
             type: SWALLOW;
             description { state: "default" 0.0;
-               min: 146 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.padding.icon.2.left";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon.2.left";
-               }
-               align: 1.0 0.5;
+               rel1.relative: 0.673 0.0;
+               rel2.relative: 0.979 1.0;
             }
          }
          BEAT_GENLIST_PART_DISCLIP
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         program { name: "go_editing";
+         /*program { name: "go_editing";
             signal: "elm,state,editing";
             source: "elm";
             action: STATE_SET "editing" 0.0;
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "elm.padding.right";
-         }
+         }*/
       }
    }
+
+   ///////// will be removed /////////
    group { name: "elm/genlist/item/dialogue.3icon.2/default";
       alias: "elm/genlist/item_odd/dialogue.3icon.2/default";
       alias: "elm/genlist/item_compress/dialogue.3icon.2/default";
          }
       }
    }
+   ////////////////////////////////
index 438721b..0cf17a0 100644 (file)
             scale: 1;
             description { state: "default" 0.0;
                min: 0 88;
-               image.normal: "00_sweep_list_bg.png";
+               image {
+                  normal: "00_sweep_list_bg.png";
+                  border: 0 0 3 0;
+               }
             }
          }
          part { name: "bottom_line";
index 84da9ad..6450e0e 100644 (file)
             }
             description { state: "index1" 0.0;
                inherit: "default" 0.0;
-               min: 165 120;
+               /* ori 148, 120
+                * but if TEXT MM width over 148
+                */
+               min: 158 120;
                fixed: 1 0;
                rel1 {
                   to: "button_image_padding";
          part {
             name: "elm.text";
             type: "TEXT";
-            effect: SOFT_SHADOW;
-            mouse_events: 0;
-            scale: 1;
-            clip_to: "clip";
-               description {
-                  state: "default" 0.0;
-                  align: 0.90 0.4;
-                  fixed: 1 1;
-                  min: 40 20;
-                  visible: 0;
-                  rel1 {
-                     to: "button_image";
-                     relative: 0.90 0.39;
-                  }
-                  rel2 {
-                     to: "button_image";
-                     relative: 0.90 0.39;
-                  }
-                  color: 88 83 79 255;
-                  color3: 0 0 0 64;
-                  text {
-                     font: "SLP:style=Bold";
-                     size: 78;
-                     min: 1 1;
-                  }
-               }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part {
-            name: "elm.text.body";
-            type: "TEXT";
-            effect: SOFT_SHADOW;
             mouse_events: 0;
             scale: 1;
             clip_to: "clip";
             description {
                state: "default" 0.0;
-               align: 0.5 0.4;
+               align: 0.5 0.5;
                fixed: 1 1;
                min: 40 20;
-               rel1 {
-                  to: "button_image";
-                  relative: 0.29 0.39;
-               }
-               rel2 {
-                  to: "button_image";
-                  relative: 0.29 0.39;
-               }
-               color: 88 83 79 255;
-               color3: 0 0 0 64;
-               text {
-                  font: "SLP:style=Bold";
-                  size: 78;
-                  min: 1 1;
-               }
-            }
-            description { state: "invisible" 0.0;
-               inherit: "default" 0.0;
                visible: 0;
-            }
-            description {
-               state: "color_change" 0.0;
-               inherit: "default" 0.0;
-               rel1 {
-                  to: "button_image";
-                  relative: 0.47 0.39;
-               }
-               rel2 {
-                  to: "button_image";
-                  relative: 0.47 0.39;
-               }
-            }
-         }
-         part {
-            name: "elm.text.last";
-            type: "TEXT";
-            effect: SOFT_SHADOW;
-            mouse_events: 0;
-            scale: 1;
-            clip_to: "clip";
-            description {
-               state: "default" 0.0;
-               align: 0.67 0.4;
-               fixed: 1 1;
-               min: 40 20;
                rel1 {
                   to: "button_image";
-                  relative: 0.67 0.39;
+                  relative: 0.0 0.0;
                }
                rel2 {
                   to: "button_image";
-                  relative: 0.67 0.39;
+                  relative: 1.0 1.0;
+                  offset: -8 -10;
                }
                color: 88 83 79 255;
                color3: 0 0 0 64;
                   min: 1 1;
                }
             }
-            description { state: "invisible" 0.0;
+            description { state: "active" 0.0;
                inherit: "default" 0.0;
-               visible: 0;
+               visible: 1;
             }
          }
          part { name: "elm.dragable.pointer";
          program { name: "first_level_invisible";
             signal: "hide_first_level";
             source: "";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text.body";
             action: STATE_SET "index1" 0.0;
             target: "button_image";
-            after: "2nd_level_visible";
-         }
-         program { name: "2nd_level_visible";
-            signal: "show_2nd_level";
-            source: "";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.text";
-         }
-         program { name: "first_level_visible";
-            signal: "show_first_level";
-            source: "";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text.last";
-            action: STATE_SET "color_change" 0.0;
-            target: "elm.text.body";
          }
          program { name: "2nd_level_invisible";
             signal: "hide_2nd_level";
             source: "";
             action: STATE_SET "default" 0.0;
             target: "button_image";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text";
-            after: "first_level_visible";
          }
          program { name: "index0.active";
             signal: "elm,state,active";
             target: "elm.swallow.index.0";
             target: "clip";
             target: "index.0.bg.image.middle";
+            target: "elm.text";
             after: "disable_timer";
          }
          program { name: "initial.index0.active";
             source: "elm";
             action: STATE_SET "invisible" 0.0;
             target: "button_image";
-            target: "elm.text.last";
-                target: "elm.text.body";
-         }              
+         }
          program { name: "disable_timer";
             script {
                set_int(timer_flag, 0);
index 1158d38..f4c3194 100644 (file)
                color: LAYOUT_EDIT_MODE_BG_COLOR_INC;
             }
          }
-         part { name: "indicator_bg";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1.to: "elm.swallow.indicator";
-               rel2.to: "elm.swallow.indicator";
-               color: 0 0 0 255;
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "elm.swallow.indicator";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               min: 0 INDICATOR_H;
-               fixed: 0 1;
-               rel1 { relative: 0.0 0.0; }
-               rel2 { relative: 1.0 0.0; }
-               align: 0.5 0.0;
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
          part { name: "elm.swallow.content";
             type: SWALLOW;
             description {
                inherit: "default" 0.0;
                visible: 1;
             }
-            description { state: "show_with_indicator" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               rel1 { relative: 0.0 1.0; to_y: "elm.swallow.indicator"; }
-            }
             description { state: "show_with_navi_bar" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                visible: 1;
                rel2 { relative: 1.0 0.0; to_y: "elm.swallow.controlbar"; }
             }
-            description { state: "show_with_indicator" 1.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               rel1 { relative: 0.0 1.0; to_y: "elm.swallow.indicator"; }
-               rel2 { relative: 1.0 0.0; to_y: "elm.swallow.controlbar"; }
-            }
             description { state: "show_with_navi_bar" 1.0;
                inherit: "default" 0.0;
                visible: 1;
                inherit: "default" 0.0;
                visible: 1;
             }
-            description { state: "show_with_indicator" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               rel1 { relative: 0.0 1.0; to_y: "elm.swallow.indicator"; }
-               rel2 { relative: 1.0 1.0; to_y: "elm.swallow.indicator"; }
-            }
          }
          part { name: "elm.swallow.controlbar";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
                visible: 0;
-               min: 0 TAB_BAR_H;
+               min: 0 CONTROLBAR_LARGE_H;
                fixed: 0 1;
                rel1 { relative: 0.0 1.0; }
                rel2 { relative: 1.0 1.0; }
                set_state(PART:"base", "edit_mode", 0.0);
             }
          }
-         program { name: "show_indicator";
-            signal: "elm,state,show,indicator";
-            source: "elm";
-            script {
-               set_state(PART:"elm.swallow.indicator", "show", 0.0);
-               set_state(PART:"indicator_bg", "show", 0.0);
-               run_program(PROGRAM:"check_location");
-            }
-         }
-         program { name: "hide_indicator";
-            signal: "elm,state,hide,indicator";
-            source: "elm";
-            script {
-               set_state(PART:"elm.swallow.indicator", "default", 0.0);
-               set_state(PART:"indicator_bg", "default", 0.0);
-               run_program(PROGRAM:"check_location");
-            }
-         }
          program { name: "show_navi_bar";
             signal: "elm,state,show,navi_bar";
             source: "elm";
             script {
                new st[30];
                new Float:vl;
-               new indicator = 0, navi_bar = 0, content = 0, controlbar = 0;
+               new navi_bar = 0, content = 0, controlbar = 0;
 
-               get_state(PART:"elm.swallow.indicator", st, 30, vl)
-               if (!strncmp(st, "show", 4))  indicator = 1;
                get_state(PART:"elm.swallow.navi_bar", st, 30, vl)
                if (!strncmp(st, "show", 4))  navi_bar = 1;
                get_state(PART:"elm.swallow.content", st, 30, vl)
 
                // set navi bar
                if (navi_bar == 1) {
-                  if (indicator == 1) {
-                     set_state(PART:"elm.swallow.navi_bar", "show_with_indicator", 0.0)
-                  } else {
-                     set_state(PART:"elm.swallow.navi_bar", "show", 0.0)
-                  }
+                  set_state(PART:"elm.swallow.navi_bar", "show", 0.0)
                }
 
                // set content
                if (content == 1) {
                   if (navi_bar == 1) {
                      set_state(PART:"elm.swallow.content", "show_with_navi_bar", 0.0)
-                  } else if (indicator == 1) {
-                     set_state(PART:"elm.swallow.content", "show_with_indicator", 0.0)
                   } else {
                      set_state(PART:"elm.swallow.content", "show", 0.0)
                   }
index b49145e..0d01f6b 100644 (file)
@@ -3,15 +3,15 @@
  *
  * Copyright (c) 2000 - 2010 Samsung Electronics Co., Ltd.
  *
- * Contact: Seokjae Jeong <seok.j.jeong@samsung.com>, Myoungwoon Roy Kim <Myoungwoon.kim@samsung.com>, Jeonghyun Yun <jh0506.yun@samsung.com>, Jaehwan Kim <jae.hwan.kim@samsung.com>, 
- *       Chuneon Park <chuneon.park@samsung.com>, Juyung Seo <juyung.seo@samsung.com>, Woohyun Jung <wh0705.jung@samsung.com>, Myungjae Lee <mjae.lee@samsung.com>, Hyoyoung Chang <hyoyoung.chang@samsung.com>, 
+ * Contact: Seokjae Jeong <seok.j.jeong@samsung.com>, Myoungwoon Roy Kim <Myoungwoon.kim@samsung.com>, Jeonghyun Yun <jh0506.yun@samsung.com>, Jaehwan Kim <jae.hwan.kim@samsung.com>,
+ *       Chuneon Park <chuneon.park@samsung.com>, Juyung Seo <juyung.seo@samsung.com>, Woohyun Jung <wh0705.jung@samsung.com>, Myungjae Lee <mjae.lee@samsung.com>, Hyoyoung Chang <hyoyoung.chang@samsung.com>,
  *    Hyunsil Park <hyunsil.park@samsung.com>, Sohyun Kim <anna1014.kim@samsung.com>, Seunggyun Kim <sgyun.kim@samsung.com>
- * 
+ *
  * This library is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by the
  * Free Software Foundation; either version 2.1 of the License, or (at your option)
  * any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
  *
  */
 
-#define PADDING      5
-#define ITEM_HEIGHT  60
-#define ITEM_WIDTH   0
-#define MAX_ITEM_WIDTH 112
-#define NAVI_BAR_EXTENDED_FNBTN_TOP_HEIGHT 110
-#define NAVI_BAR_EXTENDED_HEIGHT 115
+#define NAVIBAR_PADDING 5
+#define NAVIBAR_TITLE_ITEM_H 67  //TODO: SHOULD BE 64
+#define NAVIBAR_TITLE_ITEM_W 0
+#define NAVIBAR_TITLE_ITEM_MAX_W 112
+#define NAVIBAR_EXTENDED_FNBTN_TOP_HEIGHT 110
+#define NAVIBAR_EXTENDED_H 115
+#define NAVIBAR_TITLE_SEPARATOR_H 5
+#define NAVIBAR_TITLE_SEPARATOR_SHADOW_H 5
+#define NAVIBAR_EXTENDED_COLOR 219 201 174 255
 
 ////////////////////////////////////////////////////////////////////////////////////////
 // NavigationBar
 
 group {
    name: "elm/navigationbar/base/default";
-
    images {
-      image: "00_winset_title_bg.png" COMP;
       image: "00_winset_control_top_arrow.png" COMP;
+      image: "navibar_item_separator.png" COMP;
    }
-   
    parts {
         part { name: "base";
-         type: RECT;
-         scale : 1;
-         mouse_events: 0;
-         repeat_events: 1;
-         description { state: "default" 0.0;
-            min: 1 NAVI_BAR_H;
-            fixed: 1 1;
-            color: 0 0 0 0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.0 0.0;
-         }
-         description {
-            state: "top" 0.0;
-            inherit: "default" 0.0;
-            min: 1 0;
-         }
-         description {
-            state: "extended" 0.0;
-            inherit: "default" 0.0;
-            min: 1 NAVI_BAR_EXTENDED_HEIGHT;
-         }
-      }
-      part {
-         name: "clip_title";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-         }
-      }
-      part {
-         name: "navigationitem";
-         type: IMAGE;
-         mouse_events: 0;
-         clip_to: "clip_title";
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 1 NAVI_BAR_H;
-            fixed: 0 1;
-            rel1 { relative: 0.0 0.0; to:"base"; }
-            rel2 { relative: 1.0 0.0; to:"base"; }
-            align: 0.0 0.0;
-            image {
-               normal: "00_winset_title_bg.png";
-            }
-         }
-      }
-      part {
-         name: "elm.swallow.btn1";
-         type: SWALLOW;
-         clip_to: "clip_title";
-         scale: 1;
-         description {
-            fixed: 1 1;
-            state: "default" 0.0;
-            rel1 { relative: 0.0 0.0; to: "navigationitem"; }
-            rel2 { relative: 0.0 1.0; to: "navigationitem"; }
-            align: 0.0 0.5;
-         }
-      }
-      part {
-         name: "elm.rect.pada";
-         type: RECT;
-         mouse_events: 0;
-         clip_to: "clip_title";
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 67 0;
-            fixed: 1 0;
-            rel1 { relative: 0.0 0.0; to: "navigationitem"; }
-            rel2 { relative: 0.0 1.0; to: "navigationitem"; }
-            align: 0.0 0.5;
-            color: 0 0 0 0;
-         }
-      }
-      part {
-         name: "elm.rect.padb";
-         type: RECT;
-         mouse_events: 0;
-         clip_to: "clip_title";
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 82 0;
-            fixed: 1 0;
-            rel1 { relative: 1.0 0.0; to: "navigationitem"; }
-            rel2 { relative: 1.0 1.0; to: "navigationitem"; }
-            align: 1.0 0.5;
-            color: 0 0 0 0;
-         }
-      }
-      part {
-         name: "elm.text";
-         type: TEXT;
-         scale:1;
-         clip_to: "clip_title";
-         description {
-            state: "default" 0.0;
-            text {
-               font: "SLP:style=Medium";
-               size: 22;
-               min: 0 0;
-               align: 0.5 0.5;
-               max: 1 0;
-            }
-            color: NAVIGATIONBAR_TITLE_TEXT_COLOR;
-            rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; }
-            rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; }
-            align: 0.5 0.5;
-         }
-      }
-     part {
-          name: "events";
+           mouse_events: 0;
+           repeat_events: 1;
+           description { state: "default" 0.0;
+              min: 1 (NAVI_BAR_H + NAVIBAR_TITLE_SEPARATOR_SHADOW_H);
+              align: 0.0 0.0;
+              fixed: 1 1;
+              rel2.relative: 1.0 0.0;
+           }
+           description { state: "top" 0.0;
+              inherit: "default" 0.0;
+              min: 1 0;
+           }
+           description { state: "extended" 0.0;
+              inherit: "default" 0.0;
+              min: 1 (NAVIBAR_EXTENDED_H + NAVIBAR_TITLE_SEPARATOR_SHADOW_H);
+           }
+       }
+       part { name: "clip_title";
+          mouse_events: 0;
+          description { state: "default" 0.0;
+             rel1.to: "base";
+             rel2.to: "base";
+          }
+       }
+       part { name: "navigationitem";
           type: RECT;
+          mouse_events: 0;
           clip_to: "clip_title";
-          ignore_flags: ON_HOLD;
-          description {
-             state: "default" 0.0;
-             rel1 { to: "elm.rect.pada"; relative: 1.0 0.0; }
-             rel2 { to: "elm.rect.padb"; relative: 0.0 1.0; }
+          description { state: "default" 0.0;
+             min: 1 (NAVI_BAR_H - NAVIBAR_TITLE_SEPARATOR_H);
+             fixed: 0 1;
+             rel1 { relative: 0.0 0.0; to:"base"; }
+             rel2 { relative: 1.0 0.0; to:"base"; }
+             align: 0.5 0;
+             color: NAVIBAR_EXTENDED_COLOR;
+          }
+       }
+       part { name: "elm.swallow.btn1";
+          type: SWALLOW;
+          clip_to: "clip_title";
+          scale: 1;
+          description { state: "default" 0.0;
+             fixed: 1 1;
+             align: 0.0 0.5;
+             rel1 { relative: 0.0 0.0; to: "navigationitem"; }
+             rel2 { relative: 0.0 1.0; to: "navigationitem"; }
+          }
+       }
+       part { name: "elm.rect.pada";
+          mouse_events: 0;
+          description { state: "default" 0.0;
+             min: 67 0;
+             fixed: 1 0;
+             align: 0.0 0.5;
+             rel1 { relative: 0.0 0.0; to: "navigationitem"; }
+             rel2 { relative: 0.0 1.0; to: "navigationitem"; }
+          }
+       }
+       part { name: "elm.rect.padb";
+          mouse_events: 0;
+          description { state: "default" 0.0;
+             min: 82 0;
+             fixed: 1 0;
+             align: 1.0 0.5;
+             rel1 { relative: 1.0 0.0; to: "navigationitem"; }
+             rel2 { relative: 1.0 1.0; to: "navigationitem"; }
+          }
+       }
+       part { name: "elm.text";
+          type: TEXT;
+          scale: 1;
+          clip_to: "clip_title";
+          description { state: "default" 0.0;
+             text { font: "SLP:style=Medium";
+                size: 22;
+                min: 0 0;
+                align: 0.5 0.5;
+                max: 1 0;
+             }
+             color: NAVIGATIONBAR_TITLE_TEXT_COLOR;
+             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"; }
+          }
+       }
+       part {
+           name: "events";
+           ignore_flags: ON_HOLD;
+           description { state: "default" 0.0;
+              rel1 { to: "elm.rect.pada"; relative: 1.0 0.0; }
+              rel2 { to: "elm.rect.padb"; relative: 0.0 1.0; }
+           }
+       }
+       part {
+          name: "elm.swallow.content";
+          type: SWALLOW;
+          scale: 1;
+          description { state: "default" 0.0;
+             align: 0.0 0.0;
+             rel1 { relative: 0.0 1.0; to_y: "base"; offset: 0 -10; }
+             rel2 { relative: 1.0 1.0; }
+          }
+          description { state: "top" 0.0;
+             rel1 { relative: 0.0 0.0; }
+             rel2 { relative: 1.0 1.0; }
+          }
+       }
+       part { name: "navigationitem_separator";
+          type: IMAGE;
+          mouse_events: 0;
+          description { state: "default" 0.0;
+             min: 1 (NAVIBAR_TITLE_SEPARATOR_H + NAVIBAR_TITLE_SEPARATOR_SHADOW_H);
+             fixed: 0 1;
+             align: 0.5 1;
+             rel1 { to: "navigationitem"; relative: 0 1; }
+             rel2 { to: "base"; relative: 1 1; }
+             image { normal: "navibar_item_separator.png";
+                border: 0 0 1 5;
+                border_scale: 1;
+             }
+          }
+       }
+       part { name: "naviarrow";
+          type: IMAGE;
+          mouse_events: 0;
+          scale: 1;
+          description { state: "default" 0.0;
+             min: 15 11;
+             max: 15 11;
+             fixed: 1 1;
+             align: 0.5 1;
+             visible: 0;
+             rel1 { relative: 0 0; to: "navigationitem_separator"; offset: 0 1; }
+             rel2 { relative: 1 0; to: "navigationitem_separator"; offset: -1 0; }
+             image {
+                normal: "00_winset_control_top_arrow.png";
+             }
+          }
+          description { state: "extended" 0.0;
+             inherit: "default" 0.0;
+             visible: 1;
+          }
+       }
+       part { name: "elm.swallow.title";
+          type: SWALLOW;
+          scale: 1;
+          clip_to: "clip_title";
+          description { state: "default" 0.0;
+             min: 0 NAVIBAR_TITLE_ITEM_H;
+             max: 999999 NAVIBAR_TITLE_ITEM_H;
+             fixed: 0 1;
+             align: 0.5 0;
+             rel1 { to: "navigationitem_separator"; }
+             rel2 { to: "navigationitem_separator"; }
+             visible: 0;
+          }
+          description { state: "extended" 0.0;
+             inherit: "default" 0.0;
+             visible: 1;
+          }
+       }
+       part { name: "elm.rect.blocker";
+          type: RECT;
+          description { state: "default" 0.0;
+             visible: 0;
+          }
+          description { state: "enabled" 0.0;
              color: 0 0 0 0;
-            }
-         }
-     part {
-         name: "naviarrow";
-         type: IMAGE;
-         mouse_events: 1;
-         clip_to: "clip_title";
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 11;
-            max: 15 11;
-            visible: 0;
-            fixed: 1 1;
-            rel1 { relative: 0.0 0.0; to: "elm.text"; }
-            rel2 { relative: 1.0 1.0; to: "elm.text"; }
-            align: 0.5 1.0;
-            image {
-               normal: "00_winset_control_top_arrow.png";
-            }
-         }
-         description {
-            state: "extended" 0.0;
-            inherit: "default" 0.0;
-            visible:1;
-         }
-      }
-      part {
-         name: "elm.swallow.title";
-         type: SWALLOW;
-         scale:1;
-         clip_to: "clip_title";
-         description {
-            fixed: 0 1;
-            min: 0 ITEM_HEIGHT;
-            visible: 0;
-            state: "default" 0.0;
-            rel1 { relative: 0.0 1.0; to_y: "navigationitem"; to_x: "base";}
-            rel2 { relative: 1.0 1.0; to: "base"; }
-            align: 0.0 0.0;
-         }
-         description {
-            state: "extended" 0.0;
-            inherit: "default" 0.0;
-            visible:1;
-         }
-      }
-      part {
-         name: "elm.swallow.content";
-         type: SWALLOW;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 { relative: 0.0 1.0; to_y: "base"; }
-            rel2 { relative: 1.0 1.0; }
-         }
-         description {
-            state: "top" 0.0;
-            rel1 { relative: 0.0 0.0; }
-            rel2 { relative: 1.0 1.0; }
-         }
-      }
-      part {
-         name: "elm.rect.blocker";
-         type: RECT;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-         }
-         description {
-            state: "enabled" 0.0;
-            color: 0 0 0 0;
-            visible: 1;
-         }
-      }
+             visible: 1;
+          }
+       }
    } /* end of parts */
 
    programs {
@@ -288,6 +256,8 @@ group {
          source: "elm";
          action: STATE_SET "extended" 0.0;
          target: "naviarrow";
+         target: "elm.swallow.title";
+         target: "base";
       }
       program {
          name: "hide_extended";
@@ -295,6 +265,8 @@ group {
          source: "elm";
          action: STATE_SET "default" 0.0;
          target: "naviarrow";
+         target: "elm.swallow.title";
+         target: "base";
       }
       program {
          name: "default_titlearea";
@@ -340,13 +312,13 @@ group {
          scale: 1;
          description {
             fixed: 1 1;
-            min: 0 ITEM_HEIGHT;
+            min: 0 NAVIBAR_TITLE_ITEM_H;
             state: "default" 0.0;
             rel1 { relative: 0.0 0.0; }
             rel2 { relative: 0.0 1.0; }
             align: 0.0 0.5;
          }
-      } 
+      }
       part {
          name: "elm.rect.pad1";
          type: RECT;
@@ -360,7 +332,7 @@ group {
          }
          description {
             state: "visible" 0.0;
-            min: PADDING 0;
+            min: NAVIBAR_PADDING 0;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.swallow.title1"; }
             rel2 { relative: 1.0 1.0; to: "elm.swallow.title1"; }
@@ -374,12 +346,12 @@ group {
          scale: 1;
          description {
             fixed: 1 1;
-            min: 0 ITEM_HEIGHT;
+            min: 0 NAVIBAR_TITLE_ITEM_H;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad1"; }
             rel2 { relative: 1.0 1.0; to: "elm.rect.pad1"; }
             align: 0.0 0.5;
-         }     
+         }
       }
       part {
          name: "elm.rect.pad2";
@@ -394,7 +366,7 @@ group {
          }
          description {
             state: "visible" 0.0;
-            min: PADDING 0;
+            min: NAVIBAR_PADDING 0;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.swallow.title2"; }
             rel2 { relative: 1.0 1.0; to: "elm.swallow.title2"; }
@@ -408,13 +380,13 @@ group {
          scale: 1;
          description {
             fixed: 1 1;
-            min: 0 ITEM_HEIGHT;
+            min: 0 NAVIBAR_TITLE_ITEM_H;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad2"; }
             rel2 { relative: 1.0 1.0; to: "elm.rect.pad2"; }
             align: 0.0 0.5;
          }
-      }  
+      }
       part {
          name: "elm.rect.pad3";
          type: RECT;
@@ -428,7 +400,7 @@ group {
          }
          description {
             state: "visible" 0.0;
-            min: PADDING 0;
+            min: NAVIBAR_PADDING 0;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.swallow.title3"; }
             rel2 { relative: 1.0 1.0; to: "elm.swallow.title3"; }
@@ -442,7 +414,7 @@ group {
          scale: 1;
          description {
             fixed: 1 1;
-            min: 0 ITEM_HEIGHT;
+            min: 0 NAVIBAR_TITLE_ITEM_H;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad3"; }
             rel2 { relative: 1.0 1.0; to: "elm.rect.pad3"; }
@@ -462,7 +434,7 @@ group {
          }
          description {
             state: "visible" 0.0;
-            min: PADDING 0;
+            min: NAVIBAR_PADDING 0;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.swallow.title4"; }
             rel2 { relative: 1.0 1.0; to: "elm.swallow.title4"; }
@@ -476,13 +448,13 @@ group {
          scale: 1;
          description {
             fixed: 1 1;
-            min: 0 ITEM_HEIGHT;
+            min: 0 NAVIBAR_TITLE_ITEM_H;
             state: "default" 0.0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pad4"; }
             rel2 { relative: 1.0 1.0; to: "elm.rect.pad4"; }
             align: 0.0 0.5;
          }
-      }  
+      }
    } /* end of parts */
 
    programs {
@@ -521,49 +493,49 @@ group {
 ///////////////////////////////////////////////////////////////////////////////
    group { name: "elm/pager/base/navigationbar";
       parts {
-         part { 
+         part {
             name: "clip";
             type: RECT;
             mouse_events: 0;
-            description { 
+            description {
                state: "default" 0.0;
-               rel1 { 
+               rel1 {
                   to: "base";
                   offset: -9999 -9999;
                }
-               rel2 { 
+               rel2 {
                   to: "base";
                   offset: 9999 9999;
                }
                color: 255 255 255 255;
             }
-            description { 
+            description {
                state: "visible" 0.0;
                inherit: "default" 0.0;
             }
-            description { 
+            description {
                state: "hidden" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 0;
                visible: 0;
             }
-            description { 
+            description {
                state: "hidden2" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 0;
                visible: 0;
             }
          }
-         part { 
+         part {
             name: "base";
             type: RECT;
             mouse_events:  0;
             clip_to: "clip";
-            description { 
+            description {
                state: "default" 0.0;
                color: 0 0 0 0;
             }
-            description { 
+            description {
                state: "hidden" 0.0;
                color: 0 0 0 0;
                rel1.relative: -1.0 0.0;
@@ -575,18 +547,18 @@ group {
                rel1.relative: 1.0 0.0;
                rel2.relative: 2.0 1.0;
             }
-            description { 
+            description {
                state: "visible" 0.0;
                color: 0 0 0 0;
                rel1.relative: 0.0 0.0;
                rel2.relative: 1.0 1.0;
             }
          }
-         part { 
+         part {
             name: "elm.swallow.content";
             type: SWALLOW;
             clip_to: "clip";
-            description { 
+            description {
                state: "default" 0.0;
                rel1.to: "base";
                rel2.to: "base";
@@ -594,7 +566,7 @@ group {
          }
       }
       programs {
-         program { 
+         program {
             name: "push_start";
             signal: "elm,action,push";
             source: "elm";
@@ -603,7 +575,7 @@ group {
             target: "clip";
             after: "show_start2";
          }
-         program { 
+         program {
             name: "show_start";
             signal: "elm,action,show";
             source: "elm";
@@ -612,7 +584,7 @@ group {
             target: "clip";
             after: "show_start2";
          }
-         program { 
+         program {
             name: "show_start2";
             action:  STATE_SET "visible" 0.0;
             transition: DECELERATE 0.5;
@@ -620,11 +592,11 @@ group {
             target: "clip";
             after: "show_end";
          }
-         program { 
+         program {
             name: "show_end";
             action: SIGNAL_EMIT "elm,action,show,finished" "";
          }
-         program { 
+         program {
             name: "pop_start";
             signal: "elm,action,pop";
             source: "elm";
@@ -633,7 +605,7 @@ group {
             target: "clip";
             after: "pop_start2";
          }
-         program { 
+         program {
             name: "pop_start2";
             action:  STATE_SET "hidden2" 0.0;
             transition: DECELERATE 0.5;
@@ -641,7 +613,7 @@ group {
             target: "clip";
             after: "hide_end";
          }
-         program { 
+         program {
             name: "hide_start";
             signal: "elm,action,hide";
             source: "elm";
@@ -650,7 +622,7 @@ group {
             target: "clip";
             after: "hide_start2";
          }
-         program { 
+         program {
             name: "hide_start2";
             action:  STATE_SET "hidden" 0.0;
             transition: DECELERATE 0.5;
@@ -658,11 +630,11 @@ group {
             target: "clip";
             after: "hide_end";
          }
-         program { 
+         program {
             name: "hide_end";
             action: SIGNAL_EMIT "elm,action,hide,finished" "";
          }
-         program { 
+         program {
             name: "reset";
             signal: "elm,action,reset";
             source: "elm";
@@ -670,7 +642,7 @@ group {
             target: "base";
             target: "clip";
          }
-         program { 
+         program {
             name: "show_firstpage"; /*avoid effect in first page*/
             signal: "elm,action,show,noanimate";
             source: "elm";
@@ -679,7 +651,7 @@ group {
             target: "clip";
             after: "show_end";
          }
-         program { 
+         program {
             name: "hide_firstpage"; /*avoid effect in first page*/
             signal: "elm,action,hide,noanimate";
             source: "elm";
index b34bb12..01da2fa 100644 (file)
@@ -1,5 +1,15 @@
-#define NAVI_BAR_EXTENDED_HEIGHT2 176
-///////////////////////////////////////////////////////////////////////////////
+#define NAVIBAR_EX_EXTENDED_H 115
+#define NAVIBAR_EX_EXTENDED_H2 186
+#define NAVIBAR_EX_TITLE_SEPARATOR_H 5
+#define NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H 5
+#define NAVIBAR_EX_EXTENDED_COLOR 219 201 174 255
+#define NAVIBAR_EX_TITLE_ITEM_H 67   //TODO: SHOULD BE 59
+#define NAVIBAR_EX_TITLE_ITEM_MAX_W 112
+#define NAVIBAR_EX_TITLE_SEPARATOR_H 5
+
+////////////////////////////////////////////////////////////////////////////////////////
+// NavigationBar_ex
+////////////////////////////////////////////////////////////////////////////////////////
 group { name: "elm/navigationbar_ex/content/default";
    parts {
       part { name: "clip";
@@ -150,147 +160,126 @@ group { name: "elm/navigationbar_ex/content/default";
 
 group { name: "elm/navigationbar_ex/item/title/default";
    images {
-      image: "00_winset_title_bg.png" COMP;
+      image: "navibar_item_separator.png" COMP;
    }
    parts {
       part { name: "base";
-         type: RECT;
-         scale : 1;
          mouse_events: 0;
          repeat_events: 1;
          description { state: "default" 0.0;
-            min: 1 NAVI_BAR_H;
+            min: 1 (NAVI_BAR_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H);
             fixed: 1 1;
-            color: 0 0 0 0;
-            rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 0.0;
             align: 0.0 0.0;
          }
-         description {
-            state: "top" 0.0;
+         description { state: "top" 0.0;
             inherit: "default" 0.0;
             min: 1 0;
          }
-         description {
-            state: "extended" 0.0;
+         description { state: "extended" 0.0;
             inherit: "default" 0.0;
-            min: 1 NAVI_BAR_EXTENDED_HEIGHT;
+            min: 1 (NAVIBAR_EX_EXTENDED_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H);
          }
       }
-      part {
-         name: "navigationitem";
-         type: IMAGE;
+      part { name: "navigationitem";
+         type: RECT;
          mouse_events: 0;
          clip_to: "clip_title";
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 1 NAVI_BAR_H;
+         description { state: "default" 0.0;
+            min: 1 (NAVI_BAR_H - NAVIBAR_EX_TITLE_SEPARATOR_H);
             fixed: 0 1;
             rel1 { relative: 0.0 0.0; to: "base";}
             rel2 { relative: 1.0 0.0; to: "base";}
-            align: 0.0 0.0;
-            image {
-               normal: "00_winset_title_bg.png";
-            }
+            align: 0.5 0.0;
+            color: NAVIBAR_EX_EXTENDED_COLOR;
          }
       }
-      part {
-         name: "clip_title";
-         type: RECT;
+      part { name: "clip_title";
          mouse_events: 0;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 { relative: 0.0 0.0; to: "base"; }
-            rel2 { relative: 1.0 1.0; to: "base"; }
+         description { state: "default" 0.0;
+            rel1 { to: "base"; }
+            rel2 { to: "base"; }
          }
       }
-      part {
-         name: "elm.swallow.back";
+      part { name: "elm.swallow.back";
          type: SWALLOW;
          clip_to: "clip_title";
          scale: 1;
-         description {
+         description { state: "default" 0.0;
             fixed: 1 1;
             min: 0 40;
-            max: MAX_ITEM_WIDTH 40;
-            state: "default" 0.0;
+            max: NAVIBAR_EX_TITLE_ITEM_MAX_W 40;
+            align: 0.0 0.5;
             rel1 { relative: 0.0 0.0; to: "navigationitem"; }
             rel2 { relative: 0.0 1.0; to: "navigationitem"; }
-            align: 0.0 0.5;
          }
       }
-      part {
-         name: "elm.rect.pada";
-         type: RECT;
+      part { name: "elm.rect.pada";
          mouse_events: 0;
-         clip_to: "clip_title";
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: PADDING 0;
+         description { state: "default" 0.0;
+            min: 67 0;
             fixed: 1 0;
+            align: 0.0 0.5;
             rel1 { relative: 0.0 0.0; to: "navigationitem"; }
             rel2 { relative: 0.0 1.0; to: "navigationitem"; }
-            align: 0.0 0.5;
-            color: 0 0 0 0;
          }
-      } 
-      part {
-         name: "elm.rect.padb";
-         type: RECT;
+      }
+      part { name: "elm.rect.padb";
          mouse_events: 0;
-         clip_to: "clip_title";
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 1 0;
+         description { state: "default" 0.0;
+            min: 82 0;
             fixed: 1 0;
+            align: 1.0 0.5;
             rel1 { relative: 1.0 0.0; to: "navigationitem"; }
             rel2 { relative: 1.0 1.0; to: "navigationitem"; }
-            align: 1.0 0.5;
-            color: 0 0 0 0;
          }
       }
-      part {
-         name: "elm.text";
+      part { name: "elm.text";
          type: TEXT;
          clip_to: "clip_title";
-         scale:1;       
-         description {
-            state: "default" 0.0;
-            text
-              {
+         scale:1;
+         description { state: "default" 0.0;
+            text {
                  font: "SLP:style=Medium";
                  size: 22;
                  min: 0 0;
                  align: 0.5 0.5;
                  max: 1 0;
-              }
+            }
             color: NAVIGATIONBAR_TITLE_TEXT_COLOR;
-            rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; }  //1.0 0.0
-            rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; }
             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"; }
          }
       }
-      part {
-         name: "elm.swallow.content";
+      part { name: "elm.swallow.content";
          type: SWALLOW;
          scale: 1;
-         description {
-            state: "default" 0.0;
+         description { state: "default" 0.0;
             align: 0.0 0.0;
-            rel1 { relative: 0.0 1.0; to: "base"; }
+            rel1 { relative: 0.0 1.0; to: "base"; offset: 0 -NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H; }
             rel2 { relative: 1.0 1.0; }
          }
-         description {
-            state: "top" 0.0;
+         description { state: "top" 0.0;
             rel1 { relative: 0.0 0.0; }
             rel2 { relative: 1.0 1.0; }
          }
       }
+      part { name: "navigationitem_separator";
+         type: IMAGE;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            min: 1 (NAVIBAR_EX_TITLE_SEPARATOR_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H);
+            fixed: 0 1;
+            align: 0.5 1;
+            rel1 { to: "navigationitem"; relative: 0 1; }
+            rel2 { to: "base"; relative: 1 1; }
+            image { normal: "navibar_item_separator.png";
+                border: 0 0 1 6;
+                border_scale: 1;
+            }
+         }
+      }
    }
    programs {
       program {
@@ -330,144 +319,136 @@ group { name: "elm/navigationbar_ex/item/title/default";
 
 group { name: "elm/navigationbar_ex/item/title_option_header/default";
    images {
-      image: "00_winset_title_bg.png" COMP;
+      image: "navibar_item_separator.png" COMP;
    }
    parts {
       part { name: "base";
-         type: RECT;
-         scale : 1;
          mouse_events: 0;
          repeat_events: 1;
          description { state: "default" 0.0;
-            min: 1 NAVI_BAR_H;
+            min: 1 (NAVIBAR_EX_EXTENDED_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H);
             fixed: 1 1;
-            color: 0 0 0 0;
-            rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 0.0;
             align: 0.0 0.0;
          }
-         description {
-            state: "top" 0.0;
+         description { state: "top" 0.0;
             inherit: "default" 0.0;
             min: 1 0;
          }
-         description {
-            state: "extended" 0.0;
+         description { state: "closed" 0.0;
             inherit: "default" 0.0;
-            min: 1 NAVI_BAR_EXTENDED_HEIGHT;
+            min: 1 (NAVI_BAR_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H);
          }
       }
-      part {
-         name: "navigationitem";
-         type: IMAGE;
+      part { name: "navigationitem";
+         type: RECT;
          mouse_events: 0;
          clip_to: "clip_title";
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 1 NAVI_BAR_H;
+         description { state: "default" 0.0;
+            min: 1 (NAVI_BAR_H - NAVIBAR_EX_TITLE_SEPARATOR_H);
             fixed: 0 1;
-            rel1 { relative: 0.0 0.0; to: "base"; }
-            rel2 { relative: 1.0 0.0; to: "base"; }
-            align: 0.0 0.0;
-            image {
-               normal: "00_winset_title_bg.png";
-            }
+            rel1 { relative: 0.0 0.0; to: "base";}
+            rel2 { relative: 1.0 0.0; to: "base";}
+            align: 0.5 0.0;
+            color: NAVIBAR_EX_EXTENDED_COLOR;
          }
       }
-      part {
-         name: "clip_title";
-         type: RECT;
+      part { name: "clip_title";
          mouse_events: 0;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 { relative: 0.0 0.0; to: "base"; }
-            rel2 { relative: 1.0 1.0; to: "base"; }
+         description { state: "default" 0.0;
+            rel1 { to: "base"; }
+            rel2 { to: "base"; }
          }
       }
-      part {
-         name: "elm.swallow.back";
+      part { name: "elm.swallow.back";
          type: SWALLOW;
          clip_to: "clip_title";
          scale: 1;
-         description {
+         description { state: "default" 0.0;
             fixed: 1 1;
             min: 0 40;
-            max: MAX_ITEM_WIDTH 40;
-            state: "default" 0.0;
+            max: NAVIBAR_EX_TITLE_ITEM_MAX_W 40;
+            align: 0.0 0.5;
             rel1 { relative: 0.0 0.0; to: "navigationitem"; }
             rel2 { relative: 0.0 1.0; to: "navigationitem"; }
-            align: 0.0 0.5;
          }
       }
-      part {
-         name: "elm.rect.pada";
-         type: RECT;
+      part { name: "elm.rect.pada";
          mouse_events: 0;
-         clip_to: "clip_title";
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: PADDING 0;
+         description { state: "default" 0.0;
+            min: 67 0;
             fixed: 1 0;
+            align: 0.0 0.5;
             rel1 { relative: 0.0 0.0; to: "navigationitem"; }
             rel2 { relative: 0.0 1.0; to: "navigationitem"; }
-            align: 0.0 0.5;
-            color: 0 0 0 0;
          }
       }
-      part {
-         name: "elm.rect.padb";
-         type: RECT;
+      part { name: "elm.rect.padb";
          mouse_events: 0;
-         clip_to: "clip_title";
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 1 0;
+         description { state: "default" 0.0;
+            min: 82 0;
             fixed: 1 0;
+            align: 1.0 0.5;
             rel1 { relative: 1.0 0.0; to: "navigationitem"; }
             rel2 { relative: 1.0 1.0; to: "navigationitem"; }
-            align: 1.0 0.5;
-            color: 0 0 0 0;
          }
       }
-      part {
-         name: "elm.text";
+      part { name: "elm.text";
          type: TEXT;
          clip_to: "clip_title";
-         scale:1;       
-         description {
-            state: "default" 0.0;
-            text
-              {
+         scale:1;
+         description { state: "default" 0.0;
+            text {
                  font: "SLP:style=Medium";
                  size: 22;
                  min: 0 0;
                  align: 0.5 0.5;
                  max: 1 0;
-              }
+            }
             color: NAVIGATIONBAR_TITLE_TEXT_COLOR;
-            rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; }  //1.0 0.0
-            rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; }
             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"; }
+         }
+      }
+      part {
+         name: "events";
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            rel1 { to: "elm.rect.pada"; relative: 1 0; }
+            rel2 { to: "elm.rect.padb"; relative: 0 1; }
+         }
+      }
+      part { name: "elm.swallow.content";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            align: 0.0 0.0;
+            rel1 { relative: 0.0 1.0; to: "base"; offset: 0 -NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H; }
+            rel2 { relative: 1.0 1.0; }
+         }
+         description { state: "top" 0.0;
+            rel1 { relative: 0.0 0.0; }
+            rel2 { relative: 1.0 1.0; }
          }
       }
-     part {
-          name: "events";
-          type: RECT;
-          clip_to: "clip_title";
-          ignore_flags: ON_HOLD;
-          description {
-             state: "default" 0.0;
-             rel1 { to: "elm.text"; }
-             rel2 { to: "elm.text"; }
-             color: 0 0 0 0;
+      part { name: "navigationitem_separator";
+         type: IMAGE;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            min: 1 (NAVIBAR_EX_TITLE_SEPARATOR_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H);
+            fixed: 0 1;
+            align: 0.5 1;
+            rel1 { to: "navigationitem"; relative: 0 1; }
+            rel2 { to: "base"; relative: 1 1; }
+            image { normal: "navibar_item_separator.png";
+                border: 0 0 1 6;
+                border_scale: 1;
             }
          }
-     part {
+      }
+      part {
          name: "naviarrow";
          type: IMAGE;
          mouse_events: 1;
@@ -478,42 +459,30 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default";
             min: 15 11;
             max: 15 11;
             fixed: 1 1;
-            rel1 { relative: 0.0 0.0; to: "elm.text"; }
-            rel2 { relative: 1.0 1.0; to: "elm.text"; }
             align: 0.5 1.0;
+            rel1 { relative: 0 0; to: "navigationitem_separator"; offset: 0 1; }
+            rel2 { relative: 1 0; to: "navigationitem_separator"; offset: -1 0; }
             image {
                normal: "00_winset_control_top_arrow.png";
             }
          }
       }
-      part {
-         name: "elm.swallow.title";
+      part { name: "elm.swallow.title";
          type: SWALLOW;
-         scale:1;
+         scale: 1;
          clip_to: "clip_title";
-         description {
+         description { state: "default" 0.0;
+            min: 0 NAVIBAR_EX_TITLE_ITEM_H;
+            max: 999999 NAVIBAR_EX_TITLE_ITEM_H;
             fixed: 0 1;
-            min: 0 ITEM_HEIGHT;
-            state: "default" 0.0;
-            rel1 { relative: 0.0 1.0; to_y: "navigationitem"; }
-            rel2 { relative: 1.0 1.0; to: "base"; }
-            align: 0.0 0.0;
+            align: 0.5 0.0;
+            rel1 { to: "navigationitem_separator"; }
+            rel2 { to: "navigationitem_separator"; }
+            visible: 1;
          }
-      }
-      part {
-         name: "elm.swallow.content";
-         type: SWALLOW;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 { relative: 0.0 1.0; to: "base"; }
-            rel2 { relative: 1.0 1.0; }
-         }
-         description {
-            state: "top" 0.0;
-            rel1 { relative: 0.0 0.0; }
-            rel2 { relative: 1.0 1.0; }
+         description { state: "closed" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
          }
       }
    }
@@ -544,16 +513,18 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default";
          name: "extended_titlearea";
          signal: "elm,state,show,title";
          source: "elm";
-         action: STATE_SET "extended" 0.0;
+         action: STATE_SET "default" 0.0;
          target: "base";
+         target: "elm.swallow.title";
          transition: LINEAR 0.2;
       }
       program {
          name: "retract_titlearea";
          signal: "elm,state,hide,title";
          source: "elm";
-         action: STATE_SET "default" 0.0;
+         action: STATE_SET "closed" 0.0;
          target: "base";
+         target: "elm.swallow.title";
          transition: LINEAR 0.2;
       }
    }
@@ -561,144 +532,136 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default";
 
 group { name: "elm/navigationbar_ex/item/title_option_header2/default";
    images {
-      image: "00_winset_title_bg.png" COMP;
+      image: "navibar_item_separator.png" COMP;
    }
    parts {
       part { name: "base";
-         type: RECT;
-         scale : 1;
          mouse_events: 0;
          repeat_events: 1;
          description { state: "default" 0.0;
-            min: 1 NAVI_BAR_H;
+            min: 1 (NAVIBAR_EX_EXTENDED_H2 + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H);
             fixed: 1 1;
-            color: 0 0 0 0;
-            rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 0.0;
             align: 0.0 0.0;
          }
-         description {
-            state: "top" 0.0;
+         description { state: "top" 0.0;
             inherit: "default" 0.0;
             min: 1 0;
          }
-         description {
-            state: "extended" 0.0;
+         description { state: "closed" 0.0;
             inherit: "default" 0.0;
-            min: 1 NAVI_BAR_EXTENDED_HEIGHT2;
+            min: 1 (NAVI_BAR_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H);
          }
       }
-      part {
-         name: "navigationitem";
-         type: IMAGE;
+      part { name: "navigationitem";
+         type: RECT;
          mouse_events: 0;
          clip_to: "clip_title";
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 1 NAVI_BAR_H;
+         description { state: "default" 0.0;
+            min: 1 (NAVI_BAR_H - NAVIBAR_EX_TITLE_SEPARATOR_H);
             fixed: 0 1;
-            rel1 { relative: 0.0 0.0; to: "base"; }
-            rel2 { relative: 1.0 0.0; to: "base"; }
-            align: 0.0 0.0;
-            image {
-               normal: "00_winset_title_bg.png";
-            }
+            rel1 { relative: 0.0 0.0; to: "base";}
+            rel2 { relative: 1.0 0.0; to: "base";}
+            align: 0.5 0.0;
+            color: NAVIBAR_EX_EXTENDED_COLOR;
          }
       }
-      part {
-         name: "clip_title";
-         type: RECT;
+      part { name: "clip_title";
          mouse_events: 0;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 { relative: 0.0 0.0; to: "base"; }
-            rel2 { relative: 1.0 1.0; to: "base"; }
+         description { state: "default" 0.0;
+            rel1 { to: "base"; }
+            rel2 { to: "base"; }
          }
       }
-      part {
-         name: "elm.swallow.back";
+      part { name: "elm.swallow.back";
          type: SWALLOW;
          clip_to: "clip_title";
          scale: 1;
-         description {
+         description { state: "default" 0.0;
             fixed: 1 1;
             min: 0 40;
-            max: MAX_ITEM_WIDTH 40;
-            state: "default" 0.0;
+            max: NAVIBAR_EX_TITLE_ITEM_MAX_W 40;
+            align: 0.0 0.5;
             rel1 { relative: 0.0 0.0; to: "navigationitem"; }
             rel2 { relative: 0.0 1.0; to: "navigationitem"; }
-            align: 0.0 0.5;
          }
       }
-      part {
-         name: "elm.rect.pada";
-         type: RECT;
+      part { name: "elm.rect.pada";
          mouse_events: 0;
-         clip_to: "clip_title";
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: PADDING 0;
+         description { state: "default" 0.0;
+            min: 67 0;
             fixed: 1 0;
+            align: 0.0 0.5;
             rel1 { relative: 0.0 0.0; to: "navigationitem"; }
             rel2 { relative: 0.0 1.0; to: "navigationitem"; }
-            align: 0.0 0.5;
-            color: 0 0 0 0;
          }
       }
-      part {
-         name: "elm.rect.padb";
-         type: RECT;
+      part { name: "elm.rect.padb";
          mouse_events: 0;
-         clip_to: "clip_title";
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 1 0;
+         description { state: "default" 0.0;
+            min: 82 0;
             fixed: 1 0;
+            align: 1.0 0.5;
             rel1 { relative: 1.0 0.0; to: "navigationitem"; }
             rel2 { relative: 1.0 1.0; to: "navigationitem"; }
-            align: 1.0 0.5;
-            color: 0 0 0 0;
          }
       }
-      part {
-         name: "elm.text";
+      part { name: "elm.text";
          type: TEXT;
          clip_to: "clip_title";
-         scale:1;       
-         description {
-            state: "default" 0.0;
-            text
-              {
+         scale:1;
+         description { state: "default" 0.0;
+            text {
                  font: "SLP:style=Medium";
                  size: 22;
                  min: 0 0;
                  align: 0.5 0.5;
                  max: 1 0;
-              }
+            }
             color: NAVIGATIONBAR_TITLE_TEXT_COLOR;
-            rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; }  //1.0 0.0
-            rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; }
             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"; }
+         }
+      }
+      part {
+         name: "events";
+         ignore_flags: ON_HOLD;
+         description {
+            state: "default" 0.0;
+            rel1 { to: "elm.rect.pada"; relative: 1 0; }
+            rel2 { to: "elm.rect.padb"; relative: 0 1; }
          }
       }
-     part {
-          name: "events";
-          type: RECT;
-          clip_to: "clip_title";
-          ignore_flags: ON_HOLD;
-          description {
-             state: "default" 0.0;
-             rel1 { to: "elm.text"; }
-             rel2 { to: "elm.text"; }
-             color: 0 0 0 0;
+      part { name: "elm.swallow.content";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            align: 0.0 0.0;
+            rel1 { relative: 0.0 1.0; to: "base"; offset: 0 -NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H; }
+            rel2 { relative: 1.0 1.0; }
+         }
+         description { state: "top" 0.0;
+            rel1 { relative: 0.0 0.0; }
+            rel2 { relative: 1.0 1.0; }
+         }
+      }
+      part { name: "navigationitem_separator";
+         type: IMAGE;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            min: 1 (NAVIBAR_EX_TITLE_SEPARATOR_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H);
+            fixed: 0 1;
+            align: 0.5 1;
+            rel1 { to: "navigationitem"; relative: 0 1; }
+            rel2 { to: "base"; relative: 1 1; }
+            image { normal: "navibar_item_separator.png";
+                border: 0 0 0 6;
+                border_scale: 1;
             }
          }
-     part {
+      }
+      part {
          name: "naviarrow";
          type: IMAGE;
          mouse_events: 1;
@@ -709,42 +672,30 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default";
             min: 15 11;
             max: 15 11;
             fixed: 1 1;
-            rel1 { relative: 0.0 0.0; to: "elm.text"; }
-            rel2 { relative: 1.0 1.0; to: "elm.text"; }
             align: 0.5 1.0;
+            rel1 { relative: 0 0; to: "navigationitem_separator"; offset: 0 1; }
+            rel2 { relative: 1 0; to: "navigationitem_separator"; offset: -1 0; }
             image {
                normal: "00_winset_control_top_arrow.png";
             }
          }
       }
-      part {
-         name: "elm.swallow.title";
+      part { name: "elm.swallow.title";
          type: SWALLOW;
-         scale:1;
+         scale: 1;
          clip_to: "clip_title";
-         description {
+         description { state: "default" 0.0;
+            min: 0 (NAVIBAR_EX_TITLE_ITEM_H * 2);
+            max: 999999 (NAVIBAR_EX_TITLE_ITEM_H * 2);
             fixed: 0 1;
-            min: 0 ITEM_HEIGHT;
-            state: "default" 0.0;
-            rel1 { relative: 0.0 1.0; to_y: "navigationitem"; }
-            rel2 { relative: 1.0 1.0; to: "base"; }
-            align: 0.0 0.0;
-         }
-      }
-      part {
-         name: "elm.swallow.content";
-         type: SWALLOW;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 { relative: 0.0 1.0; to: "base"; }
-            rel2 { relative: 1.0 1.0; }
+            align: 0.5 0.0;
+            rel1 { to: "navigationitem_separator"; }
+            rel2 { to: "navigationitem_separator"; }
+            visible: 1;
          }
-         description {
-            state: "top" 0.0;
-            rel1 { relative: 0.0 0.0; }
-            rel2 { relative: 1.0 1.0; }
+         description { state: "closed" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
          }
       }
    }
@@ -775,16 +726,18 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default";
          name: "extended_titlearea";
          signal: "elm,state,show,title";
          source: "elm";
-         action: STATE_SET "extended" 0.0;
+         action: STATE_SET "default" 0.0;
          target: "base";
+         target: "elm.swallow.title";
          transition: LINEAR 0.2;
       }
       program {
          name: "retract_titlearea";
          signal: "elm,state,hide,title";
          source: "elm";
-         action: STATE_SET "default" 0.0;
+         action: STATE_SET "closed" 0.0;
          target: "base";
+         target: "elm.swallow.title";
          transition: LINEAR 0.2;
       }
    }
@@ -792,13 +745,11 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default";
 
 group { name: "elm/standard/navigationbar_ex/title_obj2";
    parts {
-      part {
-         name: "title_obj1";
+      part { name: "title_obj1";
          type: SWALLOW;
          scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 0 55;
+         description { state: "default" 0.0;
+            min: 0 NAVIBAR_EX_TITLE_ITEM_H;
             fixed: 0 1;
             rel1 { relative: 0.0 0.0; }
             rel2 { relative: 1.0 0.0; }
@@ -808,24 +759,20 @@ group { name: "elm/standard/navigationbar_ex/title_obj2";
       part {
          name: "padding";
          type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
+         description { state: "default" 0.0;
             min: 0 1;
             fixed: 0 1;
             rel1 { relative: 0.0 1.0; to_y: "title_obj1"; }
-            rel2 { relative: 1.0 0.0; }
+            rel2 { relative: 1.0 1.0; to_y: "title_obj1"; }
             align: 0.0 0.0;
             color: 207 128 19 255;
          }
       }
-      part {
-         name: "title_obj2";
+      part { name: "title_obj2";
          type: SWALLOW;
          scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 0 65;
+         description { state: "default" 0.0;
+            min: 0 NAVIBAR_EX_TITLE_ITEM_H;
             fixed: 0 1;
             rel1 { relative: 0.0 1.0; to_y: "padding"; }
             rel2 { relative: 1.0 1.0; }
index 92da954..127ca51 100644 (file)
@@ -43,6 +43,16 @@ group { name: "elm/segment_control/base/default";
    }
 }
 
+#define SEGMENT_TYPE_SINGLE 1
+#define SEGMENT_TYPE_LEFT 2
+#define SEGMENT_TYPE_MIDDLE 3
+#define SEGMENT_TYPE_RIGHT 4
+#define SEGMENT_STATE_NORMAL 1
+#define SEGMENT_STATE_PRESSED 2
+#define SEGMENT_STATE_SELECTED 3
+#define SEGMENT_STATUS_ENABLED 0
+#define SEGMENT_STATUS_DISABLED 1
+
 group { name: "elm/segment_control/item/default";
    data.item: "label.wrap.part" "label.bg";
 
@@ -358,9 +368,9 @@ group { name: "elm/segment_control/item/default";
    }
    programs {
       script {
-         public seg_type; // 1-Single, 2-Left, 3-Middle, 4-Right.
-         public seg_state; // 1-Normal/Default, 2-Pressed, 3-Selected.
-         public seg_status;// 0-Enabled/Default, 1-Disabled
+         public seg_type; // Single, Left, Middle, Right.
+         public seg_state; // Normal/Default, Pressed, Selected.
+         public seg_status;// Enabled/Default, Disabled
 
          public update_state() {
             new type, state, disabled;
@@ -368,48 +378,48 @@ group { name: "elm/segment_control/item/default";
             state = get_int(seg_state);
             disabled = get_int(seg_status);
 
-            if( state ==1 )
+            if(state == SEGMENT_STATE_NORMAL)
               {
-                 if(type == 1)
+                 if(type == SEGMENT_TYPE_SINGLE)
                    set_state(PART:"segment", "default_single", 0.0);
-                 else if(type == 2)
+                 else if(type == SEGMENT_TYPE_LEFT)
                    set_state(PART:"segment", "default_left", 0.0);
-                 else if(type == 3)
+                 else if(type == SEGMENT_TYPE_MIDDLE)
                    set_state(PART:"segment", "default_middle", 0.0);
-                 else if(type == 4)
+                 else if(type == SEGMENT_TYPE_RIGHT)
                    set_state(PART:"segment", "default_right", 0.0);
               }
-            else if( state == 2 )
+            else if(state == SEGMENT_STATE_PRESSED)
               {
-                 if(type == 1)
+                 if(type == SEGMENT_TYPE_SINGLE)
                    set_state(PART:"segment", "pressed_single", 0.0);
-                 else if(type == 2)
+                 else if(type == SEGMENT_TYPE_LEFT)
                    set_state(PART:"segment", "pressed_left", 0.0);
-                 else if(type == 3)
+                 else if(type == SEGMENT_TYPE_MIDDLE)
                    set_state(PART:"segment", "pressed_middle", 0.0);
-                  else if(type == 4)
+                 else if(type == SEGMENT_TYPE_RIGHT)
                    set_state(PART:"segment", "pressed_right", 0.0);
               }
-            else if( state == 3 )
+            else if(state == SEGMENT_STATE_SELECTED)
               {
-                 if(type == 1)
+                 if(type == SEGMENT_TYPE_SINGLE)
                    set_state(PART:"segment", "selected_single", 0.0);
-                 else if(type == 2)
+                 else if(type == SEGMENT_TYPE_LEFT)
                    set_state(PART:"segment", "selected_left", 0.0);
-                 else if(type == 3)
+                 else if(type == SEGMENT_TYPE_MIDDLE)
                    set_state(PART:"segment", "selected_middle", 0.0);
-                 else if(type == 4)
+                 else if(type == SEGMENT_TYPE_RIGHT)
                    set_state(PART:"segment", "selected_right", 0.0);
               }
-            if( disabled == 1 )
+            if(disabled == SEGMENT_STATUS_DISABLED)
               {
-                 if(type == 1)
+                 if(type == SEGMENT_TYPE_SINGLE)
                    set_state(PART:"disabler", "disabled_single", 0.0);
-                 else if(type == 2)
+                 else if(type == SEGMENT_TYPE_LEFT)
                    set_state(PART:"disabler", "disabled_left", 0.0);
-                 else if(type == 3)
+                 else if(type == SEGMENT_TYPE_MIDDLE)
                    set_state(PART:"disabler", "disabled_middle", 0.0);
-                 else if(type == 4)
+                 else if(type == SEGMENT_TYPE_RIGHT)
                    set_state(PART:"disabler", "disabled_right", 0.0);
               }
          }
@@ -419,8 +429,8 @@ group { name: "elm/segment_control/item/default";
          signal: "elm,type,segment,single";
          source: "elm";
          script {
-            set_int(seg_status, 0);
-            set_int(seg_type, 1);
+            set_int(seg_status, SEGMENT_STATUS_ENABLED);
+            set_int(seg_type, SEGMENT_TYPE_SINGLE);
             update_state();
          }
       }
@@ -429,8 +439,8 @@ group { name: "elm/segment_control/item/default";
          signal: "elm,type,segment,left";
          source: "elm";
          script {
-            set_int(seg_status, 0);
-            set_int(seg_type, 2);
+            set_int(seg_status, SEGMENT_STATUS_ENABLED);
+            set_int(seg_type, SEGMENT_TYPE_LEFT);
             update_state();
          }
       }
@@ -439,8 +449,8 @@ group { name: "elm/segment_control/item/default";
          signal: "elm,type,segment,middle";
          source: "elm";
          script {
-            set_int(seg_status, 0);
-            set_int(seg_type, 3);
+            set_int(seg_status, SEGMENT_STATUS_ENABLED);
+            set_int(seg_type, SEGMENT_TYPE_MIDDLE);
             update_state();
          }
       }
@@ -449,8 +459,8 @@ group { name: "elm/segment_control/item/default";
          signal: "elm,type,segment,right";
          source: "elm";
          script {
-            set_int(seg_status, 0);
-            set_int(seg_type, 4);
+            set_int(seg_status, SEGMENT_STATUS_ENABLED);
+            set_int(seg_type, SEGMENT_TYPE_RIGHT);
             update_state();
          }
       }
@@ -459,8 +469,8 @@ group { name: "elm/segment_control/item/default";
          signal: "elm,state,segment,normal";
          source: "elm";
          script {
-            set_int(seg_status, 0);
-            set_int(seg_state, 1);
+            set_int(seg_status, SEGMENT_STATUS_ENABLED);
+            set_int(seg_state, SEGMENT_STATE_NORMAL);
             update_state();
          }
       }
@@ -469,8 +479,8 @@ group { name: "elm/segment_control/item/default";
          signal: "elm,state,segment,pressed";
          source: "elm";
          script {
-            set_int(seg_status, 0);
-            set_int(seg_state, 2);
+            set_int(seg_status, SEGMENT_STATUS_ENABLED);
+            set_int(seg_state, SEGMENT_STATE_PRESSED);
             update_state();
          }
       }
@@ -479,8 +489,8 @@ group { name: "elm/segment_control/item/default";
          signal: "elm,state,segment,selected";
          source: "elm";
          script {
-            set_int(seg_status, 0);
-            set_int(seg_state, 3);
+            set_int(seg_status, SEGMENT_STATUS_ENABLED);
+            set_int(seg_state, SEGMENT_STATE_SELECTED);
             update_state();
          }
       }
@@ -488,7 +498,7 @@ group { name: "elm/segment_control/item/default";
          signal: "elm,state,disabled";
          source: "elm";
          script {
-            set_int(seg_status, 1);
+            set_int(seg_status, SEGMENT_STATUS_DISABLED);
             update_state();
          }
       }
@@ -496,7 +506,7 @@ group { name: "elm/segment_control/item/default";
          signal: "elm,state,enabled";
          source: "elm";
          script {
-            set_int(seg_status, 0);
+            set_int(seg_status, SEGMENT_STATUS_ENABLED);
             update_state();
          }
       }
@@ -561,14 +571,13 @@ group { name: "elm/segment_control/item/default";
    }
 }
 
-group { name: "elm/label/base/segment_normal";
+group { name: "elm/label/base/default/segment_normal";
    data.item: "default_font_size" "24";
    data.item: "min_font_size" "16";
    data.item: "max_font_size" "24";
    styles{
       style { name: "seg_text_style_normal";
-         base: "font=SLP:style=Medium font_size=18 style=shadow \
-         shadow_color="SEGMENT_CONTROL_ITEM_TITLE_TEXT_SHADOW_STYLE_COLOR_NORMAL_INC" \
+         base: "font=SLP:style=Medium font_size=18\
          align=center \
          color="SEGMENT_CONTROL_ITEM_TITLE_TEXT_STYLE_COLOR_NORMAL_INC" wrap=char";
          tag:  "br" "\n";
@@ -577,8 +586,7 @@ group { name: "elm/label/base/segment_normal";
          tag:  "tab" "\t";
       }
       style { name: "seg_text_style_pressed";
-         base: "font=SLP:style=Medium font_size=18 style=shadow \
-         shadow_color="SEGMENT_CONTROL_ITEM_TITLE_TEXT_SHADOW_STYLE_COLOR_NORMAL_INC" \
+         base: "font=SLP:style=Medium font_size=18\
          align=center \
          color="SEGMENT_CONTROL_ITEM_TITLE_TEXT_STYLE_COLOR_PRESSED_INC" wrap=char";
          tag:  "br" "\n";
@@ -587,8 +595,7 @@ group { name: "elm/label/base/segment_normal";
          tag:  "tab" "\t";
       }
       style { name: "seg_text_style_selected";
-         base: "font=SLP:style=Medium font_size=18 style=shadow \
-         shadow_color="SEGMENT_CONTROL_ITEM_TITLE_TEXT_SHADOW_STYLE_COLOR_SELECTED_INC" \
+         base: "font=SLP:style=Medium font_size=18\
          align=center color="SEGMENT_CONTROL_ITEM_TITLE_TEXT_STYLE_COLOR_SELECTED_INC" \
          wrap=char";
          tag:  "br" "\n";
@@ -597,9 +604,8 @@ group { name: "elm/label/base/segment_normal";
          tag:  "tab" "\t";
       }
       style { name: "seg_text_style_disabled";
-         base: "font=SLP:style=Medium font_size=18 style=shadow \
-         shadow_color="SEGMENT_CONTROL_ITEM_TITLE_TEXT_SHADOW_STYLE_COLOR_SELECTED_INC" \
-         align=center color="SEGMENT_CONTROL_ITEM_TITLE_TEXT_STYLE_COLOR_DISABLED_INC" \
+         base: "font=SLP:style=Medium font_size=18\
+         align=center color="SEGMENT_CONTROL_ITEM_TITLE_TEXT_STYLE_COLOR_NORMAL_INC" \
          wrap=char";
          tag:  "br" "\n";
          tag:  "hilight" "+ font=SLP:style=Bold";
@@ -643,7 +649,7 @@ group { name: "elm/label/base/segment_normal";
    }
 }
 
-group { name: "elm/label/base/segment_selected";
+group { name: "elm/label/base/default/segment_selected";
    data.item: "default_font_size" "24";
    data.item: "min_font_size" "16";
    data.item: "max_font_size" "24";
@@ -682,7 +688,7 @@ group { name: "elm/label/base/segment_selected";
       }
    }
 }
-group { name: "elm/label/base/segment_pressed";
+group { name: "elm/label/base/default/segment_pressed";
    data.item: "default_font_size" "24";
    data.item: "min_font_size" "16";
    data.item: "max_font_size" "24";
@@ -722,7 +728,7 @@ group { name: "elm/label/base/segment_pressed";
    }
 }
 
-group { name: "elm/label/base/segment_disabled";
+group { name: "elm/label/base/default/segment_disabled";
    data.item: "default_font_size" "24";
    data.item: "min_font_size" "16";
    data.item: "max_font_size" "24";
@@ -761,3 +767,745 @@ group { name: "elm/label/base/segment_disabled";
       }
    }
 }
+
+
+group { name: "elm/segment_control/base/body_style";
+   parts {
+      part { name: "bg";
+         type: RECT;
+         mouse_events: 0;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            color: 203 193 182 255;
+            rel1.offset: 5 0;
+            rel2.offset: -5 -1;
+            min: 100 40;
+         }
+      }
+   }
+}
+
+group { name: "elm/segment_control/item/body_style";
+   data.item: "label.wrap.part" "label.bg";
+
+   images {
+      image: "00_winset_btn_sge_normal.png" COMP;
+      image: "00_winset_btn_sge_body_normal_left.png" COMP;
+      image: "00_winset_btn_sge_body_normal_centre.png" COMP;
+      image: "00_winset_btn_sge_body_normal_right.png" COMP;
+      image: "00_winset_btn_sge_body.png" COMP;
+      image: "00_winset_btn_sge_body_press_center.png" COMP;
+      image: "00_winset_btn_sge_body_press_left.png" COMP;
+      image: "00_winset_btn_sge_body_press_right.png" COMP;
+      }
+   parts {
+      part { name: "segment";
+         mouse_events: 1;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 1 1;
+            visible: 0;
+            image {
+               normal: "00_winset_btn_sge_body.png";
+               border: 5 5 5 5;
+               border_scale: 1;
+               middle: 1;
+            }
+         }
+         description { state: "default_single" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image {
+               normal: "00_winset_btn_sge_body.png";
+               border: 5 5 5 5;
+            }
+         }
+         description { state: "default_left" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image {
+               normal: "00_winset_btn_sge_body_normal_left.png";
+               border:  5 1 5 5;
+            }
+         }
+         description { state: "default_right" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image {
+               normal: "00_winset_btn_sge_body_normal_right.png";
+               border: 1 5 5 5;
+            }
+         }
+         description { state: "default_middle" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image {
+            normal: "00_winset_btn_sge_body_normal_centre.png";
+            border: 1 1 5 5;
+            }
+         }
+         description { state: "pressed_single" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image {
+               normal: "00_winset_btn_sge_normal.png";
+               border: 5 5 5 5;
+            }
+         }
+         description { state: "pressed_left" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image {
+               normal: "00_winset_btn_sge_body_press_left.png";
+               border:  5 1 5 5;
+            }
+         }
+         description { state: "pressed_right" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image {
+               normal: "00_winset_btn_sge_body_press_right.png";
+               border: 1 5 5 5;
+            }
+         }
+         description { state: "pressed_middle" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image {
+               normal: "00_winset_btn_sge_body_press_center.png";
+               border: 1 1 7 7;
+            }
+         }
+         description { state: "selected_single" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image {
+               normal: "00_winset_btn_sge_normal.png";
+               border: 5 5 5 5;
+            }
+         }
+         description { state: "selected_left" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image {
+               normal: "00_winset_btn_sge_body_press_left.png";
+               border:  5 1 5 5;
+            }
+         }
+         description { state: "selected_right" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image {
+               normal: "00_winset_btn_sge_body_press_right.png";
+               border: 1 5 5 5;
+            }
+         }
+         description { state: "selected_middle" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image {
+               normal: "00_winset_btn_sge_body_press_center.png";
+               border: 1 1 7 7;
+            }
+         }
+      }
+      part { name: "padding_left";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            align: 0.0 0.0;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 0.0 1.0;
+            min: 2 2;
+            max: 2 2;
+            fixed: 1 0;
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "padding_right";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            align: 1.0 0.0;
+            rel1.relative: 1.0 0.0;
+            rel2.relative: 1.0 1.0;
+            min: 2 2;
+            max: 2 2;
+            fixed: 1 0;
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "padding_top";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            align: 0.0 0.0;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 0.0;
+            min: 2 2;
+            max: 2 2;
+            fixed: 0 1;
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "padding_bottom";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            align: 1.0 1.0;
+            rel1.relative: 0.0 1.0;
+            rel2.relative: 1.0 1.0;
+            min: 2 2;
+            max: 2 2;
+            fixed: 0 1;
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "icon.bg";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            visible: 1;
+            fixed: 1 0;
+            rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+            rel2 {relative: 1.0 1.0; to: "elm.swallow.icon"; }
+            align: 0.0 0.5;
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "padding_icon_text";
+         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.bg"; }
+            rel2 { relative: 1.0 1.0; to: "icon.bg"; }
+            fixed: 1 0;
+            min: 0 0;
+            color: 0 0 0 0;
+         }
+         description { state: "icononly" 0.0;
+            inherit: "default" 0.0;
+         }
+         description { state: "visible" 0.0; //when icon is visible
+            align: 0.0 0.0;
+            rel1 { relative: 1.0 0.0; to: "icon.bg"; }
+            rel2 { relative: 1.0 1.0; to: "icon.bg"; }
+            fixed: 1 0;
+            min: 2 0;
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "elm.swallow.icon";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            align: 0.0 0.5;
+            rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+            rel2 {relative: 0.0 0.0; to_y: "padding_bottom"; }
+            fixed: 1 0;
+            aspect: 1.0 1.0;
+            aspect_preference: BOTH;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            rel2 {relative: 0.3 0.0; to_y: "padding_bottom"; }
+         }
+         description { state: "icononly" 0.0;;
+            inherit: "default" 0.0;
+            visible: 1;
+            rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
+            align: 0.5 0.5;
+         }
+      }
+      part { name: "label.bg";
+         repeat_events: 1;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1 { relative: 1.0 1.0; to_x: "padding_icon_text"; to_y: "padding_top"; }
+            rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
+         }
+      }
+      part { name: "elm.swallow.label";
+         type: SWALLOW;
+         mouse_events: 0;
+         scale: 1;
+         clip_to: "label.bg";
+         description { state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            min: 1 1;
+            align: 0.0 0.5;
+            rel1 { relative: 1.0 1.0; to_x: "padding_icon_text";}
+            rel2 { relative: 0.0 0.0; to_x: "padding_right";}
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "disabler";
+         repeat_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            min: 1 1;
+            align: 0.0 0.5;
+            rel1 { relative: 0.0 0.0; to: "segment";}
+            rel2 { relative: 1.0 1.0; to: "segment";}
+            color: 255 255 255 150;
+         }
+         description { state: "disabled_single" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image {
+               normal: "00_button_02_normal.png";
+               border: 7 7 7 7;
+            }
+         }
+         description { state: "disabled_left" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image {
+               normal: "00_winset_btn_sge_normal_left.png";
+               border:  6 1 7 7;
+            }
+         }
+         description { state: "disabled_right" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image {
+               normal: "00_winset_btn_sge_normal_right.png";
+               border: 1 6 7 7;
+            }
+         }
+         description { state: "disabled_middle" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image {
+               normal: "00_winset_btn_sge_normal_centre.png";
+               border: 2 2 2 2;
+            }
+         }
+      }
+   }
+   programs {
+      script {
+         public seg_type; // Single, Left, Middle, Right.
+         public seg_state; // Normal/Default, Pressed, Selected.
+         public seg_status;// Enabled/Default, Disabled
+
+         public update_state() {
+            new type, state, disabled;
+            type = get_int(seg_type);
+            state = get_int(seg_state);
+            disabled = get_int(seg_status);
+
+            if(state == SEGMENT_STATE_NORMAL)
+              {
+                 if(type == SEGMENT_TYPE_SINGLE)
+                   set_state(PART:"segment", "default_single", 0.0);
+                 else if(type == SEGMENT_TYPE_LEFT)
+                   set_state(PART:"segment", "default_left", 0.0);
+                 else if(type == SEGMENT_TYPE_MIDDLE)
+                   set_state(PART:"segment", "default_middle", 0.0);
+                 else if(type == SEGMENT_TYPE_RIGHT)
+                   set_state(PART:"segment", "default_right", 0.0);
+              }
+            else if(state == SEGMENT_STATE_PRESSED)
+              {
+                 if(type == SEGMENT_TYPE_SINGLE)
+                   set_state(PART:"segment", "pressed_single", 0.0);
+                 else if(type == SEGMENT_TYPE_LEFT)
+                   set_state(PART:"segment", "pressed_left", 0.0);
+                 else if(type == SEGMENT_TYPE_MIDDLE)
+                   set_state(PART:"segment", "pressed_middle", 0.0);
+                 else if(type == SEGMENT_TYPE_RIGHT)
+                   set_state(PART:"segment", "pressed_right", 0.0);
+              }
+            else if(state == SEGMENT_STATE_SELECTED)
+              {
+                 if(type == SEGMENT_TYPE_SINGLE)
+                   set_state(PART:"segment", "selected_single", 0.0);
+                 else if(type == SEGMENT_TYPE_LEFT)
+                   set_state(PART:"segment", "selected_left", 0.0);
+                 else if(type == SEGMENT_TYPE_MIDDLE)
+                   set_state(PART:"segment", "selected_middle", 0.0);
+                 else if(type == SEGMENT_TYPE_RIGHT)
+                   set_state(PART:"segment", "selected_right", 0.0);
+              }
+            if(disabled == SEGMENT_STATUS_DISABLED)
+              {
+                 if(type == SEGMENT_TYPE_SINGLE)
+                   set_state(PART:"disabler", "disabled_single", 0.0);
+                 else if(type == SEGMENT_TYPE_LEFT)
+                   set_state(PART:"disabler", "disabled_left", 0.0);
+                 else if(type == SEGMENT_TYPE_MIDDLE)
+                   set_state(PART:"disabler", "disabled_middle", 0.0);
+                 else if(type == SEGMENT_TYPE_RIGHT)
+                   set_state(PART:"disabler", "disabled_right", 0.0);
+              }
+         }
+      }
+      program {
+         name: "segment_type_s";
+         signal: "elm,type,segment,single";
+         source: "elm";
+         script {
+            set_int(seg_status, SEGMENT_STATUS_ENABLED);
+            set_int(seg_type, SEGMENT_TYPE_SINGLE);
+            update_state();
+         }
+      }
+      program {
+         name: "segment_type_l";
+         signal: "elm,type,segment,left";
+         source: "elm";
+         script {
+            set_int(seg_status, SEGMENT_STATUS_ENABLED);
+            set_int(seg_type, SEGMENT_TYPE_LEFT);
+            update_state();
+         }
+      }
+      program {
+         name: "segment_type_m";
+         signal: "elm,type,segment,middle";
+         source: "elm";
+         script {
+            set_int(seg_status, SEGMENT_STATUS_ENABLED);
+            set_int(seg_type, SEGMENT_TYPE_MIDDLE);
+            update_state();
+         }
+      }
+      program {
+         name: "segment_type_r";
+         signal: "elm,type,segment,right";
+         source: "elm";
+         script {
+            set_int(seg_status, SEGMENT_STATUS_ENABLED);
+            set_int(seg_type, SEGMENT_TYPE_RIGHT);
+            update_state();
+         }
+      }
+      program {
+         name: "normal_segment";
+         signal: "elm,state,segment,normal";
+         source: "elm";
+         script {
+            set_int(seg_status, SEGMENT_STATUS_ENABLED);
+            set_int(seg_state, SEGMENT_STATE_NORMAL);
+            update_state();
+         }
+      }
+      program {
+         name: "pressed_segment";
+         signal: "elm,state,segment,pressed";
+         source: "elm";
+         script {
+            set_int(seg_status, SEGMENT_STATUS_ENABLED);
+            set_int(seg_state, SEGMENT_STATE_PRESSED);
+            update_state();
+         }
+      }
+      program {
+         name: "selected_segment";
+         signal: "elm,state,segment,selected";
+         source: "elm";
+         script {
+            set_int(seg_status, SEGMENT_STATUS_ENABLED);
+            set_int(seg_state, SEGMENT_STATE_SELECTED);
+            update_state();
+         }
+      }
+      program { name: "disable_segment";
+         signal: "elm,state,disabled";
+         source: "elm";
+         script {
+            set_int(seg_status, SEGMENT_STATUS_DISABLED);
+            update_state();
+         }
+      }
+      program { name: "enable_segment";
+         signal: "elm,state,enabled";
+         source: "elm";
+         script {
+            set_int(seg_status, SEGMENT_STATUS_ENABLED);
+            update_state();
+         }
+      }
+      program { name: "text_show";
+         signal: "elm,state,text,visible";
+         source: "elm";
+         script {
+            new st[31];
+            new Float:vl;
+            new st1[31];
+            new Float:vl1;
+            get_state(PART:"elm.swallow.icon", st, 30, vl);
+            get_state(PART:"elm.swallow.label", st1, 30, vl1);
+            if (!strcmp(st, "icononly"))
+              {
+                 set_state(PART:"elm.swallow.icon", "visible", 0.0);
+                 set_state(PART:"padding_icon_text", "visible", 0.0);
+              }
+            set_state(PART:"elm.swallow.label", "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.icon", st, 30, vl);
+            if (!strcmp(st, "visible"))
+              {
+                 set_state(PART:"elm.swallow.icon", "icononly", 0.0);
+                 set_state(PART:"padding_icon_text", "icononly", 0.0);
+              }
+            set_state(PART:"elm.swallow.label", "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.swallow.label", st, 30, vl);
+            if (!strcmp(st, "normal"))
+              {
+                 set_state(PART:"elm.swallow.icon", "visible", 0.0);
+                 set_state(PART:"padding_icon_text", "visible", 0.0);
+              }
+            else
+              {
+                 set_state(PART:"elm.swallow.icon", "icononly", 0.0);
+                 set_state(PART:"padding_icon_text", "icononly", 0.0);
+              }
+         }
+      }
+      program { name: "icon_hide";
+         signal: "elm,state,icon,hidden";
+         source: "elm";
+         action:  STATE_SET "default" 0.0;
+         target: "elm.swallow.icon";
+      }
+   }
+}
+
+group { name: "elm/label/base/body_style/segment_normal";
+   data.item: "default_font_size" "24";
+   data.item: "min_font_size" "16";
+   data.item: "max_font_size" "24";
+   styles{
+      style { name: "seg_text_body_style_normal";
+         base: "font=SLP:style=Medium font_size=18\
+         align=center \
+         color="SEGMENT_CONTROL_ITEM_TITLE_BODY_TEXT_STYLE_COLOR_NORMAL_INC" wrap=char";
+         tag:  "br" "\n";
+         tag:  "hilight" "+ font=SLP:style=Bold";
+         tag:  "b" "+ font=SLP:style=Bold";
+         tag:  "tab" "\t";
+      }
+      style { name: "seg_text_body_style_pressed";
+         base: "font=SLP:style=Medium font_size=18\
+         align=center \
+         color="SEGMENT_CONTROL_ITEM_TITLE_TEXT_STYLE_COLOR_PRESSED_INC" wrap=char";
+         tag:  "br" "\n";
+         tag:  "hilight" "+ font=SLP:style=Bold";
+         tag:  "b" "+ font=SLP:style=Bold";
+         tag:  "tab" "\t";
+      }
+      style { name: "seg_text_body_style_selected";
+         base: "font=SLP:style=Medium font_size=18\
+         align=center color="SEGMENT_CONTROL_ITEM_TITLE_BODY_TEXT_STYLE_COLOR_SELECTED_INC" \
+         wrap=char";
+         tag:  "br" "\n";
+         tag:  "hilight" "+ font=SLP:style=Bold";
+         tag:  "b" "+ font=SLP:style=Bold";
+         tag:  "tab" "\t";
+      }
+      style { name: "seg_text_body_style_disabled";
+         base: "font=SLP:style=Medium font_size=18\
+         align=center color="SEGMENT_CONTROL_ITEM_TITLE_BODY_TEXT_STYLE_COLOR_NORMAL_INC" \
+         wrap=char";
+         tag:  "br" "\n";
+         tag:  "hilight" "+ font=SLP:style=Bold";
+         tag:  "b" "+ font=SLP:style=Bold";
+         tag:  "tab" "\t";
+      }
+   }
+   parts {
+      part { name: "label.swallow.background";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            visible: 1;
+            rel1.relative, 0.0 0.0;
+            rel2.relative, 1.0 1.0;
+         }
+      }
+      part { name: "label.text.clip";
+         type: RECT;
+         description { state: "default" 0.0;
+            visible: 1;
+            rel1 { relative: 0 0; to: "label.swallow.background"; }
+            rel2 { relative: 1 1; to: "label.swallow.background"; }
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         clip_to: "label.text.clip";
+         description { state: "default" 0.0;
+            rel1.relative, 0.0 0.0;
+            rel2.relative, 1.0 1.0;
+            align: 0.0 0.5;
+            text {
+               style: "seg_text_body_style_normal";
+               align: 0.0 0.5;
+               min: 1 0;
+            }
+         }
+      }
+   }
+}
+
+group { name: "elm/label/base/body_style/segment_selected";
+   data.item: "default_font_size" "24";
+   data.item: "min_font_size" "16";
+   data.item: "max_font_size" "24";
+   parts {
+      part { name: "label.swallow.background";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            visible: 1;
+            rel1.relative, 0.0 0.0;
+            rel2.relative, 1.0 1.0;
+         }
+      }
+      part { name: "label.text.clip";
+         type: RECT;
+         description { state: "default" 0.0;
+            visible: 1;
+            rel1 { relative: 0 0; to: "label.swallow.background"; }
+            rel2 { relative: 1 1; to: "label.swallow.background"; }
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         clip_to: "label.text.clip";
+         description { state: "default" 0.0;
+            rel1.relative, 0.0 0.0;
+            rel2.relative, 1.0 1.0;
+            align: 0.0 0.5;
+            text {
+               style: "seg_text_body_style_selected";
+               align: 0.0 0.5;
+               min: 1 0;
+            }
+         }
+      }
+   }
+}
+group { name: "elm/label/base/body_style/segment_pressed";
+   data.item: "default_font_size" "24";
+   data.item: "min_font_size" "16";
+   data.item: "max_font_size" "24";
+   parts {
+      part { name: "label.swallow.background";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            visible: 1;
+            rel1.relative, 0.0 0.0;
+            rel2.relative, 1.0 1.0;
+         }
+      }
+      part { name: "label.text.clip";
+         type: RECT;
+         description { state: "default" 0.0;
+            visible: 1;
+            rel1 { relative: 0 0; to: "label.swallow.background"; }
+            rel2 { relative: 1 1; to: "label.swallow.background"; }
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         clip_to: "label.text.clip";
+         description { state: "default" 0.0;
+            rel1.relative, 0.0 0.0;
+            rel2.relative, 1.0 1.0;
+            align: 0.5 0.5;
+            text {
+               style: "seg_text_body_style_pressed";
+               align: 0.5 0.5;
+               min: 1 0;
+            }
+         }
+      }
+   }
+}
+
+group { name: "elm/label/base/body_style/segment_disabled";
+   data.item: "default_font_size" "24";
+   data.item: "min_font_size" "16";
+   data.item: "max_font_size" "24";
+   parts {
+      part { name: "label.swallow.background";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            visible: 1;
+            rel1.relative, 0.0 0.0;
+            rel2.relative, 1.0 1.0;
+         }
+      }
+      part { name: "label.text.clip";
+         type: RECT;
+         description { state: "default" 0.0;
+            visible: 1;
+            rel1 { relative: 0 0; to: "label.swallow.background"; }
+            rel2 { relative: 1 1; to: "label.swallow.background"; }
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         clip_to: "label.text.clip";
+         description { state: "default" 0.0;
+            rel1.relative, 0.0 0.0;
+            rel2.relative, 1.0 1.0;
+            align: 0.0 0.5;
+            text {
+               style: "seg_text_body_style_disabled";
+               align: 0.0 0.5;
+               min: 1 0;
+            }
+         }
+      }
+   }
+}
+#undef SEGMENT_TYPE_SINGLE
+#undef SEGMENT_TYPE_LEFT
+#undef SEGMENT_TYPE_MIDDLE
+#undef SEGMENT_TYPE_RIGHT
+#undef SEGMENT_STATE_NORMAL
+#undef SEGMENT_STATE_PRESSED
+#undef SEGMENT_STATE_SELECTED
+#undef SEGMENT_STATUS_ENABLED
+#undef SEGMENT_STATUS_DISABLED
diff --git a/themes/images/nbeat-black/00_winset_btn_sge_body.png b/themes/images/nbeat-black/00_winset_btn_sge_body.png
new file mode 100644 (file)
index 0000000..a575511
Binary files /dev/null and b/themes/images/nbeat-black/00_winset_btn_sge_body.png differ
diff --git a/themes/images/nbeat-black/00_winset_btn_sge_body_normal_centre.png b/themes/images/nbeat-black/00_winset_btn_sge_body_normal_centre.png
new file mode 100644 (file)
index 0000000..7e6cbff
Binary files /dev/null and b/themes/images/nbeat-black/00_winset_btn_sge_body_normal_centre.png differ
diff --git a/themes/images/nbeat-black/00_winset_btn_sge_body_normal_left.png b/themes/images/nbeat-black/00_winset_btn_sge_body_normal_left.png
new file mode 100644 (file)
index 0000000..b0db272
Binary files /dev/null and b/themes/images/nbeat-black/00_winset_btn_sge_body_normal_left.png differ
diff --git a/themes/images/nbeat-black/00_winset_btn_sge_body_normal_right.png b/themes/images/nbeat-black/00_winset_btn_sge_body_normal_right.png
new file mode 100644 (file)
index 0000000..9962e29
Binary files /dev/null and b/themes/images/nbeat-black/00_winset_btn_sge_body_normal_right.png differ
diff --git a/themes/images/nbeat-black/00_winset_btn_sge_body_press_center.png b/themes/images/nbeat-black/00_winset_btn_sge_body_press_center.png
new file mode 100644 (file)
index 0000000..ba646c9
Binary files /dev/null and b/themes/images/nbeat-black/00_winset_btn_sge_body_press_center.png differ
diff --git a/themes/images/nbeat-black/00_winset_btn_sge_body_press_left.png b/themes/images/nbeat-black/00_winset_btn_sge_body_press_left.png
new file mode 100644 (file)
index 0000000..e053826
Binary files /dev/null and b/themes/images/nbeat-black/00_winset_btn_sge_body_press_left.png differ
diff --git a/themes/images/nbeat-black/00_winset_btn_sge_body_press_right.png b/themes/images/nbeat-black/00_winset_btn_sge_body_press_right.png
new file mode 100644 (file)
index 0000000..5443f9d
Binary files /dev/null and b/themes/images/nbeat-black/00_winset_btn_sge_body_press_right.png differ
diff --git a/themes/images/nbeat-black/navibar_item_separator.png b/themes/images/nbeat-black/navibar_item_separator.png
new file mode 100644 (file)
index 0000000..166649b
Binary files /dev/null and b/themes/images/nbeat-black/navibar_item_separator.png differ
diff --git a/themes/images/nbeat/00_winset_btn_sge_body.png b/themes/images/nbeat/00_winset_btn_sge_body.png
new file mode 100644 (file)
index 0000000..a575511
Binary files /dev/null and b/themes/images/nbeat/00_winset_btn_sge_body.png differ
diff --git a/themes/images/nbeat/00_winset_btn_sge_body_normal_centre.png b/themes/images/nbeat/00_winset_btn_sge_body_normal_centre.png
new file mode 100644 (file)
index 0000000..7e6cbff
Binary files /dev/null and b/themes/images/nbeat/00_winset_btn_sge_body_normal_centre.png differ
diff --git a/themes/images/nbeat/00_winset_btn_sge_body_normal_left.png b/themes/images/nbeat/00_winset_btn_sge_body_normal_left.png
new file mode 100644 (file)
index 0000000..b0db272
Binary files /dev/null and b/themes/images/nbeat/00_winset_btn_sge_body_normal_left.png differ
diff --git a/themes/images/nbeat/00_winset_btn_sge_body_normal_right.png b/themes/images/nbeat/00_winset_btn_sge_body_normal_right.png
new file mode 100644 (file)
index 0000000..9962e29
Binary files /dev/null and b/themes/images/nbeat/00_winset_btn_sge_body_normal_right.png differ
diff --git a/themes/images/nbeat/00_winset_btn_sge_body_press_center.png b/themes/images/nbeat/00_winset_btn_sge_body_press_center.png
new file mode 100644 (file)
index 0000000..ba646c9
Binary files /dev/null and b/themes/images/nbeat/00_winset_btn_sge_body_press_center.png differ
diff --git a/themes/images/nbeat/00_winset_btn_sge_body_press_left.png b/themes/images/nbeat/00_winset_btn_sge_body_press_left.png
new file mode 100644 (file)
index 0000000..e053826
Binary files /dev/null and b/themes/images/nbeat/00_winset_btn_sge_body_press_left.png differ
diff --git a/themes/images/nbeat/00_winset_btn_sge_body_press_right.png b/themes/images/nbeat/00_winset_btn_sge_body_press_right.png
new file mode 100644 (file)
index 0000000..5443f9d
Binary files /dev/null and b/themes/images/nbeat/00_winset_btn_sge_body_press_right.png differ
diff --git a/themes/images/nbeat/navibar_item_separator.png b/themes/images/nbeat/navibar_item_separator.png
new file mode 100644 (file)
index 0000000..166649b
Binary files /dev/null and b/themes/images/nbeat/navibar_item_separator.png differ
index 034ee28..00b7613 100644 (file)
 #define SEGMENT_CONTROL_ITEM_TITLE_TEXT_STYLE_COLOR_SELECTED_INC "#000000ff"
 #define SEGMENT_CONTROL_ITEM_TITLE_TEXT_SHADOW_STYLE_COLOR_SELECTED_INC "#ffffff4d"
 
+#define SEGMENT_CONTROL_ITEM_TITLE_BODY_TEXT_STYLE_COLOR_NORMAL_INC "#959188ff"
+#define SEGMENT_CONTROL_ITEM_TITLE_BODY_TEXT_STYLE_COLOR_SELECTED_INC "#ffffffff"
+
 #define SEGMENT_CONTROL_ITEM_LABEL_TEXT_COLOR_NORMAL_INC "232 232 218 255"
 #define SEGMENT_CONTROL_ITEM_LABEL_TEXT_COLOR_PRESS_INC "232 232 218 255"
 #define SEGMENT_CONTROL_ITEM_LABEL_TEXT_COLOR_SELECT_INC "0 0 0 255"
index 0ff1201..ceebe0c 100644 (file)
 #define SEGMENT_CONTROL_ITEM_TITLE_TEXT_STYLE_COLOR_SELECTED_INC "#000000ff"
 #define SEGMENT_CONTROL_ITEM_TITLE_TEXT_SHADOW_STYLE_COLOR_SELECTED_INC "#ffffff4d"
 
+#define SEGMENT_CONTROL_ITEM_TITLE_BODY_TEXT_STYLE_COLOR_NORMAL_INC "#959188ff"
+#define SEGMENT_CONTROL_ITEM_TITLE_BODY_TEXT_STYLE_COLOR_SELECTED_INC "#ffffffff"
+
 #define SEGMENT_CONTROL_ITEM_LABEL_TEXT_COLOR_NORMAL_INC "255 255 255 255"
 #define SEGMENT_CONTROL_ITEM_LABEL_TEXT_COLOR_PRESS_INC "27 26 24 255"
 #define SEGMENT_CONTROL_ITEM_LABEL_TEXT_COLOR_SELECT_INC "0 0 0 255"
index e2c2143..4454158 100644 (file)
 
 #define INDICATOR_H            27
 #define NAVI_BAR_H             55
-#define TAB_BAR_H              86
-#define TOOL_BAR_H             74
-#define SOFTKEY_H              72
+#define CONTROLBAR_LARGE_H             78
+#define CONTROLBAR_SMALL_H             65
+#define CONTROLBAR_W                   78
+#define SOFTKEY_H              72
 #define SEGMENT_H              50
 #define SEARCHBAR_H            67