revise build scripts and spec file

Change-Id: I8a24316b33ecfefe36b0bed441c44590680ecbc6

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a58778b..1d5c1c4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,156 +1,78 @@
-#
-# Copyright (c) Samsung Electronics Co., Ltd.
-# All rights reserved.
-#
+CMAKE_MINIMUM_REQUIRED(VERSION 3.9)
+PROJECT(download-manager)
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(download-manager C CXX)
-
-ADD_SUBDIRECTORY(oma-parser)
-
-SET(PROJ_NAME "download-manager")
-SET(VENDOR "tizen")
-SET(PACKAGE ${PROJ_NAME})
-SET(PKGNAME "org.${VENDOR}.${PACKAGE}")
-SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(BINDIR "${PREFIX}/bin")
-SET(RESDIR "${PREFIX}/shared/res")
-IF(TIZEN_2_3_UX)
-SET(EDJEDIR "${RESDIR}/edje")
-SET(TABLEDIR "${RESDIR}/tables")
-ENDIF(TIZEN_2_3_UX)
-SET(IMAGEDIR "${RESDIR}/images")
-SET(DATADIR "${PREFIX}/data")
-SET(DBDATADIR "/home/owner/apps_rw/${PKGNAME}/data")
-SET(LOCALEDIR "${RESDIR}/locale")
-SET(ICONDIR "/usr/share/icons/default/small/")
-SET(HISTORYDB ".download-history.db")
-SET(DOWNLOAD-DB-SERVICE download-db-service)
-
-FIND_PROGRAM(UNAME NAMES uname)
-EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
-
-INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/src/include" "${CMAKE_SOURCE_DIR}/oma-parser/")
-
-FILE(GLOB SRCS src/*.cpp)
+INCLUDE(FindPkgConfig)
+INCLUDE(Definitions.cmake)
 
-IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
-       SET(CMAKE_BUILD_TYPE "Release")
-ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "")
-MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
+SET(EXTRA_FLAGS "-Wall -Werror -fvisibility=hidden")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_FLAGS}")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_FLAGS}")
+SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
 
-INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs REQUIRED
-       capi-web-url-download
-       capi-system-system-settings
-       capi-appfw-event
-       capi-network-connection
+SET(REQUIRED_PKGS
+       capi-appfw-application
+       capi-base-utils-i18n
        capi-content-media-content
        capi-content-mime-type
-       capi-base-utils-i18n
-       elementary
+       capi-network-connection
+       capi-system-system-settings
+       capi-web-url-download
+       data-control
+       dlog
        ecore
-       edje
-       xdgmime
+       efl-extension
+       elementary
        libcurl
+       libxml-2.0
        notification
        sqlite3
        storage
        vconf
-       efl-extension
-       libxml-2.0
-       data-control
+       xdgmime
 )
 
-SET(LIB_DL dl)
 SET(LIB_OMA_PARSER oma-parser)
-
-FOREACH(flag ${pkgs_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-FOREACH(flag ${pkgs_include_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
+SET(DB_SERVICE download-db-service)
 
 IF(SUPPORT_WAITING_RO)
-MESSAGE("SUPPORT_WAITING_RO:On")
-pkg_check_modules(drm_pkgs REQUIRED drm-client)
-FOREACH(flag ${drm_pkgs_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-ADD_DEFINITIONS("-D_ENABLE_WAITING_RO")
-#This is request of DRM Team.
-ADD_DEFINITIONS("-D_FILE_OFFSET_BITS=64")
-ELSE (SUPPORT_WAITING_RO)
-MESSAGE("SUPPORT_WAITING_RO:Off")
+       MESSAGE("SUPPORT_WAITING_RO:On")
+       SET(REQUIRED_PKGS ${REQUIRED_PKGS} drm-client)
+       ADD_DEFINITIONS("-D_ENABLE_WAITING_RO")
+       #This is request of DRM Team.
+       ADD_DEFINITIONS("-D_FILE_OFFSET_BITS=64")
 ENDIF(SUPPORT_WAITING_RO)
-IF (TIZEN_2_3_UX)
-MESSAGE("TIZEN_2_3_UX:On")
-ADD_DEFINITIONS("-D_TIZEN_2_3_UX")
-ENDIF(TIZEN_2_3_UX)
-
-MESSAGE("ARCH: ${ARCH}")
-MESSAGE("LIB_DL: ${LIB_DL}")
-
-SET(CMAKE_C_FLAGS "${INC_FLAGS}${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall")
-SET(CMAKE_CXX_FLAGS "${INC_FLAGS} ${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -Wall -Werror -Wno-literal-suffix -Wno-deprecated-declarations -fpie")
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -Wall")
-SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2")
-SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
 
-IF("${ARCH}" MATCHES "^arm.*")
-       ADD_DEFINITIONS("-DTARGET")
-    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mabi=aapcs-linux")
-ENDIF("${ARCH}" MATCHES "^arm.*")
+INCLUDE_DIRECTORIES(oma-parser)
+pkg_check_modules(pkgs REQUIRED ${REQUIRED_PKGS})
+INCLUDE_DIRECTORIES(${pkgs_INCLUDE_DIRS})
+LINK_DIRECTORIES(${pkgs_LIBRARY_DIRS})
 
-SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed -Wl,--hash-style=both")
+IF (WVGA_UX)
+       MESSAGE("WVGA_UX:On")
+       ADD_DEFINITIONS("-D_WVGA_UX")
+       ADD_DEFINITIONS("-DEDJEDIR=\"${EDJEDIR}\"")
+       ADD_DEFINITIONS("-DTABLEDIR=\"${TABLEDIR}\"")
+ENDIF()
 
-ADD_DEFINITIONS("-DPACKAGE_NAME=\"${PKGNAME}\"")
-ADD_DEFINITIONS("-DPROJ_NAME=\"${PROJ_NAME}\"")
-ADD_DEFINITIONS("-DIMAGEDIR=\"${IMAGEDIR}\"")
-ADD_DEFINITIONS("-DDATADIR=\"${DATADIR}\"")
-ADD_DEFINITIONS("-DDBDATADIR=\"${DBDATADIR}\"")
-ADD_DEFINITIONS("-DHISTORYDB=\"${HISTORYDB}\"")
-ADD_DEFINITIONS("-DLOCALEDIR=\"${LOCALEDIR}\"")
 ADD_DEFINITIONS("-D_ENABLE_OMA_DOWNLOAD")
 #ADD_DEFINITIONS("-D_ENABLE_OMA_UNSUPPROTED_CONTENT")
 #ADD_DEFINITIONS("-D_TEST_SUSPEND")
-IF(TIZEN_2_3_UX)
-ADD_DEFINITIONS("-DEDJEDIR=\"${EDJEDIR}\"")
-ADD_DEFINITIONS("-DTABLEDIR=\"${TABLEDIR}\"")
-ENDIF(TIZEN_2_3_UX)
 
-ADD_EXECUTABLE(${PROJ_NAME} ${SRCS})
-TARGET_LINK_LIBRARIES(${PROJ_NAME} ${pkgs_LDFLAGS} ${drm_pkgs_LDFLAGS} ${LIB_DL} ${LIB_OMA_PARSER})
+FILE(GLOB SRCS src/*.cpp)
+ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS} $<TARGET_OBJECTS:${LIB_OMA_PARSER}>)
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LIBRARIES} dl)
+TARGET_COMPILE_OPTIONS(${PROJECT_NAME} PUBLIC ${pkgs_CFLAGS_OTHER})
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
 
-IF(TIZEN_2_3_UX)
-ADD_CUSTOM_TARGET(download-manager-view.edj
-                        COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/res/wvga/images
-                        ${CMAKE_SOURCE_DIR}/res/wvga/edc/download-manager-view.edc
-                        ${CMAKE_BINARY_DIR}/res/wvga/edc/download-manager-view.edj
-                        DEPENDS ${CMAKE_SOURCE_DIR}/res/wvga/edc/download-manager-view.edc
-                )
-ADD_DEPENDENCIES(${PROJECT_NAME} download-manager-view.edj)
-ENDIF(TIZEN_2_3_UX)
+INSTALL(FILES res/${PKGNAME}.xml DESTINATION ${SHARE_INSTALL_PREFIX}/packages)
+INSTALL(FILES res/${PKGNAME}.png DESTINATION ${ICONDIR})
 
-INSTALL(DIRECTORY DESTINATION ${DATADIR})
-INSTALL(DIRECTORY DESTINATION ${DBDATADIR})
-INSTALL(FILES ${CMAKE_BINARY_DIR}/res/${PKGNAME}.xml DESTINATION /usr/share/packages)
-IF(TIZEN_2_3_UX)
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/wvga/images/ DESTINATION ${IMAGEDIR})
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/wvga/tables/ DESTINATION ${TABLEDIR})
-INSTALL(FILES ${CMAKE_BINARY_DIR}/res/wvga/edc/download-manager-view.edj DESTINATION ${EDJEDIR})
-ELSE(TIZEN_2_3_UX)
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/hd/images/ DESTINATION ${IMAGEDIR})
-ENDIF(TIZEN_2_3_UX)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/res/org.tizen.download-manager.png DESTINATION ${ICONDIR})
-INSTALL(TARGETS ${PROJ_NAME} DESTINATION ${BINDIR})
+IF (WVGA_UX)
+       ADD_SUBDIRECTORY(res/wvga)
+ELSE()
+       ADD_SUBDIRECTORY(res/hd)
+ENDIF()
 
+ADD_SUBDIRECTORY(oma-parser)
 ADD_SUBDIRECTORY(db-service)
-
-# i18n
-IF(TIZEN_2_3_UX)
-ADD_SUBDIRECTORY(res/wvga/po)
-ELSE(TIZEN_2_3_UX)
-ADD_SUBDIRECTORY(res/hd/po)
-ENDIF(TIZEN_2_3_UX)

diff --git a/Definitions.cmake b/Definitions.cmake
new file mode 100644 (file)
index 0000000..5705815
--- /dev/null
+++ b/Definitions.cmake
@@ -0,0 +1,36 @@
+SET(PROJ_NAME ${PROJECT_NAME})
+ADD_DEFINITIONS("-DPROJ_NAME=\"${PROJ_NAME}\"")
+
+IF(NOT DEFINED PKGNAME)
+       MESSAGE("No PKGNAME. Check build system")
+       SET(PKGNAME "org.tizen.${PROJECT_NAME}")
+ENDIF()
+ADD_DEFINITIONS("-DPACKAGE_NAME=\"${PKGNAME}\"")
+
+SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+
+SET(BINDIR "${PREFIX}/bin")
+
+IF(NOT DEFINED RESDIR)
+       MESSAGE("No RESDIR. Check build system")
+       SET(RESDIR "${PREFIX}/shared/res")
+ENDIF()
+
+SET(IMAGEDIR "${RESDIR}/images")
+ADD_DEFINITIONS("-DIMAGEDIR=\"${IMAGEDIR}\"")
+
+SET(LOCALEDIR "${RESDIR}/locale")
+ADD_DEFINITIONS("-DLOCALEDIR=\"${LOCALEDIR}\"")
+
+IF(WVGA_UX)
+       SET(EDJEDIR "${RESDIR}/edje")
+       SET(TABLEDIR "${RESDIR}/tables")
+ENDIF()
+
+SET(ICONDIR "${SHARE_INSTALL_PREFIX}/icons/default/small/")
+
+SET(DBDATADIR "/home/owner/apps_rw/${PKGNAME}/data")
+ADD_DEFINITIONS("-DDBDATADIR=\"${DBDATADIR}\"")
+
+SET(HISTORYDB ".download-history.db")
+ADD_DEFINITIONS("-DHISTORYDB=\"${HISTORYDB}\"")
\ No newline at end of file

diff --git a/db-service/CMakeLists.txt b/db-service/CMakeLists.txt
index f15b83f..3f03530 100644 (file)
--- a/db-service/CMakeLists.txt
+++ b/db-service/CMakeLists.txt
@@ -1,40 +1,18 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+SET(DB_SVC_PKGNAME org.tizen.download-db-service)
 
-SET(DOWNLOAD-DB-SERVICE-PKGNAME org.tizen.download-db-service)
+FILE(GLOB DB_SRCS *.cpp)
 
-ADD_DEFINITIONS("-D_FILE_OFFSET_BITS=64")
-
-SET(CMAKE_SKIP_BUILD_RPATH TRUE)
-
-IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
-       SET(CMAKE_BUILD_TYPE "Debug")
-ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "")
-MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
-
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -O2 -g -Wall")
-
-FILE(GLOB DOWNLOAD-DB-SERVICE-SRCS *.cpp)
+pkg_check_modules(db_pkgs REQUIRED capi-appfw-application capi-appfw-service-application
+       data-control dlog glib-2.0 sqlite3)
+INCLUDE_DIRECTORIES(${db_pkgs_INCLUDE_DIRS})
+LINK_DIRECTORIES(${db_pkgs_LIBRARY_DIRS})
 
-INCLUDE(FindPkgConfig)
-pkg_check_modules(download_db_pkgs REQUIRED glib-2.0 dlog capi-appfw-application capi-appfw-service-application data-control dlog sqlite3)
-INCLUDE_DIRECTORIES(${download_db_pkgs_INCLUDE_DIRS})
-LINK_DIRECTORIES(${download_db_pkgs_LIBRARY_DIRS})
-
-FOREACH(flag ${download_db_pkgs_CXXFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS}")
-SET(download_db_service_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE")
-
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
-
-ADD_EXECUTABLE(${DOWNLOAD-DB-SERVICE} ${DOWNLOAD-DB-SERVICE-SRCS})
-TARGET_LINK_LIBRARIES(${DOWNLOAD-DB-SERVICE} ${download_db_pkgs_LDFLAGS} )
-SET_TARGET_PROPERTIES(${DOWNLOAD-DB-SERVICE} PROPERTIES COMPILE_FLAGS "${download_db_service_CXX_FLAGS}")
+ADD_DEFINITIONS("-D_FILE_OFFSET_BITS=64")
 
-SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(BINDIR "${PREFIX}/bin")
+ADD_EXECUTABLE(${DB_SERVICE} ${DB_SRCS})
+SET_TARGET_PROPERTIES(${DB_SERVICE} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+TARGET_LINK_LIBRARIES(${DB_SERVICE} ${db_pkgs_LIBRARIES})
+TARGET_COMPILE_OPTIONS(${DB_SERVICE} PUBLIC ${db_pkgs_CFLAGS_OTHER})
 
-INSTALL(TARGETS ${DOWNLOAD-DB-SERVICE} DESTINATION ${BINDIR})
-#INSTALL(FILES tizen-manifest.xml DESTINATION /usr/share/packages RENAME ${DOWNLOAD-DB-SERVICE-PKGNAME}.xml)
+INSTALL(TARGETS ${DB_SERVICE} DESTINATION ${BINDIR})
+#INSTALL(FILES tizen-manifest.xml DESTINATION ${SHARE_INSTALL_PREFIX}/packages RENAME ${DB_SVC_PKGNAME}.xml)

diff --git a/db-service/download-db-svc-common.h b/db-service/download-db-svc-common.h
index 0686fe3..b90d0c9 100644 (file)
--- a/db-service/download-db-svc-common.h
+++ b/db-service/download-db-svc-common.h
@@ -38,7 +38,7 @@
 #define DM_DOWNLOAD_COMPLETE_STRING_ID __("IDS_DM_HEADER_DOWNLOAD_COMPLETE")
 #define DM_DOWNLOAD_FAILED_STRING_ID __("IDS_DM_BODY_DOWNLOAD_FAILED_M_STATUS_ABB")
 
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
 #define DM_POP_TEXT_ERROR ""
 #define DM_BODY_TEXT_NO_NAME "No name"
 #define DM_BODY_TEXT_UNSUPPORTED_FILE_TYPE "Unsupported file type"

diff --git a/oma-parser/CMakeLists.txt b/oma-parser/CMakeLists.txt
index 743065b..0d1672c 100644 (file)
--- a/oma-parser/CMakeLists.txt
+++ b/oma-parser/CMakeLists.txt
@@ -1,42 +1,6 @@
-
-SET(PROJ_NAME "oma-parser")
-SET(VERSION "0.0.1")
-
-FIND_LIBRARY(LIB_EXPAT expat)
-
-SET(OMA-PARSER-SRCS
-       oma-parser-common.c
-       oma-parser-dd1.c
-       oma-parser-interface.c
-)
-
-IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
-       SET(CMAKE_BUILD_TYPE "Release")
-ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "")
-
-INCLUDE(FindPkgConfig)
-pkg_check_modules(op-pkgs REQUIRED
-       dlog
-       libxml-2.0
-)
-
-FOREACH(flag ${op-pkgs_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(CMAKE_C_FLAGS "${INC_FLAGS}${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -fPIC")
-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -Wall")
-SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2")
-
-#SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed -Wl,--hash-style=both")
+FILE(GLOB OMA_SRCS *.c)
 
 ADD_DEFINITIONS("-DDEBUG_USING_DLOG")
 
-ADD_LIBRARY(${PROJ_NAME} ${OMA-PARSER-SRCS})
-#ADD_LIBRARY(${PROJ_NAME} SHARED ${OMA-PARSER-SRCS})
-TARGET_LINK_LIBRARIES(${PROJ_NAME} ${op-pkgs_LDFLAGS} ${LIB_EXPAT})
-#SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES VERSION ${VERSION})
-
-#INSTALL(TARGETS ${PROJ_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
-
-
+ADD_LIBRARY(${LIB_OMA_PARSER} OBJECT ${OMA_SRCS})
+SET_TARGET_PROPERTIES(${LIB_OMA_PARSER} PROPERTIES POSITION_INDEPENDENT_CODE ON)

diff --git a/oma-parser/oma-parser-dd1.c b/oma-parser/oma-parser-dd1.c
index e374433..34a64f2 100644 (file)
--- a/oma-parser/oma-parser-dd1.c
+++ b/oma-parser/oma-parser-dd1.c
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #include <stdio.h>
 #include <string.h>
 

diff --git a/oma-parser/oma-parser-interface.c b/oma-parser/oma-parser-interface.c
index 739819f..c7cb53b 100644 (file)
--- a/oma-parser/oma-parser-interface.c
+++ b/oma-parser/oma-parser-interface.c
@@ -13,10 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-#include <expat.h>
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "oma-parser-interface.h"
 

diff --git a/packaging/org.tizen.download-manager.spec b/packaging/org.tizen.download-manager.spec
index 9f1ed64..0fbd6f5 100644 (file)
--- a/packaging/org.tizen.download-manager.spec
+++ b/packaging/org.tizen.download-manager.spec
@@ -1,4 +1,3 @@
-%define _ux_define tizen2.3
 Name:  org.tizen.download-manager
 Summary:       Application for support of the content download
 Version:       0.3.30
@@ -7,37 +6,29 @@ License:      Flora-1.1
 Group:         misc
 URL:           N/A
 Source0:       %{name}-%{version}.tar.gz
-BuildRequires: pkgconfig(capi-web-url-download)
-BuildRequires: pkgconfig(capi-system-system-settings)
+BuildRequires: cmake
 BuildRequires: pkgconfig(capi-appfw-event)
 BuildRequires: pkgconfig(capi-appfw-service-application)
-BuildRequires: pkgconfig(capi-network-connection)
+BuildRequires: pkgconfig(capi-base-utils-i18n)
 BuildRequires: pkgconfig(capi-content-media-content)
 BuildRequires: pkgconfig(capi-content-mime-type)
-BuildRequires: pkgconfig(capi-base-utils-i18n)
-BuildRequires: pkgconfig(elementary)
+BuildRequires: pkgconfig(capi-network-connection)
+BuildRequires: pkgconfig(capi-system-system-settings)
+BuildRequires: pkgconfig(capi-web-url-download)
+BuildRequires: pkgconfig(data-control)
+BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(ecore)
-BuildRequires: pkgconfig(gles20)
-BuildRequires: pkgconfig(xdgmime)
+BuildRequires: pkgconfig(efl-extension)
+BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(libcurl)
+BuildRequires: pkgconfig(libxml-2.0)
 BuildRequires: pkgconfig(notification)
-BuildRequires: pkgconfig(appsvc)
 BuildRequires: pkgconfig(sqlite3)
-BuildRequires: pkgconfig(vconf)
-BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(libxml-2.0)
 BuildRequires: pkgconfig(storage)
-BuildRequires: pkgconfig(efl-extension)
-BuildRequires: pkgconfig(data-control)
-BuildRequires: cmake
+BuildRequires: pkgconfig(vconf)
+BuildRequires: pkgconfig(xdgmime)
 BuildRequires: gettext-devel
-BuildRequires: expat-devel
 BuildRequires: hash-signer
-Requires(post): coreutils
-Requires(post): sqlite
-Requires(post): edje-tools
-
-%{echo:#winset style:%{?_ux_define}#}
 
 %description
 Application for support of the content download
@@ -45,82 +36,48 @@ Application for support of the content download
 %prep
 %setup -q
 
-%define _default_path /usr/apps/%{name}
-%define _bin_path %{_default_path}/bin
-%define _res_path %{_default_path}/shared/res
-%define _imagedir %{_res_path}/images
-%if "%{?_ux_define}" == "tizen2.3"
-%define _edjedir %{_res_path}/edje
-%define _tabledir %{_res_path}/tables
-%endif
-%define _localedir %{_res_path}/locale
-%define _pkgxmldir /usr/share/packages
-%define _icondir /usr/share/icons/default/small
-%define support_oma_drm OFF
-
-%define cmake \
-       CFLAGS="${CFLAGS:-%optflags} -fPIC -D_REENTRANT -fvisibility=hidden"; export CFLAGS \
-       CXXFLAGS="${CXXFLAGS:-%optflags} -fvisibility-inlines-hidden"; export CXXLAGS \
-       FFLAGS="${FFLAGS:-%optflags} -fPIC -fvisibility=hidden"; export FFLAGS \
-       LDFLAGS+=" -Wl,--as-needed -Wl,--hash-style=both"; export LDFLAGS \
-       %__cmake \\\
-               -DCMAKE_INSTALL_PREFIX:PATH=%{_default_path} \\\
-               %if "%{?_lib}" == "lib64" \
-               %{?_cmake_lib_suffix64} \\\
-               %endif \
-               %{?_cmake_skip_rpath} \\\
-               %if "%{?support_oma_drm}" == "ON" \
-               -DSUPPORT_WAITING_RO:BOOL=ON \\\
-               %else \
-               -DSUPPORT_WAITING_RO:BOOL=OFF \\\
-               %endif \
-               %if "%{?_ux_define}" == "tizen2.3" \
-               -DTIZEN_2_3_UX:BOOL=ON \\\
-               %endif \
-               -DPKG_NAME=%{name} \\\
-               -DPKG_VERSION=%{version} \\\
-               -DPKG_RELEASE=%{release}
-
+%global _appdir /usr/apps/%{name}
+%global _resdir %{_appdir}/shared/res
+%global support_oma_drm OFF
+%global _ux_define wvga
 
 %build
-export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
-export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
-export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
-%cmake .
-make %{?jobs:-j%jobs}
+%cmake . -DCMAKE_VERBOSE_MAKEFILE=OFF \
+       -DCMAKE_INSTALL_PREFIX:PATH=%{_appdir} \
+%if "%{?_ux_define}" == "wvga"
+       -DWVGA_UX:BOOL=ON \
+%endif
+%if "%{?support_oma_drm}" == "ON"
+       -DSUPPORT_WAITING_RO:BOOL=ON \
+%else
+       -DSUPPORT_WAITING_RO:BOOL=OFF \
+%endif
+       -DRESDIR:PATH=%{_resdir} \
+       -DPKGNAME=%{name}
+
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 %make_install
-PKG_ID=%{name}
 %define tizen_sign 1
-%define tizen_sign_base /usr/apps/${PKG_ID}
+%define tizen_sign_base %{_appdir}
 %define tizen_sign_level platform
 %define tizen_author_sign 1
 %define tizen_dist_sign 1
 
-%post
-#mkdir -p /opt/usr/apps/org.tizen.download-manager/data/db
-#chown -R 5000:5000 /opt/usr/apps/org.tizen.download-manager/data
-#chmod -R 755 /opt/usr/apps/org.tizen.download-manager/data
-#chsmack -a 'org.tizen.download-manager' /opt/usr/apps/org.tizen.download-manager/data/db
-
-#chsmack -a 'System::Shared' /opt/usr/apps/org.tizen.download-manager/data/db
-#chsmack -t /opt/usr/apps/org.tizen.download-manager/data/db
-
 %files
-%defattr(-,root,root,-)
 %manifest %{name}.manifest
-%{_bin_path}/*
-%{_imagedir}/*
-%if "%{?_ux_define}" == "tizen2.3"
-%{_edjedir}/*
-%{_tabledir}/*
+%{_appdir}/bin/*
+%{_appdir}/signature1.xml
+%{_appdir}/author-signature.xml
+%{_resdir}/images/*
+%{_resdir}/locale/*
+%{_datadir}/packages/%{name}.xml
+%{_datadir}/icons/default/small/%{name}.png
+%if "%{?_ux_define}" == "wvga"
+%{_resdir}/edje/*
+%{_resdir}/tables/*
 %endif
-%{_localedir}/*
-%{_default_path}/author-signature.xml
-%{_default_path}/signature1.xml
-%{_pkgxmldir}/%{name}.xml
-%{_icondir}/%{name}.png
 %license LICENSE.Flora
 

diff --git a/res/hd/CMakeLists.txt b/res/hd/CMakeLists.txt
new file mode 100644 (file)
index 0000000..c8a0293
--- /dev/null
+++ b/res/hd/CMakeLists.txt
@@ -0,0 +1,4 @@
+
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/images/ DESTINATION ${IMAGEDIR})
+
+ADD_SUBDIRECTORY(po)

diff --git a/res/wvga/CMakeLists.txt b/res/wvga/CMakeLists.txt
new file mode 100644 (file)
index 0000000..73719a0
--- /dev/null
+++ b/res/wvga/CMakeLists.txt
@@ -0,0 +1,15 @@
+SET(EDC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/edc)
+
+ADD_CUSTOM_TARGET(download-manager-view.edj
+       COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/images
+               ${EDC_DIR}/download-manager-view.edc
+               ${EDC_DIR}/download-manager-view.edj
+       DEPENDS ${EDC_DIR}/download-manager-view.edc
+)
+ADD_DEPENDENCIES(${PROJECT_NAME} download-manager-view.edj)
+
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/images/ DESTINATION ${IMAGEDIR})
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tables/ DESTINATION ${TABLEDIR})
+INSTALL(FILES ${EDC_DIR}/download-manager-view.edj DESTINATION ${EDJEDIR})
+
+ADD_SUBDIRECTORY(po)
\ No newline at end of file

diff --git a/src/download-mgr-common.h b/src/download-mgr-common.h
index 70769a3..1bcd42f 100644 (file)
--- a/src/download-mgr-common.h
+++ b/src/download-mgr-common.h
@@ -39,7 +39,7 @@
 #define DM_DOWNLOAD_COMPLETE_STRING_ID __("IDS_DM_HEADER_DOWNLOAD_COMPLETE")
 #define DM_DOWNLOAD_FAILED_STRING_ID __("IDS_DM_BODY_DOWNLOAD_FAILED_M_STATUS_ABB")
 
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
 #define DM_POP_TEXT_ERROR ""
 #define DM_BODY_TEXT_NO_NAME "No name"
 #define DM_BODY_TEXT_UNSUPPORTED_FILE_TYPE "Unsupported file type"
@@ -71,7 +71,7 @@
 #define DOWNLOAD_PROVIDER_IMAGEDIR "/usr/share/download-provider/images"
 
 // Downlaod Manager resources
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
 #define DM_COLOR_TABLE_PATH TABLEDIR"/org.tizen.download-manager_ChangeableColorInfo.xml"
 #define DM_FONT_TABLE_PATH TABLEDIR"/org.tizen.download-manager_ChangeableFontInfo.xml"
 

diff --git a/src/download-mgr-notification.cpp b/src/download-mgr-notification.cpp
index 29e480a..7c8a3b0 100644 (file)
--- a/src/download-mgr-notification.cpp
+++ b/src/download-mgr-notification.cpp
@@ -389,7 +389,7 @@ notification_h DownloadNoti::createNoti(NOTIFICATION_TYPE::TYPE type)
                statusTextId = "IDS_DM_BODY_DOWNLOAD_FAILED_M_STATUS_ABB";
        }
 
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        err = notification_set_text(notiHandle, NOTIFICATION_TEXT_TYPE_TITLE,
                        fileName, NULL, NOTIFICATION_VARIABLE_TYPE_NONE);
        if (err != NOTIFICATION_ERROR_NONE) {

diff --git a/src/download-mgr-view.cpp b/src/download-mgr-view.cpp
index 72e73b1..8245682 100644 (file)
--- a/src/download-mgr-view.cpp
+++ b/src/download-mgr-view.cpp
@@ -32,7 +32,7 @@ enum {
 
 DownloadView::DownloadView(void)
        : eoWindow(NULL)
-#ifndef _TIZEN_2_3_UX
+#ifndef _WVGA_UX
        , eoIndicatorBackground(NULL)
 #endif
        , eoBackground(NULL)
@@ -41,14 +41,14 @@ DownloadView::DownloadView(void)
        , eoEmptyNoContent(NULL)
        , eoNaviBar(NULL)
        , eoNaviBarItem(NULL)
-#ifndef _TIZEN_2_3_UX
+#ifndef _WVGA_UX
        , eoToolBar(NULL)
        , eoToolBarItem(NULL)
 #endif
        , eoBox(NULL)
        , eoDldList(NULL)
        , eoPopup(NULL)
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        , eoMoreMenu(NULL)
        , eoSelectAllLayout(NULL)
        , m_isEditMode(false)
@@ -75,7 +75,7 @@ DownloadView::DownloadView(void)
        engine.initEngine();
        DateUtil &inst = DateUtil::getInstance();
        inst.updateLocale();
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        elm_theme_extension_add(NULL, EDJEDIR"/download-manager-view.edj");
 #endif
 }
@@ -83,7 +83,7 @@ DownloadView::DownloadView(void)
 DownloadView::~DownloadView()
 {
        DM_LOGD("");
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        elm_theme_extension_del(NULL, EDJEDIR"/download-manager-view.edj");
 #endif
 }
@@ -151,7 +151,7 @@ void DownloadView::destroy()
                evas_object_del(eoDldList);
                eoDldList = NULL;
        }
-#ifndef _TIZEN_2_3_UX
+#ifndef _WVGA_UX
        if(eoToolBar) {
                evas_object_del(eoToolBar);
                eoToolBar = NULL;
@@ -173,7 +173,7 @@ void DownloadView::destroy()
                evas_object_del(eoConform);
                eoConform = NULL;
        }
-#ifndef _TIZEN_2_3_UX
+#ifndef _WVGA_UX
        if(eoIndicatorBackground) {
                evas_object_del(eoIndicatorBackground);
                eoIndicatorBackground = NULL;
@@ -299,7 +299,7 @@ void DownloadView::clickedItemFromNoti(unsigned id, NOTIFICATION_TYPE::TYPE type
                        if (type == NOTIFICATION_TYPE::NOTI_FAILED) {
                                string msg[2];
                                msg[0] = __("IDS_DM_BODY_DOWNLOAD_FAILED_M_STATUS_ABB");
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                                msg[1] = __("IDS_DM_BODY_TAP_DOWNLOAD_TO_TRY_AGAIN");
 #else
                                msg[1] = __("IDS_DM_POP_FILE_NOT_RECEIVED_DOWNLOAD_AGAIN_Q");
@@ -336,7 +336,7 @@ Evas_Object *DownloadView::createBackground(Evas_Object *window)
 {
        if (!window)
                return NULL;
-#ifndef _TIZEN_2_3_UX
+#ifndef _WVGA_UX
        eoIndicatorBackground = elm_bg_add(window);
        if (eoIndicatorBackground) {
                evas_object_size_hint_weight_set(eoIndicatorBackground, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -347,7 +347,7 @@ Evas_Object *DownloadView::createBackground(Evas_Object *window)
        eoBackground = elm_bg_add(window);
        if (eoBackground) {
                evas_object_size_hint_weight_set(eoBackground, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                elm_bg_color_set(eoBackground, 255, 255, 255);
 #endif
                evas_object_show(eoBackground);
@@ -389,7 +389,7 @@ Evas_Object *DownloadView::createLayout(Evas_Object *parent)
 
                evas_object_size_hint_weight_set(eoLayout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                elm_object_content_set(parent, eoLayout);
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                elm_object_part_content_set(eoLayout, "elm.swallow.bg", eoBackground);
 #endif
                evas_object_show(eoLayout);
@@ -426,7 +426,7 @@ void DownloadView::createNaviBar()
                DM_HEADER_DOWNLOAD_MANAGER, NULL, NULL, eoBox, NULL);
        if (!eoNaviBarItem)
                DM_LOGE("Null Check:eoNaviBarItem");
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        eext_object_event_callback_add(eoNaviBar, EEXT_CALLBACK_MORE, moreKeyCB, NULL);
 #else
        createDeleteBtn();
@@ -461,7 +461,7 @@ void DownloadView::showDeletePopup()
                        EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(eoPopup, EVAS_HINT_FILL,
                EVAS_HINT_FILL);
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        snprintf(buff, MAX_BUF_LEN, "%s%s%s", "<align=left>",
                DM_OPT_TEXT_DELETE, "</align>");
        elm_object_part_text_set(eoPopup, "title,text", buff);
@@ -506,7 +506,7 @@ void DownloadView::deleteToolBarBtnCB(void *data, Evas_Object *obj, void *event_
        view.showDeletePopup();
 }
 
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
 void DownloadView::moreKeyCB(void *data, Evas_Object *obj, void *event_info)
 {
        DM_LOGD("");
@@ -750,7 +750,7 @@ void DownloadView::attachViewItem(ViewItem *viewItem)
        if (m_viewItemCount < 1) {
                hideEmptyView();
                createList();
-#ifndef _TIZEN_2_3_UX
+#ifndef _WVGA_UX
                if (eoNaviBarItem)
                        if (!elm_object_item_part_content_get(eoNaviBarItem,
                                        "title_right_btn")) {
@@ -932,7 +932,7 @@ void DownloadView::update(int diffDays)
        if (lastItem) {
                item1 = item2;
                while(item1) {
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                        elm_genlist_item_fields_update(item1 , "elm.text.sub.end",
                                        ELM_GENLIST_ITEM_FIELD_TEXT);
 #else
@@ -957,7 +957,7 @@ void DownloadView::updateLang()
        DM_LOGD("");
        if (eoNaviBarItem) {
                if (isGenlistEditMode()) {
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                        if (eoSelectAllLayout)
                                elm_object_part_text_set(eoSelectAllLayout, "elm.text",
                                        DM_BODY_TEXT_SELECT_ALL);
@@ -968,7 +968,7 @@ void DownloadView::updateLang()
                        elm_object_item_text_set(eoNaviBarItem, __("IDS_DM_HEADER_SELECT_ITEMS"));
 #endif
                } else {
-#ifndef _TIZEN_2_3_UX
+#ifndef _WVGA_UX
                        Evas_Object *buttonObj = NULL;
                        buttonObj = elm_object_item_part_content_get(eoNaviBarItem, "title_right_btn");
                        elm_object_text_set(buttonObj, DM_OPT_TEXT_DELETE);
@@ -1083,7 +1083,7 @@ void DownloadView::showEmptyView()
                elm_layout_theme_set(eoEmptyNoContent, "layout", "nocontents", "default");
                evas_object_size_hint_weight_set(eoEmptyNoContent, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                evas_object_size_hint_align_set(eoEmptyNoContent, EVAS_HINT_FILL, EVAS_HINT_FILL);
-#ifndef _TIZEN_2_3_UX
+#ifndef _WVGA_UX
                Evas_Object *icon = elm_image_add(eoEmptyNoContent);
                elm_image_file_set(icon, DM_NO_CONTENT_ICON_PATH, NULL);
                elm_object_part_content_set(eoEmptyNoContent, "nocontents.image", icon);
@@ -1092,7 +1092,7 @@ void DownloadView::showEmptyView()
                        __("IDS_DM_BODY_NO_DOWNLOADS"));
                elm_object_part_text_set(eoEmptyNoContent, "elm.help.text",
                        __("IDS_DM_BODY_AFTER_YOU_DOWNLOAD_ITEMS_THEY_WILL_BE_SHOWN_HERE"));
-#ifndef _TIZEN_2_3_UX
+#ifndef _WVGA_UX
                Evas_Object *accessObject = NULL;
                Evas_Object *noContentAccess = (Evas_Object *)edje_object_part_object_get(_EDJ(eoEmptyNoContent), "elm.text");
                accessObject = elm_access_object_register(noContentAccess, eoEmptyNoContent);
@@ -1115,7 +1115,7 @@ void DownloadView::showEmptyView()
                elm_box_pack_start(eoBox, eoEmptyNoContent);
        }
        evas_object_show(eoEmptyNoContent);
-#ifndef _TIZEN_2_3_UX
+#ifndef _WVGA_UX
        destroyDeleteBtn();
 #endif
 }
@@ -1132,7 +1132,7 @@ void DownloadView::hideEmptyView()
 
 bool DownloadView::isGenlistEditMode()
 {
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        return m_isEditMode;
 #else
        if (eoDldList)
@@ -1142,7 +1142,7 @@ bool DownloadView::isGenlistEditMode()
 #endif
 }
 
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
 void DownloadView::createSelectAllLayout()
 {
        DM_LOGD("");
@@ -1284,7 +1284,7 @@ void DownloadView::showGenlistEditMode()
 {
        DM_LOGD("");
 
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        deleteContextPopup();
        showSelectedNotify(0);
        m_isEditMode = true;
@@ -1328,7 +1328,7 @@ void DownloadView::showGenlistEditMode()
        }
 
 
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        /* Update all the realized Items */
        if (m_viewItemCount > 0)
                elm_genlist_realized_items_update(eoDldList);
@@ -1347,7 +1347,7 @@ void DownloadView::hideGenlistEditMode()
        removePopup();
        elm_object_item_text_set(eoNaviBarItem,
                DM_HEADER_DOWNLOAD_MANAGER);
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        m_isEditMode = false;
        deleteSelectAllLayout();
 #else
@@ -1366,7 +1366,7 @@ void DownloadView::hideGenlistEditMode()
                }
                it = elm_genlist_item_next_get(it);
        }
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        /* Update all the realized Items */
        if (m_viewItemCount > 0)
                elm_genlist_realized_items_update(eoDldList);
