[Button, Check, Radio]: NBeat HD UX ver-0.2 implementation
authorRajeev Ranjan <rajeev.r@samsung.com>
Thu, 29 Sep 2011 08:41:07 +0000 (17:41 +0900)
committerRajeev Ranjan <rajeev.r@samsung.com>
Fri, 30 Sep 2011 10:50:45 +0000 (19:50 +0900)
Change-Id: Iab3a665f6ea317ed8b5516397690006a3511c5d8

71 files changed:
themes/groups/button.edc
themes/groups/check.edc
themes/images/nbeat-black-hd/00_button_EditStyle.png [deleted file]
themes/images/nbeat-black-hd/00_button_EditStyle_dim.png [deleted file]
themes/images/nbeat-black-hd/00_button_EditStyle_press.png [deleted file]
themes/images/nbeat-black-hd/00_button_delete.png [deleted file]
themes/images/nbeat-black-hd/00_button_delete_dim.png [deleted file]
themes/images/nbeat-black-hd/00_button_delete_press.png [deleted file]
themes/images/nbeat-black-hd/00_button_delete_text.png [deleted file]
themes/images/nbeat-black-hd/00_button_delete_text_press.png [deleted file]
themes/images/nbeat-black-hd/00_button_minus.png
themes/images/nbeat-black-hd/00_button_minus_normal.png [deleted file]
themes/images/nbeat-black-hd/00_button_off.png
themes/images/nbeat-black-hd/00_button_on.png
themes/images/nbeat-black-hd/00_button_plus.png [changed mode: 0644->0755]
themes/images/nbeat-black-hd/00_button_plus_normal.png [deleted file]
themes/images/nbeat-black-hd/00_button_sweep_46.png [deleted file]
themes/images/nbeat-black-hd/00_button_sweep_46_dim.png [deleted file]
themes/images/nbeat-black-hd/00_button_sweep_46_focus.png [deleted file]
themes/images/nbeat-black-hd/00_button_sweep_46_press.png [deleted file]
themes/images/nbeat-black-hd/00_check_off.png
themes/images/nbeat-black-hd/00_check_on.png
themes/images/nbeat-black-hd/00_winset_btn_prev_press.png
themes/images/nbeat-black/00_button_06_dim.png
themes/images/nbeat-black/00_button_06_normal.png
themes/images/nbeat-black/00_button_06_press.png
themes/images/nbeat-black/00_button_EditStyle.png [deleted file]
themes/images/nbeat-black/00_button_EditStyle_dim.png [deleted file]
themes/images/nbeat-black/00_button_EditStyle_press.png [deleted file]
themes/images/nbeat-black/00_button_delete.png [deleted file]
themes/images/nbeat-black/00_button_delete_dim.png [deleted file]
themes/images/nbeat-black/00_button_delete_press.png [deleted file]
themes/images/nbeat-black/00_button_delete_text.png [deleted file]
themes/images/nbeat-black/00_button_delete_text_press.png [deleted file]
themes/images/nbeat-black/00_button_sweep_46.png [deleted file]
themes/images/nbeat-black/00_button_sweep_46_dim.png [deleted file]
themes/images/nbeat-black/00_button_sweep_46_focus.png [deleted file]
themes/images/nbeat-black/00_button_sweep_46_press.png [deleted file]
themes/images/nbeat-hd/00_button_06_dim.png
themes/images/nbeat-hd/00_button_06_normal.png
themes/images/nbeat-hd/00_button_06_press.png
themes/images/nbeat-hd/00_button_EditStyle.png [deleted file]
themes/images/nbeat-hd/00_button_EditStyle_dim.png [deleted file]
themes/images/nbeat-hd/00_button_EditStyle_press.png [deleted file]
themes/images/nbeat-hd/00_button_delete.png [deleted file]
themes/images/nbeat-hd/00_button_delete_dim.png [deleted file]
themes/images/nbeat-hd/00_button_delete_press.png [deleted file]
themes/images/nbeat-hd/00_button_delete_text.png [deleted file]
themes/images/nbeat-hd/00_button_delete_text_press.png [deleted file]
themes/images/nbeat-hd/00_button_sweep_46.png [deleted file]
themes/images/nbeat-hd/00_button_sweep_46_dim.png [deleted file]
themes/images/nbeat-hd/00_button_sweep_46_focus.png [deleted file]
themes/images/nbeat-hd/00_button_sweep_46_press.png [deleted file]
themes/images/nbeat-hd/00_winset_btn_prev.png
themes/images/nbeat-hd/00_winset_btn_prev_press.png
themes/images/nbeat/00_button_EditStyle.png [deleted file]
themes/images/nbeat/00_button_EditStyle_dim.png [deleted file]
themes/images/nbeat/00_button_EditStyle_press.png [deleted file]
themes/images/nbeat/00_button_delete.png [deleted file]
themes/images/nbeat/00_button_delete_dim.png [deleted file]
themes/images/nbeat/00_button_delete_press.png [deleted file]
themes/images/nbeat/00_button_delete_text.png [deleted file]
themes/images/nbeat/00_button_delete_text_press.png [deleted file]
themes/images/nbeat/00_button_sweep_46.png [deleted file]
themes/images/nbeat/00_button_sweep_46_dim.png [deleted file]
themes/images/nbeat/00_button_sweep_46_focus.png [deleted file]
themes/images/nbeat/00_button_sweep_46_press.png [deleted file]
themes/inc/nbeat-black-hd-inc.edc
themes/inc/nbeat-black-inc.edc
themes/inc/nbeat-hd-inc.edc
themes/inc/nbeat-inc.edc

index 92b3cf4..a9f97ad 100644 (file)
@@ -29,7 +29,7 @@
       alias: "elm/button/base/text_only/style1";
       alias: "elm/button/base/center";
       alias: "elm/button/base/icon_and_text/center";
-      alias: "elm/button/base/popup/contact";
+      alias: "elm/button/base/nocontents/search_button";
       images {
          image: "00_button_01_normal.png" COMP;
          image: "00_button_01_normal_press.png" COMP;
                   to: "icon_rect";
                }
                fixed: 1 0;
-               min: BUTTON_TEXT_STYLE1_VISIBLE_PADDING_AFTER_ICON_MIN_INC;
+               min: BUTTON_TEXT_STYLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
             }
             description { state: "icononly" 0.0;
                inherit: "default" 0.0;
                   to_y: "padding_right_bottom";
                }
                fixed: 1 0;
-               min: BUTTON_TEXT_STYLE1_VISIBLE_PADDING_BEFORE_TEXT_MIN_INC;
+               min: BUTTON_TEXT_STYLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
                visible: 0;
             }
          }
                   to: "icon_rect";
                }
                fixed: 1 0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_PADDING_AFTER_ICON_MIN_INC;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
             }
             description { state: "icononly" 0.0;
                inherit: "default" 0.0;
                   to_y: "padding_right_bottom";
                }
                fixed: 1 0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_PADDING_BEFORE_TEXT_MIN_INC;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
                visible: 0;
             }
          }
       }
       parts {
          part { name: "button_image";
-            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
                min: BUTTON_POPUP_BG_NORMAL_MIN_INC;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_popup_press.png";
+               image {
+                  normal: "00_button_popup_press.png";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
                image.normal: "00_button_popup_focus.png";
             }
          }
-         part {
-            name: "padding_left_top";
+         part { name: "padding_left_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: 0.0 0.0;
+               rel2 {
+                  relative: 0.0 0.0;
+               }
                min: BUTTON_POPUP_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "padding_right_bottom";
+         part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                align: 1.0 0.0;
-               rel1.relative: 1.0 1.0;
-               rel2.relative: 1.0 1.0;
+               rel1 {
+                  relative: 1.0 1.0;
+               }
                min: BUTTON_POPUP_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "padding_icon_text";
+         part { name: "padding_icon_text";
             type: RECT;
             scale: 1;
             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: "elm.swallow.content"; }
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.content"; }
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "elm.swallow.content";
+               }
+               rel2 {
+                  to: "elm.swallow.content";
+               }
                fixed: 1 0;
                min: 0 0;
                visible: 0;
          part { name: "elm.swallow.content";
             type: SWALLOW;
             scale: 1;
+            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
             description { state: "icononly" 0.0;
                visible: 1;
                min: BUTTON_POPUP_ICON_ICONONLY_MIN_INC;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
-               align: 0.5 0.5;
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
             }
          }
          part { name: "elm.text";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
+            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
-               rel1 { relative: 1.0 1.0; to_x: "padding_icon_text"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
-               align: 0.5 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_icon_text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
                color: BUTTON_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 20;
                   min: 0 0;
-                  align: 0.5 0.5;
                }
             }
             description { state: "visible" 0.0;
          }
          part { name: "over2";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
          }
          part { name: "over3";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
                color: 0 0 0 0;
             }
          }
+         part { name: "clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
          part { name: "disabler";
             type: RECT;
             description { state: "default" 0.0;
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "clicked", 0.0);
+                 set_state(PART:"elm.text", "clicked", 0.0);
             }
          }
          program { name: "button_unpress";
                new Float:vl;
                get_state(PART:"elm.swallow.content", st, 30, vl);
                if (strcmp(st, "icononly"))
-               {
-                  emit("elm,action,default,text,set", "");
-                  set_state(PART:"elm.text", "visible", 0.0);
-               }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                  set_state(PART:"button_image", "default", 0.0);
+                 {
+                    emit("elm,action,default,text,set", "");
+                    set_state(PART:"elm.text", "visible", 0.0);
+                 }
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
          }
                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);
-               }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"padding_icon_text", "visible", 0.0);
+                 }
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
                  set_state(PART:"elm.text", "visible", 0.0);
                else
                  set_state(PART:"elm.text", "disabled_visible", 0.0);
                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.swallow.content", "icononly", 0.0);
+                    set_state(PART:"padding_icon_text", "icononly", 0.0);
+                 }
                set_state(PART:"elm.text", "default", 0.0);
             }
          }
                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);
-               }
+                 {
+                    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);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"padding_icon_text", "icononly", 0.0);
+                 }
             }
          }
          program { name: "icon_hide";
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "disabled_visible", 0.0);
+                 set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
-                  set_state(PART:"elm.text", "disabled", 0.0);
+                 set_state(PART:"elm.text", "disabled", 0.0);
                set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "disabled_visible"))
-                  set_state(PART:"elm.text", "visible", 0.0);
+                 set_state(PART:"elm.text", "visible", 0.0);
                else
-                  set_state(PART:"elm.text", "default", 0.0);
+                 set_state(PART:"elm.text", "default", 0.0);
                set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
 
 ///////////////////////////////////////////////////////////////////////////////////////
 #define BUTTON_EDIT_STYLES(style_name, image_normal, image_press, min_width, min_height) \
-   group { name: "elm/button/base/contacts"style_name; \
+   group { name: "elm/button/base/contacts/"style_name; \
    alias: "elm/button/base/"style_name; \
       images { \
          image: image_normal COMP; \
@@ -3168,12 +3195,11 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/icon_only/default";
+   group { name: "elm/button/base/default";
       images {
-         image: "00_button_03_normal.png" COMP;
-         image: "00_button_03_press.png" COMP;
-         image: "00_button_03_focus.png" COMP;
-         image: "00_button_03_dim.png" COMP;
+         image: "00_button_01_normal.png" COMP;
+         image: "00_button_01_normal_press.png" COMP;
+         image: "00_button_01_normal_dim.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -3183,25 +3209,24 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 50 50;
-               max: 50 50;
+               min: 16 38;
                image {
-                  normal: "00_button_03_normal.png";
-                  border: 7 7 7 7;
+                  normal: "00_button_01_normal.png";
+                  border: 4 4 3 3;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_03_press.png";
+               image.normal: "00_button_01_normal_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_03_dim.png";
+               image.normal: "00_button_01_normal_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_03_focus.png";
+               image.normal: "00_button_01_normal_press.png";
             }
          }
          part {
@@ -3213,7 +3238,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                align: 0.0 0.0;
                rel1.relative: 0.0 0.0;
                rel2.relative: 0.0 0.0;
-               min: 5 5;
+               min: 2 2;
                fixed: 1 1;
                visible: 0;
             }
@@ -3224,55 +3249,133 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               align: 1.0 0.0;
+               align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
                rel2.relative: 1.0 1.0;
-               min: 5 5;
+               min: 2 2;
                fixed: 1 1;
                visible: 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: "elm.swallow.content"; }
+               rel2 { relative: 1.0 1.0; to: "elm.swallow.content"; }
+               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: "elm.swallow.content"; }
+               rel2 { relative: 1.0 1.0; to: "elm.swallow.content"; }
+               fixed: 1 0;
+               min: 5 0;
+               color: 0 0 0 0;
+            }
+         }
          part { name: "elm.swallow.content";
             type: SWALLOW;
-            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               max: 40 40;
                visible: 0;
+               align: 0.0 0.5;
+               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               fixed: 1 0;
+            }
+            description { state: "visible" 0.0;
+               fixed: 1 0;
+               visible: 1;
+               align: 0.0 0.5;
+               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
+            }
+            description { state: "icononly" 0.0;
+               visible: 1;
+               min: 38 38;
+               rel1 { relative: 1.0 0.0; to_x: "padding_left_top"; }
+               rel2 { relative: 0.0 1.0; to_x: "padding_right_bottom"; }
+               align: 0.5 0.5;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+            }
+         }
+         part { name: "elm.text";
+            type: TEXT;
+            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_left_top"; }
+               rel2 { relative: 0.0 0.0; to:"padding_right_bottom"; }
                align: 0.5 0.5;
+               color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: 24;
+                  min: 0 0;
+                  align: 0.5 0.5;
+               }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
+               min: 90 34;
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               min: 0 0;
+               color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
+            }
+            description { state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
+               visible: 1;
+               min: 90 34;
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               min: 0 0;
+               color: BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC;
             }
          }
-         part { name: "over1";
+         part { name: "over2";
+            type: RECT;
             mouse_events: 1;
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
-            rel1.to: "button_image";
-            rel2.to: "button_image";
+               color: 0 0 0 0;
             }
          }
-         part { name: "over2";
+         part { name: "over3";
+            type: RECT;
             mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
-            rel1.to: "button_image";
-            rel2.to: "button_image";
                color: 0 0 0 0;
             }
          }
          part { name: "disabler";
             type: RECT;
             description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
                color: 0 0 0 0;
                visible: 0;
             }
