[genlist] change font/item color in black theme

Change-Id: I1b3a01fcbebccf64ec849a250335b7fbbafd0dc9

diff --git a/themes/groups/genlist/genlist_edit.edc b/themes/groups/genlist/genlist_edit.edc
index 24bc4fb..4bd5860 100644 (file)
--- a/themes/groups/genlist/genlist_edit.edc
+++ b/themes/groups/genlist/genlist_edit.edc
@@ -859,7 +859,7 @@
             description { state: "default" 0.0;
                min: 10 0;
                fixed: 1 0;
-               color: 199 199 199 255;
+               color: GENLIST_PART_DIALOGUE_INDICATOR_BG_COLOR_INC;
                rel2.relative: 0.0 1.0;
                align: 0.0 0.0;
             }
@@ -1160,7 +1160,7 @@
           description { state: "default" 0.0;
              min: 56 0;
              fixed: 1 0;
-             color: 242 238 233 255;
+             color: LAYOUT_GROUP_LIST_BG_COLOR_INC;
              rel1 {
                 relative: 1.0 0.0;
                 offset: 0 -1;
@@ -1393,7 +1393,7 @@
           description { state: "default" 0.0;
              min: 56 0;
              fixed: 1 0;
-             color: 242 238 233 255;
+             color: LAYOUT_GROUP_LIST_BG_COLOR_INC;
              rel1 {
                 relative: 1.0 0.0;
                 offset: 0 -1;
@@ -1534,7 +1534,7 @@
             scale: 1;
             description { state: "default" 0.0;
                min: 0 70;
-               color: 239 237 230 255;
+               color: GENLIST_EDIT_SELECT_ALL_BG_COLOR_INC;
             }
          }
          part { name: "bg";
@@ -1543,7 +1543,7 @@
             repeat_events: 0;
             mouse_events: 0;
             description { state: "default" 0.0;
-               color: 239 237 230 255;
+               color: GENLIST_EDIT_SELECT_ALL_BG_COLOR_INC;
             }
          }
          GENLIST_PART_BG_IMAGE

diff --git a/themes/groups/genlist/genlist_expandable_list.edc b/themes/groups/genlist/genlist_expandable_list.edc
index 95ed564..5115660 100644 (file)
--- a/themes/groups/genlist/genlist_expandable_list.edc
+++ b/themes/groups/genlist/genlist_expandable_list.edc
@@ -132,7 +132,7 @@
             } \
             description { state: "selected" 0.0; \
                inherit: "default" 0.0; \
-               color: 225 225 225 255; \
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC; \
             } \
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
@@ -330,7 +330,7 @@
             } \
             description { state: "selected" 0.0; \
                inherit: "default" 0.0; \
-               color: 225 225 225 255; \
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC; \
             } \
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
@@ -1163,7 +1163,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
                   to_x: "elm.padding.arrow.left";
                   to_y: "elm.padding.bottom";
                }
-               color: 226 144 1 255;
+               color: GENLIST_PART_SUB_TEXT_SETTINGS_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 20;
@@ -1666,7 +1666,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
       }
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
-         GENLIST_EXPANDABLE_PART_BASE( 71, 242 238 233 255 )
+         GENLIST_EXPANDABLE_PART_BASE( 71, GENLIST_DIALOGUE_EXPANDABLE2_PART_BG_COLOR_INC )
          GENLIST_PART_BOTTOM_EFFECT_LINE
          GENLIST_PART_PADDING_LEFT( 20 )
          GENLIST_PART_PADDING_RIGHT( 10 )
@@ -1907,7 +1907,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
       }
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
-         GENLIST_EXPANDABLE_PART_BASE( 71, 242 238 233 255 )
+         GENLIST_EXPANDABLE_PART_BASE( 71, GENLIST_DIALOGUE_EXPANDABLE2_PART_BG_COLOR_INC )
          GENLIST_PART_BOTTOM_EFFECT_LINE
          GENLIST_PART_PADDING_LEFT( 20 )
          GENLIST_PART_PADDING_RIGHT( 10 )
