Merge "[ctxpopup] apply dragable area, default style only"

diff --git a/debian/changelog b/debian/changelog
index 7b9433a..52b6cd1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+nbeat-theme (0.1.1-40) unstable; urgency=low
+
+  * Upload Package - sync with elementary
+  * Git: slp-scm.sec.samsung.net:slp/pkgs/n/nbeat-theme
+  * Tag: nbeat-theme_0.1.1-40
+
+ -- ChunEon Park <chuneon.park@samsung.com>  Wed, 25 May 2011 19:12:41 +0900
+
+nbeat-theme (0.1.1-39) unstable; urgency=low
+
+  * Upload Package - button
+  * Git: slp-scm.sec.samsung.net:slp/pkgs/n/nbeat-theme
+  * Tag: nbeat-theme_0.1.1-39
+
+ -- ChunEon Park <chuneon.park@samsung.com>  Tue, 24 May 2011 14:21:08 +0900
+
+nbeat-theme (0.1.1-38) unstable; urgency=low
+
+  * Upload Package - controlbar
+  * Git: slp-scm.sec.samsung.net:slp/pkgs/n/nbeat-theme
+  * Tag: nbeat-theme_0.1.1-38
+
+ -- Jaehwan Kim <jae.hwan.kim@samsung.com>  Mon, 23 May 2011 20:31:48 +0900
+
 nbeat-theme (0.1.1-37) unstable; urgency=low
 
   * Package Upload : sync with elementary

diff --git a/themes/groups/button.edc b/themes/groups/button.edc
index f635cb7..35d5f39 100644 (file)
--- a/themes/groups/button.edc
+++ b/themes/groups/button.edc
@@ -9011,10 +9011,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                   set_state(PART:"icon_rect", "visible", 0.0);
                   set_state(PART:"padding_after_icon", "visible", 0.0);
                }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "text_hide";
