theme - one more stage in using color classes - not all original cc's

15 files changed, 113 insertions, 75 deletions

diff --git a/data/themes/colorclasses.edc b/data/themes/colorclasses.edc
index 91e09738a..6f57ccf13 100644
--- a/data/themes/colorclasses.edc
+++ b/data/themes/colorclasses.edc
@@ -65,67 +65,86 @@ color_classes {
    color_class { name: "fileman_base";
       color: FN_COL_DEFAULT_BASIC;
    }
-#if 0
-//// XXX: usless classes   
-//   color_class { name: "error_text"
-//   }
-//   color_class { name: "menu_title_active"
-//   }
-#endif
 
 // widgets
-#if 0
-   color_class { name: "focus"
+   color_class { name: "button_text";
+      color: FN_COL_DEFAULT;
    }
-   color_class { name: "button_text"
+   color_class { name: "button_text_disabled";
+      color: FN_COL_DISABLE;
    }
-   color_class { name: "button_text_disabled"
+   color_class { name: "check_text";
+      color: FN_COL_DEFAULT;
    }
-   color_class { name: "check_text"
+   color_class { name: "check_text_disabled";
+      color: FN_COL_DISABLE;
    }
-   color_class { name: "check_text_disabled"
+   color_class { name: "entry_text";
+      color: FN_COL_DEFAULT_BASIC;
    }
-   color_class { name: "entry_text"
+   color_class { name: "entry_text_disabled";
+      color: FN_COL_DEFAULT_BASIC;
    }
-   color_class { name: "entry_text_disabled"
+   color_class { name: "label_text";
+      color: FN_COL_DEFAULT;
    }
-   color_class { name: "label_text"
+   color_class { name: "label_text_disabled";
+      color: FN_COL_DISABLE;
    }
-   color_class { name: "ilist_item_selected"
+   color_class { name: "frame_base";
+      color: FN_COL_DEFAULT_BASIC;
    }
-   color_class { name: "ilist_item"
+   color_class { name: "scrollframe_base";
+      color: FN_COL_DEFAULT_BASIC;
    }
-   color_class { name: "ilist_item_base"
+   color_class { name: "radio_text";
+      color: FN_COL_DEFAULT;
    }
-   color_class { name: "ilist_item_odd"
+   color_class { name: "radio_text_disabled";
+      color: FN_COL_DISABLE;
    }
-   color_class { name: "ilist_item_odd_base"
+   color_class { name: "slider_text";
+      color: FN_COL_DEFAULT;
    }
-   color_class { name: "ilist_item_header"
+   color_class { name: "slider_text_disabled";
+      color: FN_COL_DISABLE;
    }
-   color_class { name: "ilist_item_header_base"
+   color_class { name: "ilist_item_selected";
+      color: FN_COL_HIGHLIGHT;
    }
-   color_class { name: "ilist_item_header_odd"
+   color_class { name: "ilist_item";
+      color: FN_COL_DEFAULT;
    }
-   color_class { name: "ilist_item_header_odd_base"
+   color_class { name: "ilist_item_base";
+      color: FN_COL_DEFAULT_BASIC;
    }
-   color_class { name: "radio_text"
+   color_class { name: "ilist_item_odd";
+      color: FN_COL_DEFAULT;
    }
-   color_class { name: "radio_text_disabled"
+   color_class { name: "ilist_item_odd_base";
+      color: FN_COL_DEFAULT_BASIC;
    }
-   color_class { name: "slider_text"
+   color_class { name: "ilist_item_header";
+      color: FN_COL_DEFAULT;
    }
-   color_class { name: "slider_text_disabled"
+   color_class { name: "ilist_item_header_base";
+      color: FN_COL_DEFAULT_BASIC;
    }
-   color_class { name: "frame_base"
+   color_class { name: "ilist_item_header_odd";
+      color: FN_COL_DEFAULT;
    }
-   color_class { name: "scrollframe_base"
+   color_class { name: "ilist_item_header_odd_base";
+      color: FN_COL_DEFAULT_BASIC;
    }
-#endif
 
 // modules
-#if 0
    color_class { name: "module_label";
+      color: FN_COL_DEFAULT;
+   }
+   color_class { name: "module_label_invisible";
+      color: FN_COL_TRANSPARENT;
+   }
+   color_class { name: "module_label_plain";
+      color: FN_COL_DEFAULT_BASIC;
    }
-#endif
 }
diff --git a/data/themes/edc/battery.edc b/data/themes/edc/battery.edc
index f8b164aea..a2b63a191 100644
--- a/data/themes/edc/battery.edc
+++ b/data/themes/edc/battery.edc
@@ -221,8 +221,8 @@ group { name: "e/modules/battery/main";
             rel2.to_x: "bg";
             rel2.to_y: "pwr";
             rel2.offset: -1 2;
-            color: FN_COL_DEFAULT_BASIC;
-            color_class: "module_label";
+            color_class: "module_label_plain";
+            color3: 255 255 255 255;
             text { font: "Sans"; size: 8;
                min: 0 1;
                fit: 1 1;
@@ -236,12 +236,13 @@ group { name: "e/modules/battery/main";
          description { state: "default" 0.0;
             align: 0.5 1.0;
             rel1.relative: 0.0 1.0;
+            rel1.offset: 0 -2;
             rel1.to_x: "bg";
             rel1.to_y: "pwr";
             rel2.offset: -1 1;
             rel2.to: "bg";
-            color: FN_COL_DEFAULT_BASIC;
-            color_class: "module_label";
+            color_class: "module_label_plain";
+            color3: 255 255 255 255;
             text { font: "Sans"; size: 8;
                min: 0 1;
                fit: 1 1;
diff --git a/data/themes/edc/button.edc b/data/themes/edc/button.edc
index 69258c1db..e35ce39a6 100644
--- a/data/themes/edc/button.edc
+++ b/data/themes/edc/button.edc
@@ -67,8 +67,8 @@
             rel1.to_y: "base";
             rel2.offset: -7 -7;
             rel2.to: "base";
-            color: FN_COL_DEFAULT;
             color_class: "button_text";
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
                min: 1 1;
                align: 0.5 0.5;
@@ -77,8 +77,8 @@
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: FN_COL_DISABLE;
             color_class: "button_text_disabled";
+            color3: 255 255 255 255;
          }
          description { state: "combo" 0.0;
             inherit: "default" 0.0;
@@ -97,8 +97,8 @@
          description { state: "default" 0.0;
             rel1.to: "e.text.label";
             rel2.to: "e.text.label";
-            color: FN_COL_DISABLE;
             color_class: "button_text_disabled";
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
                text_source: "e.text.label";
                align: 0.5 0.5;
diff --git a/data/themes/edc/check.edc b/data/themes/edc/check.edc
index bdd1b6cbb..36d88f73f 100644
--- a/data/themes/edc/check.edc
+++ b/data/themes/edc/check.edc
@@ -73,8 +73,8 @@ group { name: "e/widgets/check";
             rel1.to_x: "inset";
             rel1.relative: 1.0 0.0;
             rel2.offset: -3 -3;
-            color: FN_COL_DEFAULT;
             color_class: "check_text";
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
                min: 1 1;
                align: 0.0 0.5;
@@ -83,7 +83,8 @@ group { name: "e/widgets/check";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: FN_COL_DISABLE;
+            color_class: "check_text_disabled";
+            color3: 255 255 255 255;
          }
       }
       part { name: "event"; type: RECT;
@@ -154,10 +155,6 @@ group { name: "e/widgets/check_icon";
          description { state: "default" 0.0;
             rel1.to_x: "e.swallow.icon";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            color: FN_COL_DISABLE;
-         }
       }
    }
 }
diff --git a/data/themes/edc/cpufreq.edc b/data/themes/edc/cpufreq.edc
index a50b91b55..3179c698f 100644
--- a/data/themes/edc/cpufreq.edc
+++ b/data/themes/edc/cpufreq.edc
@@ -220,9 +220,8 @@ group { name: "e/modules/cpufreq/main";
             rel1.relative: 1.0 1.0;
             rel1.offset: -2 -2;
             rel2.relative: 0.75 0.75;
-            color: 255 255 255 255;
-            color3: 0 0 0 128;
             color_class: "module_label";
+            color3: 255 255 255 255;
             text { font: FN; size: 6;
                min: 1 1;
                text_class: "module_small";
diff --git a/data/themes/edc/entry.edc b/data/themes/edc/entry.edc
index 160a41f3c..c13d4b785 100644
--- a/data/themes/edc/entry.edc
+++ b/data/themes/edc/entry.edc
@@ -71,7 +71,6 @@ group { name: "e/widgets/entry/text";
             color_class: "entry_text";
             align: 0.0 0.5;
             text {
-               text: "";
                style: "entry_textblock_style";
                min: 1 1;
                align: 0.0 0.5;
diff --git a/data/themes/edc/frame.edc b/data/themes/edc/frame.edc
index 8ac02bbc4..43eb6f00b 100644
--- a/data/themes/edc/frame.edc
+++ b/data/themes/edc/frame.edc
@@ -19,6 +19,7 @@ group { name: "e/widgets/frame";
             rel1.offset: 2 0;
             rel1.to_y: "top";
             rel2.offset: -3 -3;
+            color_class: "frame_base";
             color: 64 64 64 255;
          }
       }
@@ -30,6 +31,7 @@ group { name: "e/widgets/frame";
             rel2.offset: -3 -1;
             fill.smooth: 0;
             TILED_HORIZ(120)
+            color_class: "frame_base";
          }
       }
       part { name: "edge1";
diff --git a/data/themes/edc/ibar-ibox.edc b/data/themes/edc/ibar-ibox.edc
index 91bf06339..6032a6258 100644
--- a/data/themes/edc/ibar-ibox.edc
+++ b/data/themes/edc/ibar-ibox.edc
@@ -479,8 +479,8 @@ group { name: "e/modules/ibox/icon_overlay";
          description { state: "default" 0.0;
             rel1.relative: 0.0 1.0;
             rel2.relative: 1.0 1.0;
-            color: FN_COL_TRANSPARENT;
-            color_class: "module_label";
+            color_class: "module_label_invisible";
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
                min: 1 1;
                align: 0.5 0.5;
@@ -491,7 +491,8 @@ group { name: "e/modules/ibox/icon_overlay";
             inherit: "default" 0.0;
             rel1.relative: 0.0 0.5;
             rel2.relative: 1.0 0.5;
-            color: FN_COL_DEFAULT;
+            color_class: "module_label";
+            color3: 255 255 255 255;
          }
       }
    }
diff --git a/data/themes/edc/ilist.edc b/data/themes/edc/ilist.edc
index 078a4eb99..9833368f2 100644
--- a/data/themes/edc/ilist.edc
+++ b/data/themes/edc/ilist.edc
@@ -70,8 +70,8 @@ group { name: "e/widgets/ilist";
    parts {
       part { name: "base"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            color: 64 64 64 255;
             color_class: "ilist_item_base";
+            color: 64 64 64 255;
          }
       }
       part { name: "bevel"; mouse_events: 0;
@@ -140,8 +140,8 @@ group { name: "e/widgets/ilist";
             rel2.offset: -3 -3;
             rel2.relative: 0.0 1.0;
             rel2.to_x: "e.swallow.end";
-            color: FN_COL_DEFAULT;
             color_class: "ilist_item";
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
                min: 1 1;
                align: 0.0 0.5;
@@ -189,8 +189,9 @@ group { name: "e/widgets/ilist";
             rel1.to: "e.text.label";
             rel2.offset: 2 1;
             rel2.to: "e.text.label";
-            color: FN_COL_HIGHLIGHT;
             color_class: "ilist_item_selected";
+            color2: 255 255 255 255;
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
                text_source: "e.text.label";
                align: 0.0 0.5;
@@ -289,9 +290,21 @@ group { name: "e/widgets/ilist_odd";
    parts {
       part { name: "base";
          description { state: "default" 0.0;
+            color_class: "ilist_item_odd_base";
             color: 56 56 56 255;
          }
       }
+      part { name: "e.text.label";
+         description { state: "default" 0.0;
+            color_class: "ilist_item_odd";
+         }
+         description { state: "selected" 0.0;
+            color_class: "ilist_item_odd";
+         }
+         description { state: "disabled" 0.0;
+            color_class: "ilist_item_odd";
+         }
+      }
    }
 }
 
@@ -304,8 +317,8 @@ group { name: "e/widgets/ilist_header";
    parts {
       part { name: "base"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            color: 48 48 48 255;
             color_class: "ilist_item_base";
+            color: 48 48 48 255;
          }
       }
       part { name: "pat";
@@ -339,8 +352,8 @@ group { name: "e/widgets/ilist_header";
             rel2.offset: -3 -7;
             rel2.relative: 0.0 1.0;
             rel2.to_x: "e.swallow.end";
-            color: FN_COL_DEFAULT;
             color_class: "ilist_item_header";
+            color3: 255 255 255 255;
             text { font: FNBD; size: 10;
                min: 0 1;
                align: 0.0 0.5;
diff --git a/data/themes/edc/label.edc b/data/themes/edc/label.edc
index d1d59bfe2..825ca5ec5 100644
--- a/data/themes/edc/label.edc
+++ b/data/themes/edc/label.edc
@@ -6,8 +6,8 @@ group { name: "e/widgets/label";
          description { state: "default" 0.0;
             rel1.offset: 2 2;
             rel2.offset: -3 -3;
-            color: FN_COL_DEFAULT;
             color_class: "label_text";
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
                min: 1 1;
                align: 0.0 0.5;
@@ -16,7 +16,8 @@ group { name: "e/widgets/label";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: FN_COL_DISABLE;
+            color_class: "label_text_disabled";
+            color3: 255 255 255 255;
          }
       }
    }
diff --git a/data/themes/edc/pager.edc b/data/themes/edc/pager.edc
index 9e764558d..4596db845 100644
--- a/data/themes/edc/pager.edc
+++ b/data/themes/edc/pager.edc
@@ -150,10 +150,10 @@ group { name: "e/modules/pager/desk";
          scale: 1;
          effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
-            color_class: "module_label";
             rel1.to: "base";
             rel2.to: "base";
-            color: FN_COL_DEFAULT;
+            color_class: "module_label_invisible";
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
                text_class: "module_small";
                align: 0.5 0.5;
@@ -162,6 +162,8 @@ group { name: "e/modules/pager/desk";
          }
          description { state: "active" 0.0;
             inherit: "default" 0.0;
+            color_class: "module_label";
+            color3: 255 255 255 255;
             visible: 1;
          }
       }
diff --git a/data/themes/edc/pager16.edc b/data/themes/edc/pager16.edc
index 55995b5f6..db2994f6c 100644
--- a/data/themes/edc/pager16.edc
+++ b/data/themes/edc/pager16.edc
@@ -129,10 +129,10 @@ group { name: "e/modules/pager2/desk";
          scale: 1;
          effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
-            color_class: "module_label";
             rel1.to: "base";
             rel2.to: "base";
-            color: FN_COL_DEFAULT;
+            color_class: "module_label_invisible";
+            color3: 255 255 255 255;
             text { font: "Sans"; size: 10;
                text_class: "module_small";
                align: 0.5 0.5;
@@ -141,6 +141,8 @@ group { name: "e/modules/pager2/desk";
          }
          description { state: "active" 0.0;
             inherit: "default" 0.0;
+            color_class: "module_label";
+            color3: 255 255 255 255;
             visible: 1;
          }
       }
diff --git a/data/themes/edc/radio.edc b/data/themes/edc/radio.edc
index bdb00740f..df0fd08d0 100644
--- a/data/themes/edc/radio.edc
+++ b/data/themes/edc/radio.edc
@@ -50,8 +50,8 @@ group { name: "e/widgets/radio";
             rel1.to_x: "inset";
             rel1.relative: 1.0 0.0;
             rel2.offset: -3 -3;
-            color: FN_COL_DEFAULT;
             color_class: "radio_text";
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
                min: 1 1;
                align: 0.0 0.5;
@@ -60,7 +60,8 @@ group { name: "e/widgets/radio";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: FN_COL_DISABLE;
+            color_class: "radio_text_disabled";
+            color3: 255 255 255 255;
          }
       }
       part { name: "event"; type: RECT;
diff --git a/data/themes/edc/slider.edc b/data/themes/edc/slider.edc
index 5fcf908cb..092ab7a38 100644
--- a/data/themes/edc/slider.edc
+++ b/data/themes/edc/slider.edc
@@ -77,8 +77,8 @@ group { name: "e/widgets/slider_horizontal";
             rel1.relative: 1.0 0.0;
             rel2.offset: -1 -1;
             align: 1.0 0.5;
-            color: FN_COL_DEFAULT;
             color_class: "slider_text";
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
               min: 0 1;
               align: 0.0 0.5;
@@ -111,8 +111,8 @@ group { name: "e/widgets/slider_horizontal";
          description { state: "default" 0.0;
             rel1.to: "e.text.label";
             rel2.to: "e.text.label";
-            color: FN_COL_DISABLE;
-            color_class: "slider_text";
+            color_class: "slider_text_disabled";
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
               text_source: "e.text.label";
               align: 0.0 0.5;
@@ -301,8 +301,8 @@ group { name: "e/widgets/slider_vertical";
             rel1.relative: 0.0 1.0;
             rel2.offset: -1 -1;
             align: 0.5 1.0;
-            color: FN_COL_DEFAULT;
             color_class: "slider_text";
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
               min: 0 0;
               align: 0.5 0.5;
@@ -335,8 +335,8 @@ group { name: "e/widgets/slider_vertical";
          description { state: "default" 0.0;
             rel1.to: "e.text.label";
             rel2.to: "e.text.label";
-            color: FN_COL_DISABLE;
-            color_class: "slider_text";
+            color_class: "slider_text_disabled";
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
               text_source: "e.text.label";
               align: 0.5 0.5;
diff --git a/data/themes/edc/temperature.edc b/data/themes/edc/temperature.edc
index b7638cfa5..fb95d9aee 100644
--- a/data/themes/edc/temperature.edc
+++ b/data/themes/edc/temperature.edc
@@ -42,8 +42,8 @@ group { name: "e/modules/temperature/main";
          effect: SHADOW BOTTOM;
          clip_to: "fade_clip";
          description { state: "default" 0.0;
-            color: FN_COL_SHADOW_BOTTOM;
-            color_class: "module_label";
+            color_class: "module_label_invisible";
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
                min: 1 1;
                text_class: "module_small";
@@ -51,7 +51,8 @@ group { name: "e/modules/temperature/main";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            color: FN_COL_DEFAULT;
+            color_class: "module_label";
+            color3: 255 255 255 255;
          }
       }
       part { name: "fade_clip"; type: RECT;