@@ -1939,7 +1939,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: 225 225 225 255;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
@@ -2058,7 +2058,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
       }
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
-         GENLIST_EXPANDABLE_PART_BASE( 71, 242 238 233 255 )
+         GENLIST_EXPANDABLE_PART_BASE( 71, GENLIST_DIALOGUE_EXPANDABLE2_PART_BG_COLOR_INC )
          GENLIST_PART_BOTTOM_EFFECT_LINE
          GENLIST_PART_PADDING_LEFT( 20 )
          GENLIST_PART_PADDING_RIGHT( 10 )
@@ -2124,7 +2124,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: 225 225 225 255;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
@@ -2251,7 +2251,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
       }
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
-         GENLIST_EXPANDABLE_PART_BASE( 71, 242 238 233 255 )
+         GENLIST_EXPANDABLE_PART_BASE( 71, GENLIST_DIALOGUE_EXPANDABLE2_PART_BG_COLOR_INC )
          GENLIST_PART_BOTTOM_EFFECT_LINE
          GENLIST_PART_PADDING_LEFT( 20 )
          GENLIST_PART_PADDING_RIGHT( 10 )
@@ -2317,7 +2317,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: 225 225 225 255;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
@@ -2443,7 +2443,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
       }
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
-         GENLIST_EXPANDABLE_PART_BASE( 71, 218 212 205 255 )
+         GENLIST_EXPANDABLE_PART_BASE( 71, GENLIST_DIALOGUE_EXPANDABLE3_PART_BG_COLOR_INC )
          GENLIST_PART_BOTTOM_EFFECT_LINE
          GENLIST_PART_PADDING_LEFT( 20 )
          GENLIST_PART_PADDING_RIGHT( 10 )
@@ -2475,7 +2475,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: 225 225 225 255;
+               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)

diff --git a/themes/groups/genlist/genlist_group_title.edc b/themes/groups/genlist/genlist_group_title.edc
index bb7c261..1e91190 100644 (file)
--- a/themes/groups/genlist/genlist_group_title.edc
+++ b/themes/groups/genlist/genlist_group_title.edc
@@ -122,7 +122,7 @@
             scale: 1;
             description { state: "default" 0.0;
                min: 0 39;
-               color: 0 0 0 0;
+               color: GENLIST_BUBBLE_BG_COLOR_INC;
             }
          }
          GENLIST_PART_PADDING_LEFT( 15 )
@@ -132,7 +132,7 @@
             repeat_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               color: 220 211 198 255;
+               color: GENLIST_GROUP_PART_BUBBLE_BG_COLOR_INC;
                rel2.relative: 1.0 0.62;
             }
          }
@@ -150,7 +150,7 @@
                   to_x: "elm.padding.right";
                   to_y: "text_base";
                }
-               color: 76 75 73 255;
+               color: GENLIST_GROUP_PART_BUBBLE_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Regular";
                   size: 18;
@@ -180,7 +180,7 @@
             scale: 1;
             description { state: "default" 0.0;
                min: 0 39;
-               color: 0 0 0 0;
+               color: GENLIST_BUBBLE_BG_COLOR_INC;
             }
          }
          GENLIST_PART_PADDING_LEFT( 15 )
@@ -190,7 +190,7 @@
             repeat_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               color: 220 211 198 255;
+               color: GENLIST_GROUP_PART_BUBBLE_BG_COLOR_INC;
                rel2.relative: 1.0 0.62;
             }
          }
@@ -208,7 +208,7 @@
                   to_x: "elm.padding.right";
                   to_y: "text_base";
                }
-               color: 76 75 73 255;
+               color: GENLIST_GROUP_PART_BUBBLE_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Regular";
                   size: 18;
@@ -250,7 +250,7 @@
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
                }