@@ -3285,39 +3388,125 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
       programs {
          program { name: "button_click";
             signal: "mouse,down,1";
-            source: "over1";
+            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: "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";
+         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_unclick2";
+         program { name: "button_unpress";
+            action: SIGNAL_EMIT "elm,action,unpress" "";
+         }
+         program { name: "button_mouseout_clicked";
+            signal: "mouse,up,1";
+            source: "over3";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (strcmp(st, "icononly"))
+               {
+                  emit("elm,action,default,text,set", "");
+                  set_state(PART:"elm.text", "visible", 0.0);
+               }
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
+                  set_state(PART:"button_image", "default", 0.0);
+            }
+            after: button_unpress;
+         }
+         program { name: "button_unclick3";
             signal: "mouse,clicked,1";
-            source: "over1";
+            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);
+               }
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"elm.text", "visible", 0.0);
+               else
+                 set_state(PART:"elm.text", "disabled_visible", 0.0);
+            }
+         }
+         program { name: "text_hide";
+            signal: "elm,state,text,hidden";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "visible"))
+               {
+                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                  set_state(PART:"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";
+            target: "padding_icon_text";
+         }
          program { name: "disable";
             signal: "elm,state,disabled";
             source: "elm";
             action: STATE_SET "disabled" 0.0;
             target: "button_image";
             target: "disabler";
-            after : "state_set_disable";
+            after: "disable_text";
          }
-         program { name: "state_set_disable";
+         program { name: "disable_text";
             script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.text", "disabled_visible", 0.0);
+               else
+                  set_state(PART:"elm.text", "disabled", 0.0);
                set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
@@ -3327,47 +3516,47 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             action: STATE_SET "default" 0.0;
             target: "button_image";
             target: "disabler";
-            after : "state_set_enable";
+            after: "enable_text";
          }
-         program { name: "state_set_enable";
+         program { name: "enable_text";
             script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "disabled_visible"))
+                  set_state(PART:"elm.text", "visible", 0.0);
+               else
+                  set_state(PART:"elm.text", "default", 0.0);
                set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
-         program { name: "icon_show";
-            signal: "elm,state,icon,visible";
-            source: "elm";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.swallow.content";
-         }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
-         }
          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/default";
+   group { name: "elm/button/base/hidden";
       images {
-         image: "00_button_01_normal.png" COMP;
-         image: "00_button_01_normal_press.png" COMP;
-         image: "00_button_01_normal_dim.png" COMP;
-      }
+         image: "00_button_sweep.png" COMP;
+         image: "00_button_sweep_press.png" COMP;//focus image is missing, so using press
+   }
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }
@@ -3376,24 +3565,23 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 16 38;
+               min: BUTTON_HIDDEN_BG_NORMAL_MIN_INC;
                image {
-                  normal: "00_button_01_normal.png";
-                  border: 4 4 3 3;
+                  normal: "00_button_sweep.png";
+                  border: BUTTON_HIDDEN_BG_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_normal_press.png";
+               image.normal: "00_button_sweep_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_normal_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_normal_press.png";
+               image.normal: "00_button_sweep_press.png";
             }
          }
          part {
@@ -3405,7 +3593,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                align: 0.0 0.0;
                rel1.relative: 0.0 0.0;
                rel2.relative: 0.0 0.0;
-               min: 2 2;
+               min: BUTTON_HIDDEN_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -3419,20 +3607,35 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
                rel2.relative: 1.0 1.0;
-               min: 2 2;
+               min: BUTTON_HIDDEN_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
          part {
+            name: "icon_rect";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 1;
+               min: BUTTON_HIDDEN_ICON_RECT_MIN_INC;
+               fixed: 1 0;
+               rel1 { relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_left_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_right_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: "elm.swallow.content"; }
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.content"; }
+               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;
@@ -3442,10 +3645,10 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
             description { state: "visible" 0.0; //when icon is visible
                align: 0.0 0.0;
-               rel1 { relative: 1.0 0.0; to: "elm.swallow.content"; }
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.content"; }
+               rel1 { relative: 1.0 0.0; to: "icon_rect"; }
+               rel2 { relative: 1.0 1.0; to: "icon_rect"; }
                fixed: 1 0;
-               min: 5 0;
+               min: BUTTON_HIDDEN_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
                color: 0 0 0 0;
             }
          }
@@ -3470,9 +3673,9 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
             description { state: "icononly" 0.0;
                visible: 1;
-               min: 38 38;
-               rel1 { relative: 1.0 0.0; to_x: "padding_left_top"; }
-               rel2 { relative: 0.0 1.0; to_x: "padding_right_bottom"; }
+               min: BUTTON_HIDDEN_ICON_ICONONLY_MIN_INC;
+               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
                align: 0.5 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
@@ -3485,12 +3688,12 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             description { state: "default" 0.0;
                visible: 0;
                rel1 { relative: 1.0 1.0; to_x: "padding_icon_text"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to:"padding_right_bottom"; }
+               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
                align: 0.5 0.5;
-               color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
+               color: BUTTON_HIDDEN_BUTTON_TEXT_NORMAL_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
-                  size: 24;
+                  size: BUTTON_HIDDEN_FONT_SIZE_INC;
                   min: 0 0;
                   align: 0.5 0.5;
                }
@@ -3498,29 +3701,29 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 90 34;
+               min: BUTTON_HIDDEN_TEXT_MIN_INC;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                min: 0 0;
-               color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC;
+               color: BUTTON_HIDDEN_BUTTON_TEXT_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
+               color: 0 0 0 128;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
+               color: BUTTON_HIDDEN_BUTTON_TEXT_DISABLED_COLOR_INC;
                visible: 1;
-               min: 90 34;
+               min: BUTTON_HIDDEN_TEXT_MIN_INC;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                min: 0 0;
-               color: BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC;
+               color: BUTTON_HIDDEN_BUTTON_TEXT_FOCUSED_COLOR_INC;
             }
          }
          part { name: "over2";
@@ -3719,90 +3922,103 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/hidden";
+   group { name: "elm/button/base/picker/bar/default";
       images {
-         image: "00_button_sweep.png" COMP;
-         image: "00_button_sweep_press.png" COMP;//focus image is missing, so using press
-   }
+         image: "00_picker_btn_normal.png" COMP;
+         image: "00_picker_btn_press.png" COMP;
+      }
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
-            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_HIDDEN_BG_NORMAL_MIN_INC;
+               min: BUTTON_PICKER_BAR_DEFAULT_BG_DEFAULT_MIN_INC;
                image {
-                  normal: "00_button_sweep.png";
-                  border: BUTTON_HIDDEN_BG_BORDER_INC;
+                  normal: "00_picker_btn_normal.png";
+                  border: BUTTON_PICKER_BAR_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_sweep_press.png";
+               image {
+                  normal: "00_picker_btn_press.png";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_sweep_press.png";
+               image {
+                  normal: "00_picker_btn_press.png";
+               }
             }
          }
-         part {
-            name: "padding_left_top";
+         part { name: "padding_left_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: 0.0 0.0;
-               min: BUTTON_HIDDEN_PADDING_MIN_INC;
+               rel2 {
+                  relative: 0.0 0.0;
+               }
+               min: BUTTON_PICKER_BAR_DEFAULT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "padding_right_bottom";
+         part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               rel2.relative: 1.0 1.0;
-               min: BUTTON_HIDDEN_PADDING_MIN_INC;
+               rel1 {
+                  relative: 1.0 1.0;
+               }
+               min: BUTTON_PICKER_BAR_DEFAULT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "icon_rect";
+         part { name: "icon_rect";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               visible: 1;
-               min: BUTTON_HIDDEN_ICON_RECT_MIN_INC;
+               min: BUTTON_PICKER_BAR_DEFAULT_ICON_RECT_DEFAULT_MIN_INC;
                fixed: 1 0;
-               rel1 { relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_right_bottom"; }
-               align: 0.0 0.5;
-               color: 0 0 0 0;
-            }
-         }
-         part {
-            name: "padding_icon_text";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.swallow.content";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.swallow.content";
+                  to_y: "padding_right_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"; }
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2 {
+                  to: "icon_rect";
+               }
                fixed: 1 0;
                min: 0 0;
                color: 0 0 0 0;
@@ -3812,38 +4028,62 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
             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"; }
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2 {
+                  to: "icon_rect";
+               }
                fixed: 1 0;
-               min: BUTTON_HIDDEN_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
+               min: BUTTON_PICKER_BAR_DEFAULT_PADDING_ICON_RECT_TEXT_MIN_INC;
                color: 0 0 0 0;
             }
          }
          part { name: "elm.swallow.content";
             type: SWALLOW;
             scale: 1;
+            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
-               visible: 1;
                align: 0.0 0.5;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
             description { state: "icononly" 0.0;
-               visible: 1;
-               min: BUTTON_HIDDEN_ICON_ICONONLY_MIN_INC;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
-               align: 0.5 0.5;
+               min: BUTTON_PICKER_BAR_DEFAULT_CONTENT_ICONONLY_MIN_INC;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
@@ -3852,29 +4092,36 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             type: TEXT;
             mouse_events: 0;
             scale: 1;
+            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
-               rel1 { relative: 1.0 1.0; to_x: "padding_icon_text"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
-               align: 0.5 0.5;
-               color: BUTTON_HIDDEN_BUTTON_TEXT_NORMAL_COLOR_INC;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_icon_text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
+               color: 78 73 69 255;
                text {
                   font: "SLP:style=Medium";
-                  size: BUTTON_HIDDEN_FONT_SIZE_INC;
-                  min: 0 0;
-                  align: 0.5 0.5;
+                  size: BUTTON_PICKER_BAR_DEFAULT_TEXT_FONT_SIZE_INC;
+                  min: 1 0;
+                  max: 0 0;
                }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: BUTTON_HIDDEN_TEXT_MIN_INC;
+               min: BUTTON_PICKER_BAR_DEFAULT_TEXT_VISIBLE_MIN_INC;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                min: 0 0;
-               color: BUTTON_HIDDEN_BUTTON_TEXT_PRESSED_COLOR_INC;
+               color: 255 255 255 255;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -3882,20 +4129,19 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_HIDDEN_BUTTON_TEXT_DISABLED_COLOR_INC;
+               color: 0 0 0 128;
                visible: 1;
-               min: BUTTON_HIDDEN_TEXT_MIN_INC;
+               min: BUTTON_PICKER_BAR_DEFAULT_TEXT_VISIBLE_MIN_INC;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                min: 0 0;
-               color: BUTTON_HIDDEN_BUTTON_TEXT_FOCUSED_COLOR_INC;
+               color: 255 255 255 255;
             }
          }
          part { name: "over2";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
@@ -3904,12 +4150,17 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          }
          part { name: "over3";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
                color: 0 0 0 0;
             }
          }
+         part { name: "clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
          part { name: "disabler";
             type: RECT;
             description { state: "default" 0.0;
@@ -3940,7 +4191,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "clicked", 0.0);
+                 set_state(PART:"elm.text", "clicked", 0.0);
             }
          }
          program { name: "button_unpress";
@@ -3954,12 +4205,12 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                new Float:vl;
                get_state(PART:"elm.swallow.content", st, 30, vl);
                if (strcmp(st, "icononly"))
-               {
-                  emit("elm,action,default,text,set", "");
-                  set_state(PART:"elm.text", "visible", 0.0);
-               }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                  set_state(PART:"button_image", "default", 0.0);
+                 {
+                    emit("elm,action,default,text,set", "");
+                    set_state(PART:"elm.text", "visible", 0.0);
+                 }
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
          }
@@ -3976,11 +4227,11 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                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);
-               }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"padding_icon_text", "visible", 0.0);
+                 }
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
                  set_state(PART:"elm.text", "visible", 0.0);
                else
                  set_state(PART:"elm.text", "disabled_visible", 0.0);
@@ -3994,10 +4245,10 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                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.swallow.content", "icononly", 0.0);
+                    set_state(PART:"padding_icon_text", "icononly", 0.0);
+                 }
                set_state(PART:"elm.text", "default", 0.0);
             }
          }
@@ -4009,15 +4260,15 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                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);
-               }
+                 {
+                    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);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"padding_icon_text", "icononly", 0.0);
+                 }
             }
          }
          program { name: "icon_hide";
@@ -4041,9 +4292,9 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "disabled_visible", 0.0);
+                 set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
-                  set_state(PART:"elm.text", "disabled", 0.0);
+                 set_state(PART:"elm.text", "disabled", 0.0);
                set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
@@ -4061,9 +4312,9 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "disabled_visible"))
-                  set_state(PART:"elm.text", "visible", 0.0);
+                 set_state(PART:"elm.text", "visible", 0.0);
                else
-                  set_state(PART:"elm.text", "default", 0.0);
+                 set_state(PART:"elm.text", "default", 0.0);
                set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
@@ -4089,7 +4340,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/picker/bar/default";
+   group { name: "elm/button/base/picker/prev/text/default";
+      alias: "elm/button/base/picker/next/text/default";
       images {
          image: "00_picker_btn_normal.png" COMP;
          image: "00_picker_btn_press.png" COMP;
@@ -4099,80 +4351,93 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
       }
       parts {
          part { name: "button_image";
-            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 46 42;
+               min: BUTTON_PICKER_PREV_TEXT_DEFAULT_BG_DEFAULT_MIN_INC;
                image {
                   normal: "00_picker_btn_normal.png";
-                  border: 4 4 4 4;
+                  border: BUTTON_PICKER_PREV_TEXT_DEFAULT_BG_DEFAULT_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_picker_btn_press.png";
+               image {
+                  normal: "00_picker_btn_press.png";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_picker_btn_press.png";
+               image {
+                  normal: "00_picker_btn_press.png";
+               }
             }
          }
-         part {
-            name: "padding_left_top";
+         part { name: "padding_left_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: 0.0 0.0;
-               min: 5 5;
+               rel2 {
+                  relative: 0.0 0.0;
+               }
+               min: BUTTON_PICKER_PREV_TEXT_DEFAULT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "padding_right_bottom";
+         part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               rel2.relative: 1.0 1.0;
-               min: 5 5;
+               rel1 {
+                  relative: 1.0 1.0;
+               }
+               min: BUTTON_PICKER_PREV_TEXT_DEFAULT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "icon_rect";
+         part { name: "icon_rect";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               visible: 1;
-               min: 0 32;
+               min: BUTTON_PICKER_PREV_TEXT_DEFAULT_ICON_RECT_MIN_INC;
                fixed: 1 0;
-               rel1 { relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.swallow.content";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.swallow.content";
+                  to_y: "padding_right_bottom";
+               }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
          }
-         part {
-            name: "padding_icon_text";
+         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"; }
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2 {
+                  to: "icon_rect";
+               }
                fixed: 1 0;
                min: 0 0;
                color: 0 0 0 0;
@@ -4182,39 +4447,63 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
             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"; }
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2 {
+                  to: "icon_rect";
+               }
                fixed: 1 0;
-               min: 5 0;
+               min: BUTTON_PICKER_PREV_TEXT_DEFAULT_PADDING_ICON_RECT_TEXT_MIN_INC;
                color: 0 0 0 0;
             }
          }
          part { name: "elm.swallow.content";
             type: SWALLOW;
             scale: 1;
+            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
-               visible: 1;
                align: 0.0 0.5;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
             description { state: "icononly" 0.0;
-               visible: 1;
-               min: 32 32;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
-               align: 0.5 0.5;
-               aspect: 1.0 1.0;
+               min: BUTTON_PICKER_PREV_TEXT_DEFAULT_CONTENT_ICON_ONLY_MIN_INC;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
+               aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
          }
@@ -4222,24 +4511,30 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             type: TEXT;
             mouse_events: 0;
             scale: 1;
+            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
-               rel1 { relative: 1.0 1.0; to_x: "padding_icon_text"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
-               align: 0.5 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_icon_text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
                color: 78 73 69 255;
                text {
                   font: "SLP:style=Medium";
-                  size: 20;
+                  size: BUTTON_PICKER_PREV_TEXT_DEFAULT_TEXT_FONT_SIZE_INC;
                   min: 1 0;
-                  align: 0.5 0.5;
-                  max: 0 0;
+                  max: 1 0;
                }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 80 32;
+               min: BUTTON_PICKER_PREV_TEXT_DEFAULT_TEXT_VISIBLE_MIN_INC;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
@@ -4255,7 +4550,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                inherit: "default" 0.0;
                color: 0 0 0 128;
                visible: 1;
-               min: 80 32;
+               min: BUTTON_PICKER_PREV_TEXT_DEFAULT_TEXT_VISIBLE_MIN_INC;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
@@ -4266,7 +4561,6 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          }
          part { name: "over2";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
@@ -4275,12 +4569,17 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          }
          part { name: "over3";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
                color: 0 0 0 0;
             }
          }
+         part { name: "clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
          part { name: "disabler";
             type: RECT;
             description { state: "default" 0.0;
@@ -4311,7 +4610,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "clicked", 0.0);
+                 set_state(PART:"elm.text", "clicked", 0.0);
             }
          }
          program { name: "button_unpress";
@@ -4325,12 +4624,12 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                new Float:vl;
                get_state(PART:"elm.swallow.content", st, 30, vl);
                if (strcmp(st, "icononly"))
-               {
-                  emit("elm,action,default,text,set", "");
-                  set_state(PART:"elm.text", "visible", 0.0);
-               }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                  set_state(PART:"button_image", "default", 0.0);
+                 {
+                    emit("elm,action,default,text,set", "");
+                    set_state(PART:"elm.text", "visible", 0.0);
+                 }
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
          }
@@ -4347,11 +4646,11 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                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);
-               }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"padding_icon_text", "visible", 0.0);
+                 }
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
                  set_state(PART:"elm.text", "visible", 0.0);
                else
                  set_state(PART:"elm.text", "disabled_visible", 0.0);
@@ -4365,10 +4664,10 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                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.swallow.content", "icononly", 0.0);
+                    set_state(PART:"padding_icon_text", "icononly", 0.0);
+                 }
                set_state(PART:"elm.text", "default", 0.0);
             }
          }
@@ -4380,15 +4679,15 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                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);
-               }
+                 {
+                    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);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"padding_icon_text", "icononly", 0.0);
+                 }
             }
          }
          program { name: "icon_hide";
@@ -4412,9 +4711,9 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "disabled_visible", 0.0);
+                 set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
-                  set_state(PART:"elm.text", "disabled", 0.0);
+                 set_state(PART:"elm.text", "disabled", 0.0);
                set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
@@ -4432,9 +4731,9 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "disabled_visible"))
-                  set_state(PART:"elm.text", "visible", 0.0);
+                 set_state(PART:"elm.text", "visible", 0.0);
                else
-                  set_state(PART:"elm.text", "default", 0.0);
+                 set_state(PART:"elm.text", "default", 0.0);
                set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
@@ -4460,164 +4759,85 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/picker/prev/text/default";
-      alias: "elm/button/base/picker/next/text/default";
-      images {
-         image: "00_picker_btn_normal.png" COMP;
-         image: "00_picker_btn_press.png" COMP;
-      }
+   group { name: "elm/button/base/contact";
+      alias: "elm/button/base/text_only/contact";
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
+                type: RECT;
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 46 42;
-               image {
-                  normal: "00_picker_btn_normal.png";
-                  border: 4 4 4 4;
-                  border_scale: 1;
-               }
+               rel1 { to_x: "padding.left"; to_y: "elm.text"; }
+               rel2 { to_x: "padding.right"; to_y: "elm.text"; }
+               min: BUTTON_CONTACT_BG_NORMAL_MIN_INC;
+               color: BUTTON_CONTACT_BUTTON_BG_NORMAL_COLOR_INC;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_picker_btn_press.png";
+               color: BUTTON_CONTACT_BUTTON_BG_PRESSED_COLOR_INC ;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_picker_btn_press.png";
-            }
-         }
-         part {
-            name: "padding_left_top";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 0.0 0.0;
-               min: 10 5;
-               fixed: 1 1;
-               visible: 0;
             }
          }
-         part {
-            name: "padding_right_bottom";
+         part { name: "padding.left";
             type: RECT;
             scale: 1;
-            mouse_events: 0;
             description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               rel2.relative: 1.0 1.0;
-               min: 10 5;
-               fixed: 1 1;
                visible: 0;
-            }
-         }
-         part {
-            name: "icon_rect";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 1;
-               min: 0 32;
+               min: BUTTON_CONTACT_PADDING_MIN_INC;
                fixed: 1 0;
-               rel1 { relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_right_bottom"; }
-               align: 0.0 0.5;
                color: 0 0 0 0;
+               rel1.relative: 0 0;
+               rel2 { relative: 0.0 1.0; to_x: "elm.text"; }
+               align: 1 0;
             }
          }
-         part {
-            name: "padding_icon_text";
+         part { name: "padding.right";
             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;
-            }
-         }
-         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: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
-               fixed: 1 0;
-            }
-            description { state: "visible" 0.0;
+               min: BUTTON_CONTACT_PADDING_MIN_INC;
                fixed: 1 0;
-               visible: 1;
-               align: 0.0 0.5;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-            }
-            description { state: "icononly" 0.0;
-               visible: 1;
-               min: 32 32;
-                rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
-               align: 0.5 0.5;
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
+               color: 0 0 0 0;
+               rel1 { relative: 1.0 0.0; to_x: "elm.text"; }
+               rel2.relative: 1.0 1.0;
+               align: 0 0;
             }
          }
