Elementary migration revision 69448

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

diff --git a/src/bin/test_cnp.c b/src/bin/test_cnp.c
index 9be8a58..0a22001 100644 (file)
--- a/src/bin/test_cnp.c
+++ b/src/bin/test_cnp.c
@@ -3,24 +3,17 @@
 # include "elementary_config.h"
 #endif
 #ifndef ELM_LIB_QUICKLAUNCH
-<<<<<<< HEAD
-=======
 
 static Evas_Object *glb;
 
->>>>>>> remotes/origin/upstream
 static void
 _bt_copy_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Object *en = (Evas_Object*)(data);
    const char *txt = elm_object_text_get(en);
 
-<<<<<<< HEAD
-   elm_cnp_selection_set(ELM_SEL_TYPE_CLIPBOARD, elm_object_parent_widget_get(en),
-=======
    elm_object_text_set(glb, txt);
    elm_cnp_selection_set(elm_object_parent_widget_get(en), ELM_SEL_TYPE_CLIPBOARD,
->>>>>>> remotes/origin/upstream
                          ELM_SEL_FORMAT_TEXT, txt, strlen(txt));
 }
 
@@ -29,10 +22,6 @@ _bt_paste_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
 {
    Evas_Object *en = (Evas_Object*)(data);
 
-<<<<<<< HEAD
-   elm_cnp_selection_get(ELM_SEL_TYPE_CLIPBOARD, ELM_SEL_FORMAT_TEXT,
-                         en, NULL, NULL);
-=======
    elm_cnp_selection_get(en, ELM_SEL_TYPE_CLIPBOARD, ELM_SEL_FORMAT_TEXT,
                          NULL, NULL);
 }
@@ -44,17 +33,12 @@ _bt_clear_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
 
    elm_object_text_set(glb, "");
    elm_object_cnp_selection_clear(elm_object_parent_widget_get(en), ELM_SEL_TYPE_CLIPBOARD);
->>>>>>> remotes/origin/upstream
 }
 
 void
 test_cnp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-<<<<<<< HEAD
-   Evas_Object *win, *bg, *gd, *bt, *en;
-=======
    Evas_Object *win, *bg, *gd, *bt, *en, *lb;
->>>>>>> remotes/origin/upstream
 
    win = elm_win_add(NULL, "CopyPaste", ELM_WIN_BASIC);
    elm_win_title_set(win, "CopyPaste");
@@ -76,23 +60,13 @@ test_cnp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
    elm_entry_line_wrap_set(en, ELM_WRAP_CHAR);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
-<<<<<<< HEAD
-   elm_object_text_set(en,
-                               "Elementary provides "
-                                );
-   elm_grid_pack(gd, en, 10, 10, 60, 40);
-=======
    elm_object_text_set(en, "Elementary provides ");
    elm_grid_pack(gd, en, 10, 10, 60, 30);
->>>>>>> remotes/origin/upstream
    evas_object_show(en);
 
    bt = elm_button_add(win);
    elm_object_text_set(bt, "Copy from left entry");
    evas_object_smart_callback_add(bt, "clicked", _bt_copy_clicked, en);
-<<<<<<< HEAD
-   elm_grid_pack(gd, bt, 70, 10, 22, 40);
-=======
    elm_grid_pack(gd, bt, 70, 10, 22, 30);
    evas_object_show(bt);
 
@@ -100,7 +74,6 @@ test_cnp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
    elm_object_text_set(bt, "Clear clipboard");
    evas_object_smart_callback_add(bt, "clicked", _bt_clear_clicked, en);
    elm_grid_pack(gd, bt, 70, 70, 22, 20);
->>>>>>> remotes/origin/upstream
    evas_object_show(bt);
 
    en = elm_entry_add(win);
@@ -108,26 +81,13 @@ test_cnp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
    elm_entry_line_wrap_set(en, ELM_WRAP_CHAR);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
-<<<<<<< HEAD
-   elm_object_text_set(en,
-                               "rich copying and pasting functionality,"
-                                );
-   elm_grid_pack(gd, en, 10, 50, 60, 40);
-=======
    elm_object_text_set(en, "rich copying and pasting functionality,");
    elm_grid_pack(gd, en, 10, 40, 60, 30);
->>>>>>> remotes/origin/upstream
    evas_object_show(en);
 
    bt = elm_button_add(win);
    elm_object_text_set(bt, "Paste to left entry");
    evas_object_smart_callback_add(bt, "clicked", _bt_paste_clicked, en);
-<<<<<<< HEAD
-   elm_grid_pack(gd, bt, 70, 50, 22, 40);
-   evas_object_show(bt);
-
-   evas_object_resize(win, 480, 140);
-=======
    elm_grid_pack(gd, bt, 70, 40, 22, 30);
    evas_object_show(bt);
 
@@ -146,7 +106,6 @@ test_cnp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
    evas_object_show(glb);
 
    evas_object_resize(win, 480, 200);
->>>>>>> remotes/origin/upstream
    evas_object_show(win);
 }
 #endif