-               color: 156 156 156 255;
+               color: GENLIST_PART_DIALOGUE_SUBTITLE_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 18;
@@ -264,7 +264,7 @@
             description { state: "default" 0.0;
                min: 0 1;
                fixed: 0 1;
-               color: 199 199 199 255;
+               color: GENLIST_PART_BOTTOM_LINE_INC;
                rel1 {
                   relative: 0.0 1.0;
                   offset: 0 -1;
@@ -289,7 +289,7 @@
             description { state: "default" 0.0;
                min: 0 1;
                fixed: 0 1;
-               color: 199 199 199 255;
+               color: GENLIST_PART_BOTTOM_LINE_INC;
                rel1 {
                   relative: 0.0 1.0;
                   offset: 0 -1;

diff --git a/themes/groups/genlist/genlist_macro.edc b/themes/groups/genlist/genlist_macro.edc
index 1718cea..3e070df 100644 (file)
--- a/themes/groups/genlist/genlist_macro.edc
+++ b/themes/groups/genlist/genlist_macro.edc
@@ -188,7 +188,7 @@
             scale: 1; \
             description { state: "default" 0.0; \
                min: 0 param_item_height; \
-               color: 242 238 233 255; \
+               color: LAYOUT_GROUP_LIST_BG_COLOR_INC; \
             } \
          }
 
@@ -199,7 +199,7 @@
             description { state: "default" 0.0; \
                min: 10 0; \
                fixed: 1 0; \
-               color: 199 199 199 255; \
+               color: GENLIST_PART_DIALOGUE_INDICATOR_BG_COLOR_INC; \
                rel2.relative: 0.0 1.0; \
                align: 0.0 0.0; \
             } \
@@ -212,7 +212,7 @@
             description { state: "default" 0.0; \
                min: 10 0; \
                fixed: 1 0; \
-               color: 199 199 199 255; \
+               color: GENLIST_PART_DIALOGUE_INDICATOR_BG_COLOR_INC; \
                rel2.relative: 0.0 1.0; \
                align: 0.0 0.0; \
             } \
@@ -259,7 +259,7 @@
             } \
             description { state: "disabled" 0.0; \
                inherit: "default" 0.0; \
-               color: 255 255 255 64; \
+               color: GENLIST_PART_DISCLIP_COLOR_INC; \
             } \
          }
 

diff --git a/themes/groups/genlist/genlist_styles.edc b/themes/groups/genlist/genlist_styles.edc
index 1ba109c..8766b91 100644 (file)
--- a/themes/groups/genlist/genlist_styles.edc
+++ b/themes/groups/genlist/genlist_styles.edc
@@ -8631,13 +8631,13 @@
       data.item: "labels" "elm.text.1 elm.text.2";
       styles {
         style { name: "genlist_textblock_sub_style";
-          base: "font=SLP:style=Regular font_size=22 color=#6C6C6C wrap=char text_class=list_item";
+          base: "font=SLP:style=Regular font_size=22 color="GENLIST_PART_MULTILINE_TITLE_STYLE_COLOR_INC" wrap=char text_class=list_item";
           tag:  "br" "\n";
           tag:  "ps" "ps";
           tag:  "tab" "\t";
         }
         style { name: "genlist_textblock_sub_selected_style";
-          base: "font=SLP:style=Regular font_size=22 color=#FFFFFF wrap=char text_class=list_item";
+          base: "font=SLP:style=Regular font_size=22 color="GENLIST_PART_MULTILINE_TITLE_STYLE_SELECTED_COLOR_INC" wrap=char text_class=list_item";
           tag:  "br" "\n";
           tag:  "ps" "ps";
           tag:  "tab" "\t";
@@ -8648,7 +8648,7 @@
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
-               color: 249 249 249 255;
+               color: GENLIST_PART_BG_COLOR_INC;
             }
          }
          GENLIST_PART_BG_IMAGE
@@ -9742,7 +9742,7 @@
                }
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
-               color: 78 73 69 255;
+               color: GENLIST_PART_MULTILINE_TITLE_STYLE_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 20;
@@ -9862,13 +9862,13 @@
       data.item: "labels" "elm.title elm.text";
       styles {
         style { name: "genlist_textblock_style";
-          base: "font=SLP:style=Roman font_size=26 color=#000000 wrap=char text_class=list_item";
+          base: "font=SLP:style=Roman font_size=26 color="GENLIST_PART_MULTILINE_TEXT_STYLE_COLOR_INC" wrap=char text_class=list_item";
           tag:  "br" "\n";
           tag:  "ps" "ps";
           tag:  "tab" "\t";
         }
         style { name: "genlist_textblock_selected_style";
-          base: "font=SLP:style=Roman font_size=26 color=#FFFFFF wrap=char text_class=list_item";
+          base: "font=SLP:style=Roman font_size=26 color="GENLIST_PART_MULTILINE_TEXT_STYLE_SELECTED_COLOR_INC" wrap=char text_class=list_item";
           tag:  "br" "\n";
           tag:  "ps" "ps";
           tag:  "tab" "\t";
@@ -9879,7 +9879,7 @@
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
-               color: 249 249 249 255;
+               color: GENLIST_PART_BG_COLOR_INC;
             }
          }
          GENLIST_PART_BG_IMAGE
