Modify base_scale and indicator height for Common profile

This patch modifies the base_scale and height for common profile as follows:
1) base_scale = 1.8
2) indicator height = 34 px
However above constants for Mobile profile are kept unchanged

Change-Id: I99dc095bd86fa1ff8e7a1c10dafb584e59ab8088
Signed-off-by: Kartik Tidke <kr.tidke@samsung.com>

diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
index 14ee938bda6b2e0b347187a8752852039d4e9539..6e9093b08bde0128dcce2ea61ee82e5ad5d09341 100644 (file)
--- a/CMake/CMakeLists.txt
+++ b/CMake/CMakeLists.txt
@@ -14,6 +14,9 @@ SET(PROJECT_EDC_DIR "${PROJECT_RESOURCES_DIR}/resource")
 SET(PROJECT_IMAGES_DIR "${PROJECT_RESOURCES_DIR}/images")
 SET(PROJECT_PO_DIR "${PROJECT_RESOURCES_DIR}/po")
 
+SET(TIZEN_PROFILE_MOBILE "TIZEN_PROFILE")
+SET(TIZEN_PROFILE_COMMON "TIZEN_PROFILE")
+
 IF("${TIZEN_PROFILE_NAME}" STREQUAL "MOBILE")
 
 INCLUDE(FindPkgConfig)
@@ -54,6 +57,8 @@ pkg_check_modules(pkgs REQUIRED
        msg-service
 )
 
+SET(TIZEN_PROFILE_MOBILE "TIZEN_PROFILE_MOBILE")
+
 ELSEIF("${TIZEN_PROFILE_NAME}" STREQUAL "COMMON")
 
 INCLUDE(FindPkgConfig)
@@ -93,6 +98,8 @@ pkg_check_modules(pkgs REQUIRED
        msg-service
 )
 
+SET(TIZEN_PROFILE_COMMON "TIZEN_PROFILE_COMMON")
+
 ENDIF()
 
 FOREACH(flag ${pkgs_CFLAGS})
@@ -121,4 +128,7 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${INSTALL_EXEC_PREFIX})
 INSTALL(DIRECTORY DESTINATION ${PREFIX}/data})
 INSTALL(FILES ${PROJECT_ROOT_DIR}/tizen-manifest.xml DESTINATION ${SYS_PACKAGES_DIR} RENAME org.tizen.indicator.xml)
 
+ADD_DEFINITIONS("-D\"${TIZEN_PROFILE_MOBILE}\"")
+ADD_DEFINITIONS("-D\"${TIZEN_PROFILE_COMMON}\"")
+
 ADD_SUBDIRECTORY(res)

