theme - add more standard colorclasses in e theme (so cc dialog works)

more to go still.

9 files changed, 68 insertions, 47 deletions

diff --git a/data/objects/test_focus_style.edc b/data/objects/test_focus_style.edc
index 367dd5e84..ac184c4ca 100644
--- a/data/objects/test_focus_style.edc
+++ b/data/objects/test_focus_style.edc
@@ -435,8 +435,8 @@ collections {
    } //group ends
 
 #include "../../data/themes/macros.edc"
-#include "../../data/themes/colorclasses.edc"
 #include "../../data/themes/fonts.edc"
+#include "../../data/themes/colorclasses.edc"
 
 // to customize check default style
 #include "../../data/themes/edc/elm/check.edc"
diff --git a/data/themes/colorclasses.edc b/data/themes/colorclasses.edc
index cffd977b0..91e09738a 100644
--- a/data/themes/colorclasses.edc
+++ b/data/themes/colorclasses.edc
@@ -9,59 +9,68 @@ color_classes {
 
 // wm
    color_class { name: "border_title";
-      color: 21 21 21 255;
-      color3: 255 255 255 25;
+      color: FN_COL_DISABLE;
    }
    color_class { name: "border_title_active";
-      color: 255 255 255 255;
-      color3: 0 0 0 18;
+      color: FN_COL_DEFAULT_SOFT_SHADOW;
    }
    color_class { name: "border_frame";
-      color: 255 255 255 255;
+      color: FN_COL_DEFAULT_BASIC;
    }
    color_class { name: "border_frame_active";
-      color: 255 255 255 255;
+      color: FN_COL_DEFAULT_BASIC;
    }
    color_class { name: "border_bottom";
-      color: 64 64 64 255;
+      color: FN_COL_DEFAULT_BASIC;
    }
    color_class { name: "move_text";
-      color: 255 255 255 255;
-      color3: 0 0 0 128;
+      color: FN_COL_DEFAULT;
    }
    color_class { name: "resize_text";
-      color: 255 255 255 255;
-      color3: 0 0 0 128;
+      color: FN_COL_DEFAULT;
    }
-#if 0
-   color_class { name: "error_text"
-   }
-   color_class { name: "menu_base"
+   color_class { name: "menu_base";
+      color: FN_COL_DEFAULT_BASIC;
    }
-   color_class { name: "menu_title"
+   color_class { name: "menu_title";
+      color: FN_COL_DISABLE;
    }
-   color_class { name: "menu_title_active"
+   color_class { name: "menu_item";
+      color: FN_COL_DEFAULT;
    }
-   color_class { name: "menu_item"
+   color_class { name: "menu_item_active";
+      color: FN_COL_HIGHLIGHT;
    }
-   color_class { name: "menu_item_active"
+   color_class { name: "menu_item_disabled";
+      color: FN_COL_DISABLE;
    }
-   color_class { name: "menu_item_disabled"
+   color_class { name: "winlist_item";
+      color: FN_COL_DEFAULT;
    }
-   color_class { name: "winlist_item"
+   color_class { name: "winlist_item_active";
+      color: FN_COL_HIGHLIGHT;
    }
-   color_class { name: "winlist_item_active"
+   color_class { name: "winlist_label";
+      color: FN_COL_DEFAULT;
    }
-   color_class { name: "winlist_label"
+   color_class { name: "winlist_title";
+      color: FN_COL_DISABLE;
    }
-   color_class { name: "winlist_title"
+   color_class { name: "dialog_base";
+      color: FN_COL_DEFAULT_BASIC;
    }
-   color_class { name: "dialog_base"
+   color_class { name: "shelf_base";
+      color: FN_COL_DEFAULT_BASIC;
    }
-   color_class { name: "shelf_base"
-   }
-   color_class { name: "fileman_base"
+   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
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 6700bed69..28544db8f 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -3,8 +3,8 @@
 externals.external: "elm";
 
 collections {
-#include "colorclasses.edc"
 #include "fonts.edc"
+#include "colorclasses.edc"
 
 // elm
 #include "edc/elm/bg.edc"
diff --git a/data/themes/edc/border.edc b/data/themes/edc/border.edc
index 4e6acc537..1e80ef0ab 100644
--- a/data/themes/edc/border.edc
+++ b/data/themes/edc/border.edc
@@ -419,6 +419,7 @@ group { name: "e/widgets/border/default/border";
       part { name: "bottom"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
             color_class: "border_bottom";
+            color: 64 64 64 255;
             rel1.relative: 0.0 1.0;
             rel1.offset: 0 -5;
             rel2.relative: 1.0 1.0;
diff --git a/data/themes/edc/fileman.edc b/data/themes/edc/fileman.edc
index 26b1bba3b..8b018509b 100644
--- a/data/themes/edc/fileman.edc
+++ b/data/themes/edc/fileman.edc
@@ -936,6 +936,11 @@ group { name: "e/fileman/desktop/icon/fixed";
 group { name: "e/fileman/default/scrollframe";
    inherit: "e/widgets/scrollframe";
    parts {
+      part { name: "bg";
+         description { state: "default" 0.0;
+            color_class: "fileman_base";
+         }
+      }
       part { name: "e.swallow.bg"; type: SWALLOW;
          insert_before: "clipper";
          clip_to: "clipper";
diff --git a/data/themes/edc/menu.edc b/data/themes/edc/menu.edc
index cf375ff03..4305eb577 100644
--- a/data/themes/edc/menu.edc
+++ b/data/themes/edc/menu.edc
@@ -7,6 +7,7 @@ group { name: "e/widgets/menu/default/background";
          description { state: "default" 0.0;
             rel1.relative: 0.0 1.0;
             rel1.to_y: "top";
+            color_class: "menu_base";
             color: 64 64 64 255;
          }
       }
@@ -20,6 +21,7 @@ group { name: "e/widgets/menu/default/background";
             fill.smooth: 0;
             TILED_HORIZ(120)
             fixed: 0 1;
+            color_class: "menu_base";
          }
          description { state: "active" 0.0;
             inherit: "default" 0.0;
@@ -31,13 +33,13 @@ group { name: "e/widgets/menu/default/background";
          scale: 1;
          effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
-            color_class: "menu_title";
             rel1.relative: 0.0 0.0;
             rel1.offset: 1 0;
             rel2.relative: 1.0 0.0;
             rel2.offset: -2 -1;
             align: 0.5 0.0;
-            color: FN_COL_DISABLE;
+            color_class: "menu_title";
+            color3: 255 255 255 255;
             max: 0 0;
             text { font: FNBD; size: 10;
                text_class: "menu_title";
@@ -265,8 +267,8 @@ group { name: "e/widgets/menu/default/label";
          description { state: "default" 0.0;
             rel1.offset: 5 -1;
             rel2.offset: -4 -1;
-            color: FN_COL_DEFAULT;
             color_class: "menu_item";
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
                min: 1 1;
                align: 0.0 0.5;
@@ -288,8 +290,8 @@ group { name: "e/widgets/menu/default/label";
          description { state: "default" 0.0;
             rel1.to: "e.text.label";
             rel2.to: "e.text.label";
-            color: FN_COL_DISABLE;
             color_class: "menu_item_disabled";
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
                text_source: "e.text.label";
                align: 0.0 0.5;
@@ -314,8 +316,9 @@ group { name: "e/widgets/menu/default/label";
             rel1.to: "e.text.label";
             rel2.offset: 2 1;
             rel2.to: "e.text.label";
-            color: FN_COL_HIGHLIGHT;
             color_class: "menu_item_active";
+            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;
diff --git a/data/themes/edc/scrollframe.edc b/data/themes/edc/scrollframe.edc
index 52acdb07f..5d2ce9e18 100644
--- a/data/themes/edc/scrollframe.edc
+++ b/data/themes/edc/scrollframe.edc
@@ -338,7 +338,7 @@ group { name: "e/widgets/scrollframe";
          description { state: "default" 0.0;
             rel1.to: "e.swallow.content";
             rel2.to: "e.swallow.content";
-            color: 64 64 64 200;
+            color: 64 64 64 255;
             color_class: "scrollframe_base";
          }
       }
diff --git a/data/themes/edc/shelf.edc b/data/themes/edc/shelf.edc
index 694257570..921d32711 100644
--- a/data/themes/edc/shelf.edc
+++ b/data/themes/edc/shelf.edc
@@ -24,11 +24,13 @@ group { name: "e/shelf/default/base";
             image.normal: "vgrad_med.png";
             fill.smooth: 0;
             TILED_HORIZ(120)
+            color_class: "shelf_base";
          }
          description { state: "vert" 0.0;
             image.normal: "vgrad_tall.png";
             fill.smooth: 0;
             TILED_HORIZ(40)
+            color_class: "shelf_base";
          }
       }
       part { name: "bevel"; mouse_events: 0;
diff --git a/data/themes/edc/winlist.edc b/data/themes/edc/winlist.edc
index d2df85acc..161ec2516 100644
--- a/data/themes/edc/winlist.edc
+++ b/data/themes/edc/winlist.edc
@@ -26,15 +26,15 @@ group { name: "e/widgets/winlist/main";
          scale: 1;
          effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
-            color_class: "menu_title";
             rel1.relative: 0.0 0.0;
             rel1.offset: 1 3;
             rel2.relative: 1.0 0.0;
             rel2.offset: -2 3;
             align: 0.5 0.0;
-            color: FN_COL_DISABLE;
+            color_class: "winlist_title";
+            color3: 255 255 255 255;
             text { font: FNBD; size: 10;
-               text_class: "menu_title";
+               text_class: "winlist_title";
                align: 0.5 0.0;
                min: 0 1;
             }
@@ -58,14 +58,14 @@ group { name: "e/widgets/winlist/main";
          scale: 1;
          effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
-            color_class: "winlist_label";
             rel1.relative: 1.0 0.0;
             rel1.offset: 6 0;
             rel1.to: "e.swallow.icon";
             rel2.offset: -7 -1;
             rel2.to_y: "e.swallow.icon";
             align: 0.0 0.5;
-            color: FN_COL_DEFAULT;
+            color_class: "winlist_label";
+            color3: 255 255 255 255;
             text { font: FNBD; size: 10;
                text_class: "winlist_label";
                align: 0.0 0.5;
@@ -138,12 +138,12 @@ group { name: "e/widgets/winlist/item";
             rel1.relative: 1.0 0.0;
             rel1.to_x: "icon";
             rel2.offset: -3 -3;
-            color: FN_COL_DEFAULT;
-            color_class: "ilist_item";
+            color_class: "winlist_item";
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
                min: 0 1;
                align: 0.0 0.5;
-               text_class: "ilist_item";
+               text_class: "winlist_item";
             }
          }
          description { state: "iconified" 0.0;
@@ -219,12 +219,13 @@ group { name: "e/widgets/winlist/item";
             rel1.to: "e.text.label";
             rel2.offset: 2 1;
             rel2.to: "e.text.label";
-            color: FN_COL_HIGHLIGHT;
-            color_class: "ilist_item_selected";
+            color_class: "winlist_item_active";
+            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;
-               text_class: "ilist_item";
+               text_class: "winlist_item_active";
             }
             visible: 0;
          }