Fix white theme

Change-Id: I9b19a768e6fe9576431a3f2e161f7af67f7d2cee

diff --git a/Makefile b/Makefile
index 8d3d9dc..943d5b4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ PREFIX ?= /usr
 all:
        cd themes && make
 
-install: all
+install: 
        cd themes && make $@
 
 uninstall:

diff --git a/themes/Makefile b/themes/Makefile
index 1f07a2e..d6db3bb 100644 (file)
--- a/themes/Makefile
+++ b/themes/Makefile
@@ -12,7 +12,7 @@ SRC=tizen.edc
 
 all: $(TARGET)
 
-$(TARGET): $(SRC)
+$(TARGET): clean get_edc
        cp -f ./inc/$(@:.edj=-inc.edc) ./inc/$(TMP_INC)
        edje_cc $(EDJE_FLAGS_$(V)) -id ./images/$(@:.edj=) -sd ./sounds -fd ../objects $(SRC) $@
 
@@ -29,7 +29,8 @@ install:
 uninstall:
        rm -f $(THEME_DIR)/$(TARGET)
 
-$(SRC):
+get_edc:
+       rm -rf widgets
        cp -rf $(EDC_DIR)/$(SRC) $(EDC_DIR)/widgets .
 
 rm_edc:

diff --git a/themes/inc/white-hd-inc.edc b/themes/inc/white-hd-inc.edc
index 37cc8e8..9272a28 100644 (file)
--- a/themes/inc/white-hd-inc.edc
+++ b/themes/inc/white-hd-inc.edc
@@ -111,18 +111,6 @@
 #define GENGRID_PART_REORDER_BG_COLOR_INC 0 0 0 128
 #define GENGRID_PART_TEXTBLOCK_STYLE_COLOR_INC "#F9F9F9"
 
-#define GENLIST_DIALOGUE_SEPARATOR_DEFAULT_HEIGHT 40
-
-// Group Title
-#define GENLIST_GT_PAD_T_H 36
-#define GENLIST_GT_PAD_B_H 10
-#define GENLIST_GT_PAD_M_H 36
-#define GENLIST_GT_TEXT_H  36
-#define GENLIST_GT_PAD_L_W 16
-#define GENLIST_GT_PAD_R_W 36
-#define GENLIST_GT_PAD_M_W 16
-#define GENLIST_GT_H       GENLIST_GT_PAD_T_H + GENLIST_GT_PAD_B_H + GENLIST_GT_TEXT_H
-
 #define GENLIST_HEIGHT_1_INC 1
 #define GENLIST_HEIGHT_16_INC 16
 #define GENLIST_HEIGHT_33_INC 33
@@ -134,7 +122,6 @@
 #define GENLIST_HEIGHT_89_INC 89
 #define GENLIST_HEIGHT_93_INC 93
 #define GENLIST_HEIGHT_97_INC 97
-#define GENLIST_HEIGHT_113_INC 113
 #define GENLIST_HEIGHT_129_INC 129
 #define GENLIST_HEIGHT_161_INC 161
 #define GENLIST_HEIGHT_163_INC 163
@@ -198,7 +185,6 @@
 #define GENLIST_SIZE_18_INC 18
 #define GENLIST_SIZE_21_INC 21
 #define GENLIST_SIZE_28_INC 28
-#define GENLIST_ICON_SMALL_SIZE 32
 #define GENLIST_SIZE_35_INC 35
 #define GENLIST_SIZE_38_INC 38
 #define GENLIST_SIZE_40_INC 40
@@ -213,7 +199,6 @@
 #define GENLIST_SIZE_60_INC 60
 #define GENLIST_SIZE_61_INC 61
 #define GENLIST_SIZE_SLIDE_60_INC 60
-#define GENLIST_SIZE_ICON_BIG 64
 #define GENLIST_SIZE_66_INC 66
 #define GENLIST_SIZE_74_INC 74
 #define GENLIST_SIZE_SLIDE_74_INC 74
@@ -251,7 +236,6 @@
 
 #define GENLIST_TREESIZE_16_INC 16
 #define GENLIST_TREESIZE_20_INC 20
-#define GENLIST_TREESIZE_DEFAULT 32
 
 // new
 #define GENLIST_PART_FONT_LIST_MAIN_TEXT_READ_COLOR_INC 124 124 124 255
@@ -374,36 +358,6 @@
 
 #define GENLIST_SWEEP_BG_COLOR_INC 236 240 242 255
 