@@ -9905,7 +9905,7 @@
                   to_x: "elm.padding.left";
                }
                align: 0.0 0.0;
-               color: 78 73 69 255;
+               color: GENLIST_PART_MULTILINE_TITLE_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 20;
@@ -10044,7 +10044,7 @@
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
-               color: 249 249 249 255;
+               color: GENLIST_PART_BG_COLOR_INC;
             }
          }
          GENLIST_PART_BG_IMAGE
@@ -10199,7 +10199,7 @@
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
-               color: 249 249 249 255;
+               color: GENLIST_PART_BG_COLOR_INC;
             }
          }
          GENLIST_PART_BG_IMAGE
@@ -10358,7 +10358,7 @@
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
-               color: 242 238 233 255;
+               color: GENLIST_BUBBLE_BG_COLOR_INC;
             }
          }
          part { name: "elm.icon";
@@ -10423,7 +10423,7 @@
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
-               color: 242 238 233 255;
+               color: GENLIST_BUBBLE_BG_COLOR_INC;
             }
          }
          part { name: "elm.icon";
@@ -10503,7 +10503,7 @@
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
                }
-               color: 156 156 156 255;
+               color: GENLIST_PART_DIALOGUE_SUBTITLE_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 18;
@@ -12001,7 +12001,7 @@
                }
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
-               color: 78 73 69 255;
+               color: GENLIST_PART_MULTILINE_TITLE_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 20;
@@ -12157,7 +12157,7 @@
                }
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
-               color: 78 73 69 255;
+               color: GENLIST_PART_MULTILINE_TITLE_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 20;
@@ -12342,7 +12342,7 @@
                }
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
-               color: 78 73 69 255;
+               color: GENLIST_PART_MULTILINE_TITLE_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 20;
@@ -12530,7 +12530,7 @@
                }
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
-               color: 78 73 69 255;
+               color: GENLIST_PART_MULTILINE_TITLE_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 20;
@@ -12750,7 +12750,7 @@
                }
                rel2.to_x: "elm.padding.right";
                align: 1.0 0.5;
-               color: 78 73 69 255;
+               color: GENLIST_PART_MULTILINE_TITLE_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 20;
@@ -14549,7 +14549,7 @@
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
-               color: 249 249 249 255;
+               color: GENLIST_PART_BG_COLOR_INC;
             }
          }
          GENLIST_PART_BG_IMAGE
@@ -14576,7 +14576,7 @@
                   to_x: "elm.padding.left";
                }
                align: 0.0 0.0;
-               color: 78 73 69 255;
+               color: GENLIST_PART_MULTILINE_TITLE_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 20;
@@ -14747,7 +14747,7 @@
                }
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
-               color: 78 73 69 255;
+               color: GENLIST_PART_MULTILINE_TITLE_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 20;
@@ -16461,7 +16461,7 @@
                }
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
-               color: 78 73 69 255;
+               color: GENLIST_PART_MULTILINE_TITLE_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 20;
@@ -16681,7 +16681,7 @@
                }
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
-               color: 78 73 69 255;
+               color: GENLIST_PART_MULTILINE_TITLE_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 20;
@@ -16942,7 +16942,7 @@
                }
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
-               color: 78 73 69 255;
+               color: GENLIST_PART_MULTILINE_TITLE_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: 20;
@@ -17357,7 +17357,7 @@
             description { state: "default" 0.0;
                min: 10 0;
                fixed: 1 0;
-               color: 199 199 199 255;
+               color: GENLIST_PART_DIALOGUE_INDICATOR_BG_COLOR_INC;
                rel1 {
                   relative: 1.0 1.0;
                   to_x: "vertical_line";
@@ -17456,6 +17456,7 @@
                   to_x: "elm.padding.right";
                   to_y: "text_center_line";
                }
+               color: GENLIST_PART_BG_COLOR_INC;
             }
          }
          part { name: "elm.text.1";
@@ -17513,6 +17514,7 @@
                   to_x: "elm.padding.right";
                   to_y: "text_bottom_line";
                }
