Fix/Chagne some macros

Change-Id: Ic72c8e624dc8fee19e916c50c7a08ad2eb5b0f78

diff --git a/themes/inc/white-hd-inc.edc b/themes/inc/white-hd-inc.edc
index a61b381..3bd109f 100644 (file)
--- a/themes/inc/white-hd-inc.edc
+++ b/themes/inc/white-hd-inc.edc
@@ -160,6 +160,10 @@
 #define GENLIST_PADDING_88_INC 88
 #define GENLIST_PADDING_124_INC 124
 
+#define GENLIST_TEXT_SIZE_LIST_MAIN_TEXT 44
+#define GENLIST_TEXT_SIZE_LIST_BUBBLE_TEXT 32
+#define GENLIST_TEXT_SIZE_NAME_TEXT 32
+#define GENLIST_TEXT_SIZE_LIST_MESSAGE_TEXT 32
 #define GENLIST_FONT_27_INC 27
 #define GENLIST_FONT_28_INC 28
 #define GENLIST_FONT_30_INC 30
@@ -171,8 +175,6 @@
 #define GENLIST_FONT_STYLE_40_INC "40"
 #define GENLIST_FONT_42_INC 42
 #define GENLIST_FONT_STYLE_42_INC "42"
-#define GENLIST_FONT_44_INC 44
-#define GENLIST_FONT_STYLE_44_INC "44"
 #define GENLIST_FONT_48_INC 48
 #define GENLIST_FONT_STYLE_48_INC "48"
 
@@ -237,56 +239,70 @@
 #define GENLIST_TREESIZE_16_INC 16
 #define GENLIST_TREESIZE_20_INC 20
 