@@ -9071,6 +9068,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          program { name: "disable_text";
             script {
                set_int(button_state, BUTTON_STATE_DISABLED);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "enable";
@@ -9084,6 +9082,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          program { name: "enable_text";
             script {
                set_int(button_state, BUTTON_STATE_ENABLED);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "focused";
@@ -9400,10 +9399,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                   set_state(PART:"icon_rect", "visible", 0.0);
                   set_state(PART:"padding_after_icon", "visible", 0.0);
                }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "text_hide";
@@ -9460,6 +9456,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          program { name: "disable_text";
             script {
                set_int(button_state, BUTTON_STATE_DISABLED);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "enable";
@@ -9473,6 +9470,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          program { name: "enable_text";
             script {
                set_int(button_state, BUTTON_STATE_ENABLED);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "focused";
@@ -9789,10 +9787,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                   set_state(PART:"icon_rect", "visible", 0.0);
                   set_state(PART:"padding_after_icon", "visible", 0.0);
                }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "text_hide";
@@ -9849,6 +9844,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          program { name: "disable_text";
             script {
                set_int(button_state, BUTTON_STATE_DISABLED);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "enable";
@@ -9862,6 +9858,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          program { name: "enable_text";
             script {
                set_int(button_state, BUTTON_STATE_ENABLED);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "focused";
@@ -9900,59 +9897,31 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
          }
          part {
-            name: "padding_left";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 0.0 1.0;
-               min: 10 5;
-               fixed: 1 0;
-               color: 0 0 0 0;
-            }
-         }
-         part {
-            name: "padding_right";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1.0 0.0;
-               rel1.relative: 1.0 0.0;
-               rel2.relative: 1.0 1.0;
-               min: 10 5;
-               fixed: 1 0;
-               color: 0 0 0 0;
-            }
-         }
-         part {
-            name: "padding_top";
+            name: "padding_left_top";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.0;
                rel1.relative: 0.0 0.0;
-               rel2.relative: 1.0 0.0;
-               min: 5 8;
-               fixed: 0 1;
-               color: 0 0 0 0;
+               rel2.relative: 0.0 0.0;
+               min: 10 8;
+               fixed: 1 1;
+               visible: 0;
             }
          }
          part {
-            name: "padding_bottom";
+            name: "padding_right_bottom";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
-               rel1.relative: 0.0 1.0;
+               rel1.relative: 1.0 1.0;
                rel2.relative: 1.0 1.0;
-               min: 5 8;
-               fixed: 0 1;
-               color: 0 0 0 0;
+               min: 10 8;
+               fixed: 1 1;
+               visible: 0;
             }
          }
          part {
@@ -9964,8 +9933,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                visible: 1;
                min: 0 0;
                fixed: 0 1;
-               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 { relative: 0.0 1.0; to_x: "padding_right"; to_y: "padding_top"; }
+               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
+               rel2 { relative: 0.0 1.0; to_x: "padding_right_bottom"; to_y: "padding_left_top"; }
                align: 0.5 0.0;
                color: 0 0 0 0;
             }
@@ -9973,8 +9942,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                visible: 1;
                min: 44 44;
                fixed: 0 1;
-               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 { relative: 0.0 1.0; to_x: "padding_right"; to_y: "padding_top"; }
+               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
+               rel2 { relative: 0.0 1.0; to_x: "padding_right_bottom"; to_y: "padding_left_top"; }
                align: 0.5 0.0;
                color: 0 0 0 0;
             }
@@ -10015,8 +9984,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             mouse_events: 0;
             description { state: "default" 0.0; //when only icon or no icon is there
                align: 0.5 1.0;
-               rel1 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "elm.text"; }
-               rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "elm.text"; }
+               rel1 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "elm.text"; }
+               rel2 { relative: 0.0 0.0; to_x: "padding_right_bottom"; to_y: "elm.text"; }
                fixed: 0 1;
                min: 0 0;
                color: 0 0 0 0;
@@ -10025,11 +9994,12 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          part { name: "elm.swallow.content";
             type: SWALLOW;
             scale: 1;
+            clip_to: "disabler";
             description { state: "default" 0.0;
                visible: 0;
                align: 0.5 0.0;
-               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 { relative: 0.0 1.0; to_x: "padding_right"; to_y: "padding_top"; }
+               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
+               rel2 { relative: 0.0 1.0; to_x: "padding_right_bottom"; to_y: "padding_left_top"; }
                fixed: 0 1;
             }
             description { state: "visible" 0.0;
@@ -10038,8 +10008,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                min: 44 44;
                max: 44 44;
                align: 0.5 0.5;
-               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_before_text"; }
+               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
+               rel2 { relative: 0.0 0.0; to_x: "padding_right_bottom"; to_y: "padding_before_text"; }
                aspect: 1.0 1.0;
                aspect_preference: HORIZONTAL;
             }
@@ -10047,8 +10017,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                visible: 1;
                min: 44 44;
                max: 44 44;
-               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"; }
+               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
+               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
                align: 0.5 0.5;
                aspect: 1.0 1.0;
                aspect_preference: HORIZONTAL;
@@ -10058,10 +10028,11 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             type: TEXT;
             mouse_events:  0;
             scale: 1;
+            clip_to: "disabler";
             description { state: "default" 0.0;
                visible: 0;
-               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_after_icon"; }
-               rel2 { relative: 0.0 1.0; to_x: "padding_right"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left_top"; to_y: "padding_after_icon"; }
+               rel2 { relative: 0.0 1.0; to_x: "padding_right_bottom"; }
                align: 0.5 0.5;
                color: 255 255 255 255;
                text {
@@ -10083,17 +10054,6 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                color: 255 255 255 255;
                color2: 0 0 0 102;
             }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 185 185 185 255;
-               color3: 0 0 0 0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: 185 185 185 255;
-               color3: 0 0 0 0;
-               visible: 1;
-            }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
@@ -10130,11 +10090,12 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          part { name: "disabler";
             type: RECT;
             description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
+               color: 255 255 255 255;
+               visible: 1;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
+               color: 255 255 255 127;
                visible: 1;
             }
          }
@@ -10210,10 +10171,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                   set_state(PART:"icon_rect", "visible", 0.0);
                   set_state(PART:"padding_after_icon", "visible", 0.0);
                }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "text_hide";
@@ -10270,14 +10228,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          }
          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);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "enable";
@@ -10291,14 +10243,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          }
          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);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "focused";

diff --git a/themes/groups/check.edc b/themes/groups/check.edc
index e19e2f1..76c928b 100644 (file)
--- a/themes/groups/check.edc
+++ b/themes/groups/check.edc
@@ -34,7 +34,6 @@
          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; \