-         part { name: "elm.text";
+         part {   name: "elm.text";
             type: TEXT;
             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_left_top"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
+               fixed: 1 1;
                align: 0.5 0.5;
-               color: 78 73 69 255;
+               color: BUTTON_CONTACT_BUTTON_TEXT_NORMAL_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
-                  size: 20;
-                  min: 1 0;
-                  max: 1 0;
+                  size: BUTTON_CONTACT_FONT_SIZE_INC;
+                  min: 1 1;
                   align: 0.5 0.5;
                }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 60 32;
+               min: 1 1;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 0 0;
-               color: 255 255 255 255;
+               min: 1 1;
+               color: BUTTON_CONTACT_BUTTON_TEXT_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -4625,37 +4845,46 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: 0 0 0 128;
+               color: BUTTON_CONTACT_BUTTON_TEXT_DISABLED_COLOR_INC;
                visible: 1;
-               min: 60 32;
+               min: 1 1;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 0 0;
-               color: 255 255 255 255;
+               min: 1 1;
+               color: BUTTON_CONTACT_BUTTON_TEXT_FOCUSED_COLOR_INC;
+            }
+         }
+         part { name: "over1";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel2.relative: 1.0 0.5;
             }
          }
          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;
+            rel1.to: "button_image";
+            rel2.to: "button_image";
             }
          }
          part { name: "over3";
-            type: RECT;
             mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
+            rel1.to: "button_image";
+            rel2.to: "button_image";
                color: 0 0 0 0;
             }
          }
          part { name: "disabler";
             type: RECT;
             description { state: "default" 0.0;
+               rel1.to: "button_image";
+               rel2.to: "button_image";
                color: 0 0 0 0;
                visible: 0;
             }
@@ -4675,16 +4904,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          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);
-            }
+            target: "elm.text";
          }
          program { name: "button_unpress";
             action: SIGNAL_EMIT "elm,action,unpress" "";
@@ -4695,8 +4915,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             script {
                new st[31];
                new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (strcmp(st, "icononly"))
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "clicked") || !strcmp(st, "focused"))
                {
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
@@ -4715,14 +4935,6 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             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);
-               }
                if(get_int(button_state) != BUTTON_STATE_DISABLED)
                  set_state(PART:"elm.text", "visible", 0.0);
                else
@@ -4732,44 +4944,10 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          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";
-            target: "padding_icon_text";
+            target: "elm.text";
          }
+
          program { name: "disable";
             signal: "elm,state,disabled";
             source: "elm";
@@ -4822,9 +5000,6 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             //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";
          }
@@ -4832,138 +5007,95 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/contact";
-      alias: "elm/button/base/text_only/contact";
-      images {
-         image: "00_message_button_add_recipient.png" COMP;
-         image: "00_message_button_add_recipient_press.png" COMP;
-         image: "00_message_button_add_recipient_focus.png" COMP;
-         image: "00_message_button_add_recipient_dim.png" COMP;
-      }
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
+   group { name: "elm/button/base/naviframe/back_btn/default";
+       alias: "elm/button/base/naviframe/end_btn/default";
+       //TODO: Remove this alias later
+       alias: "elm/button/base/navigationbar_prev_btn/default";
+       alias: "elm/button/base/navigationbar_backbutton/default";
+       alias: "elm/button/base/navigationbar_end_btn/default";
+       images {
+         image: "00_winset_btn_prev.png" COMP;
+         image: "00_winset_btn_prev_press.png" COMP;
       }
       parts {
          part { name: "button_image";
-                type: RECT;
+            type: RECT;
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               rel1 { to_x: "padding.left"; to_y: "elm.text"; }
-               rel2 { to_x: "padding.right"; to_y: "elm.text"; }
-               min: BUTTON_CONTACT_BG_NORMAL_MIN_INC;
-               color: BUTTON_CONTACT_BUTTON_BG_NORMAL_COLOR_INC;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_CONTACT_BUTTON_BG_PRESSED_COLOR_INC ;
+               min: BUTTON_NAVIBAR_BACK_BUTTON_BUTTON_IMAGE_MIN_INC;
+               color: 0 0 0 0;
             }
-            description { state: "disabled" 0.0;
+            description {
+               state: "clicked" 0.0;
                inherit: "default" 0.0;
             }
-            description { state: "focused" 0.0;
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
          }
-         part { name: "padding.left";
+         part {name: "padding_right";
             type: RECT;
-            scale: 1;
+            mouse_events: 0;
             description { state: "default" 0.0;
-               visible: 0;
-               min: BUTTON_CONTACT_PADDING_MIN_INC;
-               fixed: 1 0;
-               color: 0 0 0 0;
-               rel1.relative: 0 0;
-               rel2 { relative: 0.0 1.0; to_x: "elm.text"; }
                align: 1 0;
+               min: 1 0;
+               rel1 { relative: 1 0.2; }
+               rel2 { relative: 1 0.8; }
+               fixed: 1 0;
+               color: NAVIBAR_TITLE_RIGHT_SEPARATOR_COLOR_INC;
             }
          }
-         part { name: "padding.right";
+         part {name: "padding_before_right";
             type: RECT;
-            scale: 1;
+            mouse_events: 0;
             description { state: "default" 0.0;
-               visible: 0;
-               min: BUTTON_CONTACT_PADDING_MIN_INC;
+               align: 1 0;
+               min: 1 0;
+               rel1 { relative: 0 0; to: "padding_right"; }
+               rel2 { relative: 0 1; to: "padding_right"; }
                fixed: 1 0;
-               color: 0 0 0 0;
-               rel1 { relative: 1.0 0.0; to_x: "elm.text"; }
-               rel2.relative: 1.0 1.0;
-               align: 0 0;
+               color: NAVIBAR_TITLE_LEFT_SEPARATOR_COLOR_INC;
             }
          }
-         part {   name: "elm.text";
-            type: TEXT;
+         part { name: "button_center_part";
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               visible: 0;
-               fixed: 1 1;
+               min: BUTTON_NAVIBAR_BACK_BUTTON_BG_MIN_MAX_INC;
+               max: BUTTON_NAVIBAR_BACK_BUTTON_BG_MIN_MAX_INC;
                align: 0.5 0.5;
-               color: BUTTON_CONTACT_BUTTON_TEXT_NORMAL_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: BUTTON_CONTACT_FONT_SIZE_INC;
-                  min: 1 1;
-                  align: 0.5 0.5;
+               rel2 { relative: 0 1; to_x: "padding_before_right"; }
+               image {
+                  normal: "00_winset_btn_prev.png";
                }
             }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 1 1;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 1 1;
-               color: BUTTON_CONTACT_BUTTON_TEXT_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 0 0 0 128;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_CONTACT_BUTTON_TEXT_DISABLED_COLOR_INC;
-               visible: 1;
-               min: 1 1;
-            }
-            description { state: "focused" 0.0;
+            description {
+               state: "clicked" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
-               min: 1 1;
-               color: BUTTON_CONTACT_BUTTON_TEXT_FOCUSED_COLOR_INC;
+               image.normal: "00_winset_btn_prev_press.png";
             }
          }
          part { name: "over1";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel2.relative: 1.0 0.5;
-            }
-         }
-         part { name: "over2";
+            type: RECT;
             mouse_events: 1;
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
-            rel1.to: "button_image";
-            rel2.to: "button_image";
+               color: 0 0 0 0;
             }
          }
-         part { name: "over3";
+         part { name: "over2";
             mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
-            rel1.to: "button_image";
-            rel2.to: "button_image";
                color: 0 0 0 0;
             }
          }
          part { name: "disabler";
             type: RECT;
             description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
                color: 0 0 0 0;
                visible: 0;
             }
@@ -4976,248 +5108,37 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
       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";
-            target: "elm.text";
+            target: "button_center_part";
          }
-         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.text", st, 30, vl);
-               if (!strcmp(st, "clicked") || !strcmp(st, "focused"))
-               {
-                  emit("elm,action,default,text,set", "");
-                  set_state(PART:"elm.text", "visible", 0.0);
-               }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                  set_state(PART:"button_image", "default", 0.0);
-            }
-            after: button_unpress;
+         program { name: "button_unclick_anim";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+            target: "button_center_part";
          }
-         program { name: "button_unclick3";
+         program { name: "button_unclick2";
             signal: "mouse,clicked,1";
-            source: "over2";
+            source: "over1";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
-         program { name: "text_show";
-            signal: "elm,state,text,visible";
-            source: "elm";
-            script {
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-            }
-         }
-         program { name: "text_hide";
-            signal: "elm,state,text,hidden";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text";
-         }
-
          program { name: "disable";
             signal: "elm,state,disabled";
             source: "elm";
             action: STATE_SET "disabled" 0.0;
-            target: "button_image";
             target: "disabler";
-            after: "disable_text";
-         }
-         program { name: "disable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "disabled_visible", 0.0);
-               else
-                  set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, BUTTON_STATE_DISABLED);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "disabler";
-            after: "enable_text";
-         }
-         program { name: "enable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-                  set_state(PART:"elm.text", "visible", 0.0);
-               else
-                  set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, BUTTON_STATE_ENABLED);
-            }
-         }
-         program { name: "focused";
-            //signal: "elm,action,focus";
-            //source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "button_image";
-            target: "elm.text";
-         }
-         program { name: "unfocused";
-            //signal: "elm,action,unfocus";
-            //source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.text";
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/naviframe/back_btn/default";
-       alias: "elm/button/base/naviframe/end_btn/default";
-       //TODO: Remove this alias later
-       alias: "elm/button/base/navigationbar_prev_btn/default";
-       alias: "elm/button/base/navigationbar_backbutton/default";
-       alias: "elm/button/base/navigationbar_end_btn/default";
-       images {
-         image: "00_winset_btn_prev.png" COMP;
-         image: "00_winset_btn_prev_press.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            type: RECT;
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_NAVIBAR_BACK_BUTTON_BUTTON_IMAGE_MIN_INC;
-               color: 0 0 0 0;
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-         }
-         part {name: "padding_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: NAVIBAR_TITLE_RIGHT_SEPARATOR_COLOR_INC;
-            }
-         }
-         part {name: "padding_before_right";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1 0;
-               min: 1 0;
-               rel1 { relative: 0 0; to: "padding_right"; }
-               rel2 { relative: 0 1; to: "padding_right"; }
-               fixed: 1 0;
-               color: NAVIBAR_TITLE_LEFT_SEPARATOR_COLOR_INC;
-            }
-         }
-         part { name: "button_center_part";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_NAVIBAR_BACK_BUTTON_BG_MIN_MAX_INC;
-               max: BUTTON_NAVIBAR_BACK_BUTTON_BG_MIN_MAX_INC;
-               align: 0.5 0.5;
-               rel2 { relative: 0 1; to_x: "padding_before_right"; }
-               image {
-                  normal: "00_winset_btn_prev.png";
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_winset_btn_prev_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: 0 0 0 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_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            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";
+            target: "button_image";
          }
          program { name: "enable";
             signal: "elm,state,enabled";
@@ -5242,78 +5163,87 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
       }
       parts {
          part { name: "button_image";
-            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 46 42;
-               max: 46 42;
+               min: BUTTON_PICKER_PREV_ICON_DEFAULT_BG_DEFAULT_MIN_MAX_INC;
+               max: BUTTON_PICKER_PREV_ICON_DEFAULT_BG_DEFAULT_MIN_MAX_INC;
                image {
                   normal: "00_picker_btn_normal.png";
-                  border: 4 4 4 4;
+                  border: BUTTON_PICKER_PREV_ICON_DEFAULT_BG_DEFAULT_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_picker_btn_press.png";
+               image {
+                  normal: "00_picker_btn_press.png";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_picker_btn_press.png";
+               image {
+                  normal: "00_picker_btn_press.png";
+               }
             }
          }
-         part {
-            name: "padding_left_top";
+         part { name: "padding_left_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: 0.0 0.0;
-               min: 5 5;
+               rel2 {
+                  relative: 0.0 0.0;
+               }
+               min: BUTTON_PICKER_PREV_ICON_DEFAULT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "padding_right_bottom";
+         part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               rel2.relative: 1.0 1.0;
-               min: 5 5;
+               rel1 {
+                  relative: 1.0 1.0;
+               }
+               min: BUTTON_PICKER_PREV_ICON_DEFAULT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "left_arrow";
-            type: IMAGE;
+         part { name: "left_arrow";
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               min: 20 20;
-               max: 20 20;
-               align: 0.5 0.5;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
-               image.normal: "00_picker_arrow_left.png";
+               min: BUTTON_PICKER_PREV_ICON_DEFAULT_IMAGE_MIN_MAX_INC;
+               max: BUTTON_PICKER_PREV_ICON_DEFAULT_IMAGE_MIN_MAX_INC;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
+               image {
+                  normal: "00_picker_arrow_left.png";
+               }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_picker_arrow_left_press.png";
+               image {
+                  normal: "00_picker_arrow_left_press.png";
+               }
             }
          }
          part { name: "over2";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
@@ -5322,7 +5252,6 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          }
          part { name: "over3";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
                color: 0 0 0 0;
@@ -5358,8 +5287,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             signal: "mouse,up,1";
             source: "over3";
             script {
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                  set_state(PART:"button_image", "default", 0.0);
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
          }
@@ -5422,78 +5351,87 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
       }
       parts {
          part { name: "button_image";
-            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 46 42;
-               max: 46 42;
+               min: BUTTON_PICKER_PREV_ICON_DEFAULT_BG_DEFAULT_MIN_MAX_INC;
+               max: BUTTON_PICKER_PREV_ICON_DEFAULT_BG_DEFAULT_MIN_MAX_INC;
                image {
                   normal: "00_picker_btn_normal.png";
-                  border: 4 4 4 4;
+                  border: BUTTON_PICKER_PREV_ICON_DEFAULT_BG_DEFAULT_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_picker_btn_press.png";
+               image {
+                  normal: "00_picker_btn_press.png";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_picker_btn_press.png";
+               image {
+                  normal: "00_picker_btn_press.png";
+               }
             }
          }
-         part {
-            name: "padding_left_top";
+         part { name: "padding_left_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: 0.0 0.0;
-               min: 5 5;
+               rel2 {
+                  relative: 0.0 0.0;
+               }
+               min: BUTTON_PICKER_PREV_ICON_DEFAULT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "padding_right_bottom";
+         part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               rel2.relative: 1.0 1.0;
-               min: 5 5;
+               rel1 {
+                  relative: 1.0 1.0;
+               }
+               min: BUTTON_PICKER_PREV_ICON_DEFAULT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "left_arrow";
-            type: IMAGE;
+         part { name: "right_arrow";
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               min: 20 20;
-               max: 20 20;
-               align: 0.5 0.5;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top";}
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom";}
-               image.normal: "00_picker_arrow_right.png";
+               min: BUTTON_PICKER_PREV_ICON_DEFAULT_IMAGE_MIN_MAX_INC;
+               max: BUTTON_PICKER_PREV_ICON_DEFAULT_IMAGE_MIN_MAX_INC;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
+               image {
+                  normal: "00_picker_arrow_right.png";
+               }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_picker_arrow_right_press.png";
+               image {
+                  normal: "00_picker_arrow_right_press.png";
+               }
             }
          }
          part { name: "over2";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
@@ -5502,7 +5440,6 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          }
          part { name: "over3";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
                color: 0 0 0 0;
@@ -5538,8 +5475,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             signal: "mouse,up,1";
             source: "over3";
             script {
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                  set_state(PART:"button_image", "default", 0.0);
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
          }
@@ -5566,416 +5503,11 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "button_image";
-            target: "disabler";
-            after: "enable_button";
-         }
-         program { name: "enable_button";
-            script {
-               set_int(button_state, BUTTON_STATE_ENABLED);
-            }
-         }
-         program { name: "focused";
-            //signal: "elm,action,focus";
-            //source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "button_image";
-         }
-         program { name: "unfocused";
-            //signal: "elm,action,unfocus";
-            //source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-         }
-      }
-   }
-
-//###############################################
-// Nocontents Search Button Styles //
-//###############################################
-
-   group { name: "elm/button/base/nocontents/search_button";
-      images {
-         image: "00_button_03_normal.png" COMP;
-         image: "00_button_03_press.png" COMP;
-         image: "00_button_03_focus.png" COMP;
-      }
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 16 50;
-               image {
-                  normal: "00_button_03_normal.png";
-                  border: 7 7 7 7;
-                  border_scale: 1;
-               }
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_03_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_03_focus.png";
-            }
-         }
-         part {
-            name: "padding_left_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: 0.0 0.0;
-               min: 5 5;
-               fixed: 1 1;
-               visible: 0;
-            }
-         }
-         part {
-            name: "padding_right_bottom";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               rel2.relative: 1.0 1.0;
-               min: 5 5;
-               fixed: 1 1;
-               visible: 0;
-            }
-         }
-         part {
-            name: "icon_rect";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               fixed: 1 0;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
-               align: 0.0 0.5;
-               color: 0 0 0 0;
-            }
-            description { state: "visible" 0.0;
-               visible: 1;
-               min: 40 40;
-               fixed: 1 0;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-               align: 0.0 0.5;
-               color: 0 0 0 0;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
-            }
-         }
-         part {
-            name: "padding_after_icon";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0; //when only icon or no icon is there
-               align: 0.0 0.0;
-               rel1 { relative: 1.0 0.0; to: "icon_rect"; }
-               rel2 { relative: 1.0 1.0; to: "icon_rect"; }
-               fixed: 1 0;
-               min: 0 0;
-               color: 0 255 0 100;
-            }
-            description { state: "visible" 0.0;
-               visible: 1;
-               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: 12 0;
-               max: 12 0;
-               color: 0 0 0 255;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
-            }
-         }
-         part {
-            name: "padding_before_text";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0; //when only icon or no icon is there
-               align: 1.0 0.5;
-               rel1 { relative: 0.0 1.0; to_x: "elm.text"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to_x: "elm.text"; to_y: "padding_right_bottom"; }
-               fixed: 1 0;
-               min: 12 0;
-               max: 12 0;
-               color: 0 0 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: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
-               fixed: 1 0;
-            }
-            description { state: "visible" 0.0;
-               fixed: 1 0;
-               visible: 1;
-               align: 1.0 0.5;
-               rel1 { relative: 0.0 1.0; to_x: "padding_before_text"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to_x: "padding_before_text"; to_y: "padding_right_bottom"; }
-               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: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
-               align: 0.5 0.5;
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1 { relative: 1.0 1.0; to_x: "padding_after_icon"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
-               align: 0.5 0.5;
-               color: 51 102 255 255;
-               text {
-                  font: "SLP:style=Medium";
-                  size: 24;
-                  min: 0 0;
-                  max: 1 0;
-                  align: 0.5 0.5;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 90 40;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: 255 255 255 255;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 0 0 0 128;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: 0 0 0 128;
-               visible: 1;
-               min: 90 40;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: 255 255 255 255;
-            }
-         }
-         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;
-            }
-         }
-         part { name: "over3";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 0 0 0 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: "over2";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            after: "text_clicked";
-         }
-         program { name: "text_clicked";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "clicked", 0.0);
-            }
-         }
-         program { name: "button_unpress";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-         }
-         program { name: "button_mouseout_clicked";
-            signal: "mouse,up,1";
-            source: "over3";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (strcmp(st, "icononly"))
-               {
-                  emit("elm,action,default,text,set", "");
-                  set_state(PART:"elm.text", "visible", 0.0);
-               }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                  set_state(PART:"button_image", "default", 0.0);
-            }
-            after: button_unpress;
-         }
-         program { name: "button_unclick3";
-            signal: "mouse,clicked,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "text_show";
-            signal: "elm,state,text,visible";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "icononly"))
-               {
-                  set_state(PART:"elm.swallow.content", "visible", 0.0);
-                  set_state(PART:"icon_rect", "visible", 0.0);
-                  set_state(PART:"padding_after_icon", "visible", 0.0);
-               }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-            }
-         }
-         program { name: "text_hide";
-            signal: "elm,state,text,hidden";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "visible"))
-               {
-                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                  set_state(PART:"icon_rect", "icononly", 0.0);
-                  set_state(PART:"padding_after_icon", "icononly", 0.0);
-               }
-               set_state(PART:"elm.text", "default", 0.0);
-            }
-         }
-         program { name: "icon_show";
-            signal: "elm,state,icon,visible";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-               {
-                  set_state(PART:"elm.swallow.content", "visible", 0.0);
-                  set_state(PART:"icon_rect", "visible", 0.0);
-                  set_state(PART:"padding_after_icon", "visible", 0.0);
-               }
-               else
-               {
-                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                  set_state(PART:"icon_rect", "icononly", 0.0);
-                  set_state(PART:"padding_after_icon", "icononly", 0.0);
-               }
-            }
-         }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
-            target: "icon_rect";
-            target: "padding_after_icon";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "button_image";
-            target: "disabler";
-            after: "disable_text";
-         }
-         program { name: "disable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "disabled_visible", 0.0);
-               else
-                  set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, BUTTON_STATE_DISABLED);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "disabler";
-            after: "enable_text";
-         }
-         program { name: "enable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-                  set_state(PART:"elm.text", "visible", 0.0);
-               else
-                  set_state(PART:"elm.text", "default", 0.0);
+            target: "disabler";
+            after: "enable_button";
+         }
+         program { name: "enable_button";
+            script {
                set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
@@ -5984,18 +5516,12 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             //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";
          }
       }
    }
