Merge "[white space removed][Merge conflict resolved] [elm_navigationabar_ex]: 1...
authorShilpa Singh <shilpa.singh@samsung.com>
Fri, 1 Apr 2011 05:28:35 +0000 (14:28 +0900)
committerGerrit Code Review <git@Maetan>
Fri, 1 Apr 2011 05:28:35 +0000 (14:28 +0900)
62 files changed:
debian/changelog
themes/groups/button.edc
themes/groups/check.edc
themes/groups/radio.edc
themes/images/nbeat-black/00_btn_circle_bg_normal.png [new file with mode: 0644]
themes/images/nbeat-black/00_btn_circle_bg_press.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_call.png
themes/images/nbeat-black/00_button_call_press.png
themes/images/nbeat-black/00_button_cancel.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_cancel_press.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_expand_closed.png
themes/images/nbeat-black/00_button_expand_closed_press.png
themes/images/nbeat-black/00_button_expand_opened.png
themes/images/nbeat-black/00_button_expand_opened_press.png
themes/images/nbeat-black/00_button_info.png
themes/images/nbeat-black/00_button_info_press.png
themes/images/nbeat-black/00_button_minus.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_minus_press.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_plus.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_plus_press.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_radio_normal1.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_radio_normal2.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_radio_press1.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_radio_press2.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_rename.png
themes/images/nbeat-black/00_button_rename_press.png
themes/images/nbeat-black/00_button_reveal.png
themes/images/nbeat-black/00_button_reveal_press.png
themes/images/nbeat-black/00_button_send.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_send_press.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_warning.png
themes/images/nbeat-black/00_button_warning_press.png
themes/images/nbeat-black/00_check_bg_press.png
themes/images/nbeat/00_btn_circle_bg_normal.png [new file with mode: 0644]
themes/images/nbeat/00_btn_circle_bg_press.png [new file with mode: 0644]
themes/images/nbeat/00_button_call.png
themes/images/nbeat/00_button_call_press.png
themes/images/nbeat/00_button_cancel.png [new file with mode: 0644]
themes/images/nbeat/00_button_cancel_press.png [new file with mode: 0644]
themes/images/nbeat/00_button_expand_closed.png [changed mode: 0755->0644]
themes/images/nbeat/00_button_expand_closed_press.png [changed mode: 0755->0644]
themes/images/nbeat/00_button_expand_opened.png [changed mode: 0755->0644]
themes/images/nbeat/00_button_expand_opened_press.png [changed mode: 0755->0644]
themes/images/nbeat/00_button_info.png
themes/images/nbeat/00_button_info_press.png
themes/images/nbeat/00_button_minus.png [new file with mode: 0644]
themes/images/nbeat/00_button_minus_press.png [new file with mode: 0644]
themes/images/nbeat/00_button_plus.png [new file with mode: 0644]
themes/images/nbeat/00_button_plus_press.png [new file with mode: 0644]
themes/images/nbeat/00_button_radio_normal1.png [new file with mode: 0644]
themes/images/nbeat/00_button_radio_normal2.png [new file with mode: 0644]
themes/images/nbeat/00_button_radio_press1.png [new file with mode: 0644]
themes/images/nbeat/00_button_radio_press2.png [new file with mode: 0644]
themes/images/nbeat/00_button_rename.png
themes/images/nbeat/00_button_rename_press.png
themes/images/nbeat/00_button_reveal.png
themes/images/nbeat/00_button_reveal_press.png
themes/images/nbeat/00_button_send.png [new file with mode: 0644]
themes/images/nbeat/00_button_send_press.png [new file with mode: 0644]
themes/images/nbeat/00_button_warning.png
themes/images/nbeat/00_button_warning_press.png
themes/images/nbeat/00_check_bg_press.png

index 32d8074..5c6f74f 100644 (file)
@@ -1,3 +1,11 @@
+nbeat-theme (0.1.1-15) unstable; urgency=low
+
+  * Package upload
+  * Git: 165.213.180.234:slp/pkgs/n/nbeat-theme
+  * Tag: nbeat-theme_0.1.1-15
+
+ -- ChunEon Park <chuneon.park@samsung.com>  Thu, 31 Mar 2011 19:46:30 +0900
+
 nbeat-theme (0.1.1-14) unstable; urgency=low
 
   * Package upload
index 3df4663..35a6e6f 100644 (file)
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  */
+
+#define BUTTON_STATE_ENABLED  0
+#define BUTTON_STATE_DISABLED 1
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/text_only/style1";
+   group { name: "elm/button/base/style1";
+      alias: "elm/button/base/text_only/style1";
       images {
          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 = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
                color2: BUTTON_TEXT_STYLE1_DISABLED_SHAWDOW_COLOR_INC;
                color3: 0 0 0 0;
                visible: 1;
+               min: 90 36;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"icon_rect", "visible", 0.0);
                   set_state(PART:"padding_after_icon", "visible", 0.0);
                }
-               set_state(PART:"elm.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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/text_only/style2";
+   group { name: "elm/button/base/style2";
+      alias: "elm/button/base/text_only/style2";
       images {
          image: "00_button_04_normal.png" COMP;
          image: "00_button_04_press.png" COMP;
          image: "00_button_04_dim.png" COMP;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
                color2: BUTTON_TEXT_STYLE2_DISABLED_SHAWDOW_COLOR_INC;
                color3: 0 0 0 0;
                visible: 1;
+               min: 90 36;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"icon_rect", "visible", 0.0);
                   set_state(PART:"padding_after_icon", "visible", 0.0);
                }
-               set_state(PART:"elm.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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/text_only/style3";
+   group { name: "elm/button/base/style3";
+      alias: "elm/button/base/text_only/style3";
       images {
          image: "00_button_04_normal.png" COMP;
          image: "00_button_04_press.png" COMP;
          image: "00_button_04_dim.png" COMP;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
                color2: BUTTON_TEXT_STYLE3_DISABLED_SHAWDOW_COLOR_INC;
                color3: 0 0 0 0;
                visible: 1;
+               min: 90 65;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"elm.swallow.content", "visible", 0.0);
                   set_state(PART:"padding_icon_text", "visible", 0.0);
                }
-               set_state(PART:"elm.text", "visible", 0.0);
+               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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/text_only/sweep";
+   group { name: "elm/button/base/sweep";
+      alias: "elm/button/base/text_only/sweep";
       images {
          image: "00_button_sweep.png" COMP;
          image: "00_button_sweep_press.png" COMP;//focus image is missing, so using press
          image: "00_button_sweep_dim.png" COMP;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
                color2: BUTTON_SWEEP_BUTTON_TEXT_DISABLED_SHAWDOW_COLOR_INC;
                color3: 0 0 0 0;
                visible: 1;
+               min: 90 28;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"elm.swallow.content", "visible", 0.0);
                   set_state(PART:"padding_icon_text", "visible", 0.0);
                }
-               set_state(PART:"elm.text", "visible", 0.0);
+               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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
 
 ///////////////////////////////////////////////////////////////////////////////////////
 //Button style added for 2 line sweep in the list
-   group { name: "elm/button/base/text_only/sweep_46";
+   group { name: "elm/button/base/sweep_46";
+      alias: "elm/button/base/text_only/sweep_46";
       images {
          image: "00_button_sweep_46.png" COMP;
          image: "00_button_sweep_46_press.png" COMP;
          image: "00_button_sweep_46_dim.png" COMP;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
                color2: BUTTON_SWEEP_BUTTON_TEXT_DISABLED_SHAWDOW_COLOR_INC;
                color3: 0 0 0 0;
                visible: 1;
+               min: 90 36;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"elm.swallow.content", "visible", 0.0);
                   set_state(PART:"padding_icon_text", "visible", 0.0);
                }
-               set_state(PART:"elm.text", "visible", 0.0);
+               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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/text_only/title";
+   group { name: "elm/button/base/title";
+      alias: "elm/button/base/text_only/title";
       images {
          image: "00_button_02_normal.png" COMP;
          image: "00_button_02_press.png" COMP;
          image: "00_button_02_focus.png" COMP;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
                color: 0 0 0 128;
                color3: 0 0 0 0;
                visible: 1;
+               min: 90 40;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"elm.swallow.content", "visible", 0.0);
                   set_state(PART:"padding_icon_text", "visible", 0.0);
                }
-               set_state(PART:"elm.text", "visible", 0.0);
+               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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
       }
    }
 
-   ///////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/navigationbar_functionbutton/default";
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
                color2: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_DISABLED_SHADOW_COLOR_INC;
                color3: 0 0 0 0;
                visible: 1;
+               min: 80 40;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"elm.swallow.content", "visible", 0.0);
                   set_state(PART:"padding_icon_text", "visible", 0.0);
                }
-               set_state(PART:"elm.text", "visible", 0.0);
+               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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
                }
          }
          program { name: "focused";
    group { name: "elm/button/base/edit";
       alias: "elm/button/base/navigationbar_functionbutton/edit";
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
                color2: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_DISABLED_SHADOW_COLOR_INC;
                color3: 0 0 0 0;
                visible: 1;
+               min: 80 40;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"elm.swallow.content", "visible", 0.0);
                   set_state(PART:"padding_icon_text", "visible", 0.0);
                }
-               set_state(PART:"elm.text", "visible", 0.0);
+               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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
                }
          }
          program { name: "focused";
          image: "00_button_popup_dim.png" COMP;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
             color2: BUTTON_POPUP_BUTTON_TEXT_DISABLED_SHAWDOW_COLOR_INC;
             color3: 0 0 0 0;
             visible: 1;
+            min: 90 20;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
                emit("elm,action,default,text,set", "");
                set_state(PART:"elm.text", "visible", 0.0);
             }
-            if(get_int(button_state) !=1)
+            if(get_int(button_state) != BUTTON_STATE_DISABLED)
                set_state(PART:"button_image", "default", 0.0);
          }
          after: button_unpress;
                set_state(PART:"elm.swallow.content", "visible", 0.0);
                set_state(PART:"padding_icon_text", "visible", 0.0);
             }
-            set_state(PART:"elm.text", "visible", 0.0);
+            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";
                set_state(PART:"elm.text", "disabled_visible", 0.0);
             else
                set_state(PART:"elm.text", "disabled", 0.0);