@@ -103,8 +102,7 @@
                image.normal: "00_check_checking.png"; \
             } \
             description { state: "disabled_visible" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_check_checking_dim.png"; \
+               inherit: "visible" 0.0; \
                visible: 1; \
             } \
          } \
@@ -372,6 +370,286 @@ CHECK_STYLE_DEFAULT("default", 26, 26)
 CHECK_STYLE_DEFAULT("default/extended", 60, 75)
 
 ////////////////////////////////////////////////////////////////////////////////
+
+#define CHECK_STYLE_LIST(style_name, min_width, min_height) \
+ group { name: "elm/check/base/"style_name; \
+      images { \
+         image: "00_check_bg.png" COMP; \
+         image: "00_check_bg_dim.png" COMP; \
+         image: "00_check_checking.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: "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: "disabled_visible" 0.0; \
+               inherit: "visible" 0.0; \
+               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; \
+               } \
+               color: CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC; \
+            } \
+            description { state: "visible" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+               text.min: 1 1; \
+            } \
+            description { state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+            } \
+            description { state: "disabled_visible" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+               text.min: 1 1; \
+               color: CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC; \
+            } \
+         } \
+         part { name: "events1"; \
+            type: RECT; \
+            ignore_flags: ON_HOLD; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+            } \
+         } \
+         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: "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_LIST("list", 26, 26)
+
+////////////////////////////////////////////////////////////////////////////////
+CHECK_STYLE_LIST("list/extended", 60, 75)
+
+////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/check/base/multicheck";
       images {
          image: "00_check_bg.png" COMP;

diff --git a/themes/groups/controlbar.edc b/themes/groups/controlbar.edc
index 8c635c2..53cf74b 100644 (file)
--- a/themes/groups/controlbar.edc
+++ b/themes/groups/controlbar.edc
@@ -662,24 +662,6 @@
                                }
                        }
                        part{
-                               name: "elm.swallow.text_shadow";
-                               type: SWALLOW;
-                               scale: 1;
-                               mouse_events:1;
-                               description{
-                                       state: "default" 0.0;
-                                       fixed: 1 1;
-                                       visible: 0;
-                                       rel1{offset: 2 2; to: "elm.swallow.text";}
-                                       rel2{offset: 2 2; to: "elm.swallow.text";}
-                               }
-                               description{
-                                       state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible: 1;
-                               }
-                       }
-                       part{
                                name: "elm.swallow.text";
                                type: SWALLOW;
                                scale: 1;
@@ -694,8 +676,6 @@
                                description{
                                        state: "icon_text" 0.0;
                                        inherit: "default" 0.0;
-                                       fixed: 1 1;
-                                       align: 0.5 0.5;
                                        rel1 {relative: 0.5 0.6; }
                                        rel2 {relative: 0.5 1.0; }
                                }
@@ -726,11 +706,13 @@
                name: "elm/controlbar/item_bg_move/default";
                images{
                        image: "00_winset_tabbar_focus.png" COMP;
+                       image: "00_winset_tabbar_focus_left.png" COMP;
+                       image: "00_winset_tabbar_focus_right.png" COMP;
                }
 
                parts{
                        part{
-                               name: "bg_img";
+                               name: "selected_box";
                                type: IMAGE;
                                mouse_events: 0;
                                description{
@@ -739,50 +721,44 @@
                                        image.normal: "00_winset_tabbar_focus.png";
                                        image.border: 2 2 3 2;
                                }
-                       }
-               }
-       }
-
-       group{
-               name: "elm/controlbar/item_bg_move_left/default";
-               images{
-                       image: "00_winset_tabbar_focus_left.png" COMP;
-               }
-
-               parts{
-                       part{
-                               name: "bg_img";
-                               type: IMAGE;
-                               mouse_events: 0;
                                description{
-                                       state: "default" 0.0;
+                                       state: "left" 0.0;
                                        visible: 1;
                                        image.normal: "00_winset_tabbar_focus_left.png";
                                        image.border: 2 3 2 2;
                                }
-                       }
-               }
-       }
-
-       group{
-               name: "elm/controlbar/item_bg_move_right/default";
-               images{
-                       image: "00_winset_tabbar_focus_right.png" COMP;
-               }
-
-               parts{
-                       part{
-                               name: "bg_img";
-                               type: IMAGE;
-                               mouse_events: 0;
                                description{
-                                       state: "default" 0.0;
+                                       state: "right" 0.0;
                                        visible: 1;
                                        image.normal: "00_winset_tabbar_focus_right.png";
                                        image.border: 3 2 2 2;
                                }
                        }
                }
+
+               programs{
+                       program{
+                               name: "default";
+                               signal: "elm,state,default";
+                               source: "elm";
+                               action: STATE_SET "default" 0.0;
+                               target: "selected_box";
+                       }
+                       program{
+                               name: "left";
+                               signal: "elm,state,left";
+                               source: "elm";
+                               action: STATE_SET "left" 0.0;
+                               target: "selected_box";
+                       }
+                       program{
+                               name: "right";
+                               signal: "elm,state,right";
+                               source: "elm";
+                               action: STATE_SET "right" 0.0;
+                               target: "selected_box";
+                       }
+               }
        }
 
        group{

diff --git a/themes/groups/editfield.edc b/themes/groups/editfield.edc
index 1aa89fc..c9539df 100644 (file)
--- a/themes/groups/editfield.edc
+++ b/themes/groups/editfield.edc
@@ -427,7 +427,7 @@ group { name: "elm/editfield/base/default";
 group { name: "elm/editfield/base/searchbar";
    alias: "elm/editfield/base/searchbar/default";
    images {
-      image: "00_field_btn_delete.png" COMP;
+      image: "00_field_btn_clear.png" COMP;
    }
    parts {
       part {
@@ -523,7 +523,7 @@ group { name: "elm/editfield/base/searchbar";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 15 0;
+            min: 0 0;
             fixed: 1 1;
             align: 0 0;
             rel1.relative : 0.0 0.0;
@@ -538,7 +538,7 @@ group { name: "elm/editfield/base/searchbar";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 15 0;
+            min: 0 0;
             fixed: 1 1;
             align: 0 0;
             rel1.relative : 0.0 0.0;
@@ -661,7 +661,7 @@ group { name: "elm/editfield/base/searchbar";
             color: EDITFIELD_TITLE_COLOR_INC;
             text {
                font: "SLP:style=Medium";
-               size: 24;
+               size: 20;
                min: 1 1;
                align: 0.0 0.0;
             }
@@ -755,8 +755,8 @@ group { name: "elm/editfield/base/searchbar";
                to_y : "bottom2";
             }
             image {
-                normal: "00_field_btn_delete.png";
-                border: 10 10 10 10;
+                normal: "00_field_btn_clear.png";
+                border: 4 4 4 4;
                 border_scale: 1;
             }
          }

diff --git a/themes/groups/progressbar.edc b/themes/groups/progressbar.edc
index ec5fe3e..279851e 100644 (file)
--- a/themes/groups/progressbar.edc
+++ b/themes/groups/progressbar.edc
@@ -2048,8 +2048,8 @@
    }
    group { name: "elm/progressbar/horizontal/pending_list";
       images {
-         image: "00_pending_list_01.png" COMP;
-         image: "00_pending_list_02.png" COMP;
+         image: "00_winset_progress_pending_01.png" COMP;
+         image: "00_winset_progress_pending_02.png" COMP;
       }
       parts {
          part { name: "elm.padding.left";
@@ -2194,7 +2194,7 @@
                   offset: -1 -1;
                }
                image {
-                  normal: "00_pending_list_01.png";
+                  normal: "00_winset_progress_pending_01.png";
                   border: 0 0 0 0;
                }
             }
@@ -2217,7 +2217,7 @@
                   offset: -1 -1;
                }
                image {
-                  normal: "00_pending_list_01.png";
+                  normal: "00_winset_progress_pending_01.png";
                   border: 0 0 0 0;
                }
             }
@@ -2257,7 +2257,7 @@
                   relative: 1.0 1.0;
                }
                image {
-                  normal: "00_pending_list_02.png";
+                  normal: "00_winset_progress_pending_02.png";
                   border: 0 0 0 0;
                }
             }

diff --git a/themes/groups/searchbar.edc b/themes/groups/searchbar.edc
index 5d5875d..5f04a41 100644 (file)
--- a/themes/groups/searchbar.edc
+++ b/themes/groups/searchbar.edc
@@ -198,16 +198,42 @@ group {
                }
             }
          }
-         part { name: "left_text_padding_rect";
+         part { name: "left_padding_search_textfield";
             type: RECT;
             scale: 1;
             description{
                visible: 0;
-               min: 32 0;
+               min: 10 0;
                fixed: 1 0;
-               align: 0 0;
-               rel1 { to_x: "left_padding_rect"; to_y: "base_bg"; };
-               rel2 { relative: 0.0 1.0; to_x: "left_padding_rect"; to_y: "base_bg"; };
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "search_icon";
+                  to_y: "inputfield_rect";
+               };
+               rel2 {
+                  relative: 1.0 1.0;
+                  to_x: "search_icon";
+                  to_y: "inputfield_rect";
+               };
+            }
+         }
+         part { name: "right_padding_search_textfield";
+            type: RECT;
+            scale: 1;
+            description{
+               visible: 0;
+               min: 5 0;
+               fixed: 1 0;
+               align: 1.0 0.5;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "inputfield_rect";
+               };
+               rel2 {
+                  relative: 1.0 1.0;
+                  to: "inputfield_rect";
+               };
             }
          }
          part {   name: "search_textfield";
@@ -220,17 +246,28 @@ group {
                min: 0 30;
                fixed: 0 1;
                align: 0.0 0.5;
-               rel1 { relative: 1.0 0.5; to_x: "left_text_padding_rect"; to_y: "inputfield_rect"; };
-               rel2 { relative: 0.0 0.5; to_x: "right_padding_rect"; to_y: "inputfield_rect"; };
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "left_padding_search_textfield";
+               };
+               rel2 {
+                  relative: 0.0 1.0;
+                  to: "right_padding_search_textfield";
+               };
             }
             description {
                visible:1;
                state: "in" 0.0;
                min: 0 30;
-               fixed: 0 1;
                align: 0.0 0.5;
-               rel1 { relative: 1.0 0.5; to_x: "left_text_padding_rect"; to_y: "inputfield_rect"; };
-               rel2 { relative: 0.0 0.5; to_x: "right_field_and_btn_padding_rect"; to_y: "inputfield_rect"; };
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "left_padding_search_textfield";
+               };
+               rel2 {
+                  relative: 0.0 1.0;
+                  to: "right_padding_search_textfield";
+               };
             }
             description {
                state: "down" 0.0;

diff --git a/themes/images/nbeat-black/00_pending_list_02.png b/themes/images/nbeat-black/00_field_btn_clear.png
similarity index 63%
rename from themes/images/nbeat-black/00_pending_list_02.png
rename to themes/images/nbeat-black/00_field_btn_clear.png
index f518bd1..8359287 100644 (file)
Binary files a/themes/images/nbeat-black/00_pending_list_02.png and b/themes/images/nbeat-black/00_field_btn_clear.png differ

diff --git a/themes/images/nbeat/00_pending_list_02.png b/themes/images/nbeat-black/00_winset_progress_pending_01.png
similarity index 63%
rename from themes/images/nbeat/00_pending_list_02.png
rename to themes/images/nbeat-black/00_winset_progress_pending_01.png
index f518bd1..0304853 100644 (file)
Binary files a/themes/images/nbeat/00_pending_list_02.png and b/themes/images/nbeat-black/00_winset_progress_pending_01.png differ

diff --git a/themes/images/nbeat-black/00_pending_list_01.png b/themes/images/nbeat-black/00_winset_progress_pending_02.png
similarity index 63%
rename from themes/images/nbeat-black/00_pending_list_01.png
rename to themes/images/nbeat-black/00_winset_progress_pending_02.png
index 12bab63..303ca43 100644 (file)
Binary files a/themes/images/nbeat-black/00_pending_list_01.png and b/themes/images/nbeat-black/00_winset_progress_pending_02.png differ

diff --git a/themes/images/nbeat/00_pending_list_01.png b/themes/images/nbeat/00_field_btn_clear.png
similarity index 63%
rename from themes/images/nbeat/00_pending_list_01.png
rename to themes/images/nbeat/00_field_btn_clear.png
index 12bab63..8359287 100644 (file)
Binary files a/themes/images/nbeat/00_pending_list_01.png and b/themes/images/nbeat/00_field_btn_clear.png differ

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

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