@@ -8265,186 +7791,244 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
       }
       parts {
          part { name: "button_image";
-            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 10 34;
                image {
                   normal: "00_button_06_normal.png";
-                  border: 4 4 3 3;
+                  border: BUTTON_TICKERNOTI_BG_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_06_press.png";
+               image {
+                  normal: "00_button_06_press.png";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_06_dim.png";
+               image {
+                  normal: "00_button_06_dim.png";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_06_press.png";
+               image {
+                  normal: "00_button_06_press.png";
+               }
             }
          }
-         part {
-            name: "padding_left_top";
+         part { name: "padding_left_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: 0.0 0.0;
-               min: 5 5;
+               rel2 {
+                  relative: 0.0 0.0;
+               }
+               min: BUTTON_TICKERNOTI_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "padding_right_bottom";
+         part { name: "bg";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: BUTTON_TICKERNOTI_BG_MIN_INC;
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_TICKERNOTI_VISIBLE_BG_MIN_INC;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_TICKERNOTI_ICONONLY_BG_MIN_INC;
+            }
+         }
+         part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               rel2.relative: 1.0 1.0;
-               min: 5 5;
+               rel1 {
+                  relative: 1.0 1.0;
+               }
+               min: BUTTON_TICKERNOTI_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "icon_rect";
+         part { name: "icon_rect";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               visible: 1;
+               visible: 0;
                min: 0 0;
                fixed: 1 0;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                align: 0.0 0.5;
-               color: 0 0 0 0;
             }
             description { state: "visible" 0.0;
-               visible: 1;
-               min: 24 24;
-               max: 24 24;
+               visible: 0;
+               min: BUTTON_TICKERNOTI_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               max: BUTTON_TICKERNOTI_VISIBLE_ICON_RECT_MIN_MAX_INC;
                fixed: 1 0;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+               relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                align: 0.0 0.5;
-               color: 0 0 0 0;
             }
             description { state: "icononly" 0.0;
                inherit: "default" 0.0;
             }
          }
-         part {
-            name: "padding_after_icon";
+         part { name: "padding_after_icon";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0; //when only icon or no icon is there
                align: 0.0 0.0;
-               rel1 { relative: 1.0 0.0; to: "icon_rect"; }
-               rel2 { relative: 1.0 1.0; to: "icon_rect"; }
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2 {
+                  to: "icon_rect";
+               }
                fixed: 1 0;
                min: 0 0;
-               color: 0 255 0 100;
+               visible: 0;
             }
             description { state: "visible" 0.0;
-               visible: 1;
+               visible: 0;
                align: 0.0 0.0;
-               rel1 { relative: 1.0 0.0; to: "icon_rect"; }
-               rel2 { relative: 1.0 1.0; to: "icon_rect"; }
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2 {
+                  to: "icon_rect";
+               }
                fixed: 1 0;
-               min: 8 0;
-               color: 0 0 0 0;
+               min: BUTTON_TICKERNOTI_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
             }
             description { state: "icononly" 0.0;
                inherit: "default" 0.0;
             }
          }
-         part {
-            name: "padding_before_text";
+         part { name: "padding_before_text";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0; //when only icon or no icon is there
                align: 1.0 0.5;
-               rel1 { relative: 0.0 1.0; to_x: "elm.text"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to_x: "elm.text"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.text";
+                  to_y: "padding_right_bottom";
+               }
                fixed: 1 0;
-               min: 8 0;
-               color: 0 0 0 0;
+               min: BUTTON_TICKERNOTI_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+               visible: 0;
             }
          }
          part { name: "elm.swallow.content";
             type: SWALLOW;
             scale: 1;
+            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
-               visible: 1;
-               min: 24 24;
-               max: 24 24;
+               min: BUTTON_TICKERNOTI_VISIBLE_ICON_MIN_MAX_INC;
+               max: BUTTON_TICKERNOTI_VISIBLE_ICON_MIN_MAX_INC;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 1.0; to_x: "padding_before_text"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to_x: "padding_before_text"; to_y: "padding_right_bottom"; }
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "padding_before_text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "padding_before_text";
+                  to_y: "padding_right_bottom";
+               }
             }
             description { state: "icononly" 0.0;
-               visible: 1;
-               min: 30 20;
-               max: 30 20;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
+               min: BUTTON_TICKERNOTI_ICONONLY_ICON_MIN_MAX_INC;
+               max: BUTTON_TICKERNOTI_ICONONLY_ICON_MIN_MAX_INC;
                align: 0.5 0.5;
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
             }
          }
          part { name: "elm.text";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
+            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
-               rel1 { relative: 1.0 1.0; to_x: "padding_after_icon"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
-               align: 0.5 0.5;
-               color: BUTTON_TEXT_TICKERNOTI_NORMAL_COLOR_INC;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_after_icon";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
+               color: BUTTON_TICKERNOTI_NORMAL_COLOR_INC;
                text {
-                  font: "SLP:style=Roman";
-                  size: 20;
-                  min: 0 0;
-                  align: 0.5 0.5;
+                  font: "SLP:style=Medium";
+                  size: BUTTON_TICKERNOTI_FONT_SIZE_INC;
+                  min: 1 0;
+                  max: 1 0;
                }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 90 24;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 0 0;
-               color: BUTTON_TEXT_TICKERNOTI_NORMAL_COLOR_INC;
+               color: BUTTON_TICKERNOTI_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -8452,20 +8036,17 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_TEXT_TICKERNOTI_DISABLED_COLOR_INC;
+               color: BUTTON_TICKERNOTI_DISABLED_COLOR_INC;
                visible: 1;
-               min: 90 24;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 0 0;
-               color: BUTTON_TEXT_TICKERNOTI_NORMAL_COLOR_INC;
+               color: BUTTON_TICKERNOTI_PRESSED_COLOR_INC;
             }
          }
          part { name: "over2";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
@@ -8474,12 +8055,17 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          }
          part { name: "over3";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
                color: 0 0 0 0;
             }
          }
+         part { name: "clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
          part { name: "disabler";
             type: RECT;
             description { state: "default" 0.0;
@@ -8510,7 +8096,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "clicked", 0.0);
+                 set_state(PART:"elm.text", "clicked", 0.0);
             }
          }
          program { name: "button_unpress";
@@ -8524,12 +8110,12 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                new Float:vl;
                get_state(PART:"elm.swallow.content", st, 30, vl);
                if (strcmp(st, "icononly"))
-               {
-                  emit("elm,action,default,text,set", "");
-                  set_state(PART:"elm.text", "visible", 0.0);
-               }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                  set_state(PART:"button_image", "default", 0.0);
+                 {
+                    emit("elm,action,default,text,set", "");
+                    set_state(PART:"elm.text", "visible", 0.0);
+                 }
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
          }
@@ -8546,12 +8132,13 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                new Float:vl;
                get_state(PART:"elm.swallow.content", st, 30, vl);
                if (!strcmp(st, "icononly"))
-               {
-                  set_state(PART:"elm.swallow.content", "visible", 0.0);
-                  set_state(PART:"icon_rect", "visible", 0.0);
-                  set_state(PART:"padding_after_icon", "visible", 0.0);
-               }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"icon_rect", "visible", 0.0);
+                    set_state(PART:"padding_after_icon", "visible", 0.0);
+                    set_state(PART:"bg", "visible", 0.0);
+                 }
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
                  set_state(PART:"elm.text", "visible", 0.0);
                else
                  set_state(PART:"elm.text", "disabled_visible", 0.0);
@@ -8565,11 +8152,12 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                new Float:vl;
                get_state(PART:"elm.swallow.content", st, 30, vl);
                if (!strcmp(st, "visible"))
-               {
-                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                  set_state(PART:"icon_rect", "icononly", 0.0);
-                  set_state(PART:"padding_after_icon", "icononly", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"icon_rect", "icononly", 0.0);
+                    set_state(PART:"padding_after_icon", "icononly", 0.0);
+                    set_state(PART:"bg", "icononly", 0.0);
+                 }
                set_state(PART:"elm.text", "default", 0.0);
             }
          }
@@ -8581,17 +8169,19 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-               {
-                  set_state(PART:"elm.swallow.content", "visible", 0.0);
-                  set_state(PART:"icon_rect", "visible", 0.0);
-                  set_state(PART:"padding_after_icon", "visible", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"icon_rect", "visible", 0.0);
+                    set_state(PART:"padding_after_icon", "visible", 0.0);
+                    set_state(PART:"bg", "visible", 0.0);
+                 }
                else
-               {
-                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                  set_state(PART:"icon_rect", "icononly", 0.0);
-                  set_state(PART:"padding_after_icon", "icononly", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"icon_rect", "icononly", 0.0);
+                    set_state(PART:"padding_after_icon", "icononly", 0.0);
+                    set_state(PART:"bg", "icononly", 0.0);
+                 }
             }
          }
          program { name: "icon_hide";
@@ -8599,8 +8189,9 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "elm.swallow.content";
-            target: "icon_rect";
             target: "padding_after_icon";
+            target: "icon_rect";
+            target: "bg";
          }
          program { name: "disable";
             signal: "elm,state,disabled";
@@ -8616,9 +8207,9 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "disabled_visible", 0.0);
+                 set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
-                  set_state(PART:"elm.text", "disabled", 0.0);
+                 set_state(PART:"elm.text", "disabled", 0.0);
                set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
@@ -8636,9 +8227,9 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "disabled_visible"))
-                  set_state(PART:"elm.text", "visible", 0.0);
+                 set_state(PART:"elm.text", "visible", 0.0);
                else
-                  set_state(PART:"elm.text", "default", 0.0);
+                 set_state(PART:"elm.text", "default", 0.0);
                set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
index 161eeda..a0b466d 100644 (file)
@@ -762,7 +762,7 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI
                   size: CHECK_ONOFF_ON_FONT_SIZE_INC;
                   fit: 1 1;
                   align: 0.2 0.5;
-                  size_range: 12 18;
+                  size_range: 12 CHECK_ONOFF_ON_FONT_SIZE_INC;
                   min: 0 0;
                }
             }
@@ -778,7 +778,7 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI
                   size: 16;
                   align: 0.2 0.5;
                   fit: 1 1;
-                  size_range: 12 18;
+                  size_range: 12 CHECK_ONOFF_ON_FONT_SIZE_INC;
                   min: 0 0;
                }
             }
@@ -799,7 +799,7 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI
                   size: CHECK_ONOFF_OFF_FONT_SIZE_INC;
                   fit: 1 1;
                   align: 0.2 0.5;
-                  size_range: 12 18;
+                  size_range: 12 CHECK_ONOFF_OFF_FONT_SIZE_INC;
                   min: 0 0;
                }
             }
@@ -814,7 +814,7 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI
                   size: 16;
                   align: 0.2 0.5;
                   fit: 1 1;
-                  size_range: 12 18;
+                  size_range: 12 CHECK_ONOFF_OFF_FONT_SIZE_INC;
                   min: 0 0;
                }
             }