-            set_int(button_state, 1);
+            set_int(button_state, BUTTON_STATE_DISABLED);
          }
       }
       program { name: "enable";
                set_state(PART:"elm.text", "visible", 0.0);
             else
                set_state(PART:"elm.text", "default", 0.0);
-            set_int(button_state, 0);
+            set_int(button_state, BUTTON_STATE_ENABLED);
          }
       }
       program { name: "focused";
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/expand/opened";
+   group { name: "elm/button/base/expand_2/opened";
       images {
-         image: "00_button_expand_opened.png" COMP;
-         image: "00_button_expand_opened_press.png" COMP;
-         image: "00_button_expand_opened_dim.png" COMP;
+         image: "00_button_expand_2_opened.png" COMP;
+         image: "00_button_expand_2_opened_press.png" COMP;
+         image: "00_button_expand_2_opened_dim.png" COMP;
       }
       parts {
          part { name: "button_image";
                min: 40 40;
                max: 40 40;
                image {
-                  normal: "00_button_expand_opened.png";
+                  normal: "00_button_expand_2_opened.png";
                }
             }
             description {
                state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_expand_opened_press.png";
+               image.normal: "00_button_expand_2_opened_press.png";
             }
             description {
                state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_expand_opened_dim.png";
+               image.normal: "00_button_expand_2_opened_dim.png";
             }
          }
          part { name: "over1";
       }
    }
 
-   group { name: "elm/button/base/expand/opened/extended";
+   group { name: "elm/button/base/expand_2/opened/extended";
       images {
-         image: "00_button_expand_opened.png" COMP;
-         image: "00_button_expand_opened_press.png" COMP;
-         image: "00_button_expand_opened_dim.png" COMP;
+         image: "00_button_expand_2_opened.png" COMP;
+         image: "00_button_expand_2_opened_press.png" COMP;
+         image: "00_button_expand_2_opened_dim.png" COMP;
       }
       parts {
          part { name: "button_image";
                min: 40 40;
                max: 40 40;
                image {
-                  normal: "00_button_expand_opened.png";
+                  normal: "00_button_expand_2_opened.png";
                }
             }
             description {
                state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_expand_opened_press.png";
+               image.normal: "00_button_expand_2_opened_press.png";
             }
             description {
                state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_expand_opened_dim.png";
+               image.normal: "00_button_expand_2_opened_dim.png";
             }
          }
          part { name: "over1";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/expand/closed";
+   group { name: "elm/button/base/expand_2/closed";
       images {
-         image: "00_button_expand_closed.png" COMP;
-         image: "00_button_expand_closed_press.png" COMP;
-         image: "00_button_expand_closed_dim.png" COMP;
+         image: "00_button_expand_2_closed.png" COMP;
+         image: "00_button_expand_2_closed_press.png" COMP;
+         image: "00_button_expand_2_closed_dim.png" COMP;
       }
       parts {
          part { name: "button_image";
                min: 40 40;
                max: 40 40;
                image {
-                  normal: "00_button_expand_closed.png";
+                  normal: "00_button_expand_2_closed.png";
                }
             }
             description {
                state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_expand_closed_press.png";
+               image.normal: "00_button_expand_2_closed_press.png";
             }
             description {
                state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_expand_closed_dim.png";
+               image.normal: "00_button_expand_2_closed_dim.png";
             }
          }
          part { name: "over1";
       }
    }
 
-   group { name: "elm/button/base/expand/closed/extended";
+   group { name: "elm/button/base/expand_2/closed/extended";
       images {
-         image: "00_button_expand_closed.png" COMP;
-         image: "00_button_expand_closed_press.png" COMP;
-         image: "00_button_expand_closed_dim.png" COMP;
+         image: "00_button_expand_2_closed.png" COMP;
+         image: "00_button_expand_2_closed_press.png" COMP;
+         image: "00_button_expand_2_closed_dim.png" COMP;
       }
       parts {
          part { name: "button_image";
                min: 40 40;
                max: 40 40;
                image {
-                  normal: "00_button_expand_closed.png";
+                  normal: "00_button_expand_2_closed.png";
                }
             }
             description {
                state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_expand_closed_press.png";
+               image.normal: "00_button_expand_2_closed_press.png";
             }
             description {
                state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_expand_closed_dim.png";
+               image.normal: "00_button_expand_2_closed_dim.png";
             }
          }
          part { name: "over1";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/expand_2/opened";
+#define BUTTON_CIRCLE_STYLES(style_name, image_normal, image_press, min_width, min_height) \
+   group { name: "elm/button/base/"style_name; \
+      images { \
+         image: "00_btn_circle_bg_normal.png" COMP; \
+         image: "00_btn_circle_bg_press.png" COMP; \
+         image: image_normal COMP; \
+         image: image_press COMP; \
+      } \
+      parts { \
+         part { name: "button_image"; \
+            mouse_events: 1; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: 40 40; \
+               max: 40 40; \
+               image { \
+                  normal: "00_btn_circle_bg_normal.png"; \
+               } \
+               color: 255 255 255 255; \
+            } \
+            description { \
+               state: "clicked" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_btn_circle_bg_press.png"; \
+            } \
+            description { \
+               state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               color: 255 255 255 128; \
+            } \
+         } \
+         part { name: "button_center_part"; \
+            mouse_events: 1; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: 40 40; \
+               max: 40 40; \
+               image.normal: image_normal; \
+               color: 255 255 255 255; \
+            } \
+            description { \
+               state: "clicked" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: image_press; \
+            } \
+            description { \
+               state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               color: 255 255 255 128; \
+            } \
+         } \
+         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; \
+               min: min_width min_height; \
+            } \
+         } \
+         part { name: "over2"; \
+            mouse_events: 1; \
+            repeat_events: 1; \
+            description { state: "default" 0.0; \
+               color: 255 255 255 0; \
+            } \
+            description { state: "clicked" 0.0; \
+               inherit:  "default" 0.0; \
+               visible: 1; \
+               color: 255 255 255 0; \
+            } \
+         } \
+         part { name: "disabler"; \
+            type: RECT; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+               visible: 0; \
+            } \
+            description { state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+            } \
+         } \
+      } \
+      programs { \
+         program { name: "button_click"; \
+            signal: "mouse,down,1"; \
+            source: "over1"; \
+            action: SIGNAL_EMIT "elm,action,press" ""; \
+            after: "button_click_anim"; \
+         } \
+         program { name: "button_click_anim"; \
+            action: STATE_SET "clicked" 0.0; \
+            target: "button_image"; \
+            target: "button_center_part"; \
+         } \
+         program { name: "button_unclick"; \
+            signal: "mouse,up,1"; \
+            source: "over2"; \
+            action: SIGNAL_EMIT "elm,action,unpress" ""; \
+            after: "button_unclick_anim"; \
+         } \
+         program { name: "button_unclick_anim"; \
+            action: STATE_SET "default" 0.0; \
+            target: "button_image"; \
+            target: "button_center_part"; \
+         } \
+         program { name: "button_click2"; \
+            signal: "mouse,down,1"; \
+            source: "over2"; \
+            action: STATE_SET "clicked" 0.0; \
+            target: "over2"; \
+         } \
+         program { name: "button_unclick2"; \
+            signal: "mouse,clicked,1"; \
+            source: "over1"; \
+            action: STATE_SET "default" 0.0; \
+            target: "over1"; \
+            after: "button_unclick3"; \
+         } \
+         program { name: "button_unclick3"; \
+            action: SIGNAL_EMIT "elm,action,click" ""; \
+         } \
+         program { name: "disable"; \
+            signal: "elm,state,disabled"; \
+            source: "elm"; \
+            action: STATE_SET "disabled" 0.0; \
+            target: "disabler"; \
+            target: "button_image"; \
+            target: "button_center_part"; \
+         } \
+         program { name: "enable"; \
+            signal: "elm,state,enabled"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "disabler"; \
+            target: "button_image"; \
+            target: "button_center_part"; \
+         } \
+      } \
+   }
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("reveal", "00_button_reveal.png", "00_button_reveal.png", 40, 40)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("reveal/extended", "00_button_reveal.png", "00_button_reveal_press.png", 60, 70)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("expand/closed", "00_button_expand_closed.png", "00_button_expand_closed_press.png", 40, 40)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("expand/closed/extended", "00_button_expand_closed.png", "00_button_expand_closed_press.png", 60, 70)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("expand/opened", "00_button_expand_opened.png", "00_button_expand_opened_press.png", 40, 40)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("expand/opened/extended", "00_button_expand_opened.png", "00_button_expand_opened_press.png", 60, 70)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("info", "00_button_info.png", "00_button_info_press.png", 40, 40)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("info/extended", "00_button_info.png", "00_button_info_press.png", 60, 70)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("rename", "00_button_rename.png", "00_button_rename_press.png", 40, 40)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("rename/extended", "00_button_rename.png", "00_button_rename_press.png", 60, 70)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("call", "00_button_call.png", "00_button_call_press.png", 40, 40)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("call/extended", "00_button_call.png", "00_button_call_press.png", 60, 70)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("warning", "00_button_warning.png", "00_button_warning_press.png", 40, 40)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("warning/extended", "00_button_warning.png", "00_button_warning_press.png", 60, 70)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("plus", "00_button_plus.png", "00_button_plus_press.png", 40, 40)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("plus/extended", "00_button_plus.png", "00_button_plus_press.png", 60, 70)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("minus", "00_button_minus.png", "00_button_minus_press.png", 40, 40)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("minus/extended", "00_button_minus.png", "00_button_minus_press.png", 60, 70)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("cancel", "00_button_cancel.png", "00_button_cancel_press.png", 40, 40)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("cancel/extended", "00_button_cancel.png", "00_button_cancel_press.png", 60, 70)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("send", "00_button_send.png", "00_button_send_press.png", 40, 40)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("send/extended", "00_button_send.png", "00_button_send_press.png", 60, 70)
+
+///////////////////////////////////////////////////////////////////////////////////////
+#define BUTTON_EDIT_STYLES(style_name, image_normal, image_press, min_width, min_height) \
+   group { name: "elm/button/base/"style_name; \
+      images { \
+         image: image_normal COMP; \
+         image: image_press COMP; \
+         image: "00_button_EditStyle.png" COMP; \
+         image: "00_button_EditStyle_press.png" COMP; \
+         image: "00_button_EditStyle_dim.png" COMP; \
+      } \
+      parts { \
+         part { name: "button_image"; \
+            mouse_events: 1; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: 46 46; \
+               max: 46 46; \
+               image { \
+                  normal: "00_button_EditStyle.png"; \
+                  border: 8 0 3 3; \
+                  border_scale: 1; \
+               } \
+            } \
+            description { \
+               state: "clicked" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_button_EditStyle_press.png"; \
+            } \
+            description { \
+               state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_button_EditStyle_dim.png"; \
+            } \
+         } \
+         part { name: "button_center_part"; \
+            mouse_events: 0; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: 46 46; \
+               max: 46 46; \
+               image { \
+                  normal: image_normal; \
+                  border: 8 0 3 3; \
+                  border_scale: 1; \
+               } \
+            } \
+            description { \
+               state: "clicked" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: image_press; \
+            } \
+         } \
+         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; \
+               min: min_width min_height; \
+            } \
+         } \
+         part { name: "over2"; \
+            mouse_events: 1; \
+            repeat_events: 1; \
+            description { state: "default" 0.0; \
+               color: 255 255 255 0; \
+            } \
+            description { state: "clicked" 0.0; \
+               inherit:  "default" 0.0; \
+               visible: 1; \
+               color: 255 255 255 0; \
+            } \
+         } \
+         part { name: "disabler"; \
+            type: RECT; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+               visible: 0; \
+            } \
+            description { state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+            } \
+         } \
+      } \
+      programs { \
+         program { name: "button_click"; \
+            signal: "mouse,down,1"; \
+            source: "over1"; \
+            action: SIGNAL_EMIT "elm,action,press" ""; \
+            after: "button_click_anim"; \
+         } \
+         program { name: "button_click_anim"; \
+            action: STATE_SET "clicked" 0.0; \
+            target: "button_image"; \
+            target: "button_center_part"; \
+         } \
+         program { name: "button_unclick"; \
+            signal: "mouse,up,1"; \
+            source: "over2"; \
+            action: SIGNAL_EMIT "elm,action,unpress" ""; \
+            after: "button_unclick_anim"; \
+         } \
+         program { name: "button_unclick_anim"; \
+            action: STATE_SET "default" 0.0; \
+            target: "button_image"; \
+            target: "button_center_part"; \
+         } \
+         program { name: "button_click2"; \
+            signal: "mouse,down,1"; \
+            source: "over2"; \
+            action: STATE_SET "clicked" 0.0; \
+            target: "over2"; \
+         } \
+         program { name: "button_unclick2"; \
+            signal: "mouse,clicked,1"; \
+            source: "over1"; \
+            action: STATE_SET "default" 0.0; \
+            target: "over1"; \
+            after: "button_unclick3"; \
+         } \
+         program { name: "button_unclick3"; \
+            action: SIGNAL_EMIT "elm,action,click" ""; \
+         } \
+         program { name: "disable"; \
+            signal: "elm,state,disabled"; \
+            source: "elm"; \
+            action: STATE_SET "disabled" 0.0; \
+            target: "disabler"; \
+            target: "button_image"; \
+         } \
+         program { name: "enable"; \
+            signal: "elm,state,enabled"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "disabler"; \
+            target: "button_image"; \
+         } \
+      } \
+   }
+///////////////////////////////////////////////////////////////////////////////////////
+BUTTON_EDIT_STYLES("icon_plus", "00_button_icon_plus.png", "00_button_icon_plus_press.png", 46, 46)
+
+///////////////////////////////////////////////////////////////////////////////////////
+BUTTON_EDIT_STYLES("icon_plus/extended", "00_button_icon_plus.png", "00_button_icon_plus_press.png", 60, 75)
+
+///////////////////////////////////////////////////////////////////////////////////////
+BUTTON_EDIT_STYLES("icon_minus", "00_button_icon_minus.png", "00_button_icon_minus_press.png", 46, 46)
+
+///////////////////////////////////////////////////////////////////////////////////////
+BUTTON_EDIT_STYLES("icon_minus/extended", "00_button_icon_minus.png", "00_button_icon_minus_press.png", 60, 75)
+
+///////////////////////////////////////////////////////////////////////////////////////
+BUTTON_EDIT_STYLES("icon_expand", "00_button_icon_expand.png", "00_button_icon_expand_press.png", 46, 46)
+
+///////////////////////////////////////////////////////////////////////////////////////
+BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_button_icon_expand_press.png", 60, 75)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/multiline";
+      alias: "elm/button/base/text_only/multiline";
       images {
-         image: "00_button_expand_2_opened.png" COMP;
-         image: "00_button_expand_2_opened_press.png" COMP;
-         image: "00_button_expand_2_opened_dim.png" COMP;
+         image: "00_button_04_normal.png" COMP;
+         image: "00_button_04_press.png" COMP;
+         image: "00_button_04_dim.png" COMP;
+      }
+      script {
+         public button_state = BUTTON_STATE_ENABLED;
+      }
+      styles{
+         style { name: "btn_multiline_style";
+            base: "font=SLP:style=Medium font_size=18 align=center color=#ffffff wrap=char";
+            tag:  "br" "\n";
+            tag:  "ps" "ps";
+            tag:  "hilight" "+ font=SLP:style=Bold";
+            tag:  "b" "+ font=SLP:style=Bold";
+            tag:  "tab" "\t";
+         }
       }
       parts {
          part { name: "button_image";
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 40 40;
-               max: 40 40;
+               min: 10 46;
                image {
-                  normal: "00_button_expand_2_opened.png";
+                  normal: "00_button_04_normal.png";
+                  border: 4 4 3 3;
+                  border_scale: 1;
                }
             }
-            description {
-               state: "clicked" 0.0;
+            description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_expand_2_opened_press.png";
+               image.normal: "00_button_04_press.png";
             }
-            description {
-               state: "disabled" 0.0;
+            description { state: "disabled" 0.0;
+               inherit:  "default" 0.0;
+               image.normal: "00_button_04_dim.png";
+            }
+            description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_expand_2_opened_dim.png";
+               image.normal: "00_button_04_press.png";
             }
          }
-         part { name: "over1";
+         part {
+            name: "padding_left";
             type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
+            scale: 1;
+            mouse_events: 0;
             description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 0.0 1.0;
+               min: 2 2;
+               fixed: 1 0;
                color: 0 0 0 0;
             }
          }
-         part { name: "over2";
-            mouse_events: 1;
-            repeat_events: 1;
+         part {
+            name: "padding_right";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
             description { state: "default" 0.0;
-               color: 255 255 255 0;
+               align: 1.0 0.0;
+               rel1.relative: 1.0 0.0;
+               rel2.relative: 1.0 1.0;
+               min: 2 2;
+               fixed: 1 0;
+               color: 0 0 0 0;
             }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 0;
+         }
+         part {
+            name: "padding_top";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 0.0;
+               min: 2 2;
+               fixed: 0 1;
+               color: 0 0 0 0;
             }
          }
-         part { name: "disabler";
+         part {
+            name: "padding_bottom";
             type: RECT;
+            scale: 1;
+            mouse_events: 0;
             description { state: "default" 0.0;
+               align: 1.0 1.0;
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 1.0 1.0;
+               min: 2 2;
+               fixed: 0 1;
                color: 0 0 0 0;
-               visible: 0;
             }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
+         }
+         part {
+            name: "icon_rect";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
                visible: 1;
+               min: 0 40;
+               fixed: 1 0;
+               rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
+               rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
+               align: 0.0 0.5;
+               color: 0 0 0 0;
             }
          }
-      }
-      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";
-         }
-         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: "button_click2";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: STATE_SET "clicked" 0.0;
-            target: "over2";
-         }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: STATE_SET "default" 0.0;
-            target: "over1";
-            after: "button_unclick3";
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-      }
-   }
-
-   group { name: "elm/button/base/expand_2/opened/extended";
-      images {
-         image: "00_button_expand_2_opened.png" COMP;
-         image: "00_button_expand_2_opened_press.png" COMP;
-         image: "00_button_expand_2_opened_dim.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 40 40;
-               max: 40 40;
-               image {
-                  normal: "00_button_expand_2_opened.png";
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_expand_2_opened_press.png";
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_expand_2_opened_dim.png";
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               min: 60 75;
-               max: 60 75;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 255 255 255 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over1";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-         }
-         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: "button_click2";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: STATE_SET "clicked" 0.0;
-            target: "over2";
-         }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: STATE_SET "default" 0.0;
-            target: "over1";
-            after: "button_unclick3";
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/expand_2/closed";
-      images {
-         image: "00_button_expand_2_closed.png" COMP;
-         image: "00_button_expand_2_closed_press.png" COMP;
-         image: "00_button_expand_2_closed_dim.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 40 40;
-               max: 40 40;
-               image {
-                  normal: "00_button_expand_2_closed.png";
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_expand_2_closed_press.png";
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_expand_2_closed_dim.png";
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 255 255 255 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over1";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-         }
-         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: "button_click2";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: STATE_SET "clicked" 0.0;
-            target: "over2";
-         }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: STATE_SET "default" 0.0;
-            target: "over1";
-            after: "button_unclick3";
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-      }
-   }
-
-   group { name: "elm/button/base/expand_2/closed/extended";
-      images {
-         image: "00_button_expand_2_closed.png" COMP;
-         image: "00_button_expand_2_closed_press.png" COMP;
-         image: "00_button_expand_2_closed_dim.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 40 40;
-               max: 40 40;
-               image {
-                  normal: "00_button_expand_2_closed.png";
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_expand_2_closed_press.png";
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_expand_2_closed_dim.png";
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               min: 60 75;
-               max: 60 75;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 255 255 255 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over1";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-         }
-         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: "button_click2";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: STATE_SET "clicked" 0.0;
-            target: "over2";
-         }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: STATE_SET "default" 0.0;
-            target: "over1";
-            after: "button_unclick3";
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/reveal";
-      images {
-         image: "00_button_reveal.png" COMP;
-         image: "00_button_reveal_press.png" COMP;
-         image: "00_button_reveal_dim.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 40 40;
-               max: 40 40;
-               image {
-                  normal: "00_button_reveal.png";
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_reveal_press.png";
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_reveal_dim.png";
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 255 255 255 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over1";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-         }
-         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: "button_click2";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: STATE_SET "clicked" 0.0;
-            target: "over2";
-         }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: STATE_SET "default" 0.0;
-            target: "over1";
-            after: "button_unclick3";
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-      }
-   }
-
-   group { name: "elm/button/base/reveal/extended";
-      images {
-         image: "00_button_reveal.png" COMP;
-         image: "00_button_reveal_press.png" COMP;
-         image: "00_button_reveal_dim.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 40 40;
-               max: 40 40;
-               image {
-                  normal: "00_button_reveal.png";
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_reveal_press.png";
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_reveal_dim.png";
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               min: 60 70;
-               max: 60 70;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 255 255 255 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over1";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-         }
-         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: "button_click2";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: STATE_SET "clicked" 0.0;
-            target: "over2";
-         }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: STATE_SET "default" 0.0;
-            target: "over1";
-            after: "button_unclick3";
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-      }
-   }
-
-   group { name: "elm/button/base/call/extended";
-      images {
-         image: "00_button_call.png" COMP;
-         image: "00_button_call_press.png" COMP;
-         image: "00_button_call_dim.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 40 40;
-               max: 40 40;
-               image {
-                  normal: "00_button_call.png";
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_call_press.png";
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_call_dim.png";
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               min: 60 75;
-               max: 60 75;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 255 255 255 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over1";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-         }
-         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: "button_click2";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: STATE_SET "clicked" 0.0;
-            target: "over2";
-         }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: STATE_SET "default" 0.0;
-            target: "over1";
-            after: "button_unclick3";
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/add";
-      images {
-         image: "00_button_icon_plus.png" COMP;
-         image: "00_button_icon_plus_press.png" COMP;
-         image: "00_button_EditStyle.png" COMP;
-         image: "00_button_EditStyle_press.png" COMP;
-         image: "00_button_EditStyle_dim.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 46 46;
-               max: 46 46;
-               image {
-                  normal: "00_button_EditStyle.png";
-                  border: 8 0 3 3;
-                  border_scale: 1;
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_EditStyle_press.png";
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_EditStyle_dim.png";
-            }
-         }
-         part { name: "button_center_part";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 46 46;
-               max: 46 46;
-               image {
-                  normal: "00_button_icon_plus.png";
-                  border: 8 0 3 3;
-                  border_scale: 1;
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_icon_plus_press.png";
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 255 255 255 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over1";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            target: "button_center_part";
-         }
-         program { name: "button_unclick";
-            signal: "mouse,up,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-            after: "button_unclick_anim";
-         }
-         program { name: "button_unclick_anim";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "button_center_part";
-         }
-         program { name: "button_click2";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: STATE_SET "clicked" 0.0;
-            target: "over2";
-         }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: STATE_SET "default" 0.0;
-            target: "over1";
-            after: "button_unclick3";
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-      }
-   }
-
-   group { name: "elm/button/base/add/extended";
-      images {
-         image: "00_button_icon_plus.png" COMP;
-         image: "00_button_icon_plus_press.png" COMP;
-         image: "00_button_EditStyle.png" COMP;
-         image: "00_button_EditStyle_press.png" COMP;
-         image: "00_button_EditStyle_dim.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 46 46;
-               max: 46 46;
-               image {
-                  normal: "00_button_EditStyle.png";
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_EditStyle_press.png";
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_EditStyle_dim.png";
-            }
-         }
-         part { name: "button_center_part";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 46 46;
-               max: 46 46;
-               image {
-                  normal: "00_button_icon_plus.png";
-                  border: 8 0 3 3;
-                  border_scale: 1;
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_icon_plus_press.png";
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               min: 60 75;
-               max: 60 75;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 255 255 255 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over1";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            target: "button_center_part";
-         }
-         program { name: "button_unclick";
-            signal: "mouse,up,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-            after: "button_unclick_anim";
-         }
-         program { name: "button_unclick_anim";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "button_center_part";
-         }
-         program { name: "button_click2";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: STATE_SET "clicked" 0.0;
-            target: "over2";
-         }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: STATE_SET "default" 0.0;
-            target: "over1";
-            after: "button_unclick3";
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/minus";
-      images {
-         image: "00_button_icon_minus.png" COMP;
-         image: "00_button_icon_minus_press.png" COMP;
-         image: "00_button_EditStyle.png" COMP;
-         image: "00_button_EditStyle_press.png" COMP;
-         image: "00_button_EditStyle_dim.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 46 46;
-               max: 46 46;
-               image {
-                  normal: "00_button_EditStyle.png";
-                  border: 8 0 3 3;
-                  border_scale: 1;
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_EditStyle_press.png";
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_EditStyle_dim.png";
-            }
-         }
-         part { name: "button_center_part";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 46 46;
-               max: 46 46;
-               image {
-                  normal: "00_button_icon_minus.png";
-                  border: 8 0 3 3;
-                  border_scale: 1;
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_icon_minus_press.png";
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 255 255 255 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over1";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            target: "button_center_part";
-         }
-         program { name: "button_unclick";
-            signal: "mouse,up,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-            after: "button_unclick_anim";
-         }
-         program { name: "button_unclick_anim";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "button_center_part";
-         }
-         program { name: "button_click2";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: STATE_SET "clicked" 0.0;
-            target: "over2";
-         }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: STATE_SET "default" 0.0;
-            target: "over1";
-            after: "button_unclick3";
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-      }
-   }
-
-   group { name: "elm/button/base/minus/extended";
-      images {
-         image: "00_button_icon_minus.png" COMP;
-         image: "00_button_icon_minus_press.png" COMP;
-         image: "00_button_EditStyle.png" COMP;
-         image: "00_button_EditStyle_press.png" COMP;
-         image: "00_button_EditStyle_dim.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 46 46;
-               max: 46 46;
-               image {
-                  normal: "00_button_EditStyle.png";
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_EditStyle_press.png";
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_EditStyle_dim.png";
-            }
-         }
-         part { name: "button_center_part";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 46 46;
-               max: 46 46;
-               image {
-                  normal: "00_button_icon_minus.png";
-                  border: 8 0 3 3;
-                  border_scale: 1;
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_icon_minus_press.png";
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               min: 60 75;
-               max: 60 75;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 255 255 255 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over1";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            target: "button_center_part";
-         }
-         program { name: "button_unclick";
-            signal: "mouse,up,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-            after: "button_unclick_anim";
-         }
-         program { name: "button_unclick_anim";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "button_center_part";
-         }
-         program { name: "button_click2";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: STATE_SET "clicked" 0.0;
-            target: "over2";
-         }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: STATE_SET "default" 0.0;
-            target: "over1";
-            after: "button_unclick3";
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/icon_expand";
-      images {
-         image: "00_button_icon_expand.png" COMP;
-         image: "00_button_icon_expand_press.png" COMP;
-         image: "00_button_EditStyle.png" COMP;
-         image: "00_button_EditStyle_press.png" COMP;
-         image: "00_button_EditStyle_dim.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 46 46;
-               max: 46 46;
-               image {
-                  normal: "00_button_EditStyle.png";
-                  border: 8 0 3 3;
-                  border_scale: 1;
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_EditStyle_press.png";
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_EditStyle_dim.png";
-            }
-         }
-         part { name: "button_center_part";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 46 46;
-               max: 46 46;
-               image {
-                  normal: "00_button_icon_expand.png";
-                  border: 8 0 3 3;
-                  border_scale: 1;
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_icon_expand_press.png";
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 255 255 255 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over1";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            target: "button_center_part";
-         }
-         program { name: "button_unclick";
-            signal: "mouse,up,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-            after: "button_unclick_anim";
-         }
-         program { name: "button_unclick_anim";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "button_center_part";
-         }
-         program { name: "button_click2";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: STATE_SET "clicked" 0.0;
-            target: "over2";
-         }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: STATE_SET "default" 0.0;
-            target: "over1";
-            after: "button_unclick3";
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-      }
-   }
-
-   group { name: "elm/button/base/icon_expand/extended";
-      images {
-         image: "00_button_icon_expand.png" COMP;
-         image: "00_button_icon_expand_press.png" COMP;
-         image: "00_button_EditStyle.png" COMP;
-         image: "00_button_EditStyle_press.png" COMP;
-         image: "00_button_EditStyle_dim.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 46 46;
-               max: 46 46;
-               image {
-                  normal: "00_button_EditStyle.png";
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_EditStyle_press.png";
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_EditStyle_dim.png";
-            }
-         }
-         part { name: "button_center_part";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 46 46;
-               max: 46 46;
-               image {
-                  normal: "00_button_icon_expand.png";
-                  border: 8 0 3 3;
-                  border_scale: 1;
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_icon_expand_press.png";
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               min: 60 75;
-               max: 60 75;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 255 255 255 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over1";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            target: "button_center_part";
-         }
-         program { name: "button_unclick";
-            signal: "mouse,up,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-            after: "button_unclick_anim";
-         }
-         program { name: "button_unclick_anim";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "button_center_part";
-         }
-         program { name: "button_click2";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: STATE_SET "clicked" 0.0;
-            target: "over2";
-         }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: STATE_SET "default" 0.0;
-            target: "over1";
-            after: "button_unclick3";
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/rename";
-      images {
-         image: "00_button_rename.png" COMP;
-         image: "00_button_rename_press.png" COMP;
-         image: "00_button_rename_dim.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 40 40;
-               max: 40 40;
-               image {
-                  normal: "00_button_rename.png";
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_rename_press.png";
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_rename_dim.png";
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 255 255 255 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over1";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-         }
-         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: "button_click2";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: STATE_SET "clicked" 0.0;
-            target: "over2";
-         }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: STATE_SET "default" 0.0;
-            target: "over1";
-            after: "button_unclick3";
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-      }
-   }
-
-   group { name: "elm/button/base/rename/extended";
-      images {
-         image: "00_button_rename.png" COMP;
-         image: "00_button_rename_press.png" COMP;
-         image: "00_button_rename_dim.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 40 40;
-               max: 40 40;
-               image {
-                  normal: "00_button_rename.png";
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_rename_press.png";
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_rename_dim.png";
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               min: 60 75;
-               max: 60 75;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 255 255 255 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over1";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-         }
-         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: "button_click2";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: STATE_SET "clicked" 0.0;
-            target: "over2";
-         }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: STATE_SET "default" 0.0;
-            target: "over1";
-            after: "button_unclick3";
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/warning";
-      images {
-         image: "00_button_warning.png" COMP;
-         image: "00_button_warning_press.png" COMP;
-         image: "00_button_warning_dim.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 40 40;
-               max: 40 40;
-               image {
-                  normal: "00_button_warning.png";
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_warning_press.png";
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_warning_dim.png";
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 255 255 255 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 0;
-            }
-         }
-         part { name: "disabler";
+         part {
+            name: "padding_icon_text";
             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";
-         }
-         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: "button_click2";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: STATE_SET "clicked" 0.0;
-            target: "over2";
-         }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: STATE_SET "default" 0.0;
-            target: "over1";
-            after: "button_unclick3";
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-      }
-   }
-
-   group { name: "elm/button/base/warning/extended";
-      images {
-         image: "00_button_warning.png" COMP;
-         image: "00_button_warning_press.png" COMP;
-         image: "00_button_warning_dim.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
             scale: 1;
-            description { state: "default" 0.0;
-               min: 40 40;
-               max: 40 40;
-               image {
-                  normal: "00_button_warning.png";
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_warning_press.png";
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_warning_dim.png";
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               min: 60 75;
-               max: 60 75;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 255 255 255 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
+            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;
-               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";
-         }
-         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: "button_click2";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: STATE_SET "clicked" 0.0;
-            target: "over2";
-         }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: STATE_SET "default" 0.0;
-            target: "over1";
-            after: "button_unclick3";
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/info";
-      images {
-         image: "00_button_info.png" COMP;
-         image: "00_button_info_press.png" COMP;
-         image: "00_button_info_dim.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 40 40;
-               max: 40 40;
-               image {
-                  normal: "00_button_info.png";
-               }
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_info_press.png";
             }
-            description {
-               state: "disabled" 0.0;
+            description { state: "icononly" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_info_dim.png";
             }
-         }
-         part { name: "over1";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "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: "over2";
-            mouse_events: 1;
-            repeat_events: 1;
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
+            scale: 1;
             description { state: "default" 0.0;
-               color: 255 255 255 0;
+               visible: 0;
+               align: 0.0 0.5;
+               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               fixed: 1 0;
             }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
+            description { state: "visible" 0.0;
+               fixed: 1 0;
                visible: 1;
-               color: 255 255 255 0;
+               align: 0.0 0.5;
+               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+            }
+            description { state: "icononly" 0.0;;
+               visible: 1;
+               min: 40 40;
+               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
+               align: 0.5 0.5;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
             }
          }
-         part { name: "disabler";
-            type: RECT;
+         part { name: "elm.text";
+            type: TEXTBLOCK;
+            //effect: SHADOW;
+            mouse_events:  0;
+            scale: 1;
             description { state: "default" 0.0;
-               color: 0 0 0 0;
                visible: 0;
+               rel1 { relative: 1.0 1.0; to_x: "padding_icon_text"; to_y: "padding_top"; }
+               rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y:"padding_bottom"; }
+               align: 0.5 0.5;
+               color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
+               color2: BUTTON_TEXT_STYLE1_NORMAL_SHAWDOW_COLOR_INC;
+               text {
+                  style: "btn_multiline_style";
+                  min:  0 0;
+                  max: 0 1;
+               }
             }
-            description { state: "disabled" 0.0;
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
+               min: 80 0;
             }
-         }
-      }
-      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";
-         }
-         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: "button_click2";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: STATE_SET "clicked" 0.0;
-            target: "over2";
-         }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: STATE_SET "default" 0.0;
-            target: "over1";
-            after: "button_unclick3";
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-         }
-      }
-   }
-
-   group { name: "elm/button/base/info/extended";
-      images {
-         image: "00_button_info.png" COMP;
-         image: "00_button_info_press.png" COMP;
-         image: "00_button_info_dim.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 40 40;
-               max: 40 40;
-               image {
-                  normal: "00_button_info.png";
-               }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               min: 0 0;
+               color: BUTTON_TEXT_STYLE2_PRESSED_COLOR_INC;
+               color2: BUTTON_TEXT_STYLE2_PRESSED_SHAWDOW_COLOR_INC;
             }
-            description {
-               state: "clicked" 0.0;
+            description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_info_press.png";
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
             }
-            description {
-               state: "disabled" 0.0;
+            description { state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               color: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_DISABLED_COLOR_INC;
+               color2: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_DISABLED_SHADOW_COLOR_INC;
+               color3: 0 0 0 0;
+               visible: 1;
+               min: 80 0;
+            }
+            description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_info_dim.png";
+               visible: 1;
+               min: 0 0;
+               color: BUTTON_TEXT_STYLE2_DISABLED_COLOR_INC;
+               color2: BUTTON_TEXT_STYLE2_DISABLED_SHAWDOW_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;
-               min: 60 75;
-               max: 60 75;
                color: 0 0 0 0;
             }
+            description { state: "disabled" 0.0;
+               inherit:  "default" 0.0;
+               visible: 0;
+            }
          }
-         part { name: "over2";
+         part { name: "over3";
+            type: RECT;
             mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
-               color: 255 255 255 0;
+               color: 0 0 0 0;
             }
             description { state: "clicked" 0.0;
                inherit:  "default" 0.0;
                visible: 1;
-               color: 255 255 255 0;
             }
          }
          part { name: "disabler";
       programs {
          program { name: "button_click";
             signal: "mouse,down,1";
-            source: "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";
+         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" "";
-            after: "button_unclick_anim";
          }
-         program { name: "button_unclick_anim";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
+         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_click2";
             signal: "mouse,down,1";
-            source: "over2";
+            source: "over3";
             action: STATE_SET "clicked" 0.0;
-            target: "over2";
+            target: "over3";
          }
          program { name: "button_unclick2";
             signal: "mouse,clicked,1";
-            source: "over1";
+            source: "over3";
             action: STATE_SET "default" 0.0;
-            target: "over1";
-            after: "button_unclick3";
+            target: "over3";
          }
          program { name: "button_unclick3";
+            signal: "mouse,clicked,1";
+            source: "over2";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
+         program { name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "icononly"))
+               {
+                  set_state(PART:"elm.swallow.content", "visible", 0.0);
+                  set_state(PART:"padding_icon_text", "visible", 0.0);
+               }
+               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";
+         }
          program { name: "disable";
             signal: "elm,state,disabled";
             source: "elm";
             action: STATE_SET "disabled" 0.0;
-            target: "disabler";
             target: "button_image";
+            target: "over2";
+            target: "disabler";
+            after: "disable_text";
+         }
+         program { name: "disable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.text", "disabled_visible", 0.0);
+               else
+                  set_state(PART:"elm.text", "disabled", 0.0);
+               set_int(button_state, BUTTON_STATE_DISABLED);
+            }
          }
          program { name: "enable";
             signal: "elm,state,enabled";
             source: "elm";
             action: STATE_SET "default" 0.0;
+            target: "button_image";
+            target: "over2";
             target: "disabler";
+            after: "enable_text";
+         }
+         program { name: "enable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "disabled_visible"))
+                  set_state(PART:"elm.text", "visible", 0.0);
+               else
+                  set_state(PART:"elm.text", "default", 0.0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
+            }
+         }
+         program { name: "focused";
+            //signal: "elm,action,focus";
+            //source: "elm";
+            action: STATE_SET "focused" 0.0;
+            target: "button_image";
+            target: "elm.text";
+         }
+         program { name: "unfocused";
+            //signal: "elm,action,unfocus";
+            //source: "elm";
+            action: STATE_SET "default" 0.0;
             target: "button_image";
+            after: "unfocus_text";
+         }
+         program { name: "unfocus_text";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.text";
          }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/call";
+   group { name: "elm/button/base/icon_only/default";
       images {
-         image: "00_button_call.png" COMP;
-         image: "00_button_call_press.png" COMP;
-         image: "00_button_call_dim.png" COMP;
+         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;
+      }
+      script {
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 40 40;
-               max: 40 40;
+               min: 50 50;
+               max: 50 50;
                image {
-                  normal: "00_button_call.png";
+                  normal: "00_button_03_normal.png";
+                  border: 7 7 7 7;
+                  border_scale: 1;
                }
             }
-            description {
-               state: "clicked" 0.0;
+            description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_call_press.png";
+               image.normal: "00_button_03_press.png";
             }
-            description {
-               state: "disabled" 0.0;
+            description { state: "disabled" 0.0;
+               inherit:  "default" 0.0;
+               image.normal: "00_button_03_dim.png";
+            }
+            description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_call_dim.png";
+               image.normal: "00_button_03_focus.png";
             }
          }
-         part { name: "over1";
+         part {
+            name: "padding_left";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 0.0 1.0;
+               min: 5 5;
+               fixed: 1 0;
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "padding_right";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               align: 1.0 0.0;
+               rel1.relative: 1.0 0.0;
+               rel2.relative: 1.0 1.0;
+               min: 5 5;
+               fixed: 1 0;
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "padding_top";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 0.0;
+               min: 5 5;
+               fixed: 0 1;
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "padding_bottom";
             type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               align: 1.0 1.0;
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 1.0 1.0;
+               min: 5 5;
+               fixed: 0 1;
+               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;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
+               align: 0.5 0.5;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "over1";
             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";
+            }
+            description { state: "disabled" 0.0;
+               inherit:  "default" 0.0;
+               visible: 0;
             }
          }
          part { name: "over2";
             mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
-               color: 255 255 255 0;
+            rel1.to: "button_image";
+            rel2.to: "button_image";
+               color: 0 0 0 0;
             }
             description { state: "clicked" 0.0;
                inherit:  "default" 0.0;
                visible: 1;
-               color: 255 255 255 0;
+               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;
             }
             signal: "elm,state,disabled";
             source: "elm";
             action: STATE_SET "disabled" 0.0;
-            target: "disabler";
             target: "button_image";
+            target: "over1";
+            target: "disabler";
+            after : "state_set_disable";
+         }
+         program { name: "state_set_disable";
+            script {
+               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: "over1";
             target: "disabler";
+            after : "state_set_enable";
+         }
+         program { name: "state_set_enable";
+            script {
+               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";
+         }
+         program { name: "unfocused";
+            //signal: "elm,action,unfocus";
+            //source: "elm";
+            action: STATE_SET "default" 0.0;
             target: "button_image";
          }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/text_only/multiline";
+   group { name: "elm/button/base/dark";
+      alias: "elm/button/base/sound_dark";
+      alias: "elm/button/base/sound_haptic_multiline";
       images {
-         image: "00_button_04_normal.png" COMP;
-         image: "00_button_04_press.png" COMP;
-         image: "00_button_04_dim.png" COMP;
+         image: "00_button_02_normal.png" COMP;
+         image: "00_button_02_press.png" COMP;
+         image: "00_button_02_focus.png" COMP;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
-      }
-      styles{
-         style { name: "btn_multiline_style";
-            base: "font=SLP:style=Medium font_size=18 align=center color=#ffffff wrap=char";
-            tag:  "br" "\n";
-            tag:  "ps" "ps";
-            tag:  "hilight" "+ font=SLP:style=Bold";
-            tag:  "b" "+ font=SLP:style=Bold";
-            tag:  "tab" "\t";
-         }
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 10 46;
+               min: 16 50;
                image {
-                  normal: "00_button_04_normal.png";
-                  border: 4 4 3 3;
+                  normal: "00_button_02_normal.png";
+                  border: 7 7 7 7;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_04_press.png";
+               image.normal: "00_button_02_press.png";
             }
             description { state: "disabled" 0.0;
                inherit:  "default" 0.0;
-               image.normal: "00_button_04_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_04_press.png";
+               image.normal: "00_button_02_focus.png";
             }
          }
          part {
                align: 0.0 0.0;
                rel1.relative: 0.0 0.0;
                rel2.relative: 0.0 1.0;
-               min: 2 2;
+               min: 5 5;
                fixed: 1 0;
                color: 0 0 0 0;
             }
                align: 1.0 0.0;
                rel1.relative: 1.0 0.0;
                rel2.relative: 1.0 1.0;
-               min: 2 2;
+               min: 5 5;
                fixed: 1 0;
                color: 0 0 0 0;
             }
                align: 0.0 0.0;
                rel1.relative: 0.0 0.0;
                rel2.relative: 1.0 0.0;
-               min: 2 2;
+               min: 5 5;
                fixed: 0 1;
                color: 0 0 0 0;
             }
                align: 1.0 1.0;
                rel1.relative: 0.0 1.0;
                rel2.relative: 1.0 1.0;
-               min: 2 2;
+               min: 5 5;
                fixed: 0 1;
                color: 0 0 0 0;
             }
             }
          }
          part { name: "elm.text";
-            type: TEXTBLOCK;
+            type: TEXT;
             //effect: SHADOW;
             mouse_events:  0;
             scale: 1;
                rel1 { relative: 1.0 1.0; to_x: "padding_icon_text"; to_y: "padding_top"; }
                rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y:"padding_bottom"; }
                align: 0.5 0.5;