-// new
-#define GENLIST_PART_FONT_LIST_MAIN_TEXT_READ_COLOR_INC 124 124 124 255
-#define GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC 0 0 0 255
-#define GENLIST_PART_FONT_LIST_MAIN_TEXT_FOCUS_COLOR_INC 249 249 249 255
-#define GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC 124 124 124 255
-#define GENLIST_PART_FONT_LIST_SUB_TEXT_SETTINGS_COLOR_INC 42 137 194 204
-#define GENLIST_PART_FONT_LIST_SUB_TEXT_FOCUS_COLOR_INC 249 249 249 255
-#define GENLIST_PART_FONT_FLEXIBLE_TEXT_MAIN_COLOR_INC 0 0 0 255
-#define GENLIST_PART_FONT_FLEXIBLE_TEXT_SUB_COLOR_INC 149 149 149 255
-#define GENLIST_PART_FONT_INDEX_LIST_COLOR_INC 29 100 149 255
-#define GENLIST_PART_FONT_EDITFIELD_TEXT_COLOR_INC 158 187 205 255
-#define GENLIST_PART_FONT_EDITFIELD_TEXT_CURSOR_COLOR_INC 42 137 194 255
-#define GENLIST_PART_FONT_MULTILINE_TEXT_COLOR_INC 124 124 124 255
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_READ_COLOR_INC 124 124 124 255
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_UNREAD_COLOR_INC 0 0 0 255
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_FOCUS_COLOR_INC 249 249 249 255
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_2_COLOR_INC 124 124 124 255
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_2_FOCUS_COLOR_INC 249 249 249 255
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_3_COLOR_INC 124 124 124 255
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_3_FOCUS_COLOR_INC 249 249 249 255
-#define GENLIST_PART_FONT_CONVERTOR_STYLE_COLOR_INC 249 249 249 255
-#define GENLIST_PART_FONT_CONVERTOR_STYLE_FOCUS_COLOR_INC 249 249 249 255
-#define GENLIST_PART_FONT_UNREAD_EMAIL_COLOR_INC 0 0 0 255
-#define GENLIST_PART_FONT_CONTENTS_TEXT_COLOR_INC 210 210 210 255
-#define GENLIST_PART_FONT_NAME_TEXT_COLOR_INC 128 128 128 255
-#define GENLIST_PART_FONT_NAME_TEXT_DIM_COLOR_INC 42 137 194 255
-#define GENLIST_PART_FONT_BUBBLE_READ_MESSAGE_COLOR_INC 0 0 0 255
-#define GENLIST_PART_FONT_BUBBLE_MESSAGE_TIME_COLOR_INC 0 0 0 255
-#define GENLIST_PART_FONT_BUBBLE_SENT_MESSAGE_COLOR_INC 0 0 0 255
-#define GENLIST_PART_FONT_BUBBLE_SOS_MESSAGE_COLOR_INC 192 23 23 255
-#define GENLIST_PART_FONT_BUBBLE_MESSAGE_DATE_COLOR_INC 128 128 128 255
-#define GENLIST_PART_FONT_BUBBLE_LINK_MESSAGE_COLOR_INC 34 129 157 255
-#define GENLIST_PART_FONT_BUBBLE_MESSAGE_FAILED_COLOR_INC 211 0 0 255
-#define GENLIST_PART_FONT_BUBBLE_READ_MESSAGE_NAME_COLOR_INC 57 166 215 255
-#define GENLIST_PART_FONT_BUBBLE_MESSAGE_HELP_COLOR_INC 146 146 146 255
-#define GENLIST_PART_FONT_LIST_BUBBLE_TEXT_COLOR_INC 249 249 249 255
-#define GENLIST_PART_FONT_LIST_MESSAGE_TEXT_COLOR_INC 0 0 0 255
-#define GENLIST_PART_FONT_SWEEP_STYLE_COLOR_INC 118 118 118 255
-
-#define GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_STYLE_COLOR_INC "#000000FF"
-#define GENLIST_PART_FONT_LIST_SUB_TEXT_STYLE_COLOR_INC "#7C7C7CFF"
-#define GENLIST_PART_FONT_FLEXIBLE_TEXT_MAIN_STYLE_COLOR_INC "#000000FF"
-#define GENLIST_PART_FONT_FLEXIBLE_TEXT_SUB_STYLE_COLOR_INC "#959595FF"
-#define GENLIST_PART_FONT_MULTILINE_TEXT_STYLE_COLOR_INC "#959595FF"
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_READ_STYLE_COLOR_INC "#7C7C7CFF"
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_UNREAD_STYLE_COLOR_INC "#000000FF"
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_FOCUS_STYLE_COLOR_INC "#F9F9F9FF"
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_2_STYLE_COLOR_INC "#7C7C7CFF"
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_2_FOCUS_STYLE_COLOR_INC "#F9F9F9FF"
-#define GENLIST_PART_FONT_HELP_TEXT_STYLE_COLOR_INC "#7C7C7CFF"
+// ----------- TEXT COLOR ---------------- //
+#define GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_READ    124 124 124 255
+#define GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD  0 0 0 255
+#define GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_FOCUS   249 249 249 255
+
+#define GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT  124 124 124 255
+#define GENLIST_TEXT_COLOR_LIST_SUB_TEXT_SETTINGS 42 137 194 204
+#define GENLIST_TEXT_COLOR_LIST_SUB_TEXT_FOCUS    249 249 249 255
+
+#define GENLIST_TEXT_COLOR_FLEXIBLE_TEXT_MAIN     0 0 0 255
+#define GENLIST_TEXT_COLOR_FLEXIBLE_TEXT_SUB      149 149 149 255
+
+#define GENLIST_TEXT_COLOR_EDITFIELD_TEXT         158 187 205 255
+#define GENLIST_TEXT_COLOR_EDITFIELD_TEXT_CURSOR  42 137 194 255
+
+#define GENLIST_TEXT_COLOR_MULTILINE_TEXT 124 124 124 255
+
+#define GENLIST_TEXT_COLOR_INDEX_LIST              29 100 149 255
+#define GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_01_READ 124 124 124 255
+#define GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_01_UNREAD 0 0 0 255
+#define GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_01_FOCUS 249 249 249 255
+
+#define GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_02 124 124 124 255
+#define GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_02_FOCUS 249 249 249 255
+
+#define GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_03 124 124 124 255
+#define GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_03_FOCUS 249 249 249 255
+
+#define GENLIST_TEXT_COLOR_CONVERTOR_STYLE 249 249 249 255
+#define GENLIST_TEXT_COLOR_CONVERTOR_STYLE_FOCUS 249 249 249 255
+
+#define GENLIST_TEXT_COLOR_UNREAD_EMAIL 0 0 0 255
+#define GENLIST_TEXT_COLOR_CONTENTS_TEXT 210 210 210 255
+#define GENLIST_TEXT_COLOR_NAME_TEXT 128 128 128 255
+#define GENLIST_TEXT_COLOR_NAME_TEXT_DIM 42 137 194 255
+#define GENLIST_TEXT_COLOR_LIST_BUBBLE_TEXT 249 249 249 255
+#define GENLIST_TEXT_COLOR_LIST_MESSAGE_TEXT 0 0 0 255
+
+#define GENLIST_TEXT_COLOR_BUBBLE_READ_MESSAGE 0 0 0 255
+#define GENLIST_TEXT_COLOR_BUBBLE_MESSAGE_TIME 0 0 0 255
+#define GENLIST_TEXT_COLOR_BUBBLE_SENT_MESSAGE 0 0 0 255
+#define GENLIST_TEXT_COLOR_BUBBLE_SOS_MESSAGE 192 23 23 255
+#define GENLIST_TEXT_COLOR_BUBBLE_MESSAGE_DATE 128 128 128 255
+#define GENLIST_TEXT_COLOR_BUBBLE_LINK_MESSAGE 34 129 157 255
+#define GENLIST_TEXT_COLOR_BUBBLE_MESSAGE_FAILED 211 0 0 255
+#define GENLIST_TEXT_COLOR_BUBBLE_READ_MESSAGE_NAME 57 166 215 255
+#define GENLIST_TEXT_COLOR_BUBBLE_MESSAGE_HELP 146 146 146 255
+#define GENLIST_TEXT_COLOR_SWEEP_STYLE 118 118 118 255
+
+#define GENLIST_TEXT_COLOR_STYLE_NAME_TEXT "#808080FF"
+#define GENLIST_TEXT_COLOR_STYLE_LIST_MAIN_TEXT_READ "#000000FF"
+#define GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD_STYLE "#000000FF"
+#define GENLIST_TEXT_COLOR_LIST_MESSAGE_TEXT_STYLE "#000000FF"
+#define GENLIST_TEXT_COLOR_STYLE_LIST_SUB_TEXT "#7C7C7CFF"
+#define GENLIST_TEXT_COLOR_FLEXIBLE_TEXT_MAIN_STYLE "#000000FF"
+#define GENLIST_TEXT_COLOR_FLEXIBLE_TEXT_SUB_STYLE "#959595FF"
+#define GENLIST_TEXT_COLOR_MULTILINE_TEXT_STYLE "#959595FF"
+#define GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_READ_STYLE "#7C7C7CFF"
+#define GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_UNREAD_STYLE "#000000FF"
+#define GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_FOCUS_STYLE "#F9F9F9FF"
+#define GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_2_STYLE "#7C7C7CFF"
+#define GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_2_FOCUS_STYLE "#F9F9F9FF"
+#define GENLIST_TEXT_COLOR_HELP_TEXT_STYLE "#7C7C7CFF"
+#define GENLIST_TEXT_COLOR_LIST_BUBBLE_TEXT_STYLE "#F9F9F9FF"
 
 #define GENLIST_PART_DISCLIP_COLOR_INC 255 255 255 110 // alpha was 64 [???]
 #define GENLIST_PART_BG_COLOR_INC 236 240 242 255