@@ -1309,32 +1309,37 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
 ////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/check/base/delete";
       images {
-         image: "00_button_delete.png" COMP;
-         image: "00_button_delete_press.png" COMP;
-         image: "00_button_delete_dim.png" COMP;
-         image: "00_button_delete_text.png" COMP;
-         image: "00_button_delete_text_press.png" COMP;
+         image: "00_button_icon_minus.png" COMP;
+         image: "00_button_icon_minus_press.png" COMP;
+         image: "00_button_edit.png" COMP;
+         image: "00_button_edit_press.png" COMP;
+         image: "00_button_edit_dim.png" COMP;
       }
       script {
          public button_state = 0; //0:enabled, 1: disabled
       }
       parts {
-         part {
-            name: "bg";
-            mouse_events: 1;
+         part { name: "bg1";
             scale: 1;
-            type: IMAGE;
             description { state: "default" 0.0;
                align: 1.0 0.5;
-               min: 40 40;
-               max: 40 40;
-               rel1.relative: 1.0 0.0;
-               fixed: 1 0;
-               image.normal: "00_button_delete.png";
+               rel1 {
+                  to: "bg2";
+               }
+               rel2 {
+                  to: "bg2";
+               }
+               image {
+                  normal: "00_button_edit.png";
+                  border: CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_BORDER_INC;
+                  border_scale: 1;
+               }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_delete_press.png";
+               image {
+                  normal: "00_button_edit_press.png";
+               }
             }
             description { state: "intermediate" 0.0;
                inherit: "default" 0.0;
@@ -1346,446 +1351,30 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_delete_dim.png";
-            }
-         }
-         part {
-            name: "clipper";
-            type: RECT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               align: 1.0 0.5;
-               min: 40 40;
-               max: 40 40;
-               color: 255 255 255 255;
-            }
-            description { state: "on" 0.0;
-               align: 1.0 0.5;
-               min: 117 40;
-               max: 117 40;
-               color: 255 255 255 255;
+               image {
+                  normal: "00_button_edit_dim.png";
+               }
             }
          }
-         part {
-            name: "bg_expand";
-            mouse_events: 0;
+         part { name: "bg2";
             scale: 1;
-            type: IMAGE;
-            clip_to: "clipper";
             description { state: "default" 0.0;
-               align: 0.0 0.5;
-               min: 117 40;
-               max: 117 40;
-               image.normal: "00_button_delete_text.png";
-               image.border: 32 16 0 0;
-               image.border_scale: 1;
-               rel1 { relative: 1 0; to_x: "bg"; }
-               rel2 { relative: 1 1; to_x: "bg"; }
-               fixed: 1 0;
-            }
-            description { state: "clicked" 0.0;
-               align: 1.0 0.5;
-               min: 117 40;
-               max: 117 40;
-               image.normal: "00_button_delete_text.png";
-               image.border: 32 16 0 0;
-               image.border_scale: 1;
-               rel1 { relative: 1 0; to_x: "bg"; }
-               rel2 { relative: 1 1; to_x: "bg"; }
-               fixed: 1 0;
-               image.normal: "00_button_delete_text_press.png";
-            }
-            description { state: "intermediate" 0.0;
-               align: 0.0 0.5;
-               min: 117 40;
-               max: 117 40;
-               image.normal: "00_button_delete_text.png";
-               image.border: 32 16 0 0;
-               image.border_scale: 1;
-               rel1 { relative: 0 0; to_x: "bg"; }
-               rel2 { relative: 0 1; to_x: "bg"; }
-               fixed: 1 0;
-            }
-            description { state: "on" 0.0;
                align: 1.0 0.5;
-               min: 117 40;
-               max: 117 40;
-               image.normal: "00_button_delete_text.png";
-               image.border: 32 16 0 0;
-               image.border_scale: 1;
-               rel1 { relative: 1 0; to_x: "bg"; }
-               rel2 { relative: 1 1; to_x: "bg"; }
-               fixed: 1 0;
-            }
-         }
-         part { name: "check";
-            type: TEXT;
-            mouse_events: 0;
-            scale:1;
-            description { state: "default" 0.0;
-               visible: 0;
-               align: 0.8 0.5;
-               min: 0 0;
-               text {
-                  font: "SLP:style=Medium";
-                  size: 20;
-                  min: 0 0;
-                  align: 0.5 0.5;
-                  text: "";
+               min: CHECK_STYLE_DELETE_BUTTON_BG_IMAGE_MIN_MAX_WIDTH_INC;
+               max: CHECK_STYLE_DELETE_BUTTON_BG_IMAGE_MIN_MAX_WIDTH_INC;
+               rel1 {
+                  relative: 1.0 0.0;
                }
-            }
-            description { state: "visible" 0.0;
-               visible: 1;
-               align: 0.8 0.5;
-               min: 75 40;
-               max: 75 40;
-               color: CHECK_DELETE_TEXT_DELETE_NORMAL_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: 20;
-                  min: 1 0;
-                  align: 0.0 0.5;
-                  text: "Delete";
-               }
-            }
-            description { state: "visible_pressed" 0.0;
-               inherit: "visible" 0.0;
-               color: CHECK_DELETE_TEXT_DELETE_PRESS_COLOR_INC;
-            }
-         }
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
-            description { state: "default" 0.0;
                fixed: 1 0;
-               visible: 0;
-               color: 255 255 255 255;
-               align: 0.0 0.5;
-               rel1.to_x: "bg";
-               rel1.relative: 1.0 0.0;
-               rel1.offset: 1 1;
-               rel2.to_x: "bg";
-               rel2.relative: 1.0 1.0;
-               rel2.offset: 2 -2;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               fixed: 1 1;
-               visible: 1;
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 128 128 128 128;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: 128 128 128 128;
-               fixed: 1 1;
-               visible: 1;
-               aspect: 1.0 1.0;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               fixed: 1 1;
-               rel1 { relative: 1.0 0.5; offset: 1 1; to_x: "elm.swallow.content"; }
-               rel2 { relative: 1.0 0.5; offset: -2 -2; }
-               color: 255 255 255 255;
-               align: 0.0 0.5;
-               text {
-                  style: "check_label_textblock_style";
-                  min: 0 0;
-               }
-               color: CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text.min: 1 1;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text.min: 1 1;
-               color: CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC;
-            }
-         }
-         part { name: "events1";
-            type: RECT;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               rel1.to: "bg";
-               rel2.to_x: "elm.text";
-               align: 0.0 0.5;
-            }
-            description { state: "visible" 0.0;
-               color: 0 0 0 0;
-               rel1.to: "bg_expand";
-               rel2.to_x: "elm.text";
-               align: 0.0 0.5;
-            }
-         }
-         part { name: "events2";
-            type: RECT;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               rel1.to: "bg";
-               rel2.to_x: "elm.text";
-               align: 0.0 0.5;
-            }
-            description { state: "visible" 0.0;
-               color: 0 0 0 0;
-               rel1.to: "bg_expand";
-               rel2.to_x: "elm.text";
-               align: 0.0 0.5;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               rel2.to_x: "elm.text";
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "click";
-            signal: "mouse,clicked,1";
-            source: "events1";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"check", st, 30, vl);
-               if (!strcmp(st, "visible_pressed"))
-                  set_state(PART:"check", "visible", 0.0);
-            }
-            after: "toggle";
-         }
-         program { name: "toggle";
-            action: SIGNAL_EMIT "elm,action,check,toggle" "";
-         }
-         program { name: "unfocused";
-            signal: "elm,action,unfocus";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"bg", st, 30, vl);
-               if (!strcmp(st, "on")) {
-                  emit("elm,action,check,toggle", "");
-               }
-            }
-         }
-         program { name: "click_down";
-            signal: "mouse,down,1";
-            source: "events2";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"check", st, 30, vl);
-               if (!strcmp(st, "visible"))
-               {
-                  set_state(PART:"bg_expand", "clicked", 0.0);
-                  set_state(PART:"check", "visible_pressed", 0.0);
-               }
-               else
-                  set_state(PART:"bg", "clicked", 0.0);
-            }
-         }
-         program { name: "check_normal";
-            signal: "mouse,up,1";
-            source: "events2";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"check", st, 30, vl);
-               if (!strcmp(st, "visible_pressed"))
-               {
-                  set_state(PART:"bg_expand", "on", 0.0);
-                  set_state(PART:"check", "visible", 0.0);
+               image {
+                  normal: "00_button_icon_minus.png";
                }
-               get_state(PART:"bg_expand", st, 30, vl);
-               if (!strcmp(st, "default"))
-                  set_state(PART:"bg", "default", 0.0);
-            }
-         }
-         program { name: "check_on";
-            signal: "elm,state,check,on";
-            source: "elm";
-            action: STATE_SET "on" 0.0;
-            target: "clipper";
-            after: "start_expand";
-         }
-         program { name: "start_expand";
-            action:  STATE_SET "intermediate" 0.0;
-            target: "bg";
-            target: "bg_expand";
-            after: "expand";
-         }
-         program { name: "expand";
-            action: STATE_SET "on" 0.0;
-            target: "bg_expand";
-            target: "bg";
-            transition: ACCELERATE 0.1;
-            after: "check_visible";
-         }
-         program { name: "check_visible";
-            action:  STATE_SET "visible" 0.0;
-            target: "check";
-            target: "events1";
-            target: "events2";
-         }
-         program { name: "check_off";
-            signal: "elm,state,check,off";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "check";
-            after: "contract";
-         }
-         program { name: "contract";
-            action:  STATE_SET "intermediate" 0.0;
-            target: "bg_expand";
-            transition: ACCELERATE 0.1;
-            after: "normal_bg";
-         }
-         program { name: "normal_bg";
-            script {
-               if(get_int(button_state) !=1)
-                  set_state(PART:"bg", "default", 0.0);
-               else
-                  set_state(PART:"bg", "disabled", 0.0);
-            }
-            after: "bg_default";
-         }
-         program { name: "bg_default";
-            action:  STATE_SET "default" 0.0;
-            target: "bg_expand";
-            target: "clipper";
-            target: "events1";
-            target: "events2";
-         }
-         program { name: "text_show";
-            signal: "elm,state,text,visible";
-            source: "elm";
-            action:  STATE_SET "visible" 0.0;
-            target: "elm.text";
-         }
-         program { name: "text_hide";
-            signal: "elm,state,text,hidden";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "elm.text";
-         }
-         program { name: "icon_show";
-            signal: "elm,state,icon,visible";
-            source: "elm";
-            action:  STATE_SET "visible" 0.0;
-            target: "elm.swallow.content";
-         }
-         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: "disabler";
-            target: "bg";
-            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);
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.swallow.content", "disabled_visible", 0.0);
-               else
-                  set_state(PART:"elm.swallow.content", "disabled", 0.0);
-               set_int(button_state, 1);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "bg";
-            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);
-
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.swallow.content", "visible", 0.0);
-               else
-                  set_state(PART:"elm.swallow.content", "default", 0.0);
-               set_int(button_state, 0);
-            }
-         }
-      }
-   }
-
-   group { name: "elm/check/base/delete/extended";
-      images {
-         image: "00_button_delete.png" COMP;
-         image: "00_button_delete_press.png" COMP;
-         image: "00_button_delete_dim.png" COMP;
-         image: "00_button_delete_text.png" COMP;
-         image: "00_button_delete_text_press.png" COMP;
-      }
-      script {
-         public button_state = 0; //0:enabled, 1: disabled
-      }
-      parts {
-         part {
-            name: "bg";
-            mouse_events: 1;
-            scale: 1;
-            type: IMAGE;
-            description { state: "default" 0.0;
-               align: 1.0 0.5;
-               min: 40 40;
-               max: 40 40;
-               rel1.relative: 1.0 0.0;
-               fixed: 1 0;
-               image.normal: "00_button_delete.png";
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_delete_press.png";
+               image {
+                  normal: "00_button_icon_minus_press.png";
+               }
             }
             description { state: "intermediate" 0.0;
                inherit: "default" 0.0;
@@ -1797,106 +1386,97 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_delete_dim.png";
+               image {
+                  normal: "00_button_icon_minus.png";
+               }
             }
          }
-         part {
-            name: "clipper";
+         part { name: "clipper";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                align: 1.0 0.5;
-               min: 40 40;
-               max: 40 40;
+               min: CHECK_STYLE_DELETE_BUTTON_BG_IMAGE_MIN_MAX_WIDTH_INC;
+               max: CHECK_STYLE_DELETE_BUTTON_BG_IMAGE_MIN_MAX_WIDTH_INC;
                color: 255 255 255 255;
             }
             description { state: "on" 0.0;
                align: 1.0 0.5;
-               min: 117 40;
-               max: 117 40;
+               min: CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_IMAGE_MIN_MAX_WIDTH_INC;
+               max: CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_IMAGE_MIN_MAX_WIDTH_INC;
                color: 255 255 255 255;
             }
          }
-         part {
-            name: "bg_expand";
+         part { name: "bg_expand";
             mouse_events: 0;
             scale: 1;
-            type: IMAGE;
             clip_to: "clipper";
             description { state: "default" 0.0;
                align: 0.0 0.5;
-               min: 117 40;
-               max: 117 40;
-               image.normal: "00_button_delete_text.png";
-               image.border: 32 16 0 0;
-               image.border_scale: 1;
-               rel1 { relative: 1 0; to_x: "bg"; }
-               rel2 { relative: 1 1; to_x: "bg"; }
+               min: CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_IMAGE_MIN_MAX_WIDTH_INC;
+               max: CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_IMAGE_MIN_MAX_WIDTH_INC;
+               image {
+                  normal: "00_button_edit.png";
+                  border: CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_BORDER_INC;
+                  border_scale: 1;
+               }
+               rel1 {
+                  relative: 1 0; 
+                  to_x: "bg2"; 
+               }
+               rel2 {
+                  to_x: "bg2";
+               }
                fixed: 1 0;
             }
             description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
                align: 1.0 0.5;
-               min: 117 40;
-               max: 117 40;
-               image.normal: "00_button_delete_text.png";
-               image.border: 32 16 0 0;
-               image.border_scale: 1;
-               rel1 { relative: 1 0; to_x: "bg"; }
-               rel2 { relative: 1 1; to_x: "bg"; }
-               fixed: 1 0;
-               image.normal: "00_button_delete_text_press.png";
+               image {
+                  normal: "00_button_edit_press.png";
+               }
             }
             description { state: "intermediate" 0.0;
-               align: 0.0 0.5;
-               min: 117 40;
-               max: 117 40;
-               image.normal: "00_button_delete_text.png";
-               image.border: 32 16 0 0;
-               image.border_scale: 1;
-               rel1 { relative: 0 0; to_x: "bg"; }
-               rel2 { relative: 0 1; to_x: "bg"; }
-               fixed: 1 0;
+               inherit: "default" 0.0;
+               rel1 {
+                  relative: 0 0;
+                  to_x: "bg2";
+               }
+               rel2 {
+                  relative: 0 1;
+                  to_x: "bg2";
+               }
             }
             description { state: "on" 0.0;
+               inherit: "default" 0.0;
                align: 1.0 0.5;
-               min: 117 40;
-               max: 117 40;
-               image.normal: "00_button_delete_text.png";
-               image.border: 32 16 0 0;
-               image.border_scale: 1;
-               rel1 { relative: 1 0; to_x: "bg"; }
-               rel2 { relative: 1 1; to_x: "bg"; }
-               fixed: 1 0;
             }
          }
          part { name: "check";
             type: TEXT;
             mouse_events: 0;
-            scale:1;
+            scale: 1;
             description { state: "default" 0.0;
                visible: 0;
-               align: 0.8 0.5;
+               align: 1.0 0.5;
                min: 0 0;
                text {
                   font: "SLP:style=Medium";
-                  size: 20;
+                  size: CHECK_STYLE_DELETE_BUTTON_TEXT_FONT_SIZE_INC;
                   min: 0 0;
-                  align: 0.5 0.5;
                   text: "";
                }
             }
             description { state: "visible" 0.0;
-               visible: 1;
-               align: 0.8 0.5;
-               min: 75 40;
-               max: 75 40;
+               align: 1.0 0.5;
+               min: CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_IMAGE_MIN_MAX_WIDTH_INC;
+               max: CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_IMAGE_MIN_MAX_WIDTH_INC;
                color: CHECK_DELETE_TEXT_DELETE_NORMAL_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
-                  size: 20;
+                  size: CHECK_STYLE_DELETE_BUTTON_TEXT_FONT_SIZE_INC;
                   min: 1 0;
-                  align: 0.0 0.5;
                   text: "Delete";
                }
             }
@@ -1912,12 +1492,16 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
                visible: 0;
                color: 255 255 255 255;
                align: 0.0 0.5;
-               rel1.to_x: "bg";
-               rel1.relative: 1.0 0.0;
-               rel1.offset: 1 1;
-               rel2.to_x: "bg";
-               rel2.relative: 1.0 1.0;
-               rel2.offset: 2 -2;
+               rel1 {
+                  to_x: "bg2";
+                  relative: 1.0 0.0;
+                  offset: 1 1;
+               }
+               rel2 {
+                  to_x: "bg2";
+                  relative: 1.0 1.0;
+                  offset: 2 -2;
+               }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
@@ -1945,8 +1529,15 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
             description { state: "default" 0.0;
                visible: 0;
                fixed: 1 1;
-               rel1 { relative: 1.0 0.5; offset: 1 1; to_x: "elm.swallow.content"; }
-               rel2 { relative: 1.0 0.5; offset: -2 -2; }
+               rel1 {
+                  relative: 1.0 0.5;
+                  offset: 1 1;
+                  to_x: "elm.swallow.content";
+               }
+               rel2 {
+                  relative: 1.0 0.5;
+                  offset: -2 -2;
+               }
                color: 255 255 255 255;
                align: 0.0 0.5;
                text {
@@ -1975,19 +1566,23 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
                color: 0 0 0 0;
-               rel1.to: "bg";
-               rel2.to_x: "elm.text";
+               rel1 {
+                  to: "bg2";
+               }
+               rel2 {
+                  to_x: "elm.text";
+               }
                align: 0.0 0.5;
-               fixed: 1 0;
-               min: 60 75;
             }
             description { state: "visible" 0.0;
                color: 0 0 0 0;
-               rel1.to: "bg_expand";
-               rel2.to_x: "elm.text";
+               rel1 {
+                  to: "bg_expand";
+               }
+               rel2 {
+                  to_x: "elm.text";
+               }
                align: 0.0 0.5;
-               fixed: 1 0;
-               min: 60 75;
             }
          }
          part { name: "events2";
@@ -1995,25 +1590,31 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
             repeat_events: 1;
             description { state: "default" 0.0;
                color: 0 0 0 0;
-               rel1.to: "bg";
-               rel2.to_x: "elm.text";
+               rel1 {
+                  to: "bg2";
+               }
+               rel2 {
+                  to_x: "elm.text";
+               }
                align: 0.0 0.5;
-               fixed: 1 0;
-               min: 60 75;
             }
             description { state: "visible" 0.0;
                color: 0 0 0 0;
-               rel1.to: "bg_expand";
-               rel2.to_x: "elm.text";
+               rel1 {
+                  to: "bg_expand";
+               }
+               rel2 {
+                  to_x: "elm.text";
+               }
                align: 0.0 0.5;
-               fixed: 1 0;
-               min: 60 75;
             }
          }
          part { name: "disabler";
             type: RECT;
             description { state: "default" 0.0;
-               rel2.to_x: "elm.text";
+               rel2 {
+                  to_x: "elm.text";
+               }
                color: 0 0 0 0;
                visible: 0;
             }
@@ -2032,7 +1633,7 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
                new Float:vl;
                get_state(PART:"check", st, 30, vl);
                if (!strcmp(st, "visible_pressed"))
-                  set_state(PART:"check", "visible", 0.0);
+                 set_state(PART:"check", "visible", 0.0);
             }
             after: "toggle";
          }
@@ -2045,9 +1646,9 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
             script {
                new st[31];
                new Float:vl;
-               get_state(PART:"bg", st, 30, vl);
+               get_state(PART:"bg2", st, 30, vl);
                if (!strcmp(st, "on")) {
-                  emit("elm,action,check,toggle", "");
+                 emit("elm,action,check,toggle", "");
                }
             }
          }
@@ -2059,12 +1660,14 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
                new Float:vl;
                get_state(PART:"check", st, 30, vl);
                if (!strcmp(st, "visible"))
