src/bin src/edje_external conflict fixed

[framework/uifw/elementary.git] / src / bin / test_launcher.c

diff --git a/src/bin/test_launcher.c b/src/bin/test_launcher.c
index ab1cc77..7111feb 100644 (file)
--- a/src/bin/test_launcher.c
+++ b/src/bin/test_launcher.c
@@ -15,15 +15,9 @@ mode_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
    EINA_LIST_FOREACH(mbs, l, mb)
      {
         if (elm_mapbuf_enabled_get(mb))
-<<<<<<< HEAD
-          elm_mapbuf_enabled_set(mb, 0);
-        else
-          elm_mapbuf_enabled_set(mb, 1);
-=======
           elm_mapbuf_enabled_set(mb, EINA_FALSE);
         else
           elm_mapbuf_enabled_set(mb, EINA_TRUE);
->>>>>>> remotes/origin/upstream
      }
 }
 
@@ -223,11 +217,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    elm_box_horizontal_set(bx, EINA_TRUE);
 
    sc = elm_scroller_add(win);
-<<<<<<< HEAD
-   elm_scroller_bounce_set(sc, 1, 0);
-=======
    elm_scroller_bounce_set(sc, EINA_TRUE, EINA_FALSE);
->>>>>>> remotes/origin/upstream
    elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
    evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_fill_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -275,11 +265,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
                   elm_object_scale_set(ic, 0.5);
                   snprintf(buf, sizeof(buf), "%s/images/icon_%02i.png", elm_app_data_dir_get(), n);
                   elm_icon_file_set(ic, buf, NULL);
-<<<<<<< HEAD
-                  elm_icon_scale_set(ic, 0, 0);
-=======
                   elm_icon_resizable_set(ic, 0, 0);
->>>>>>> remotes/origin/upstream
                   evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                   evas_object_size_hint_align_set(ic, 0.5, 0.5);
                   elm_table_pack(tb, ic, 1 + i, 1 + (j * 2), 1, 1);
@@ -342,11 +328,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    ck = elm_check_add(win);
    elm_object_text_set(ck, "Map");
-<<<<<<< HEAD
-   elm_check_state_set(ck, 0);
-=======
    elm_check_state_set(ck, EINA_FALSE);
->>>>>>> remotes/origin/upstream
    evas_object_smart_callback_add(ck, "changed", mode_cb, win);
    evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(ck, 0.05, 0.99);
@@ -355,11 +337,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    ck = elm_check_add(win);
    elm_object_text_set(ck, "A");
-<<<<<<< HEAD
-   elm_check_state_set(ck, 1);
-=======
    elm_check_state_set(ck, EINA_TRUE);
->>>>>>> remotes/origin/upstream
    evas_object_smart_callback_add(ck, "changed", alpha_cb, win);
    evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(ck, 0.20, 0.99);
@@ -368,11 +346,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    ck = elm_check_add(win);
    elm_object_text_set(ck, "Smo");
-<<<<<<< HEAD
-   elm_check_state_set(ck, 1);
-=======
    elm_check_state_set(ck, EINA_TRUE);
->>>>>>> remotes/origin/upstream
    evas_object_smart_callback_add(ck, "changed", smooth_cb, win);
    evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(ck, 0.40, 0.99);
@@ -381,11 +355,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    ck = elm_check_add(win);
    elm_object_text_set(ck, "FS");
-<<<<<<< HEAD
-   elm_check_state_set(ck, 0);
-=======
    elm_check_state_set(ck, EINA_FALSE);
->>>>>>> remotes/origin/upstream
    evas_object_smart_callback_add(ck, "changed", full_cb, win);
    evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(ck, 0.5, 0.99);
@@ -465,11 +435,7 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_data_set(win, "mbs", mbs);
 
    sc = elm_scroller_add(win);
-<<<<<<< HEAD
-   elm_scroller_bounce_set(sc, 1, 0);
-=======
    elm_scroller_bounce_set(sc, EINA_TRUE, EINA_FALSE);
->>>>>>> remotes/origin/upstream
    elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
    evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_win_resize_object_add(win, sc);
@@ -486,11 +452,7 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
 
    ck = elm_check_add(win);
    elm_object_text_set(ck, "Map");
-<<<<<<< HEAD
-   elm_check_state_set(ck, 0);
-=======
    elm_check_state_set(ck, EINA_FALSE);
