TH - add new radioa nd check styles from master

2 files changed, 429 insertions, 72 deletions

diff --git a/data/elementary/themes/edc/elm/check.edc b/data/elementary/themes/edc/elm/check.edc
index 197637750f..038e5e9027 100644
--- a/data/elementary/themes/edc/elm/check.edc
+++ b/data/elementary/themes/edc/elm/check.edc
@@ -63,6 +63,7 @@ group { name: "elm/check/base/default";
       text { "sizer_content"; nomouse;
          scale: 1;
          desc { "default";
+            fixed: 1 1;
             visible: 0;
             text { font: FN; size: 10;
                min: 0 0;
diff --git a/data/elementary/themes/edc/elm/radio.edc b/data/elementary/themes/edc/elm/radio.edc
index dba16a3762..07c7b22c97 100644
--- a/data/elementary/themes/edc/elm/radio.edc
+++ b/data/elementary/themes/edc/elm/radio.edc
@@ -296,16 +296,10 @@ group { name: "elm/radio/base/default";
    }
 }
 
+#define SELECTED 8
 group { name: "elm/radio/base/plain";
    alias: "elm/check/base/plain";
-   images.image: "button_normal.png" COMP;
-   images.image: "button_clicked.png" COMP;
-   images.image: "horizontal_separated_bar_small_glow.png" COMP;
-#define ICON     1
-#define LABEL    2
-#define MASK     3
-#define DISABLE  4
-#define SELECTED 8
+   images.image: "win_shadow.png" COMP;
    script {
       public btmode;
       public eval_mode(m) {
@@ -313,17 +307,32 @@ group { name: "elm/radio/base/plain";
          new d = m & DISABLE;
          new s = m & SELECTED;
          if (s) {
-            set_state(PART:"base", "selected", 0.0);
-            set_state(PART:"bar", "selected", 0.0);
+            if (!d) {
+               set_state(PART:"shadow", "selected", 0.0);
+               set_state(PART:"base", "selected", 0.0);
+               set_state(PART:"bar", "selected", 0.0);
+            } else {
+               set_state(PART:"shadow", "selected", 0.0);
+               set_state(PART:"base", "disabled", 0.0);
+               set_state(PART:"bar", "default", 0.0);
+            }
          } else {
-            set_state(PART:"base", "default", 0.0);
-            set_state(PART:"bar", "default", 0.0);
+            if (!d) {
+               set_state(PART:"shadow", "default", 0.0);
+               set_state(PART:"base", "default", 0.0);
+               set_state(PART:"bar", "default", 0.0);
+            } else {
+               set_state(PART:"shadow", "selected", 0.0);
+               set_state(PART:"base", "disabled", 0.0);
+               set_state(PART:"bar", "default", 0.0);
+            }
          }
          if (m1 == (ICON | LABEL)) {
             if (!d) {
                set_state(PART:"elm.swallow.content", "visible", 0.0);
                set_state(PART:"sizer_content", "visible", 0.0);
-               set_state(PART:"elm.text", "visible", 0.0);
+               if (s) set_state(PART:"elm.text", "selected", 0.0);
+               else set_state(PART:"elm.text", "visible", 0.0);
                set_state(PART:"clip", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
             } else {
@@ -343,8 +352,7 @@ group { name: "elm/radio/base/plain";
             } else {
                set_state(PART:"elm.swallow.content", "icononly", 0.0);
                set_state(PART:"sizer_content", "icononly", 0.0);
-               set_state(PART:"elm.text", "disabled", 0.0);
-               set_state(PART:"base", "disabled", 0.0);
+               set_state(PART:"elm.text", "default", 0.0);
                set_state(PART:"clip", "disabled", 0.0);
                set_state(PART:"event", "disabled", 0.0);
             }
@@ -352,7 +360,8 @@ group { name: "elm/radio/base/plain";
             if (!d) {
                set_state(PART:"elm.swallow.content", "default", 0.0);
                set_state(PART:"sizer_content", "default", 0.0);
-               set_state(PART:"elm.text", "visible", 0.0);
+               if (s) set_state(PART:"elm.text", "selected", 0.0);
+               else set_state(PART:"elm.text", "visible", 0.0);
                set_state(PART:"clip", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
             } else {
@@ -380,22 +389,34 @@ group { name: "elm/radio/base/plain";
       }
    }
    parts {
-      part { name: "base"; mouse_events: 0;
+      part { name: "shadow"; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: -1 0;
+            rel.to: "base";
+            WIN_SHADOW_SMALL;
+         }
+         description { state: "selected" 0.0; inherit;
+            image.border_scale_by: 0.1;
+            rel1.offset: -2 -1;
             rel2.offset: 0 1;
-            image.normal: "button_normal.png";
-            image.border: 4 4 3 5;
-            image.middle: SOLID;
-            fill.smooth: 0;
          }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            image.normal: "button_clicked.png";
-            image.border: 5 5 4 6;
+      }
+      rect { name: "base"; nomouse;
+         scale: 1;
+         desc { "default";
+            color: 96 96 96 255;
+            rel1.offset: 2 2;
+            rel2.offset: -3 -3;
+            offscale;
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "selected"; inherit;
+            color: 128 128 128 255;
+            rel1.offset: 3 3;
+            rel2.offset: -4 -4;
+            offscale;
+         }
+         desc { "disabled"; inherit;
+            color: 72 72 72 255;
          }
       }
       part { name: "clip"; type: RECT;
@@ -414,11 +435,10 @@ group { name: "elm/radio/base/plain";
             visible: 0;
             align: 0.0 0.5;
             max: 0 0;
-            rel1.offset: 6 5;
-            rel1.to: "base";
+            rel1.offset: 0 6;
             rel2.relative: 0.0 1.0;
-            rel2.offset: 6 -8;
-            rel2.to: "base";
+            rel2.offset: 0 -7;
+            offscale;
          }
          description { state: "icononly" 0.0;
            inherit: "default" 0.0;
@@ -426,13 +446,18 @@ group { name: "elm/radio/base/plain";
             align: 0.5 0.5;
             max: 9999 9999;
             min: 16 16;
+            rel1.offset: 6 6;
+            rel2.offset: 6 -7;
             rel2.relative: 1.0 1.0;
-            rel2.offset: -7 -8;
+            rel2.offset: -5 -5;
+            fixed: 0 0;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             visible: 1;
             aspect: 1.0 1.0;
+            rel1.offset: 6 6;
+            rel2.offset: 6 -7;
             max: 9999 9999;
             min: 16 16;
          }
@@ -469,60 +494,59 @@ group { name: "elm/radio/base/plain";
          }
       }
       part { name: "elm.text"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 2 4;
+            fixed: 1 1;
+            rel1.offset: 0 6;
             rel1.to_x: "elm.swallow.content";
             rel1.relative: 1.0 0.0;
-            rel1.to_y: "base";
-            rel2.offset: -8 -8;
-            rel2.to: "base";
-            color: FN_COL_DEFAULT;
-            color_class: "radio_text";
+            rel2.offset: -7 -7;
+            color: 192 192 192 255;
             text { font: FN; size: 10;
               min: 0 0;
               align: 0.0 0.5;
               text_class: "radio";
             }
+            offscale;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color_class: "radio_text_disabled";
-            color3: 255 255 255 255;
+            color: 96 96 96 255;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
+            fixed: 0 0;
+            rel1.offset: 6 6;
             visible: 1;
             text.min: 1 1;
             text.ellipsis: -1;
          }
+         description { state: "selected" 0.0;
+            inherit: "visible" 0.0;
+            color: 255 255 255 255;
+         }
          description { state: "disabled_visible" 0.0;
             inherit: "default" 0.0;
-            color_class: "radio_text_disabled";
-            color3: 255 255 255 255;
+            color: 96 96 96 255;
+            rel1.offset: 6 6;
             visible: 1;
             text.min: 1 1;
             text.ellipsis: -1;
          }
       }
-      image { "bar"; nomouse;
+      rect { "bar"; nomouse;
          desc { "default";
-            image.normal: "horizontal_separated_bar_small_glow.png";
-            image.border: 4 4 4 4;
-            fill.smooth: 0;
-            fill.smooth: 0;
+            color: 51 153 255 0;
             fixed: 0 1;
             rel.to: "base";
             rel1.relative: 0.0 1.0;
-            rel1.offset: 1 -12;
-            rel2.offset: -2 -3;
-            color: 255 255 255 0;
+            rel1.offset: 0 -1;
+            align: 0.5 1.0;
             visible: 0;
          }
-         desc { "selected";
-           inherit: "default";
-           color: 255 255 255 255;
+         desc { "selected"; inherit;
+           min: 0 5;
+           color: 51 153 255 255;
            visible: 1;
          }
       }
@@ -538,8 +562,10 @@ group { name: "elm/radio/base/plain";
    }
    programs {
       program { signal: "mouse,down,1"; source: "event";
-         action:  STATE_SET "selected" 0.0;
-         target: "base";
+         script {
+            new m = get_int(btmode);
+            eval_mode(m | SELECTED);
+         }
       }
       program { signal: "mouse,up,1"; source: "event";
          script {
@@ -610,22 +636,355 @@ group { name: "elm/radio/base/plain";
          }
       }
    }
-#undef ICON
-#undef LABEL
-#undef MASK
-#undef DISABLE
 }
 
 group { name: "elm/radio/base/icon";
    alias: "elm/check/base/icon";
+   images.image: "win_shadow.png" COMP;
+   script {
+      public btmode;
+      public eval_mode(m) {
+         new m1 = m & MASK;
+         new d = m & DISABLE;
+         new s = m & SELECTED;
+         if (s) {
+            if (!d) {
+               set_state(PART:"shadow", "selected", 0.0);
+               set_state(PART:"base", "selected", 0.0);
+               set_state(PART:"bar", "selected", 0.0);
+            } else {
+               set_state(PART:"shadow", "selected", 0.0);
+               set_state(PART:"base", "disabled", 0.0);
+               set_state(PART:"bar", "default", 0.0);
+            }
+         } else {
+            if (!d) {
+               set_state(PART:"shadow", "default", 0.0);
+               set_state(PART:"base", "default", 0.0);
+               set_state(PART:"bar", "default", 0.0);
+            } else {
+               set_state(PART:"shadow", "selected", 0.0);
+               set_state(PART:"base", "disabled", 0.0);
+               set_state(PART:"bar", "default", 0.0);
+            }
+         }
+         if (m1 == (ICON | LABEL)) {
+            if (!d) {
+               set_state(PART:"elm.swallow.content", "visible", 0.0);
+               set_state(PART:"sizer_content", "visible", 0.0);
+               if (s) set_state(PART:"elm.text", "selected", 0.0);
+               else set_state(PART:"elm.text", "visible", 0.0);
+               set_state(PART:"clip", "default", 0.0);
+               set_state(PART:"event", "default", 0.0);
+            } else {
+               set_state(PART:"elm.swallow.content", "visible", 0.0);
+               set_state(PART:"sizer_content", "visible", 0.0);
+               set_state(PART:"elm.text", "disabled_visible", 0.0);
+               set_state(PART:"clip", "disabled", 0.0);
+               set_state(PART:"event", "disabled", 0.0);
+            }
+         } else if (m1 == (ICON)) {
+            if (!d) {
+               set_state(PART:"elm.swallow.content", "icononly", 0.0);
+               set_state(PART:"sizer_content", "icononly", 0.0);
+               set_state(PART:"elm.text", "default", 0.0);
+               set_state(PART:"clip", "default", 0.0);
+               set_state(PART:"event", "default", 0.0);
+            } else {
+               set_state(PART:"elm.swallow.content", "icononly", 0.0);
+               set_state(PART:"sizer_content", "icononly", 0.0);
+               set_state(PART:"elm.text", "default", 0.0);
+               set_state(PART:"clip", "disabled", 0.0);
+               set_state(PART:"event", "disabled", 0.0);
+            }
+         } else if (m1 == (LABEL)) {
+            if (!d) {
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"sizer_content", "default", 0.0);
+               if (s) set_state(PART:"elm.text", "selected", 0.0);
+               else set_state(PART:"elm.text", "visible", 0.0);
+               set_state(PART:"clip", "default", 0.0);
+               set_state(PART:"event", "default", 0.0);
+            } else {
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"sizer_content", "default", 0.0);
+               set_state(PART:"elm.text", "disabled_visible", 0.0);
+               set_state(PART:"clip", "disabled", 0.0);
+               set_state(PART:"event", "disabled", 0.0);
+            }
+         } else {
+            if (!d) {
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"sizer_content", "default", 0.0);
+               set_state(PART:"elm.text", "default", 0.0);
+               set_state(PART:"clip", "default", 0.0);
+               set_state(PART:"event", "default", 0.0);
+            } else {
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"sizer_content", "default", 0.0);
+               set_state(PART:"elm.text", "default", 0.0);
+               set_state(PART:"clip", "disabled", 0.0);
+               set_state(PART:"event", "disabled", 0.0);
+            }
+         }
+      }
+   }
+   parts {
+      part { name: "shadow"; mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel.to: "base";
+            WIN_SHADOW_SMALL;
+         }
+         description { state: "selected" 0.0; inherit;
+            image.border_scale_by: 0.1;
+            rel1.offset: -2 -1;
+            rel2.offset: 0 1;
+         }
+      }
+      rect { name: "base"; nomouse;
+         scale: 1;
+         desc { "default";
+            color: 96 96 96 255;
+            rel1.offset: 2 2;
+            rel2.offset: -3 -3;
+            offscale;
+         }
+         desc { "selected"; inherit;
+            color: 128 128 128 255;
+            rel1.offset: 3 3;
+            rel2.offset: -4 -4;
+            offscale;
+         }
+         desc { "disabled"; inherit;
+            color: 72 72 72 255;
+         }
+      }
+      part { name: "clip"; type: RECT;
+         description { state: "default" 0.0;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 64;
+         }
+      }
+      part { name: "elm.swallow.content"; type: SWALLOW;
+         scale: 1;
+         clip_to: "clip";
+         description { state: "default" 0.0;
+            fixed: 0 1;
+            visible: 0;
+            align: 0.5 0.0;
+            max: 0 0;
+            rel1.offset: 6 0;
+            rel2.relative: 1.0 0.0;
+            rel2.offset: -7 0;
+            offscale;
+         }
+         description { state: "icononly" 0.0;
+           inherit: "default" 0.0;
+            visible: 1;
+            align: 0.5 0.5;
+            max: 9999 9999;
+            min: 16 16;
+            rel1.offset: 6 6;
+            rel2.offset: 6 -7;
+            rel2.relative: 1.0 1.0;
+            rel2.offset: -5 -5;
+            fixed: 0 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            aspect: 1.0 1.0;
+            rel1.offset: 6 5;
+            rel2.offset: -5 5;
+            max: 9999 9999;
+            min: 16 16;
+            fixed: 1 1;
+         }
+      }
+      part { name: "sizer_content"; type: TEXT; mouse_events:  0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            visible: 0;
+            text { font: FN; size: 10;
+               min: 0 0;
+               text_class: "radio_text";
+            }
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            rel1.to: "elm.swallow.content";
+            rel2.to: "elm.swallow.content";
+            text {
+               min: 1 1;
+               ellipsis: -1;
+               text: "M";
+            }
+         }
+         description { state: "icononly" 0.0;
+            inherit: "default" 0.0;
+            rel1.to: "elm.swallow.content";
+            rel2.to: "elm.swallow.content";
+            text {
+               min: 1 1;
+               ellipsis: -1;
+               text: "M";
+            }
+         }
+      }
+      part { name: "elm.text"; type: TEXT; mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            rel1.offset: 6 0;
+            rel1.to_y: "elm.swallow.content";
+            rel1.relative: 0.0 1.0;
+            rel2.offset: -7 -7;
+            color: 192 192 192 255;
+            text { font: FN; size: 10;
+              min: 0 0;
+              align: 0.5 1.0;
+              text_class: "radio";
+            }
+            offscale;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            color: 96 96 96 255;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            fixed: 0 0;
+            rel1.offset: 6 6;
+            visible: 1;
+            text.min: 1 1;
+            text.ellipsis: -1;
+         }
+         description { state: "selected" 0.0;
+            inherit: "visible" 0.0;
+            color: 255 255 255 255;
+         }
+         description { state: "disabled_visible" 0.0;
+            inherit: "default" 0.0;
+            color: 96 96 96 255;
+            rel1.offset: 6 6;
+            visible: 1;
+            text.min: 1 1;
+            text.ellipsis: -1;
+         }
+      }
+      rect { "bar"; nomouse;
+         desc { "default";
+            color: 51 153 255 0;
+            fixed: 0 1;
+            rel.to: "base";
+            rel1.relative: 0.0 1.0;
+            rel1.offset: 0 -1;
+            align: 0.5 1.0;
+            visible: 0;
+         }
+         desc { "selected"; inherit;
+           min: 0 5;
+           color: 51 153 255 255;
+           visible: 1;
+         }
+      }
+      part { name: "event"; type: RECT;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+   }
+   programs {
+      program { signal: "mouse,down,1"; source: "event";
+         script {
+            new m = get_int(btmode);
+            eval_mode(m | SELECTED);
+         }
+      }
+      program { signal: "mouse,up,1"; source: "event";
+         script {
+            new m = get_int(btmode);
+            eval_mode(m);
+         }
+      }
+      program { signal: "mouse,clicked,1"; source: "event";
+         action: SIGNAL_EMIT "elm,action,radio,toggle" "elm";
+      }
+      program { signal: "mouse,clicked,1"; source: "event";
+         action: SIGNAL_EMIT "elm,action,check,toggle" "elm";
+      }
+      program { signal: "elm,state,*,on"; source: "elm";
+         script {
+            new m = get_int(btmode);
+            m |= SELECTED; set_int(btmode, m);
+            eval_mode(m);
+         }
+      }
+      program { signal: "elm,state,*,off"; source: "elm";
+         script {
+            new m = get_int(btmode);
+            m &= ~SELECTED; set_int(btmode, m);
+            eval_mode(m);
+         }
+      }
+      program { signal: "elm,state,text,visible"; source: "elm";
+         script {
+            new m = get_int(btmode);
+            m |= LABEL; set_int(btmode, m);
+            eval_mode(m);
+         }
+      }
+      program { signal: "elm,state,text,hidden"; source: "elm";
+         script {
+            new m = get_int(btmode);
+            m &= ~LABEL; set_int(btmode, m);
+            eval_mode(m);
+         }
+      }
+      program { signal: "elm,state,icon,visible"; source: "elm";
+         script {
+            new m = get_int(btmode);
+            m |= ICON; set_int(btmode, m);
+            eval_mode(m);
+         }
+      }
+      program { signal: "elm,state,icon,hidden"; source: "elm";
+         script {
+            new m = get_int(btmode);
+            m &= ~ICON; set_int(btmode, m);
+            eval_mode(m);
+         }
+      }
+      program { signal: "elm,state,disabled"; source: "elm";
+         script {
+            new m = get_int(btmode);
+            m |= DISABLE; set_int(btmode, m);
+            eval_mode(m);
+         }
+      }
+      program { signal: "elm,state,enabled"; source: "elm";
+         script {
+            new m = get_int(btmode);
+            m &= ~DISABLE; set_int(btmode, m);
+            eval_mode(m);
+         }
+      }
+   }
+}
+/*
+group { name: "elm/radio/base/icon";
+   alias: "elm/check/base/icon";
    images.image: "button_normal.png" COMP;
    images.image: "button_clicked.png" COMP;
    images.image: "horizontal_separated_bar_small_glow.png" COMP;
-#define ICON     1
-#define LABEL    2
-#define MASK     3
-#define DISABLE  4
-#define SELECTED 8
    script {
       public btmode;
       public eval_mode(m) {
@@ -664,7 +1023,6 @@ group { name: "elm/radio/base/icon";
                set_state(PART:"elm.swallow.content", "icononly", 0.0);
                set_state(PART:"sizer_content", "icononly", 0.0);
                set_state(PART:"elm.text", "disabled", 0.0);
-               set_state(PART:"base", "disabled", 0.0);
                set_state(PART:"clip", "disabled", 0.0);
                set_state(PART:"event", "disabled", 0.0);
             }
@@ -730,7 +1088,7 @@ group { name: "elm/radio/base/icon";
          scale: 1;
          clip_to: "clip";
          description { state: "default" 0.0;
-            fixed: 0 1;
+            fixed: 1 0;
             visible: 0;
             align: 0.5 0.0;
             max: 0 0;
@@ -749,6 +1107,7 @@ group { name: "elm/radio/base/icon";
             min: 16 16;
             rel2.relative: 1.0 1.0;
             rel2.offset: -7 -8;
+            fixed: 0 0;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -933,8 +1292,5 @@ group { name: "elm/radio/base/icon";
          }
       }
    }
-#undef ICON
-#undef LABEL
-#undef MASK
-#undef DISABLE
 }
+*/