theme - colorclass work.

4 files changed, 132 insertions, 15 deletions

diff --git a/data/themes/colorclasses.edc b/data/themes/colorclasses.edc
index a02530b6e..cffd977b0 100644
--- a/data/themes/colorclasses.edc
+++ b/data/themes/colorclasses.edc
@@ -1,7 +1,122 @@
 color_classes {
-   color_class {
-      name: "comp_focus-out_color";
+// comp
+   color_class { name: "comp_focus-out_color";
       color: 255 255 255 255;
-      color3: 0 0 0 0;
    }
+   color_class { name: "comp_focus_color";
+      color: 255 255 255 255;
+   }
+
+// wm
+   color_class { name: "border_title";
+      color: 21 21 21 255;
+      color3: 255 255 255 25;
+   }
+   color_class { name: "border_title_active";
+      color: 255 255 255 255;
+      color3: 0 0 0 18;
+   }
+   color_class { name: "border_frame";
+      color: 255 255 255 255;
+   }
+   color_class { name: "border_frame_active";
+      color: 255 255 255 255;
+   }
+   color_class { name: "border_bottom";
+      color: 64 64 64 255;
+   }
+   color_class { name: "move_text";
+      color: 255 255 255 255;
+      color3: 0 0 0 128;
+   }
+   color_class { name: "resize_text";
+      color: 255 255 255 255;
+      color3: 0 0 0 128;
+   }
+#if 0
+   color_class { name: "error_text"
+   }
+   color_class { name: "menu_base"
+   }
+   color_class { name: "menu_title"
+   }
+   color_class { name: "menu_title_active"
+   }
+   color_class { name: "menu_item"
+   }
+   color_class { name: "menu_item_active"
+   }
+   color_class { name: "menu_item_disabled"
+   }
+   color_class { name: "winlist_item"
+   }
+   color_class { name: "winlist_item_active"
+   }
+   color_class { name: "winlist_label"
+   }
+   color_class { name: "winlist_title"
+   }
+   color_class { name: "dialog_base"
+   }
+   color_class { name: "shelf_base"
+   }
+   color_class { name: "fileman_base"
+   }
+#endif
+
+// widgets
+#if 0
+   color_class { name: "focus"
+   }
+   color_class { name: "button_text"
+   }
+   color_class { name: "button_text_disabled"
+   }
+   color_class { name: "check_text"
+   }
+   color_class { name: "check_text_disabled"
+   }
+   color_class { name: "entry_text"
+   }
+   color_class { name: "entry_text_disabled"
+   }
+   color_class { name: "label_text"
+   }
+   color_class { name: "ilist_item_selected"
+   }
+   color_class { name: "ilist_item"
+   }
+   color_class { name: "ilist_item_base"
+   }
+   color_class { name: "ilist_item_odd"
+   }
+   color_class { name: "ilist_item_odd_base"
+   }
+   color_class { name: "ilist_item_header"
+   }
+   color_class { name: "ilist_item_header_base"
+   }
+   color_class { name: "ilist_item_header_odd"
+   }
+   color_class { name: "ilist_item_header_odd_base"
+   }
+   color_class { name: "radio_text"
+   }
+   color_class { name: "radio_text_disabled"
+   }
+   color_class { name: "slider_text"
+   }
+   color_class { name: "slider_text_disabled"
+   }
+   color_class { name: "frame_base"
+   }
+   color_class { name: "scrollframe_base"
+   }
+#endif
+
+// modules
+#if 0
+   color_class { name: "module_label";
+   }
+#endif
 }
diff --git a/data/themes/edc/border.edc b/data/themes/edc/border.edc
index f4156863f..4e6acc537 100644
--- a/data/themes/edc/border.edc
+++ b/data/themes/edc/border.edc
@@ -79,16 +79,17 @@ group { name: "e/widgets/border/default/border";
       }
       part { name: "top"; mouse_events: 0;
          description { state: "default" 0.0;
-            color_class: "border_top";
             image.normal: "vgrad_med_lighter.png";
             rel2.to_y: "title2";
             rel2.offset: -1 -4;
             fill.smooth: 0;
             TILED_HORIZ(120)
+            color_class: "border_frame";
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
             image.normal: "vgrad_med_dark.png";
+            color_class: "border_frame_active";
          }
       }
       part { name: "bevel"; mouse_events: 0;
@@ -105,7 +106,6 @@ group { name: "e/widgets/border/default/border";
          scale: 1;
          effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
-            color_class: "border_title";
             rel1.relative: 1.0 0.0;
             rel1.offset: 1 3;
             rel1.to_x: "e.event.icon";
@@ -113,7 +113,8 @@ group { name: "e/widgets/border/default/border";
             rel2.offset: -2 3;
             rel2.to_x: "e.event.minimize";
             align: 0.5 0.0;
-            color: FN_COL_DISABLE;
+            color_class: "border_title";
+            color3: 255 255 255 255;
             text { font: FNBD; size: 10;
                text_class: "title_bar";
                align: 0.5 0.0;
@@ -130,7 +131,6 @@ group { name: "e/widgets/border/default/border";
          scale: 1;
          effect: SOFT_SHADOW BOTTOM;
          description { state: "default" 0.0;
-            color_class: "border_title_active";
             rel1.relative: 1.0 0.0;
             rel1.offset: 1 2;
             rel1.to_x: "e.event.icon";
@@ -138,7 +138,8 @@ group { name: "e/widgets/border/default/border";
             rel2.offset: -1 2;
             rel2.to_x: "e.event.minimize";
             align: 0.5 0.0;
-            color: FN_COL_DEFAULT_SOFT_SHADOW;
+            color_class: "border_title_active";
+            color3: 255 255 255 255;
             text { font: FNBD; size: 10;
                text_source: "e.text.title";
                text_class: "title_bar";
@@ -422,7 +423,6 @@ group { name: "e/widgets/border/default/border";
             rel1.offset: 0 -5;
             rel2.relative: 1.0 1.0;
             min: 0 5;
-            color: 64 64 64 255;
             fixed: 0 1;
          }
          description { state: "shaded" 0.0;
@@ -979,7 +979,6 @@ group { name: "e/widgets/border/noresize/border";
       }
       part { name: "bottom"; type: RECT;
          description { state: "default" 0.0;
-            color_class: "border_bottom";
             rel1.relative: 0.0 1.0;
             rel1.offset: 0 -1;
             rel2.relative: 1.0 1.0;
@@ -1024,7 +1023,6 @@ group { name: "e/widgets/border/noresize_dialog/border";
       }
       part { name: "bottom"; type: RECT;
          description { state: "default" 0.0;
-            color_class: "border_bottom";
             rel1.relative: 0.0 1.0;
             rel1.offset: 0 -1;
             rel2.relative: 1.0 1.0;
@@ -1238,8 +1236,8 @@ group { name: "e/widgets/border/default/move";
             rel1.offset: 4 4;
             rel1.relative: 1.0 0.0;
             rel2.offset: -5 -5;
-            color: FN_COL_DEFAULT;
             color_class: "move_text";
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
                min: 1 1;
                text_class: "move_text";
@@ -1267,5 +1265,11 @@ group { name: "e/widgets/border/default/resize";
             image.normal: "ic_win_resize.png";
          }
       }
+      part { name: "e.text.label"; type: TEXT;
+         description { state: "default" 0.0;
+            color_class: "resize_text";
+            color3: 255 255 255 255;
+         }
+      }
    }
 }
diff --git a/data/themes/edc/comp.edc b/data/themes/edc/comp.edc
index 796f0be06..0aa558551 100644
--- a/data/themes/edc/comp.edc
+++ b/data/themes/edc/comp.edc
@@ -322,8 +322,7 @@ group { name: "e/comp/frame/default";
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color_class: "";
-            color: 255 255 255 255;
+            color_class: "comp_focus_color";
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;
diff --git a/data/themes/edc/elm/segment_control.edc b/data/themes/edc/elm/segment_control.edc
index 365f8282d..82139657f 100644
--- a/data/themes/edc/elm/segment_control.edc
+++ b/data/themes/edc/elm/segment_control.edc
@@ -192,7 +192,6 @@ group { name: "elm/segment_control/item/default";
          }
          description { state: "pressed" 0.0;
             inherit: "default" 0.0;
-            color: FN_COL_DEFAULT_BASIC2;
             visible: 1;
          }
          description { state: "disabled" 0.0;