Replace DYNAMICBOX with WIDGET

Change-Id: I4fa263e6a23e097be90fe8ba2d5fe1fd457014db
Signed-off-by: Kyuho Jo <kyuho.jo@samsung.com>

diff --git a/TC/testcase/utc_shortcut.c b/TC/testcase/utc_shortcut.c
index d5879ee..efdb4c3 100755 (executable)
--- a/TC/testcase/utc_shortcut.c
+++ b/TC/testcase/utc_shortcut.c
@@ -133,7 +133,7 @@ static void utc_shortcut_get_list_p(void)
 static void utc_add_to_home_dynamicbox_n(void)
 {
        int ret;
-       ret = add_to_home_dynamicbox("fail", NULL, DYNAMICBOX_TYPE_1x1, NULL, NULL, -1.0f, 1, response_cb, (void *)1);
+       ret = add_to_home_dynamicbox("fail", NULL, WIDGET_SIZE_1x1, NULL, NULL, -1.0f, 1, response_cb, (void *)1);
        if (ret != SHORTCUT_ERROR_NONE) {
                dts_check_eq("add_to_home_dynamicbox", ret, SHORTCUT_ERROR_NONE, "success");
        }
@@ -142,7 +142,7 @@ static void utc_add_to_home_dynamicbox_n(void)
 static void utc_add_to_home_dynamicbox_p(void)
 {
        int ret;
-       ret = add_to_home_dynamicbox("success", NULL, DYNAMICBOX_TYPE_1x1, NULL, NULL, -1.0f, 1, response_cb, (void *)2);
+       ret = add_to_home_dynamicbox("success", NULL, WIDGET_SIZE_1x1, NULL, NULL, -1.0f, 1, response_cb, (void *)2);
        if (ret != SHORTCUT_ERROR_NONE) {
                dts_check_eq("add_to_home_dynamicbox", ret, SHORTCUT_ERROR_NONE, "success");
        }
@@ -260,7 +260,7 @@ static void utc_shortcut_icon_request_send_n(void)
 {
        int ret;
 
-       ret = shortcut_icon_request_send(NULL, DYNAMICBOX_TYPE_1x1, NULL, NULL, NULL, NULL, NULL);
+       ret = shortcut_icon_request_send(NULL, WIDGET_SIZE_1x1, NULL, NULL, NULL, NULL, NULL);
        dts_check_eq("shortcut_icon_request_send", ret, SHORTCUT_ERROR_INVALID_PARAMETER, "success");
 }
 
@@ -278,7 +278,7 @@ static void utc_shortcut_icon_request_send_p(void)
                return;
        }
 
-       ret = shortcut_icon_request_send(s_info.handle, DYNAMICBOX_TYPE_1x1, NULL, NULL, "/tmp/icon.png", result_cb, NULL);
+       ret = shortcut_icon_request_send(s_info.handle, WIDGET_SIZE_1x1, NULL, NULL, "/tmp/icon.png", result_cb, NULL);
        dts_check_eq("shortcut_icon_request_send", ret, 0, "success");
 }
 

diff --git a/lib/include/shortcut.h b/lib/include/shortcut.h
index c741f75..d740651 100755 (executable)
--- a/lib/include/shortcut.h
+++ b/lib/include/shortcut.h
@@ -92,18 +92,18 @@ enum shortcut_internal_type {
 
        DYNAMICBOX_TYPE_DEFAULT   = 0x10000000, /**< Type mask for the default dynamicbox */
        DYNAMICBOX_TYPE_EASY_DEFAULT = 0x30000000,      /**< Type mask for the easy mode dynamicbox */
-       DYNAMICBOX_TYPE_1x1       = 0x10010000, /**< 1x1 */
-       DYNAMICBOX_TYPE_2x1       = 0x10020000, /**< 2x1 */
-       DYNAMICBOX_TYPE_2x2       = 0x10040000, /**< 2x2 */
-       DYNAMICBOX_TYPE_4x1       = 0x10080000, /**< 4x1 */
-       DYNAMICBOX_TYPE_4x2       = 0x10100000, /**< 4x2 */
-       DYNAMICBOX_TYPE_4x3       = 0x10200000, /**< 4x3 */
-       DYNAMICBOX_TYPE_4x4       = 0x10400000, /**< 4x4 */
-       DYNAMICBOX_TYPE_4x5       = 0x11000000, /**< 4x5 */
-       DYNAMICBOX_TYPE_4x6       = 0x12000000, /**< 4x6 */
-       DYNAMICBOX_TYPE_EASY_1x1          = 0x30010000, /**< Easy mode 1x1 */
-       DYNAMICBOX_TYPE_EASY_3x1          = 0x30020000, /**< Easy mode 3x2 */
-       DYNAMICBOX_TYPE_EASY_3x3          = 0x30040000, /**< Easy mode 3x3 */
+       WIDGET_SIZE_1x1   = 0x10010000, /**< 1x1 */
+       WIDGET_SIZE_2x1   = 0x10020000, /**< 2x1 */
+       WIDGET_SIZE_2x2   = 0x10040000, /**< 2x2 */
+       WIDGET_SIZE_4x1   = 0x10080000, /**< 4x1 */
+       WIDGET_SIZE_4x2   = 0x10100000, /**< 4x2 */
+       WIDGET_SIZE_4x3           = 0x10200000, /**< 4x3 */
+       WIDGET_SIZE_4x4   = 0x10400000, /**< 4x4 */
+       WIDGET_SIZE_4x5   = 0x11000000, /**< 4x5 */
+       WIDGET_SIZE_4x6   = 0x12000000, /**< 4x6 */
+       WIDGET_SIZE_EASY_1x1      = 0x30010000, /**< Easy mode 1x1 */
+       WIDGET_SIZE_EASY_3x1      = 0x30020000, /**< Easy mode 3x2 */
+       WIDGET_SIZE_EASY_3x3      = 0x30040000, /**< Easy mode 3x3 */
        DYNAMICBOX_TYPE_UNKNOWN   = 0x1FFF0000, /**< Error */
 };
 

diff --git a/test/icon.c b/test/icon.c
index 724153d..a2ec08d 100755 (executable)
--- a/test/icon.c
+++ b/test/icon.c
@@ -51,14 +51,14 @@ static Eina_Bool test_main(void *data)
        snprintf(filename, sizeof(filename), "/opt/usr/share/live_magazine/always/out%d.png", idx);
 
        switch (idx % 7) {
-       case 0: type = DYNAMICBOX_TYPE_1x1; break;
-       case 1: type = DYNAMICBOX_TYPE_2x1; break;
-       case 2: type = DYNAMICBOX_TYPE_2x2; break;
-       case 3: type = DYNAMICBOX_TYPE_4x1; break;
-       case 4: type = DYNAMICBOX_TYPE_4x2; break;
-       case 5: type = DYNAMICBOX_TYPE_4x3; break;
-       case 6: type = DYNAMICBOX_TYPE_4x4; break;
-       default: type = DYNAMICBOX_TYPE_1x1; break;
+       case 0: type = WIDGET_SIZE_1x1; break;
+       case 1: type = WIDGET_SIZE_2x1; break;
+       case 2: type = WIDGET_SIZE_2x2; break;
+       case 3: type = WIDGET_SIZE_4x1; break;
+       case 4: type = WIDGET_SIZE_4x2; break;
+       case 5: type = WIDGET_SIZE_4x3; break;
+       case 6: type = WIDGET_SIZE_4x4; break;
+       default: type = WIDGET_SIZE_1x1; break;
        }
 
        ret = shortcut_icon_request_send(handle, type, NULL, NULL, filename, result_cb, NULL);