-               {
-                  set_state(PART:"bg_expand", "clicked", 0.0);
-                  set_state(PART:"check", "visible_pressed", 0.0);
+                 {
+                    set_state(PART:"bg_expand", "clicked", 0.0);
+                    set_state(PART:"check", "visible_pressed", 0.0);
+                 }
+               else {
+                  set_state(PART:"bg2", "clicked", 0.0);
+                  set_state(PART:"bg1", "clicked", 0.0);
                }
-               else
-                  set_state(PART:"bg", "clicked", 0.0);
             }
          }
          program { name: "check_normal";
@@ -2075,13 +1678,15 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
                new Float:vl;
                get_state(PART:"check", st, 30, vl);
                if (!strcmp(st, "visible_pressed"))
-               {
-                  set_state(PART:"bg_expand", "on", 0.0);
-                  set_state(PART:"check", "visible", 0.0);
-               }
+                 {
+                    set_state(PART:"bg_expand", "on", 0.0);
+                    set_state(PART:"check", "visible", 0.0);
+                 }
                get_state(PART:"bg_expand", st, 30, vl);
-               if (!strcmp(st, "default"))
-                  set_state(PART:"bg", "default", 0.0);
+               if (!strcmp(st, "default")) {
+                  set_state(PART:"bg2", "default", 0.0);
+                  set_state(PART:"bg1", "default", 0.0);
+               }
             }
          }
          program { name: "check_on";
@@ -2092,20 +1697,22 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
             after: "start_expand";
          }
          program { name: "start_expand";
-            action:  STATE_SET "intermediate" 0.0;
-            target: "bg";
+            action: STATE_SET "intermediate" 0.0;
+            target: "bg2";
+            target: "bg1";
             target: "bg_expand";
             after: "expand";
          }
          program { name: "expand";
             action: STATE_SET "on" 0.0;
             target: "bg_expand";
-            target: "bg";
+            target: "bg2";
+            target: "bg1";
             transition: ACCELERATE 0.1;
             after: "check_visible";
          }
          program { name: "check_visible";
-            action:  STATE_SET "visible" 0.0;
+            action: STATE_SET "visible" 0.0;
             target: "check";
             target: "events1";
             target: "events2";
@@ -2113,27 +1720,31 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
          program { name: "check_off";
             signal: "elm,state,check,off";
             source: "elm";
-            action:  STATE_SET "default" 0.0;
+            action: STATE_SET "default" 0.0;
             target: "check";
             after: "contract";
          }
          program { name: "contract";
-            action:  STATE_SET "intermediate" 0.0;
+            action: STATE_SET "intermediate" 0.0;
             target: "bg_expand";
             transition: ACCELERATE 0.1;
             after: "normal_bg";
          }
          program { name: "normal_bg";
             script {
-               if(get_int(button_state) !=1)
-                  set_state(PART:"bg", "default", 0.0);
-               else
-                  set_state(PART:"bg", "disabled", 0.0);
+               if (get_int(button_state) !=1) {
+                 set_state(PART:"bg2", "default", 0.0);
+                 set_state(PART:"bg1", "default", 0.0);
+               }
+               else {
+                 set_state(PART:"bg2", "disabled", 0.0);
+                 set_state(PART:"bg1", "disabled", 0.0);
+               }
             }
             after: "bg_default";
          }
          program { name: "bg_default";
-            action:  STATE_SET "default" 0.0;
+            action: STATE_SET "default" 0.0;
             target: "bg_expand";
             target: "clipper";
             target: "events1";
@@ -2142,25 +1753,25 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
          program { name: "text_show";
             signal: "elm,state,text,visible";
             source: "elm";
-            action:  STATE_SET "visible" 0.0;
+            action: STATE_SET "visible" 0.0;
             target: "elm.text";
          }
          program { name: "text_hide";
             signal: "elm,state,text,hidden";
             source: "elm";
-            action:  STATE_SET "default" 0.0;
+            action: STATE_SET "default" 0.0;
             target: "elm.text";
          }
          program { name: "icon_show";
             signal: "elm,state,icon,visible";
             source: "elm";
-            action:  STATE_SET "visible" 0.0;
+            action: STATE_SET "visible" 0.0;
             target: "elm.swallow.content";
          }
          program { name: "icon_hide";
             signal: "elm,state,icon,hidden";
             source: "elm";
-            action:  STATE_SET "default" 0.0;
+            action: STATE_SET "default" 0.0;
             target: "elm.swallow.content";
          }
          program { name: "disable";
@@ -2168,7 +1779,8 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
             source: "elm";
             action: STATE_SET "disabled" 0.0;
             target: "disabler";
-            target: "bg";
+            target: "bg2";
+            target: "bg1";
             after: "disable_text";
          }
          program { name: "disable_text";
@@ -2177,14 +1789,14 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "disabled_visible", 0.0);
+                 set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
-                  set_state(PART:"elm.text", "disabled", 0.0);
+                 set_state(PART:"elm.text", "disabled", 0.0);
                get_state(PART:"elm.swallow.content", st, 30, vl);
                if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.swallow.content", "disabled_visible", 0.0);
+                 set_state(PART:"elm.swallow.content", "disabled_visible", 0.0);
                else
-                  set_state(PART:"elm.swallow.content", "disabled", 0.0);
+                 set_state(PART:"elm.swallow.content", "disabled", 0.0);
                set_int(button_state, 1);
             }
          }
@@ -2193,7 +1805,8 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "disabler";
-            target: "bg";
+            target: "bg2";
+            target: "bg1";
             after: "enable_text";
          }
          program { name: "enable_text";
@@ -2202,15 +1815,14 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "disabled_visible"))
-                  set_state(PART:"elm.text", "visible", 0.0);
+                 set_state(PART:"elm.text", "visible", 0.0);
                else
-                  set_state(PART:"elm.text", "default", 0.0);
-
+                 set_state(PART:"elm.text", "default", 0.0);
                get_state(PART:"elm.swallow.content", st, 30, vl);
                if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.swallow.content", "visible", 0.0);
+                 set_state(PART:"elm.swallow.content", "visible", 0.0);
                else
-                  set_state(PART:"elm.swallow.content", "default", 0.0);
+                 set_state(PART:"elm.swallow.content", "default", 0.0);
                set_int(button_state, 0);
             }
          }
diff --git a/themes/images/nbeat-black-hd/00_button_EditStyle.png b/themes/images/nbeat-black-hd/00_button_EditStyle.png
deleted file mode 100644 (file)
index 582062e..0000000
Binary files a/themes/images/nbeat-black-hd/00_button_EditStyle.png and /dev/null differ
diff --git a/themes/images/nbeat-black-hd/00_button_EditStyle_dim.png b/themes/images/nbeat-black-hd/00_button_EditStyle_dim.png
deleted file mode 100644 (file)
index 1fa09bf..0000000
Binary files a/themes/images/nbeat-black-hd/00_button_EditStyle_dim.png and /dev/null differ
diff --git a/themes/images/nbeat-black-hd/00_button_EditStyle_press.png b/themes/images/nbeat-black-hd/00_button_EditStyle_press.png
deleted file mode 100644 (file)
index d47374e..0000000
Binary files a/themes/images/nbeat-black-hd/00_button_EditStyle_press.png and /dev/null differ
diff --git a/themes/images/nbeat-black-hd/00_button_delete.png b/themes/images/nbeat-black-hd/00_button_delete.png
deleted file mode 100644 (file)
index 96f514b..0000000
Binary files a/themes/images/nbeat-black-hd/00_button_delete.png and /dev/null differ
diff --git a/themes/images/nbeat-black-hd/00_button_delete_dim.png b/themes/images/nbeat-black-hd/00_button_delete_dim.png
deleted file mode 100644 (file)
index 59854c7..0000000
Binary files a/themes/images/nbeat-black-hd/00_button_delete_dim.png and /dev/null differ
diff --git a/themes/images/nbeat-black-hd/00_button_delete_press.png b/themes/images/nbeat-black-hd/00_button_delete_press.png
deleted file mode 100644 (file)
index be934ad..0000000
Binary files a/themes/images/nbeat-black-hd/00_button_delete_press.png and /dev/null differ
diff --git a/themes/images/nbeat-black-hd/00_button_delete_text.png b/themes/images/nbeat-black-hd/00_button_delete_text.png
deleted file mode 100644 (file)
index d8df523..0000000
Binary files a/themes/images/nbeat-black-hd/00_button_delete_text.png and /dev/null differ
diff --git a/themes/images/nbeat-black-hd/00_button_delete_text_press.png b/themes/images/nbeat-black-hd/00_button_delete_text_press.png
deleted file mode 100644 (file)
index ef5592a..0000000
Binary files a/themes/images/nbeat-black-hd/00_button_delete_text_press.png and /dev/null differ
index 015e71e..eadabad 100644 (file)
Binary files a/themes/images/nbeat-black-hd/00_button_minus.png and b/themes/images/nbeat-black-hd/00_button_minus.png differ
diff --git a/themes/images/nbeat-black-hd/00_button_minus_normal.png b/themes/images/nbeat-black-hd/00_button_minus_normal.png
deleted file mode 100755 (executable)
index eadabad..0000000
Binary files a/themes/images/nbeat-black-hd/00_button_minus_normal.png and /dev/null differ
index 3587a8f..0c6c3d1 100644 (file)
Binary files a/themes/images/nbeat-black-hd/00_button_off.png and b/themes/images/nbeat-black-hd/00_button_off.png differ
index f54199d..d18dfe0 100644 (file)
Binary files a/themes/images/nbeat-black-hd/00_button_on.png and b/themes/images/nbeat-black-hd/00_button_on.png differ
old mode 100644 (file)
new mode 100755 (executable)
index 2aa07a3..724d1a8
Binary files a/themes/images/nbeat-black-hd/00_button_plus.png and b/themes/images/nbeat-black-hd/00_button_plus.png differ
diff --git a/themes/images/nbeat-black-hd/00_button_plus_normal.png b/themes/images/nbeat-black-hd/00_button_plus_normal.png
deleted file mode 100755 (executable)
index 724d1a8..0000000
Binary files a/themes/images/nbeat-black-hd/00_button_plus_normal.png and /dev/null differ
diff --git a/themes/images/nbeat-black-hd/00_button_sweep_46.png b/themes/images/nbeat-black-hd/00_button_sweep_46.png
deleted file mode 100644 (file)
index 330aa39..0000000
Binary files a/themes/images/nbeat-black-hd/00_button_sweep_46.png and /dev/null differ
diff --git a/themes/images/nbeat-black-hd/00_button_sweep_46_dim.png b/themes/images/nbeat-black-hd/00_button_sweep_46_dim.png
deleted file mode 100644 (file)
index 8deec26..0000000
Binary files a/themes/images/nbeat-black-hd/00_button_sweep_46_dim.png and /dev/null differ
diff --git a/themes/images/nbeat-black-hd/00_button_sweep_46_focus.png b/themes/images/nbeat-black-hd/00_button_sweep_46_focus.png
deleted file mode 100644 (file)
index e41f0e9..0000000
Binary files a/themes/images/nbeat-black-hd/00_button_sweep_46_focus.png and /dev/null differ
diff --git a/themes/images/nbeat-black-hd/00_button_sweep_46_press.png b/themes/images/nbeat-black-hd/00_button_sweep_46_press.png
deleted file mode 100644 (file)
index 13e877a..0000000
Binary files a/themes/images/nbeat-black-hd/00_button_sweep_46_press.png and /dev/null differ
index 28bafd6..1acd3db 100644 (file)
Binary files a/themes/images/nbeat-black-hd/00_check_off.png and b/themes/images/nbeat-black-hd/00_check_off.png differ
index 78b3b46..ec99ff1 100644 (file)
Binary files a/themes/images/nbeat-black-hd/00_check_on.png and b/themes/images/nbeat-black-hd/00_check_on.png differ
index 8599454..e624dc9 100644 (file)
Binary files a/themes/images/nbeat-black-hd/00_winset_btn_prev_press.png and b/themes/images/nbeat-black-hd/00_winset_btn_prev_press.png differ
index 433d198..49502c1 100644 (file)
Binary files a/themes/images/nbeat-black/00_button_06_dim.png and b/themes/images/nbeat-black/00_button_06_dim.png differ
index ce05da2..91e02ae 100644 (file)
Binary files a/themes/images/nbeat-black/00_button_06_normal.png and b/themes/images/nbeat-black/00_button_06_normal.png differ
index 5bf0ac8..089e554 100644 (file)
Binary files a/themes/images/nbeat-black/00_button_06_press.png and b/themes/images/nbeat-black/00_button_06_press.png differ
diff --git a/themes/images/nbeat-black/00_button_EditStyle.png b/themes/images/nbeat-black/00_button_EditStyle.png
deleted file mode 100644 (file)
index 582062e..0000000
Binary files a/themes/images/nbeat-black/00_button_EditStyle.png and /dev/null differ
diff --git a/themes/images/nbeat-black/00_button_EditStyle_dim.png b/themes/images/nbeat-black/00_button_EditStyle_dim.png
deleted file mode 100644 (file)
index 1fa09bf..0000000
Binary files a/themes/images/nbeat-black/00_button_EditStyle_dim.png and /dev/null differ
diff --git a/themes/images/nbeat-black/00_button_EditStyle_press.png b/themes/images/nbeat-black/00_button_EditStyle_press.png
deleted file mode 100644 (file)
index d47374e..0000000
Binary files a/themes/images/nbeat-black/00_button_EditStyle_press.png and /dev/null differ
diff --git a/themes/images/nbeat-black/00_button_delete.png b/themes/images/nbeat-black/00_button_delete.png
deleted file mode 100644 (file)
index ab0339c..0000000
Binary files a/themes/images/nbeat-black/00_button_delete.png and /dev/null differ
diff --git a/themes/images/nbeat-black/00_button_delete_dim.png b/themes/images/nbeat-black/00_button_delete_dim.png
deleted file mode 100644 (file)
index d2e9792..0000000
Binary files a/themes/images/nbeat-black/00_button_delete_dim.png and /dev/null differ
diff --git a/themes/images/nbeat-black/00_button_delete_press.png b/themes/images/nbeat-black/00_button_delete_press.png
deleted file mode 100644 (file)
index 258925b..0000000
Binary files a/themes/images/nbeat-black/00_button_delete_press.png and /dev/null differ
diff --git a/themes/images/nbeat-black/00_button_delete_text.png b/themes/images/nbeat-black/00_button_delete_text.png
deleted file mode 100644 (file)
index 53e5b32..0000000
Binary files a/themes/images/nbeat-black/00_button_delete_text.png and /dev/null differ
diff --git a/themes/images/nbeat-black/00_button_delete_text_press.png b/themes/images/nbeat-black/00_button_delete_text_press.png
deleted file mode 100644 (file)
index 04935c3..0000000
Binary files a/themes/images/nbeat-black/00_button_delete_text_press.png and /dev/null differ
diff --git a/themes/images/nbeat-black/00_button_sweep_46.png b/themes/images/nbeat-black/00_button_sweep_46.png
deleted file mode 100644 (file)
index 330aa39..0000000
Binary files a/themes/images/nbeat-black/00_button_sweep_46.png and /dev/null differ
diff --git a/themes/images/nbeat-black/00_button_sweep_46_dim.png b/themes/images/nbeat-black/00_button_sweep_46_dim.png
deleted file mode 100644 (file)
index 8deec26..0000000
Binary files a/themes/images/nbeat-black/00_button_sweep_46_dim.png and /dev/null differ
diff --git a/themes/images/nbeat-black/00_button_sweep_46_focus.png b/themes/images/nbeat-black/00_button_sweep_46_focus.png
deleted file mode 100644 (file)
index e41f0e9..0000000
Binary files a/themes/images/nbeat-black/00_button_sweep_46_focus.png and /dev/null differ
diff --git a/themes/images/nbeat-black/00_button_sweep_46_press.png b/themes/images/nbeat-black/00_button_sweep_46_press.png
deleted file mode 100644 (file)
index 13e877a..0000000
Binary files a/themes/images/nbeat-black/00_button_sweep_46_press.png and /dev/null differ
index 433d198..e4fa83e 100644 (file)
Binary files a/themes/images/nbeat-hd/00_button_06_dim.png and b/themes/images/nbeat-hd/00_button_06_dim.png differ
index ce05da2..9b5a00e 100644 (file)
Binary files a/themes/images/nbeat-hd/00_button_06_normal.png and b/themes/images/nbeat-hd/00_button_06_normal.png differ
index 5bf0ac8..1e34014 100644 (file)
Binary files a/themes/images/nbeat-hd/00_button_06_press.png and b/themes/images/nbeat-hd/00_button_06_press.png differ
diff --git a/themes/images/nbeat-hd/00_button_EditStyle.png b/themes/images/nbeat-hd/00_button_EditStyle.png
deleted file mode 100644 (file)
index 582062e..0000000
Binary files a/themes/images/nbeat-hd/00_button_EditStyle.png and /dev/null differ
diff --git a/themes/images/nbeat-hd/00_button_EditStyle_dim.png b/themes/images/nbeat-hd/00_button_EditStyle_dim.png
deleted file mode 100644 (file)
index 1fa09bf..0000000
Binary files a/themes/images/nbeat-hd/00_button_EditStyle_dim.png and /dev/null differ
diff --git a/themes/images/nbeat-hd/00_button_EditStyle_press.png b/themes/images/nbeat-hd/00_button_EditStyle_press.png
deleted file mode 100644 (file)
index d47374e..0000000
Binary files a/themes/images/nbeat-hd/00_button_EditStyle_press.png and /dev/null differ
diff --git a/themes/images/nbeat-hd/00_button_delete.png b/themes/images/nbeat-hd/00_button_delete.png
deleted file mode 100644 (file)
index 96f514b..0000000
Binary files a/themes/images/nbeat-hd/00_button_delete.png and /dev/null differ
diff --git a/themes/images/nbeat-hd/00_button_delete_dim.png b/themes/images/nbeat-hd/00_button_delete_dim.png
deleted file mode 100644 (file)
index 59854c7..0000000
Binary files a/themes/images/nbeat-hd/00_button_delete_dim.png and /dev/null differ
diff --git a/themes/images/nbeat-hd/00_button_delete_press.png b/themes/images/nbeat-hd/00_button_delete_press.png
deleted file mode 100644 (file)
index be934ad..0000000
Binary files a/themes/images/nbeat-hd/00_button_delete_press.png and /dev/null differ
diff --git a/themes/images/nbeat-hd/00_button_delete_text.png b/themes/images/nbeat-hd/00_button_delete_text.png
deleted file mode 100644 (file)
index d8df523..0000000
Binary files a/themes/images/nbeat-hd/00_button_delete_text.png and /dev/null differ
diff --git a/themes/images/nbeat-hd/00_button_delete_text_press.png b/themes/images/nbeat-hd/00_button_delete_text_press.png
deleted file mode 100644 (file)
index ef5592a..0000000
Binary files a/themes/images/nbeat-hd/00_button_delete_text_press.png and /dev/null differ
diff --git a/themes/images/nbeat-hd/00_button_sweep_46.png b/themes/images/nbeat-hd/00_button_sweep_46.png
deleted file mode 100644 (file)
index 330aa39..0000000
Binary files a/themes/images/nbeat-hd/00_button_sweep_46.png and /dev/null differ
diff --git a/themes/images/nbeat-hd/00_button_sweep_46_dim.png b/themes/images/nbeat-hd/00_button_sweep_46_dim.png
deleted file mode 100644 (file)
index 8deec26..0000000
Binary files a/themes/images/nbeat-hd/00_button_sweep_46_dim.png and /dev/null differ
diff --git a/themes/images/nbeat-hd/00_button_sweep_46_focus.png b/themes/images/nbeat-hd/00_button_sweep_46_focus.png
deleted file mode 100644 (file)
index e41f0e9..0000000
Binary files a/themes/images/nbeat-hd/00_button_sweep_46_focus.png and /dev/null differ
diff --git a/themes/images/nbeat-hd/00_button_sweep_46_press.png b/themes/images/nbeat-hd/00_button_sweep_46_press.png
deleted file mode 100644 (file)
index 13e877a..0000000
Binary files a/themes/images/nbeat-hd/00_button_sweep_46_press.png and /dev/null differ
index 7cd92b9..15b43b0 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_btn_prev.png and b/themes/images/nbeat-hd/00_winset_btn_prev.png differ
index 8599454..822de9a 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_btn_prev_press.png and b/themes/images/nbeat-hd/00_winset_btn_prev_press.png differ
diff --git a/themes/images/nbeat/00_button_EditStyle.png b/themes/images/nbeat/00_button_EditStyle.png
deleted file mode 100644 (file)
index 582062e..0000000
Binary files a/themes/images/nbeat/00_button_EditStyle.png and /dev/null differ
diff --git a/themes/images/nbeat/00_button_EditStyle_dim.png b/themes/images/nbeat/00_button_EditStyle_dim.png
deleted file mode 100644 (file)
index 1fa09bf..0000000
Binary files a/themes/images/nbeat/00_button_EditStyle_dim.png and /dev/null differ
diff --git a/themes/images/nbeat/00_button_EditStyle_press.png b/themes/images/nbeat/00_button_EditStyle_press.png
deleted file mode 100644 (file)
index d47374e..0000000
Binary files a/themes/images/nbeat/00_button_EditStyle_press.png and /dev/null differ
diff --git a/themes/images/nbeat/00_button_delete.png b/themes/images/nbeat/00_button_delete.png
deleted file mode 100644 (file)
index 96f514b..0000000
Binary files a/themes/images/nbeat/00_button_delete.png and /dev/null differ
diff --git a/themes/images/nbeat/00_button_delete_dim.png b/themes/images/nbeat/00_button_delete_dim.png
deleted file mode 100644 (file)
index 59854c7..0000000
Binary files a/themes/images/nbeat/00_button_delete_dim.png and /dev/null differ
diff --git a/themes/images/nbeat/00_button_delete_press.png b/themes/images/nbeat/00_button_delete_press.png
deleted file mode 100644 (file)
index be934ad..0000000
Binary files a/themes/images/nbeat/00_button_delete_press.png and /dev/null differ
diff --git a/themes/images/nbeat/00_button_delete_text.png b/themes/images/nbeat/00_button_delete_text.png
deleted file mode 100644 (file)
index d8df523..0000000
Binary files a/themes/images/nbeat/00_button_delete_text.png and /dev/null differ
diff --git a/themes/images/nbeat/00_button_delete_text_press.png b/themes/images/nbeat/00_button_delete_text_press.png
deleted file mode 100644 (file)
index ef5592a..0000000
Binary files a/themes/images/nbeat/00_button_delete_text_press.png and /dev/null differ
diff --git a/themes/images/nbeat/00_button_sweep_46.png b/themes/images/nbeat/00_button_sweep_46.png
deleted file mode 100644 (file)
index 330aa39..0000000
Binary files a/themes/images/nbeat/00_button_sweep_46.png and /dev/null differ
diff --git a/themes/images/nbeat/00_button_sweep_46_dim.png b/themes/images/nbeat/00_button_sweep_46_dim.png
deleted file mode 100644 (file)
index 8deec26..0000000
Binary files a/themes/images/nbeat/00_button_sweep_46_dim.png and /dev/null differ
diff --git a/themes/images/nbeat/00_button_sweep_46_focus.png b/themes/images/nbeat/00_button_sweep_46_focus.png
deleted file mode 100644 (file)
index e41f0e9..0000000
Binary files a/themes/images/nbeat/00_button_sweep_46_focus.png and /dev/null differ
diff --git a/themes/images/nbeat/00_button_sweep_46_press.png b/themes/images/nbeat/00_button_sweep_46_press.png
deleted file mode 100644 (file)
index 13e877a..0000000
Binary files a/themes/images/nbeat/00_button_sweep_46_press.png and /dev/null differ
index efc4f65..52e4220 100644 (file)
 #define BUTTON_TEXT_STYLE1_BG_BORDER_INC 5 5 5 5
 #define BUTTON_TEXT_STYLE1_PADDING_MIN_INC 5 5
 #define BUTTON_TEXT_STYLE1_VISIBLE_ICON_RECT_MIN_MAX_INC 38 38
