From d334b398c5aecee88748a8fdb13e5599b48e8b65 Mon Sep 17 00:00:00 2001 From: Rahul Dadhich Date: Mon, 25 Apr 2016 15:34:40 +0530 Subject: [PATCH] [TSAM-1135]UG to UIApp conversion. Change-Id: I9c943bde7340c2fb104139b56b36aa3cac57b9d7 Signed-off-by: Rahul Dadhich --- .cproject | 1269 ++++++++++++++++++-- .exportMap | 4 + .project | 13 +- Build/appendix.mk | 1 + Build/basedef.mk | 14 + Build/flags.mk | 16 + Build/makefile | 275 +++++ Build/prepost.mk | 6 + Build/tooldef.mk | 61 + CMakeLists.txt | 113 +- {include => inc}/gallery-efl.h | 20 +- {include => inc}/ge-albums.h | 0 {include => inc}/ge-button.h | 0 {include => inc}/ge-data-type.h | 0 {include => inc}/ge-data-util.h | 0 {include => inc}/ge-data.h | 0 {include => inc}/ge-db-update.h | 0 {include => inc}/ge-debug.h | 12 +- {include => inc}/ge-exif.h | 0 {include => inc}/ge-ext-exec.h | 0 {include => inc}/ge-ext-ug-load.h | 2 +- {include => inc}/ge-file-util.h | 0 {include => inc}/ge-gridview.h | 0 {include => inc}/ge-icon.h | 6 +- {include => inc}/ge-lang.h | 2 +- {include => inc}/ge-local-data.h | 0 {include => inc}/ge-main-view.h | 0 {include => inc}/ge-nocontent.h | 0 {include => inc}/ge-rotate-bg.h | 0 {include => inc}/ge-strings.h | 0 {include => inc}/ge-thumb.h | 0 {include => inc}/ge-tile.h | 0 {include => inc}/ge-ugdata.h | 6 +- {include => inc}/ge-ui-util.h | 0 {include => inc}/ge-util.h | 2 +- packaging/ug-gallery-efl.spec | 76 +- project_def.prop | 73 ++ .../edc/images/T01_album_edit_check_on.png | Bin 3190 -> 0 bytes .../edc => edje}/gallery-efl-check.edc | 0 .../edc => edje}/gallery-efl-edc-res.h | 0 .../edc => edje}/gallery-efl-expanded-title.edc | 0 .../gallery-efl-gengrid-item-albums.edc | 0 .../gallery-efl-gengrid-item-thumbview.edc | 0 .../edc => edje}/gallery-efl-gengrid.edc | 0 .../edc => edje}/gallery-efl-nocontents.edc | 0 res/{black_theme/edc => edje}/gallery-efl.edc | 0 .../edc => edje}/images/00_badge_bg.png | Bin .../edc => edje}/images/00_button_icon_arrow.png | Bin .../images/00_button_icon_arrow_press.png | Bin .../edc => edje}/images/00_check_bg_dim.png | Bin .../images/00_popup_dropdown_title_bg.png | Bin .../images/00_popup_dropdown_title_bg_focus.png | Bin .../images/00_popup_dropdown_title_bg_press.png | Bin .../edc => edje}/images/00_scroll_bar.png | Bin .../edc => edje}/images/00_thumbs_bg_focus.png | Bin .../edc => edje}/images/00_title_bg.png | Bin .../images/Contents_broken_351X261.png | Bin .../images/No_thumbnail_351X261.png | Bin .../edc => edje}/images/T01_Nocontents_picture.png | Bin .../images/T01_album_edit_check_bg.png | Bin .../images}/T01_album_edit_check_off.png | Bin .../images}/T01_album_edit_check_on.png | Bin .../edc => edje}/images/T01_album_folder_bg.png | Bin .../images}/T01_album_icon_camera.png | Bin .../images}/T01_album_icon_download.png | Bin .../images}/T01_album_icon_folder.png | Bin .../images}/T01_album_icon_sd_card.png | Bin .../edc => edje}/images/T01_btn_play.png | Bin .../images_edc => edje/images}/T01_icon_lock.png | Bin .../images}/T01_icon_panorama.png | Bin .../images}/T01_icon_sound_shot.png | Bin .../images}/T01_icon_thumbnail_bookmark.png | Bin .../images/T01_overscrolling_bottom.png | Bin .../edc => edje}/images/T01_overscrolling_left.png | Bin .../images/T01_overscrolling_right.png | Bin .../edc => edje}/images/T01_overscrolling_top.png | Bin .../images}/T01_title_icon_select_all.png | Bin .../edc => edje}/images/T01_video_play.png | Bin .../images}/gallery-efl-images.edc | 0 .../edc => edje}/images/gallery_icon_container.png | Bin .../edc => edje}/images/gallery_icon_full.png | Bin .../edc => edje}/sounds/S_Touch_30ms.wav | Bin res/po/CMakeLists.txt | 2 +- shared/res/ug-gallery-efl.png | Bin 0 -> 7476 bytes src/CMakeLists.txt | 109 ++ src/gallery-efl.c | 190 +-- src/util/ge-ext-ug-load.c | 156 ++- src/util/ge-lang.c | 6 +- src/util/ge-ui-util.c | 3 + src/util/ge-util.c | 53 +- src/view/ge-albums.c | 46 +- src/view/ge-gridview.c | 58 +- src/view/ge-main-view.c | 15 +- tizen-manifest.xml | 17 + ug-gallery-efl.manifest-3.0.in | 5 + ug-gallery-efl.manifest.xml | 9 + ug-gallery-efl.xml | 2 +- 97 files changed, 2291 insertions(+), 351 deletions(-) create mode 100644 .exportMap create mode 100644 Build/appendix.mk create mode 100644 Build/basedef.mk create mode 100644 Build/flags.mk create mode 100644 Build/makefile create mode 100644 Build/prepost.mk create mode 100644 Build/tooldef.mk rename {include => inc}/gallery-efl.h (85%) rename {include => inc}/ge-albums.h (100%) rename {include => inc}/ge-button.h (100%) rename {include => inc}/ge-data-type.h (100%) rename {include => inc}/ge-data-util.h (100%) rename {include => inc}/ge-data.h (100%) rename {include => inc}/ge-db-update.h (100%) rename {include => inc}/ge-debug.h (81%) rename {include => inc}/ge-exif.h (100%) rename {include => inc}/ge-ext-exec.h (100%) rename {include => inc}/ge-ext-ug-load.h (98%) rename {include => inc}/ge-file-util.h (100%) rename {include => inc}/ge-gridview.h (100%) rename {include => inc}/ge-icon.h (86%) rename {include => inc}/ge-lang.h (95%) rename {include => inc}/ge-local-data.h (100%) rename {include => inc}/ge-main-view.h (100%) rename {include => inc}/ge-nocontent.h (100%) rename {include => inc}/ge-rotate-bg.h (100%) rename {include => inc}/ge-strings.h (100%) rename {include => inc}/ge-thumb.h (100%) rename {include => inc}/ge-tile.h (100%) rename {include => inc}/ge-ugdata.h (98%) rename {include => inc}/ge-ui-util.h (100%) rename {include => inc}/ge-util.h (98%) create mode 100644 project_def.prop delete mode 100644 res/black_theme/edc/images/T01_album_edit_check_on.png rename res/{black_theme/edc => edje}/gallery-efl-check.edc (100%) rename res/{black_theme/edc => edje}/gallery-efl-edc-res.h (100%) rename res/{black_theme/edc => edje}/gallery-efl-expanded-title.edc (100%) rename res/{black_theme/edc => edje}/gallery-efl-gengrid-item-albums.edc (100%) rename res/{black_theme/edc => edje}/gallery-efl-gengrid-item-thumbview.edc (100%) rename res/{black_theme/edc => edje}/gallery-efl-gengrid.edc (100%) rename res/{black_theme/edc => edje}/gallery-efl-nocontents.edc (100%) rename res/{black_theme/edc => edje}/gallery-efl.edc (100%) rename res/{black_theme/edc => edje}/images/00_badge_bg.png (100%) rename res/{black_theme/edc => edje}/images/00_button_icon_arrow.png (100%) rename res/{black_theme/edc => edje}/images/00_button_icon_arrow_press.png (100%) rename res/{black_theme/edc => edje}/images/00_check_bg_dim.png (100%) rename res/{black_theme/edc => edje}/images/00_popup_dropdown_title_bg.png (100%) rename res/{black_theme/edc => edje}/images/00_popup_dropdown_title_bg_focus.png (100%) rename res/{black_theme/edc => edje}/images/00_popup_dropdown_title_bg_press.png (100%) rename res/{black_theme/edc => edje}/images/00_scroll_bar.png (100%) rename res/{black_theme/edc => edje}/images/00_thumbs_bg_focus.png (100%) rename res/{black_theme/edc => edje}/images/00_title_bg.png (100%) rename res/{black_theme => edje}/images/Contents_broken_351X261.png (100%) rename res/{black_theme => edje}/images/No_thumbnail_351X261.png (100%) rename res/{black_theme/edc => edje}/images/T01_Nocontents_picture.png (100%) rename res/{black_theme/edc => edje}/images/T01_album_edit_check_bg.png (100%) rename res/{black_theme/images_edc => edje/images}/T01_album_edit_check_off.png (100%) rename res/{black_theme/images_edc => edje/images}/T01_album_edit_check_on.png (100%) rename res/{black_theme/edc => edje}/images/T01_album_folder_bg.png (100%) rename res/{black_theme/images_edc => edje/images}/T01_album_icon_camera.png (100%) rename res/{black_theme/images_edc => edje/images}/T01_album_icon_download.png (100%) rename res/{black_theme/images_edc => edje/images}/T01_album_icon_folder.png (100%) rename res/{black_theme/images_edc => edje/images}/T01_album_icon_sd_card.png (100%) rename res/{black_theme/edc => edje}/images/T01_btn_play.png (100%) rename res/{black_theme/images_edc => edje/images}/T01_icon_lock.png (100%) rename res/{black_theme/images_edc => edje/images}/T01_icon_panorama.png (100%) rename res/{black_theme/images_edc => edje/images}/T01_icon_sound_shot.png (100%) rename res/{black_theme/images_edc => edje/images}/T01_icon_thumbnail_bookmark.png (100%) rename res/{black_theme/edc => edje}/images/T01_overscrolling_bottom.png (100%) rename res/{black_theme/edc => edje}/images/T01_overscrolling_left.png (100%) rename res/{black_theme/edc => edje}/images/T01_overscrolling_right.png (100%) rename res/{black_theme/edc => edje}/images/T01_overscrolling_top.png (100%) rename res/{black_theme/images_edc => edje/images}/T01_title_icon_select_all.png (100%) rename res/{black_theme/edc => edje}/images/T01_video_play.png (100%) rename res/{black_theme/images_edc => edje/images}/gallery-efl-images.edc (100%) rename res/{black_theme/edc => edje}/images/gallery_icon_container.png (100%) rename res/{black_theme/edc => edje}/images/gallery_icon_full.png (100%) rename res/{black_theme/edc => edje}/sounds/S_Touch_30ms.wav (100%) create mode 100644 shared/res/ug-gallery-efl.png create mode 100644 src/CMakeLists.txt create mode 100644 tizen-manifest.xml create mode 100644 ug-gallery-efl.manifest-3.0.in create mode 100644 ug-gallery-efl.manifest.xml diff --git a/.cproject b/.cproject index f59c837..fedaaee 100644 --- a/.cproject +++ b/.cproject @@ -1,35 +1,912 @@ - - + + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + - + + - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + @@ -409,9 +1504,10 @@ - + + @@ -421,8 +1517,10 @@ @@ -448,22 +1546,17 @@ - - - - + @@ -478,14 +1571,14 @@ - + - - + + - - + + @@ -512,6 +1605,8 @@ + + @@ -544,6 +1639,7 @@ + @@ -568,8 +1664,10 @@ + + @@ -591,8 +1689,8 @@ - - - - - - - - - - + - @@ -770,5 +1865,19 @@ - + + + + + + + + + + + + + + + diff --git a/.exportMap b/.exportMap new file mode 100644 index 0000000..43e310e --- /dev/null +++ b/.exportMap @@ -0,0 +1,4 @@ +{ + global: main; + local: *; +}; diff --git a/.project b/.project index de8eb64..d08cb00 100644 --- a/.project +++ b/.project @@ -25,7 +25,7 @@ - 1443699656611 + 1461319227941 26 @@ -34,7 +34,7 @@ - 1443699656613 + 1461319227944 6 @@ -42,14 +42,5 @@ 1.0-name-matches-false-false-project_def.prop - - 1443699656614 - - 22 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-true-false-CMakeLists.txt - - diff --git a/Build/appendix.mk b/Build/appendix.mk new file mode 100644 index 0000000..2e06c34 --- /dev/null +++ b/Build/appendix.mk @@ -0,0 +1 @@ +# Appendix diff --git a/Build/basedef.mk b/Build/basedef.mk new file mode 100644 index 0000000..7cacafc --- /dev/null +++ b/Build/basedef.mk @@ -0,0 +1,14 @@ +# Add inputs and outputs from these tool invocations to the build variables + +C_DEPS += + +SYSROOT := $(SBI_SYSROOT) + +ROOTSTRAP_INCS := $(addprefix -I $(SYSROOT)/,$(PLATFORM_INCS_EX)) +EFL_INCS := + +RS_LIBRARIES := $(addprefix -l,$(RS_LIBRARIES_EX)) + +PLATFORM_INCS := $(ROOTSTRAP_INCS) $(EFL_INCS) \ + -I"$(SDK_PATH)/library" + diff --git a/Build/flags.mk b/Build/flags.mk new file mode 100644 index 0000000..0ee8efb --- /dev/null +++ b/Build/flags.mk @@ -0,0 +1,16 @@ + +DEBUG_OP = -g3 +CPP_DEBUG_OP = + +OPTIMIZATION_OP = -O0 +CPP_OPTIMIZATION_OP = + +COMPILE_FLAGS = $(DEBUG_OP) $(OPTIMIZATION_OP) -Wall -c -fmessage-length=0 + +CPP_COMPILE_FLAGS = $(CPP_DEBUG_OP) $(CPP_OPTIMIZATION_OP) + +LINK_FLAGS = + +AR_FLAGS = + +EDC_COMPILE_FLAGS = \ No newline at end of file diff --git a/Build/makefile b/Build/makefile new file mode 100644 index 0000000..4e2d6c5 --- /dev/null +++ b/Build/makefile @@ -0,0 +1,275 @@ +BUILD_SCRIPT_VERSION := 1.0.7 + +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)) + +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" + +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 + +$$(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 + +# 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 + +# 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))) +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_clean : + rm -f "$(APPFILE)" + rm -rf "$(OUTPUT_DIR)" + +make_version : + @echo $(BUILD_SCRIPT_VERSION) diff --git a/Build/prepost.mk b/Build/prepost.mk new file mode 100644 index 0000000..6bb5e2f --- /dev/null +++ b/Build/prepost.mk @@ -0,0 +1,6 @@ + +# Add pre/post build process +PREBUILD_DESC = +PREBUILD_COMMAND = +POSTBUILD_DESC = +POSTBUILD_COMMAND = diff --git a/Build/tooldef.mk b/Build/tooldef.mk new file mode 100644 index 0000000..4244fb3 --- /dev/null +++ b/Build/tooldef.mk @@ -0,0 +1,61 @@ +# Add inputs and outputs from these tool invocations to the build variables + +ifeq ($(strip $(BUILD_CONFIG)),) +BUILD_CONFIG = Debug +endif + +ifeq ($(strip $(OUTPUT_DIR)),) +OUTPUT_DIR := $(PROJPATH)/$(BUILD_CONFIG) +endif + + +ifneq ($(strip $(MKDIR_BIN)),) +MKDIR = $(MKDIR_BIN) +MKDIR_OP = -p +else +MKDIR = mkdir +MKDIR_OP = -p +endif + +ifneq ($(strip $(UNAME_BIN)),) +UNAME = $(UNAME_BIN) +else +UNAME = uname +endif + +ifneq ($(strip $(M4_BIN)),) +M4 = $(M4_BIN) +else +M4 = m4 +endif + +ifneq ($(strip $(TR_BIN)),) +TR = $(TR_BIN) +else +TR = tr +endif + +ifneq ($(strip $(FIND_BIN)),) +FIND = $(FIND_BIN) +else +FIND = find +endif + +ifneq ($(strip $(GREP_BIN)),) +GREP = $(GREP_BIN) +else +GREP = grep +endif + +ifneq ($(strip $(EDJE_CC_BIN)),) +EDJE_CC = $(EDJE_CC_BIN) +else +EDJE_CC = edje_cc +endif + +ifneq ($(strip $(MSGFMT_BIN)),) +MSGFMT = $(MSGFMT_BIN) +else +MSGFMT = msgfmt +endif + diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f0aa29..d7abab6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,86 +1,34 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) PROJECT(ug-gallery-efl C) -SET(GALLERY_UG_PROJECT_NAME ug-gallery-efl) -SET(GE_EDC_DIR black_theme/edc) -SET(GE_IMG_DIR black_theme/edc/images) -SET(GE_SOUND_DIR black_theme/edc/sounds) -SET(GE_IMG_EDC_DIR black_theme/images_edc) -SET(GE_IMG_C_DIR black_theme/images) - -IF("${CMAKE_BUILD_TYPE}" STREQUAL "") - SET(CMAKE_BUILD_TYPE "Release") -ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "") -MESSAGE("Build type: ${CMAKE_BUILD_TYPE}") SET(PREFIX ${CMAKE_INSTALL_PREFIX}) -SET(RESDIR "${PREFIX}/res") +#SET(PREFIX ${CMAKE_INSTALL_PREFIX}) +#SET(RESDIR "${IMGDIRRES}/res") SET(LOCALEDIR "${RESDIR}/locale") SET(EXEC_PREFIX "\${prefix}") SET(LIBDIR "\${prefix}/lib") -SET(INCLUDEDIR "\${prefix}/include") -SET(VERSION 1.0) - -ADD_DEFINITIONS("-D_USE_DLOG_") -ADD_DEFINITIONS("-D_USE_SECURE_LOG_") -ADD_DEFINITIONS("-D_USE_ROTATE_BG_GE") -ADD_DEFINITIONS("-DLOCALEDIR=\"${LOCALEDIR}\"") -ADD_DEFINITIONS("-DPACKAGE=\"${PROJECT_NAME}\"") -ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") - -AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src MAIN_UG_SRCS) -AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src/data DATA_UG_SRCS) -AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src/util UTIL_UG_SRCS) -AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src/view VIEW_UG_SRCS) -AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src/widget WIDGET_UG_SRCS) - -SET(UG_SRCS - ${MAIN_UG_SRCS} - ${DATA_UG_SRCS} - ${UTIL_UG_SRCS} - ${VIEW_UG_SRCS} - ${WIDGET_UG_SRCS} - ) - -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) - -INCLUDE(FindPkgConfig) -pkg_check_modules(pkgs REQUIRED - elementary - evas - dlog - glib-2.0 - capi-appfw-application - capi-content-media-content - ui-gadget-1 - efl-extension - notification - appsvc - storage - libtzplatform-config -) +SET(INCLUDEDIR "\${prefix}/inc") -FOREACH(flag ${pkgs_CFLAGS}) - SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") -ENDFOREACH(flag) - -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fvisibility=hidden") -SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -fpie") -SET(CMAKE_C_FLAGS_RELEASE "-O2 -fpie") -SET(CMAKE_LDFLAGS "-Wl,-zdefs" ) - -FIND_PROGRAM(UNAME NAMES uname) -EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH") -IF("${ARCH}" STREQUAL "arm") - ADD_DEFINITIONS("-DTARGET") - MESSAGE("add -DTARGET") -ENDIF("${ARCH}" STREQUAL "arm") - -#SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed") -SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie") +SET(GALLERY_UG_PROJECT_NAME ug-gallery-efl) +SET(GE_EDC_DIR edje) +SET(GE_IMG_DIR edje/images) +SET(GE_SOUND_DIR edje/sounds) +SET(GE_IMG_EDC_DIR edje/images) +SET(GE_IMG_C_DIR edje/images) + +# subdir +ADD_SUBDIRECTORY(src) +ADD_SUBDIRECTORY(src/data) +ADD_SUBDIRECTORY(src/util) +ADD_SUBDIRECTORY(src/view) +ADD_SUBDIRECTORY(src/widget) +ADD_SUBDIRECTORY(res/edje) +ADD_SUBDIRECTORY(res/icon) +ADD_SUBDIRECTORY(res/edje/images) +ADD_SUBDIRECTORY(res/po) +ADD_SUBDIRECTORY(res/edje/sounds) -ADD_LIBRARY(${PROJECT_NAME} SHARED ${UG_SRCS}) -SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION 0.0.1) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} "-ldl") +CONFIGURE_FILE(ug-gallery-efl.manifest-3.0.in ${PKGNAME}.manifest) # EDJ ADD_CUSTOM_COMMAND(OUTPUT gallery-efl.edj @@ -100,17 +48,16 @@ ADD_CUSTOM_COMMAND(OUTPUT gallery-efl-images.edj ADD_CUSTOM_TARGET(gallery_efl_edj_build DEPENDS gallery-efl.edj gallery-efl-images.edj) ADD_DEPENDENCIES(${PROJECT_NAME} gallery_efl_edj_build) -INSTALL(FILES ${CMAKE_BINARY_DIR}/gallery-efl.edj DESTINATION ${RESDIR}/edje/ug-gallery-efl) -INSTALL(FILES ${CMAKE_BINARY_DIR}/gallery-efl-images.edj DESTINATION ${RESDIR}/edje/ug-gallery-efl) +INSTALL(FILES ${CMAKE_BINARY_DIR}/gallery-efl.edj DESTINATION ${RESDIR}/edje) +INSTALL(FILES ${CMAKE_BINARY_DIR}/gallery-efl-images.edj DESTINATION ${RESDIR}/edje/images) -INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/res/${GE_IMG_C_DIR} DESTINATION ${RESDIR}/images/ug-gallery-efl) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR}) +INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/res/${GE_IMG_C_DIR} DESTINATION ${RESDIR}/edje) -INSTALL(FILES ${PROJECT_NAME}.xml DESTINATION ${TZ_SYS_RO_PACKAGES}) +INSTALL(FILES ug-gallery-efl.manifest.xml DESTINATION ${MANIFESTDIR} RENAME ${PKGNAME}.xml) +INSTALL(FILES shared/res/ug-gallery-efl.png DESTINATION ${ICONDIR}) +#INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/res/edje/images/ DESTINATION ${IMGDIR}) +INSTALL(FILES ${PROJECT_NAME}.xml DESTINATION ${MANIFESTDIR}) -# i18n -ADD_SUBDIRECTORY(res/po) # Install appcontrol icon -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/icon/ug-gallery-efl.png DESTINATION ${RESDIR}/images/ug-gallery-efl) - +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/icon/ug-gallery-efl.png DESTINATION ${ICONDIR}) diff --git a/include/gallery-efl.h b/inc/gallery-efl.h similarity index 85% rename from include/gallery-efl.h rename to inc/gallery-efl.h index 950f1a6..c1b4849 100644 --- a/include/gallery-efl.h +++ b/inc/gallery-efl.h @@ -24,11 +24,23 @@ extern "C" { #endif /* __cplusplus */ +static inline char * ge_get_resource_path() { + char * path = app_get_resource_path(); + return path; +} + +static inline char* full_path(char *str1, char *str2) { + char path[1024] = {}; + snprintf(path, 1024, "%s%s", str1, str2); + char *full_path = strdup(path); + return full_path; +} + #define GALLERY_APP_ICON_DIR "/usr/share/icons/default/small/" -#define GE_UG_RES_DIR PREFIX"/res/" -#define GE_IMAGES_DIR GE_UG_RES_DIR"images/"PACKAGE"/images/" -#define GE_EDJ_DIR GE_UG_RES_DIR"edje/"PACKAGE"/" -#define GE_EDJ_FILE GE_EDJ_DIR"gallery-efl.edj" +#define GE_UG_RES_DIR ge_get_resource_path() +#define GE_IMAGES_DIR full_path(GE_UG_RES_DIR, "edje/images/") +#define GE_EDJ_DIR full_path(GE_UG_RES_DIR, "edje/") +#define GE_EDJ_FILE full_path(GE_EDJ_DIR, "gallery-efl.edj") #ifdef _USE_CUSTOMIZED_GENGRID_STYLE #define GE_GENGRID_STYLE_GALLERY "gallery_efl" #endif diff --git a/include/ge-albums.h b/inc/ge-albums.h similarity index 100% rename from include/ge-albums.h rename to inc/ge-albums.h diff --git a/include/ge-button.h b/inc/ge-button.h similarity index 100% rename from include/ge-button.h rename to inc/ge-button.h diff --git a/include/ge-data-type.h b/inc/ge-data-type.h similarity index 100% rename from include/ge-data-type.h rename to inc/ge-data-type.h diff --git a/include/ge-data-util.h b/inc/ge-data-util.h similarity index 100% rename from include/ge-data-util.h rename to inc/ge-data-util.h diff --git a/include/ge-data.h b/inc/ge-data.h similarity index 100% rename from include/ge-data.h rename to inc/ge-data.h diff --git a/include/ge-db-update.h b/inc/ge-db-update.h similarity index 100% rename from include/ge-db-update.h rename to inc/ge-db-update.h diff --git a/include/ge-debug.h b/inc/ge-debug.h similarity index 81% rename from include/ge-debug.h rename to inc/ge-debug.h index 3a915de..fb3398a 100644 --- a/include/ge-debug.h +++ b/inc/ge-debug.h @@ -49,9 +49,9 @@ typedef enum { #ifdef _USE_DLOG_ -#define ge_dbg(fmt, arg...) LOGD(FONT_COLOR_BLUE fmt FONT_COLOR_RESET, ##arg) -#define ge_dbgW(fmt, arg...) LOGW(FONT_COLOR_GREEN fmt FONT_COLOR_RESET, ##arg) -#define ge_dbgE(fmt, arg...) LOGE(FONT_COLOR_RED fmt FONT_COLOR_RESET, ##arg) +#define ge_dbg(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, "[%s][%d] : "fmt"\n", __func__, __LINE__, ##arg) +#define ge_dbgW(fmt, arg...) dlog_print(DLOG_INFO, LOG_TAG, "[%s][%d] : "fmt"\n", __func__, __LINE__, ##arg) +#define ge_dbgE(fmt, arg...) dlog_print(DLOG_ERROR, LOG_TAG, "[%s][%d] : "fmt"\n", __func__, __LINE__, ##arg) #else @@ -61,9 +61,9 @@ typedef enum { #endif #ifdef _USE_SECURE_LOG_ -#define ge_sdbg(fmt, arg...) SECURE_LOGD(FONT_COLOR_BLUE fmt FONT_COLOR_RESET, ##arg) -#define ge_sdbgW(fmt, arg...) SECURE_LOGI(FONT_COLOR_GREEN fmt FONT_COLOR_RESET, ##arg) -#define ge_sdbgE(fmt, arg...) SECURE_LOGE(FONT_COLOR_RED fmt FONT_COLOR_RESET, ##arg) +#define ge_sdbg(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, "[%s][%d] : "fmt"\n", __func__, __LINE__, ##arg) +#define ge_sdbgW(fmt, arg...) dlog_print(DLOG_INFO, LOG_TAG, "[%s][%d] : "fmt"\n", __func__, __LINE__, ##arg) +#define ge_sdbgE(fmt, arg...) dlog_print(DLOG_ERROR, LOG_TAG, "[%s][%d] : "fmt"\n", __func__, __LINE__, ##arg) #endif #define ge_warn_if(expr, fmt, arg...) do { \ diff --git a/include/ge-exif.h b/inc/ge-exif.h similarity index 100% rename from include/ge-exif.h rename to inc/ge-exif.h diff --git a/include/ge-ext-exec.h b/inc/ge-ext-exec.h similarity index 100% rename from include/ge-ext-exec.h rename to inc/ge-ext-exec.h diff --git a/include/ge-ext-ug-load.h b/inc/ge-ext-ug-load.h similarity index 98% rename from include/ge-ext-ug-load.h rename to inc/ge-ext-ug-load.h index e83e986..e1af42f 100644 --- a/include/ge-ext-ug-load.h +++ b/inc/ge-ext-ug-load.h @@ -18,7 +18,7 @@ #ifndef _GE_EXT_UG_LOAD_H_ #define _GE_EXT_UG_LOAD_H_ -#include +//#include #include "gallery-efl.h" typedef enum { diff --git a/include/ge-file-util.h b/inc/ge-file-util.h similarity index 100% rename from include/ge-file-util.h rename to inc/ge-file-util.h diff --git a/include/ge-gridview.h b/inc/ge-gridview.h similarity index 100% rename from include/ge-gridview.h rename to inc/ge-gridview.h diff --git a/include/ge-icon.h b/inc/ge-icon.h similarity index 86% rename from include/ge-icon.h rename to inc/ge-icon.h index 9cb6259..97c2081 100644 --- a/include/ge-icon.h +++ b/inc/ge-icon.h @@ -20,7 +20,7 @@ #include "gallery-efl.h" -#define GE_IMAGES_EDJ_FILE GE_EDJ_DIR"/gallery-efl-images.edj" +#define GE_IMAGES_EDJ_FILE full_path(GE_EDJ_DIR, "/gallery-efl-images.edj") #define GE_DEFAULT_APP_ICON GALLERY_APP_ICON_DIR"org.tizen.gallery.png" #define GE_ALBUM_ICON_CAMERA "T01_album_icon_camera.png" @@ -37,8 +37,8 @@ #define GE_ICON_TITLE_SELECT_NOT_OK "T01_album_edit_check_off.png" #define GE_ICON_SOUND_SHOT "T01_icon_sound_shot.png" #define GE_ICON_PANORAMA "T01_icon_panorama.png" -#define GE_ICON_NO_THUMBNAIL GE_IMAGES_DIR"No_thumbnail_351X261.png" -#define GE_ICON_CONTENTS_BROKEN GE_IMAGES_DIR"Contents_broken_351X261.png" +#define GE_ICON_NO_THUMBNAIL full_path(GE_IMAGES_DIR, "No_thumbnail_351X261.png") +#define GE_ICON_CONTENTS_BROKEN full_path(GE_IMAGES_DIR, "Contents_broken_351X261.png") #endif //__GE_ICON_H__ diff --git a/include/ge-lang.h b/inc/ge-lang.h similarity index 95% rename from include/ge-lang.h rename to inc/ge-lang.h index ea58bcc..002068c 100644 --- a/include/ge-lang.h +++ b/inc/ge-lang.h @@ -25,7 +25,7 @@ extern "C" { #endif -int _ge_lang_update(ge_ugdata *ugd); +void _ge_lang_update(ge_ugdata *ugd); #ifdef _cplusplus } diff --git a/include/ge-local-data.h b/inc/ge-local-data.h similarity index 100% rename from include/ge-local-data.h rename to inc/ge-local-data.h diff --git a/include/ge-main-view.h b/inc/ge-main-view.h similarity index 100% rename from include/ge-main-view.h rename to inc/ge-main-view.h diff --git a/include/ge-nocontent.h b/inc/ge-nocontent.h similarity index 100% rename from include/ge-nocontent.h rename to inc/ge-nocontent.h diff --git a/include/ge-rotate-bg.h b/inc/ge-rotate-bg.h similarity index 100% rename from include/ge-rotate-bg.h rename to inc/ge-rotate-bg.h diff --git a/include/ge-strings.h b/inc/ge-strings.h similarity index 100% rename from include/ge-strings.h rename to inc/ge-strings.h diff --git a/include/ge-thumb.h b/inc/ge-thumb.h similarity index 100% rename from include/ge-thumb.h rename to inc/ge-thumb.h diff --git a/include/ge-tile.h b/inc/ge-tile.h similarity index 100% rename from include/ge-tile.h rename to inc/ge-tile.h diff --git a/include/ge-ugdata.h b/inc/ge-ugdata.h similarity index 98% rename from include/ge-ugdata.h rename to inc/ge-ugdata.h index fc63494..69b193c 100644 --- a/include/ge-ugdata.h +++ b/inc/ge-ugdata.h @@ -22,7 +22,7 @@ #include #include #include -#include +//#include #include #include @@ -234,8 +234,8 @@ struct _ge_ugdata { int popup_mode; ge_cluster_list* cluster_list; - ui_gadget_h ug_called_by_me; - ui_gadget_h ug; +// ui_gadget_h ug_called_by_me; +// ui_gadget_h ug; char *ug_path; app_control_h service; /*added for "ug_send_result"*/ bool b_destroy_me; diff --git a/include/ge-ui-util.h b/inc/ge-ui-util.h similarity index 100% rename from include/ge-ui-util.h rename to inc/ge-ui-util.h diff --git a/include/ge-util.h b/inc/ge-util.h similarity index 98% rename from include/ge-util.h rename to inc/ge-util.h index 417bec3..24eaece 100644 --- a/include/ge-util.h +++ b/inc/ge-util.h @@ -43,6 +43,6 @@ int _ge_addhome_image(ge_ugdata *ugd, char *path); int _ge_send_result(ge_ugdata *ugd); int _ge_atoi(const char *number); char *_ge_str(char *str_id); - +char *_ge_get_edje_path(void); #endif //_GE_UTIL_H_ diff --git a/packaging/ug-gallery-efl.spec b/packaging/ug-gallery-efl.spec index cd7f6eb..d4e9990 100644 --- a/packaging/ug-gallery-efl.spec +++ b/packaging/ug-gallery-efl.spec @@ -1,9 +1,9 @@ -Name: ug-gallery-efl +Name: org.tizen.ug-gallery-efl Summary: Gallery UX Version: 1.3.21 Release: 1 -Group: Applications +Group: Applications/Multimedia Applications License: Apache-2.0 Source0: %{name}-%{version}.tar.gz @@ -16,10 +16,8 @@ BuildRequires: gettext-tools BuildRequires: edje-tools BuildRequires: prelink BuildRequires: libicu-devel - BuildRequires: pkgconfig(elementary) BuildRequires: pkgconfig(evas) -BuildRequires: pkgconfig(ui-gadget-1) BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(notification) @@ -33,49 +31,61 @@ BuildRequires: pkgconfig(libtzplatform-config) %description Description: gallery UG +%define PREFIX %{TZ_SYS_RO_APP}/%{name} +%define MANIFESTDIR %{TZ_SYS_RO_PACKAGES} +%define ICONDIR %{TZ_SYS_RO_ICONS}/default/small + +%define RESDIR %{PREFIX}/res +%define EDJDIR %{RESDIR}/edje +%define IMGDIR %{EDJDIR}/images +%define BINDIR %{PREFIX}/bin +%define LIBDIR %{PREFIX}/lib +%define LOCALEDIR %{RESDIR}/locale +%define IMGDIRRES %{RESDIR}/res + %prep %setup -q %build - -%define _app_license_dir %{TZ_SYS_SHARE}/license - -%if 0%{?tizen_build_binary_release_type_eng} -export CFLAGS="$CFLAGS -DTIZEN_ENGINEER_MODE" -export CXXFLAGS="$CXXFLAGS -DTIZEN_ENGINEER_MODE" -export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE" +%if 0%{?sec_build_binary_debug_enable} +export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE" +export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE" +export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" %endif -%ifarch %{arm} -CXXFLAGS+=" -D_ARCH_ARM_ -mfpu=neon" -%endif - -cmake . -DCMAKE_INSTALL_PREFIX=%{TZ_SYS_RO_UG} \ - -DARCH=%{ARCH} \ - -DTZ_SYS_RO_PACKAGES=%{TZ_SYS_RO_PACKAGES} +cmake . \ + -DPREFIX=%{PREFIX} \ + -DPKGDIR=%{name} \ + -DIMGDIR=%{IMGDIR} \ + -DEDJDIR=%{EDJDIR} \ + -DPKGNAME=%{name} \ + -DBINDIR=%{BINDIR} \ + -DMANIFESTDIR=%{MANIFESTDIR} \ + -DEDJIMGDIR=%{EDJIMGDIR} \ + -DLIBDIR=%{LIBDIR} \ + -DICONDIR=%{ICONDIR} \ + -DLOCALEDIR=%{LOCALEDIR} \ + -DRESDIR=%{RESDIR} make %{?jobs:-j%jobs} %install rm -rf %{buildroot} - %make_install - -mkdir -p %{buildroot}%{_app_license_dir} -cp LICENSE %{buildroot}%{_app_license_dir}/ug-gallery-efl +mkdir -p %{buildroot}/%{LIBDIR} %post -mkdir -p /usr/ug/bin/ -ln -sf /usr/bin/ug-client %{TZ_SYS_RO_UG}/bin/gallery-efl -%postun +GOPTION="-g 6514" %files -%manifest ug-gallery-efl.manifest +%manifest %{name}.manifest %defattr(-,root,root,-) -%{TZ_SYS_RO_UG}/lib/libug-gallery-efl.so* -%{TZ_SYS_RO_UG}/res/edje/ug-gallery-efl/* -%{TZ_SYS_RO_UG}/res/images/ug-gallery-efl/* -%{TZ_SYS_RO_UG}/res/locale/*/*/ug-gallery-efl.mo -%{TZ_SYS_RO_PACKAGES}/ug-gallery-efl.xml -%{TZ_SYS_RO_UG}/res/images/ug-gallery-efl/ug-gallery-efl.png -%{TZ_SYS_SHARE}/license/ug-gallery-efl +%dir +%{LIBDIR} +%{BINDIR}/* +%{MANIFESTDIR}/*.xml +%{ICONDIR}/* +%{RESDIR}/* +%{ICONDIR}/* +#%{IMGDIR}/* +#%{LOCALEDIR}/* diff --git a/project_def.prop b/project_def.prop new file mode 100644 index 0000000..02ee0d2 --- /dev/null +++ b/project_def.prop @@ -0,0 +1,73 @@ + +# Project Name +APPNAME = ug-gallery-efl + +# Project Type +type = app + +# Project Profile +profile = mobile-3.0 + +# C Sources +USER_SRCS = src/data/ge-data.c src/widget/ge-rotate-bg.c src/util/ge-util.c src/util/ge-debug.c src/view/ge-gridview.c src/data/ge-local-data.c src/view/ge-albums.c src/data/ge-data-util.c src/widget/ge-button.c src/gallery-efl.c src/widget/ge-tile.c src/util/ge-file-util.c src/util/ge-ext-exec.c src/data/ge-data-type.c src/widget/ge-thumb.c src/util/ge-ui-util.c src/widget/ge-nocontent.c src/util/ge-ext-ug-load.c src/util/ge-exif.c src/util/ge-lang.c src/util/ge-db-update.c src/view/ge-main-view.c + +# EDC Sources +USER_EDCS = + +# PO Sources +USER_POS = res/po/zh_TW.po res/po/fr.po res/po/ro.po res/po/pt_BR.po res/po/or.po res/po/mk.po res/po/hy.po res/po/ca.po res/po/en.po res/po/ka.po res/po/nb.po res/po/zh_HK.po res/po/sk.po res/po/ml.po res/po/pl.po res/po/tr_TR.po res/po/gl.po res/po/nl.po res/po/ru_RU.po res/po/bn.po res/po/el_GR.po res/po/et.po res/po/sl.po res/po/kn.po res/po/en_PH.po res/po/eu.po res/po/it_IT.po res/po/sr.po res/po/mr.po res/po/de.po res/po/is.po res/po/pa.po res/po/te.po res/po/bg.po res/po/lv.po res/po/gu.po res/po/uk.po res/po/fi.po res/po/cs.po res/po/uz.po res/po/en_US.po res/po/ja_JP.po res/po/zh_CN.po res/po/hr.po res/po/hu.po res/po/ga.po res/po/si.po res/po/ko_KR.po res/po/da.po res/po/pt_PT.po res/po/fr_CA.po res/po/lt.po res/po/es_ES.po res/po/hi.po res/po/mn_MN.po res/po/es_US.po res/po/az.po res/po/sv.po res/po/ar.po res/po/kk.po res/po/ta.po + +# User Defines +USER_DEFS = PREFIX='"/home/owner/apps_rw/org.tizen.ug-gallery-efl"' _USE_SECURE_LOG_ _USE_DLOG_ +USER_CPP_DEFS = + +# User Undefines +USER_UNDEFS = +USER_CPP_UNDEFS = + +# User Libraries +USER_LIBS = + +# User Objects +USER_OBJS = +USER_OBJS_ABS = + +# User Includes +## C Compiler +USER_INC_DIRS = inc +USER_INC_DIRS_ABS = +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 Library Path +USER_LIB_DIRS = lib +USER_LIB_DIRS_ABS = + +# EDC Resource Path +USER_EDCS_IMAGE_DIRS = res/edje/images +USER_EDCS_IMAGE_DIRS_ABS = +USER_EDCS_SOUND_DIRS = res/edje/sounds +USER_EDCS_SOUND_DIRS_ABS = +USER_EDCS_FONT_DIRS = edje/fonts +USER_EDCS_FONT_DIRS_ABS = + +# EDC Flags +USER_EXT_EDC_KEYS = EDC0 + +USER_EXT_EDC0_EDCS = res/edje/images/gallery-efl-images.edc res/edje/gallery-efl.edc +USER_EXT_EDC0_EDCS_IMAGE_DIRS = res/edje/images +USER_EXT_EDC0_EDCS_IMAGE_DIRS_ABS = +USER_EXT_EDC0_EDCS_SOUND_DIRS = res/edje/sounds +USER_EXT_EDC0_EDCS_SOUND_DIRS_ABS = +USER_EXT_EDC0_EDCS_FONT_DIRS = edje/fonts +USER_EXT_EDC0_EDCS_FONT_DIRS_ABS = + +# Resource Filter +USER_RES_INCLUDE = +USER_RES_EXCLUDE = + diff --git a/res/black_theme/edc/images/T01_album_edit_check_on.png b/res/black_theme/edc/images/T01_album_edit_check_on.png deleted file mode 100644 index c2a6b3c9e8be733e44e7ddde998f4c3cdf2713db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3190 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 diff --git a/res/black_theme/edc/gallery-efl-check.edc b/res/edje/gallery-efl-check.edc similarity index 100% rename from res/black_theme/edc/gallery-efl-check.edc rename to res/edje/gallery-efl-check.edc diff --git a/res/black_theme/edc/gallery-efl-edc-res.h b/res/edje/gallery-efl-edc-res.h similarity index 100% rename from res/black_theme/edc/gallery-efl-edc-res.h rename to res/edje/gallery-efl-edc-res.h diff --git a/res/black_theme/edc/gallery-efl-expanded-title.edc b/res/edje/gallery-efl-expanded-title.edc similarity index 100% rename from res/black_theme/edc/gallery-efl-expanded-title.edc rename to res/edje/gallery-efl-expanded-title.edc diff --git a/res/black_theme/edc/gallery-efl-gengrid-item-albums.edc b/res/edje/gallery-efl-gengrid-item-albums.edc similarity index 100% rename from res/black_theme/edc/gallery-efl-gengrid-item-albums.edc rename to res/edje/gallery-efl-gengrid-item-albums.edc diff --git a/res/black_theme/edc/gallery-efl-gengrid-item-thumbview.edc b/res/edje/gallery-efl-gengrid-item-thumbview.edc similarity index 100% rename from res/black_theme/edc/gallery-efl-gengrid-item-thumbview.edc rename to res/edje/gallery-efl-gengrid-item-thumbview.edc diff --git a/res/black_theme/edc/gallery-efl-gengrid.edc b/res/edje/gallery-efl-gengrid.edc similarity index 100% rename from res/black_theme/edc/gallery-efl-gengrid.edc rename to res/edje/gallery-efl-gengrid.edc diff --git a/res/black_theme/edc/gallery-efl-nocontents.edc b/res/edje/gallery-efl-nocontents.edc similarity index 100% rename from res/black_theme/edc/gallery-efl-nocontents.edc rename to res/edje/gallery-efl-nocontents.edc diff --git a/res/black_theme/edc/gallery-efl.edc b/res/edje/gallery-efl.edc similarity index 100% rename from res/black_theme/edc/gallery-efl.edc rename to res/edje/gallery-efl.edc diff --git a/res/black_theme/edc/images/00_badge_bg.png b/res/edje/images/00_badge_bg.png similarity index 100% rename from res/black_theme/edc/images/00_badge_bg.png rename to res/edje/images/00_badge_bg.png diff --git a/res/black_theme/edc/images/00_button_icon_arrow.png b/res/edje/images/00_button_icon_arrow.png similarity index 100% rename from res/black_theme/edc/images/00_button_icon_arrow.png rename to res/edje/images/00_button_icon_arrow.png diff --git a/res/black_theme/edc/images/00_button_icon_arrow_press.png b/res/edje/images/00_button_icon_arrow_press.png similarity index 100% rename from res/black_theme/edc/images/00_button_icon_arrow_press.png rename to res/edje/images/00_button_icon_arrow_press.png diff --git a/res/black_theme/edc/images/00_check_bg_dim.png b/res/edje/images/00_check_bg_dim.png similarity index 100% rename from res/black_theme/edc/images/00_check_bg_dim.png rename to res/edje/images/00_check_bg_dim.png diff --git a/res/black_theme/edc/images/00_popup_dropdown_title_bg.png b/res/edje/images/00_popup_dropdown_title_bg.png similarity index 100% rename from res/black_theme/edc/images/00_popup_dropdown_title_bg.png rename to res/edje/images/00_popup_dropdown_title_bg.png diff --git a/res/black_theme/edc/images/00_popup_dropdown_title_bg_focus.png b/res/edje/images/00_popup_dropdown_title_bg_focus.png similarity index 100% rename from res/black_theme/edc/images/00_popup_dropdown_title_bg_focus.png rename to res/edje/images/00_popup_dropdown_title_bg_focus.png diff --git a/res/black_theme/edc/images/00_popup_dropdown_title_bg_press.png b/res/edje/images/00_popup_dropdown_title_bg_press.png similarity index 100% rename from res/black_theme/edc/images/00_popup_dropdown_title_bg_press.png rename to res/edje/images/00_popup_dropdown_title_bg_press.png diff --git a/res/black_theme/edc/images/00_scroll_bar.png b/res/edje/images/00_scroll_bar.png similarity index 100% rename from res/black_theme/edc/images/00_scroll_bar.png rename to res/edje/images/00_scroll_bar.png diff --git a/res/black_theme/edc/images/00_thumbs_bg_focus.png b/res/edje/images/00_thumbs_bg_focus.png similarity index 100% rename from res/black_theme/edc/images/00_thumbs_bg_focus.png rename to res/edje/images/00_thumbs_bg_focus.png diff --git a/res/black_theme/edc/images/00_title_bg.png b/res/edje/images/00_title_bg.png similarity index 100% rename from res/black_theme/edc/images/00_title_bg.png rename to res/edje/images/00_title_bg.png diff --git a/res/black_theme/images/Contents_broken_351X261.png b/res/edje/images/Contents_broken_351X261.png similarity index 100% rename from res/black_theme/images/Contents_broken_351X261.png rename to res/edje/images/Contents_broken_351X261.png diff --git a/res/black_theme/images/No_thumbnail_351X261.png b/res/edje/images/No_thumbnail_351X261.png similarity index 100% rename from res/black_theme/images/No_thumbnail_351X261.png rename to res/edje/images/No_thumbnail_351X261.png diff --git a/res/black_theme/edc/images/T01_Nocontents_picture.png b/res/edje/images/T01_Nocontents_picture.png similarity index 100% rename from res/black_theme/edc/images/T01_Nocontents_picture.png rename to res/edje/images/T01_Nocontents_picture.png diff --git a/res/black_theme/edc/images/T01_album_edit_check_bg.png b/res/edje/images/T01_album_edit_check_bg.png similarity index 100% rename from res/black_theme/edc/images/T01_album_edit_check_bg.png rename to res/edje/images/T01_album_edit_check_bg.png diff --git a/res/black_theme/images_edc/T01_album_edit_check_off.png b/res/edje/images/T01_album_edit_check_off.png similarity index 100% rename from res/black_theme/images_edc/T01_album_edit_check_off.png rename to res/edje/images/T01_album_edit_check_off.png diff --git a/res/black_theme/images_edc/T01_album_edit_check_on.png b/res/edje/images/T01_album_edit_check_on.png similarity index 100% rename from res/black_theme/images_edc/T01_album_edit_check_on.png rename to res/edje/images/T01_album_edit_check_on.png diff --git a/res/black_theme/edc/images/T01_album_folder_bg.png b/res/edje/images/T01_album_folder_bg.png similarity index 100% rename from res/black_theme/edc/images/T01_album_folder_bg.png rename to res/edje/images/T01_album_folder_bg.png diff --git a/res/black_theme/images_edc/T01_album_icon_camera.png b/res/edje/images/T01_album_icon_camera.png similarity index 100% rename from res/black_theme/images_edc/T01_album_icon_camera.png rename to res/edje/images/T01_album_icon_camera.png diff --git a/res/black_theme/images_edc/T01_album_icon_download.png b/res/edje/images/T01_album_icon_download.png similarity index 100% rename from res/black_theme/images_edc/T01_album_icon_download.png rename to res/edje/images/T01_album_icon_download.png diff --git a/res/black_theme/images_edc/T01_album_icon_folder.png b/res/edje/images/T01_album_icon_folder.png similarity index 100% rename from res/black_theme/images_edc/T01_album_icon_folder.png rename to res/edje/images/T01_album_icon_folder.png diff --git a/res/black_theme/images_edc/T01_album_icon_sd_card.png b/res/edje/images/T01_album_icon_sd_card.png similarity index 100% rename from res/black_theme/images_edc/T01_album_icon_sd_card.png rename to res/edje/images/T01_album_icon_sd_card.png diff --git a/res/black_theme/edc/images/T01_btn_play.png b/res/edje/images/T01_btn_play.png similarity index 100% rename from res/black_theme/edc/images/T01_btn_play.png rename to res/edje/images/T01_btn_play.png diff --git a/res/black_theme/images_edc/T01_icon_lock.png b/res/edje/images/T01_icon_lock.png similarity index 100% rename from res/black_theme/images_edc/T01_icon_lock.png rename to res/edje/images/T01_icon_lock.png diff --git a/res/black_theme/images_edc/T01_icon_panorama.png b/res/edje/images/T01_icon_panorama.png similarity index 100% rename from res/black_theme/images_edc/T01_icon_panorama.png rename to res/edje/images/T01_icon_panorama.png diff --git a/res/black_theme/images_edc/T01_icon_sound_shot.png b/res/edje/images/T01_icon_sound_shot.png similarity index 100% rename from res/black_theme/images_edc/T01_icon_sound_shot.png rename to res/edje/images/T01_icon_sound_shot.png diff --git a/res/black_theme/images_edc/T01_icon_thumbnail_bookmark.png b/res/edje/images/T01_icon_thumbnail_bookmark.png similarity index 100% rename from res/black_theme/images_edc/T01_icon_thumbnail_bookmark.png rename to res/edje/images/T01_icon_thumbnail_bookmark.png diff --git a/res/black_theme/edc/images/T01_overscrolling_bottom.png b/res/edje/images/T01_overscrolling_bottom.png similarity index 100% rename from res/black_theme/edc/images/T01_overscrolling_bottom.png rename to res/edje/images/T01_overscrolling_bottom.png diff --git a/res/black_theme/edc/images/T01_overscrolling_left.png b/res/edje/images/T01_overscrolling_left.png similarity index 100% rename from res/black_theme/edc/images/T01_overscrolling_left.png rename to res/edje/images/T01_overscrolling_left.png diff --git a/res/black_theme/edc/images/T01_overscrolling_right.png b/res/edje/images/T01_overscrolling_right.png similarity index 100% rename from res/black_theme/edc/images/T01_overscrolling_right.png rename to res/edje/images/T01_overscrolling_right.png diff --git a/res/black_theme/edc/images/T01_overscrolling_top.png b/res/edje/images/T01_overscrolling_top.png similarity index 100% rename from res/black_theme/edc/images/T01_overscrolling_top.png rename to res/edje/images/T01_overscrolling_top.png diff --git a/res/black_theme/images_edc/T01_title_icon_select_all.png b/res/edje/images/T01_title_icon_select_all.png similarity index 100% rename from res/black_theme/images_edc/T01_title_icon_select_all.png rename to res/edje/images/T01_title_icon_select_all.png diff --git a/res/black_theme/edc/images/T01_video_play.png b/res/edje/images/T01_video_play.png similarity index 100% rename from res/black_theme/edc/images/T01_video_play.png rename to res/edje/images/T01_video_play.png diff --git a/res/black_theme/images_edc/gallery-efl-images.edc b/res/edje/images/gallery-efl-images.edc similarity index 100% rename from res/black_theme/images_edc/gallery-efl-images.edc rename to res/edje/images/gallery-efl-images.edc diff --git a/res/black_theme/edc/images/gallery_icon_container.png b/res/edje/images/gallery_icon_container.png similarity index 100% rename from res/black_theme/edc/images/gallery_icon_container.png rename to res/edje/images/gallery_icon_container.png diff --git a/res/black_theme/edc/images/gallery_icon_full.png b/res/edje/images/gallery_icon_full.png similarity index 100% rename from res/black_theme/edc/images/gallery_icon_full.png rename to res/edje/images/gallery_icon_full.png diff --git a/res/black_theme/edc/sounds/S_Touch_30ms.wav b/res/edje/sounds/S_Touch_30ms.wav similarity index 100% rename from res/black_theme/edc/sounds/S_Touch_30ms.wav rename to res/edje/sounds/S_Touch_30ms.wav diff --git a/res/po/CMakeLists.txt b/res/po/CMakeLists.txt index 2da1b23..1bc2c02 100644 --- a/res/po/CMakeLists.txt +++ b/res/po/CMakeLists.txt @@ -8,7 +8,7 @@ SET(POFILES ar.po az.po bg.po bn.po ca.po cs.po da.po de.po el_GR.po en_PH.po en.po en_US.po es_ES.po es_US.po et.po eu.po fi.po fr_CA.po fr.po ga.po gl.po gu.po hi.po hr.po hu.po hy.po is.po it_IT.po ja_JP.po ka.po kk.po kn.po ko_KR.po lt.po lv.po mk.po ml.po mn_MN.po mr.po nb.po nl.po or.po pa.po pl.po pt_BR.po pt_PT.po ro.po ru_RU.po si.po sk.po sl.po sr.po sv.po ta.po te.po tr_TR.po uk.po uz.po zh_CN.po zh_HK.po zh_TW.po) SET(MSGFMT "/usr/bin/msgfmt") -SET(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/res/locale") +#SET(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/res/locale") FOREACH(pofile ${POFILES}) SET(pofile ${CMAKE_CURRENT_SOURCE_DIR}/${pofile}) diff --git a/shared/res/ug-gallery-efl.png b/shared/res/ug-gallery-efl.png new file mode 100644 index 0000000000000000000000000000000000000000..8be71c8f7835ffe9ba8ec8536c8d5a004ceb9d92 GIT binary patch literal 7476 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 KrOG8t0{#yrotate_mode); - if (evt == ugd->rotate_mode) { +#endif + int changed_ang = elm_win_rotation_get(obj); + ge_dbg("New angle: %d, old angle: %d", changed_ang, ugd->rotate_mode); + if (changed_ang == ugd->rotate_mode) { return; } else { - ugd->rotate_mode = evt; + ugd->rotate_mode = changed_ang; } /* Update rotate mode and view */ @@ -128,12 +128,12 @@ static int _ge_init_view(ge_ugdata *ugd) GE_CHECK_VAL(ugd, -1); /* Base Layout */ - ugd->ly_main = ge_ui_create_main_ly(ugd->ly_parent); + ugd->ly_main = ge_ui_create_main_ly(ugd->win); GE_CHECK_VAL(ugd->ly_main, -1); /* Background */ - ugd->bg = _ge_create_bg(ugd->ly_main); - GE_CHECK_VAL(ugd->bg, -1); +// ugd->bg = _ge_create_bg(ugd->ly_main); +// GE_CHECK_VAL(ugd->bg, -1); /* Navigation Bar */ ugd->naviframe = ge_ui_create_naviframe(ugd, ugd->ly_main); @@ -191,11 +191,14 @@ static int _ge_close_view(ge_ugdata *ugd) /************* Destroy UI objects **************/ /* Destroy UG called by me */ + +#ifdef _UG_UI_CONVERSION if (ugd->ug_called_by_me) { ge_dbg("Destroy ug_called_by_me"); ug_destroy(ugd->ug_called_by_me); ugd->ug_called_by_me = NULL; } +#endif GE_IF_DEL_OBJ(ugd->popup) GE_IF_DEL_OBJ(ugd->ly_main) if (ugd->th) { @@ -499,28 +502,40 @@ static int __ge_get_rotate_value(ge_ugdata *ugd) * * @return */ -static void * _ge_create(ui_gadget_h ug, enum ug_mode mode, app_control_h service, void *priv) +void _ge_create(void *priv) { ge_dbg("Enter..."); ge_ugdata *ugd = NULL; - GE_CHECK_NULL(priv); - GE_CHECK_NULL(service); - GE_CHECK_NULL(ug); + GE_CHECK(priv); ge_dbgW("Gallery UG start..."); ugd = (ge_ugdata *)priv; - ugd->ug = ug; + // ugd->ug = ug; ugd->attach_panel_display_mode = ATTACH_PANEL_NONE; /* Get window */ - ugd->win = (Evas_Object *)ug_get_window(); - GE_CHECK_NULL(ugd->win); + + ugd->win = elm_win_util_standard_add("ug-gallery-efl", "ug-gallery-efl"); + + GE_CHECK(ugd->win); + elm_win_conformant_set(ugd->win, EINA_TRUE); + elm_win_autodel_set(ugd->win, EINA_TRUE); + /* Get conformant */ - ugd->conform = ug_get_conformant(); - GE_CHECK_NULL(ugd->conform); + Evas_Object *parent = elm_conformant_add(ugd->win); + if (!parent) { + return ; + } + evas_object_size_hint_weight_set(parent, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_show(parent); + evas_object_show(ugd->win); + ugd->conform = parent; + /* Get caller layout */ - ugd->ly_parent = (Evas_Object *)ug_get_parent_layout(ug); - GE_CHECK_NULL(ugd->ly_parent); +// ugd->ly_parent = elm_layout_add(ugd->win); +// GE_CHECK(ugd->ly_parent); /* Bind text domain for internalization */ + char * path = app_get_resource_path(); + ge_dbgW("Gallery UG start...and resource path is : %s", path); bindtextdomain("ug-gallery-efl" , "/usr/ug/res/locale"); /* Reset inited flag, it would be set as TRUE if albums view created */ _ge_ui_get_indicator_state(ugd); @@ -529,22 +544,17 @@ static void * _ge_create(ui_gadget_h ug, enum ug_mode mode, app_control_h servic #endif /* Add window rotation callback to rotate view as fast as possible */ evas_object_smart_callback_add(ugd->win, "wm,rotation,changed", - __ge_win_rot_changed_cb, (void *)ugd); + __ge_win_rot_changed_cb, (void *)ugd); __ge_get_rotate_value(ugd); - app_control_clone(&(ugd->service), service); - /* Connect DB first */ + /* Connect DB first */ if (_ge_data_init(ugd) != 0) { ge_dbgE("_ge_data_init failed!"); } /*Register db udpate callback*/ _ge_db_update_reg_cb(ugd); /* Parse parameters passed from parent */ - if (_ge_parse_param(ugd, service) != 0) { - ge_dbgE("Failed to parse parameters!"); - ug_send_result_full(ugd->ug, ugd->service, APP_CONTROL_RESULT_FAILED); - return NULL; - } + ugd->is_attach_panel = false; if (ugd->overlap_mode) { @@ -554,19 +564,9 @@ static void * _ge_create(ui_gadget_h ug, enum ug_mode mode, app_control_h servic } else { ge_dbg("Normal mode"); } - if ((ugd->file_select_mode != GE_FILE_SELECT_T_NONE) || - (ugd->album_select_mode != GE_ALBUM_SELECT_T_NONE)) { - /* create gallery UG */ - if (_ge_create_view(ugd) != 0) { - ge_dbgE("Failed to create Gallery UG view!"); - return NULL; - } - } else { - ge_dbgE("Wrong file_select_mode[%d] or album_select_mode[%d]", - ugd->file_select_mode, ugd->album_select_mode); - } - return ugd->ly_main; + + } /** @@ -576,9 +576,11 @@ static void * _ge_create(ui_gadget_h ug, enum ug_mode mode, app_control_h servic * @param data * @param priv */ -static void _ge_start(ui_gadget_h ug, app_control_h service, void *priv) +#ifdef _UG_UI_CONVERSION +static void _ge_start(void *priv) { } +#endif /** * @brief @@ -587,7 +589,7 @@ static void _ge_start(ui_gadget_h ug, app_control_h service, void *priv) * @param data * @param priv */ -static void _ge_pause(ui_gadget_h ug, app_control_h service, void *priv) +void _ge_pause(void *priv) { ge_dbg(""); } @@ -599,15 +601,14 @@ static void _ge_pause(ui_gadget_h ug, app_control_h service, void *priv) * @param data * @param priv */ -static void _ge_resume(ui_gadget_h ug, app_control_h service, void *priv) +void _ge_resume(void *priv) { ge_dbg(""); GE_CHECK(priv); ge_ugdata *ugd = (ge_ugdata *)priv; /*update*/ - if (ugd->ug_called_by_me == NULL && - ugd->file_select_mode != GE_FILE_SELECT_T_SLIDESHOW) { - ge_update_view(ugd); + if (ugd->file_select_mode != GE_FILE_SELECT_T_SLIDESHOW) { +// ge_update_view(ugd); } } @@ -618,10 +619,9 @@ static void _ge_resume(ui_gadget_h ug, app_control_h service, void *priv) * @param data * @param priv */ -static void _ge_destroy(ui_gadget_h ug, app_control_h service, void *priv) +void _ge_destroy(void *priv) { ge_dbgW(""); - GE_CHECK(ug); GE_CHECK(priv); _ge_close_view((ge_ugdata *)priv); ge_dbgW("Destroy gallery UG done!"); @@ -635,6 +635,8 @@ static void _ge_destroy(ui_gadget_h ug, app_control_h service, void *priv) * @param data * @param priv */ + +#ifdef _UG_UI_CONVERSION static void _ge_message(ui_gadget_h ug, app_control_h msg, app_control_h service, void *priv) { ge_dbg(""); @@ -665,6 +667,7 @@ static void _ge_message(ui_gadget_h ug, app_control_h msg, app_control_h service } } } +#endif /** * @brief @@ -674,6 +677,8 @@ static void _ge_message(ui_gadget_h ug, app_control_h msg, app_control_h service * @param data * @param priv */ + +#ifdef _UG_UI_CONVERSION static void _ge_event(ui_gadget_h ug, enum ug_event event, app_control_h service, void *priv) { GE_CHECK(priv); @@ -725,6 +730,7 @@ UG_ROTATE_EVENT: ge_dbg("rotate_mode: %d", ugd->rotate_mode); } + static void _ge_key_event(ui_gadget_h ug, enum ug_key_event event, app_control_h service, void *priv) { ge_dbg(""); @@ -734,15 +740,50 @@ static void _ge_key_event(ui_gadget_h ug, enum ug_key_event event, app_control_h switch (event) { case UG_KEY_EVENT_END: ge_dbg("Receive key end event"); - if (!ugd->is_attach_panel) { - ug_destroy_me(ugd->ug); - } + app_control_destroy(ugd->service); break; default: break; } } +#endif + +void __ge_get_app_control_data( app_control_h app_control,void *data) +{ + ge_ugdata *ugd = NULL; + GE_CHECK(data); + ugd = (ge_ugdata *)data; + app_control_clone(&(ugd->service), app_control); + + if (_ge_parse_param(ugd, app_control) != 0) { + ge_dbgE("Failed to parse parameters!"); + bool reply_requested = false; + app_control_is_reply_requested(ugd->service, &reply_requested); + if (reply_requested) { + ge_sdbg("send reply to caller"); + app_control_h reply = NULL; + app_control_create(&reply); + app_control_reply_to_launch_request(reply, ugd->service, APP_CONTROL_RESULT_FAILED); + app_control_destroy(reply); + } + app_control_destroy(ugd->service); + return; + } + if ((ugd->file_select_mode != GE_FILE_SELECT_T_NONE) || + (ugd->album_select_mode != GE_ALBUM_SELECT_T_NONE)) { + /* create gallery UG */ + if (_ge_create_view(ugd) != 0) { + ge_dbgE("Failed to create Gallery UG view!"); + return; + } + } else { + ge_dbgE("Wrong file_select_mode[%d] or album_select_mode[%d]", + ugd->file_select_mode, ugd->album_select_mode); + } + elm_win_resize_object_add(ugd->win, ugd->ly_main); + +} /** * @brief @@ -751,27 +792,36 @@ static void _ge_key_event(ui_gadget_h ug, enum ug_key_event event, app_control_h * * @return */ -UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops) +int main(int argc, char *argv[]) { ge_dbgW("UG_MODULE_INIT"); - ge_ugdata *ugd = NULL; - GE_CHECK_VAL(ops, -1); - - ugd = calloc(1, sizeof(ge_ugdata)); - GE_CHECK_VAL(ugd, -1); + struct _ge_ugdata ugd; + + + ui_app_lifecycle_callback_s ops; + int ret = APP_ERROR_NONE; + app_event_handler_h hLanguageChangedHandle; + app_event_handler_h hRegionFormatChangedHandle; + memset(&ops, 0x0, sizeof(ui_app_lifecycle_callback_s)); + memset(&ugd, 0x0, sizeof(struct _ge_ugdata)); + ops.create = _ge_create; + ops.terminate = _ge_destroy; + ops.pause = _ge_pause; + ops.resume = _ge_resume; + ops.app_control =__ge_get_app_control_data; + ret = ui_app_add_event_handler(&hRegionFormatChangedHandle, APP_EVENT_REGION_FORMAT_CHANGED, _ge_lang_update, (void*)&ugd); + if (ret != APP_ERROR_NONE) { + ge_dbgE("APP_EVENT_REGION_FORMAT_CHANGED ui_app_add_event_handler failed : [%d]!!!", ret); + return -1; + } - ops->create = _ge_create; - ops->start = _ge_start; - ops->pause = _ge_pause; - ops->resume = _ge_resume; - ops->destroy = _ge_destroy; - ops->message = _ge_message; - ops->event = _ge_event; - ops->key_event = _ge_key_event; - ops->priv = ugd; - ops->opt = UG_OPT_INDICATOR_ENABLE; + ret = ui_app_add_event_handler(&hLanguageChangedHandle, APP_EVENT_LANGUAGE_CHANGED, _ge_lang_update, (void*)&ugd); + if (ret != APP_ERROR_NONE) { + ge_dbgE("APP_EVENT_LANGUAGE_CHANGED ui_app_add_event_handler failed : [%d]!!!", ret); + return -1; + } + return ui_app_main(argc, argv, &ops, &ugd); - return 0; } /** @@ -781,10 +831,12 @@ UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops) * * @return */ + +#ifdef _UG_UI_CONVERSION UG_MODULE_API void UG_MODULE_EXIT(struct ug_module_ops *ops) { GE_CHECK(ops); GE_FREEIF(ops->priv); ge_dbgW("UG_MODULE_EXIT"); } - +#endif diff --git a/src/util/ge-ext-ug-load.c b/src/util/ge-ext-ug-load.c index 10360fb..4d4aa1b 100644 --- a/src/util/ge-ext-ug-load.c +++ b/src/util/ge-ext-ug-load.c @@ -147,10 +147,10 @@ static void _ge_ext_destroy_me(ge_ugdata *ugd) { ge_dbg(""); GE_CHECK(ugd); + +#ifdef _UG_UI_CONVERSION GE_CHECK(ugd->ug_called_by_me); GE_CHECK(ugd->ug); - GE_CHECK(ugd->service); - bool send_result = false; if (ugd->ug_called_by_me) { ge_dbg("Destroy ug_called_by_me"); @@ -159,6 +159,16 @@ static void _ge_ext_destroy_me(ge_ugdata *ugd) } else { ge_dbg("ug_called_by_me does not exist!"); } +#endif + + GE_CHECK(ugd->service); + bool send_result = false; + app_control_h reply = NULL; + app_control_create(&reply); + if (!reply) { + ge_dbg("reply handle not created"); + return; + } if (ugd->file_select_mode == GE_FILE_SELECT_T_SLIDESHOW) { ugd->b_destroy_me = false; @@ -171,7 +181,7 @@ static void _ge_ext_destroy_me(ge_ugdata *ugd) if (ugd->file_select_mode == GE_FILE_SELECT_T_SETAS) { if (ugd->file_setas_image_path) { ge_dbg("GE_SETAS_IMAGE_PATH:%s", ugd->file_setas_image_path); - app_control_add_extra_data(ugd->service, + app_control_add_extra_data(reply, GE_SETAS_IMAGE_PATH, ugd->file_setas_image_path); @@ -184,7 +194,7 @@ static void _ge_ext_destroy_me(ge_ugdata *ugd) ugd->file_select_setas_mode == GE_SETAS_T_CROP_WALLPAPER)) { ge_dbg("GE_SETAS_CALLERID_CROP_IMAGE_PATH:%s", ugd->file_setas_crop_image_path); - app_control_add_extra_data(ugd->service, + app_control_add_extra_data(reply, APP_CONTROL_DATA_SELECTED, ugd->file_setas_crop_image_path); @@ -194,22 +204,36 @@ static void _ge_ext_destroy_me(ge_ugdata *ugd) if (send_result) { ge_dbg("Call ug_send_result_full() to send result."); + bool reply_requested = false; + +#ifdef _UG_UI_CONVERSION ug_send_result_full(ugd->ug, ugd->service, APP_CONTROL_RESULT_SUCCEEDED); +#endif + app_control_is_reply_requested(ugd->service, &reply_requested); + if (reply_requested) { + ge_sdbg("send reply to caller"); + app_control_reply_to_launch_request(reply, ugd->service, APP_CONTROL_RESULT_SUCCEEDED); + app_control_destroy(reply); + } } } if (ugd->b_destroy_me) { ge_dbg("Setting is appllied, destroy gallery UG."); ugd->b_destroy_me = false; + app_control_destroy(ugd->service); /* Destroy self */ +#ifdef _UG_UI_CONVERSION if (!ugd->is_attach_panel) { ug_destroy_me(ugd->ug); } +#endif } else { ge_dbg("Cancel button tapped, back to thumbnails view."); } } +#if _UG_UI_CONVERSION static void _ge_ext_iv_layout_cb(ui_gadget_h ug, enum ug_mode mode, void* priv) { ge_dbg(""); @@ -219,7 +243,8 @@ static void _ge_ext_iv_layout_cb(ui_gadget_h ug, enum ug_mode mode, void* priv) Evas_Object *base = (Evas_Object *)ug_get_layout(ug); if (!base) { ge_dbgE("ug_get_layout failed!"); - ug_destroy(ug); + app_control_destroy(); //to do passing parameter +// ug_destroy(ug); return; } @@ -326,6 +351,8 @@ static void __ge_ext_iv_end_cb(ui_gadget_h ug, void *priv) } } +#endif + static char **__ge_ext_get_select_index(ge_ugdata *ugd, int *size) { GE_CHECK_NULL(ugd); @@ -473,7 +500,11 @@ static int __ge_ext_set_setas_data(ge_ugdata *ugd, char *file_url, int y = 0; int w = 0; int h = 0; + +#ifdef _UG_UI_CONVERSION elm_win_screen_size_get((Evas_Object *)ug_get_window(), &x, &y, &w, &h); +#endif + elm_win_screen_size_get(ugd->win, &x, &y, &w, &h); char *reso_str = (char *)calloc(1, GE_IV_STR_LEN_MAX); if (reso_str == NULL) { ge_dbgE("Calloc failed!"); @@ -633,14 +664,90 @@ int _ge_ext_load_iv_ug_select_mode(void *data, ge_media_s *item, ge_ext_iv_type } } +static void +__ge_gallery_ug_result_cb(app_control_h request, app_control_h result, app_control_result_e reply, void *data) +{ + + ge_dbg(""); + GE_CHECK(data); + GE_CHECK(result); + ge_ugdata *ugd = (ge_ugdata *)data; + char *path = NULL; + char *status = NULL; + + if (ugd->file_select_mode == GE_FILE_SELECT_T_SETAS) { + /*If set wallpaper success, homescreen_path should not be null. + And if setting wallpaper was canceled in IV, gallery-efl doesn't exit immediately*/ + app_control_get_extra_data(result, GE_BUNDLE_HOMESCREEN_PATH, + &path); + if (NULL == path) + app_control_get_extra_data(result, GE_BUNDLE_LOCKSCREEN_PATH, + &path); + ge_dbg("SETAS_IMAGE_PATH"); + app_control_get_extra_data(result, "Result", &status); + ugd->file_select_setas_mode = 0; + if (strcmp(status, "Cancel")) { + ugd->file_select_setas_mode = 1; + } + + if (path) { + ge_dbg(":%s", path); + ugd->b_destroy_me = true; + ugd->file_setas_image_path = path; + } else { + ugd->b_destroy_me = false; + } + /*If has got homescreen_path, setats_mode should not be callerid and + crop wallpaper*/ + if (path == NULL && + (ugd->file_select_setas_mode == GE_SETAS_T_CALLERID || + ugd->file_select_setas_mode == GE_SETAS_T_CROP_WALLPAPER)) { + app_control_get_extra_data(result, APP_CONTROL_DATA_SELECTED, + &path); + ge_dbg("CALLERID_CROP_IMAGE_PATH"); + if (path) { + ge_dbg(":%s", path); + ugd->b_destroy_me = true; + ugd->file_setas_crop_image_path = path; + } else { + ugd->b_destroy_me = false; + } + } + } + + char *error_state = NULL; + app_control_get_extra_data(result, GE_IMAGEVIEWER_RETURN_ERROR, + &error_state); + if (error_state) { + ge_dbg("error string : %s", error_state); + + if (!g_strcmp0(error_state, "not_supported_file_type")) { + ugd->b_destroy_me = false; + if (ugd->ug_path == NULL) { + ge_dbgE("current item is NULL"); + GE_FREE(error_state); + return; + } + app_control_h service; + app_control_create(&service); + GE_CHECK(service); + app_control_set_operation(service, APP_CONTROL_OPERATION_VIEW); + app_control_set_uri(service, ugd->ug_path); + app_control_send_launch_request(service, NULL, NULL); + app_control_destroy(service); + } + GE_FREE(error_state); + } + _ge_ext_destroy_me((ge_ugdata *)data); +} + int _ge_ext_load_iv_ug(ge_ugdata *ugd, char *file_url, char *album_index, int image_index) { GE_CHECK_VAL(file_url, -1); GE_CHECK_VAL(ugd, -1); +#ifdef _UG_UI_CONVERSION struct ug_cbs cbs; ui_gadget_h ug = NULL; - app_control_h service = NULL; - if (ugd->ug_called_by_me) { ge_dbgW("Already exits some UG called by me!"); return -1; @@ -652,6 +759,8 @@ int _ge_ext_load_iv_ug(ge_ugdata *ugd, char *file_url, char *album_index, int im cbs.destroy_cb = _ge_ext_iv_destroy_cb; cbs.end_cb = __ge_ext_iv_end_cb; cbs.priv = ugd; +#endif + app_control_h service = NULL; app_control_create(&service); GE_CHECK_VAL(service, -1); @@ -680,10 +789,11 @@ int _ge_ext_load_iv_ug(ge_ugdata *ugd, char *file_url, char *album_index, int im app_control_add_extra_data(service, "Index", image_index_str); app_control_set_app_id(service, GE_IV_UG_NAME); + +#ifdef _UG_UI_CONVERSION ug = ug_create(ugd->ug, GE_IV_UG_NAME, UG_MODE_FULLVIEW, service, &cbs); ugd->ug_called_by_me = ug; - app_control_destroy(service); if (!ug) { ge_dbgE("Create UG failed!"); return -1; @@ -691,15 +801,26 @@ int _ge_ext_load_iv_ug(ge_ugdata *ugd, char *file_url, char *album_index, int im ge_dbg("Create UG successully"); return 0; } +#endif + int ret = app_control_send_launch_request(service, __ge_gallery_ug_result_cb, ugd); + app_control_destroy(service); + if (ret == 0) { + ge_dbg("Launched ug-image-viewer-efl successfully."); + return 0; + } else { + ge_dbgE("Launching ug-image-viewer-efl Failed."); + return -1; + } } int _ge_ext_load_iv_ug_for_help(ge_ugdata *ugd, const char *uri) { GE_CHECK_VAL(ugd, -1); + +#ifdef _UG_UI_CONVERSION struct ug_cbs cbs; ui_gadget_h ug = NULL; - app_control_h service = NULL; if (ugd->ug_called_by_me) { ge_dbgW("Already exits some UG called by me!"); @@ -712,7 +833,9 @@ int _ge_ext_load_iv_ug_for_help(ge_ugdata *ugd, const char *uri) cbs.destroy_cb = _ge_ext_iv_destroy_cb; cbs.end_cb = __ge_ext_iv_end_cb; cbs.priv = ugd; +#endif + app_control_h service = NULL; app_control_create(&service); GE_CHECK_VAL(service, -1); @@ -722,9 +845,21 @@ int _ge_ext_load_iv_ug_for_help(ge_ugdata *ugd, const char *uri) /* Set help uri to file path */ app_control_add_extra_data(service, GE_PATH, uri); + + app_control_set_app_id(service, GE_IV_UG_NAME); + int ret = app_control_send_launch_request(service, __ge_gallery_ug_result_cb, ugd); + app_control_destroy(service); + if (ret == 0) { + ge_dbg("Launched ug-image-viewer-efl successfully."); + return 0; + } else { + ge_dbgE("Launching ug-image-viewer-efl Failed."); + return -1; + } + +#ifdef _UG_UI_CONVERSION ug = ug_create(ugd->ug, GE_IV_UG_NAME, UG_MODE_FULLVIEW, service, &cbs); ugd->ug_called_by_me = ug; - app_control_destroy(service); if (ug != NULL) { ge_dbg("Create UG successully"); return 0; @@ -732,4 +867,5 @@ int _ge_ext_load_iv_ug_for_help(ge_ugdata *ugd, const char *uri) ge_dbgE("Create UG failed!"); return -1; } +#endif } diff --git a/src/util/ge-lang.c b/src/util/ge-lang.c index fd38bd9..14d3b04 100644 --- a/src/util/ge-lang.c +++ b/src/util/ge-lang.c @@ -22,15 +22,17 @@ #include "ge-gridview.h" #include "ge-main-view.h" -int _ge_lang_update(ge_ugdata *ugd) +void _ge_lang_update(ge_ugdata *ugd) { - GE_CHECK_VAL(ugd, -1); + GE_CHECK(ugd); int view_m = _ge_get_view_mode(ugd); ge_dbg("view: %d", view_m); if (view_m == GE_VIEW_THUMBS || view_m == GE_VIEW_THUMBS_EDIT) { _ge_grid_update_lang(ugd); } +#ifdef _UG_UI_CONVERSION return 0; +#endif } diff --git a/src/util/ge-ui-util.c b/src/util/ge-ui-util.c index dbb0400..3de43d2 100644 --- a/src/util/ge-ui-util.c +++ b/src/util/ge-ui-util.c @@ -49,10 +49,13 @@ static Eina_Bool __ge_popup_timeout_cb(void *data) /* Used for adding shortcut failed */ if (ugd->popup_mode == GE_POPUP_EXIT) { ge_dbgW("Terminate me!"); +#ifdef _UG_UI_CONVERSION if (!ugd->is_attach_panel) { ug_destroy_me(ugd->ug); ugd->ug = NULL; } +#endif + app_control_destroy(ugd->service); } GE_IF_DEL_OBJ(ugd->popup); diff --git a/src/util/ge-util.c b/src/util/ge-util.c index edc8236..3dfbd75 100644 --- a/src/util/ge-util.c +++ b/src/util/ge-util.c @@ -301,18 +301,31 @@ int _ge_send_result(ge_ugdata *ugd) send_success = false; goto GE_SEND_RESULT_FINISHED; } + bool reply_requested; + app_control_h reply = NULL; + app_control_create(&reply); + if (!reply) { + ge_dbgE("Unable to create reply handle"); + return -1; + } if (sel_cnt <= 0 || !path_array) { ge_dbgE("Invalid selection or paths"); - app_control_add_extra_data(ugd->service, + app_control_add_extra_data(reply, GE_FILE_SELECT_RETURN_COUNT, "0"); - app_control_add_extra_data(ugd->service, GE_FILE_SELECT_RETURN_PATH, + app_control_add_extra_data(reply, GE_FILE_SELECT_RETURN_PATH, NULL); - app_control_add_extra_data(ugd->service, APP_CONTROL_DATA_SELECTED, + app_control_add_extra_data(reply, APP_CONTROL_DATA_SELECTED, NULL); - app_control_add_extra_data(ugd->service, APP_CONTROL_DATA_PATH, + app_control_add_extra_data(reply, APP_CONTROL_DATA_PATH, NULL); - ug_send_result_full(ugd->ug, ugd->service, - APP_CONTROL_RESULT_FAILED); + app_control_is_reply_requested(ugd->service, &reply_requested); + if (reply_requested) { + ge_sdbg("send reply to caller"); +// app_control_create(&reply); + app_control_reply_to_launch_request(reply, ugd->service, APP_CONTROL_RESULT_FAILED); + app_control_destroy(reply); + } + app_control_destroy(ugd->service); } else { if (ugd->file_select_mode == GE_FILE_SELECT_T_IMFT) { _ge_ext_load_app(ugd, FILETRANSFER, paths, sel_cnt); @@ -320,17 +333,25 @@ int _ge_send_result(ge_ugdata *ugd) char t_str[32] = { 0, }; eina_convert_itoa(sel_cnt, t_str); - app_control_add_extra_data(ugd->service, + app_control_add_extra_data(reply, GE_FILE_SELECT_RETURN_COUNT, t_str); - app_control_add_extra_data(ugd->service, GE_FILE_SELECT_RETURN_PATH, + app_control_add_extra_data(reply, GE_FILE_SELECT_RETURN_PATH, paths); - app_control_add_extra_data_array(ugd->service, APP_CONTROL_DATA_SELECTED, + app_control_add_extra_data_array(reply, APP_CONTROL_DATA_SELECTED, (const char **)path_array, sel_cnt); - app_control_add_extra_data_array(ugd->service, APP_CONTROL_DATA_PATH, + app_control_add_extra_data_array(reply, APP_CONTROL_DATA_PATH, (const char **)path_array, sel_cnt); - ug_send_result_full(ugd->ug, ugd->service, APP_CONTROL_RESULT_SUCCEEDED); + app_control_is_reply_requested(ugd->service, &reply_requested); + if (reply_requested) { + ge_sdbg("send reply to caller"); + +// app_control_create(&reply); + app_control_reply_to_launch_request(reply, ugd->service, APP_CONTROL_RESULT_SUCCEEDED); + app_control_destroy(reply); + } } send_success = true; + goto GE_SEND_RESULT_FINISHED; } GE_SEND_RESULT_FINISHED: @@ -345,6 +366,7 @@ GE_SEND_RESULT_FINISHED: } GE_FREE(path_array); } + app_control_destroy(ugd->service); if (send_success == true) { return 0; } else { @@ -386,3 +408,12 @@ char *_ge_str(char *str_id) } } +char *_ge_get_edje_path(void) +{ + char *path = app_get_resource_path(); + if (!path) { + return NULL; + } + return path; +} + diff --git a/src/view/ge-albums.c b/src/view/ge-albums.c index 9755540..c450062 100644 --- a/src/view/ge-albums.c +++ b/src/view/ge-albums.c @@ -170,11 +170,22 @@ static int __ge_albums_open_album(ge_cluster *album) GE_ALBUM_SELECT_RETURN_PATH, album->cluster->path); ge_dbg("return folder-path: %s", album->cluster->path); +#ifdef _UG_UI_CONVERSION ug_send_result_full(ugd->ug, ugd->service, APP_CONTROL_RESULT_SUCCEEDED); if (!ugd->is_attach_panel) { ug_destroy_me(ugd->ug); ugd->ug = NULL; +#endif + bool reply_requested; + app_control_is_reply_requested(ugd->service, &reply_requested); + if (reply_requested) { + ge_sdbg("send reply to caller"); + app_control_h reply = NULL; + app_control_create(&reply); + app_control_reply_to_launch_request(reply, ugd->service, APP_CONTROL_RESULT_SUCCEEDED); + app_control_destroy(reply); } + app_control_destroy(ugd->service); return 0; } @@ -206,10 +217,13 @@ static Eina_Bool __ge_albums_sel_idler_cb(void *data) GE_CHECK_FALSE(album_item->cluster); GE_CHECK_FALSE(album_item->ugd); ge_ugdata *ugd = album_item->ugd; + +#ifdef _UG_UI_CONVERSION if (ugd->ug == NULL) { ge_dbg("UG already destroyed, return!"); goto GE_ALBUMS_DONE; } +#endif if (album_item->cover) { _ge_data_util_free_item(album_item->cover); @@ -218,7 +232,7 @@ static Eina_Bool __ge_albums_sel_idler_cb(void *data) __ge_albums_open_album(album_item); -GE_ALBUMS_DONE: +//GE_ALBUMS_DONE: ecore_idler_del(ugd->sel_album_idler); ugd->sel_album_idler = NULL; @@ -234,17 +248,20 @@ static Eina_Bool __ge_split_albums_sel_idler_cb(void *data) GE_CHECK_FALSE(album_item->cluster); GE_CHECK_FALSE(album_item->ugd); ge_ugdata *ugd = album_item->ugd; + +#ifdef _UG_UI_CONVERSION if (ugd->ug == NULL) { ge_dbg("UG already destroyed, return!"); goto GE_ALBUMS_DONE; } +#endif if (album_item->cover) { _ge_data_util_free_item(album_item->cover); album_item->cover = NULL; } __ge_split_albums_open_album(album_item); -GE_ALBUMS_DONE: +//GE_ALBUMS_DONE: ecore_idler_del(ugd->sel_album_idler); ugd->sel_album_idler = NULL; ge_dbg("Select album +++"); @@ -258,10 +275,14 @@ static void __ge_albums_sel_cb(void *data, Evas_Object *obj, void *ei) GE_CHECK(album_item->cluster); GE_CHECK(album_item->ugd); ge_ugdata *ugd = album_item->ugd; + +#ifdef _UG_UI_CONVERSION if (ugd->ug == NULL) { ge_dbg("UG already destroyed, return!"); return; } +#endif + ugd->album_item = album_item; ge_dbg(""); if (ugd->sel_album_idler) { @@ -285,10 +306,12 @@ static void __ge_split_albums_sel_cb(void *data, Evas_Object *obj, void *ei) GE_CHECK(album_item->cluster); GE_CHECK(album_item->ugd); ge_ugdata *ugd = album_item->ugd; +#ifdef _UG_UI_CONVERSION if (ugd->ug == NULL) { ge_dbg("UG already destroyed, return!"); return; } +#endif ugd->album_item = album_item; ge_dbg(""); if (ugd->sel_album_idler) { @@ -965,7 +988,7 @@ static void _ge_grid_move_stop_cb(void *data, Evas_Object *obj, void *ei) } else { app_control_add_extra_data(app_control, ATTACH_PANEL_FLICK_MODE_KEY, ATTACH_PANEL_FLICK_MODE_DISABLE); } - ret = ug_send_result_full(ugd->ug, app_control, APP_CONTROL_RESULT_SUCCEEDED); + app_control_reply_to_launch_request(app_control, ugd->service, APP_CONTROL_RESULT_SUCCEEDED); } app_control_destroy(app_control); } @@ -1081,12 +1104,19 @@ static Eina_Bool __ge_main_back_cb(void *data, Elm_Object_Item *it) app_control_add_extra_data(ugd->service, GE_FILE_SELECT_RETURN_COUNT, "0"); app_control_add_extra_data(ugd->service, GE_FILE_SELECT_RETURN_PATH, NULL); app_control_add_extra_data(ugd->service, APP_CONTROL_DATA_SELECTED, NULL); - ug_send_result_full(ugd->ug, ugd->service, APP_CONTROL_RESULT_FAILED); + + bool reply_requested; + app_control_is_reply_requested(ugd->service, &reply_requested); + if (reply_requested) { + ge_sdbg("send reply to caller"); + app_control_h reply = NULL; + app_control_create(&reply); + app_control_reply_to_launch_request(reply, ugd->service, APP_CONTROL_RESULT_FAILED); + app_control_destroy(reply); + } + ge_dbg("Destroying handle"); + app_control_destroy(ugd->service); //elm_naviframe_item_pop(it); - if (!ugd->is_attach_panel) { - ug_destroy_me(ugd->ug); - ge_dbg("ug_destroy_me"); - } /*If return ture, ug will pop naviframe first.*/ return EINA_FALSE; } diff --git a/src/view/ge-gridview.c b/src/view/ge-gridview.c index 27519f4..195380f 100644 --- a/src/view/ge-gridview.c +++ b/src/view/ge-gridview.c @@ -334,6 +334,7 @@ int _ge_grid_sel_one(ge_ugdata *ugd, char *file_url) if (ret != APP_CONTROL_ERROR_NONE) { ge_dbgW("Add selected path failed!"); } +#ifdef _UG_UI_CONVERSION ret = ug_send_result_full(ugd->ug, ugd->service, APP_CONTROL_RESULT_SUCCEEDED); if (ret != 0) { @@ -342,6 +343,17 @@ int _ge_grid_sel_one(ge_ugdata *ugd, char *file_url) if (!ugd->is_attach_panel) { ug_destroy_me(ugd->ug); } +#endif + bool reply_requested; + app_control_is_reply_requested(ugd->service, &reply_requested); + if (reply_requested) { + ge_sdbg("send reply to caller"); + app_control_h reply = NULL; + app_control_create(&reply); + app_control_reply_to_launch_request(reply, ugd->service, APP_CONTROL_RESULT_FAILED); + app_control_destroy(reply); + } + app_control_destroy(ugd->service); GE_FREEIF(path_array[0]); GE_FREEIF(path_array); @@ -967,22 +979,27 @@ static Eina_Bool __ge_grid_back_cb(void *data, Elm_Object_Item *it) ge_ugdata *ugd = (ge_ugdata *)data; if (ugd->file_select_mode == GE_FILE_SELECT_T_SLIDESHOW) { - ug_send_result_full(ugd->ug, ugd->service, - APP_CONTROL_RESULT_FAILED); - //ug_destroy_me(ugd->ug); + bool reply_requested; + app_control_is_reply_requested(ugd->service, &reply_requested); + if (reply_requested) { + ge_sdbg("send reply to caller"); + app_control_h reply = NULL; + app_control_create(&reply); + app_control_reply_to_launch_request(reply, ugd->service, APP_CONTROL_RESULT_FAILED); + app_control_destroy(reply); + } ge_dbg("ug_destroy_me"); + app_control_destroy(ugd->service); /*If return ture, ug will pop naviframe first.*/ return EINA_FALSE; } else { - //ug_destroy_me(ugd->ug); ge_dbgW("ug_destroy_me ug destroyed in the else part"); } /* Reset view mode */ ge_dbgW("To update albums view!"); _ge_albums_update_view(data); - //ug_destroy_me(ugd->ug); return EINA_TRUE; } @@ -1009,7 +1026,6 @@ static void __ge_grid_done_cb(void *data, Evas_Object *obj, void *ei) } _ge_send_result(ugd); - ug_destroy_me(ugd->ug); } static void __ge_grid_cancel_cb(void *data, Evas_Object *obj, void *ei) @@ -1179,17 +1195,13 @@ static void __ge_grid_done_cb(void *data, Evas_Object *obj, void *ei) ge_dbgE("if part fun will be called "); // __ge_main_done_cb(ugd, NULL, NULL); _ge_send_result(ugd); - if (!ugd->is_attach_panel) { - ug_destroy_me(ugd->ug); - } + app_control_destroy(ugd->service); //__ge_grid_append_sel_item(ugd, gitem); } else { ge_dbgE("else part fun will be called "); // __ge_main_done_cb(ugd, NULL, NULL); _ge_send_result(ugd); - if (!ugd->is_attach_panel) { - ug_destroy_me(ugd->ug); - } + app_control_destroy(ugd->service); //__ge_grid_remove_sel_item(ugd, gitem); } } else { @@ -1290,12 +1302,18 @@ static Eina_Bool __ge_main_back_cb(void *data, Elm_Object_Item *it) app_control_add_extra_data(ugd->service, GE_FILE_SELECT_RETURN_COUNT, "0"); app_control_add_extra_data(ugd->service, GE_FILE_SELECT_RETURN_PATH, NULL); app_control_add_extra_data(ugd->service, APP_CONTROL_DATA_SELECTED, NULL); - ug_send_result_full(ugd->ug, ugd->service, APP_CONTROL_RESULT_FAILED); + bool reply_requested; + app_control_is_reply_requested(ugd->service, &reply_requested); + if (reply_requested) { + ge_sdbg("send reply to caller"); + app_control_h reply = NULL; + app_control_create(&reply); + app_control_reply_to_launch_request(reply, ugd->service, APP_CONTROL_RESULT_FAILED); + app_control_destroy(reply); + } + ge_dbg("ug_destroy_me"); + app_control_destroy(ugd->service); //elm_naviframe_item_pop(it); - if (!ugd->is_attach_panel) { - ug_destroy_me(ugd->ug); - ge_dbg("ug_destroy_me"); - } /*If return ture, ug will pop naviframe first.*/ return EINA_FALSE; } @@ -1323,7 +1341,7 @@ void _my_custom_keydown_cb(void* data, int type, void* event) ret = app_control_create(&app_control); if (ret == APP_CONTROL_ERROR_NONE) { app_control_add_extra_data(app_control, ATTACH_PANEL_FLICK_MODE_KEY, ATTACH_PANEL_FLICK_MODE_ENABLE); - ret = ug_send_result_full(app_data->ug, app_control, APP_CONTROL_RESULT_SUCCEEDED); + app_control_reply_to_launch_request(app_control, app_data->service, APP_CONTROL_RESULT_SUCCEEDED); } app_control_destroy(app_control); } @@ -1415,7 +1433,7 @@ static void __ge_albums_detail_cancel_cb(void *data, Evas_Object *obj, void *ei) ret = app_control_create(&app_control); if (ret == APP_CONTROL_ERROR_NONE) { app_control_add_extra_data(app_control, ATTACH_PANEL_FLICK_MODE_KEY, ATTACH_PANEL_FLICK_MODE_ENABLE); - ret = ug_send_result_full(app_data->ug, app_control, APP_CONTROL_RESULT_SUCCEEDED); + app_control_reply_to_launch_request(app_control, app_data->service, APP_CONTROL_RESULT_SUCCEEDED); } app_control_destroy(app_control); } @@ -1525,7 +1543,7 @@ static void _ge_detail_view_grid_move_stop_cb(void *data, Evas_Object *obj, void } else { app_control_add_extra_data(app_control, ATTACH_PANEL_FLICK_MODE_KEY, ATTACH_PANEL_FLICK_MODE_DISABLE); } - ret = ug_send_result_full(ugd->ug, app_control, APP_CONTROL_RESULT_SUCCEEDED); + app_control_reply_to_launch_request(app_control, ugd->service, APP_CONTROL_RESULT_SUCCEEDED); } app_control_destroy(app_control); } diff --git a/src/view/ge-main-view.c b/src/view/ge-main-view.c index a904c07..6b76f80 100644 --- a/src/view/ge-main-view.c +++ b/src/view/ge-main-view.c @@ -30,7 +30,7 @@ static void __ge_main_done_cb(void *data, Evas_Object *obj, void *ei) ge_ugdata *ugd = (ge_ugdata *)data; elm_object_item_disabled_set((Elm_Object_Item *)ei, EINA_TRUE); _ge_send_result(ugd); - ug_destroy_me(ugd->ug); + app_control_destroy(ugd->service); } static void __ge_main_cancel_cb(void *data, Evas_Object *obj, void *ei) @@ -82,9 +82,18 @@ static Eina_Bool __ge_main_back_cb(void *data, Elm_Object_Item *it) app_control_add_extra_data(ugd->service, GE_FILE_SELECT_RETURN_COUNT, "0"); app_control_add_extra_data(ugd->service, GE_FILE_SELECT_RETURN_PATH, NULL); app_control_add_extra_data(ugd->service, APP_CONTROL_DATA_SELECTED, NULL); - ug_send_result_full(ugd->ug, ugd->service, APP_CONTROL_RESULT_FAILED); + + bool reply_requested; + app_control_is_reply_requested(ugd->service, &reply_requested); + if (reply_requested) { + ge_sdbg("send reply to caller"); + app_control_h reply = NULL; + app_control_create(&reply); + app_control_reply_to_launch_request(reply, ugd->service, APP_CONTROL_RESULT_FAILED); + app_control_destroy(reply); + } + app_control_destroy(ugd->service); //elm_naviframe_item_pop(it); - ug_destroy_me(ugd->ug); ge_dbg("ug_destroy_me"); /*If return ture, ug will pop naviframe first.*/ return EINA_FALSE; diff --git a/tizen-manifest.xml b/tizen-manifest.xml new file mode 100644 index 0000000..9991f69 --- /dev/null +++ b/tizen-manifest.xml @@ -0,0 +1,17 @@ + + + + + + ug-gallery-efl.png + + + http://tizen.org/privilege/packagemanager.info + http://tizen.org/privilege/datasharing + http://tizen.org/privilege/mediastorage + http://tizen.org/privilege/appmanager.launch + http://tizen.org/privilege/content.write + http://tizen.org/privilege/externalstorage + + + diff --git a/ug-gallery-efl.manifest-3.0.in b/ug-gallery-efl.manifest-3.0.in new file mode 100644 index 0000000..97e8c31 --- /dev/null +++ b/ug-gallery-efl.manifest-3.0.in @@ -0,0 +1,5 @@ + + + + + diff --git a/ug-gallery-efl.manifest.xml b/ug-gallery-efl.manifest.xml new file mode 100644 index 0000000..c253334 --- /dev/null +++ b/ug-gallery-efl.manifest.xml @@ -0,0 +1,9 @@ + + + + UG Gallery AppControl + + /usr/share/icons/default/small/ug-gallery-efl.png + + + diff --git a/ug-gallery-efl.xml b/ug-gallery-efl.xml index 3e8e79b..e14308d 100644 --- a/ug-gallery-efl.xml +++ b/ug-gallery-efl.xml @@ -54,7 +54,7 @@ Jiansong Jin Gallery application - + /usr/ug/res/images/ug-gallery-efl/ug-gallery-efl.png -- 2.7.4