From: Dmytro Dragan Date: Mon, 22 Aug 2016 12:15:27 +0000 (+0300) Subject: TizenRefApp-6973 Remove unused graphical resources in wallpaper-ui-service X-Git-Tag: submit/tizen/20160825.141343^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=582f44c4c0b5acb0874ea877f334f4843c519f96;p=profile%2Fmobile%2Fapps%2Fnative%2Fwallpaper-ui-service.git TizenRefApp-6973 Remove unused graphical resources in wallpaper-ui-service Change-Id: Ic8ff370b231a74df9dd437ed848beaf12ee58b5e Signed-off-by: Dmytro Dragan --- diff --git a/Build/basedef.mk b/Build/basedef.mk index 7cacafc..8812624 100644 --- a/Build/basedef.mk +++ b/Build/basedef.mk @@ -2,13 +2,23 @@ C_DEPS += -SYSROOT := $(SBI_SYSROOT) +USES_EFL = yes +USES_USR_INC = yes -ROOTSTRAP_INCS := $(addprefix -I $(SYSROOT)/,$(PLATFORM_INCS_EX)) -EFL_INCS := +SYSROOT = $(SBI_SYSROOT) + +USR_INCS := $(addprefix -I $(SYSROOT),$(PLATFORM_INCS_EX)) +EFL_INCS = + +ifeq ($(strip $(PLATFORM_LIB_PATHS)),) +RS_LIB_PATHS := "$(SYSROOT)/usr/lib" +else +RS_LIB_PATHS := $(addprefix -L$(SYSROOT),$(PLATFORM_LIB_PATHS)) +endif RS_LIBRARIES := $(addprefix -l,$(RS_LIBRARIES_EX)) -PLATFORM_INCS := $(ROOTSTRAP_INCS) $(EFL_INCS) \ - -I"$(SDK_PATH)/library" +PLATFORM_INCS = $(USR_INCS) $(EFL_INCS) \ + -I"$(SDK_PATH)/library" +OS_NAME := $(shell $(UNAME)) diff --git a/Build/build_c.mk b/Build/build_c.mk new file mode 100644 index 0000000..81940cd --- /dev/null +++ b/Build/build_c.mk @@ -0,0 +1,110 @@ +# C/C++ build script + + +_FUNC_EXT2O = $(patsubst %.$(3),$(1)/%.o,$(2)) +_FUNC_C2O = $(call _FUNC_EXT2O,$(1),$(2),c) +_FUNC_CPP2O = $(call _FUNC_EXT2O,$(1),$(2),cpp) + + +# parameter : +# $(1) - C/C++ soruce file +# $(2) - output path +# $(3) - .ext +CONVERT_ESC_EXT_TO_O = $(addprefix $(2)/,$(call CONVERT_4MAKE_TO_OUT,$(patsubst %.$(3),%.o,$(1)))) + +CONVERT_ESC_C_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),c) +CONVERT_ESC_CPP_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),cpp) + + +# parameter : +# $(1) - encoded one C/C++ soruce file +# $(2) - output path +# $(3) - ext title (C/C++) +# $(4) - ext (c/cpp) +# $(5) - compiler ($(CC)/$(CXX)) +# $(6) - build opt +# $(7) - build opt file +# output : +# $(8) - output files list +define C_BUILD_PROC_RAW +$(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4)) : $(call DECODE_4MAKE,$(1)) $(7) + @echo ' Building file: $$<' + @echo ' Invoking: $(3) Compiler' + $$(call MAKEDIRS,$$(@D)) + $(5) -c "$$<" -o "$$@" $(6) @$(7) + @echo ' Finished building: $$<' +$(8) += $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4)) +endef + + +# parameter : +# $(1) - output paths +# $(2) - src paths +# $(3) - inc paths +# $(4) - inc files +# $(5) - Defs +# $(6) - UnDefs +# $(7) - compiler opt +# $(8) - compiler opt file +# $(9) - ext title (C/C++) +# $(10) - ext (c/cpp) +# $(11) - compiler ($(CC)/$(CXX)) +# output : +# $(12) - OBJS +# return : +# none +define C_PROC_RAW + +_OUTPUT_DIR := $$(strip $(1))# +_SRCS := $(2)# +_INCS := $(3)# +_INC_FILES := $(4)# +_DEFS := $(5)# +_UNDEFS := $(6)# + +_OPT := $(7) +_OPT_FILE := $(8) + +_EXT_TITLE := $(9) +_EXT := $(10) +_COMPILER := $(11) + +#_OUTPUT_FILES := $(12) + +_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_SRCS)) +_ENC_SRCS := $$(filter %.$$(_EXT),$$(_ENC_SRCS)) + +ifneq ($$(strip $$(_SRCS)),) + +_NORMAL_SRCS := $$(filter-out %*.$$(_EXT),$$(_ENC_SRCS)) +_WIDLCARD_SRCS := $$(filter %*.$$(_EXT),$$(_ENC_SRCS)) + +_ALL_SRCS := $$(call DECODE_4MAKE,$$(_NORMAL_SRCS)) \ + $$(foreach var,$$(_WIDLCARD_SRCS),$$(call FIND_FILES_4MAKE,$$(call DECODE_4MAKE,$$(var)))) + +ifneq ($$(strip $$(_ALL_SRCS)),) + +_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_ALL_SRCS)) + +_CDEFS := $$(CDEFS) +_CDEFS += $$(addprefix -D,$$(_DEFS)) +_CDEFS += $$(addprefix -U,$$(_UNDEFS)) + +_ENC_C_INCS := $$(call ENCODE_4MAKE,$$(_INCS)) +_ENC_C_INCS := $$(addprefix -I,$$(_ENC_C_INCS)) + +_ENC_INC_FILES := $$(call ENCODE_4MAKE,$$(_INC_FILES)) +_ENC_INC_FILES += $$(addprefix -include,$$(_ENC_INC_FILES)) + +_C_INCS := $$(call DECODE_4MAKE,$$(_ENC_C_INCS) $$(_ENC_C_INC_FILES)) + +_DEFS := $$(_CDEFS) $$(_C_INCS) -I"pch" $$(_OPT) + +$$(foreach var,$$(_ENC_SRCS),$$(eval $$(call C_BUILD_PROC_RAW,$$(var),$$(_OUTPUT_DIR),$$(_EXT_TITLE),$$(_EXT),$$(_COMPILER),$$(_DEFS),$$(_OPT_FILE),$(12)))) + +endif # (_(strip _(_ALL_SRCS)),) + +endif # (_(strip _(_SRCS)),) + + +endef diff --git a/Build/build_edc.mk b/Build/build_edc.mk new file mode 100644 index 0000000..8485bb2 --- /dev/null +++ b/Build/build_edc.mk @@ -0,0 +1,81 @@ +# EDC build script + + +FUNC_EDC2EDJ = $(patsubst %.edc,$(2)/%.edj,$(1)) + +# parameter : +# $(1) - C/C++ soruce file +# $(2) - output path +CONVERT_ESC_EDC_TO_EDJ = $(call CONVERT_4MAKE_TO_OUT,$(call FUNC_EDC2EDJ,$(1),$(2))) + + +# parameter : +# $(1) - encoded one C/C++ soruce file +# $(2) - output path +# $(3) - build opt +# output : +# $(4) - output files list +define EDJ_BUILD_PROC_RAW +$(call CONVERT_ESC_EDC_TO_EDJ,$(1),$(2)) : $(call DECODE_4MAKE,$(1)) + @echo ' Building file: $$<' + @echo ' Invoking: EDC Resource Compiler' + $$(call MAKEDIRS,$$(@D)) + $$(EDJE_CC) $(3) "$$<" "$$@" + @echo ' Finished building: $$<' +$(4) += $(call CONVERT_ESC_EDC_TO_EDJ,$(1),$(2)) +endef + + +# parameter : +# $(1) - output paths +# $(2) - src paths +# $(3) - image inc paths +# $(4) - sound inc paths +# $(5) - font inc paths +# output : +# $(6) - OBJS +# return : +# none +define EDJ_PROC_RAW + +_OUTPUT_DIR := $$(strip $(1))# +_SRCS := $(2)# +_IMAGE_DIRS := $(3)# +_SOUND_DIRS := $(4)# +_FONT_DIRS := $(5)# + +ifneq ($$(strip $$(_SRCS)),) + +_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_SRCS)) + +_NORMAL_SRCS := $$(filter-out %*.edc,$$(_ENC_SRCS)) +_WIDLCARD_SRCS := $$(filter %*.edc,$$(_ENC_SRCS)) + +_ALL_SRCS := $$(call DECODE_4MAKE,$$(_NORMAL_SRCS)) \ + $$(foreach var,$$(_WIDLCARD_SRCS),$$(call FIND_FILES_4MAKE,$$(call DECODE_4MAKE,$$(var)))) + +ifneq ($$(strip $$(_ALL_SRCS)),) + +_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_ALL_SRCS)) + +_COMPILER_FLAGS := -id "$$(_OUTPUT_DIR)" -id "$$(SDK_TOOLPATH)/enventor/share/enventor/images" +_COMPILER_FLAGS += -sd "$$(_OUTPUT_DIR)" -sd "$$(SDK_TOOLPATH)/enventor/share/enventor/sounds" +_COMPILER_FLAGS += -fd "$$(_OUTPUT_DIR)" -fd "$$(SDK_TOOLPATH)/enventor/share/enventor/fonts" + +ifneq ($$(strip $$(_IMAGE_DIRS)),) +_COMPILER_FLAGS += $$(addprefix -id ,$$(_IMAGE_DIRS)) +endif +ifneq ($$(strip $$(_SOUND_DIRS)),) +_COMPILER_FLAGS += $$(addprefix -sd ,$$(_SOUND_DIRS)) +endif +ifneq ($$(strip $$(_FONT_DIRS)),) +_COMPILER_FLAGS += $$(addprefix -fd ,$$(_FONT_DIRS)) +endif + +$$(foreach var,$$(_ENC_SRCS),$$(eval $$(call EDJ_BUILD_PROC_RAW,$$(var),$$(_OUTPUT_DIR),$$(_COMPILER_FLAGS),$(6)))) + +endif # (_(strip _(_ALL_SRCS)),) + +endif # (_(strip _(_SRCS)),) + +endef diff --git a/Build/build_po.mk b/Build/build_po.mk new file mode 100644 index 0000000..23eb0df --- /dev/null +++ b/Build/build_po.mk @@ -0,0 +1,64 @@ +# PO build script + + +_FUNC_PO2MO = $(patsubst %.po,$(2)/res/locale/%/LC_MESSAGES/$(3).mo,$(notdir $(1))) + + +# parameter : +# $(1) - C/C++ soruce file +# $(2) - output path +# $(3) - app name +CONVERT_ESC_PO_TO_MO = $(call CONVERT_4MAKE_TO_OUT,$(call _FUNC_PO2MO,$(1),$(2),$(3))) + + +# parameter : +# $(1) - encoded one C/C++ soruce file +# $(2) - output path +# $(3) - app name +# output : +# $(4) - output files list +define MO_BUILD_PROC_RAW +$(call CONVERT_ESC_PO_TO_MO,$(1),$(2),$(3)) : $(call DECODE_4MAKE,$(1)) + @echo ' Building file: $$<' + @echo ' Invoking: msgfmt String Formatter' + $$(call MAKEDIRS,$$(@D)) + $$(MSGFMT) -o "$$@" "$$<" + @echo ' Finished building: $$<' +$(4) += $(call CONVERT_ESC_PO_TO_MO,$(1),$(2),$(3)) +endef + + +# parameter : +# $(1) - output dir +# $(2) - src paths +# $(3) - app name +# output : +# $(4) - OBJS + +define MO_PROC_RAW + +_PROJ_ROOT := $(1) +_SRCS := $(2) +_APPNAME := $(3) + +ifneq ($$(strip $$(_SRCS)),) + +_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_SRCS)) + +_NORMAL_SRCS := $$(filter-out %*.po,$$(_ENC_SRCS)) +_WIDLCARD_SRCS := $$(filter %*.po,$$(_ENC_SRCS)) + +_ALL_SRCS := $$(call DECODE_4MAKE,$$(_NORMAL_SRCS)) \ + $$(foreach var,$$(_WIDLCARD_SRCS),$$(call FIND_FILES_4MAKE,$$(call DECODE_4MAKE,$$(var)))) + +ifneq ($$(strip $$(_ALL_SRCS)),) + +_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_ALL_SRCS)) + +$$(foreach var,$$(_ENC_SRCS),$$(eval $$(call MO_BUILD_PROC_RAW,$$(var),$$(_OUTPUT_DIR),$$(_APPNAME),$(4)))) + +endif # (_(strip _(_ALL_SRCS)),) + +endif # (_(strip _(_SRCS)),) + +endef diff --git a/Build/flags.mk b/Build/flags.mk index 0ee8efb..78e1e6d 100644 --- a/Build/flags.mk +++ b/Build/flags.mk @@ -5,11 +5,11 @@ CPP_DEBUG_OP = OPTIMIZATION_OP = -O0 CPP_OPTIMIZATION_OP = -COMPILE_FLAGS = $(DEBUG_OP) $(OPTIMIZATION_OP) -Wall -c -fmessage-length=0 +COMPILE_FLAGS = $(DEBUG_OP) $(OPTIMIZATION_OP) -Wall -c -fmessage-length=0 -fPIE CPP_COMPILE_FLAGS = $(CPP_DEBUG_OP) $(CPP_OPTIMIZATION_OP) -LINK_FLAGS = +LINK_FLAGS = -pie AR_FLAGS = diff --git a/Build/funcs.mk b/Build/funcs.mk new file mode 100644 index 0000000..8297d18 --- /dev/null +++ b/Build/funcs.mk @@ -0,0 +1,50 @@ + +BSLASH := \\# +NULL_CHAR := # +SPACE := \ # +COLON := :# +DOTDOT := ..# +SPACE_ESC := &sp;# +COLON_ESC := &co;# +SPACE_OUT := ~sp~# +COLON_OUT := ~co~# +DOTDOT_OUT := ~dtdt~# + +BSLASH2SLASH = $(subst $(BSLASH),/,$(1)) + +REMOVE_TAIL = $(patsubst %/,%,$(1)) + +#LOWER_CASE = $(shell echo translit($(1),[A-Z],[a-z])|$(M4)) +LOWER_CASE = $(shell echo $(1)|$(TR) [A-Z] [a-z]) + +#ifneq ($(findstring Windows,$(OS)),) +# ... +#endif + +FIND_FILES = $(shell $(FIND) $(1)/$(2) | $(SED) 's/^$(subst /,$(BSLASH)/,$(1))$(BSLASH)///') +FIND_FILES_ESC = $(shell $(FIND) $(1)/$(2) | $(SED) 's/^$(subst /,$(BSLASH)/,$(1))$(BSLASH)///' -e 's/:/$(BSLASH)&co;/g' -e 's/$(BSLASH) /$(BSLASH)&sp;/g') +FIND_FILES_4MAKE = $(shell $(FIND) $(1)/$(2) | $(SED) 's/^$(subst /,$(BSLASH)/,$(1))$(BSLASH)///') + +FIND_FILES_ABS = $(shell $(FIND) $(1)) +FIND_FILES_ABS_4MAKE = $(shell $(FIND) $(1) -e 's/$(BSLASH) /$(BSLASH)&sp;/g') +FIND_FILES_ABS_ESC = $(shell $(FIND) $(1) -e 's/:/$(BSLASH)&co;/g' -e 's/$(BSLASH) /$(BSLASH)&sp;/g') + +FIND_FILES_4MAKE = $(shell $(FIND) $(1) | $(SED) 's/ /\\\ /g') + +#ENCODE_ESC = $(shell echo $(1) | $(SED) -e 's/:/$(BSLASH)&co;/g' -e 's/$(BSLASH) /$(BSLASH)&sp;/g') +#DECODE_ESC = $(shell echo $(1) | $(SED) -e 's/$(BSLASH)&co;/:/g' -e 's/$(BSLASH)&sp;/$(BSLASH) / g') +ENCODE_ESC = $(subst $(SPACE),$(SPACE_ESC),$(subst $(COLON),$(COLON_ESC),$(1))) +DECODE_ESC = $(subst $(COLON_ESC),$(COLON),$(subst $(SPACE_ESC),$(SPACE),$(1))) +ENCODE_4MAKE = $(subst $(SPACE),$(SPACE_ESC),$(1)) +DECODE_4MAKE = $(subst $(SPACE_ESC),$(SPACE),$(1)) + +CONVERT_TO_OUT = $(subst $(DOTDOT),$(DOTDOT_OUT),$(subst $(COLON),$(COLON_OUT),$(subst $(SPACE),$(SPACE_OUT),$(1)))) +CONVERT_ESC_TO_OUT = $(subst $(DOTDOT),$(DOTDOT_OUT),$(subst $(COLON_ESC),$(COLON_OUT),$(subst $(SPACE_ESC),$(SPACE_OUT),$(1)))) +CONVERT_4MAKE_TO_OUT = $(subst $(DOTDOT),$(DOTDOT_OUT),$(subst $(COLON),$(COLON_OUT),$(subst $(SPACE_ESC),$(SPACE_OUT),$(1)))) + +PROC_NO_EXIST = $(if $(wildcard $(1)),,$(call $(2),$(1))) +define MAKEDIRS0 + @echo ' Building directory: $(1)' + @$(MKDIR) $(MKDIR_OP) $(subst $(BSLASH),/,$(1)) +endef +MAKEDIRS = $(call PROC_NO_EXIST,$(1),MAKEDIRS0) diff --git a/Build/makefile b/Build/makefile index 4e2d6c5..9348c50 100644 --- a/Build/makefile +++ b/Build/makefile @@ -1,275 +1,34 @@ -BUILD_SCRIPT_VERSION := 1.0.7 +# +# Usege : make -f /Build/makefile -C +# + +BUILD_SCRIPT_VERSION := 1.1.0 -all : app_build - -clean : app_clean - -version : make_version - - -BSLASH := \\# -BSLASH2SLASH = $(subst $(BSLASH),/,$(1)) -REMOVE_TAIL = $(patsubst %/,%,$(1)) - -PROJ_ROOT := $(call BSLASH2SLASH,$(PROJPATH)) - --include $(PROJ_ROOT)/project_def.prop --include basedef.mk --include tooldef.mk --include flags.mk --include prepost.mk - -APPTYPE := $(type) - -OBJ_OUTPUT := $(call BSLASH2SLASH,$(OUTPUT_DIR)/objs) - -OS_NAME = $(shell $(UNAME)) - -#LOWER_APPNAME := $(shell echo translit($(APPNAME),[A-Z],[a-z])|$(M4)) -LOWER_APPNAME := $(shell echo $(APPNAME)|$(TR) [A-Z] [a-z]) - -ifeq ($(strip $(APPTYPE)),app) -APPFILE := $(OUTPUT_DIR)/$(LOWER_APPNAME) -endif -ifeq ($(strip $(APPTYPE)),staticLib) -APPFILE := $(OUTPUT_DIR)/lib$(LOWER_APPNAME).a -endif -ifeq ($(strip $(APPTYPE)),sharedLib) -APPFILE := $(OUTPUT_DIR)/lib$(LOWER_APPNAME).so -endif - -ifneq ($(strip $(PLATFORM_INCS)),) -PLATFORM_INCS_FILE := $(OBJ_OUTPUT)/platform_incs_file.inc -endif - -FIND_FILES = $(shell $(FIND) $(PROJ_ROOT)/$(dir $(1)) -type f -name $(notdir $(1)) -printf '$(dir $(1))%P ') - -NORMAL_SRCS := $(filter-out %*.c %*.cpp,$(USER_SRCS)) -WIDLCARD_SRCS := $(filter %*.c %*.cpp,$(USER_SRCS)) -ALL_SRCS := $(NORMAL_SRCS) $(foreach var,$(WIDLCARD_SRCS),$(call FIND_FILES,$(var))) - -C_SRCS := $(filter %.c,$(ALL_SRCS)) -CPP_SRCS := $(filter %.cpp,$(ALL_SRCS)) - -USER_EDCS := $(subst $(BSLASH),/,$(USER_EDCS)) -NORMAL_EDCS := $(filter-out %*.edc,$(USER_EDCS)) -WIDLCARD_EDCS := $(filter %*.edc,$(USER_EDCS)) -EDCS := $(NORMAL_EDCS) $(foreach var,$(WIDLCARD_EDCS),$(call FIND_FILES,$(var))) - -NORMAL_POS := $(filter-out %*.po,$(USER_POS)) -WIDLCARD_POS := $(filter %*.po,$(USER_POS)) -POS := $(NORMAL_POS) $(foreach var,$(WIDLCARD_POS),$(call FIND_FILES,$(var))) - -LIBPATHS := $(addprefix -L$(PROJ_ROOT)/,$(USER_LIB_DIRS)) \ - $(addprefix -L,$(USER_LIB_DIRS_ABS)) -LIBS += $(addprefix -l,$(USER_LIBS)) -UOBJS := $(addprefix $(PROJ_ROOT)/,$(USER_OBJS)) \ - $(USER_OBJS_ABS) - -M_OPT = -MMD -MP -MF"$(@:%.o=%.d)" - -FUNC_C2O = $(patsubst %.c,$(OBJ_OUTPUT)/%.o,$(1)) -FUNC_CPP2O = $(patsubst %.cpp,$(OBJ_OUTPUT)/%.o,$(1)) -FUNC_EDC2EDJ = $(patsubst %.edc,$(OUTPUT_DIR)/%.edj,$(1)) -FUNC_PO2MO = $(patsubst %.po,$(OUTPUT_DIR)/res/locale/%/LC_MESSAGES/$(LOWER_APPNAME).mo,$(notdir $(1))) - - -C_OBJS := $(call FUNC_C2O,$(C_SRCS)) -CPP_OBJS := $(call FUNC_CPP2O,$(CPP_SRCS)) -OBJS := $(C_OBJS) $(CPP_OBJS) -EDJ_FILES := $(call FUNC_EDC2EDJ,$(EDCS)) -MO_FILES := $(call FUNC_PO2MO,$(POS)) -DEPS := $(OBJS:.o=.d) - - -ifneq ($(strip $(DEPS)),) --include $(DEPS) -endif - -ifeq ($(strip $(APPTYPE)),app) -$(APPFILE) : $(OBJS) $(UOBJS) - @echo ' Building target: $@' - @echo ' Invoking: C/C++ Linker' - @$(MKDIR) $(MKDIR_OP) $(subst $(BSLASH),/,$(@D)) - $(CXX) -o "$(APPFILE)" $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -pie -lpthread -Xlinker -rpath="/home/developer/sdk_tools/lib" --sysroot="$(SYSROOT)" -Xlinker --version-script="$(PROJ_PATH)/.exportMap" -L"$(SBI_SYSROOT)/usr/lib" $(RS_LIBRARIES) -Xlinker -rpath="/opt/usr/apps/$(APPID)/lib" -Werror-implicit-function-declaration - @echo ' Finished building target: $@' -endif -ifeq ($(strip $(APPTYPE)),staticLib) -$(APPFILE) : $(OBJS) $(UOBJS) - @echo ' Building target: $@' - @echo ' Invoking: Archive utility' - @$(MKDIR) $(MKDIR_OP) $(subst $(BSLASH),/,$(@D)) - $(AR) -r "$(APPFILE)" $(OBJS) $(UOBJS) $(AR_FLAGS) - @echo ' Finished building target: $@' -endif -ifeq ($(strip $(APPTYPE)),sharedLib) -$(APPFILE) : $(OBJS) $(UOBJS) - @echo ' Building target: $@' - @echo ' Invoking: C/C++ Linker' - @$(MKDIR) $(MKDIR_OP) $(subst $(BSLASH),/,$(@D)) - $(CXX) -o "$(APPFILE)" $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -shared -lpthread --sysroot="$(SYSROOT)" -L"$(SYSROOT)/usr/lib" $(RS_LIBRARIES) - @echo ' Finished building target: $@' -endif - - -ifneq ($(strip $(C_SRCS)),) -CDEFS += $(addprefix -D,$(USER_DEFS)) -CDEFS += $(addprefix -U,$(USER_UNDEFS)) +.PHONY : app_version app_build app_clean build_version -INCS := $(addprefix -I$(PROJ_ROOT)/,$(USER_INC_DIRS)) \ - $(addprefix -I,$(USER_INC_DIRS_ABS)) \ - $(addprefix -include$(PROJ_ROOT)/,$(USER_INC_FILES)) \ - $(addprefix -include,$(USER_INC_FILES_ABS)) -$(C_OBJS) : $(OBJ_OUTPUT)/%.o : $(PROJ_ROOT)/%.c $(PLATFORM_INCS_FILE) - @echo ' Building file: $<' - @echo ' Invoking: C Compiler' - @$(MKDIR) $(MKDIR_OP) $(subst $(BSLASH),/,$(@D)) -ifeq ($(strip $(APPTYPE)),sharedLib) - $(CC) -c $< -o $@ $(CDEFS) $(INCS) -I"pch" $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) -fPIC --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) @$(PLATFORM_INCS_FILE) -else - $(CC) -c $< -o $@ $(CDEFS) $(INCS) -I"pch" $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) -fPIE --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) @$(PLATFORM_INCS_FILE) -endif - @echo ' Finished building: $<' -endif - -ifneq ($(strip $(CPP_SRCS)),) -CPPDEFS += $(addprefix -D,$(USER_CPP_DEFS)) -CPPDEFS += $(addprefix -U,$(USER_CPP_UNDEFS)) - -CPP_INCS := $(addprefix -I$(PROJ_ROOT)/,$(USER_CPP_INC_DIRS)) \ - $(addprefix -I,$(USER_CPP_INC_DIRS_ABS)) \ - $(addprefix -include$(PROJ_ROOT)/,$(USER_CPP_INC_FILES)) \ - $(addprefix -include,$(USER_CPP_INC_FILES_ABS)) - -$(CPP_OBJS) : $(OBJ_OUTPUT)/%.o : $(PROJ_ROOT)/%.cpp $(PLATFORM_INCS_FILE) - @echo ' Building file: $<' - @echo ' Invoking: C++ Compiler' - @$(MKDIR) $(MKDIR_OP) $(subst $(BSLASH),/,$(@D)) -ifeq ($(strip $(APPTYPE)),sharedLib) - $(CXX) -c $< -o $@ $(CPPDEFS) $(CPP_INCS) -I"pch" $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) -fPIC --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) @$(PLATFORM_INCS_FILE) -else - $(CXX) -c $< -o $@ $(CPPDEFS) $(CPP_INCS) -I"pch" $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) -fPIE --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) @$(PLATFORM_INCS_FILE) -endif - @echo ' Finished building: $<' -endif - - -$(OBJ_OUTPUT) : - @echo ' Building directory: $@' - @$(MKDIR) $(MKDIR_OP) $(OBJ_OUTPUT) - -preproc : $(OBJ_OUTPUT) -ifneq ($(strip $(PREBUILD_COMMAND)),) -ifneq ($(strip $(PREBUILD_DESC)),) - @echo $(PREBUILD_DESC) -endif - @echo $(shell $(PREBUILD_COMMAND)) -endif - - -postproc : -ifneq ($(strip $(POSTBUILD_COMMAND)),) -ifneq ($(strip $(POSTBUILD_DESC)),) - @echo $(POSTBUILD_DESC) -endif - @echo $(shell $(POSTBUILD_COMMAND)) -endif - -ifneq ($(strip $(PLATFORM_INCS)),) -$(PLATFORM_INCS_FILE) : $(OBJ_OUTPUT) - @echo ' Building inc file: $@' -ifneq ($(findstring Linux,$(OS_NAME)),) - @echo $(PLATFORM_INCS) > $@ -else -ifneq ($(findstring 3.82,$(MAKE_VERSION)),) - $(file > $@,$(PLATFORM_INCS)) -else - @echo $(PLATFORM_INCS) > $@ -endif -endif -endif - -ALL_EDJ_FILES := - -define EDJ_PROC -ALL_EDCS := $$(subst $(BSLASH),/,$$($(2))) -NORMAL_EDCS := $$(filter-out %*.edc,$$(ALL_EDCS)) -WIDLCARD_EDCS := $$(filter %*.edc,$$(ALL_EDCS)) -EDCS := $$(NORMAL_EDCS) $$(foreach var_edc,$$(WIDLCARD_EDCS),$$(call FIND_FILES,$$(var_edc))) - -ifneq ($$(strip $$(EDCS)),) -EDJ_FILES := $$(call FUNC_EDC2EDJ,$$(EDCS)) - -ALL_EDJ_FILES += $$(EDJ_FILES) - -EDC_$(1)_COMPILER_FLAGS := -id "$$(SDK_TOOLPATH)/enventor/share/enventor/images" -EDC_$(1)_COMPILER_FLAGS += -sd "$$(SDK_TOOLPATH)/enventor/share/enventor/sounds" -EDC_$(1)_COMPILER_FLAGS += -fd "$$(SDK_TOOLPATH)/enventor/share/enventor/fonts" +all : app_build -ifneq ($$(strip $(3)),) -EDC_$(1)_COMPILER_FLAGS += $$(addprefix -id $$(PROJ_PATH)/,$$($(3))) -endif -ifneq ($$(strip $(4)),) -EDC_$(1)_COMPILER_FLAGS += $$(addprefix -id ,$$($(4))) -endif -ifneq ($$(strip $(5)),) -EDC_$(1)_COMPILER_FLAGS += $$(addprefix -sd $$(PROJ_PATH)/,$$($(5))) -endif -ifneq ($$(strip $(6)),) -EDC_$(1)_COMPILER_FLAGS += $$(addprefix -sd ,$$($(6))) -endif -ifneq ($$(strip $(7)),) -EDC_$(1)_COMPILER_FLAGS += $$(addprefix -fd $$(PROJ_PATH)/,$$($(7))) -endif -ifneq ($$(strip $(8)),) -EDC_$(1)_COMPILER_FLAGS += $$(addprefix -fd ,$$($(8))) -endif +clean : app_clean -$$(EDJ_FILES) : $$(OUTPUT_DIR)/%.edj : $$(PROJ_ROOT)/%.edc - @echo ' Building file: $$<' - @echo ' Invoking: EDC Resource Compiler' - @$$(MKDIR) $$(MKDIR_OP) $$(subst $$(BSLASH),/,$$(@D)) - $$(EDJE_CC) $$(EDC_$(1)_COMPILER_FLAGS) $$(CDEFS) "$$<" "$$@" - @echo ' Finished building: $$<' -endif -endef +version : build_version -# Global EDCs -ifneq ($(strip $(USER_EDCS)),) -$(eval $(call EDJ_PROC,,USER_EDCS,USER_EDCS_IMAGE_DIRS,USER_EDCS_IMAGE_DIRS_ABS,USER_EDCS_SOUND_DIRS,USER_EDCS_SOUND_DIRS_ABS,USER_EDCS_FONT_DIRS,USER_EDCS_FONT_DIRS_ABS)) -endif +#PROJ_ROOT = . +BUILD_ROOT := $(PROJ_PATH)/Build# -# Individual EDCs -ifneq ($(strip $(USER_EXT_EDC_KEYS)),) -$(foreach var,$(USER_EXT_EDC_KEYS),$(eval $(call EDJ_PROC,$(var),USER_EXT_$(var)_EDCS,USER_EXT_$(var)_EDCS_IMAGE_DIRS,USER_EXT_$(var)_EDCS_IMAGE_DIRS_ABS,USER_EXT_$(var)_EDCS_SOUND_DIRS,USER_EXT_$(var)_EDCS_SOUND_DIRS_ABS,USER_EXT_$(var)_EDCS_FONT_DIRS,USER_EXT_$(var)_EDCS_FONT_DIRS_ABS))) +ifeq ($(MAKE_NAME),mingw32-make) +ifneq ($(SHELL),) +OPTIONS += --eval="SHELL=$(SHELL)" endif - - -ifneq ($(strip $(POS)),) -define MO_RULE -$(call FUNC_PO2MO,$(1)) : $(PROJ_ROOT)/$(1) - @echo ' Building file: $$<' - @echo ' Invoking: msgfmt String Formatter' - @$$(MKDIR) $$(MKDIR_OP) $$(subst $$(BSLASH),/,$$(@D)) - $$(MSGFMT) -o $$@ $$< - @echo ' Finished building: $$<' -endef - -$(foreach var,$(POS),$(eval $(call MO_RULE,$(var)))) endif - -secondary-outputs : $(ALL_EDJ_FILES) $(MO_FILES) - --include appendix.mk - - -app_build : preproc $(APPFILE) secondary-outputs postproc +app_build : + @echo $(MAKE) -f "$(BUILD_ROOT)/makefile.mk" + @$(MAKE) -f "$(BUILD_ROOT)/makefile.mk" -C "$(PROJ_PATH)" $(OPTIONS) app_clean : - rm -f "$(APPFILE)" - rm -rf "$(OUTPUT_DIR)" + @$(MAKE) -f "$(BUILD_ROOT)/makefile.mk" -C "$(PROJ_PATH)" $(OPTIONS) clean -make_version : - @echo $(BUILD_SCRIPT_VERSION) +build_version : + @echo makefile : $(BUILD_SCRIPT_VERSION) + @$(MAKE) -f "$(BUILD_ROOT)/makefile.mk" -C "$(PROJ_PATH)" $(OPTIONS) version diff --git a/Build/makefile.mk b/Build/makefile.mk new file mode 100644 index 0000000..7384d24 --- /dev/null +++ b/Build/makefile.mk @@ -0,0 +1,191 @@ +# +# Usege : make -f /Build/makefile -C +# + +BUILD_SCRIPT_VERSION := 1.2.2 + +.PHONY : app_version app_clean build_version + + +all : app_build + +clean : app_clean + +version : build_version + + +#PROJ_ROOT := $(call BSLASH2SLASH,$(PROJPATH)) +PROJ_ROOT := . +BUILD_ROOT := $(PROJ_ROOT)/Build + +include $(PROJ_ROOT)/project_def.prop +-include $(PROJ_ROOT)/build_def.prop + +include $(BUILD_ROOT)/funcs.mk + +-include $(BUILD_ROOT)/basedef.mk +-include $(BUILD_ROOT)/tooldef.mk +-include $(BUILD_ROOT)/flags.mk + + +APPTYPE := $(type) + +OUTPUT_DIR := $(PROJ_ROOT)/$(BUILD_CONFIG) +OBJ_OUTPUT := $(OUTPUT_DIR)/objs + +LOWER_APPNAME := $(call LOWER_CASE,$(APPNAME)) +APPID2 := $(subst $(basename $(APPID)).,,$(APPID)) + +ifeq ($(strip $(APPTYPE)),app) +APPFILE := $(OUTPUT_DIR)/$(LOWER_APPNAME) +endif +ifeq ($(strip $(APPTYPE)),staticLib) +APPFILE := $(OUTPUT_DIR)/lib$(LOWER_APPNAME).a +endif +ifeq ($(strip $(APPTYPE)),sharedLib) +APPFILE := $(OUTPUT_DIR)/lib$(LOWER_APPNAME).so +endif + +ifneq ($(strip $(PLATFORM_INCS)),) +PLATFORM_INCS_FILE := $(OBJ_OUTPUT)/platform_incs_file.inc +endif + +include $(BUILD_ROOT)/build_c.mk + + +ifeq ($(strip $(APPTYPE)),app) +EXT_OP := -fPIE +endif +ifeq ($(strip $(APPTYPE)),staticLib) +EXT_OP := -fPIE +endif +ifeq ($(strip $(APPTYPE)),sharedLib) +EXT_OP := -fPIC +endif + +C_OPT := $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) +CPP_OPT := $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) +C_OPT_FILE := $(PLATFORM_INCS_FILE) + +OBJS := # + +# Global C/C++ +ifeq ($(strip $(USER_ROOT)),) +USER_ROOT := $(PROJ_ROOT) +endif +$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_SRCS),$(USER_INC_DIRS),$(USER_INC_FILES),$(USER_DEFS),$(USER_UNDEFS),$(C_OPT),$(C_OPT_FILE),C,c,$(CC),OBJS)) +$(foreach ext,cpp cxx cc c++ C,$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_SRCS),$(USER_INC_DIRS),$(USER_CPP_INC_FILES),$(USER_CPP_DEFS),$(USER_CPP_UNDEFS),$(CPP_OPT),$(C_OPT_FILE),C++,$(ext),$(CXX),OBJS))) + +# Individual C/C++ +ifneq ($(strip $(USER_EXT_C_KEYS)),) +$(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_INC_FILES),$(USER_EXT_$(var)_DEFS),$(USER_EXT_$(var)_UNDEFS),$(C_OPT),$(C_OPT_FILE),C,c,$(CC),OBJS))) +$(foreach ext,cpp cxx cc c++ C,$(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_CPP_INC_FILES),$(USER_EXT_$(var)_CPP_DEFS),$(USER_EXT_$(var)_CPP_UNDEFS),$(C_OPT),$(C_OPT_FILE),C++,$(ext),$(CXX),OBJS)))) +endif + + +ifneq ($(strip $(USER_LIB_DIRS)),) +_ENC_USER_LIB_DIRS := $(call ENCODE_4MAKE,$(USER_LIB_DIRS)) +_ENC_USER_LIB_DIRS := $(addprefix -L,$(_ENC_USER_LIB_DIRS)) +LIBPATHS := $(call DECODE_4MAKE,$(_ENC_USER_LIB_DIRS)) +endif + +LIBS += $(addprefix -l,$(USER_LIBS)) + +UOBJS += $(USER_OBJS) + +M_OPT = -MMD -MP -MF"$(@:%.o=%.d)" + +DEPS := $(OBJS:.o=.d) + +ifneq ($(strip $(DEPS)),) +-include $(PROJ_ROOT)/Build/$(DEPS) +endif + + +ifeq ($(strip $(APPTYPE)),app) +$(APPFILE) : $(OBJS) $(UOBJS) + @echo ' Building target: $@' + @echo ' Invoking: C/C++ Linker' + $(call MAKEDIRS,$(@D)) + $(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -pie -lpthread -Xlinker -rpath="/home/developer/sdk_tools/lib" --sysroot="$(SYSROOT)" -Xlinker --version-script="$(PROJ_ROOT)/.exportMap" $(RS_LIB_PATHS) $(RS_LIBRARIES) -Xlinker -rpath="/opt/usr/apps/$(APPID)/lib" -Werror-implicit-function-declaration + @echo ' Finished building target: $@' +endif +ifeq ($(strip $(APPTYPE)),staticLib) +$(APPFILE) : $(OBJS) $(UOBJS) + @echo ' Building target: $@' + @echo ' Invoking: Archive utility' + $(call MAKEDIRS,$(@D)) + $(AR) -r $(APPFILE) $(OBJS) $(UOBJS) $(AR_FLAGS) + @echo ' Finished building target: $@' +endif +ifeq ($(strip $(APPTYPE)),sharedLib) +$(APPFILE) : $(OBJS) $(UOBJS) + @echo ' Building target: $@' + @echo ' Invoking: C/C++ Linker' + $(call MAKEDIRS,$(@D)) + $(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -shared -lpthread --sysroot="$(SYSROOT)" $(RS_LIB_PATHS) $(RS_LIBRARIES) + @echo ' Finished building target: $@' +endif + + +$(OBJ_OUTPUT) : + $(call MAKEDIRS,$@) + +$(OUTPUT_DIR) : + $(call MAKEDIRS,$@) + + +ifneq ($(strip $(PLATFORM_INCS)),) +$(PLATFORM_INCS_FILE) : $(OBJ_OUTPUT) + @echo ' Building inc file: $@' +ifneq ($(findstring Windows,$(OS)),) +ifneq ($(findstring 3.82,$(MAKE_VERSION)),) + $(file > $@,$(PLATFORM_INCS)) +else + @echo $(PLATFORM_INCS) > $@ +endif +else + @echo $(PLATFORM_INCS) > $@ +endif +endif + + +include $(BUILD_ROOT)/build_edc.mk + +EDJ_FILES := + +# Global EDCs +ifneq ($(strip $(USER_EDCS)),) +$(eval $(call EDJ_PROC_RAW,$(OUTPUT_DIR),$(USER_EDCS),$(USER_EDCS_IMAGE_DIRS),$(USER_EDCS_SOUND_DIRS),$(USER_EDCS_FONT_DIRS),EDJ_FILES)) +endif + +# Individual EDCs +ifneq ($(strip $(USER_EXT_EDC_KEYS)),) +$(foreach var,$(USER_EXT_EDC_KEYS),$(eval $(call EDJ_PROC_RAW,$(OUTPUT_DIR),$(USER_EXT_$(var)_EDCS),$(USER_EXT_$(var)_EDCS_IMAGE_DIRS),$(USER_EXT_$(var)_EDCS_SOUND_DIRS),$(USER_EXT_$(var)_EDCS_FONT_DIRS),EDJ_FILES))) +endif + + +include $(BUILD_ROOT)/build_po.mk + +MO_FILES := + +# Global POs +ifneq ($(strip $(USER_POS)),) +$(eval $(call MO_PROC_RAW,$(OUTPUT_DIR),$(USER_POS),$(APPID2),MO_FILES)) +endif + + +secondary-outputs : $(EDJ_FILES) $(MO_FILES) + +-include appendix.mk + +app_build : $(OUTPUT_DIR) $(APPFILE) secondary-outputs + @echo ========= done ========= + + +app_clean : + rm -f $(APPFILE) + rm -rf $(OUTPUT_DIR) + +build_version : + @echo makefile.mk : $(BUILD_SCRIPT_VERSION) diff --git a/Build/tooldef.mk b/Build/tooldef.mk index 4244fb3..9df2a39 100644 --- a/Build/tooldef.mk +++ b/Build/tooldef.mk @@ -4,10 +4,19 @@ ifeq ($(strip $(BUILD_CONFIG)),) BUILD_CONFIG = Debug endif +ifneq ($(strip $(PROJROOT)),) +PROJPATH := $(PROJROOT) +endif + ifeq ($(strip $(OUTPUT_DIR)),) OUTPUT_DIR := $(PROJPATH)/$(BUILD_CONFIG) endif +ifneq ($(strip $(SHELL_BIN)),) +SHELL = $(SHELL_BIN) +else +SHELL = sh +endif ifneq ($(strip $(MKDIR_BIN)),) MKDIR = $(MKDIR_BIN) @@ -41,6 +50,12 @@ else FIND = find endif +ifneq ($(strip $(SED_BIN)),) +SED = $(SED_BIN) +else +SED = sed +endif + ifneq ($(strip $(GREP_BIN)),) GREP = $(GREP_BIN) else diff --git a/edje/images/00_focus_01.#.png b/edje/images/00_focus_01.#.png deleted file mode 100644 index e9a1206..0000000 Binary files a/edje/images/00_focus_01.#.png and /dev/null differ diff --git a/edje/images/00_sub_depth_thumbs_bg.#.png b/edje/images/00_sub_depth_thumbs_bg.#.png deleted file mode 100644 index 51f16f1..0000000 Binary files a/edje/images/00_sub_depth_thumbs_bg.#.png and /dev/null differ diff --git a/edje/images/00_thumbs_bg_focus.png b/edje/images/00_thumbs_bg_focus.png deleted file mode 100644 index 29bfe6a..0000000 Binary files a/edje/images/00_thumbs_bg_focus.png and /dev/null differ diff --git a/edje/images/A01-1_popup_wallpaper_home_ef.png b/edje/images/A01-1_popup_wallpaper_home_ef.png deleted file mode 100644 index 8a0dc60..0000000 Binary files a/edje/images/A01-1_popup_wallpaper_home_ef.png and /dev/null differ diff --git a/edje/images/A01-1_popup_wallpaper_theme_bg.png b/edje/images/A01-1_popup_wallpaper_theme_bg.png deleted file mode 100644 index 79667ce..0000000 Binary files a/edje/images/A01-1_popup_wallpaper_theme_bg.png and /dev/null differ diff --git a/edje/images/No_gallery_ef.png b/edje/images/No_gallery_ef.png deleted file mode 100644 index f37b236..0000000 Binary files a/edje/images/No_gallery_ef.png and /dev/null differ diff --git a/edje/images/No_gallery_ic.png b/edje/images/No_gallery_ic.png deleted file mode 100644 index 9e5a718..0000000 Binary files a/edje/images/No_gallery_ic.png and /dev/null differ diff --git a/edje/images/TA_logo.png b/edje/images/TA_logo.png deleted file mode 100644 index 2ced62b..0000000 Binary files a/edje/images/TA_logo.png and /dev/null differ diff --git a/edje/images/Wallpaper_ic.png b/edje/images/Wallpaper_ic.png deleted file mode 100644 index 5957775..0000000 Binary files a/edje/images/Wallpaper_ic.png and /dev/null differ diff --git a/edje/images/Wallpaper_press.png b/edje/images/Wallpaper_press.png deleted file mode 100644 index 5a61c38..0000000 Binary files a/edje/images/Wallpaper_press.png and /dev/null differ diff --git a/edje/images/Wallpapers_bg.#.png b/edje/images/Wallpapers_bg.#.png deleted file mode 100644 index 8d497e1..0000000 Binary files a/edje/images/Wallpapers_bg.#.png and /dev/null differ diff --git a/edje/images/Wallpapers_bg.png b/edje/images/Wallpapers_bg.png deleted file mode 100644 index 8d497e1..0000000 Binary files a/edje/images/Wallpapers_bg.png and /dev/null differ diff --git a/edje/images/Wallpapers_home_ef.png b/edje/images/Wallpapers_home_ef.png deleted file mode 100644 index 301b748..0000000 Binary files a/edje/images/Wallpapers_home_ef.png and /dev/null differ diff --git a/edje/images/Wallpapers_home_ic.png b/edje/images/Wallpapers_home_ic.png deleted file mode 100644 index fe70988..0000000 Binary files a/edje/images/Wallpapers_home_ic.png and /dev/null differ diff --git a/edje/images/Wallpapers_lock_ef.png b/edje/images/Wallpapers_lock_ef.png deleted file mode 100644 index 73f7aa2..0000000 Binary files a/edje/images/Wallpapers_lock_ef.png and /dev/null differ diff --git a/edje/images/Wallpapers_lock_ic.png b/edje/images/Wallpapers_lock_ic.png deleted file mode 100644 index a638820..0000000 Binary files a/edje/images/Wallpapers_lock_ic.png and /dev/null differ diff --git a/edje/images/Wallpapers_setting_ef.png b/edje/images/Wallpapers_setting_ef.png deleted file mode 100644 index df6f295..0000000 Binary files a/edje/images/Wallpapers_setting_ef.png and /dev/null differ diff --git a/edje/images/Wallpapers_setting_ic.png b/edje/images/Wallpapers_setting_ic.png deleted file mode 100644 index f1744ca..0000000 Binary files a/edje/images/Wallpapers_setting_ic.png and /dev/null differ diff --git a/edje/images/Wallpapers_tab_bar.#.png b/edje/images/Wallpapers_tab_bar.#.png deleted file mode 100644 index eff008f..0000000 Binary files a/edje/images/Wallpapers_tab_bar.#.png and /dev/null differ diff --git a/edje/images/Wallpapers_tab_bar_ef.#.png b/edje/images/Wallpapers_tab_bar_ef.#.png deleted file mode 100644 index 96a7ca8..0000000 Binary files a/edje/images/Wallpapers_tab_bar_ef.#.png and /dev/null differ diff --git a/edje/images/com.samsung.gallery.png b/edje/images/com.samsung.gallery.png deleted file mode 100644 index 027d0c3..0000000 Binary files a/edje/images/com.samsung.gallery.png and /dev/null differ diff --git a/edje/images/default_bg.png b/edje/images/default_bg.png deleted file mode 100644 index 0d329f2..0000000 Binary files a/edje/images/default_bg.png and /dev/null differ diff --git a/edje/images/help/B31_help_tap_1_default.png b/edje/images/help/B31_help_tap_1_default.png deleted file mode 100644 index 02a5914..0000000 Binary files a/edje/images/help/B31_help_tap_1_default.png and /dev/null differ diff --git a/edje/images/home_wallpapaer_title_bg.#.png b/edje/images/home_wallpapaer_title_bg.#.png deleted file mode 100644 index 12a637c..0000000 Binary files a/edje/images/home_wallpapaer_title_bg.#.png and /dev/null differ diff --git a/edje/images/icon_add.png b/edje/images/icon_add.png deleted file mode 100644 index efa4733..0000000 Binary files a/edje/images/icon_add.png and /dev/null differ diff --git a/edje/images/icon_preview_dim.png b/edje/images/icon_preview_dim.png deleted file mode 100644 index dc3c3e0..0000000 Binary files a/edje/images/icon_preview_dim.png and /dev/null differ diff --git a/edje/images/lockscreen-options-theme/0.png b/edje/images/lockscreen-options-theme/0.png deleted file mode 100644 index 2bd51ae..0000000 Binary files a/edje/images/lockscreen-options-theme/0.png and /dev/null differ diff --git a/edje/images/lockscreen-options-theme/1.png b/edje/images/lockscreen-options-theme/1.png deleted file mode 100644 index ce7de56..0000000 Binary files a/edje/images/lockscreen-options-theme/1.png and /dev/null differ diff --git a/edje/images/lockscreen-options-theme/2.png b/edje/images/lockscreen-options-theme/2.png deleted file mode 100644 index dfd8463..0000000 Binary files a/edje/images/lockscreen-options-theme/2.png and /dev/null differ diff --git a/edje/images/lockscreen-options-theme/3.png b/edje/images/lockscreen-options-theme/3.png deleted file mode 100644 index 8bfa04e..0000000 Binary files a/edje/images/lockscreen-options-theme/3.png and /dev/null differ diff --git a/edje/images/lockscreen-options-theme/4.png b/edje/images/lockscreen-options-theme/4.png deleted file mode 100644 index ebe4c58..0000000 Binary files a/edje/images/lockscreen-options-theme/4.png and /dev/null differ diff --git a/edje/images/lockscreen-options-theme/5.png b/edje/images/lockscreen-options-theme/5.png deleted file mode 100644 index 408e64d..0000000 Binary files a/edje/images/lockscreen-options-theme/5.png and /dev/null differ diff --git a/edje/images/lockscreen-options-theme/6.png b/edje/images/lockscreen-options-theme/6.png deleted file mode 100644 index 52a48f0..0000000 Binary files a/edje/images/lockscreen-options-theme/6.png and /dev/null differ diff --git a/edje/images/lockscreen-options-theme/7.png b/edje/images/lockscreen-options-theme/7.png deleted file mode 100644 index 52a48f0..0000000 Binary files a/edje/images/lockscreen-options-theme/7.png and /dev/null differ diff --git a/edje/images/mainmenu_icon.png b/edje/images/mainmenu_icon.png deleted file mode 100644 index ab3194b..0000000 Binary files a/edje/images/mainmenu_icon.png and /dev/null differ diff --git a/edje/images/my_favorite_ic.png b/edje/images/my_favorite_ic.png deleted file mode 100644 index 0b39dc2..0000000 Binary files a/edje/images/my_favorite_ic.png and /dev/null differ diff --git a/edje/images/no_gallery_interest_bg.png b/edje/images/no_gallery_interest_bg.png deleted file mode 100644 index 061f575..0000000 Binary files a/edje/images/no_gallery_interest_bg.png and /dev/null differ diff --git a/edje/images/photo_slide.png b/edje/images/photo_slide.png deleted file mode 100644 index dffcaca..0000000 Binary files a/edje/images/photo_slide.png and /dev/null differ diff --git a/edje/images/set_thumbnail_focus.#.png b/edje/images/set_thumbnail_focus.#.png deleted file mode 100644 index 5a355a6..0000000 Binary files a/edje/images/set_thumbnail_focus.#.png and /dev/null differ diff --git a/edje/images/set_thumbnail_focus_ef.#.png b/edje/images/set_thumbnail_focus_ef.#.png deleted file mode 100644 index d5a947f..0000000 Binary files a/edje/images/set_thumbnail_focus_ef.#.png and /dev/null differ diff --git a/edje/images/settings_color_theme.png b/edje/images/settings_color_theme.png deleted file mode 100644 index 60b299e..0000000 Binary files a/edje/images/settings_color_theme.png and /dev/null differ diff --git a/edje/images/single_selection.png b/edje/images/single_selection.png deleted file mode 100644 index b7ef3c2..0000000 Binary files a/edje/images/single_selection.png and /dev/null differ diff --git a/edje/images/single_selection_ic.png b/edje/images/single_selection_ic.png deleted file mode 100644 index 63c54f5..0000000 Binary files a/edje/images/single_selection_ic.png and /dev/null differ diff --git a/edje/images/thumbnail_Badge_ic.png b/edje/images/thumbnail_Badge_ic.png deleted file mode 100644 index 1d95327..0000000 Binary files a/edje/images/thumbnail_Badge_ic.png and /dev/null differ diff --git a/edje/images/thumbnail_bg.png b/edje/images/thumbnail_bg.png deleted file mode 100644 index 630c36d..0000000 Binary files a/edje/images/thumbnail_bg.png and /dev/null differ diff --git a/edje/images/thumbnail_default_bg.png b/edje/images/thumbnail_default_bg.png deleted file mode 100644 index e0508dd..0000000 Binary files a/edje/images/thumbnail_default_bg.png and /dev/null differ diff --git a/edje/images/travel.png b/edje/images/travel.png deleted file mode 100644 index 42f8d20..0000000 Binary files a/edje/images/travel.png and /dev/null differ diff --git a/edje/images/ug-gallery-efl.png b/edje/images/ug-gallery-efl.png deleted file mode 100644 index 37aecdc..0000000 Binary files a/edje/images/ug-gallery-efl.png and /dev/null differ diff --git a/edje/images/ug-wallpaper-viewer-efl.png b/edje/images/ug-wallpaper-viewer-efl.png deleted file mode 100644 index d809e89..0000000 Binary files a/edje/images/ug-wallpaper-viewer-efl.png and /dev/null differ diff --git a/inc/wallpaper-ui-service-main.h b/inc/wallpaper-ui-service-main.h index 200e855..6612ebd 100644 --- a/inc/wallpaper-ui-service-main.h +++ b/inc/wallpaper-ui-service-main.h @@ -55,9 +55,9 @@ typedef struct { /** * @brief Creates main view * - * @param[in] ad pointer to main control struct + * @param[in] data pointer to main control struct */ -HAPI void wallpaper_main_create_view(wallpaper_ui_service_appdata *ad); +HAPI void wallpaper_main_create_view(wallpaper_ui_service_appdata *data); /** * @brief Apply image path to system settings diff --git a/project_def.prop b/project_def.prop index 05a1091..56459da 100644 --- a/project_def.prop +++ b/project_def.prop @@ -8,14 +8,14 @@ type = app # Project Profile profile = mobile-3.0 -# C Sources +# C/CPP Sources USER_SRCS = src/wallpaper-ui-service.c src/wallpaper-ui-service-main.c # EDC Sources USER_EDCS = # PO Sources -USER_POS = res/po_sdk/en_US.po res/po_sdk/kk.po res/po_sdk/hi.po res/po_sdk/az.po res/po_sdk/pt_PT.po res/po_sdk/pt_BR.po res/po_sdk/ar.po res/po_sdk/ro.po res/po_sdk/hr.po res/po_sdk/ca.po res/po_sdk/ka.po res/po_sdk/sv.po res/po_sdk/is.po res/po_sdk/bg.po res/po_sdk/mk.po res/po_sdk/zh_TW.po res/po_sdk/fr.po res/po_sdk/lt.po res/po_sdk/en.po res/po_sdk/ru_RU.po res/po_sdk/uk.po res/po_sdk/hu.po res/po_sdk/gl.po res/po_sdk/nb.po res/po_sdk/it_IT.po res/po_sdk/en_PH.po res/po_sdk/fr_CA.po res/po_sdk/sr.po res/po_sdk/zh_HK.po res/po_sdk/el_GR.po res/po_sdk/ja_JP.po res/po_sdk/hy.po res/po_sdk/tr_TR.po res/po_sdk/de.po res/po_sdk/sl.po res/po_sdk/nl.po res/po_sdk/zh_CN.po res/po_sdk/da.po res/po_sdk/sk.po res/po_sdk/lv.po res/po_sdk/pl.po res/po_sdk/ga.po res/po_sdk/es_US.po res/po_sdk/ko_KR.po res/po_sdk/uz.po res/po_sdk/fi.po res/po_sdk/et.po res/po_sdk/es_ES.po res/po_sdk/cs.po res/po_sdk/eu.po +USER_POS = res/po_sdk/en_US.po res/po_sdk/kk.po res/po_sdk/hi.po res/po_sdk/az.po res/po_sdk/pt_PT.po res/po_sdk/pt_BR.po res/po_sdk/ar.po res/po_sdk/ro.po res/po_sdk/ca.po res/po_sdk/hr.po res/po_sdk/ka.po res/po_sdk/sv.po res/po_sdk/is.po res/po_sdk/bg.po res/po_sdk/mk.po res/po_sdk/zh_TW.po res/po_sdk/fr.po res/po_sdk/lt.po res/po_sdk/en.po res/po_sdk/ru_RU.po res/po_sdk/uk.po res/po_sdk/hu.po res/po_sdk/gl.po res/po_sdk/nb.po res/po_sdk/it_IT.po res/po_sdk/en_PH.po res/po_sdk/fr_CA.po res/po_sdk/sr.po res/po_sdk/zh_HK.po res/po_sdk/el_GR.po res/po_sdk/ja_JP.po res/po_sdk/hy.po res/po_sdk/tr_TR.po res/po_sdk/de.po res/po_sdk/sl.po res/po_sdk/nl.po res/po_sdk/zh_CN.po res/po_sdk/da.po res/po_sdk/sk.po res/po_sdk/lv.po res/po_sdk/pl.po res/po_sdk/ga.po res/po_sdk/es_US.po res/po_sdk/ko_KR.po res/po_sdk/uz.po res/po_sdk/fi.po res/po_sdk/et.po res/po_sdk/cs.po res/po_sdk/es_ES.po res/po_sdk/eu.po # User Defines USER_DEFS = @@ -30,42 +30,32 @@ USER_LIBS = # User Objects USER_OBJS = -USER_OBJS_ABS = # User Includes ## C Compiler -USER_INC_DIRS = inc -USER_INC_DIRS_ABS = +USER_C_INC_DIRS = inc USER_INC_FILES = -USER_INC_FILES_ABS = ## C++ Compiler USER_CPP_INC_DIRS = -USER_CPP_INC_DIRS_ABS = USER_CPP_INC_FILES = -USER_CPP_INC_FILES_ABS = + +USER_INC_DIRS = $(USER_C_INC_DIRS) $(USER_CPP_INC_DIRS) # User Library Path -USER_LIB_DIRS = -USER_LIB_DIRS_ABS = +USER_LIB_DIRS = lib # EDC Resource Path -USER_EDCS_IMAGE_DIRS = edje/images -USER_EDCS_IMAGE_DIRS_ABS = -USER_EDCS_SOUND_DIRS = edje/sounds -USER_EDCS_SOUND_DIRS_ABS = -USER_EDCS_FONT_DIRS = edje/fonts -USER_EDCS_FONT_DIRS_ABS = +USER_EDCS_IMAGE_DIRS = ${OUTPUT_DIR} edje/images +USER_EDCS_SOUND_DIRS = ${OUTPUT_DIR} edje/sounds +USER_EDCS_FONT_DIRS = ${OUTPUT_DIR} edje/fonts # EDC Flags USER_EXT_EDC_KEYS = EDC0 -USER_EXT_EDC0_EDCS = res/edje/popup-wallpaper-macro.edc res/edje/button_customized_theme.edc res/edje/popup-wallpaper.edc res/edje/popup-wallpaper-main-view.edc res/edje/mutiple-wallpaper.edc res/edje/gengrid_customized_theme.edc res/edje/color_classes.edc -USER_EXT_EDC0_EDCS_IMAGE_DIRS = edje/images -USER_EXT_EDC0_EDCS_IMAGE_DIRS_ABS = -USER_EXT_EDC0_EDCS_SOUND_DIRS = edje/sounds -USER_EXT_EDC0_EDCS_SOUND_DIRS_ABS = -USER_EXT_EDC0_EDCS_FONT_DIRS = edje/fonts -USER_EXT_EDC0_EDCS_FONT_DIRS_ABS = +USER_EXT_EDC0_EDCS = res/edje/popup-wallpaper-macro.edc res/edje/button_customized_theme.edc res/edje/popup-wallpaper.edc res/edje/popup-wallpaper-main-view.edc res/edje/mutiple-wallpaper.edc res/edje/color_classes.edc +USER_EXT_EDC0_EDCS_IMAGE_DIRS = ${OUTPUT_DIR} edje/images +USER_EXT_EDC0_EDCS_SOUND_DIRS = ${OUTPUT_DIR} edje/sounds +USER_EXT_EDC0_EDCS_FONT_DIRS = ${OUTPUT_DIR} edje/fonts # Resource Filter USER_RES_INCLUDE = diff --git a/res/edje/gengrid_customized_theme.edc b/res/edje/gengrid_customized_theme.edc deleted file mode 100644 index 6102028..0000000 --- a/res/edje/gengrid_customized_theme.edc +++ /dev/null @@ -1,973 +0,0 @@ -/* - * Copyright (c) 20014-2015 Samsung Electronics Co., Ltd All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#define GENGRID_FONT_STYLE_INC "26" -#define GENGRID_FONT_STYLE_APPLICATION_INC "30" -#define GENGRID_FONT_STYLE_24_INC "24" -#define GENGRID_PART_BG_COLOR_INC 0 0 0 0 -#define GENGRID_PART_TEXTBLOCK_STYLE_COLOR_INC "#FAFAFAFF" -#define GENGRID_PART_TEXTBLOCK_STYLE_SHADOW_COLOR_INC "#00000000" -#define GENGRID_PART_BACKGROUND_COLOR_INC 0 0 0 0 -#define GENGRID_EDIT_MODE_CHECK_SIZE_INC 63 63 -#define GENGRID_ITEM_CHECK_TOP_RIGHT_PADDING_INC 2 2 - -#define GENGRID_DEFAULT_LEFT_TOP_PADDING_INC 2 2 -#define GENGRID_DEFAULT_RIGHT_BOTTOM_PADDING_INC 2 2 -#define GENGRID_DEFAULT_ITEM_BG_LEFT_TOP_PADDING_INC 1 1 -#define GENGRID_DEFAULT_ITEM_BG_RIGHT_BOTTOM_PADDING_INC 1 1 -#define GENGRID_DEFAULT_ITEM_REAL_BG_RIGHT_PADDING_INC 0 0 - -#define GENGRID_GALLERY_LEFT_TOP_PADDING_INC 3 3 -#define GENGRID_GALLERY_RIGHT_BOTTOM_PADDING_INC 3 3 - -#define GENGRID_GRID_TEXT_LEFT_TOP_PADDING_INC 6 6 -#define GENGRID_GRID_TEXT_RIGHT_BOTTOM_PADDING_INC 6 64 -#define GENGRID_GRID_TEXT_ITEM_BG_LEFT_TOP_PADDING_INC 1 1 -#define GENGRID_GRID_TEXT_ITEM_BG_RIGHT_BOTTOM_PADDING_INC 1 1 -#define GENGRID_GRID_TEXT_ITEM_REAL_BG_RIGHT_PADDING_INC 0 0 -#define GENGRID_GRID_TEXT_TEXT_LEFT_RIGHT_PADDING_INC 6 0 - -#define GENGRID_GRID_TEXT2_LEFT_TOP_PADDING_INC 6 6 -#define GENGRID_GRID_TEXT2_RIGHT_BOTTOM_PADDING_INC 6 6 -#define GENGRID_GRID_TEXT2_ITEM_BG_LEFT_TOP_PADDING_INC 1 1 -#define GENGRID_GRID_TEXT2_ITEM_BG_RIGHT_BOTTOM_PADDING_INC 1 1 -#define GENGRID_GRID_TEXT2_ITEM_REAL_BG_RIGHT_PADDING_INC 0 0 -#define GENGRID_GRID_TEXT2_TEXT_LEFT_RIGHT_PADDING_INC 6 0 - -#define GENGRID_POPUP_CONTENT_TOP_PADDING 26 -#define GENGRID_POPUP_CONTENT_BOTTOM_PADDING 26 -#define GENGRID_POPUP_BG_COLOR 0 0 0 0 -#define GENGRID_POPUP_TEXT_LEFT_TOP_PADDING_INC 14 0 -#define GENGRID_POPUP_TEXT_RIGHT_BOTTOM_PADDING_INC 14 74 -#define GENGRID_POPUP_ITEM_REAL_BG_LEFT_PADDING_INC ((190-117)/2) ((150-117)/2) -#define GENGRID_POPUP_ITEM_REAL_BG_RIGHT_PADDING_INC ((190-117)/2) ((150-117)/2) - - #define GENGRID_ITEM_SELECT_VI_EFFECT \ - } \ - description { state: "pressed" 0.0; \ - inherit: "default" 0.0; \ - map { \ - on: 1; \ - perspective: "persp1"; \ - smooth: 0; \ - } \ - } \ - description { state: "selected" 0.0; \ - inherit: "default" 0.0; \ - map { \ - on: 1; \ - perspective: "persp"; \ - smooth: 1; \ - } - - #define GENGRID_PROGRAM_ITEM_SELECT_VI_EFFECT( TARGET ) \ - program { name: "vi_pressed"; \ - action: STATE_SET "pressed" 0.0; \ - TARGET \ - after: "vi_zoom_in"; \ - } \ - program { name: "vi_zoom_in"; \ - action: STATE_SET "selected" 0.0; \ - TARGET \ - transition: SIN_FAC 0.05 1.5; \ - } \ - program { name: "vi_zoom_out"; \ - action: STATE_SET "pressed" 0.0; \ - TARGET \ - transition: SIN_FAC 0.167 1.1; \ - after: "vi_default"; \ - } \ - program { name: "vi_default"; \ - action: STATE_SET "default" 0.0; \ - TARGET \ - } - -#define GENGRID_PROGRAM_DEFAULT( TARGET ) \ - program { name: "default"; \ - signal: "elm,state,default"; \ - source: "elm"; \ - action: STATE_SET "default" 0.0; \ - target: "focus_bg"; \ - TARGET \ - } \ - -collections { - base_scale: 2.4; - - group { name: "elm/gengrid/item/default/default"; - alias: "elm/gengrid/item/default_grid/default"; - data.item: "contents" "elm.swallow.icon elm.swallow.end elm.swallow.video"; - data.item: "focus_highlight" "on"; - images { - image : "00_focus_01.#.png" COMP; - image : "00_sub_depth_thumbs_bg.#.png" COMP; - } - script { - public selected = 0; - } - parts { - part { name: "select_clip"; - type: RECT; - description { state: "default" 0.0; - visible: 0; - } - description { state: "selected" 0.0; - visible: 0; - } - } - part { name: "persp"; - type: RECT; - description { state: "default" 0.0; - min: 32 32; - max: 32 32; - fixed: 1 1; - align: 0.5 0.5; - color: 0 0 0 0; - visible: 1; - perspective { - zplane: -70; - focal: 1000; - } - } - } - part { name: "persp1"; - type: RECT; - description { state: "default" 0.0; - min: 32 32; - max: 32 32; - fixed: 1 1; - align: 0.5 0.5; - color: 0 0 0 0; - visible: 1; - perspective { - zplane: 0; - focal: 1000; - } - } - } - part { name: "bg"; - type: RECT; - description { state: "default" 0.0; - color: GENGRID_PART_BACKGROUND_COLOR_INC; - } - } - part { name: "left_top_padding"; - type: SPACER; - scale : 1; - description { state: "default" 0.0; - min: GENGRID_DEFAULT_LEFT_TOP_PADDING_INC; - align: 0.0 0.0; - fixed: 1 1; - rel1.to: "bg"; - rel2 { - relative: 0.0 0.0; - to: "bg"; - } - } - } - part { name: "right_bottom_padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: GENGRID_DEFAULT_RIGHT_BOTTOM_PADDING_INC; - align: 1.0 1.0; - fixed: 1 1; - rel1 { - relative: 1.0 1.0; - to: "bg"; - } - rel2.to: "bg"; - } - } - part { name: "item_bg"; - type: IMAGE; - description { state: "default" 0.0; - rel1 { - relative: 1.0 1.0; - to: "left_top_padding"; - } - rel2 { - relative: 0.0 0.0; - to: "right_bottom_padding"; - } - image.normal: "00_sub_depth_thumbs_bg.#.png"; - //color: 0 0 0 0; - GENGRID_ITEM_SELECT_VI_EFFECT - } - } - part { name: "item_bg_left_top_padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: GENGRID_DEFAULT_ITEM_BG_LEFT_TOP_PADDING_INC; - align: 0.0 0.0; - fixed: 1 1; - rel1.to: "item_bg"; - rel2 { - relative: 0.0 0.0; - to: "item_bg"; - } - } - } - part { name: "item_bg_right_bottom_padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: GENGRID_DEFAULT_ITEM_BG_RIGHT_BOTTOM_PADDING_INC; - align: 1.0 1.0; - fixed: 1 1; - rel1 { - relative: 1.0 1.0; - to: "item_bg"; - } - rel2.to: "item_bg"; - } - } - part { name: "item_real_bg"; - type: RECT; - description { state: "default" 0.0; - visible: 0; - rel1 { - relative: 1.0 1.0; - to: "item_bg_left_top_padding"; - } - rel2 { - relative: 0.0 0.0; - to: "item_bg_right_bottom_padding"; - } - GENGRID_ITEM_SELECT_VI_EFFECT - } - } - part { name: "item_real_bg_left_top_padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: GENGRID_DEFAULT_ITEM_REAL_BG_RIGHT_PADDING_INC; - align: 0.0 0.0; - fixed: 1 1; - rel1.to: "item_real_bg"; - rel2 { - relative: 0.0 0.0; - to: "item_real_bg"; - } - } - } - part { name: "item_real_bg_right_bottom_padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: GENGRID_DEFAULT_ITEM_REAL_BG_RIGHT_PADDING_INC; - align: 1.0 1.0; - fixed: 1 1; - rel1 { - relative: 1.0 1.0; - to: "item_real_bg"; - } - rel2.to: "item_real_bg"; - } - } - part { name: "elm.swallow.icon"; - type: SWALLOW; - description { state: "default" 0.0; - rel1 { - relative: 1.0 1.0; - to: "item_real_bg_left_top_padding"; - } - rel2 { - relative: 0.0 0.0; - to: "item_real_bg_right_bottom_padding"; - } - GENGRID_ITEM_SELECT_VI_EFFECT - } - } - part { name: "video_text_bg"; - type: SPACER; - description { state: "default" 0.0; - rel1 { - relative: 0.0 1.0; - to: "item_real_bg"; - } - rel2 { - relative: 1.0 1.0; - to: "item_real_bg"; - } - } - } - part { name: "elm.video_text.padding.left"; - scale: 1; - type: SPACER; - description { state: "default" 0.0; - rel1 { - relative: 0 0; - to: "video_text_bg"; - } - rel2 { - relative: 0 1; - to: "video_text_bg"; - } - } - } - part { name: "elm.swallow.video"; - type: SWALLOW; - description { state: "default" 0.0; - rel1.to: "elm.swallow.icon"; - rel2.to: "elm.swallow.icon"; - } - } - part { name: "elm.swallow.end"; - type: SWALLOW; - description { state: "default" 0.0; - rel1.to: "elm.swallow.icon"; - rel2.to: "elm.swallow.icon"; - GENGRID_ITEM_SELECT_VI_EFFECT - } - } - part { name: "reorder_bg"; - type: RECT; - repeat_events: 1; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "item_bg"; - rel2.to: "item_bg"; - color: 0 0 0 0; - } - } - part { name: "focus_bg"; - type: IMAGE; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - rel1 { - relative: 0.0 0.0; - to: "elm.swallow.icon"; - } - rel2 { - relative: 1.0 1.0; - to: "elm.swallow.icon"; - } - image.normal: "00_focus_01.#.png"; - //color_class: "W061"; - } - description { state: "enabled" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - } - programs { - program { name: "selected"; - signal: "elm,state,selected"; - source: "elm"; - script { - if (!get_int(selected)) { - set_int(selected, 1); - run_program(PROGRAM:"vi_pressed"); - } - } - } - program { name: "unselected"; - signal: "elm,state,unselected"; - source: "elm"; - script { - if (get_int(selected)) { - set_int(selected, 0); - run_program(PROGRAM:"vi_zoom_out"); - } - } - } - GENGRID_PROGRAM_ITEM_SELECT_VI_EFFECT( - target: "item_bg"; - target: "item_real_bg"; - target: "elm.swallow.icon"; - target: "elm.swallow.end"; - ) - program { name: "touch_snd"; - signal: "mouse,clicked,1"; - source: "item_bg"; - script { - new st[31]; - new Float:vl; - get_state(PART:"item_bg", st, 30, vl); - if (!strcmp(st, "selected") || - !strcmp(st, "pressed")) - run_program(PROGRAM:"play_sound"); - } - } - program { name: "play_sound"; - action: RUN_PLUGIN "touch_sound"; - } - program { name: "action_focus"; - signal: "elm,action,focus_highlight,show"; - source: "elm"; - action: STATE_SET "enabled" 0.0; - target: "focus_bg"; - } - program { name: "action_unfocus"; - signal: "elm,action,focus_highlight,hide"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "focus_bg"; - } - GENGRID_PROGRAM_DEFAULT( - target: "item_bg"; - target: "item_real_bg"; - target: "elm.swallow.icon"; - target: "elm.swallow.end"; - ) - } -} -group { name: "elm/gengrid/item/gallery/default"; - inherit: "elm/gengrid/item/default/default"; - alias: "elm/gengrid/item/gallery_grid/default"; - parts { - part { name: "left_top_padding"; - description { state: "default" 0.0; - min: GENGRID_GALLERY_LEFT_TOP_PADDING_INC; - } - } - part { name: "right_bottom_padding"; - description { state: "default" 0.0; - min: GENGRID_GALLERY_RIGHT_BOTTOM_PADDING_INC; - } - } - part { name: "item_bg"; - description { state: "default" 0.0; - GENGRID_ITEM_SELECT_VI_EFFECT - } - } - part { name: "item_bg_left_1pxl_inner_padding"; - type: RECT; - description { state: "default" 0.0; - min: GENGRID_DEFAULT_ITEM_BG_LEFT_TOP_PADDING_INC; - align: 0.0 0.5; - fixed: 1 0; - rel1.to: "item_bg"; - rel2 { - relative: 0.0 1.0; - to: "item_bg"; - } - color: 64 64 64 255; - GENGRID_ITEM_SELECT_VI_EFFECT - } - } - part { name: "item_bg_top_1pxl_inner_padding"; - type: RECT; - description { state: "default" 0.0; - min: GENGRID_DEFAULT_ITEM_BG_LEFT_TOP_PADDING_INC; - align: 0.5 0.0; - fixed: 0 1; - rel1 { - relative: 1.0 0.0; - to_x: "item_bg_left_1pxl_inner_padding"; - to_y: "item_bg"; - } - rel2 { - relative: 0.0 0.0; - to_x: "item_bg_right_1pxl_inner_padding"; - to_y: "item_bg"; - } - color: 64 64 64 255; - GENGRID_ITEM_SELECT_VI_EFFECT - } - } - part { name: "item_bg_right_1pxl_inner_padding"; - type: RECT; - description { state: "default" 0.0; - min: GENGRID_DEFAULT_ITEM_BG_LEFT_TOP_PADDING_INC; - align: 1.0 0.5; - fixed: 1 0; - rel1 { - relative: 1.0 0.0; - to: "item_bg"; - } - rel2 { - relative: 1.0 1.0; - to: "item_bg"; - } - color: 64 64 64 255; - GENGRID_ITEM_SELECT_VI_EFFECT - } - } - part { name: "item_bg_bottom_1pxl_inner_padding"; - type: RECT; - description { state: "default" 0.0; - min: GENGRID_DEFAULT_ITEM_BG_LEFT_TOP_PADDING_INC; - align: 0.5 1.0; - fixed: 0 1; - rel1 { - relative: 1.0 1.0; - to_x: "item_bg_left_1pxl_inner_padding"; - to_y: "item_bg"; - } - rel2 { - relative: 0.0 1.0; - to_x: "item_bg_right_1pxl_inner_padding"; - to_y: "item_bg"; - } - color: 64 64 64 255; - GENGRID_ITEM_SELECT_VI_EFFECT - } - } - part { name: "item_real_bg"; - description { state: "default" 0.0; - visible: 0; - rel1 { - relative: 1.0 1.0; - to_x: "item_bg_left_1pxl_inner_padding"; - to_y: "item_bg_top_1pxl_inner_padding"; - } - rel2 { - relative: 0.0 0.0; - to_x: "item_bg_right_1pxl_inner_padding"; - to_y: "item_bg_bottom_1pxl_inner_padding"; - } - GENGRID_ITEM_SELECT_VI_EFFECT - } - } - } - programs { - GENGRID_PROGRAM_ITEM_SELECT_VI_EFFECT( - target: "item_bg"; - target: "item_real_bg"; - target: "elm.swallow.icon"; - target: "elm.swallow.end"; - target: "item_bg_top_1pxl_inner_padding"; - target: "item_bg_left_1pxl_inner_padding"; - target: "item_bg_right_1pxl_inner_padding"; - target: "item_bg_bottom_1pxl_inner_padding"; - ) - GENGRID_PROGRAM_DEFAULT( - target: "item_bg"; - target: "item_real_bg"; - target: "elm.swallow.icon"; - target: "elm.swallow.end"; - target: "item_bg_top_1pxl_inner_padding"; - target: "item_bg_left_1pxl_inner_padding"; - target: "item_bg_right_1pxl_inner_padding"; - target: "item_bg_bottom_1pxl_inner_padding"; - ) - } -} -} -/* - group { name: "elm/gengrid/item/customized_default_style/default"; - //alias: "elm/gengrid/item/default_grid/default"; - data.item: "texts" "elm.text"; - data.item: "contents" "elm.swallow.icon elm.swallow.end elm.swallow.video"; - data.item: "focus_highlight" "on"; - images { - image : "00_focus_01.#.png" COMP; - image : "00_sub_depth_thumbs_bg.#.png" COMP; - } - script { - public selected = 0; - } - parts { - part { name: "select_clip"; - type: RECT; - description { state: "default" 0.0; - visible: 0; - } - description { state: "selected" 0.0; - visible: 0; - } - } - part { name: "persp"; - type: RECT; - description { state: "default" 0.0; - min: 32 32; - max: 32 32; - fixed: 1 1; - align: 0.5 0.5; - color: 0 0 0 0; - visible: 1; - perspective { - zplane: -70; - focal: 1000; - } - } - } - part { name: "persp1"; - type: RECT; - description { state: "default" 0.0; - min: 32 32; - max: 32 32; - fixed: 1 1; - align: 0.5 0.5; - color: 0 0 0 0; - visible: 1; - perspective { - zplane: 0; - focal: 1000; - } - } - } - part { name: "bg"; - type: RECT; - description { state: "default" 0.0; - color: GENGRID_PART_BACKGROUND_COLOR_INC; - } - } - part { name: "left_top_padding"; - type: SPACER; - scale : 1; - description { state: "default" 0.0; - min: GENGRID_DEFAULT_LEFT_TOP_PADDING_INC; - align: 0.0 0.0; - fixed: 1 1; - rel1.to: "bg"; - rel2 { - relative: 0.0 0.0; - to: "bg"; - } - } - } - part { name: "right_bottom_padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: GENGRID_DEFAULT_RIGHT_BOTTOM_PADDING_INC; - align: 1.0 1.0; - fixed: 1 1; - rel1 { - relative: 1.0 1.0; - to: "bg"; - } - rel2.to: "bg"; - } - } - part { name: "item_bg"; - type: IMAGE; - description { state: "default" 0.0; - visible: 0; - rel1 { - relative: 1.0 1.0; - to: "left_top_padding"; - } - rel2 { - relative: 0.0 0.0; - to: "right_bottom_padding"; - } - image.normal: "00_sub_depth_thumbs_bg.#.png"; - color_class: "W154"; - GENGRID_ITEM_SELECT_VI_EFFECT - } - } - part { name: "item_bg_left_top_padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: GENGRID_DEFAULT_ITEM_BG_LEFT_TOP_PADDING_INC; - align: 0.0 0.0; - fixed: 1 1; - rel1.to: "item_bg"; - rel2 { - relative: 0.0 0.0; - to: "item_bg"; - } - } - } - part { name: "item_bg_right_bottom_padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: GENGRID_DEFAULT_ITEM_BG_RIGHT_BOTTOM_PADDING_INC; - align: 1.0 1.0; - fixed: 1 1; - rel1 { - relative: 1.0 1.0; - to: "item_bg"; - } - rel2.to: "item_bg"; - } - } - part { name: "item_real_bg"; - type: RECT; - description { state: "default" 0.0; - visible: 0; - rel1 { - relative: 1.0 1.0; - to: "item_bg_left_top_padding"; - } - rel2 { - relative: 0.0 0.0; - to: "item_bg_right_bottom_padding"; - } - GENGRID_ITEM_SELECT_VI_EFFECT - } - } - part { name: "item_real_bg_left_top_padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: GENGRID_DEFAULT_ITEM_REAL_BG_RIGHT_PADDING_INC; - align: 0.0 0.0; - fixed: 1 1; - rel1.to: "item_real_bg"; - rel2 { - relative: 0.0 0.0; - to: "item_real_bg"; - } - } - } - part { name: "item_real_bg_right_bottom_padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: GENGRID_DEFAULT_ITEM_REAL_BG_RIGHT_PADDING_INC; - align: 1.0 1.0; - fixed: 1 1; - rel1 { - relative: 1.0 1.0; - to: "item_real_bg"; - } - rel2.to: "item_real_bg"; - } - } - part { name: "elm.swallow.icon"; - type: SWALLOW; - description { state: "default" 0.0; - rel1 { - relative: 1.0 1.0; - to: "item_real_bg_left_top_padding"; - } - rel2 { - relative: 0.0 0.0; - to: "item_real_bg_right_bottom_padding"; - } - GENGRID_ITEM_SELECT_VI_EFFECT - } - } - part { name: "video_text_bg"; - type: SPACER; - description { state: "default" 0.0; - rel1 { - relative: 0.0 1.0; - to: "item_real_bg"; - } - rel2 { - relative: 1.0 1.0; - to: "item_real_bg"; - } - } - } - part { name: "elm.video_text.padding.left"; - scale: 1; - type: SPACER; - description { state: "default" 0.0; - rel1 { - relative: 0 0; - to: "video_text_bg"; - } - rel2 { - relative: 0 1; - to: "video_text_bg"; - } - } - } - part { name: "elm.swallow.video"; - type: SWALLOW; - description { state: "default" 0.0; - rel1.to: "elm.swallow.icon"; - rel2.to: "elm.swallow.icon"; - } - } - part { name: "elm.swallow.end"; - type: SWALLOW; - description { state: "default" 0.0; - rel1.to: "elm.swallow.icon"; - rel2.to: "elm.swallow.icon"; - GENGRID_ITEM_SELECT_VI_EFFECT - } - } - part { name: "text_left_padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: 6 0; - align: 0.0 0.5; - rel1 { - relative: 0.0 0.0; - to: "item_bg"; - } - rel2 { - relative: 0.0 1.0; - to: "item_bg"; - } - } - } - part { name: "text_right_padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: 6 0; - align: 1.0 0.5; - rel1 { - relative: 1.0 0.0; - to: "item_bg"; - } - rel2 { - relative: 1.0 1.0; - to: "item_bg"; - } - } - } - part { name: "text_bottom_padding"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: 0 10; - align: 0.5 1.0; - rel1 { - relative: 0.0 1.0; - to: "elm.swallow.icon"; - } - rel2 { - relative: 1.0 1.0; - to: "elm.swallow.icon"; - } - } - } - part { name: "elm.text"; - type: TEXTBLOCK; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - min: 0 26; - align: 0.5 1.0; - rel1 { - relative: 1.0 0.0; - to_x: "text_left_padding"; - to_y: "text_bottom_padding"; - } - rel2 { - relative: 0.0 0.0; - to_x: "text_right_padding"; - to_y: "text_bottom_padding"; - } - text { - style: "gengrid_textblock_style"; - min: 0 1; - align: 0.5 1.0; - } - GENGRID_ITEM_SELECT_VI_EFFECT - } - } - part { name: "elm.swallow.block"; - type: SWALLOW; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to : "elm.text"; - rel2.to : "elm.text"; - GENGRID_ITEM_SELECT_VI_EFFECT - } - } - part { name: "reorder_bg"; - type: RECT; - repeat_events: 1; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "item_bg"; - rel2.to: "item_bg"; - color: 0 0 0 0; - } - } - part { name: "focus_bg"; - type: IMAGE; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - rel1 { - relative: 0.0 0.0; - to: "elm.swallow.icon"; - } - rel2 { - relative: 1.0 1.0; - to: "elm.swallow.icon"; - } - image.normal: "00_focus_01.#.png"; - color_class: "W061"; - } - description { state: "enabled" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - } - programs { - program { name: "selected"; - signal: "elm,state,selected"; - source: "elm"; - script { - if (!get_int(selected)) { - set_int(selected, 1); - run_program(PROGRAM:"vi_pressed"); - } - } - } - program { name: "unselected"; - signal: "elm,state,unselected"; - source: "elm"; - script { - if (get_int(selected)) { - set_int(selected, 0); - run_program(PROGRAM:"vi_zoom_out"); - } - } - } - GENGRID_PROGRAM_ITEM_SELECT_VI_EFFECT( - target: "item_bg"; - target: "item_real_bg"; - target: "elm.swallow.icon"; - target: "elm.text"; - target: "elm.swallow.end"; - ) - program { name: "touch_snd"; - signal: "mouse,clicked,1"; - source: "item_bg"; - script { - new st[31]; - new Float:vl; - get_state(PART:"item_bg", st, 30, vl); - if (!strcmp(st, "selected") || - !strcmp(st, "pressed")) - play_sample("touch_sound", 1.0); - } - } - program { name: "action_focus"; - signal: "elm,action,focus_highlight,show"; - source: "elm"; - action: STATE_SET "enabled" 0.0; - target: "focus_bg"; - } - program { name: "action_unfocus"; - signal: "elm,action,focus_highlight,hide"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "focus_bg"; - } - GENGRID_PROGRAM_DEFAULT( - target: "item_bg"; - target: "item_real_bg"; - target: "elm.swallow.icon"; - target: "elm.text"; - target: "elm.swallow.end"; - ) - } - } - - */ diff --git a/res/edje/mutiple-wallpaper.edc b/res/edje/mutiple-wallpaper.edc index bcbba85..4d0093c 100644 --- a/res/edje/mutiple-wallpaper.edc +++ b/res/edje/mutiple-wallpaper.edc @@ -242,7 +242,6 @@ group{ group{ name: "preview_gengrid.item"; images { - //image: "00_thumbs_bg_focus.png" COMP; image: "thumbnail_focus.#.png" COMP; } @@ -374,41 +373,6 @@ group{ } -group { name: "preview_icon"; - - images { - image: "Wallpapers_setting_ic.png" COMP; - image: "Wallpapers_setting_ef.png" COMP; - } - - parts { - part { name: "icon"; - type: IMAGE; - mouse_events: 1; - repeat_events: 0; - scale: 1; - description {state: "default" 0.0; - image.normal: "Wallpapers_setting_ic.png"; - min: 46 46; - max: 46 46; - fixed:1 1; - } - } - part { name: "effect"; - type: IMAGE; - mouse_events: 1; - repeat_events: 0; - scale: 1; - description { state: "default" 0.0; - image.normal: "Wallpapers_setting_ef.png"; - min: 46 46; - max: 46 46; - fixed:1 1; - } - } - } -} - group { name: "default_gengrid.item"; diff --git a/res/edje/popup-wallpaper-main-view.edc b/res/edje/popup-wallpaper-main-view.edc index f5f4f2d..cb64879 100644 --- a/res/edje/popup-wallpaper-main-view.edc +++ b/res/edje/popup-wallpaper-main-view.edc @@ -120,16 +120,6 @@ group { public tabbar_visible = 0; //Tabbar visible status (This value is used for tabbar group) } - images { -// set { -// name: "home_wallpapaer_title_bg"; -// image { -// image: "icons/home_wallpapaer_title_bg.#.png" RAW; -// } -// } - image: "icons/home_wallpapaer_title_bg.#.png" RAW; - } - parts { part { name: "bg"; @@ -182,7 +172,6 @@ group { fixed: 0 1; rel1 { to: "bg"; relative: 0.0 0.0; } rel2 { to: "bg"; relative: 1.0 0.0; } - //image.normal: "icons/home_wallpapaer_title_bg.#.png"; visible: 1; color: 0 0 0 255; map.on: 1; diff --git a/res/edje/popup-wallpaper.edc b/res/edje/popup-wallpaper.edc index 86b699a..e7ac9dc 100644 --- a/res/edje/popup-wallpaper.edc +++ b/res/edje/popup-wallpaper.edc @@ -19,7 +19,6 @@ #include "popup-wallpaper-macro.edc" #include "popup-wallpaper-main-view.edc" #include "mutiple-wallpaper.edc" -#include "gengrid_customized_theme.edc" collections { diff --git a/res/festival/01_Milad-un-Nabi.jpg b/res/festival/01_Milad-un-Nabi.jpg deleted file mode 100644 index 5aa5f94..0000000 Binary files a/res/festival/01_Milad-un-Nabi.jpg and /dev/null differ diff --git a/res/festival/02_Republic_Day.jpg b/res/festival/02_Republic_Day.jpg deleted file mode 100644 index 56c2f80..0000000 Binary files a/res/festival/02_Republic_Day.jpg and /dev/null differ diff --git a/res/festival/03_Holi.jpg b/res/festival/03_Holi.jpg deleted file mode 100644 index 27179a7..0000000 Binary files a/res/festival/03_Holi.jpg and /dev/null differ diff --git a/res/festival/04_Ram-Navami.jpg b/res/festival/04_Ram-Navami.jpg deleted file mode 100644 index e0ef726..0000000 Binary files a/res/festival/04_Ram-Navami.jpg and /dev/null differ diff --git a/res/festival/05_Good_Friday.jpg b/res/festival/05_Good_Friday.jpg deleted file mode 100644 index 63386f2..0000000 Binary files a/res/festival/05_Good_Friday.jpg and /dev/null differ diff --git a/res/festival/06_Buddha.jpg b/res/festival/06_Buddha.jpg deleted file mode 100644 index bcb63b5..0000000 Binary files a/res/festival/06_Buddha.jpg and /dev/null differ diff --git a/res/festival/07_Id-Ul-Fitr.jpg b/res/festival/07_Id-Ul-Fitr.jpg deleted file mode 100644 index 15eeeb8..0000000 Binary files a/res/festival/07_Id-Ul-Fitr.jpg and /dev/null differ diff --git a/res/festival/08_IndependenceDay.jpg b/res/festival/08_IndependenceDay.jpg deleted file mode 100644 index ac3d7ea..0000000 Binary files a/res/festival/08_IndependenceDay.jpg and /dev/null differ diff --git a/res/festival/09_Id-ul-Juha.jpg b/res/festival/09_Id-ul-Juha.jpg deleted file mode 100644 index 4dc8147..0000000 Binary files a/res/festival/09_Id-ul-Juha.jpg and /dev/null differ diff --git a/res/festival/10_Janmashtami.jpg b/res/festival/10_Janmashtami.jpg deleted file mode 100644 index 45889a9..0000000 Binary files a/res/festival/10_Janmashtami.jpg and /dev/null differ diff --git a/res/festival/11_Dussehra.jpg b/res/festival/11_Dussehra.jpg deleted file mode 100644 index e72ab42..0000000 Binary files a/res/festival/11_Dussehra.jpg and /dev/null differ diff --git a/res/festival/12_Mahatma_Gandhi_Jayanti.jpg b/res/festival/12_Mahatma_Gandhi_Jayanti.jpg deleted file mode 100644 index 68e9b60..0000000 Binary files a/res/festival/12_Mahatma_Gandhi_Jayanti.jpg and /dev/null differ diff --git a/res/festival/13_Diwali.jpg b/res/festival/13_Diwali.jpg deleted file mode 100644 index 5e6f2d7..0000000 Binary files a/res/festival/13_Diwali.jpg and /dev/null differ diff --git a/res/festival/14_Muharram.jpg b/res/festival/14_Muharram.jpg deleted file mode 100644 index d2fef11..0000000 Binary files a/res/festival/14_Muharram.jpg and /dev/null differ diff --git a/res/festival/15_Christmas.jpg b/res/festival/15_Christmas.jpg deleted file mode 100644 index 24943db..0000000 Binary files a/res/festival/15_Christmas.jpg and /dev/null differ diff --git a/res/festival/16_Mahavir_Jayanti.jpg b/res/festival/16_Mahavir_Jayanti.jpg deleted file mode 100644 index 89ef3e3..0000000 Binary files a/res/festival/16_Mahavir_Jayanti.jpg and /dev/null differ diff --git a/res/festival/17_Guru_Nanak.jpg b/res/festival/17_Guru_Nanak.jpg deleted file mode 100644 index 82062a3..0000000 Binary files a/res/festival/17_Guru_Nanak.jpg and /dev/null differ diff --git a/src/wallpaper-ui-service-main.c b/src/wallpaper-ui-service-main.c index 26893d3..f6f8fd1 100644 --- a/src/wallpaper-ui-service-main.c +++ b/src/wallpaper-ui-service-main.c @@ -660,18 +660,18 @@ static void _wallpaper_preview_main() WALLPAPERUI_TRACE_END; } -HAPI void wallpaper_main_create_view(wallpaper_ui_service_appdata *ad) +HAPI void wallpaper_main_create_view(wallpaper_ui_service_appdata *data) { WALLPAPERUI_TRACE_BEGIN; char *value = NULL; state_data.flag_changed = EINA_FALSE; - if (ad == NULL) { + if (data == NULL) { WALLPAPERUI_DBG("wallpaper_ui_service_appdata is NULL"); return; } - + ad = data; if (ad->win == NULL) { WALLPAPERUI_DBG("ad->win is NULL"); return; @@ -923,7 +923,6 @@ static Evas_Object *main_gengrid_add(Evas_Object *parent) vconf_get_int(VCONFKEY_LOCKSCREEN_WALLPAPER_TYPE, &setting_type); WALLPAPERUI_DBG("VCONFKEY_LOCKSCREEN_WALLPAPER_TYPE %d", setting_type); - ad->gengrid = elm_gengrid_add(parent); elm_scroller_policy_set(ad->gengrid, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); evas_object_size_hint_weight_set(ad->gengrid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);