Refactor and Update radio image as tizen style

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

Change-Id: I21109b684bc70b52f3f4adf9d317dd2039a008ae

diff --git a/Source/WebKit/efl/DefaultTheme/CMakeLists.txt b/Source/WebKit/efl/DefaultTheme/CMakeLists.txt
index 1ccfcf5..ac60dc9 100644 (file)
--- a/Source/WebKit/efl/DefaultTheme/CMakeLists.txt
+++ b/Source/WebKit/efl/DefaultTheme/CMakeLists.txt
@@ -58,10 +58,11 @@ ADD_CUSTOM_COMMAND(
         widget/progressbar/bt_base.png
         widget/progressbar/progressbar.edc
         widget/progressbar/shelf_inset.png
-        widget/radio/img_radio_off_focus.png
-        widget/radio/img_radio_off.png
-        widget/radio/img_radio_on_focus.png
-        widget/radio/img_radio_on.png
+        widget/radio/00_button_radio_activated.png
+        widget/radio/00_button_radio_activated_dim.png
+        widget/radio/00_button_radio_bg.png
+        widget/radio/00_button_radio_dim_bg.png
+        widget/radio/00_button_radio_focus.png
         widget/radio/radio.edc
         widget/scrollbar/scrollbar.edc
         widget/scrollbar/scrollbar_h.png

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

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

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

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

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

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

diff --git a/Source/WebKit/efl/DefaultTheme/widget/radio/img_radio_bg_enabled.png b/Source/WebKit/efl/DefaultTheme/widget/radio/img_radio_bg_enabled.png
deleted file mode 100644 (file)
index 85bb5b1..0000000
Binary files a/Source/WebKit/efl/DefaultTheme/widget/radio/img_radio_bg_enabled.png and /dev/null differ

diff --git a/Source/WebKit/efl/DefaultTheme/widget/radio/img_radio_off.png b/Source/WebKit/efl/DefaultTheme/widget/radio/img_radio_off.png
deleted file mode 100644 (file)
index cd64cd8..0000000
Binary files a/Source/WebKit/efl/DefaultTheme/widget/radio/img_radio_off.png and /dev/null differ

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

diff --git a/Source/WebKit/efl/DefaultTheme/widget/radio/img_radio_on.png b/Source/WebKit/efl/DefaultTheme/widget/radio/img_radio_on.png
deleted file mode 100644 (file)
index b8d8ecb..0000000
Binary files a/Source/WebKit/efl/DefaultTheme/widget/radio/img_radio_on.png and /dev/null differ

diff --git a/Source/WebKit/efl/DefaultTheme/widget/radio/img_radio_on_focus.png b/Source/WebKit/efl/DefaultTheme/widget/radio/img_radio_on_focus.png
deleted file mode 100644 (file)
index bf8a970..0000000
Binary files a/Source/WebKit/efl/DefaultTheme/widget/radio/img_radio_on_focus.png and /dev/null differ

diff --git a/Source/WebKit/efl/DefaultTheme/widget/radio/radio.edc b/Source/WebKit/efl/DefaultTheme/widget/radio/radio.edc
index 06d7c27..d4fc67c 100644 (file)
--- a/Source/WebKit/efl/DefaultTheme/widget/radio/radio.edc
+++ b/Source/WebKit/efl/DefaultTheme/widget/radio/radio.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 {
-      name: "webkit/widget/radio";
-      min: 12 12;
+group { name: "webkit/widget/radio";
+   data { item: "scale" "4.5"; } /* original size is 12,12 */
+   min: 54 54;
 
-      images {
-         image: "widget/radio/img_radio_bg_enabled.png" COMP;
-         image: "widget/radio/img_radio_bg_disabled.png" COMP;
-         image: "widget/radio/img_radio_on.png" COMP;
-         image: "widget/radio/img_radio_off.png" COMP;
-         image: "widget/radio/img_radio_on_focus.png" COMP;
-         image: "widget/radio/img_radio_off_focus.png" COMP;
-      }
+   images {
+      image: "widget/radio/00_button_radio_activated.png" COMP;
+      image: "widget/radio/00_button_radio_activated_dim.png" COMP;
+      image: "widget/radio/00_button_radio_bg.png" COMP;
+      image: "widget/radio/00_button_radio_dim_bg.png" COMP;
+      image: "widget/radio/00_button_radio_focus.png" COMP;
+   }
 
-      script {
-          public isEnabled;
-          public isPressed;
-          public isChecked;
-          public isFocused;
+   script {
+       public isEnabled;
+       public isPressed;
+       public isChecked;
+       public isFocused;
 
-          public show() {
-              if (get_int(isEnabled) == 1) {
-                  set_state(PART:"radio_button", "default", 0.0);
-                  set_state(PART:"bg", "enabled", 0.0);
-                  if (get_int(isChecked) == 1) {
-                      set_state(PART:"radio_button", "enabled_checked", 0.0);
-                      if (get_int(isFocused) == 1)
-                          set_state(PART:"radio_button", "focus_checked", 0.0);
-                  }
-                  else {
-                      if (get_int(isFocused) == 1)
-                          set_state(PART:"radio_button", "focused", 0.0);
-                  }
-              }
-              else {
-                  set_state(PART:"radio_button", "disabled", 0.0);
-                  set_state(PART:"bg", "disabled", 0.0);
-                  if (get_int(isChecked) == 1)
-                      set_state(PART:"radio_button", "disabled_checked", 0.0);
-              }
-          }
-      }
-
-      parts {
-         part {
-            name: "bg";
-            type: IMAGE;
-            description {
-               state: "default" 0.0;
-               min: 12 12;
-               max: 12 12;
-               image {
-                  normal: "widget/radio/img_radio_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:"radio", "enabled_checked", 0.0);
+               } else {
+                   set_state(PART:"bg", "disabled", 0.0);
+                   set_state(PART:"radio", "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/radio/img_radio_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: "radio_button";
-            type: IMAGE;
-            description {
-               state: "default" 0.0;
-               min: 12 12;
-               max: 12 12;
-               image {
-                  normal: "widget/radio/img_radio_off.png";
-               }
-            }
-            description {
-               state: "enabled_checked" 0.0;
-               inherit: "default" 0.0;
-               image {
-                  normal: "widget/radio/img_radio_on.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:"radio", "default", 0.0);
+               set_state(PART:"focus", "default", 0.0);
+           }
+       }
+   }
+
+   parts {
+      part { name: "bg";
+         type: IMAGE;
+         description {
+            state: "default" 0.0;
+            min: 54 54;
+            max: 54 54;
+            image {
+               normal: "widget/radio/00_button_radio_bg.png";
             }
-            description {
-               state: "disabled_checked" 0.0;
-               inherit: "enabled_checked" 0.0;
-               color: 255 255 255 150;
+         }
+         description {
+            state: "enabled" 0.0;
+            inherit: "default" 0.0;
+         }
+         description {
+            state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            image {
+               normal: "widget/radio/00_button_radio_dim_bg.png";
             }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 150;
+         }
+      }
+      part { name: "radio";
+         type: IMAGE;
+         description {
+            state: "default" 0.0;
+            min: 54 54;
+            max: 54 54;
+            visible: 0;
+         }
+         description {
+            state: "enabled_checked" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image {
+               normal: "widget/radio/00_button_radio_activated.png";
             }
-            description {
-               state: "focus_checked" 0.0;
-               inherit: "default" 0.0;
-               image {
-                  normal: "widget/radio/img_radio_on_focus.png";
-               }
+         }
+         description {
+            state: "disabled_checked" 0.0;
+            inherit: "enabled_checked" 0.0;
+            visible: 1;
+            color: 255 255 255 150;
+            image {
+               normal: "widget/radio/00_button_radio_activated.png";
             }
-            description {
-               state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image {
-                  normal: "widget/radio/img_radio_off_focus.png";
-               }
+         }
+      }
+      part { name: "focus";
+         type: IMAGE;
+         description {
+            state: "default" 0.0;
+            min: 54 54;
+            max: 54 54;
+            visible: 0;
+         }
+         description {
+            state: "focused" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image {
+               normal: "widget/radio/00_button_radio_focus.png";
             }
          }
       }
+   }
 
-      programs {
-         program {
-            name: "enabled";
-            signal: "enabled";
-            script {
-               set_int(isEnabled, 1);
-               show();
-            }
+   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: "pressed";
+         signal: "pressed";
+         script {
+            set_int(isPressed, 1);
+            show();
          }
-        program {
-            name: "checked";
-            signal: "checked";
-            script {
-               set_int(isChecked, 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: "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();
-            }  
+      }
+     program {
+         name: "reset";
+         signal: "reset";
+         script {
+            set_int(isEnabled, 0);
+            set_int(isPressed, 0);
+            set_int(isChecked, 0);
+            set_int(isFocused, 0);
+            show();
          }
       }
    }
+}