@@ -1392,7 +1392,7 @@ void DownloadView::handleChangedAllCheckedState()
                if (viewItem) {
                        if (viewItem->isFinished()) {
                                viewItem->setCheckedValue(m_allChecked);
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                                elm_genlist_item_fields_update(it, "elm.swallow.icon.2",
                                        ELM_GENLIST_ITEM_FIELD_CONTENT);
 #else
@@ -1406,7 +1406,7 @@ void DownloadView::handleChangedAllCheckedState()
        }
 
        if (m_allChecked && checkedCount > 0) {
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                Evas_Object *doneButton = elm_object_part_content_get(eoNaviBar, "title_right_btn");
                elm_object_disabled_set(doneButton, EINA_FALSE);
                Evas_Object *checkBox = elm_object_part_content_get(eoSelectAllLayout, "elm.swallow.icon");
@@ -1419,7 +1419,7 @@ void DownloadView::handleChangedAllCheckedState()
        } else {
                m_allChecked = EINA_FALSE;
                showSelectedNotify(0);
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                Evas_Object *doneButton = elm_object_part_content_get(eoNaviBar, "title_right_btn");
                elm_object_disabled_set(doneButton, EINA_TRUE);
                Evas_Object *checkBox = elm_object_part_content_get(eoSelectAllLayout, "elm.swallow.icon");
@@ -1457,7 +1457,7 @@ void DownloadView::handleCheckedState()
        else
                m_allChecked = EINA_FALSE;
 
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        if (eoSelectAllLayout) {
                Evas_Object *checkBox = elm_object_part_content_get(eoSelectAllLayout, "elm.swallow.icon");
                if (checkBox)
@@ -1468,13 +1468,13 @@ void DownloadView::handleCheckedState()
 
 
        if (checkedCount == 0) {
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                elm_object_disabled_set(doneButton, EINA_TRUE);
 #else
                elm_object_item_disabled_set(eoToolBarItem, EINA_TRUE);
 #endif
        } else {
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                elm_object_disabled_set(doneButton, EINA_FALSE);
 #else
                elm_object_item_disabled_set(eoToolBarItem, EINA_FALSE);
@@ -1488,7 +1488,7 @@ void DownloadView::showSelectedNotify(int selectedCount)
        char buff[MAX_BUF_LEN] = { 0, };
 
        DM_LOGD("");
-#ifndef _TIZEN_2_3_UX
+#ifndef _WVGA_UX
        if (selectedCount <= 0) {
                elm_object_item_text_set(eoNaviBarItem, __("IDS_DM_HEADER_SELECT_ITEMS"));
                return;
@@ -1501,7 +1501,7 @@ void DownloadView::showSelectedNotify(int selectedCount)
        elm_object_item_text_set(eoNaviBarItem, buff);
 }
 
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
 void DownloadView::selectAllChangedCB(void *data, Evas *e, Evas_Object *obj,
        void *event_info)
 {
@@ -1560,7 +1560,7 @@ void DownloadView::showRetryPopup(ViewItem *viewItem, string *msg)
        evas_object_size_hint_align_set(eoPopup, EVAS_HINT_FILL,
                EVAS_HINT_FILL);
 
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        string titleText = "<align=left>" + msg[0] + "</align>";
        elm_object_part_text_set(eoPopup, "title,text", titleText.c_str());
 #else
@@ -1575,7 +1575,7 @@ void DownloadView::showRetryPopup(ViewItem *viewItem, string *msg)
                        viewItem);
        btn2 = elm_button_add(eoPopup);
        elm_object_style_set(btn2, "popup");
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                elm_object_text_set(btn2, DM_SK_TEXT_DOWNLOAD);
 #else
                elm_object_text_set(btn2, S_("IDS_COM_SK_RETRY"));
@@ -1612,7 +1612,7 @@ void DownloadView::showMemoryFullPopup(string &msg)
        evas_object_size_hint_align_set(eoPopup, EVAS_HINT_FILL,
                        EVAS_HINT_FILL);
 
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        snprintf(buff, MAX_BUF_LEN, "%s%s%s", "<align=left>",
                __("IDS_DM_HEADER_DEFAULT_STROAGE_FULL"), "</align>");
        elm_object_part_text_set(eoPopup, "title,text", buff);
@@ -1624,7 +1624,7 @@ void DownloadView::showMemoryFullPopup(string &msg)
        elm_object_text_set(eoPopup, buff);
        btn1 = elm_button_add(eoPopup);
        elm_object_style_set(btn1, "popup");
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        elm_object_text_set(btn1, DM_SK_TEXT_CANCEL);
 #else
        elm_object_text_set(btn1, DM_SK_TEXT_OK);
@@ -1657,7 +1657,7 @@ void DownloadView::showErrPopup(string *desc)
        eoPopup = elm_popup_add(eoWindow);
        elm_popup_align_set(eoPopup, ELM_NOTIFY_ALIGN_FILL, 1.0);
        evas_object_size_hint_weight_set(eoPopup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        string titleText = "<align=left>" + desc[0] + "</align>";
        elm_object_part_text_set(eoPopup, "title,text", titleText.c_str());
 #else
@@ -1778,7 +1778,7 @@ void DownloadView::showOMAPopup(string msg, ViewItem *viewItem)
        elm_popup_align_set(eoPopup, ELM_NOTIFY_ALIGN_FILL, 1.0);
        evas_object_size_hint_weight_set(eoPopup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        elm_object_text_set(eoPopup, msg.c_str());
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        string titleText = "<align=left>" + string(DM_SK_TEXT_DOWNLOAD) + "</align>";
        elm_object_part_text_set(eoPopup, "title,text", titleText.c_str());
 #else

diff --git a/src/download-mgr-view.h b/src/download-mgr-view.h
index 7309d15..9f29728 100644 (file)
--- a/src/download-mgr-view.h
+++ b/src/download-mgr-view.h
@@ -79,7 +79,7 @@ public:
        static Eina_Bool pauseTimerCB(void *data);
 
 private:
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        static void selectAllChangedCB(void *data, Evas *e, Evas_Object *obj, void *event_info);
 #else
        static void selectAllChangedCB(void *data, Evas_Object *obj, void *event_info);
@@ -100,7 +100,7 @@ private:
        static void omaPopupResponseOKCB(void *data, Evas_Object *obj, void *event_info);
        static void omaPopupResponseCancelCB(void *data, Evas_Object *obj, void *event_info);
 #endif
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        static void moreKeyCB(void *data, Evas_Object *obj, void *event_info);
        static void contextPopupDismissedCB(void *data, Evas_Object *obj, void *event_info);
        static void rotateContextPopupCB(void *data, Evas_Object *obj, void *event_info);
@@ -118,7 +118,7 @@ private:
        Evas_Object *createLayout(Evas_Object *parent);
        void createTheme(void);
        void createNaviBar(void);
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        void createContextPopup();
        void deleteContextPopup();
        void moveContextPopup();
@@ -145,7 +145,7 @@ private:
 #endif
        void showGenlistEditMode(void);
        void hideGenlistEditMode(void);
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        void createSelectAllLayout();
        void deleteSelectAllLayout();
 #else
@@ -157,7 +157,7 @@ private:
        void cleanGenlistData();
 
        Evas_Object *eoWindow;
-#ifndef _TIZEN_2_3_UX
+#ifndef _WVGA_UX
        Evas_Object *eoIndicatorBackground;
 #endif
        Evas_Object *eoBackground;
@@ -166,14 +166,14 @@ private:
        Evas_Object *eoEmptyNoContent;
        Evas_Object *eoNaviBar;
        Elm_Object_Item *eoNaviBarItem;
-#ifndef _TIZEN_2_3_UX
+#ifndef _WVGA_UX
        Evas_Object *eoToolBar;
        Elm_Object_Item *eoToolBarItem;
 #endif
        Evas_Object *eoBox;
        Evas_Object *eoDldList;
        Evas_Object *eoPopup;
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        Evas_Object *eoMoreMenu;
        Evas_Object *eoSelectAllLayout;
        bool m_isEditMode;

diff --git a/src/download-mgr-viewItem.cpp b/src/download-mgr-viewItem.cpp
index 1d9fe6a..8c70546 100644 (file)
--- a/src/download-mgr-viewItem.cpp
+++ b/src/download-mgr-viewItem.cpp
@@ -42,7 +42,7 @@ ViewItem::ViewItem(Item *item)
                item->subscribe(m_aptr_observer.get());
        }
 
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        dldGenlistStyle.item_style = "dm/progress.main";
 #else
        dldGenlistStyle.item_style = "3text.3icon.progress";
@@ -53,7 +53,7 @@ ViewItem::ViewItem(Item *item)
        dldGenlistStyle.func.del = deleteGenlistData;
        dldGenlistStyle.decorate_all_item_style = "edit_default";
 
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        dldHistoryGenlistStyle.item_style = "type1";
 #else
        dldHistoryGenlistStyle.item_style = "3text.1icon.1";
@@ -205,7 +205,7 @@ void ViewItem::updateFromItem()
        if (state == ITEM::SUSPENDED) {
                return;
        } else if (state == ITEM::DOWNLOADING) {
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                Evas_Object *progress = elm_object_item_part_content_get(m_glItem, "elm.icon");
 #else
                Evas_Object *progress = elm_object_item_part_content_get(m_glItem, "elm.swallow.progress");
@@ -217,7 +217,7 @@ void ViewItem::updateFromItem()
                        DM_LOGV("progress value[%.2f]", percentageProgress);
                        elm_progressbar_value_set(progress, percentageProgress);
                }
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                elm_genlist_item_fields_update(m_glItem, "elm.text.progress",
                        ELM_GENLIST_ITEM_FIELD_TEXT);
 #else
@@ -273,7 +273,7 @@ char *ViewItem::getGenlistLabelCB(void *data, Evas_Object *obj, const char *part
 char *ViewItem::getGenlistLabel(Evas_Object *obj, const char *part)
 {
        DM_LOGD("part[%s]", part);
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                if (strcmp(part, "elm.text.sub") == 0) {
                        return (char *)getMessage();
                } else if (strcmp(part, "elm.text.sub.end") == 0) {
@@ -330,7 +330,7 @@ Evas_Object *ViewItem::getGenlistIcon(Evas_Object *obj, const char *part)
 {
        DM_LOGD("part[%s]state[%s]", part, stateStr());
 
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        DownloadView &view = DownloadView::getInstance();
        if (strcmp(part, "elm.icon.1") == 0) {
                Evas_Object *icon = elm_icon_add(obj);
@@ -401,7 +401,7 @@ Evas_Object *ViewItem::getGenlistIcon(Evas_Object *obj, const char *part)
 #endif
 }
 
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
 void ViewItem::checkBoxChangedCB(void *data, Evas_Object *obj, void *event_info)
 {
        DM_LOGD("");
@@ -464,7 +464,7 @@ void ViewItem::clickedGenlistItem()
        if (view.isGenlistEditMode() && m_glItem) {
                Evas_Object *checkBox = NULL;
                Eina_Bool state;
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
         checkBox = elm_object_item_part_content_get(m_glItem, "elm.swallow.icon.2");
 #else
                checkBox = elm_object_item_part_content_get(m_glItem, "elm.edit.icon.1");
@@ -480,7 +480,7 @@ void ViewItem::clickedGenlistItem()
             if (!m_item->play()) {
                                string msg[2];
                                msg[0] = __("IDS_DM_HEADER_UNABLE_TO_OPEN_FILE");
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                                msg[1] = __("IDS_DM_BODY_UNABLE_TO_FIND_AN_APPLICATION_TO_OPEN_THIS_FILE");
 #else
                                msg[1] = S_("IDS_COM_BODY_NO_APPLICATIONS_CAN_PERFORM_THIS_ACTION");
@@ -490,7 +490,7 @@ void ViewItem::clickedGenlistItem()
                } else {
                        string msg[2];
                        msg[0] = __("IDS_DM_HEADER_UNABLE_TO_OPEN_FILE");
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                        msg[1] = __("IDS_DM_BODY_THIS_FILE_CANNOT_BE_FOUND_TAP_DOWNLOAD_TO_TRY_DOWNLOADING_IT_AGAIN");
 #else
                        msg[1] = __("IDS_DM_POP_FILE_DOES_NOT_EXIST_DOWNLOAD_AGAIN_Q");
@@ -500,7 +500,7 @@ void ViewItem::clickedGenlistItem()
        } else if (isFinishedWithErr()) {
                string msg[2];
                msg[0] = __("IDS_DM_BODY_DOWNLOAD_FAILED_M_STATUS_ABB");
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                msg[1] = __("IDS_DM_BODY_TAP_DOWNLOAD_TO_TRY_AGAIN");
 #else
                msg[1] = __("IDS_DM_POP_FILE_NOT_RECEIVED_DOWNLOAD_AGAIN_Q");
@@ -544,7 +544,7 @@ const char *ViewItem::getMessage()
        case ITEM::QUEUED:
        case ITEM::PREPARE_TO_RETRY:
        case ITEM::RECEIVING_DOWNLOAD_INFO:
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                buff = strdup(__("IDS_DM_BODY_PREPARING_ING_M_STATUS_ABB"));
 #else
                buff = strdup(__("IDS_DM_BODY_PREPARING_TO_DOWNLOAD_ING"));
@@ -567,7 +567,7 @@ const char *ViewItem::getMessage()
                break;
 #ifdef _ENABLE_OMA_DOWNLOAD
        case ITEM::NOTIFYING:
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                buff = strdup(__("IDS_DM_BODY_NOTIFYING_SERVER_ING"));
 #else
                buff = strdup(__("IDS_DM_BODY_NOTIFYING_SERVER_ING_ABB"));
@@ -576,7 +576,7 @@ const char *ViewItem::getMessage()
 #endif
 #ifdef _ENABLE_WAITING_RO
        case ITEM::WAITING_RO:
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                buff = strdup(__("IDS_DM_BODY_ACTIVATING_DRM_CONTENT_ING"));
 #else
                buff = strdup(S_("IDS_COM_POP_ACTIVATING"));
@@ -668,7 +668,7 @@ Evas_Object *ViewItem::createProgressBar(Evas_Object *parent)
 
        if (getFileSize() == 0 || isPreparingDownload()) {
                //DM_LOGI("Pending style::progressBar[%p]",progress);
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                elm_object_style_set(progress, "pending");
 #else
                elm_object_style_set(progress, "pending_list");
@@ -680,7 +680,7 @@ Evas_Object *ViewItem::createProgressBar(Evas_Object *parent)
                elm_progressbar_pulse(progress, EINA_TRUE);
        } else {
                //DM_LOGI("List style::progressBar[%p] fileSize[%d] state[%d]",progress, getFileSize(),getState());
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
                elm_object_style_set(progress, "default");
 #else
                elm_object_style_set(progress, "list_progress");
@@ -705,7 +705,7 @@ Evas_Object *ViewItem::createProgressBar(Evas_Object *parent)
 Evas_Object *ViewItem::createCancelBtn(Evas_Object *parent)
 {
        DM_LOGV("");
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        Evas_Object *button = elm_button_add(parent);
        elm_object_style_set(button, "dm_cancel_button");
        Evas_Object *icon = elm_image_add(parent);

diff --git a/src/download-mgr-viewItem.h b/src/download-mgr-viewItem.h
index fc3c051..60264dc 100644 (file)
--- a/src/download-mgr-viewItem.h
+++ b/src/download-mgr-viewItem.h
@@ -55,7 +55,7 @@ public:
        static Evas_Object *getGenlistIconCB(void *data, Evas_Object *obj,
                const char *part);
        Evas_Object *getGenlistIcon(Evas_Object *obj, const char *part);
-#ifdef _TIZEN_2_3_UX
+#ifdef _WVGA_UX
        static void checkBoxChangedCB(void *data, Evas_Object *obj,
                void *event_info);
 #endif