+               color: GENLIST_PART_BG_COLOR_INC;
             }
          }
          part { name: "elm.text.2";

diff --git a/themes/groups/genlist/genlist_sweep.edc b/themes/groups/genlist/genlist_sweep.edc
index b075aec..3339858 100644 (file)
--- a/themes/groups/genlist/genlist_sweep.edc
+++ b/themes/groups/genlist/genlist_sweep.edc
@@ -61,7 +61,7 @@
                min: 0 1;
                fixed: 0 1;
                visible: 1;
-               color: 212 212 212 255;
+               color: GENLIST_PART_BOTTOM_LINE_INC;
                rel1 {
                   relative: 0.0 1.0;
                   offset: 0 -1;
@@ -141,7 +141,7 @@
                   to_x: "base.padding.right";
                   to_y: "base";
                }
-               color: 255 255 255 255;
+               color: GENLIST_PART_SLIDE_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
                   size: 22;
@@ -204,7 +204,7 @@
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: 255 255 255 64;
+               color: GENLIST_PART_DISCLIP_COLOR_INC;
             }
          }
       }
@@ -279,7 +279,7 @@
                min: 0 1;
                fixed: 0 1;
                visible: 1;
-               color: 212 212 212 255;
+               color: GENLIST_PART_BOTTOM_LINE_INC;
                rel1 {
                   relative: 0.0 1.0;
                   offset: 0 -1;
@@ -359,7 +359,7 @@
                   to_x: "base.padding.right";
                   to_y: "base";
                }
-               color: 255 255 255 255;
+               color: GENLIST_PART_SLIDE_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
                   size: 22;
@@ -455,7 +455,7 @@
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: 255 255 255 64;
+               color: GENLIST_PART_DISCLIP_COLOR_INC;
             }
          }
       }
@@ -530,7 +530,7 @@
                min: 0 1;
                fixed: 0 1;
                visible: 1;
-               color: 212 212 212 255;
+               color: GENLIST_PART_BOTTOM_LINE_INC;
                rel1 {
                   relative: 0.0 1.0;
                   offset: 0 -1;
@@ -610,7 +610,7 @@
                   to_x: "base.padding.right";
                   to_y: "base";
                }
-               color: 255 255 255 255;
+               color: GENLIST_PART_SLIDE_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
                   size: 22;
@@ -737,7 +737,7 @@
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: 255 255 255 64;
+               color: GENLIST_PART_DISCLIP_COLOR_INC;
             }
          }
       }
@@ -812,7 +812,7 @@
                min: 0 1;
                fixed: 0 1;
                visible: 1;
-               color: 212 212 212 255;
+               color: GENLIST_PART_BOTTOM_LINE_INC;
                rel1 {
                   relative: 0.0 1.0;
                   offset: 0 -1;
@@ -892,7 +892,7 @@
                   to_x: "base.padding.right";
                   to_y: "base";
                }
-               color: 255 255 255 255;
+               color: GENLIST_PART_SLIDE_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
                   size: 22;
@@ -1052,7 +1052,7 @@
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: 255 255 255 64;
+               color: GENLIST_PART_DISCLIP_COLOR_INC;
             }
          }
       }

diff --git a/themes/images/nbeat-black/00_sweep_list_bg.png b/themes/images/nbeat-black/00_sweep_list_bg.png
old mode 100644 (file)
new mode 100755 (executable)
index 0ba7107..d87592a
Binary files a/themes/images/nbeat-black/00_sweep_list_bg.png and b/themes/images/nbeat-black/00_sweep_list_bg.png differ

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index b25764c..d8a2c6a 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -24,7 +24,7 @@
  */
 
 #define LAYOUT_BG_COLOR_INC 0 0 0 255
-#define LAYOUT_EDIT_MODE_BG_COLOR_INC 15 15 15 255
+#define LAYOUT_EDIT_MODE_BG_COLOR_INC 36 36 36 255
 #define LAYOUT_GROUP_LIST_BG_COLOR_INC 15 15 15 255
 
 #define NAVIBAR_TITLE_TEXT_COLOR_INC 235 236 237 255
@@ -40,15 +40,25 @@
 
 #define LABEL_TEXT_BLOCK_STYLE_COLOR_INC "#FFFFFF"
 
+#define GENLIST_PART_DISCLIP_COLOR_INC 255 255 255 64
 #define GENLIST_PART_BG_COLOR_INC 0 0 0 255