-#define BUTTON_TEXT_STYLE1_DEFAULT_PADDING_AFTER_ICON_MIN_INC 0 0
-#define BUTTON_TEXT_STYLE1_VISIBLE_PADDING_AFTER_ICON_MIN_INC 10 0
-#define BUTTON_TEXT_STYLE1_VISIBLE_PADDING_BEFORE_TEXT_MIN_INC 10 0
+#define BUTTON_TEXT_STYLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC 10 0
 #define BUTTON_TEXT_STYLE1_VISIBLE_ICON_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE1_FONT_SIZE_INC 32
 #define BUTTON_TEXT_STYLE2_BG_BORDER_INC 5 5 5 5
 #define BUTTON_TEXT_STYLE2_PADDING_MIN_INC 5 5
 #define BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC 38 38
-#define BUTTON_TEXT_STYLE2_DEFAULT_PADDING_AFTER_ICON_MIN_INC 0 0
-#define BUTTON_TEXT_STYLE2_VISIBLE_PADDING_AFTER_ICON_MIN_INC 10 0
-#define BUTTON_TEXT_STYLE2_VISIBLE_PADDING_BEFORE_TEXT_MIN_INC 10 0
+#define BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC 10 0
 #define BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE2_FONT_SIZE_INC 32
 #define BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC 64 64
 #define BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC 64 64
 
-#define BUTTON_POPUP_BG_NORMAL_MIN_INC 30 46
+#define BUTTON_POPUP_BG_NORMAL_MIN_INC 30 74
 #define BUTTON_POPUP_BG_BORDER_INC 5 5 5 5
 #define BUTTON_POPUP_PADDING_MIN_INC 8 5
 #define BUTTON_POPUP_PADDING_ICON_TEXT_VISIBLE_MIN_INC 8 0
 #define BUTTON_POPUP_ICON_ICONONLY_MIN_INC 38 38
-#define BUTTON_POPUP_TEXT_MIN_INC 90 20
+#define BUTTON_POPUP_TEXT_MIN_INC 90 64
 
 #define BUTTON_EDIT_STYLE_BG_NORMAL_MIN_MAX_INC 74 74
 #define BUTTON_EDIT_STYLE_IMAGE_NORMAL_MIN_MAX_INC 74 74
 #define BUTTON_NAVIBAR_RIGHT_SWALLOW_ICONONLY_MIN_MAX_INC 38 38
 #define BUTTON_NAVIBAR_RIGHT_TEXT_FONT_SIZE_INC 32
 
+#define BUTTON_TICKERNOTI_BG_MIN_INC 54 54
+#define BUTTON_TICKERNOTI_VISIBLE_BG_MIN_INC 62 34
+#define BUTTON_TICKERNOTI_ICONONLY_BG_MIN_INC 54 54
+#define BUTTON_TICKERNOTI_BG_BORDER_INC 5 5 5 5
+#define BUTTON_TICKERNOTI_PADDING_MIN_INC 5 5
+#define BUTTON_TICKERNOTI_VISIBLE_ICON_RECT_MIN_MAX_INC 44 44
+#define BUTTON_TICKERNOTI_VISIBLE_PADDING_ICON_TEXT_MIN_INC 8 0
+#define BUTTON_TICKERNOTI_VISIBLE_ICON_MIN_MAX_INC 44 44
+#define BUTTON_TICKERNOTI_ICONONLY_ICON_MIN_MAX_INC 44 44
+#define BUTTON_TICKERNOTI_FONT_SIZE_INC 28
+
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_BG_DEFAULT_MIN_INC 74 66
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_BG_DEFAULT_BORDER_INC 5 5 5 5
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_PADDING_MIN_INC 10 5
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_ICON_RECT_MIN_INC 0 56
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_PADDING_ICON_RECT_TEXT_MIN_INC 5 0
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_CONTENT_ICON_ONLY_MIN_INC 56 56
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_TEXT_FONT_SIZE_INC 32
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_TEXT_VISIBLE_MIN_INC 96 56
+
+#define BUTTON_PICKER_PREV_ICON_DEFAULT_BG_DEFAULT_MIN_MAX_INC 74 66
+#define BUTTON_PICKER_PREV_ICON_DEFAULT_BG_DEFAULT_BORDER_INC 5 5 5 5
+#define BUTTON_PICKER_PREV_ICON_DEFAULT_PADDING_MIN_INC 5 5
+#define BUTTON_PICKER_PREV_ICON_DEFAULT_IMAGE_MIN_MAX_INC 32 32
+
+#define BUTTON_PICKER_BAR_DEFAULT_BG_DEFAULT_MIN_INC 74 66
+#define BUTTON_PICKER_BAR_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC 5 5 5 5
+#define BUTTON_PICKER_BAR_DEFAULT_PADDING_MIN_INC 5 5
+#define BUTTON_PICKER_BAR_DEFAULT_ICON_RECT_DEFAULT_MIN_INC 0 56
+#define BUTTON_PICKER_BAR_DEFAULT_PADDING_ICON_RECT_TEXT_MIN_INC 5 0
+#define BUTTON_PICKER_BAR_DEFAULT_CONTENT_ICONONLY_MIN_INC 56 56
+#define BUTTON_PICKER_BAR_DEFAULT_TEXT_FONT_SIZE_INC 32
+#define BUTTON_PICKER_BAR_DEFAULT_TEXT_VISIBLE_MIN_INC 128 56
+
 #define CHECK_DELETE_TEXT_DELETE_NORMAL_COLOR_INC 205 2 5 255
 #define CHECK_DELETE_TEXT_DELETE_PRESS_COLOR_INC 255 255 255 255
 
 #define CHECK_ONOFF_BG_NORMAL_MIN_MAX_INC 60 80
 #define CHECK_ONOFF_CHECK_IMAGE_BORDER_INC 5 5 5 5
-#define CHECK_ONOFF_ON_FONT_SIZE_INC 20
-#define CHECK_ONOFF_OFF_FONT_SIZE_INC 20
+#define CHECK_ONOFF_ON_FONT_SIZE_INC 24
+#define CHECK_ONOFF_OFF_FONT_SIZE_INC 24
 
 #define CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_WIDTH_INC 64
 #define CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC 64
 #define CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MIN_HEIGHT_INC 75
 #define CHECK_STYLE_DEFAULT_BG_NORMAL_MIN_MAX_INC 42 42
 
+#define CHECK_STYLE_DELETE_BUTTON_BG_IMAGE_MIN_MAX_WIDTH_INC 74 74
+#define CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_IMAGE_MIN_MAX_WIDTH_INC 124 74
+#define CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_BORDER_INC 8 0 5 5
+#define CHECK_STYLE_DELETE_BUTTON_TEXT_FONT_SIZE_INC 32
+
 #define RADIO_STYLE_DEFAULT_BG_IMAGE_MIN_WIDTH_INC 42
 #define RADIO_STYLE_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC 42
 #define RADIO_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MIN_WIDTH_INC 50
 #define EDITFIELD_SEARCHBAR_BOTTOM3_SINGLE_INC 50
 #define EDITFIELD_SEARCHBAR_BOTTOM3_MULTI_INC 50
 
-#define BUTTON_TEXT_TICKERNOTI_NORMAL_COLOR_INC        249 249 249 255
-#define BUTTON_TEXT_TICKERNOTI_DISABLED_COLOR_INC         185 185 185 255
+#define BUTTON_TICKERNOTI_NORMAL_COLOR_INC        249 249 249 255
+#define BUTTON_TICKERNOTI_PRESSED_COLOR_INC       249 249 249 255
+#define BUTTON_TICKERNOTI_DISABLED_COLOR_INC      185 185 185 255
 
 #define CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC        255 255 255 255
 #define CHECK_DEFAULT_TEXT_PRESSED_COLOR_INC      0 0 0 255
 #define TICKERNOTI_DEFAULT_BG_PADDING_LEFT_TOP_INC 10 8
 #define TICKERNOTI_DEFAULT_BG_PADDING_RIGHT_BOTTOM_INC 10 16
 #define TICKERNOTI_DEFAULT_PADDING_AFTER_ICON_INC 15 0
-#define TICKERNOTI_DEFAULT_BUTTON_MIN_INC 90 74
-#define TICKERNOTI_DEFAULT_BUTTON_MAX_INC 90 34
-#define TICKERNOTI_DEFAULT_ICON_MIN_INC 74 74
+#define TICKERNOTI_DEFAULT_BUTTON_MIN_INC 90 54
+#define TICKERNOTI_DEFAULT_BUTTON_MAX_INC 90 54
+#define TICKERNOTI_DEFAULT_ICON_MIN_INC 64 64
 #define TICKERNOTI_DEFAULT_PADDING_BEFORE_BUTTON_INC 5 0
 #define TICKERNOTI_DEFAULT_TEXT_FONT_SIZE_INC 30
 #define TICKERNOTI_INFO_BG_MIN_HEIGHT_INC 50
index 1c164a2..7fa1733 100644 (file)
 #define BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC 249 249 249 255
 #define BUTTON_SWEEP_BUTTON_TEXT_PRESSED_COLOR_INC 249 249 249 255
 #define BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC 249 249 249 255
-#define BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC                    0 0 0 255
+#define BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC 0 0 0 255
 
 #define BUTTON_CONTACT_BUTTON_BG_NORMAL_COLOR_INC 42 109 140 255
 #define BUTTON_CONTACT_BUTTON_BG_PRESSED_COLOR_INC 64 182 237 255
 #define BUTTON_TEXT_STYLE1_BG_BORDER_INC 4 4 3 3
 #define BUTTON_TEXT_STYLE1_PADDING_MIN_INC 5 5
 #define BUTTON_TEXT_STYLE1_VISIBLE_ICON_RECT_MIN_MAX_INC 24 24
-#define BUTTON_TEXT_STYLE1_DEFAULT_PADDING_AFTER_ICON_MIN_INC 0 0
-#define BUTTON_TEXT_STYLE1_VISIBLE_PADDING_AFTER_ICON_MIN_INC 8 0
-#define BUTTON_TEXT_STYLE1_VISIBLE_PADDING_BEFORE_TEXT_MIN_INC 8 0
+#define BUTTON_TEXT_STYLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC 8 0
 #define BUTTON_TEXT_STYLE1_VISIBLE_ICON_MIN_MAX_INC 24 24
 #define BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC 30 30
 #define BUTTON_TEXT_STYLE1_FONT_SIZE_INC 20
 #define BUTTON_TEXT_STYLE2_BG_BORDER_INC 4 4 3 3
 #define BUTTON_TEXT_STYLE2_PADDING_MIN_INC 5 5
 #define BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC 24 24
-#define BUTTON_TEXT_STYLE2_DEFAULT_PADDING_AFTER_ICON_MIN_INC 0 0
-#define BUTTON_TEXT_STYLE2_VISIBLE_PADDING_AFTER_ICON_MIN_INC 8 0
-#define BUTTON_TEXT_STYLE2_VISIBLE_PADDING_BEFORE_TEXT_MIN_INC 8 0
+#define BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC 8 0
 #define BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC 24 24
 #define BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC 30 30
 #define BUTTON_TEXT_STYLE2_FONT_SIZE_INC 20
 #define BUTTON_NAVIBAR_RIGHT_SWALLOW_ICONONLY_MIN_MAX_INC 30 30
 #define BUTTON_NAVIBAR_RIGHT_TEXT_FONT_SIZE_INC 20
 
+#define BUTTON_TICKERNOTI_BG_MIN_INC 34 34
+#define BUTTON_TICKERNOTI_VISIBLE_BG_MIN_INC 42 34
+#define BUTTON_TICKERNOTI_ICONONLY_BG_MIN_INC 34 34
+#define BUTTON_TICKERNOTI_BG_BORDER_INC 4 4 4 4
+#define BUTTON_TICKERNOTI_PADDING_MIN_INC 5 5
+#define BUTTON_TICKERNOTI_VISIBLE_ICON_RECT_MIN_MAX_INC 24 24
+#define BUTTON_TICKERNOTI_VISIBLE_PADDING_ICON_TEXT_MIN_INC 8 0
+#define BUTTON_TICKERNOTI_VISIBLE_ICON_MIN_MAX_INC 24 24
+#define BUTTON_TICKERNOTI_ICONONLY_ICON_MIN_MAX_INC 30 30
+#define BUTTON_TICKERNOTI_FONT_SIZE_INC 20
+
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_BG_DEFAULT_MIN_INC 46 42
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_BG_DEFAULT_BORDER_INC 4 4 4 4
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_PADDING_MIN_INC 10 5
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_ICON_RECT_MIN_INC 0 32
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_PADDING_ICON_RECT_TEXT_MIN_INC 5 0
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_CONTENT_ICON_ONLY_MIN_INC 32 32
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_TEXT_FONT_SIZE_INC 20
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_TEXT_VISIBLE_MIN_INC 60 32
+
+#define BUTTON_PICKER_PREV_ICON_DEFAULT_BG_DEFAULT_MIN_MAX_INC 46 42
+#define BUTTON_PICKER_PREV_ICON_DEFAULT_BG_DEFAULT_BORDER_INC 4 4 4 4
+#define BUTTON_PICKER_PREV_ICON_DEFAULT_PADDING_MIN_INC 5 5
+#define BUTTON_PICKER_PREV_ICON_DEFAULT_IMAGE_MIN_MAX_INC 20 20
+
+#define BUTTON_PICKER_BAR_DEFAULT_BG_DEFAULT_MIN_INC 46 42
+#define BUTTON_PICKER_BAR_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC 4 4 4 4
+#define BUTTON_PICKER_BAR_DEFAULT_PADDING_MIN_INC 5 5
+#define BUTTON_PICKER_BAR_DEFAULT_ICON_RECT_DEFAULT_MIN_INC 0 32
+#define BUTTON_PICKER_BAR_DEFAULT_PADDING_ICON_RECT_TEXT_MIN_INC 5 0
+#define BUTTON_PICKER_BAR_DEFAULT_CONTENT_ICONONLY_MIN_INC 32 32
+#define BUTTON_PICKER_BAR_DEFAULT_TEXT_FONT_SIZE_INC 20
+#define BUTTON_PICKER_BAR_DEFAULT_TEXT_VISIBLE_MIN_INC 80 32
+
 #define CHECK_DELETE_TEXT_DELETE_NORMAL_COLOR_INC 205 2 5 255
 #define CHECK_DELETE_TEXT_DELETE_PRESS_COLOR_INC 255 255 255 255
 
 #define CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MIN_HEIGHT_INC 75
 #define CHECK_STYLE_DEFAULT_BG_NORMAL_MIN_MAX_INC 26 26
 