-               color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_STYLE1_NORMAL_SHAWDOW_COLOR_INC;
+               color: 255 255 255 255;
+               color2: 0 0 0 0;
                text {
-                  style: "btn_multiline_style";
+                  font: "SLP:style=Medium";
+                  size: 24;
                   min:  0 0;
-                  max: 0 1;
+                  align: 0.5 0.5;
+                  max: 1 0;
                }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 80 0;
+               min: 90 40;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                min: 0 0;
-               color: BUTTON_TEXT_STYLE2_PRESSED_COLOR_INC;
-               color2: BUTTON_TEXT_STYLE2_PRESSED_SHAWDOW_COLOR_INC;
+               color: 255 255 255 255;
+               color2: 0 0 0 102;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_DISABLED_COLOR_INC;
-               color2: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_DISABLED_SHADOW_COLOR_INC;
+               color: 0 0 0 128;
                color3: 0 0 0 0;
                visible: 1;
+               min: 90 40;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                min: 0 0;
-               color: BUTTON_TEXT_STYLE2_DISABLED_COLOR_INC;
-               color2: BUTTON_TEXT_STYLE2_DISABLED_SHAWDOW_COLOR_INC;
+               color: 255 255 255 255;
+               color2: 0 0 0 102;
             }
          }
          part { name: "over2";
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"elm.swallow.content", "visible", 0.0);
                   set_state(PART:"padding_icon_text", "visible", 0.0);
                }