-#define GENLIST_PART_BG_SELECTED_COLOR_INC 199 185 164 255
-#define GENLIST_PART_BG_UNSELECTED_COLOR_INC 199 185 164 0
+#define GENLIST_PART_BG_SELECTED_COLOR_INC 50 65 74 255
+#define GENLIST_PART_BG_UNSELECTED_COLOR_INC 0 0 0 0
 #define GENLIST_PART_SELECT_ALL_BG_COLOR_INC 239 237 230 255
-#define GENLIST_PART_TEXT_COLOR_INC 255 255 255 255
-#define GENLIST_PART_TEXT_SELECTED_COLOR_INC 225 225 225 255
-#define GENLIST_PART_SUB_TEXT_COLOR_INC 161 139 73 255
-#define GENLIST_PART_SUB_TEXT_SETTINGS_COLOR_INC 226 144 1 255
-#define GENLIST_PART_BOTTOM_LINE_INC 41 40 36 255
+#define GENLIST_PART_TEXT_COLOR_INC 249 249 249 255
+#define GENLIST_PART_TEXT_SELECTED_COLOR_INC 249 249 249 255
+#define GENLIST_PART_SUB_TEXT_COLOR_INC 100 100 100 255
+#define GENLIST_PART_SUB_TEXT_SETTINGS_COLOR_INC 42 109 140 255
+#define GENLIST_PART_MULTILINE_TEXT_COLOR_INC GENLIST_PART_TEXT_COLOR_INC
+#define GENLIST_PART_MULTILINE_TITLE_COLOR_INC 149 149 149 255
+#define GENLIST_PART_MULTILINE_TITLE_STYLE_COLOR_INC "#F9F9F9FF"
+#define GENLIST_PART_MULTILINE_TITLE_STYLE_SELECTED_COLOR_INC "#F9F9F9FF"
+#define GENLIST_PART_MULTILINE_TEXT_STYLE_COLOR_INC "#959595FF"
+#define GENLIST_PART_MULTILINE_TEXT_STYLE_SELECTED_COLOR_INC "#959595FF"
+#define GENLIST_PART_SLIDE_TEXT_COLOR_INC 255 255 255 255
+#define GENLIST_PART_BOTTOM_LINE_INC 68 68 68 255
+#define GENLIST_PART_DIALOGUE_SUBTITLE_TEXT_COLOR_INC 102 102 102 255
+#define GENLIST_PART_DIALOGUE_INDICATOR_BG_COLOR_INC 68 68 68 255
 #define GENLIST_GROUP_PART_TEXT_COLOR_INC 153 151 121 255
 #define GENLIST_GROUP_PART_BASE_EVENT_INC \
          part { name: "base_event";\
@@ -58,12 +68,13 @@
                color: 0 0 0 0;\
             }\
          }
-#define GENLIST_GROUP_PART_BASE_IMAGE_INC 
+#define GENLIST_GROUP_PART_BASE_IMAGE_INC
 #define GENLIST_GROUP_BG_COLOR_DEFAULT_INC 15 15 15 255
 #define GENLIST_GROUP_BG_COLOR_ALPHA_OFF_INC 15 15 15 255
 #define GENLIST_GROUP_LEFT_BG_COLOR_INC 15 15 15 255
 #define GENLIST_EDIT_PART_LINE_INC 41 40 36 150
 #define GENLIST_EDIT_BG_COLOR_INC 0 0 0 255
+#define GENLIST_EDIT_SELECT_ALL_BG_COLOR_INC 36 36 36 255
 #define GENLIST_EXPANDABLE_PART_BG_COLOR_INC GENLIST_PART_BG_COLOR_INC
 #define GENLIST_EXPANDABLE2_PART_BG_COLOR_INC 15 15 15 255
 #define GENLIST_EXPANDABLE2_NOSHADOW_BG_COLOR_INC 15 15 15 255
@@ -128,6 +139,11 @@
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
          }