diff --git a/CMake/res/resource/CMakeLists.txt b/CMake/res/resource/CMakeLists.txt
index 8c5db4c4ab0f4139791779b01e8a102d58cb987d..38912236f09ac3ac8b57c5f09bb26d58c666a1e4 100644 (file)
--- a/CMake/res/resource/CMakeLists.txt
+++ b/CMake/res/resource/CMakeLists.txt
@@ -1,5 +1,8 @@
 ADD_CUSTOM_TARGET(indicator_port.edj
-               COMMAND edje_cc -id ${PROJECT_EDC_DIR}/icons_edc "${EDJEFLAGS}"
+               COMMAND edje_cc
+               -id ${PROJECT_EDC_DIR}/icons_edc
+               -D${TIZEN_PROFILE_MOBILE}
+               -D${TIZEN_PROFILE_COMMON} "${EDJEFLAGS}"
                ${PROJECT_EDC_DIR}/indicator_port.edc
                indicator_port.edj
                DEPENDS ${PROJECT_EDC_DIR}/indicator_port.edc
@@ -7,7 +10,10 @@ ADD_CUSTOM_TARGET(indicator_port.edj
 ADD_DEPENDENCIES(${PROJECT_NAME} indicator_port.edj)
 
 ADD_CUSTOM_TARGET(ticker.edj
-               COMMAND edje_cc -id ${PROJECT_EDC_DIR}/icons_edc "${EDJEFLAGS}"
+               COMMAND edje_cc
+               -id ${PROJECT_EDC_DIR}/icons_edc
+               -D${TIZEN_PROFILE_MOBILE}
+               -D${TIZEN_PROFILE_COMMON} "${EDJEFLAGS}"
                ${PROJECT_EDC_DIR}/ticker.edc
                ticker.edj
                DEPENDS ${PROJECT_EDC_DIR}/ticker.edc
@@ -15,7 +21,10 @@ ADD_CUSTOM_TARGET(ticker.edj
 ADD_DEPENDENCIES(${PROJECT_NAME} ticker.edj)
 
 ADD_CUSTOM_TARGET(ticker_default.edj
-               COMMAND edje_cc -id ${PROJECT_EDC_DIR}/icons_edc "${EDJEFLAGS}"
+               COMMAND edje_cc
+               -id ${PROJECT_EDC_DIR}/icons_edc
+               -D${TIZEN_PROFILE_MOBILE}
+               -D${TIZEN_PROFILE_COMMON} "${EDJEFLAGS}"
                ${PROJECT_EDC_DIR}/ticker_default.edc
                ticker_default.edj
                DEPENDS ${PROJECT_EDC_DIR}/ticker_default.edc
@@ -23,7 +32,10 @@ ADD_CUSTOM_TARGET(ticker_default.edj
 ADD_DEPENDENCIES(${PROJECT_NAME} ticker_default.edj)
 
 ADD_CUSTOM_TARGET(ticker_animated_icon.edj
-               COMMAND edje_cc -id ${PROJECT_EDC_DIR}/animated_icon "${EDJEFLAGS}"
+               COMMAND edje_cc
+               -id ${PROJECT_EDC_DIR}/animated_icon
+               -D${TIZEN_PROFILE_MOBILE}
+               -D${TIZEN_PROFILE_COMMON} "${EDJEFLAGS}"
                ${PROJECT_EDC_DIR}/ticker_animated_icon.edc
                ticker_animated_icon.edj
                DEPENDS ${PROJECT_EDC_DIR}/ticker_animated_icon.edc
@@ -31,7 +43,9 @@ ADD_CUSTOM_TARGET(ticker_animated_icon.edj
 ADD_DEPENDENCIES(${PROJECT_NAME} ticker_animated_icon.edj)
 
 ADD_CUSTOM_TARGET(indicator_icon_theme.edj
-               COMMAND edje_cc "${EDJEFLAGS}"
+               COMMAND edje_cc
+               -D${TIZEN_PROFILE_MOBILE}
+               -D${TIZEN_PROFILE_COMMON} "${EDJEFLAGS}"
                ${PROJECT_EDC_DIR}/indicator_icon_theme.edc
                indicator_icon_theme.edj
                DEPENDS ${PROJECT_EDC_DIR}/indicator_icon_theme.edc
@@ -39,7 +53,9 @@ ADD_CUSTOM_TARGET(indicator_icon_theme.edj
 ADD_DEPENDENCIES(${PROJECT_NAME} indicator_icon_theme.edj)
 
 ADD_CUSTOM_TARGET(indicator_icon_nonfixed_theme.edj
-               COMMAND edje_cc "${EDJEFLAGS}"
+               COMMAND edje_cc
+               -D${TIZEN_PROFILE_MOBILE}
+               -D${TIZEN_PROFILE_COMMON} "${EDJEFLAGS}"
                ${PROJECT_EDC_DIR}/indicator_icon_nonfixed_theme.edc
                indicator_icon_nonfixed_theme.edj
                DEPENDS ${PROJECT_EDC_DIR}/indicator_icon_nonfixed_theme.edc
@@ -47,7 +63,10 @@ ADD_CUSTOM_TARGET(indicator_icon_nonfixed_theme.edj
 ADD_DEPENDENCIES(${PROJECT_NAME} indicator_icon_nonfixed_theme.edj)
 
 ADD_CUSTOM_TARGET(indicator_icon_animation.edj
-               COMMAND edje_cc -id ${PROJECT_EDC_DIR}/icons_edc "${EDJEFLAGS}"
+               COMMAND edje_cc
+               -id ${PROJECT_EDC_DIR}/icons_edc
+               -D${TIZEN_PROFILE_MOBILE}
+               -D${TIZEN_PROFILE_COMMON} "${EDJEFLAGS}"
                ${PROJECT_EDC_DIR}/indicator_icon_animation.edc
                indicator_icon_animation.edj
                DEPENDS ${PROJECT_EDC_DIR}/indicator_icon_animation.edc

diff --git a/inc/indicator_gui.h b/inc/indicator_gui.h
index 145cfcdbe1f3f1c52c322ca178fe99b31bdba76d..5ea93da0bce4d67ecf40ce7e2dd03d159261818c 100644 (file)
--- a/inc/indicator_gui.h
+++ b/inc/indicator_gui.h
@@ -18,8 +18,21 @@
 #define __INDICATOR_GUI_H__
 
 /* DISPLAY */
+
+/* To be used in .c files */
+#ifdef TIZEN_PROFILE_COMMON
+#define INDICATOR_HEIGHT 34
+#define EDJE_BASE_SCALE 1.8
+#else
 #define INDICATOR_HEIGHT 40
 #define EDJE_BASE_SCALE 2.6
+#endif
+
+/* To be used in .edc files */
+#define EDJE_BASE_SCALE_MOBILE 2.6
+#define EDJE_BASE_SCALE_COMMON 1.8
+#define INDICATOR_HEIGHT_MOBILE 40
+#define INDICATOR_HEIGHT_COMMON 34
 
 #define ICON_PADDING           3
 

diff --git a/res/resource/indicator_icon_animation.edc b/res/resource/indicator_icon_animation.edc
index 891ae85252dab02789e5b23d2fa34f6b0708cdd1..b0803ff6f90afa3fb808e42bcb485374253968fd 100644 (file)
--- a/res/resource/indicator_icon_animation.edc
+++ b/res/resource/indicator_icon_animation.edc
@@ -18,7 +18,11 @@
 #include "indicator_common.edc"
 
 collections {
-       base_scale: EDJE_BASE_SCALE;
+#ifdef TIZEN_PROFILE_COMMON
+       base_scale: EDJE_BASE_SCALE_COMMON;
+#else
+       base_scale: EDJE_BASE_SCALE_MOBILE;
+#endif
 
        group {
                name: "elm/indicator/icon/base";

diff --git a/res/resource/indicator_icon_nonfixed_theme.edc b/res/resource/indicator_icon_nonfixed_theme.edc
index 869e3b6e9ebf0378db7aa84b7645a6d484b0be74..ea94d36885ad121a4b393fba913479f8b33ddc68 100644 (file)
--- a/res/resource/indicator_icon_nonfixed_theme.edc
+++ b/res/resource/indicator_icon_nonfixed_theme.edc
@@ -18,7 +18,11 @@
 #include "indicator_common.edc"
 
 collections {
-       base_scale: EDJE_BASE_SCALE;
+#ifdef TIZEN_PROFILE_COMMON
+       base_scale: EDJE_BASE_SCALE_COMMON;
+#else
+       base_scale: EDJE_BASE_SCALE_MOBILE;
+#endif
 
        group {
                name: "elm/indicator/icon/base";

diff --git a/res/resource/indicator_icon_theme.edc b/res/resource/indicator_icon_theme.edc
index 625ac099755894e340a6f927501cab8cf1123427..88d62d8f3eee908ed51c2ac3ec7e787ca90d2f2b 100644 (file)
--- a/res/resource/indicator_icon_theme.edc
+++ b/res/resource/indicator_icon_theme.edc
@@ -18,7 +18,11 @@
 #include "indicator_common.edc"
 
 collections {
-       base_scale: EDJE_BASE_SCALE;
+#ifdef TIZEN_PROFILE_COMMON
+       base_scale: EDJE_BASE_SCALE_COMMON;
+#else
+       base_scale: EDJE_BASE_SCALE_MOBILE;
+#endif
 
        group {
                name: "elm/indicator/icon/base";

diff --git a/res/resource/indicator_port.edc b/res/resource/indicator_port.edc
index 8af3896736c3e41ea49d4fde76bb451cb8210600..c4f9d6a39d99db9ea404fe1b3fa74bb413af68a8 100644 (file)
--- a/res/resource/indicator_port.edc
+++ b/res/resource/indicator_port.edc
@@ -19,7 +19,11 @@
 
 
 collections {
-       base_scale: EDJE_BASE_SCALE;
+#ifdef TIZEN_PROFILE_COMMON
+       base_scale: EDJE_BASE_SCALE_COMMON;
+#else
+       base_scale: EDJE_BASE_SCALE_MOBILE;
+#endif
 
        group {
                name: "indicator";
@@ -71,7 +75,11 @@ collections {
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       max: -1 INDICATOR_HEIGHT;
+#ifdef TIZEN_PROFILE_COMMON
+                                       max: -1 INDICATOR_HEIGHT_COMMON;
+#else
+                                       max: -1 INDICATOR_HEIGHT_MOBILE;
+#endif
                                        fixed: 0 1;
                                        color_class: "bg_default";
                                }

diff --git a/res/resource/ticker.edc b/res/resource/ticker.edc
index 6ded83e656536693d92e7e6d2950ccd191a4f2b2..609f892834b190659dfb06c94e2e23ac1a7ec996 100644 (file)
--- a/res/resource/ticker.edc
+++ b/res/resource/ticker.edc
@@ -20,7 +20,12 @@
 
 collections
 {
-       base_scale: EDJE_BASE_SCALE;
+#ifdef TIZEN_PROFILE_COMMON
+       base_scale: EDJE_BASE_SCALE_COMMON;
+#else
+       base_scale: EDJE_BASE_SCALE_MOBILE;
+#endif
+
        group {
                name: "indicator/tickernoti/text";
                data {

diff --git a/res/resource/ticker_animated_icon.edc b/res/resource/ticker_animated_icon.edc
index a9c07da1c41347557a7d4b4027f2e7d31f78f63d..884df16e8e779b5d8304f26f8e6157d8cca2e2d1 100644 (file)
--- a/res/resource/ticker_animated_icon.edc
+++ b/res/resource/ticker_animated_icon.edc
@@ -37,7 +37,11 @@ images {
        image: "noti_install_complete.png" COMP;
 }
 collections {
-       base_scale: EDJE_BASE_SCALE;
+#ifdef TIZEN_PROFILE_COMMON
+       base_scale: EDJE_BASE_SCALE_COMMON;
+#else
+       base_scale: EDJE_BASE_SCALE_MOBILE;
+#endif
        group {
                name: "quickpanel/animated_icon_download";
                parts {

diff --git a/res/resource/ticker_default.edc b/res/resource/ticker_default.edc
index ffc9d18a00efa4a16e652fd18e6f39a90a6000f5..0f09f36ebce193e203ecef1582d7b51aea841d9e 100644 (file)
--- a/res/resource/ticker_default.edc
+++ b/res/resource/ticker_default.edc
@@ -71,8 +71,13 @@ images
 }
 
 collections {
-       base_scale: EDJE_BASE_SCALE;
-       group {
+#ifdef TIZEN_PROFILE_COMMON
+       base_scale: EDJE_BASE_SCALE_COMMON;
+#else
+       base_scale: EDJE_BASE_SCALE_MOBILE;
+#endif
+
+               group {
                name: "quickpanel/root";
 
                script {