Refactor and Update check image as tizen style

[Title] Refactor and Update check image as tizen style
[Issue#] P130620-1407
[Problem] check/radio buttons are displayed like blured
[Cause] Refer to the previous commit
[Solution] Update check image as bigger.(12 -> 60)

Change-Id: Ie2c48c9fb1ea863adbb507b5ac0af189c55f34ea

diff --git a/Source/WebKit/efl/DefaultTheme/CMakeLists.txt b/Source/WebKit/efl/DefaultTheme/CMakeLists.txt
index ed70af8..0a68881 100644 (file)
--- a/Source/WebKit/efl/DefaultTheme/CMakeLists.txt
+++ b/Source/WebKit/efl/DefaultTheme/CMakeLists.txt
@@ -15,11 +15,12 @@ ADD_CUSTOM_COMMAND(
         widget/button/img_button_focus.png
         widget/button/img_button_normal.png
         widget/button/img_button_press.png
+        widget/check/00_check_activated.png
+        widget/check/00_check_activated_dim.png
+        widget/check/00_check_bg.png
+        widget/check/00_check_dim_bg.png
+        widget/check/00_check_focus.png
         widget/check/check.edc
-        widget/check/img_check_off_focus.png
-        widget/check/img_check_off.png
-        widget/check/img_check_on_focus.png
-        widget/check/img_check_on.png
         widget/combo/combo.edc
         widget/combo/00_combo_focus_button.png
         widget/combo/00_combo_focus.png

diff --git a/Source/WebKit/efl/DefaultTheme/widget/check/00_check_activated.png b/Source/WebKit/efl/DefaultTheme/widget/check/00_check_activated.png
new file mode 100644 (file)
index 0000000..486cb92
Binary files /dev/null and b/Source/WebKit/efl/DefaultTheme/widget/check/00_check_activated.png differ

diff --git a/Source/WebKit/efl/DefaultTheme/widget/check/00_check_activated_dim.png b/Source/WebKit/efl/DefaultTheme/widget/check/00_check_activated_dim.png
new file mode 100644 (file)
index 0000000..b41648f
Binary files /dev/null and b/Source/WebKit/efl/DefaultTheme/widget/check/00_check_activated_dim.png differ

diff --git a/Source/WebKit/efl/DefaultTheme/widget/check/00_check_bg.png b/Source/WebKit/efl/DefaultTheme/widget/check/00_check_bg.png
new file mode 100644 (file)
index 0000000..711231e
Binary files /dev/null and b/Source/WebKit/efl/DefaultTheme/widget/check/00_check_bg.png differ

diff --git a/Source/WebKit/efl/DefaultTheme/widget/check/00_check_dim_bg.png b/Source/WebKit/efl/DefaultTheme/widget/check/00_check_dim_bg.png
new file mode 100644 (file)
index 0000000..d1dee44
Binary files /dev/null and b/Source/WebKit/efl/DefaultTheme/widget/check/00_check_dim_bg.png differ

diff --git a/Source/WebKit/efl/DefaultTheme/widget/check/00_check_focus.png b/Source/WebKit/efl/DefaultTheme/widget/check/00_check_focus.png
new file mode 100644 (file)
index 0000000..fc8c98d
Binary files /dev/null and b/Source/WebKit/efl/DefaultTheme/widget/check/00_check_focus.png differ

diff --git a/Source/WebKit/efl/DefaultTheme/widget/check/check.edc b/Source/WebKit/efl/DefaultTheme/widget/check/check.edc
index e66e8fb..629f7e1 100644 (file)
--- a/Source/WebKit/efl/DefaultTheme/widget/check/check.edc
+++ b/Source/WebKit/efl/DefaultTheme/widget/check/check.edc
@@ -1,7 +1,7 @@
 /*
     Copyright (C) 2008,2009 INdT - Instituto Nokia de Tecnologia
     Copyright (C) 2009,2010 ProFUSION embedded systems
-    Copyright (C) 2009,2010 Samsung Electronics
+    Copyright (C) 2009,2013 Samsung Electronics
 
     This file is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -19,160 +19,167 @@
     Boston, MA 02110-1301, USA.
 */
 
-   group {
+group { name: "webkit/widget/checkbox";
+   data { item: "scale" "5"; } /* original size is 12,12 */
+   min: 60 60;
 
-      name: "webkit/widget/checkbox";
-      min: 12 12;
-
-      images {
-         image: "widget/check/img_check_bg_enabled.png" COMP;
-         image: "widget/check/img_check_bg_disabled.png" COMP;
-         image: "widget/check/img_check_on.png" COMP;
-         image: "widget/check/img_check_off.png" COMP;
-         image: "widget/check/img_check_off_focus.png" COMP;
-         image: "widget/check/img_check_on_focus.png" COMP;
-      }
-
-      script {
-          public isEnabled;
-          public isPressed;
-          public isChecked;
-          public isFocused;
+   images {
+      image: "widget/check/00_check_activated.png" COMP;
+      image: "widget/check/00_check_activated_dim.png" COMP;
+      image: "widget/check/00_check_bg.png" COMP;
+      image: "widget/check/00_check_dim_bg.png" COMP;
+      image: "widget/check/00_check_focus.png" COMP;
+   }
 
-          public show() {
-              if (get_int(isEnabled) == 1) {
-                  set_state(PART:"check_button", "default", 0.0);
-                  set_state(PART:"bg", "enabled", 0.0);
-                  if (get_int(isChecked) == 1) {
-                      set_state(PART:"check_button", "enabled_checked", 0.0);
-                      if (get_int(isFocused) == 1)
-                          set_state(PART:"check_button", "focus_checked", 0.0);
-                  }
-                  else {
-                      if (get_int(isFocused) == 1)
-                          set_state(PART:"check_button", "focused", 0.0);
-                  }
-              }
-              else {
-                  set_state(PART:"check_button", "disabled", 0.0);
-                  set_state(PART:"bg", "disabled", 0.0);
-                  if (get_int(isChecked) == 1)
-                      set_state(PART:"check_button", "disabled_checked", 0.0);
-              }
-          }
-      }
+   script {
+       public isEnabled;
+       public isPressed;
+       public isChecked;
+       public isFocused;
 
-      parts {
-         part {
-            name: "bg";
-            type: IMAGE;
-            description {
-               state: "default" 0.0;
-               min: 12 12;
-               max: 12 12;
-               image {
-                  normal: "widget/check/img_check_bg_enabled.png";
+       public show() {
+           if (get_int(isChecked) == 1) {
+               if (get_int(isEnabled) == 1) {
+                   set_state(PART:"bg", "enabled", 0.0);
+                   set_state(PART:"check", "enabled_checked", 0.0);
+               } else {
+                   set_state(PART:"bg", "disabled", 0.0);
+                   set_state(PART:"check", "disabled_checked", 0.0);
                }
-            }
-            description {
-               state: "enabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image {
-                  normal: "widget/check/img_check_bg_disabled.png";
+               if (get_int(isFocused) == 1) {
+                   set_state(PART:"focus", "focused", 0.0);
+               } else {
+                   set_state(PART:"focus", "default", 0.0);
                }
-            }
-         }
-         part {
-            name: "check_button";
-            type: IMAGE;
-            description {
-               state: "default" 0.0;
-               min: 12 12;
-               max: 12 12;
-               image {
-                  normal: "widget/check/img_check_off.png";
-               }
-            }
-            description {
-               state: "enabled_checked" 0.0;
-               inherit: "default" 0.0;
-               image {
-                  normal: "widget/check/img_check_on.png";
-               }
-            }
-            description {
-               state: "disabled_checked" 0.0;
-               inherit: "enabled_checked" 0.0;
-               color: 255 255 255 150;
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 150;
-            }
-            description {
-               state: "focus_checked" 0.0;
-               inherit: "default" 0.0;
-               image {
-                  normal: "widget/check/img_check_on_focus.png";
+           } else {
+               if (get_int(isEnabled) == 1) {
+                   set_state(PART:"bg", "enabled", 0.0);
+               } else {
+                   set_state(PART:"bg", "disabled", 0.0);
                }
+               set_state(PART:"check", "default", 0.0);
+               set_state(PART:"focus", "default", 0.0);
+           }
+       }
+   }
+
+   parts {
+      part { name: "bg";
+         type: IMAGE;
+         description {
+            state: "default" 0.0;
+            min: 60 60;
+            max: 60 60;
+            image {
+               normal: "widget/check/00_check_bg.png";
             }
-            description {
-               state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image {
-                  normal: "widget/check/img_check_off_focus.png";
-               }
+         }
+         description {
+            state: "enabled" 0.0;
+            inherit: "default" 0.0;
+         }
+         description {
+            state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            image {
+               normal: "widget/check/00_check_dim_bg.png";
             }
          }
       }
-      programs {
-         program {
-            name: "enabled";
-            signal: "enabled";
-            script {
-               set_int(isEnabled, 1);
-               show();
-            }
+      part { name: "check";
+         type: IMAGE;
+         description {
+            state: "default" 0.0;
+            min: 60 60;
+            max: 60 60;
+            visible: 0;
          }
-         program {
-            name: "pressed";
-            signal: "pressed";
-            script {
-               set_int(isPressed, 1);
-               show();
+         description {
+            state: "enabled_checked" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image {
+               normal: "widget/check/00_check_activated.png";
             }
          }
-        program {
-            name: "checked";
-            signal: "checked";
-            script {
-               set_int(isChecked, 1);
-               show();
+         description {
+            state: "disabled_checked" 0.0;
+            inherit: "enabled_checked" 0.0;
+            visible: 1;
+            color: 255 255 255 150;
+            image {
+               normal: "widget/check/00_check_activated.png";
             }
          }
-         program {
-            name: "focused";
-            signal: "focused";
-            script {
-               set_int(isFocused, 1);
-               show();
-            }
+      }
+      part { name: "focus";
+         type: IMAGE;
+         description {
+            state: "default" 0.0;
+            min: 60 60;
+            max: 60 60;
+            visible: 0;
          }
-        program {
-            name: "reset";
-            signal: "reset";
-            script {
-               set_int(isEnabled, 0);
-               set_int(isPressed, 0);
-               set_int(isChecked, 0);
-               set_int(isFocused, 0);
-               show();
+         description {
+            state: "focused" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image {
+               normal: "widget/check/00_check_focus.png";
             }
          }
       }
    }
+
+   programs {
+      program {
+         name: "enabled";
+         signal: "enabled";
+         script {
+            set_int(isEnabled, 1);
+            show();
+         }
+      }
+      program {
+         name: "pressed";
+         signal: "pressed";
+         script {
+            set_int(isPressed, 1);
+            show();
+         }
+      }
+     program {
+         name: "checked";
+         signal: "checked";
+         script {
+            set_int(isChecked, 1);
+            show();
+         }
+      }
+      program {
+         name: "focused";
+         signal: "focused";
+         script {
+            set_int(isFocused, 1);
+            show();
+         }
+      }
+       program {
+         name: "hovered";
+         signal: "hovered";
+         script {
+         }
+      }
+     program {
+         name: "reset";
+         signal: "reset";
+         script {
+            set_int(isEnabled, 0);
+            set_int(isPressed, 0);
+            set_int(isChecked, 0);
+            set_int(isFocused, 0);
+            show();
+         }
+      }
+   }
+}

diff --git a/Source/WebKit/efl/DefaultTheme/widget/check/img_check_bg_disabled.png b/Source/WebKit/efl/DefaultTheme/widget/check/img_check_bg_disabled.png
deleted file mode 100644 (file)
index 5eb5219..0000000
Binary files a/Source/WebKit/efl/DefaultTheme/widget/check/img_check_bg_disabled.png and /dev/null differ

diff --git a/Source/WebKit/efl/DefaultTheme/widget/check/img_check_off.png b/Source/WebKit/efl/DefaultTheme/widget/check/img_check_off.png
deleted file mode 100644 (file)
index 167fa4e..0000000
Binary files a/Source/WebKit/efl/DefaultTheme/widget/check/img_check_off.png and /dev/null differ

diff --git a/Source/WebKit/efl/DefaultTheme/widget/check/img_check_off_focus.png b/Source/WebKit/efl/DefaultTheme/widget/check/img_check_off_focus.png
deleted file mode 100644 (file)
index 18bee2a..0000000
Binary files a/Source/WebKit/efl/DefaultTheme/widget/check/img_check_off_focus.png and /dev/null differ

diff --git a/Source/WebKit/efl/DefaultTheme/widget/check/img_check_on.png b/Source/WebKit/efl/DefaultTheme/widget/check/img_check_on.png
deleted file mode 100644 (file)
index 87d13ed..0000000
Binary files a/Source/WebKit/efl/DefaultTheme/widget/check/img_check_on.png and /dev/null differ

diff --git a/Source/WebKit/efl/DefaultTheme/widget/check/img_check_on_focus.png b/Source/WebKit/efl/DefaultTheme/widget/check/img_check_on_focus.png
deleted file mode 100644 (file)
index 1f40566..0000000
Binary files a/Source/WebKit/efl/DefaultTheme/widget/check/img_check_on_focus.png and /dev/null differ