->>>>>>> remotes/origin/upstream
    evas_object_smart_callback_add(ck, "changed", mode_cb, win);
    evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(ck, 0.05, 0.99);
@@ -499,11 +461,7 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
 
    ck = elm_check_add(win);
    elm_object_text_set(ck, "A");
-<<<<<<< HEAD
-   elm_check_state_set(ck, 1);
-=======
    elm_check_state_set(ck, EINA_TRUE);
->>>>>>> remotes/origin/upstream
    evas_object_smart_callback_add(ck, "changed", alpha_cb, win);
    evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(ck, 0.20, 0.99);
@@ -512,11 +470,7 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
 
    ck = elm_check_add(win);
    elm_object_text_set(ck, "Smo");
-<<<<<<< HEAD
-   elm_check_state_set(ck, 1);
-=======
    elm_check_state_set(ck, EINA_TRUE);
->>>>>>> remotes/origin/upstream
    evas_object_smart_callback_add(ck, "changed", smooth_cb, win);
    evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(ck, 0.40, 0.99);
@@ -525,11 +479,7 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
 
    ck = elm_check_add(win);
    elm_object_text_set(ck, "FS");
-<<<<<<< HEAD
-   elm_check_state_set(ck, 0);
-=======
    elm_check_state_set(ck, EINA_FALSE);
->>>>>>> remotes/origin/upstream
    evas_object_smart_callback_add(ck, "changed", full_cb, win);
    evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(ck, 0.5, 0.99);
@@ -561,11 +511,7 @@ l3_mode_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
    EINA_LIST_FOREACH(mbs, l, mb)
      {
         if (elm_mapbuf_enabled_get(mb))
-<<<<<<< HEAD
-          elm_mapbuf_enabled_set(mb, 0);
-=======
           elm_mapbuf_enabled_set(mb, EINA_FALSE);
->>>>>>> remotes/origin/upstream
         else
           elm_mapbuf_enabled_set(mb, 1);
      }
@@ -804,11 +750,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    elm_box_horizontal_set(bx, EINA_TRUE);
 
    sc = elm_scroller_add(win);
-<<<<<<< HEAD
-   elm_scroller_bounce_set(sc, 1, 0);
-=======
    elm_scroller_bounce_set(sc, EINA_TRUE, EINA_FALSE);
->>>>>>> remotes/origin/upstream
    elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
    evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_fill_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -867,11 +809,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
                   elm_object_scale_set(ic, 0.5);
                   snprintf(buf, sizeof(buf), "%s/images/icon_%02i.png", elm_app_data_dir_get(), n);
                   elm_icon_file_set(ic, buf, NULL);
-<<<<<<< HEAD
-                  elm_icon_scale_set(ic, 0, 0);
-=======
                   elm_icon_resizable_set(ic, 0, 0);
->>>>>>> remotes/origin/upstream
                   evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                   evas_object_size_hint_align_set(ic, 0.5, 0.5);
                   elm_object_part_content_set(ly2, "slot", ic);
@@ -925,11 +863,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
 
    ck = elm_check_add(win);
    elm_object_text_set(ck, "Map");
-<<<<<<< HEAD
-   elm_check_state_set(ck, 0);
-=======
    elm_check_state_set(ck, EINA_FALSE);
->>>>>>> remotes/origin/upstream
    evas_object_smart_callback_add(ck, "changed", l3_mode_cb, win);
    evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(ck, 0.05, 0.99);
@@ -956,11 +890,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
 
    ck = elm_check_add(win);
    elm_object_text_set(ck, "FS");
-<<<<<<< HEAD
-   elm_check_state_set(ck, 0);
-=======
    elm_check_state_set(ck, EINA_FALSE);
->>>>>>> remotes/origin/upstream
    evas_object_smart_callback_add(ck, "changed", l3_full_cb, win);
    evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(ck, 0.5, 0.99);
@@ -969,11 +899,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
 
    ck = elm_check_add(win);
    elm_object_text_set(ck, "Hid");
-<<<<<<< HEAD
-   elm_check_state_set(ck, 0);
-=======
    elm_check_state_set(ck, EINA_FALSE);
->>>>>>> remotes/origin/upstream
    evas_object_smart_callback_add(ck, "changed", l3_hidden_cb, win);
    evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(ck, 0.5, 0.99);