-//old
-#if 0
-#define GENLIST_PART_DISCLIP_COLOR_INC 255 255 255 110 // alpha was 64 [???]
-#define GENLIST_PART_BG_COLOR_INC 0 0 0 255
-#define GENLIST_PART_BG_SELECTED_COLOR_INC 60 100 155 255
-#define GENLIST_PART_BG_UNSELECTED_COLOR_INC 60 100 155 0
-#define GENLIST_PART_DIALOGUE_BG_COLOR_INC 15 15 15 255
-#define GENLIST_PART_SELECT_ALL_BG_COLOR_INC 239 237 230 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 7 180 211 255
-#define GENLIST_PART_MULTILINE_TEXT_COLOR_INC 100 100 100 255
-#define GENLIST_PART_MULTILINE_TITLE_COLOR_INC 249 249 249 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 "#646464FF"
-#define GENLIST_PART_MULTILINE_SUB_TEXT_STYLE_COLOR_INC "#a8a8a8"
-#define GENLIST_PART_MULTILINE_TEXT_STYLE_SELECTED_COLOR_INC "#646464FF"
-#define GENLIST_PART_MULTILINE_HELP_STYLE_COLOR_INC "#b4b4b4"
-#define GENLIST_PART_MATCH_TAG_COLOR_INC "+ color=#3F8DAD"
-#define GENLIST_PART_SLIDE_TEXT_COLOR_INC 255 255 255 255
-#define GENLIST_PART_BOTTOM_LINE_INC 87 87 87 255
-#define GENLIST_PART_DIALOGUE_SUBTITLE_TEXT_COLOR_INC 168 168 168 255
-#define GENLIST_PART_DIALOGUE_INDICATOR_BG_COLOR_INC 87 87 87 255
-#define GENLIST_PART_EMAIL_READ_TEXT_COLOR_INC 108 108 108 255
-#define GENLIST_PART_EMAIL_UNREAD_TEXT_COLOR_INC 249 249 249 255
-#define GENLIST_PART_EMAIL_URGENCY_UNREAD_TEXT_COLOR_INC 207 37 37 255
-#define GENLIST_PART_EMAIL_URGENCY_READ_TEXT_COLOR_INC 171 82 82 255
-#endif
 #define GENLIST_PART_EMAIL_MSGCOUNT_TEXT_COLOR_INC 255 255 255 255
 #define GENLIST_PART_TEXTBLOCK_STYLE_COLOR_INC "#a8a8a8FF"
 #define GENLIST_PART_TEXTBLOCK_STYLE_SELECTED_COLOR_INC "#646464"
@@ -412,106 +366,6 @@
 #define GENLIST_PART_TEXTBLOCK_SUB_STYLE_COLOR_INC "#a8a8a8"
 #define GENLIST_PART_TEXTBLOCK_URGENCY_READ_STYLE_COLOR_INC "#AB5252"
 #define GENLIST_PART_TEXTBLOCK_URGENCY_UNREAD_STYLE_COLOR_INC "#CF2525"
-#if 0
-#define GENLIST_GROUP_PART_TEXT_COLOR_INC 131 154 192 255
-#define GENLIST_GROUP_PART_BASE_EVENT_INC \
-         part { name: "base_event";\
-            type: RECT;\
-            repeat_events: 0;\
-            description { state: "default" 0.0;\
-               color: 0 0 0 0;\
-            }\
-         }
-#define GENLIST_GROUP_PART_BASE_IMAGE_INC
-#define GENLIST_GROUP_BG_COLOR_DEFAULT_INC 17 23 27 255
-#define GENLIST_GROUP_BG_COLOR_ALPHA_OFF_INC 17 23 27 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_PART_BOTTOM_LINE_INC 82 82 82 255
-#define GENLIST_EDIT_BG_COLOR_INC 0 0 0 255
-#define GENLIST_EDIT_SELECT_ALL_BG_COLOR_INC 17 23 27 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 // [???]
-#define GENLIST_EXPANDABLE3_PART_BG_COLOR_INC 30 30 30 255
-#define GENLIST_EXPANDABLE_PART_BG_IMAGE_INC \
-         part { name: "bg_image"; \
-            clip_to: "disclip"; \
-            mouse_events: 0; \
-            description { state: "default" 0.0; \
-               image { \
-                  normal: "00_list_expandable_bg.png"; \
-                  border: 0 0 12 6; \
-                  border_scale: 1; \
-               } \
-            } \
-            description { state: "selected" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_list_bar_press_1x80.png"; \
-            } \
-            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
-          }
-#define GENLIST_PART_BG_EXPANDABLE3_IMAGE_INC \
-         part { name: "bg_image"; \
-            clip_to: "disclip"; \
-            mouse_events: 0; \
-            description { state: "default" 0.0; \
-               image { \
-                  normal: "00_list_expandable_2_bg.png"; \
-                  border: 0 0 12 6; \
-                  border_scale: 1; \
-               } \
-            } \
-            description { state: "selected" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_list_bar_press_1x80.png"; \
-            } \
-            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
-         }
-#define GENLIST_EXPANDABLE3_PART_BG_IMAGE_INC \
-         part { name: "bg_image"; \
-            clip_to: "disclip"; \
-            mouse_events: 0; \
-            description { state: "default" 0.0; \
-               image { \
-                  normal: "00_list_expandable_2_bg.png"; \
-                  border: 0 0 12 6; \
-                  border_scale: 1; \
-               } \
-            } \
-            description { state: "selected" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_list_bar_press_1x80.png"; \
-            } \
-            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
-         }
-#define GENLIST_EXPANDABLE3_NOSHADOW_PART_BG_IMAGE_INC \
-         part { name: "bg_image"; \
-            clip_to: "disclip"; \
-            mouse_events: 0; \
-            description { state: "default" 0.0; \
-               image { \
-                  normal: "00_list_expandable_2_noshadow_bg.png"; \
-                  border: 0 0 0 6; \
-                  border_scale: 1; \
-               } \
-            } \
-            description { state: "selected" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_list_bar_press_1x80.png"; \
-            } \
-            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 34 37 40 255
-#define GENLIST_GROUP_PART_BUBBLE_TEXT_COLOR_INC 57 166 215 255
-#define GENLIST_GROUP_PART_BUBBLE_BG_COLOR_INC 56 69 90 255
-#define GENLIST_BUBBLE_BG_COLOR_INC 153 153 153 255
-#endif
 
 #define CONTACT_DISPLAY_NAME_FONT_COLOR_INC  255 255 255 255
 #define CONTACT_DISPLAY_NAME_FONT_GRAY_COLOR_INC 230 230 230 255