+#define GENLIST_DIALOGUE_EXPANDABLE2_PART_BG_COLOR_INC 31 31 31 255
+#define GENLIST_DIALOGUE_EXPANDABLE3_PART_BG_COLOR_INC 46 46 46 255
+#define GENLIST_GROUP_PART_BUBBLE_TEXT_COLOR_INC 57 166 215 255
+#define GENLIST_GROUP_PART_BUBBLE_BG_COLOR_INC 36 43 44 255
+#define GENLIST_BUBBLE_BG_COLOR_INC 153 153 153 255
 
 #define DIALOGUEGROUP_ITEM_TITLE_TEXT_COLOR_INC 130 130 130 255
 #define DIALOGUEGROUP_ITEM_SINGLE_TEXT_COLOR_INC 255 255 255 255

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index 75b2304..b20bca4 100755 (executable)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -39,6 +39,7 @@
 
 #define LABEL_TEXT_BLOCK_STYLE_COLOR_INC "#000000"
 
+#define GENLIST_PART_DISCLIP_COLOR_INC 255 255 255 64
 #define GENLIST_PART_BG_COLOR_INC 249 249 249 255
 #define GENLIST_PART_BG_SELECTED_COLOR_INC 199 185 164 255
 #define GENLIST_PART_BG_UNSELECTED_COLOR_INC 199 185 164 0
@@ -47,7 +48,16 @@
 #define GENLIST_PART_TEXT_SELECTED_COLOR_INC 255 255 255 255
 #define GENLIST_PART_SUB_TEXT_COLOR_INC 108 108 108 255
 #define GENLIST_PART_SUB_TEXT_SETTINGS_COLOR_INC 226 144 1 255
+#define GENLIST_PART_MULTILINE_TEXT_COLOR_INC GENLIST_PART_TEXT_COLOR_INC
+#define GENLIST_PART_MULTILINE_TITLE_COLOR_INC 78 73 69 255
+#define GENLIST_PART_MULTILINE_TITLE_STYLE_COLOR_INC "#4E4E4EFF"
+#define GENLIST_PART_MULTILINE_TITLE_STYLE_SELECTED_COLOR_INC "#4E4E4EFF"
+#define GENLIST_PART_MULTILINE_TEXT_STYLE_COLOR_INC "#000000"
+#define GENLIST_PART_MULTILINE_TEXT_STYLE_SELECTED_COLOR_INC "#FFFFFF"
+#define GENLIST_PART_SLIDE_TEXT_COLOR_INC 255 255 255 255
 #define GENLIST_PART_BOTTOM_LINE_INC 199 199 199 255
+#define GENLIST_PART_DIALOGUE_SUBTITLE_TEXT_COLOR_INC 156 156 156 255
+#define GENLIST_PART_DIALOGUE_INDICATOR_BG_COLOR_INC 199 199 199 255
 #define GENLIST_GROUP_PART_TEXT_COLOR_INC 108 108 108 255
 #define GENLIST_GROUP_PART_BASE_EVENT_INC \
          part { name: "base_event";\
@@ -75,6 +85,7 @@
 #define GENLIST_GROUP_LEFT_BG_COLOR_INC 210 206 191 255
 #define GENLIST_EDIT_PART_LINE_INC 187 187 187 150
 #define GENLIST_EDIT_BG_COLOR_INC 234 230 217 255
+#define GENLIST_EDIT_SELECT_ALL_BG_COLOR_INC 239 237 230 255
 #define GENLIST_EXPANDABLE_PART_BG_COLOR_INC GENLIST_PART_BG_COLOR_INC
 #define GENLIST_EXPANDABLE2_PART_BG_COLOR_INC 242 238 233 255
 #define GENLIST_EXPANDABLE3_PART_BG_COLOR_INC 218 212 205 255
@@ -151,6 +162,11 @@
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
          }
+#define GENLIST_DIALOGUE_EXPANDABLE2_PART_BG_COLOR_INC 242 238 233 255
+#define GENLIST_DIALOGUE_EXPANDABLE3_PART_BG_COLOR_INC 218 212 205 255
+#define GENLIST_GROUP_PART_BUBBLE_TEXT_COLOR_INC 76 75 73 255
+#define GENLIST_GROUP_PART_BUBBLE_BG_COLOR_INC 220 211 198 255
+#define GENLIST_BUBBLE_BG_COLOR_INC 192 192 192 255
 
 #define DIALOGUEGROUP_ITEM_TITLE_TEXT_COLOR_INC 104 94 82 255
 #define DIALOGUEGROUP_ITEM_SINGLE_TEXT_COLOR_INC 0 0 0 255