[Ux 4.4] Check gengrid style implementation.

Change-Id: I06bf051d89a7f1d0143c2519ffcdbbb1dbed52ea

diff --git a/themes/widgets/check.edc b/themes/widgets/check.edc
index b1304f4..1448bb6 100644 (file)
--- a/themes/widgets/check.edc
+++ b/themes/widgets/check.edc
@@ -1553,9 +1553,10 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
 ////////////////////////////////////////////////////////////////////////////////
 
    group { name: "elm/check/base/grid";
-      images.image: "00_grid_select_check.png" COMP;
-      images.image: "00_grid_select_check_bg.png" COMP;
-      images.image: "00_grid_select_check_bg_press.png" COMP;
+      images.image: "00_check_bg.png" COMP;
+      images.image: "00_check_dim_bg.png" COMP;
+      images.image: "00_check_dim.png" COMP;
+      images.image: "00_check_Activated.png" COMP;
       script {
          public check_state = CHECK_STATE_DEFAULT;
          public check_visible = CHECK_HIDE;
@@ -1568,62 +1569,48 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
                visible: 0;
             }
          }
-         part { name: "top_right_padding";
+         part { name: "top_left_padding";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                visible: 0;
                min: GENGRID_ITEM_CHECK_TOP_RIGHT_PADDING_INC;
-               align: 1.0 0.0;
+               align: 0.0 0.0;
                fixed: 1 1;
                rel1 {
-                  relative: 1.0 0.0;
+                  relative: 0.0 0.0;
                   to: "bg";
                }
                rel2 {
-                  relative: 1.0 0.0;
+                  relative: 0.0 0.0;
                   to: "bg";
                }
             }
          }
-         part { name: "selected_bg";
-            scale: 1;
-            type: RECT;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1.to: "bg";
-               rel2.to: "bg";
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: GENGRID_EDIT_MODE_CHECK_BG_COLOR_INC;
-            }
-         }
          part { name: "bg2";
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                min: GENGRID_EDIT_MODE_CHECK_SIZE_INC;
-               align: 1.0 0.0;
+               align: 0.0 0.0;
                fixed: 1 1;
                rel1 {
                   relative: 0.0 1.0;
-                  to: "top_right_padding";
+                  to: "top_left_padding";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to: "top_right_padding";
+                  to: "top_left_padding";
                }
-               image.normal: "00_grid_select_check_bg.png";
+               image.normal: "00_check_bg.png";
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_grid_select_check_bg_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
+               image.normal: "00_check_dim_bg.png";
             }
          }
          part { name: "check";
@@ -1634,7 +1621,7 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
                visible: 0;
                rel1.to: "bg2";
                rel2.to: "bg2";
-               image.normal: "00_grid_select_check.png";
+               image.normal: "00_check_Activated.png";
                color: 255 255 255 0;
             }
             description { state: "visible" 0.0;
@@ -1648,6 +1635,7 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
+               image.normal: "00_check_dim.png";
             }
          }
          part { name: "sequence_clip";
@@ -1777,10 +1765,6 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
             signal: "mouse,clicked,1";
             source: "events";
             action: SIGNAL_EMIT "elm,action,check,toggle" "";
-            after: "touch_sound";
-         }
-         program { name: "touch_sound";
-            action: PLAY_SAMPLE "touch_sound" 1.0;
             after: "bg_normal";
          }
          program { name: "bg_normal";
@@ -1836,7 +1820,6 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
                     set_state(PART:"sequence_clip", "visible", 0.0);
                  }
                set_state(PART:"bg2", "visible", 0.0);
-               set_state(PART:"selected_bg", "visible", 0.0);
             }
          }
          program { name: "check_off";
@@ -1852,7 +1835,6 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
                     set_state(PART:"sequence_clip", "default", 0.0);
                  }
                set_state(PART:"bg2", "default", 0.0);
-               set_state(PART:"selected_bg", "default", 0.0);
             }
          }
          program { name: "check_show_effect";