-               set_state(PART:"elm.text", "visible", 0.0);
+               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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
             target: "disabler";
             after: "enable_text";
          }
-         program { name: "enable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-                  set_state(PART:"elm.text", "visible", 0.0);
-               else
-                  set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
-            }
-         }
-         program { name: "focused";
-            //signal: "elm,action,focus";
-            //source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "button_image";
-            target: "elm.text";
-         }
-         program { name: "unfocused";
-            //signal: "elm,action,unfocus";
-            //source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            after: "unfocus_text";
-         }
-         program { name: "unfocus_text";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.text";
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/icon_only/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;
-      }
-      script {
-         public button_state = 0; //0:enabled, 1: disabled
-      }
-      parts {
-         part { name: "button_image";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 50 50;
-               max: 50 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;
-               image.normal: "00_button_03_dim.png";
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_03_focus.png";
-            }
-         }
-         part {
-            name: "padding_left";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 0.0 1.0;
-               min: 5 5;
-               fixed: 1 0;
-               color: 0 0 0 0;
-            }
-         }
-         part {
-            name: "padding_right";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1.0 0.0;
-               rel1.relative: 1.0 0.0;
-               rel2.relative: 1.0 1.0;
-               min: 5 5;
-               fixed: 1 0;
-               color: 0 0 0 0;
-            }
-         }
-         part {
-            name: "padding_top";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 1.0 0.0;
-               min: 5 5;
-               fixed: 0 1;
-               color: 0 0 0 0;
-            }
-         }
-         part {
-            name: "padding_bottom";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 0.0 1.0;
-               rel2.relative: 1.0 1.0;
-               min: 5 5;
-               fixed: 0 1;
-               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;
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
-               align: 0.5 0.5;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "over1";
-            mouse_events: 1;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-            rel1.to: "button_image";
-            rel2.to: "button_image";
-            }
-            description { state: "disabled" 0.0;
-               inherit:  "default" 0.0;
-               visible: 0;
-            }
-         }
-         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;
-            }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               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;
-            }
-            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";
-         }
-         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: "button_click2";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: STATE_SET "clicked" 0.0;
-            target: "over2";
-         }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: STATE_SET "default" 0.0;
-            target: "over1";
-            after: "button_unclick3";
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "button_image";
-            target: "over1";
-            target: "disabler";
-            after : "state_set_disable";
-         }
-         program { name: "state_set_disable";
-            script {
-               set_int(button_state, 1);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "over1";
-            target: "disabler";
-            after : "state_set_enable";
-         }
-         program { name: "state_set_enable";
+         program { name: "enable_text";
             script {
-               set_int(button_state, 0);
+               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/dark";
-      alias: "elm/button/base/sound_dark";
-      alias: "elm/button/base/sound_haptic_multiline";
+   group { name: "elm/button/base/default";
       images {
-         image: "00_button_02_normal.png" COMP;
-         image: "00_button_02_press.png" COMP;
-         image: "00_button_02_focus.png" COMP;
+         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 = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
             description { state: "default" 0.0;
                min: 16 50;
                image {
-                  normal: "00_button_02_normal.png";
+                  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_02_press.png";
+               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_02_focus.png";
+               image.normal: "00_button_03_focus.png";
             }
          }
          part {
                rel1 { relative: 1.0 1.0; to_x: "padding_icon_text"; to_y: "padding_top"; }
                rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y:"padding_bottom"; }
                align: 0.5 0.5;
-               color: 255 255 255 255;
-               color2: 0 0 0 0;
+               color: 90 73 40 255;
+               color2: 255 255 255 255;
                text {
                   font: "SLP:style=Medium";
                   size: 24;
                color: 0 0 0 128;
                color3: 0 0 0 0;
                visible: 1;
+               min: 90 40;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"elm.swallow.content", "visible", 0.0);
                   set_state(PART:"padding_icon_text", "visible", 0.0);
                }
-               set_state(PART:"elm.text", "visible", 0.0);
+               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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/default";
+   group { name: "elm/button/base/hidden";
       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_sweep.png" COMP;
+         image: "00_button_sweep_press.png" COMP;//focus image is missing, so using press
+         //image: "00_button_sweep_dim.png" COMP;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 16 50;
+               min: 10 38;
                image {
-                  normal: "00_button_03_normal.png";
-                  border: 7 7 7 7;
+                  normal: "00_button_sweep.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_sweep_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";
+               image.normal: "00_button_sweep_press.png";
             }
          }
          part {
             mouse_events: 0;
             description { state: "default" 0.0;
                visible: 1;
-               min: 0 40;
+               min: 0 28;
                fixed: 1 0;
                rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
                rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
             }
             description { state: "icononly" 0.0;;
                visible: 1;
-               min: 40 40;
+               min: 28 28;
                rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
                rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
                align: 0.5 0.5;
                rel1 { relative: 1.0 1.0; to_x: "padding_icon_text"; to_y: "padding_top"; }
                rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y:"padding_bottom"; }
                align: 0.5 0.5;
-               color: 90 73 40 255;
-               color2: 255 255 255 255;
+               color: BUTTON_HIDDEN_BUTTON_TEXT_NORMAL_COLOR_INC;
+               color2: BUTTON_HIDDEN_BUTTON_TEXT_NORMAL_SHAWDOW_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 24;
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 90 40;
+               min: 90 28;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                min: 0 0;
-               color: 255 255 255 255;
-               color2: 0 0 0 102;
+               color: BUTTON_HIDDEN_BUTTON_TEXT_PRESSED_COLOR_INC;
+               color2: BUTTON_HIDDEN_BUTTON_TEXT_PRESSED_SHAWDOW_COLOR_INC;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: 0 0 0 128;
+               color: BUTTON_HIDDEN_BUTTON_TEXT_DISABLED_COLOR_INC;
+               color2: BUTTON_HIDDEN_BUTTON_TEXT_DISABLED_SHAWDOW_COLOR_INC;
                color3: 0 0 0 0;
                visible: 1;
+               min: 90 28;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                min: 0 0;
-               color: 255 255 255 255;
-               color2: 0 0 0 102;
+               color: BUTTON_HIDDEN_BUTTON_TEXT_FOCUSED_COLOR_INC;
+               color2: BUTTON_HIDDEN_BUTTON_TEXT_FOCUSED_SHAWDOW_COLOR_INC;
             }
          }
          part { name: "over2";
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"elm.swallow.content", "visible", 0.0);
                   set_state(PART:"padding_icon_text", "visible", 0.0);
                }
-               set_state(PART:"elm.text", "visible", 0.0);
+               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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/hidden";
+   group { name: "elm/button/base/popup/contact";
       images {
-         image: "00_button_sweep.png" COMP;
-         image: "00_button_sweep_press.png" COMP;//focus image is missing, so using press
-         //image: "00_button_sweep_dim.png" COMP;
+         image: "00_button_01_normal.png" COMP;
+         image: "00_button_01_press.png" COMP;
+         image: "00_button_01_focus.png" COMP;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 10 38;
+               min: 16 46;
                image {
-                  normal: "00_button_sweep.png";
-                  border: 4 4 3 3;
+                  normal: "00_button_01_normal.png";
+                  border: 4 4 4 4;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_sweep_press.png";
+               image.normal: "00_button_01_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_button_01_focus.png";
             }
          }
          part {
                align: 0.0 0.0;
                rel1.relative: 0.0 0.0;
                rel2.relative: 0.0 1.0;
-               min: 5 5;
+               min: 10 5;
                fixed: 1 0;
                color: 0 0 0 0;
             }
                align: 1.0 0.0;
                rel1.relative: 1.0 0.0;
                rel2.relative: 1.0 1.0;
-               min: 5 5;
+               min: 10 5;
                fixed: 1 0;
                color: 0 0 0 0;
             }
                align: 0.0 0.0;
                rel1.relative: 0.0 0.0;
                rel2.relative: 1.0 0.0;
-               min: 5 5;
+               min: 5 10;
                fixed: 0 1;
                color: 0 0 0 0;
             }
                align: 1.0 1.0;
                rel1.relative: 0.0 1.0;
                rel2.relative: 1.0 1.0;
-               min: 5 5;
+               min: 5 10;
                fixed: 0 1;
                color: 0 0 0 0;
             }
             mouse_events: 0;
             description { state: "default" 0.0;
                visible: 1;
-               min: 0 28;
+               min: 0 40;
                fixed: 1 0;
                rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
                rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
                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: 10 0;
                color: 0 0 0 0;
             }
          }
             }
             description { state: "icononly" 0.0;;
                visible: 1;
-               min: 28 28;
+               min: 24 24;
                rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
                rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
                align: 0.5 0.5;
                visible: 0;
                rel1 { relative: 1.0 1.0; to_x: "padding_icon_text"; to_y: "padding_top"; }
                rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y:"padding_bottom"; }
-               align: 0.5 0.5;
-               color: BUTTON_HIDDEN_BUTTON_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_HIDDEN_BUTTON_TEXT_NORMAL_SHAWDOW_COLOR_INC;
+               align: 0.0 0.5;
+               color: 90 73 40 255;
+               color2: 255 255 255 255;
                text {
                   font: "SLP:style=Medium";
-                  size: 24;
+                  size: 20;
                   min:  0 0;
                   align: 0.5 0.5;
                   max: 1 0;
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 90 28;
+               min: 90 20;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                min: 0 0;
-               color: BUTTON_HIDDEN_BUTTON_TEXT_PRESSED_COLOR_INC;
-               color2: BUTTON_HIDDEN_BUTTON_TEXT_PRESSED_SHAWDOW_COLOR_INC;
+               color: 255 255 255 255;
+               color2: 0 0 0 102;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_HIDDEN_BUTTON_TEXT_DISABLED_COLOR_INC;
-               color2: BUTTON_HIDDEN_BUTTON_TEXT_DISABLED_SHAWDOW_COLOR_INC;
+               color: 0 0 0 128;
                color3: 0 0 0 0;
                visible: 1;
+               min: 90 20;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                min: 0 0;
-               color: BUTTON_HIDDEN_BUTTON_TEXT_FOCUSED_COLOR_INC;
-               color2: BUTTON_HIDDEN_BUTTON_TEXT_FOCUSED_SHAWDOW_COLOR_INC;
+               color: 255 255 255 255;
+               color2: 0 0 0 102;
             }
          }
          part { name: "over2";
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"elm.swallow.content", "visible", 0.0);
                   set_state(PART:"padding_icon_text", "visible", 0.0);
                }
-               set_state(PART:"elm.text", "visible", 0.0);
+               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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/popup/contact";
+   group { name: "elm/button/base/picker/bar/default";
       images {
-         image: "00_button_01_normal.png" COMP;
-         image: "00_button_01_press.png" COMP;
-         image: "00_button_01_focus.png" COMP;
+         image: "00_picker_btn_normal.png" COMP;
+         image: "00_picker_btn_press.png" COMP;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 16 46;
+               min: 46 42;
                image {
-                  normal: "00_button_01_normal.png";
+                  normal: "00_picker_btn_normal.png";
                   border: 4 4 4 4;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_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_01_focus.png";
+               image.normal: "00_picker_btn_press.png";
             }
          }
          part {
                align: 0.0 0.0;
                rel1.relative: 0.0 0.0;
                rel2.relative: 0.0 1.0;
-               min: 10 5;
+               min: 5 5;
                fixed: 1 0;
                color: 0 0 0 0;
             }
                align: 1.0 0.0;
                rel1.relative: 1.0 0.0;
                rel2.relative: 1.0 1.0;
-               min: 10 5;
+               min: 5 5;
                fixed: 1 0;
                color: 0 0 0 0;
             }
                align: 0.0 0.0;
                rel1.relative: 0.0 0.0;
                rel2.relative: 1.0 0.0;
-               min: 5 10;
+               min: 5 5;
                fixed: 0 1;
                color: 0 0 0 0;
             }
                align: 1.0 1.0;
                rel1.relative: 0.0 1.0;
                rel2.relative: 1.0 1.0;
-               min: 5 10;
+               min: 5 5;
                fixed: 0 1;
                color: 0 0 0 0;
             }
             mouse_events: 0;
             description { state: "default" 0.0;
                visible: 1;
-               min: 0 40;
+               min: 0 32;
                fixed: 1 0;
                rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
                rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
                rel1 { relative: 1.0 0.0; to: "icon_rect"; }
                rel2 { relative: 1.0 1.0; to: "icon_rect"; }
                fixed: 1 0;
-               min: 10 0;
+               min: 5 0;
                color: 0 0 0 0;
             }
          }
             }
             description { state: "icononly" 0.0;;
                visible: 1;
-               min: 24 24;
+               min: 32 32;
                rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
                rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
                align: 0.5 0.5;
                visible: 0;
                rel1 { relative: 1.0 1.0; to_x: "padding_icon_text"; to_y: "padding_top"; }
                rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y:"padding_bottom"; }
-               align: 0.0 0.5;
-               color: 90 73 40 255;
-               color2: 255 255 255 255;
+               align: 0.5 0.5;
+               color: 78 73 69 255;
+               color2: 0 0 0 0;
                text {
                   font: "SLP:style=Medium";
                   size: 20;
-                  min:  0 0;
+                  min:  1 0;
                   align: 0.5 0.5;
-                  max: 1 0;
+                  max: 0 0;
                }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 90 20;
+               min: 80 32;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                min: 0 0;
                color: 255 255 255 255;
-               color2: 0 0 0 102;
+               color2: 0 0 0 0;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
                color: 0 0 0 128;
                color3: 0 0 0 0;
                visible: 1;
+               min: 80 32;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"elm.swallow.content", "visible", 0.0);
                   set_state(PART:"padding_icon_text", "visible", 0.0);
                }
-               set_state(PART:"elm.text", "visible", 0.0);
+               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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/calendarpicker/bar";
+   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;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
                align: 0.0 0.0;
                rel1.relative: 0.0 0.0;
                rel2.relative: 0.0 1.0;
-               min: 5 5;
+               min: 10 5;
                fixed: 1 0;
                color: 0 0 0 0;
             }
                align: 1.0 0.0;
                rel1.relative: 1.0 0.0;
                rel2.relative: 1.0 1.0;
-               min: 5 5;
+               min: 10 5;
                fixed: 1 0;
                color: 0 0 0 0;
             }
                   size: 20;
                   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: 60 32;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                color: 0 0 0 128;
                color3: 0 0 0 0;
                visible: 1;
+               min: 60 32;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"elm.swallow.content", "visible", 0.0);
                   set_state(PART:"padding_icon_text", "visible", 0.0);
                }
-               set_state(PART:"elm.text", "visible", 0.0);
+               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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/icon_and_text/center";
+   group { name: "elm/button/base/center";
+      alias: "elm/button/base/icon_and_text/center";
       images {
          image: "00_button_01_normal.png" COMP;
          image: "00_button_01_press.png" COMP;
          image: "00_button_01_dim.png" COMP;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
                color2: BUTTON_ICON_TEXT_DISABLED_SHAWDOW_COLOR_INC;
                color3: 0 0 0 0;
                visible: 1;
+               min: 90 24;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                     emit("elm,action,default,text,set", "");
                     set_state(PART:"elm.text", "visible", 0.0);
                  }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"icon_rect", "visible", 0.0);
                   set_state(PART:"padding_after_icon", "visible", 0.0);
                }