+#define CHECK_STYLE_DELETE_BUTTON_BG_IMAGE_MIN_MAX_WIDTH_INC 46 46
+#define CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_IMAGE_MIN_MAX_WIDTH_INC 74 46
+#define CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_BORDER_INC 8 0 3 3
+#define CHECK_STYLE_DELETE_BUTTON_TEXT_FONT_SIZE_INC 20
+
 #define RADIO_STYLE_DEFAULT_BG_IMAGE_MIN_WIDTH_INC 26
 #define RADIO_STYLE_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC 26
 #define RADIO_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MIN_WIDTH_INC 50
 #define EDITFIELD_SEARCHBAR_BOTTOM3_SINGLE_INC 60
 #define EDITFIELD_SEARCHBAR_BOTTOM3_MULTI_INC 50
 
-#define BUTTON_TEXT_TICKERNOTI_NORMAL_COLOR_INC        249 249 249 255
-#define BUTTON_TEXT_TICKERNOTI_DISABLED_COLOR_INC         185 185 185 255
+#define BUTTON_TICKERNOTI_NORMAL_COLOR_INC        249 249 249 255
+#define BUTTON_TICKERNOTI_PRESSED_COLOR_INC       249 249 249 255
+#define BUTTON_TICKERNOTI_DISABLED_COLOR_INC      185 185 185 255
 
 #define CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC        255 255 255 255
 #define CHECK_DEFAULT_TEXT_PRESSED_COLOR_INC      0 0 0 255
index dfe5c94..2932725 100644 (file)
 #define BUTTON_TEXT_STYLE1_BG_BORDER_INC 5 5 5 5
 #define BUTTON_TEXT_STYLE1_PADDING_MIN_INC 5 5
 #define BUTTON_TEXT_STYLE1_VISIBLE_ICON_RECT_MIN_MAX_INC 38 38
-#define BUTTON_TEXT_STYLE1_DEFAULT_PADDING_AFTER_ICON_MIN_INC 0 0
-#define BUTTON_TEXT_STYLE1_VISIBLE_PADDING_AFTER_ICON_MIN_INC 10 0
-#define BUTTON_TEXT_STYLE1_VISIBLE_PADDING_BEFORE_TEXT_MIN_INC 10 0
+#define BUTTON_TEXT_STYLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC 10 0
 #define BUTTON_TEXT_STYLE1_VISIBLE_ICON_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE1_FONT_SIZE_INC 32
 #define BUTTON_TEXT_STYLE2_BG_BORDER_INC 5 5 5 5
 #define BUTTON_TEXT_STYLE2_PADDING_MIN_INC 5 5
 #define BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC 38 38
-#define BUTTON_TEXT_STYLE2_DEFAULT_PADDING_AFTER_ICON_MIN_INC 0 0
-#define BUTTON_TEXT_STYLE2_VISIBLE_PADDING_AFTER_ICON_MIN_INC 10 0
-#define BUTTON_TEXT_STYLE2_VISIBLE_PADDING_BEFORE_TEXT_MIN_INC 10 0
+#define BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC 10 0
 #define BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE2_FONT_SIZE_INC 32
 #define BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC 64 64
 #define BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC 64 64
 
-#define BUTTON_POPUP_BG_NORMAL_MIN_INC 30 46
+#define BUTTON_POPUP_BG_NORMAL_MIN_INC 30 74
 #define BUTTON_POPUP_BG_BORDER_INC 5 5 5 5
 #define BUTTON_POPUP_PADDING_MIN_INC 8 5
 #define BUTTON_POPUP_PADDING_ICON_TEXT_VISIBLE_MIN_INC 8 0
 #define BUTTON_POPUP_ICON_ICONONLY_MIN_INC 38 38
-#define BUTTON_POPUP_TEXT_MIN_INC 90 20
+#define BUTTON_POPUP_TEXT_MIN_INC 90 64
 
 #define BUTTON_EDIT_STYLE_BG_NORMAL_MIN_MAX_INC 74 74
 #define BUTTON_EDIT_STYLE_IMAGE_NORMAL_MIN_MAX_INC 74 74
 #define BUTTON_NAVIBAR_RIGHT_SWALLOW_ICONONLY_MIN_MAX_INC 38 38
 #define BUTTON_NAVIBAR_RIGHT_TEXT_FONT_SIZE_INC 32
 
+#define BUTTON_TICKERNOTI_BG_MIN_INC 54 54
+#define BUTTON_TICKERNOTI_VISIBLE_BG_MIN_INC 62 34
+#define BUTTON_TICKERNOTI_ICONONLY_BG_MIN_INC 54 54
+#define BUTTON_TICKERNOTI_BG_BORDER_INC 5 5 5 5
+#define BUTTON_TICKERNOTI_PADDING_MIN_INC 5 5
+#define BUTTON_TICKERNOTI_VISIBLE_ICON_RECT_MIN_MAX_INC 44 44
+#define BUTTON_TICKERNOTI_VISIBLE_PADDING_ICON_TEXT_MIN_INC 8 0
+#define BUTTON_TICKERNOTI_VISIBLE_ICON_MIN_MAX_INC 44 44
+#define BUTTON_TICKERNOTI_ICONONLY_ICON_MIN_MAX_INC 44 44
+#define BUTTON_TICKERNOTI_FONT_SIZE_INC 28
+
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_BG_DEFAULT_MIN_INC 74 66
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_BG_DEFAULT_BORDER_INC 5 5 5 5
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_PADDING_MIN_INC 16 5
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_ICON_RECT_MIN_INC 0 56
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_PADDING_ICON_RECT_TEXT_MIN_INC 5 0
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_CONTENT_ICON_ONLY_MIN_INC 56 56
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_TEXT_FONT_SIZE_INC 32
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_TEXT_VISIBLE_MIN_INC 96 56
+
+#define BUTTON_PICKER_PREV_ICON_DEFAULT_BG_DEFAULT_MIN_MAX_INC 74 66
+#define BUTTON_PICKER_PREV_ICON_DEFAULT_BG_DEFAULT_BORDER_INC 5 5 5 5
+#define BUTTON_PICKER_PREV_ICON_DEFAULT_PADDING_MIN_INC 5 5
+#define BUTTON_PICKER_PREV_ICON_DEFAULT_IMAGE_MIN_MAX_INC 32 32
+
+#define BUTTON_PICKER_BAR_DEFAULT_BG_DEFAULT_MIN_INC 74 66
+#define BUTTON_PICKER_BAR_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC 5 5 5 5
+#define BUTTON_PICKER_BAR_DEFAULT_PADDING_MIN_INC 5 5
+#define BUTTON_PICKER_BAR_DEFAULT_ICON_RECT_DEFAULT_MIN_INC 0 56
+#define BUTTON_PICKER_BAR_DEFAULT_PADDING_ICON_RECT_TEXT_MIN_INC 5 0
+#define BUTTON_PICKER_BAR_DEFAULT_CONTENT_ICONONLY_MIN_INC 56 56
+#define BUTTON_PICKER_BAR_DEFAULT_TEXT_FONT_SIZE_INC 32
+#define BUTTON_PICKER_BAR_DEFAULT_TEXT_VISIBLE_MIN_INC 128 56
+
 #define CHECK_DELETE_TEXT_DELETE_NORMAL_COLOR_INC 207 41 41 255
 #define CHECK_DELETE_TEXT_DELETE_PRESS_COLOR_INC 255 255 255 255
 
 #define CHECK_ONOFF_BG_NORMAL_MIN_MAX_INC 60 80
 #define CHECK_ONOFF_CHECK_IMAGE_BORDER_INC 5 5 5 5
-#define CHECK_ONOFF_ON_FONT_SIZE_INC 20
-#define CHECK_ONOFF_OFF_FONT_SIZE_INC 20
+#define CHECK_ONOFF_ON_FONT_SIZE_INC 24
+#define CHECK_ONOFF_OFF_FONT_SIZE_INC 24
 
 #define CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_WIDTH_INC 64
 #define CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC 64
 #define CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MIN_HEIGHT_INC 75
 #define CHECK_STYLE_DEFAULT_BG_NORMAL_MIN_MAX_INC 42 42
 
+#define CHECK_STYLE_DELETE_BUTTON_BG_IMAGE_MIN_MAX_WIDTH_INC 74 74
+#define CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_IMAGE_MIN_MAX_WIDTH_INC 124 74
+#define CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_BORDER_INC 8 0 5 5
+#define CHECK_STYLE_DELETE_BUTTON_TEXT_FONT_SIZE_INC 32
+
 #define RADIO_STYLE_DEFAULT_BG_IMAGE_MIN_WIDTH_INC 42
 #define RADIO_STYLE_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC 42
 #define RADIO_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MIN_WIDTH_INC 50
 #define EDITFIELD_SEARCHBAR_BOTTOM3_SINGLE_INC 50
 #define EDITFIELD_SEARCHBAR_BOTTOM3_MULTI_INC 50
 
-#define BUTTON_TEXT_TICKERNOTI_NORMAL_COLOR_INC        255 255 255 255
-#define BUTTON_TEXT_TICKERNOTI_DISABLED_COLOR_INC         185 185 185 255
+#define BUTTON_TICKERNOTI_NORMAL_COLOR_INC        255 255 255 255
+#define BUTTON_TICKERNOTI_PRESSED_COLOR_INC       255 255 255 255
+#define BUTTON_TICKERNOTI_DISABLED_COLOR_INC      185 185 185 255
 
 #define CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC        0 0 0 255
 #define CHECK_DEFAULT_TEXT_PRESSED_COLOR_INC      255 255 255 255
 #define TICKERNOTI_DEFAULT_BG_PADDING_LEFT_TOP_INC 10 8
 #define TICKERNOTI_DEFAULT_BG_PADDING_RIGHT_BOTTOM_INC 10 16
 #define TICKERNOTI_DEFAULT_PADDING_AFTER_ICON_INC 15 0
-#define TICKERNOTI_DEFAULT_BUTTON_MIN_INC 90 74
-#define TICKERNOTI_DEFAULT_BUTTON_MAX_INC 90 34
-#define TICKERNOTI_DEFAULT_ICON_MIN_INC 74 74
+#define TICKERNOTI_DEFAULT_BUTTON_MIN_INC 90 54
+#define TICKERNOTI_DEFAULT_BUTTON_MAX_INC 90 54
+#define TICKERNOTI_DEFAULT_ICON_MIN_INC 64 64
 #define TICKERNOTI_DEFAULT_PADDING_BEFORE_BUTTON_INC 5 0
 #define TICKERNOTI_DEFAULT_TEXT_FONT_SIZE_INC 30
 #define TICKERNOTI_INFO_BG_MIN_HEIGHT_INC 50
index 2d2d428..3e98695 100644 (file)
 #define BUTTON_TEXT_STYLE1_BG_BORDER_INC 4 4 3 3
 #define BUTTON_TEXT_STYLE1_PADDING_MIN_INC 5 5
 #define BUTTON_TEXT_STYLE1_VISIBLE_ICON_RECT_MIN_MAX_INC 24 24
-#define BUTTON_TEXT_STYLE1_DEFAULT_PADDING_AFTER_ICON_MIN_INC 0 0
-#define BUTTON_TEXT_STYLE1_VISIBLE_PADDING_AFTER_ICON_MIN_INC 8 0
-#define BUTTON_TEXT_STYLE1_VISIBLE_PADDING_BEFORE_TEXT_MIN_INC 8 0
+#define BUTTON_TEXT_STYLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC 8 0
 #define BUTTON_TEXT_STYLE1_VISIBLE_ICON_MIN_MAX_INC 24 24
 #define BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC 30 30
 #define BUTTON_TEXT_STYLE1_FONT_SIZE_INC 20
 #define BUTTON_TEXT_STYLE2_BG_BORDER_INC 4 4 3 3
 #define BUTTON_TEXT_STYLE2_PADDING_MIN_INC 5 5
 #define BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC 24 24
-#define BUTTON_TEXT_STYLE2_DEFAULT_PADDING_AFTER_ICON_MIN_INC 0 0
-#define BUTTON_TEXT_STYLE2_VISIBLE_PADDING_AFTER_ICON_MIN_INC 8 0
-#define BUTTON_TEXT_STYLE2_VISIBLE_PADDING_BEFORE_TEXT_MIN_INC 8 0
+#define BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC 8 0
 #define BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC 24 24
 #define BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC 30 30
 #define BUTTON_TEXT_STYLE2_FONT_SIZE_INC 20
 #define BUTTON_NAVIBAR_RIGHT_SWALLOW_ICONONLY_MIN_MAX_INC 30 30
 #define BUTTON_NAVIBAR_RIGHT_TEXT_FONT_SIZE_INC 20
 
+#define BUTTON_TICKERNOTI_BG_MIN_INC 34 34
+#define BUTTON_TICKERNOTI_VISIBLE_BG_MIN_INC 42 34
+#define BUTTON_TICKERNOTI_ICONONLY_BG_MIN_INC 34 34
+#define BUTTON_TICKERNOTI_BG_BORDER_INC 4 4 4 4
+#define BUTTON_TICKERNOTI_PADDING_MIN_INC 5 5
+#define BUTTON_TICKERNOTI_VISIBLE_ICON_RECT_MIN_MAX_INC 24 24
+#define BUTTON_TICKERNOTI_VISIBLE_PADDING_ICON_TEXT_MIN_INC 8 0
+#define BUTTON_TICKERNOTI_VISIBLE_ICON_MIN_MAX_INC 24 24
+#define BUTTON_TICKERNOTI_ICONONLY_ICON_MIN_MAX_INC 30 30
+#define BUTTON_TICKERNOTI_FONT_SIZE_INC 20
+
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_BG_DEFAULT_MIN_INC 46 42
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_BG_DEFAULT_BORDER_INC 4 4 4 4
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_PADDING_MIN_INC 10 5
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_ICON_RECT_MIN_INC 0 32
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_PADDING_ICON_RECT_TEXT_MIN_INC 5 0
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_CONTENT_ICON_ONLY_MIN_INC 32 32
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_TEXT_FONT_SIZE_INC 20
+#define BUTTON_PICKER_PREV_TEXT_DEFAULT_TEXT_VISIBLE_MIN_INC 60 32
+
+#define BUTTON_PICKER_PREV_ICON_DEFAULT_BG_DEFAULT_MIN_MAX_INC 46 42
+#define BUTTON_PICKER_PREV_ICON_DEFAULT_BG_DEFAULT_BORDER_INC 4 4 4 4
+#define BUTTON_PICKER_PREV_ICON_DEFAULT_PADDING_MIN_INC 5 5
+#define BUTTON_PICKER_PREV_ICON_DEFAULT_IMAGE_MIN_MAX_INC 20 20
+
+#define BUTTON_PICKER_BAR_DEFAULT_BG_DEFAULT_MIN_INC 46 42
+#define BUTTON_PICKER_BAR_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC 4 4 4 4
+#define BUTTON_PICKER_BAR_DEFAULT_PADDING_MIN_INC 5 5
+#define BUTTON_PICKER_BAR_DEFAULT_ICON_RECT_DEFAULT_MIN_INC 0 32
+#define BUTTON_PICKER_BAR_DEFAULT_PADDING_ICON_RECT_TEXT_MIN_INC 5 0
+#define BUTTON_PICKER_BAR_DEFAULT_CONTENT_ICONONLY_MIN_INC 32 32
+#define BUTTON_PICKER_BAR_DEFAULT_TEXT_FONT_SIZE_INC 20
+#define BUTTON_PICKER_BAR_DEFAULT_TEXT_VISIBLE_MIN_INC 80 32
+
 #define CHECK_DELETE_TEXT_DELETE_NORMAL_COLOR_INC 207 41 41 255
 #define CHECK_DELETE_TEXT_DELETE_PRESS_COLOR_INC 255 255 255 255
 
 #define CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MIN_HEIGHT_INC 75
 #define CHECK_STYLE_DEFAULT_BG_NORMAL_MIN_MAX_INC 26 26
 
+#define CHECK_STYLE_DELETE_BUTTON_BG_IMAGE_MIN_MAX_WIDTH_INC 46 46
+#define CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_IMAGE_MIN_MAX_WIDTH_INC 74 46
+#define CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_BORDER_INC 8 0 3 3
+#define CHECK_STYLE_DELETE_BUTTON_TEXT_FONT_SIZE_INC 20
+
 #define RADIO_STYLE_DEFAULT_BG_IMAGE_MIN_WIDTH_INC 26
 #define RADIO_STYLE_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC 26
 #define RADIO_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MIN_WIDTH_INC 50
 #define EDITFIELD_SEARCHBAR_BOTTOM3_SINGLE_INC 60
 #define EDITFIELD_SEARCHBAR_BOTTOM3_MULTI_INC 50
 
-#define BUTTON_TEXT_TICKERNOTI_NORMAL_COLOR_INC        255 255 255 255
-#define BUTTON_TEXT_TICKERNOTI_DISABLED_COLOR_INC         185 185 185 255
+#define BUTTON_TICKERNOTI_NORMAL_COLOR_INC        255 255 255 255
+#define BUTTON_TICKERNOTI_PRESSED_COLOR_INC       255 255 255 255
+#define BUTTON_TICKERNOTI_DISABLED_COLOR_INC      185 185 185 255
 
 #define CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC        0 0 0 255
 #define CHECK_DEFAULT_TEXT_PRESSED_COLOR_INC      255 255 255 255