-               set_state(PART:"elm.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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/text_only/contact";
+   group { name: "elm/button/base/contact";
+      alias: "elm/button/base/text_only/contact";
       alias: "elm/button/base/haptic";
       images {
          image: "00_message_button_add_recipient.png" COMP;
          image: "00_message_button_add_recipient_dim.png" COMP;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
          program { name: "text_show";
             signal: "elm,state,text,visible";
             source: "elm";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.text";
+            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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/text_only/more";
+   group { name: "elm/button/base/more";
+      alias: "elm/button/base/text_only/more";
       images {
          image: "00_button_more.png" COMP;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
          program { name: "text_show";
             signal: "elm,state,text,visible";
             source: "elm";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.text";
+            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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                set_state(PART:"elm.text", "visible", 0.0);
                else
                set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
          image: "00_button_03_focus.png" COMP;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
                color: 0 0 0 128;
                color3: 0 0 0 0;
                visible: 1;
+               min: 90 40;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"elm.swallow.content", "visible", 0.0);
                   set_state(PART:"padding_icon_text", "visible", 0.0);
                }
-               set_state(PART:"elm.text", "visible", 0.0);
+               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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
          image: "00_button_03_focus.png" COMP;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
                color: 0 0 0 128;
                color3: 0 0 0 0;
                visible: 1;
+               min: 90 40;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"elm.swallow.content", "visible", 0.0);
                   set_state(PART:"padding_icon_text", "visible", 0.0);
                }
-               set_state(PART:"elm.text", "visible", 0.0);
+               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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
          image: "00_button_03_focus.png" COMP;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
                color: 0 0 0 128;
                color3: 0 0 0 0;
                visible: 1;
+               min: 90 40;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"elm.swallow.content", "visible", 0.0);
                   set_state(PART:"padding_icon_text", "visible", 0.0);
                }
-               set_state(PART:"elm.text", "visible", 0.0);
+               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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/calendarpicker/prev";
+   group { name: "elm/button/base/picker/prev/icon/default";
       images {
          image: "00_picker_btn_normal.png" COMP;
          image: "00_picker_btn_press.png" COMP;
          image: "00_picker_arrow_left_press.png" COMP;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
             signal: "mouse,up,1";
             source: "over3";
             script {
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
          }
          program { name: "disable_button";
             script {
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
          }
          program { name: "enable_button";
             script {
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/calendarpicker/next";
+   group { name: "elm/button/base/picker/next/icon/default";
       images {
          image: "00_picker_btn_normal.png" COMP;
          image: "00_picker_btn_press.png" COMP;
          image: "00_picker_arrow_right_press.png" COMP;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
             signal: "mouse,up,1";
             source: "over3";
             script {
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
          }
          program { name: "disable_button";
             script {
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
          }
          program { name: "enable_button";
             script {
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
          image: "00_button_03_focus.png" COMP;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
                color: 0 0 0 128;
                color3: 0 0 0 0;
                visible: 1;
+               min: 90 40;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"icon_rect", "visible", 0.0);
                   set_state(PART:"padding_after_icon", "visible", 0.0);
                }
-               set_state(PART:"elm.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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/navigationbar_control/center";
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
                color: BUTTON_ICON_TEXT_DISABLED_COLOR_INC;
                color3: 0 0 0 0;
                visible: 1;
+               min: 90 24;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                     emit("elm,action,default,text,set", "");
                     set_state(PART:"elm.text", "visible", 0.0);
                  }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"icon_rect", "visible", 0.0);
                   set_state(PART:"padding_after_icon", "visible", 0.0);
                }
-               set_state(PART:"elm.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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/navigationbar_control/left";
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
                color: 0 0 0 128;
                color3: 0 0 0 0;
                visible: 1;
+               min: 90 40;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"elm.swallow.content", "visible", 0.0);
                   set_state(PART:"padding_icon_text", "visible", 0.0);
                }
-               set_state(PART:"elm.text", "visible", 0.0);
+               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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/navigationbar_control/right";
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
                color: 0 0 0 128;
                color3: 0 0 0 0;
                visible: 1;
+               min: 90 40;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"elm.swallow.content", "visible", 0.0);
                   set_state(PART:"padding_icon_text", "visible", 0.0);
                }
-               set_state(PART:"elm.text", "visible", 0.0);
+               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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
          image: "00_button_06_dim.png" COMP;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
                inherit: "default" 0.0;
                color: BUTTON_TEXT_TICKERNOTI_DISABLED_COLOR_INC;
                visible: 1;
+               min: 90 24;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                   emit("elm,action,default,text,set", "");
                   set_state(PART:"elm.text", "visible", 0.0);
                }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                   set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
                   set_state(PART:"icon_rect", "visible", 0.0);
                   set_state(PART:"padding_after_icon", "visible", 0.0);
                }
-               set_state(PART:"elm.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";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/text_only/expandable_number";
+   group { name: "elm/button/base/expandable_number";
+      alias: "elm/button/base/text_only/expandable_number";
       images {
          image: "00_button_05_normal.png" COMP;
          image: "00_button_05_press.png" COMP;
          image: "00_arrow_down_dim.png" COMP;
       }
       script {
-         public button_state = 0; //0:enabled, 1: disabled
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
                color2: BUTTON_TEXT_STYLE1_DISABLED_SHAWDOW_COLOR_INC;
                color3: 0 0 0 0;
                visible: 1;
+               min: 90 36;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
             signal: "mouse,up,1";
             source: "over3";
             script {
-               //new st[31];
-               //new Float:vl;
-               //get_state(PART:"elm.swallow.content", st, 30, vl);
-               //if (strcmp(st, "icononly"))
-               {
-                  //emit("elm,action,default,text,set", "");
-                  //set_state(PART:"elm.text", "visible", 0.0);
-               }
-               if(get_int(button_state) !=1)
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
                {
                   set_state(PART:"button_image", "default", 0.0);
                   set_state(PART:"elm.text", "visible", 0.0);
             signal: "elm,state,text,visible";
             source: "elm";
             script {
-               //new st[31];
-               //new Float:vl;
-               //get_state(PART:"elm.swallow.content", st, 30, vl);
-               //if (!strcmp(st, "icononly"))
-               {
-                  //set_state(PART:"elm.swallow.content", "visible", 0.0);
-                  //set_state(PART:"icon_rect", "visible", 0.0);
-                  //set_state(PART:"padding_after_icon", "visible", 0.0);
-               }
-               set_state(PART:"elm.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:"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";
          }
          program { name: "disable";
             signal: "elm,state,disabled";
                   set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
                   set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, 1);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
          program { name: "enable";
                   set_state(PART:"elm.text", "visible", 0.0);
                else
                   set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, 0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
          program { name: "focused";
             target: "elm.text";
          }
       }
-   }
\ No newline at end of file
+   }
+
+#undef BUTTON_STATE_ENABLED
+#undef BUTTON_STATE_DISABLED
index 5d6dda0..bc56927 100644 (file)
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  */
-
+#define CHECK_STATE_DEFAULT 0
+#define CHECK_STATE_VISIBLE 1
+#define CHECK_STATE_DISABLED_VISIBLE 2
+#define CHECK_STATE_DISABLED 3
    styles {
       style { name: "check_label_textblock_disabled_style";
          base: "font=SLP:style=Roman _ font_size=24 color=#888888 color3=#000000 wrap=char";
          tag: "tab" "\t";
       }
    }
-   group { name: "elm/check/base/default";
+
+///////////////////////////////////////////////////////////////////////////////////////
+#define CHECK_STYLE_DEFAULT(style_name, min_width, min_height) \
+   group { name: "elm/check/base/"style_name; \
+      images { \
+         image: "00_check_bg.png" COMP; \
+         image: "00_check_bg_press.png" COMP; \
+         image: "00_check_bg_dim.png" COMP; \
+         image: "00_check_checking.png" COMP; \
+         image: "00_check_checking_dim.png" COMP; \
+      } \
+      script { \
+         public check_state = CHECK_STATE_DEFAULT; \
+      } \
+      parts { \
+         part { name: "back_bg"; \
+            type: RECT; \
+            mouse_events: 1; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               rel2.relative: 0.0 1.0; \
+               align: 0 0.5; \
+               min: min_width min_height; \
+               fixed: 1 0; \
+               visible: 1; \
+               color: 0 0 0 0; \
+            } \
+         } \
+         part { name: "bg"; \
+            mouse_events: 0; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: 26 26; \
+               max: 26 26; \
+               fixed: 1 1; \
+               rel1{ to: "back_bg"; } \
+               rel2{ to: "back_bg"; } \
+               align: 0.5 0.5; \
+               visible: 1; \
+               image { \
+                  normal: "00_check_bg.png"; \
+               } \
+               fill.smooth : 0; \
+            } \
+            description { state: "pressed" 0.0; \
+               inherit: "default" 0.0; \
+               image { \
+                  normal: "00_check_bg_press.png"; \
+               } \
+               fill.smooth : 0; \
+            } \
+            description { state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               image { \
+                  normal: "00_check_bg_dim.png"; \
+               } \
+               fill.smooth : 0; \
+            } \
+         } \
+         part { name: "check"; \
+            mouse_events: 0; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               rel1.to: "bg"; \
+               rel2.to: "bg"; \
+               visible: 0; \
+            } \
+            description { state: "visible" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+               image.normal: "00_check_checking.png"; \
+            } \
+            description { state: "pressed" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+               image.normal: "00_check_checking.png"; \
+            } \
+            description { state: "disabled_visible" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_check_checking_dim.png"; \
+               visible: 1; \
+            } \
+         } \
+         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: 0 1; \
+               rel1 { relative: 1.0 0.5; offset: 1 1; to_x: "elm.swallow.content"; } \
+               rel2 { relative: 1.0 0.5; offset: -2 -2; } \
+               align: 0.0 0.5; \
+               text { \
+                  style: "check_label_textblock_style"; \
+                  min: 0 0; \
+               } \
+            } \
+            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 {  \
+                  style: "check_label_textblock_disabled_style"; \
+                  min: 1 1; \
+               } \
+            } \
+         } \
+         part { name: "events1"; \
+            type: RECT; \
+            ignore_flags: ON_HOLD; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+            } \
+         } \
+         part { name: "events2"; \
+            type: RECT; \
+            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: "click"; \
+            signal: "mouse,clicked,1"; \
+            source: "events1"; \
+         action: SIGNAL_EMIT "elm,action,check,toggle" ""; \
+         } \
+         program { name: "bg_normal"; \
+            signal: "mouse,up,1"; \
+            source: "events2"; \
+            script { \
+               if(get_int(check_state) == CHECK_STATE_VISIBLE) \
+                 set_state(PART:"check", "visible", 0.0); \
+               else if(get_int(check_state) == CHECK_STATE_DEFAULT)\
+                 set_state(PART:"check", "default", 0.0); \
+               else \
+                 set_state(PART:"check", "disabled_visible", 0.0); \
+               set_state(PART:"bg", "default", 0.0); \
+            } \
+         } \
+         program { name: "pressed"; \
+            signal: "mouse,down,1"; \
+            source: "events2"; \
+            script { \
+               new st[31]; \
+               new Float:vl; \
+               get_state(PART:"check", st, 30, vl); \
+               if (!strcmp(st, "default")) \
+                 set_state(PART:"check", "pressed", 0.0); \
+               else \
+                 set_state(PART:"check", "default", 0.0); \
+               set_state(PART:"bg", "pressed", 0.0); \
+            } \
+         } \
+         program { name: "mouse,out"; \
+            signal: "mouse,out"; \
+            source: "events2"; \
+            script { \
+               if(get_int(check_state) == CHECK_STATE_VISIBLE) \
+                 set_state(PART:"check", "visible", 0.0); \
+               else \
+                 set_state(PART:"check", "default", 0.0); \
+            } \
+         } \
+         program { name: "check_on"; \
+            signal: "elm,state,check,on"; \
+            source: "elm"; \
+            script { \
+               set_int(check_state, CHECK_STATE_VISIBLE); \
+               set_state(PART:"check", "visible", 0.0); \
+            } \
+         } \
+         program { name: "check_off"; \
+            signal: "elm,state,check,off"; \
+            source: "elm"; \
+            action:  STATE_SET "default" 0.0; \
+            target: "check"; \
+            script { \
+               if(get_int(check_state) == CHECK_STATE_VISIBLE) \
+               { \
+                  set_int(check_state, CHECK_STATE_DEFAULT); \
+                  set_state(PART:"check", "default", 0.0); \
+               } \
+            } \
+         } \
+         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); \
+               get_state(PART:"check", st, 30, vl); \
+               if (!strcmp(st, "visible")) \
+               { \
+                  set_state(PART:"check", "disabled_visible", 0.0); \
+                  set_int(check_state, CHECK_STATE_DISABLED_VISIBLE); \
+               } \
+            } \
+         } \
+         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); \
+               get_state(PART:"check", st, 30, vl); \
+               if (!strcmp(st, "disabled_visible")) \
+               { \
+                  set_state(PART:"check", "visible", 0.0); \
+                  set_int(check_state, CHECK_STATE_VISIBLE); \
+               } \
+               else \
+                  set_int(check_state, CHECK_STATE_DEFAULT); \
+            } \
+         } \
+      } \
+   }
+
+////////////////////////////////////////////////////////////////////////////////
+CHECK_STYLE_DEFAULT("default", 26, 26)
+
+////////////////////////////////////////////////////////////////////////////////
+CHECK_STYLE_DEFAULT("default/extended", 60, 75)
+
+////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/check/base/multicheck";
       images {
          image: "00_check_bg.png" COMP;
          image: "00_check_bg_press.png" COMP;
          image: "00_check_bg_dim.png" COMP;
-         image: "00_check_checking.png" COMP;
-         image: "00_check_checking_press.png" COMP;
+         image: "multicheck_0001.png" COMP;
+         image: "multicheck_0002.png" COMP;
+         image: "multicheck_0003.png" COMP;
+         image: "multicheck_0004.png" COMP;
+         image: "multicheck_0005.png" COMP;
+         image: "multicheck_0006.png" COMP;
          image: "00_check_checking_dim.png" COMP;
       }
       script {
             description { state: "default" 0.0;
                rel2.relative: 0.0 1.0;
                align: 0.0 0.5;
-               min: 26 26;
-               max: 26 26;
+               min: 44 44;
+               max: 44 44;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                visible: 1;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               rel1.to: "bg"; 
+               rel1.to: "bg";
                rel2.to: "bg";
                visible: 0;
             }
+            description { state: "visible_1" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image.normal: "multicheck_0001.png";
+            }
+            description { state: "visible_2" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image.normal: "multicheck_0002.png";
+            }
+            description { state: "visible_3" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image.normal: "multicheck_0003.png";
+            }
+            description { state: "visible_4" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image.normal: "multicheck_0004.png";
+            }
+            description { state: "visible_5" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image.normal: "multicheck_0005.png";
+            }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               image.normal: "00_check_checking.png";
+               image.normal: "multicheck_0006.png";
             }
             description { state: "pressed" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               image.normal: "00_check_checking_press.png";
+               image.normal: "multicheck_0006.png";
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               text {            
+               text {
                   style: "check_label_textblock_disabled_style";
                   min: 1 1;
                }
                new st[31];
                new Float:vl;
                get_state(PART:"check", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                  set_state(PART:"check", "pressed", 0.0);
-            
+               if (!strcmp(st, "default"))
+                 set_state(PART:"check", "pressed", 0.0);
+               else
+                 set_state(PART:"check", "default", 0.0);
+
                set_state(PART:"bg", "pressed", 0.0);
             }
          }
-         program { name: "check_on";
-            signal: "elm,state,check,on";
-            source: "elm";
-            script {
-               set_int(check_state, 1);
-               if(get_int(check_state) == 1)
-                  set_state(PART:"check", "visible", 0.0);
-            }
-         }
-         program { name: "check_off";
-            signal: "elm,state,check,off";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "check";
+         program { name: "mouse,out";
+            signal: "mouse,out";
+            source: "events2";
             script {
                if(get_int(check_state) == 1)
-               {
-                  set_int(check_state, 0);
-                  set_state(PART:"check", "default", 0.0);
-               }
-            }
-         }
-         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);
+                 set_state(PART:"check", "visible", 0.0);
                else
-                  set_state(PART:"elm.swallow.content", "disabled", 0.0);
-   
-               get_state(PART:"check", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                  set_state(PART:"check", "disabled_visible", 0.0);
-               set_int(check_state, 2);
+                 set_state(PART:"check", "default", 0.0);
             }
          }
-         program { name: "enable";
-            signal: "elm,state,enabled";
+         program { name: "check_on";
+            signal: "elm,state,check,on";
             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);
-
-               get_state(PART:"check", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-               {  
-                  set_state(PART:"check", "visible", 0.0);
-                  set_int(check_state, 1);
-               }
-               else
-                  set_int(check_state, 0);
-            }
-         }
-      }
-   }
-
-   group { name: "elm/check/base/default/extended";
-      images {
-         image: "00_check_bg.png" COMP;
-         image: "00_check_bg_press.png" COMP;
-         image: "00_check_bg_dim.png" COMP;
-         image: "00_check_checking.png" COMP;
-         image: "00_check_checking_press.png" COMP;
-         image: "00_check_checking_dim.png" COMP;
-      }
-      script {
-         public check_state = 0; //0:default, 1: visible, 2: disabled_visible
-      }
-      parts {
-         part { name: "back_bg";
-            type: RECT;
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel2.relative: 0.0 1.0;
-               align: 0 0.5;
-               min: 60 75;
-               fixed: 1 0;
-               visible: 1;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "bg";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 26 26;
-               max: 26 26;
-               fixed: 1 1;
-               rel1{ to: "back_bg"; }
-               rel2{ to: "back_bg"; }
-               align: 0.5 0.5;
-               visible: 1;
-               image {
-                  normal: "00_check_bg.png";
-               }
-               fill.smooth : 0;
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               image {
-                  normal: "00_check_bg_press.png";
-               }
-               fill.smooth : 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image {
-                  normal: "00_check_bg_dim.png";
-               }
-               fill.smooth : 0;
-            }
-         }
-         part { name: "check";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1.to: "bg"; 
-               rel2.to: "bg";
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               image.normal: "00_check_checking.png";
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               image.normal: "00_check_checking_press.png";
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_check_checking_dim.png";
-               visible: 1;
+               set_int(check_state, 1);
             }
+            after: "check_on_1";
          }
-         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;
+         program { name: "check_on_1";
+            in: 0.05 0.0;
+            script {
+               if(get_int(check_state) == 1)
+                  set_state(PART:"check", "visible_1", 0.0);
             }
-            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: 0 1;
-               rel1 { relative: 1.0 0.5; offset: 1 1; to_x: "elm.swallow.content"; }
-               rel2 { relative: 1.0 0.5; offset: -2 -2; }
-               align: 0.0 0.5;
-               text {
-                  style: "check_label_textblock_style";
-                  min: 0 0;
-               }
-            }
-            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 { 
-                  style: "check_label_textblock_disabled_style";
-                  min: 1 1;
-               }
-            }
-         }
-         part { name: "events1";
-            type: RECT;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "events2";
-            type: RECT;
-            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: "click";
-            signal: "mouse,clicked,1";
-            source: "events1";
-         action: SIGNAL_EMIT "elm,action,check,toggle" "";
-         }
-         program { name: "bg_normal";
-            signal: "mouse,up,1";
-            source: "events2";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"check", st, 30, vl);
-               if (!strcmp(st, "pressed"))
-                  set_state(PART:"check", "visible", 0.0);
-               set_state(PART:"bg", "default", 0.0);
-            }
-         }
-         program { name: "pressed";
-            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:"check", "pressed", 0.0);
-            
-               set_state(PART:"bg", "pressed", 0.0);
-            }
-         }
-         program { name: "check_on";
-            signal: "elm,state,check,on";
-            source: "elm";
-            script {
-               set_int(check_state, 1);
-               if(get_int(check_state) == 1)
-                  set_state(PART:"check", "visible", 0.0);
-            }
-         }
-         program { name: "check_off";
-            signal: "elm,state,check,off";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "check";
-            script {
-               if(get_int(check_state) == 1)
-               {
-                  set_int(check_state, 0);
-                  set_state(PART:"check", "default", 0.0);
-               }
-            }
-         }
-         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);
-
-               get_state(PART:"check", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                  set_state(PART:"check", "disabled_visible", 0.0);
-               set_int(check_state, 2);
-            }
-         }
-         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);
-
-               get_state(PART:"check", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-               {  
-                  set_state(PART:"check", "visible", 0.0);
-                  set_int(check_state, 1);
-               }
-               else
-                  set_int(check_state, 0);
-            }
-         }
-      }
-   }
-////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/check/base/multicheck";
-      images {
-         image: "00_check_bg.png" COMP;
-         image: "00_check_bg_press.png" COMP;
-         image: "00_check_bg_dim.png" COMP;
-         image: "multicheck_0001.png" COMP;
-         image: "multicheck_0002.png" COMP;
-         image: "multicheck_0003.png" COMP;
-         image: "multicheck_0004.png" COMP;
-         image: "multicheck_0005.png" COMP;
-         image: "multicheck_0006.png" COMP;
-         //image: "00_check_checked.png" COMP;
-         //image: "00_check_checking.png" COMP;
-         image: "00_check_checking_dim.png" COMP;
-      }
-      script {
-         public check_state = 0; //0:default, 1: visible, 2: disabled_visible
-      }
-      parts {
-         part { name: "bg";
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel2.relative: 0.0 1.0;
-               align: 0.0 0.5;
-               min: 44 44;
-               max: 44 44;
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-               visible: 1;          
-               image {
-                  normal: "00_check_bg.png";
-               }
-               fill.smooth : 0;
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               image {
-                  normal: "00_check_bg_press.png";
-               }
-               fill.smooth : 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image {
-                  normal: "00_check_bg_dim.png";
-               }
-               fill.smooth : 0;
-            }
-         }
-         part { name: "check";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1.to: "bg"; 
-               rel2.to: "bg";
-               visible: 0;
-            }
-            description { state: "visible_1" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               image.normal: "multicheck_0001.png";
-            }
-            description { state: "visible_2" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               image.normal: "multicheck_0002.png";
-            }
-            description { state: "visible_3" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               image.normal: "multicheck_0003.png";
-            }
-            description { state: "visible_4" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               image.normal: "multicheck_0004.png";
-            }
-            description { state: "visible_5" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               image.normal: "multicheck_0005.png";
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               image.normal: "multicheck_0006.png";
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               image.normal: "multicheck_0006.png";
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_check_checking_dim.png";
-               visible: 1;
-            }
-         }
-         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: 0 1;
-               rel1 { relative: 1.0 0.5; offset: 1 1; to_x: "elm.swallow.content"; }
-               rel2 { relative: 1.0 0.5; offset: -2 -2; }
-               align: 0.0 0.5;
-               text {
-                  style: "check_label_textblock_style";
-                  min: 0 0;
-               }
-            }
-            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 {            
-                  style: "check_label_textblock_disabled_style";
-                  min: 1 1;
-               }
-            }
-         }
-         part { name: "events1";
-            type: RECT;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "events2";
-            type: RECT;
-            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: "click";
-            signal: "mouse,clicked,1";
-            source: "events1";
-         action: SIGNAL_EMIT "elm,action,check,toggle" "";
-         }
-         program { name: "bg_normal";
-            signal: "mouse,up,1";
-            source: "events2";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"check", st, 30, vl);
-               if (!strcmp(st, "pressed"))
-                  set_state(PART:"check", "visible", 0.0);
-               set_state(PART:"bg", "default", 0.0);
-            }
-         }
-         program { name: "pressed";
-            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:"check", "pressed", 0.0);
-            
-               set_state(PART:"bg", "pressed", 0.0);
-            }
-         }
-         program { name: "check_on";
-            signal: "elm,state,check,on";
-            source: "elm";
-            script {
-               set_int(check_state, 1);
-            }
-            after: "check_on_1";
-         }
-         program { name: "check_on_1";
-            in: 0.05 0.0;
-            script {
-               if(get_int(check_state) == 1)
-                  set_state(PART:"check", "visible_1", 0.0);
-            }
-            after: "check_on_2";
-         }
-         program { name: "check_on_2";
-            in: 0.05 0.0;
-            script {
-               if(get_int(check_state) == 1)
-                  set_state(PART:"check", "visible_2", 0.0);
-            }
-            after: "check_on_3";
-         }
-         program { name: "check_on_3";
-            in: 0.05 0.0;
-            script {
-               if(get_int(check_state) == 1)
-                  set_state(PART:"check", "visible_3", 0.0);
-            }
-            after: "check_on_4";
-         }
-         program { name: "check_on_4";
-            in: 0.05 0.0;
-            script {
-               if(get_int(check_state) == 1)
-                  set_state(PART:"check", "visible_4", 0.0);
-            }
-            after: "check_on_5";
-         }
-         program { name: "check_on_5";
-            in: 0.05 0.0;
-            script {
-               if(get_int(check_state) == 1)
-                  set_state(PART:"check", "visible_5", 0.0);
-            }
-            after: "check_on_6";
-         }
-         program { name: "check_on_6";
-            in: 0.05 0.0;
-            script {
-               if(get_int(check_state) == 1)
-                  set_state(PART:"check", "visible", 0.0);
-            }
-         }
-         program { name: "check_off";
-            signal: "elm,state,check,off";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "check";
-            script {
-               if(get_int(check_state) == 1)
-               {
-                  set_int(check_state, 0);
-                  set_state(PART:"check", "default", 0.0);
-               }
-            }
-         }
-         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);
-
-               get_state(PART:"check", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                  set_state(PART:"check", "disabled_visible", 0.0);
-               set_int(check_state, 2);
-            }
-         }
-         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);
-
-               get_state(PART:"check", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-               {  
-                  set_state(PART:"check", "visible", 0.0);
-                  set_int(check_state, 1);
-               }
-               else
-                  set_int(check_state, 0);
-            }
-         }
-      }
-   }
-
-////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/check/base/on&off";
-      images {
-         image: "00_check_off.png" COMP;
-         //image: "00_check_off_press.png" COMP;
-         image: "00_check_on.png" COMP;
-         //image: "00_check_on_press.png" COMP;
-      }
-      parts {
-         part { 
-            name: "bg";
-            mouse_events: 1;
-            scale: 1;
-            type: RECT;
-            description { state: "default" 0.0;
-               rel2.relative: 0.0 1.0;
-               fixed: 1 0;
-               align: 0.0 0.5;
-               min: 38 50;
-               max: 38 50;
-               color: 0 0 0 0;
-            }
-         }
-      part { name: "check";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1.to: "bg";
-               rel2.to: "bg";
-               visible: 1;
-               image {
-                  normal: "00_check_off.png";
-                  border: 16 12 14 14;
-                  middle: 1;
-                  border_scale: 1;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               image {
-                  normal: "00_check_on.png";
-               }
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               /*image {
-                  normal: "00_check_off_press.png";
-               }*/
-            }
-            description { state: "visible_pressed" 0.0;
-               inherit: "default" 0.0;
-               /*image {
-                  normal: "00_check_on_press.png";
-               }*/
-            }
-         }
-         part { name: "text_onoff";
-            type: TEXT;
-            mouse_events: 0;
-            scale:1;
-            description { state: "default" 0.0;
-               visible: 1;
-               rel1.to: "check";
-               rel2.to: "check";
-               rel2.relative: 0.85 1.0;
-               text {
-                  font: "SLP:style=Medium";
-                  size: 20;
-                  min: 0 0;
-                  align: 1.0 0.5;
-                  text: "OFF";
-               }
-            }
-            description { state: "on" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 0.15 0.0;      
-               text {
-                  font: "SLP:style=Medium";
-                  size: 20;
-                  min: 0 0;
-                  align: 0.0 0.5;
-                  text: "ON";
-               }
-            }
-         }
-         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: 0 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;
-               }
-            }
-            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 {            
-                  style: "check_label_textblock_disabled_style";
-                  min: 1 1;
-               }
-            }
-         }
-         part { name: "events";
-            type: RECT;
-            ignore_flags: ON_HOLD;
-            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;
-               color: 0 0 0 128;
+            after: "check_on_2";
+         }
+         program { name: "check_on_2";
+            in: 0.05 0.0;
+            script {
+               if(get_int(check_state) == 1)
+                  set_state(PART:"check", "visible_2", 0.0);
             }
+            after: "check_on_3";
          }
-      }
-      programs {
-         program { name: "click";
-            signal: "mouse,up,1";
-            source: "events";
-            action: SIGNAL_EMIT "elm,action,check,toggle" "";
+         program { name: "check_on_3";
+            in: 0.05 0.0;
+            script {
+               if(get_int(check_state) == 1)
+                  set_state(PART:"check", "visible_3", 0.0);
+            }
+            after: "check_on_4";
          }
-         program { name: "pressed";
-            signal: "mouse,down,1";
-            source: "events";
+         program { name: "check_on_4";
+            in: 0.05 0.0;
             script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"check", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                  set_state(PART:"check", "visible_pressed", 0.0);
-               else if (!strcmp(st, "default"))
-                  set_state(PART:"check", "pressed", 0.0);
+               if(get_int(check_state) == 1)
+                  set_state(PART:"check", "visible_4", 0.0);
             }
+            after: "check_on_5";
          }
-         program { name: "mouseout";
-            signal: "mouse,out";
-            source: "events";
-            after: "bg_check_normal";
+         program { name: "check_on_5";
+            in: 0.05 0.0;
+            script {
+               if(get_int(check_state) == 1)
+                  set_state(PART:"check", "visible_5", 0.0);
+            }
+            after: "check_on_6";
          }
-         program { name: "bg_check_normal";
+         program { name: "check_on_6";
+            in: 0.05 0.0;
             script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"check", st, 30, vl);
-               if (!strcmp(st, "pressed"))
-                  set_state(PART:"check", "default", 0.0);
-               else if (!strcmp(st, "visible_pressed"))
+               if(get_int(check_state) == 1)
                   set_state(PART:"check", "visible", 0.0);
             }
          }
-         program { name: "check_on";
-            signal: "elm,state,check,on";
-            source: "elm";
-            action:  STATE_SET "visible" 0.0;
-            target: "check";
-            after: "text_on";
-         }
-         program { name: "text_on";
-            action:  STATE_SET "on" 0.0;
-            target: "text_onoff";
-         }
          program { name: "check_off";
             signal: "elm,state,check,off";
             source: "elm";
             action:  STATE_SET "default" 0.0;
             target: "check";
-            after: "text_off";
-         }
-         program { name: "text_off";
-            action:  STATE_SET "default" 0.0;
-            target: "text_onoff";
+            script {
+               if(get_int(check_state) == 1)
+               {
+                  set_int(check_state, 0);
+                  set_state(PART:"check", "default", 0.0);
+               }
+            }
          }
          program { name: "text_show";
             signal: "elm,state,text,visible";
             source: "elm";
             action: STATE_SET "disabled" 0.0;
             target: "disabler";
+            target: "bg";
             after: "disable_text";
          }
          program { name: "disable_text";
                   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);
+
+               get_state(PART:"check", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"check", "disabled_visible", 0.0);
+               set_int(check_state, 2);
             }
          }
          program { name: "enable";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "disabler";
+            target: "bg";
             after: "enable_text";
          }
          program { name: "enable_text";
                   set_state(PART:"elm.swallow.content", "visible", 0.0);
                else
                   set_state(PART:"elm.swallow.content", "default", 0.0);
+
+               get_state(PART:"check", st, 30, vl);
+               if (!strcmp(st, "disabled_visible"))
+               {
+                  set_state(PART:"check", "visible", 0.0);
+                  set_int(check_state, 1);
+               }
+               else
+                  set_int(check_state, 0);
             }
          }
       }
    }
 
 ////////////////////////////////////////////////////////////////////////////////
-// check favorite style
-
-group { name: "elm/check/base/favorite";
+   group { name: "elm/check/base/on&off";
       images {
-         image: "00_winset_icon_favorite_off.png" COMP;
-         image: "00_winset_icon_favorite_on.png" COMP;
+         image: "00_check_off.png" COMP;
+         //image: "00_check_off_press.png" COMP;
+         image: "00_check_on.png" COMP;
+         //image: "00_check_on_press.png" COMP;
       }
       parts {
-         part { name: "bg";
-            type: RECT;
+         part {
+            name: "bg";
             mouse_events: 1;
             scale: 1;
+            type: RECT;
             description { state: "default" 0.0;
-               rel2.relative: 1.0 1.0;
+               rel2.relative: 0.0 1.0;
+               fixed: 1 0;
                align: 0.0 0.5;
-               min: 40 40;
-               max: 40 40;
+               min: 38 50;
+               max: 38 50;
                color: 0 0 0 0;
             }
          }
-         part { name: "check";
+      part { name: "check";
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               rel1.to: "bg"; 
+               rel1.to: "bg";
                rel2.to: "bg";
                visible: 1;
-               image.normal: "00_winset_icon_favorite_off.png";
-               color: 255 255 255 255;
+               image {
+                  normal: "00_check_off.png";
+                  border: 16 12 14 14;
+                  border_scale: 1;
+               }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
-               image.normal: "00_winset_icon_favorite_on.png";
+               image {
+                  normal: "00_check_on.png";
+               }
             }
-            description { state: "disabled" 0.0;
+            description { state: "pressed" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_winset_icon_favorite_off.png";
-               color: 128 128 128 255;
-               visible: 1;
+               image {
+                  normal: "00_check_off.png";
+               }
             }
-            description { state: "disabled_visible" 0.0;
+            description { state: "visible_pressed" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_winset_icon_favorite_on.png";
-               color: 128 128 128 255;
+               image {
+                  normal: "00_check_on.png";
+               }
+            }
+         }
+         part { name: "text_onoff";
+            type: TEXT;
+            mouse_events: 0;
+            scale:1;
+            description { state: "default" 0.0;
                visible: 1;
+               rel1.to: "check";
+               rel2.to: "check";
+               rel2.relative: 0.85 1.0;
+               text {
+                  font: "SLP:style=Medium";
+                  size: 20;
+                  min: 0 0;
+                  align: 1.0 0.5;
+                  text: "OFF";
+               }
+            }
+            description { state: "on" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 0.15 0.0;
+               text {
+                  font: "SLP:style=Medium";
+                  size: 20;
+                  min: 0 0;
+                  align: 0.0 0.5;
+                  text: "ON";
+               }
             }
          }
          part { name: "elm.swallow.content";
@@ -1427,6 +887,7 @@ group { name: "elm/check/base/favorite";
                fixed: 0 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";
@@ -1444,7 +905,7 @@ group { name: "elm/check/base/favorite";
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               text {            
+               text {
                   style: "check_label_textblock_disabled_style";
                   min: 1 1;
                }
@@ -1454,8 +915,6 @@ group { name: "elm/check/base/favorite";
             type: RECT;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
-               rel1.to: "bg";
-               align: 0.0 0.5;
                color: 0 0 0 0;
             }
          }
@@ -1468,26 +927,66 @@ group { name: "elm/check/base/favorite";
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
                visible: 1;
+               color: 0 0 0 128;
             }
          }
       }
       programs {
          program { name: "click";
-            signal: "mouse,clicked,1";
+            signal: "mouse,up,1";
             source: "events";
-         action: SIGNAL_EMIT "elm,action,check,toggle" "";
+            action: SIGNAL_EMIT "elm,action,check,toggle" "";
+         }
+         program { name: "pressed";
+            signal: "mouse,down,1";
+            source: "events";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"check", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"check", "visible_pressed", 0.0);
+               else if (!strcmp(st, "default"))
+                  set_state(PART:"check", "pressed", 0.0);
+            }
+         }
+         program { name: "mouseout";
+            signal: "mouse,out";
+            source: "events";
+            after: "bg_check_normal";
+         }
+         program { name: "bg_check_normal";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"check", st, 30, vl);
+               if (!strcmp(st, "pressed"))
+                  set_state(PART:"check", "default", 0.0);
+               else if (!strcmp(st, "visible_pressed"))
+                  set_state(PART:"check", "visible", 0.0);
+            }
          }
          program { name: "check_on";
             signal: "elm,state,check,on";
             source: "elm";
             action:  STATE_SET "visible" 0.0;
             target: "check";
+            after: "text_on";
+         }
+         program { name: "text_on";
+            action:  STATE_SET "on" 0.0;
+            target: "text_onoff";
          }
          program { name: "check_off";
             signal: "elm,state,check,off";
             source: "elm";
             action:  STATE_SET "default" 0.0;
             target: "check";
+            after: "text_off";
+         }
+         program { name: "text_off";
+            action:  STATE_SET "default" 0.0;
+            target: "text_onoff";
          }
          program { name: "text_show";
             signal: "elm,state,text,visible";
@@ -1529,18 +1028,11 @@ group { name: "elm/check/base/favorite";
                   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);
-   
-               get_state(PART:"check", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                  set_state(PART:"check", "disabled_visible", 0.0);
-               else
-                  set_state(PART:"check", "disabled", 0.0);
             }
          }
          program { name: "enable";
@@ -1565,267 +1057,264 @@ group { name: "elm/check/base/favorite";
                   set_state(PART:"elm.swallow.content", "visible", 0.0);
                else
                   set_state(PART:"elm.swallow.content", "default", 0.0);
-
-               get_state(PART:"check", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-                  set_state(PART:"check", "visible", 0.0);
-               else
-                  set_state(PART:"check", "default", 0.0);
             }
          }
       }
    }
 
-  group { name: "elm/check/base/favorite/extended";
-     images {
-        image: "00_winset_icon_favorite_off.png" COMP;
-        image: "00_winset_icon_favorite_on.png" COMP;
-     }
-     parts {
-        part { name: "back_bg";
-            type: RECT;
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel2.relative: 0.0 1.0;
-               align: 0 0.5;
-               min: 60 75;
-               fixed: 1 0;
-               visible: 1;
-               color: 0 0 0 0;
-            }
-         }
-        part { name: "bg";
-           type: RECT;
-           mouse_events: 1;
-           scale: 1;
-           description { state: "default" 0.0;
-              rel2.relative: 1.0 1.0;
-              align: 0.5 0.5;
-              rel1 { to: "back_bg"; }
-              rel2 { to: "back_bg"; }
-              min: 40 40;
-              max: 40 40;
-              fixed: 1 1;
-              color: 0 0 0 0;
-           }
-        }
-        part { name: "check";
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              rel1.to: "bg"; 
-              rel2.to: "bg";
-              visible: 1;
-              image.normal: "00_winset_icon_favorite_off.png";
-              color: 255 255 255 255;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              image.normal: "00_winset_icon_favorite_on.png";
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "00_winset_icon_favorite_off.png";
-              color: 128 128 128 255;
-              visible: 1;
-           }
-           description { state: "disabled_visible" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "00_winset_icon_favorite_on.png";
-              color: 128 128 128 255;
-              visible: 1;
-           }
-        }
-        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: 0 1;
-              rel1 { relative: 1.0 0.5; offset: 1 1; to_x: "elm.swallow.content"; }
-              rel2 { relative: 1.0 0.5; offset: -2 -2; }
-              align: 0.0 0.5;
-              text {
-                style: "check_label_textblock_style";
-                min: 0 0;
-              }
-           }
-           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 { 
-                style: "check_label_textblock_disabled_style";
-                min: 1 1;
-              }
-           }
-        }
-        part { name: "events";
-           type: RECT;
-           ignore_flags: ON_HOLD;
-           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;
-           }
-        }
+///////////////////////////////////////////////////////////////////////////////////////
+#define CHECK_STYLE_FAVORITE(style_name, min_width, min_height) \
+   group { name: "elm/check/base/"style_name; \
+      images { \
+         image: "00_winset_icon_favorite_off.png" COMP; \
+         image: "00_winset_icon_favorite_on.png" COMP; \
+      } \
+      parts { \
+         part { name: "back_bg"; \
+            type: RECT; \
+            mouse_events: 1; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+                rel2.relative: 0.0 1.0; \
+               align: 0 0.5; \
+               min: min_width min_height; \
+               fixed: 1 0; \
+               visible: 1; \
+               color: 0 0 0 0; \
+            } \
+         } \
+         part { name: "bg"; \
+            type: RECT; \
+            mouse_events: 1; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               rel2.relative: 1.0 1.0; \
+               align: 0.5 0.5; \
+               rel1 { to: "back_bg"; } \
+               rel2 { to: "back_bg"; } \
+              min: 40 40; \
+               max: 40 40; \
+               fixed: 1 1; \
+               color: 0 0 0 0; \
+            } \
+         } \
+         part { name: "check"; \
+            mouse_events: 0; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               rel1.to: "bg"; \
+               rel2.to: "bg"; \
+               visible: 1; \
+               image.normal: "00_winset_icon_favorite_off.png"; \
+               color: 255 255 255 255; \
+            } \
+            description { state: "visible" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+               image.normal: "00_winset_icon_favorite_on.png"; \
+            } \
+            description { state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_winset_icon_favorite_off.png"; \
+               color: 128 128 128 255; \
+               visible: 1; \
+            } \
+            description { state: "disabled_visible" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_winset_icon_favorite_on.png"; \
+               color: 128 128 128 255; \
+               visible: 1; \
+            } \
+         } \
+         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: 0 1; \
+               rel1 { relative: 1.0 0.5; offset: 1 1; to_x: "elm.swallow.content"; } \
+               rel2 { relative: 1.0 0.5; offset: -2 -2; } \
+               align: 0.0 0.5; \
+               text { \
+                 style: "check_label_textblock_style"; \
+                 min: 0 0; \
+               } \
+            } \
+            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 { \
+                 style: "check_label_textblock_disabled_style"; \
+                 min: 1 1; \
+               } \
+            } \
+         } \
+         part { name: "events"; \
+            type: RECT; \
+            ignore_flags: ON_HOLD; \
+            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: "click"; \
+            signal: "mouse,up,1"; \
+            source: "events"; \
+         action: SIGNAL_EMIT "elm,action,check,toggle" ""; \
+         } \
+         program { name: "check_on"; \
+            signal: "elm,state,check,on"; \
+            source: "elm"; \
+            action:  STATE_SET "visible" 0.0; \
+            target: "check"; \
+         } \
+         program { name: "check_off"; \
+            signal: "elm,state,check,off"; \
+            source: "elm"; \
+            action:  STATE_SET "default" 0.0; \
+            target: "check"; \
+         } \
+         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"; \
+            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); \
+               get_state(PART:"check", st, 30, vl); \
+               if (!strcmp(st, "visible")) \
+                 set_state(PART:"check", "disabled_visible", 0.0); \
+               else \
+                  set_state(PART:"check", "disabled", 0.0); \
+            } \
+         } \
+         program { name: "enable"; \
+            signal: "elm,state,enabled"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+           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); \
+               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); \
+               get_state(PART:"check", st, 30, vl); \
+               if (!strcmp(st, "disabled_visible")) \
+                 set_state(PART:"check", "visible", 0.0); \
+               else \
+                 set_state(PART:"check", "default", 0.0); \
+            } \
+         } \
+      } \
    }
-   programs {
-        program { name: "click";
-           signal: "mouse,up,1";
-           source: "events";
-        action: SIGNAL_EMIT "elm,action,check,toggle" "";
-        }
-        program { name: "check_on";
-           signal: "elm,state,check,on";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "check";
-        }
-        program { name: "check_off";
-           signal: "elm,state,check,off";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "check";
-        }
-        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";
-           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);
-   
-              get_state(PART:"check", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"check", "disabled_visible", 0.0);
-              else
-                 set_state(PART:"check", "disabled", 0.0);
-           }
-        }
-        program { name: "enable";
-           signal: "elm,state,enabled";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           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);
-
-              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);
+////////////////////////////////////////////////////////////////////////////////
+CHECK_STYLE_FAVORITE("favorite", 40, 40)
 
-              get_state(PART:"check", st, 30, vl);
-              if (!strcmp(st, "disabled_visible"))
-                set_state(PART:"check", "visible", 0.0);
-              else
-                set_state(PART:"check", "default", 0.0);
-           }
-        }
-      }
-   }
+////////////////////////////////////////////////////////////////////////////////
+CHECK_STYLE_FAVORITE("favorite/extended", 60, 75)
 
 ////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/check/base/delete";
@@ -1840,7 +1329,7 @@ group { name: "elm/check/base/favorite";
          public button_state = 0; //0:enabled, 1: disabled
       }
       parts {
-         part { 
+         part {
             name: "bg";
             mouse_events: 1;
             scale: 1;
@@ -1870,7 +1359,7 @@ group { name: "elm/check/base/favorite";
                image.normal: "00_button_delete_dim.png";
             }
          }
-         part { 
+         part {
             name: "clipper";
             type: RECT;
             mouse_events: 0;
@@ -1888,7 +1377,7 @@ group { name: "elm/check/base/favorite";
                color: 255 255 255 255;
             }
          }
-         part { 
+         part {
             name: "bg_expand";
             mouse_events: 0;
             scale: 1;
@@ -1961,7 +1450,7 @@ group { name: "elm/check/base/favorite";
                align: 0.8 0.5;
                min: 75 40;
                max: 75 40;
-               color: CHECK_DELETE_TEXT_DELETE_NORMAL_COLOR_INC;     
+               color: CHECK_DELETE_TEXT_DELETE_NORMAL_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 20;
@@ -2035,7 +1524,7 @@ group { name: "elm/check/base/favorite";
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               text {            
+               text {
                   style: "check_label_textblock_disabled_style";
                   min: 1 1;
                }
@@ -2078,7 +1567,7 @@ group { name: "elm/check/base/favorite";
             description { state: "default" 0.0;
                rel2.to_x: "elm.text";
                color: 0 0 0 0;
-               visible: 0;          
+               visible: 0;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -2110,7 +1599,7 @@ group { name: "elm/check/base/favorite";
                new Float:vl;
                get_state(PART:"bg", st, 30, vl);
                if (!strcmp(st, "on")) {
-                  emit("elm,action,check,toggle", ""); 
+                  emit("elm,action,check,toggle", "");
                }
             }
          }
@@ -2243,7 +1732,6 @@ group { name: "elm/check/base/favorite";
                   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);
@@ -2293,7 +1781,7 @@ group { name: "elm/check/base/favorite";
          public button_state = 0; //0:enabled, 1: disabled
       }
       parts {
-         part { 
+         part {
             name: "bg";
             mouse_events: 1;
             scale: 1;
@@ -2323,7 +1811,7 @@ group { name: "elm/check/base/favorite";
                image.normal: "00_button_delete_dim.png";
             }
          }
-         part { 
+         part {
             name: "clipper";
             type: RECT;
             mouse_events: 0;
@@ -2341,7 +1829,7 @@ group { name: "elm/check/base/favorite";
                color: 255 255 255 255;
             }
          }
-         part { 
+         part {
             name: "bg_expand";
             mouse_events: 0;
             scale: 1;
@@ -2414,7 +1902,7 @@ group { name: "elm/check/base/favorite";
                align: 0.8 0.5;
                min: 75 40;
                max: 75 40;
-               color: CHECK_DELETE_TEXT_DELETE_NORMAL_COLOR_INC;     
+               color: CHECK_DELETE_TEXT_DELETE_NORMAL_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 20;
@@ -2488,7 +1976,7 @@ group { name: "elm/check/base/favorite";
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               text {            
+               text {
                   style: "check_label_textblock_disabled_style";
                   min: 1 1;
                }
@@ -2571,7 +2059,7 @@ group { name: "elm/check/base/favorite";
                new Float:vl;
                get_state(PART:"bg", st, 30, vl);
                if (!strcmp(st, "on")) {
-                  emit("elm,action,check,toggle", ""); 
+                  emit("elm,action,check,toggle", "");
                }
             }
          }
@@ -2704,7 +2192,6 @@ group { name: "elm/check/base/favorite";
                   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);
@@ -2741,13 +2228,13 @@ group { name: "elm/check/base/favorite";
          }
       }
    }
+
 ////////////////////////////////////////////////////////////////////////////////
    group {
       name: "elm/check/base/grid";
       images {
             image: "00_grid_select_check.png" COMP;
       }
-
       parts {
          part {
             name: "bg";
@@ -2795,7 +2282,6 @@ group { name: "elm/check/base/favorite";
                visible: 0;
             }
          }
-
          part {
             name: "selected_bg";
             type: RECT;
@@ -2814,7 +2300,6 @@ group { name: "elm/check/base/favorite";
                visible: 1;
             }
          }
-
          part {
             name: "check";
             mouse_events: 0;
@@ -2942,7 +2427,6 @@ group { name: "elm/check/base/favorite";
             }
          }
       }
-
       programs {
          program {
             name: "click";
@@ -3054,13 +2538,11 @@ group { name: "elm/check/base/favorite";
                   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);
-
                get_state(PART:"check", st, 30, vl);
                if (!strcmp(st, "visible"))
                         set_state(PART:"check", "disabled_visible", 0.0);
@@ -3092,7 +2574,6 @@ group { name: "elm/check/base/favorite";
                   set_state(PART:"elm.swallow.content", "visible", 0.0);
                else
                   set_state(PART:"elm.swallow.content", "default", 0.0);
-
                get_state(PART:"check", st, 30, vl);
                if (!strcmp(st, "disabled_visible"))
                   set_state(PART:"check", "visible", 0.0);
@@ -3101,3 +2582,7 @@ group { name: "elm/check/base/favorite";
       }
    }
 
+#undef CHECK_STATE_DEFAULT
+#undef CHECK_STATE_VISIBLE
+#undef CHECK_STATE_DISABLED_VISIBLE
+#undef CHECK_STATE_DISABLED
index 09fdd46..2bc617c 100644 (file)
  *
  */
 
+#define RADIO_STATE_DEFAULT 0
+#define RADIO_STATE_VISIBLE 1
+#define RADIO_STATE_DISABLED_VISIBLE 2
+#define RADIO_STATE_DISABLED 3
+
    styles {
       style { name: "radio_label_textblock_style";
          base: "font=SLP:style=Medium font_size=14 color=#ffffff wrap=char";
          tag: "tab" "\t";
       }
    }
-   group { name: "elm/radio/base/default";
-      images {
-         image: "00_button_radio.png" COMP;
-         image: "00_button_radio_press.png" COMP;
-         image: "00_button_radio_focus.png" COMP;
-         image: "00_button_radio_dim.png" COMP;
-      }
-      parts {
-         part { name: "bg";
-            mouse_events: 1;
-            scale: 1;
-            type: RECT;
-            description { state: "default" 0.0;
-               rel1.offset: 0 0;
-               rel2.relative: 0.0 1.0;
-               rel2.offset: 0 0;
-               fixed: 1 0;
-               align: 0.0 0.5;
-               min: 26 26;
-               max: 26 26;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "radio";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  to: "bg";
-                  offset: 0 0;
-               }
-               rel2 {
-                  to: "bg";
-                  offset: 0 0;
-               }
-               visible: 1;
-               color: 255 255 255 255;
-               image.normal: "00_button_radio.png";
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_radio_focus.png";
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_radio_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_radio_dim.png";
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_radio_dim.png";
-            }
-         }
-         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: 0 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: "radio_label_textblock_style";
-                  min: 0 0;
-               }
-            }
-            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 {            
-                  style: "radio_label_textblock_disabled_style";
-                  min: 1 1;
-               }
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            type: RECT;
-            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;
-               color: 0 0 0 0;
-            }
-         }
-      }
-      programs {
-         program { name: "click";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: SIGNAL_EMIT "elm,action,radio,toggle" "";
-         }
-         program { name: "mouse_up";
-            signal: "mouse,up,1";
-            source: "over2";
-            after: "bg_radio_normal";
-         }
-         program { name: "bg_radio_normal";
-            script {
-            new st[31];
-               new Float:vl;
-               get_state(PART:"radio", st, 30, vl);
-               if (!strcmp(st, "pressed"))
-                  set_state(PART:"radio", "default", 0.0);
-               set_state(PART:"bg", "default", 0.0);
-            }
-         }
-         program { name: "pressed";
-            signal: "mouse,down,1";
-            source: "over2";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"radio", st, 30, vl);
-               if (!strcmp(st, "default"))
-                  set_state(PART:"radio", "pressed", 0.0);
-            }
-         }
-         program { name: "radio_on";
-            signal: "elm,state,radio,on";
-            source: "elm";
-            action:  STATE_SET "visible" 0.0;
-            target: "radio";
-         }
-         program { name: "radio_off";
-            signal: "elm,state,radio,off";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "radio";
-         }
-         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";
-            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);
-               
-               get_state(PART:"radio", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                  set_state(PART:"radio", "disabled_visible", 0.0);
-               else
-                  set_state(PART:"radio", "disabled", 0.0);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            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);
-
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-                  set_state(PART:"elm.swallow.content", "visible", 0.0);
-               else
-                  set_state(PART:"elm.swallow.content", "default", 0.0);
-                  
-               get_state(PART:"radio", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-                  set_state(PART:"radio", "visible", 0.0);
-               else
-                  set_state(PART:"radio", "default", 0.0);
-            }
-         }
-      }
+///////////////////////////////////////////////////////////////////////////////////////
+#define RADIO_STYLE_DEFAULT(style_name, min_width, min_height) \
+   group { name: "elm/radio/base/"style_name; \
+      images { \
+         image: "00_button_radio_normal1.png" COMP; \
+         image: "00_button_radio_normal2.png" COMP; \
+         image: "00_button_radio_press1.png" COMP; \
+         image: "00_button_radio_press2.png" COMP; \
+      } \
+      script { \
+         public radio_state = RADIO_STATE_DEFAULT; \
+      } \
+      parts { \
+         part { name: "back_bg"; \
+            type: RECT; \
+            mouse_events: 1; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               rel2.relative: 0.0 1.0; \
+               align: 0 0.5; \
+               min: min_width min_height; \
+               fixed: 1 0; \
+               visible: 1; \
+               color: 0 0 0 0; \
+            } \
+         } \
+         part { name: "bg"; \
+            mouse_events: 1; \
+            scale: 1; \
+            type: RECT; \
+            description { state: "default" 0.0; \
+               rel1{ to: "back_bg"; } \
+               rel2{ to: "back_bg"; } \
+               fixed: 1 1; \
+               align: 0.5 0.5; \
+               min: 26 26; \
+               max: 26 26; \
+               color: 0 0 0 0; \
+            } \
+         } \
+         part { name: "radio"; \
+            mouse_events: 0; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               rel1 { \
+                  to: "bg"; \
+                  offset: 0 0; \
+               } \
+               rel2 { \
+                  to: "bg"; \
+                  offset: 0 0; \
+               } \
+               visible: 1; \
+               color: 255 255 255 255; \
+               image.normal: "00_button_radio_normal2.png"; \
+            } \
+            description { state: "visible" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_button_radio_normal1.png"; \
+               color: 255 255 255 255; \
+            } \
+            description { state: "pressed" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_button_radio_press2.png"; \
+               color: 255 255 255 255; \
+            } \
+            description { state: "pressed_visible" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_button_radio_press1.png"; \
+               color: 255 255 255 255; \
+            } \
+            description { state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               color: 255 255 255 128; \
+            } \
+            description { state: "disabled_visible" 0.0; \
+               inherit: "visible" 0.0; \
+               color: 255 255 255 128; \
+            } \
+         } \
+         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: 0 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: "radio_label_textblock_style"; \
+                  min: 0 0; \
+               } \
+            } \
+            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 { \
+                  style: "radio_label_textblock_disabled_style"; \
+                  min: 1 1; \
+               } \
+            } \
+         } \
+         part { name: "over1"; \
+            type: RECT; \
+            ignore_flags: ON_HOLD; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+            } \
+         } \
+         part { name: "over2"; \
+            type: RECT; \
+            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; \
+               color: 0 0 0 0; \
+            } \
+         } \
+      } \
+      programs { \
+         program { name: "click"; \
+            signal: "mouse,clicked,1"; \
+            source: "over1"; \
+            action: SIGNAL_EMIT "elm,action,radio,toggle" ""; \
+         } \
+         program { name: "mouse_up"; \
+            signal: "mouse,up,1"; \
+            source: "over2"; \
+            after: "bg_radio_normal"; \
+         } \
+         program { name: "bg_radio_normal"; \
+            script { \
+            new st[31]; \
+               new Float:vl; \
+               get_state(PART:"radio", st, 30, vl); \
+               if(get_int(radio_state) == RADIO_STATE_VISIBLE) \
+                 set_state(PART:"radio", "visible", 0.0); \
+               else if(get_int(radio_state) == RADIO_STATE_DEFAULT) \
+                 set_state(PART:"radio", "default", 0.0); \
+               else \
+                 set_state(PART:"radio", "disabled_visible", 0.0); \
+            } \
+         } \
+         program { name: "mouse,out"; \
+            signal: "mouse,out"; \
+            source: "over2"; \
+            script { \
+               if(get_int(radio_state) == RADIO_STATE_VISIBLE) \
+                 set_state(PART:"radio", "visible", 0.0); \
+               else \
+                 set_state(PART:"radio", "default", 0.0); \
+            } \
+         } \
+         program { name: "pressed"; \
+            signal: "mouse,down,1"; \
+            source: "over2"; \
+            script { \
+               new st[31]; \
+               new Float:vl; \
+               get_state(PART:"radio", st, 30, vl); \
+               if (!strcmp(st, "default")) \
+                 set_state(PART:"radio", "pressed", 0.0); \
+            } \
+         } \
+         program { name: "radio_on"; \
+            signal: "elm,state,radio,on"; \
+            source: "elm"; \
+            script { \
+               set_int(radio_state, RADIO_STATE_VISIBLE); \
+               set_state(PART:"radio", "visible", 0.0); \
+            } \
+         } \
+         program { name: "radio_off"; \
+            signal: "elm,state,radio,off"; \
+            source: "elm"; \
+            script { \
+               set_int(radio_state, RADIO_STATE_DEFAULT); \
+               set_state(PART:"radio", "default", 0.0); \
+            } \
+         } \
+         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"; \
+            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); \
+               get_state(PART:"radio", st, 30, vl); \
+               if (!strcmp(st, "visible")) \
+               { \
+                  set_state(PART:"radio", "disabled_visible", 0.0); \
+                  set_int(radio_state, RADIO_STATE_DISABLED_VISIBLE); \
+                } \
+               else \
+               { \
+                  set_state(PART:"radio", "disabled", 0.0); \
+                  set_int(radio_state, RADIO_STATE_DISABLED); \
+               } \
+            } \
+         } \
+         program { name: "enable"; \
+            signal: "elm,state,enabled"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            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); \
+               get_state(PART:"elm.swallow.content", st, 30, vl); \
+               if (!strcmp(st, "disabled_visible")) \
+                  set_state(PART:"elm.swallow.content", "visible", 0.0); \
+               else \
+                  set_state(PART:"elm.swallow.content", "default", 0.0); \
+               get_state(PART:"radio", st, 30, vl); \
+               if (!strcmp(st, "disabled_visible")) \
+               { \
+                  set_state(PART:"radio", "visible", 0.0); \
+                  set_int(radio_state, RADIO_STATE_VISIBLE); \
+               } \
+               else \
+               { \
+                  set_state(PART:"radio", "default", 0.0); \
+                  set_int(radio_state, RADIO_STATE_DEFAULT); \
+               } \
+            } \
+         } \
+      } \
    }
 
-   group { name: "elm/radio/base/default/extended";
-      images {
-         image: "00_button_radio.png" COMP;
-         image: "00_button_radio_press.png" COMP;
-         image: "00_button_radio_focus.png" COMP;
-         image: "00_button_radio_dim.png" COMP;
-      }
-      parts {
-         part { name: "back_bg";
-            type: RECT;
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel2.relative: 0.0 1.0;
-               align: 0 0.5;
-               min: 50 50;
-               fixed: 1 0;
-               visible: 1;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "bg";
-            mouse_events: 1;
-            scale: 1;
-            type: RECT;
-            description { state: "default" 0.0;
-               rel1{ to: "back_bg"; }
-               rel2{ to: "back_bg"; }
-               fixed: 1 1;
-               align: 0.5 0.5;
-               min: 26 26;
-               max: 26 26;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "radio";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  to: "bg";
-                  offset: 0 0;
-               }
-               rel2 {
-                  to: "bg";
-                  offset: 0 0;
-               }
-               visible: 1;
-               color: 255 255 255 255;
-               image.normal: "00_button_radio.png";
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_radio_focus.png";
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_radio_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_radio_dim.png";
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_radio_dim.png";
-            }
-         }
-         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: 0 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: "radio_label_textblock_style";
-                  min: 0 0;
-               }
-            }
-            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 {            
-                  style: "radio_label_textblock_disabled_style";
-                  min: 1 1;
-               }
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            type: RECT;
-            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;
-               color: 0 0 0 0;
-            }
-         }
-      }
-      programs {
-         program { name: "click";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: SIGNAL_EMIT "elm,action,radio,toggle" "";
-         }
-         program { name: "mouse_up";
-            signal: "mouse,up,1";
-            source: "over2";
-            after: "bg_radio_normal";
-         }
-         program { name: "bg_radio_normal";
-            script {
-            new st[31];
-               new Float:vl;
-               get_state(PART:"radio", st, 30, vl);
-               if (!strcmp(st, "pressed"))
-                  set_state(PART:"radio", "default", 0.0);
-               set_state(PART:"bg", "default", 0.0);
-            }
-         }
-         program { name: "pressed";
-            signal: "mouse,down,1";
-            source: "over2";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"radio", st, 30, vl);
-               if (!strcmp(st, "default"))
-                  set_state(PART:"radio", "pressed", 0.0);
-            }
-         }
-         program { name: "radio_on";
-            signal: "elm,state,radio,on";
-            source: "elm";
-            action:  STATE_SET "visible" 0.0;
-            target: "radio";
-         }
-         program { name: "radio_off";
-            signal: "elm,state,radio,off";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "radio";
-         }
-         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";
-            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);
+///////////////////////////////////////////////////////////////////////////////////////
+RADIO_STYLE_DEFAULT("default", 26, 26)
 
-               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);
-               
-               get_state(PART:"radio", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                  set_state(PART:"radio", "disabled_visible", 0.0);
-               else
-                  set_state(PART:"radio", "disabled", 0.0);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            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);
+///////////////////////////////////////////////////////////////////////////////////////
+RADIO_STYLE_DEFAULT("default/extended", 50, 50)
 
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-                  set_state(PART:"elm.swallow.content", "visible", 0.0);
-               else
-                  set_state(PART:"elm.swallow.content", "default", 0.0);
-                  
-               get_state(PART:"radio", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-                  set_state(PART:"radio", "visible", 0.0);
-               else
-                  set_state(PART:"radio", "default", 0.0);
-            }
-         }
-      }
-   }
+#undef RADIO_STATE_DEFAULT
+#undef RADIO_STATE_VISIBLE
+#undef RADIO_STATE_DISABLED_VISIBLE
+#undef RADIO_STATE_DISABLED
diff --git a/themes/images/nbeat-black/00_btn_circle_bg_normal.png b/themes/images/nbeat-black/00_btn_circle_bg_normal.png
new file mode 100644 (file)
index 0000000..c806e26
Binary files /dev/null and b/themes/images/nbeat-black/00_btn_circle_bg_normal.png differ
diff --git a/themes/images/nbeat-black/00_btn_circle_bg_press.png b/themes/images/nbeat-black/00_btn_circle_bg_press.png
new file mode 100644 (file)
index 0000000..d554fa1
Binary files /dev/null and b/themes/images/nbeat-black/00_btn_circle_bg_press.png differ
index d1a6540..d216104 100644 (file)
Binary files a/themes/images/nbeat-black/00_button_call.png and b/themes/images/nbeat-black/00_button_call.png differ
index 6f6f7af..e6b9b2e 100644 (file)
Binary files a/themes/images/nbeat-black/00_button_call_press.png and b/themes/images/nbeat-black/00_button_call_press.png differ
diff --git a/themes/images/nbeat-black/00_button_cancel.png b/themes/images/nbeat-black/00_button_cancel.png
new file mode 100644 (file)
index 0000000..344c71d
Binary files /dev/null and b/themes/images/nbeat-black/00_button_cancel.png differ
diff --git a/themes/images/nbeat-black/00_button_cancel_press.png b/themes/images/nbeat-black/00_button_cancel_press.png
new file mode 100644 (file)
index 0000000..63f9697
Binary files /dev/null and b/themes/images/nbeat-black/00_button_cancel_press.png differ
index 9dae975..ca01fc1 100644 (file)
Binary files a/themes/images/nbeat-black/00_button_expand_closed.png and b/themes/images/nbeat-black/00_button_expand_closed.png differ
index 9dae975..9f7059f 100644 (file)
Binary files a/themes/images/nbeat-black/00_button_expand_closed_press.png and b/themes/images/nbeat-black/00_button_expand_closed_press.png differ
index ea59455..b821e01 100644 (file)
Binary files a/themes/images/nbeat-black/00_button_expand_opened.png and b/themes/images/nbeat-black/00_button_expand_opened.png differ
index ea59455..89287a6 100644 (file)
Binary files a/themes/images/nbeat-black/00_button_expand_opened_press.png and b/themes/images/nbeat-black/00_button_expand_opened_press.png differ
index f3b33a0..9676625 100644 (file)
Binary files a/themes/images/nbeat-black/00_button_info.png and b/themes/images/nbeat-black/00_button_info.png differ
index a6860c4..6aba7ea 100644 (file)
Binary files a/themes/images/nbeat-black/00_button_info_press.png and b/themes/images/nbeat-black/00_button_info_press.png differ
diff --git a/themes/images/nbeat-black/00_button_minus.png b/themes/images/nbeat-black/00_button_minus.png
new file mode 100644 (file)
index 0000000..4460bb6
Binary files /dev/null and b/themes/images/nbeat-black/00_button_minus.png differ
diff --git a/themes/images/nbeat-black/00_button_minus_press.png b/themes/images/nbeat-black/00_button_minus_press.png
new file mode 100644 (file)
index 0000000..9ef2d6c
Binary files /dev/null and b/themes/images/nbeat-black/00_button_minus_press.png differ
diff --git a/themes/images/nbeat-black/00_button_plus.png b/themes/images/nbeat-black/00_button_plus.png
new file mode 100644 (file)
index 0000000..01e0649
Binary files /dev/null and b/themes/images/nbeat-black/00_button_plus.png differ
diff --git a/themes/images/nbeat-black/00_button_plus_press.png b/themes/images/nbeat-black/00_button_plus_press.png
new file mode 100644 (file)
index 0000000..829f29c
Binary files /dev/null and b/themes/images/nbeat-black/00_button_plus_press.png differ
diff --git a/themes/images/nbeat-black/00_button_radio_normal1.png b/themes/images/nbeat-black/00_button_radio_normal1.png
new file mode 100644 (file)
index 0000000..e5b7bd6
Binary files /dev/null and b/themes/images/nbeat-black/00_button_radio_normal1.png differ
diff --git a/themes/images/nbeat-black/00_button_radio_normal2.png b/themes/images/nbeat-black/00_button_radio_normal2.png
new file mode 100644 (file)
index 0000000..105d99d
Binary files /dev/null and b/themes/images/nbeat-black/00_button_radio_normal2.png differ
diff --git a/themes/images/nbeat-black/00_button_radio_press1.png b/themes/images/nbeat-black/00_button_radio_press1.png
new file mode 100644 (file)
index 0000000..bcbe5a0
Binary files /dev/null and b/themes/images/nbeat-black/00_button_radio_press1.png differ
diff --git a/themes/images/nbeat-black/00_button_radio_press2.png b/themes/images/nbeat-black/00_button_radio_press2.png
new file mode 100644 (file)
index 0000000..a22ec23
Binary files /dev/null and b/themes/images/nbeat-black/00_button_radio_press2.png differ
index d34f086..8277770 100644 (file)
Binary files a/themes/images/nbeat-black/00_button_rename.png and b/themes/images/nbeat-black/00_button_rename.png differ
index 4bbb9bc..4a0215c 100644 (file)
Binary files a/themes/images/nbeat-black/00_button_rename_press.png and b/themes/images/nbeat-black/00_button_rename_press.png differ
index 16e652d..f8ba1fe 100644 (file)
Binary files a/themes/images/nbeat-black/00_button_reveal.png and b/themes/images/nbeat-black/00_button_reveal.png differ
index d4dd542..efdd69b 100644 (file)
Binary files a/themes/images/nbeat-black/00_button_reveal_press.png and b/themes/images/nbeat-black/00_button_reveal_press.png differ
diff --git a/themes/images/nbeat-black/00_button_send.png b/themes/images/nbeat-black/00_button_send.png
new file mode 100644 (file)
index 0000000..f827769
Binary files /dev/null and b/themes/images/nbeat-black/00_button_send.png differ
diff --git a/themes/images/nbeat-black/00_button_send_press.png b/themes/images/nbeat-black/00_button_send_press.png
new file mode 100644 (file)
index 0000000..a3514fe
Binary files /dev/null and b/themes/images/nbeat-black/00_button_send_press.png differ
index 5744ed0..e4028bc 100644 (file)
Binary files a/themes/images/nbeat-black/00_button_warning.png and b/themes/images/nbeat-black/00_button_warning.png differ
index 2f5783b..8f9ac77 100644 (file)
Binary files a/themes/images/nbeat-black/00_button_warning_press.png and b/themes/images/nbeat-black/00_button_warning_press.png differ
index dff42ff..ff77227 100644 (file)
Binary files a/themes/images/nbeat-black/00_check_bg_press.png and b/themes/images/nbeat-black/00_check_bg_press.png differ
diff --git a/themes/images/nbeat/00_btn_circle_bg_normal.png b/themes/images/nbeat/00_btn_circle_bg_normal.png
new file mode 100644 (file)
index 0000000..c806e26
Binary files /dev/null and b/themes/images/nbeat/00_btn_circle_bg_normal.png differ
diff --git a/themes/images/nbeat/00_btn_circle_bg_press.png b/themes/images/nbeat/00_btn_circle_bg_press.png
new file mode 100644 (file)
index 0000000..d554fa1
Binary files /dev/null and b/themes/images/nbeat/00_btn_circle_bg_press.png differ
index d1a6540..d216104 100644 (file)
Binary files a/themes/images/nbeat/00_button_call.png and b/themes/images/nbeat/00_button_call.png differ
index 6f6f7af..e6b9b2e 100644 (file)
Binary files a/themes/images/nbeat/00_button_call_press.png and b/themes/images/nbeat/00_button_call_press.png differ
diff --git a/themes/images/nbeat/00_button_cancel.png b/themes/images/nbeat/00_button_cancel.png
new file mode 100644 (file)
index 0000000..344c71d
Binary files /dev/null and b/themes/images/nbeat/00_button_cancel.png differ
diff --git a/themes/images/nbeat/00_button_cancel_press.png b/themes/images/nbeat/00_button_cancel_press.png
new file mode 100644 (file)
index 0000000..63f9697
Binary files /dev/null and b/themes/images/nbeat/00_button_cancel_press.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 9dae975..ca01fc1
Binary files a/themes/images/nbeat/00_button_expand_closed.png and b/themes/images/nbeat/00_button_expand_closed.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 9dae975..9f7059f
Binary files a/themes/images/nbeat/00_button_expand_closed_press.png and b/themes/images/nbeat/00_button_expand_closed_press.png differ
old mode 100755 (executable)
new mode 100644 (file)
index ea59455..b821e01
Binary files a/themes/images/nbeat/00_button_expand_opened.png and b/themes/images/nbeat/00_button_expand_opened.png differ
old mode 100755 (executable)
new mode 100644 (file)
index ea59455..89287a6
Binary files a/themes/images/nbeat/00_button_expand_opened_press.png and b/themes/images/nbeat/00_button_expand_opened_press.png differ
index d8e8eb8..9676625 100644 (file)
Binary files a/themes/images/nbeat/00_button_info.png and b/themes/images/nbeat/00_button_info.png differ
index ec69a71..6aba7ea 100644 (file)
Binary files a/themes/images/nbeat/00_button_info_press.png and b/themes/images/nbeat/00_button_info_press.png differ
diff --git a/themes/images/nbeat/00_button_minus.png b/themes/images/nbeat/00_button_minus.png
new file mode 100644 (file)
index 0000000..4460bb6
Binary files /dev/null and b/themes/images/nbeat/00_button_minus.png differ
diff --git a/themes/images/nbeat/00_button_minus_press.png b/themes/images/nbeat/00_button_minus_press.png
new file mode 100644 (file)
index 0000000..9ef2d6c
Binary files /dev/null and b/themes/images/nbeat/00_button_minus_press.png differ
diff --git a/themes/images/nbeat/00_button_plus.png b/themes/images/nbeat/00_button_plus.png
new file mode 100644 (file)
index 0000000..01e0649
Binary files /dev/null and b/themes/images/nbeat/00_button_plus.png differ
diff --git a/themes/images/nbeat/00_button_plus_press.png b/themes/images/nbeat/00_button_plus_press.png
new file mode 100644 (file)
index 0000000..829f29c
Binary files /dev/null and b/themes/images/nbeat/00_button_plus_press.png differ
diff --git a/themes/images/nbeat/00_button_radio_normal1.png b/themes/images/nbeat/00_button_radio_normal1.png
new file mode 100644 (file)
index 0000000..e5b7bd6
Binary files /dev/null and b/themes/images/nbeat/00_button_radio_normal1.png differ
diff --git a/themes/images/nbeat/00_button_radio_normal2.png b/themes/images/nbeat/00_button_radio_normal2.png
new file mode 100644 (file)
index 0000000..105d99d
Binary files /dev/null and b/themes/images/nbeat/00_button_radio_normal2.png differ
diff --git a/themes/images/nbeat/00_button_radio_press1.png b/themes/images/nbeat/00_button_radio_press1.png
new file mode 100644 (file)
index 0000000..bcbe5a0
Binary files /dev/null and b/themes/images/nbeat/00_button_radio_press1.png differ
diff --git a/themes/images/nbeat/00_button_radio_press2.png b/themes/images/nbeat/00_button_radio_press2.png
new file mode 100644 (file)
index 0000000..a22ec23
Binary files /dev/null and b/themes/images/nbeat/00_button_radio_press2.png differ
index fe3c7ac..8277770 100644 (file)
Binary files a/themes/images/nbeat/00_button_rename.png and b/themes/images/nbeat/00_button_rename.png differ
index 3b69025..4a0215c 100644 (file)
Binary files a/themes/images/nbeat/00_button_rename_press.png and b/themes/images/nbeat/00_button_rename_press.png differ
index 72329e1..f8ba1fe 100644 (file)
Binary files a/themes/images/nbeat/00_button_reveal.png and b/themes/images/nbeat/00_button_reveal.png differ
index 000bd1e..efdd69b 100644 (file)
Binary files a/themes/images/nbeat/00_button_reveal_press.png and b/themes/images/nbeat/00_button_reveal_press.png differ
diff --git a/themes/images/nbeat/00_button_send.png b/themes/images/nbeat/00_button_send.png
new file mode 100644 (file)
index 0000000..f827769
Binary files /dev/null and b/themes/images/nbeat/00_button_send.png differ
diff --git a/themes/images/nbeat/00_button_send_press.png b/themes/images/nbeat/00_button_send_press.png
new file mode 100644 (file)
index 0000000..a3514fe
Binary files /dev/null and b/themes/images/nbeat/00_button_send_press.png differ
index e28194b..e4028bc 100644 (file)
Binary files a/themes/images/nbeat/00_button_warning.png and b/themes/images/nbeat/00_button_warning.png differ
index a2dea25..8f9ac77 100644 (file)
Binary files a/themes/images/nbeat/00_button_warning_press.png and b/themes/images/nbeat/00_button_warning_press.png differ
index dff42ff..ff77227 100644 (file)
Binary files a/themes/images/nbeat/00_check_bg_press.png and b/themes/images/nbeat/00_check_bg_press.png differ