Resolve the conflicts.
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 3 Nov 2015 09:28:53 +0000 (18:28 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 3 Nov 2015 09:28:53 +0000 (18:28 +0900)
Change-Id: Ia166d3ec942fda47829d93e9d35085dd507f3e1f

23 files changed:
data/themes/edc/comp.edc
data/themes/edc/elm/button.edc
data/themes/edc/elm/spinner.edc
src/bin/test_popup.c
src/lib/Makefile.am
src/lib/elc_popup.c
src/lib/elm_cnp.c
src/lib/elm_gengrid.eo
src/lib/elm_gengrid_item.eo
src/lib/elm_genlist.c
src/lib/elm_genlist_item.eo
src/lib/elm_list.c
src/lib/elm_list_item.eo
src/lib/elm_photocam.c
src/lib/elm_photocam.eo
src/lib/elm_radio.c
src/lib/elm_radio.eo
src/lib/elm_scroller.eo
src/lib/elm_scroller_legacy.h
src/lib/elm_segment_control_item.eo
src/lib/elm_spinner.c
src/lib/elm_spinner.eo
src/lib/elm_widget.h

index 112dc6d26313137bfe643bcad8b7f0cb9cfc180d..c6b6fd76ee28f78ef115226d11fff5f9f5934e6e 100644 (file)
@@ -289,12 +289,7 @@ group { name: "e/comp/frame/default";
             image.normal: "win_glow.png";
             image.border: 9 9 9 9;
             image.middle: 0;
-<<<<<<< HEAD
-            rel1.to: "gspacer";
-            rel2.to: "gspacer";
-=======
             rel.to: "gspacer";
->>>>>>> opensource/master
             fill.smooth: 0;
             color: 255 255 255 0;
             visible: 0;
index 4081363ca74afac5f9f8fb61c20b428a468bd6ea..c1712873fe525ff0696136e95b282cb83087462e 100644 (file)
@@ -1530,11 +1530,7 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default";
                }
             }
             description { state: "disabled" 0.0;
-<<<<<<< HEAD
-               inherit: "default" 0 0 ;
-=======
                inherit: "default" 0.0 ;
->>>>>>> opensource/master
                color: FN_COL_DISABLE;
                color_class: "spinner_disabled";
             }
index 3c6b95fb470a9ec48a2437fee09aad5f562dd3f9..b2d1a29322618247a4f7d775c7cf29f42aababb8 100644 (file)
@@ -2,12 +2,6 @@ group { name: "elm/spinner/base/default";
    alias: "elm/spinner/base/colorselector/default";
    images.image: "vert_bar_inset.png" COMP;
    parts {
-<<<<<<< HEAD
-      part { name: "bg";
-         type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-=======
       part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
             rel1.to: "elm.swallow.text_button";
@@ -18,7 +12,6 @@ group { name: "elm/spinner/base/default";
          type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
->>>>>>> opensource/master
          }
       }
       part { name: "inset"; mouse_events: 0;
@@ -48,14 +41,9 @@ group { name: "elm/spinner/base/default";
       }
       part { name: "elm.swallow.entry";
          type: SWALLOW;
-<<<<<<< HEAD
-         description { state: "default" 0.0;
-            fixed: 1 0;
-=======
          clip_to: "clip";
          description { state: "default" 0.0;
             fixed: 1 1;
->>>>>>> opensource/master
             rel1.to: "elm.swallow.text_button";
             rel2.to: "elm.swallow.text_button";
             visible: 0;
@@ -195,26 +183,6 @@ group { name: "elm/spinner/base/vertical";
       part { name: "elm.swallow.inc_button";
          type: SWALLOW;
          scale: 1;
-<<<<<<< HEAD
-         description { state: "default" 0.0;
-            rel1.to: "inset";
-            rel1.offset: 1 1;
-            rel1.relative: 1.0 0.0;
-            rel2.to: "inset";
-            rel2.offset: 1 -2;
-            align: 1.0 0.5;
-         }
-      }
-      part { name: "elm.swallow.text_button";
-         type: SWALLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-            visible: 1;
-            rel1.to_y: "inset";
-            rel1.to_x: "elm.swallow.dec_button";
-            rel1.relative: 1.0 0.0;
-            rel1.offset: 1 1;
-=======
          description { state: "default" 0.0;
             rel1.to: "inset";
             rel1.offset: 1 1;
@@ -233,7 +201,6 @@ group { name: "elm/spinner/base/vertical";
             rel1.to_x: "elm.swallow.dec_button";
             rel1.relative: 1.0 0.0;
             rel1.offset: 1 1;
->>>>>>> opensource/master
             rel2.to_y: "inset";
             rel2.to_x: "elm.swallow.inc_button";
             rel2.relative: 0.0 1.0;
index a811417277e7cd16cf45935b631d98df8863b2bb..dcfba0eebc942581a4a25a28882c4f36fc5383c2 100644 (file)
@@ -656,57 +656,6 @@ _popup_center_title_list_content_1button_cb(void *data, Evas_Object *obj EINA_UN
 
 static void
 _popup_center_title_genlist_content_1button_cb(void *data, Evas_Object *obj EINA_UNUSED,
-<<<<<<< HEAD
-                                            void *event_info EINA_UNUSED)
-{
-   Evas_Object *popup, *genlist;
-   Evas_Object *btn;
-   int i;
-
-   popup = elm_popup_add(data);
-   elm_object_part_text_set(popup, "title,text", "Title");
-
-   Elm_Genlist_Item_Class *itc1 = elm_genlist_item_class_new();
-   itc1->item_style = "default";
-   itc1->func.text_get = gl_popup_text_get;
-   itc1->func.content_get = NULL;
-   itc1->func.state_get = NULL;
-   itc1->func.del = NULL;
-
-   // genlist as a popup content
-   genlist = elm_genlist_add(popup);
-   elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
-   elm_scroller_content_min_limit(genlist, EINA_FALSE, EINA_TRUE);
-
-   for (i = 0; i < 10; i++)
-     {
-        elm_genlist_item_append(genlist,
-                                itc1,
-                                (void *)(uintptr_t)i/* item data */,
-                                NULL/* parent */,
-                                ELM_GENLIST_ITEM_NONE,
-                                NULL,
-                                NULL);
-     }
-   elm_genlist_item_class_free(itc1);
-   elm_object_content_set(popup, genlist);
-
-   // popup buttons
-   btn = elm_button_add(popup);
-   elm_object_text_set(btn, "OK");
-   elm_object_part_content_set(popup, "button1", btn);
-   evas_object_smart_callback_add(btn, "clicked", _popup_close_cb, popup);
-
-   // popup show should be called after adding all the contents and the buttons
-   // of popup to set the focus into popup's contents correctly.
-   evas_object_show(popup);
-}
-
-
-static void
-_subpopup_cb(void *data, Evas_Object *obj EINA_UNUSED,
-=======
->>>>>>> opensource/master
                                             void *event_info EINA_UNUSED)
 {
    Evas_Object *popup, *genlist;
index c8aa293d13bba34f3a7b61021a6e4528b2ea96a1..21242624feeb489a111c1b7f2a49aa4f0166cf90 100644 (file)
@@ -648,120 +648,6 @@ EXTRA_DIST += ${elementaryeolianfiles_DATA}
 nodist_includesunstable_HEADERS = $(elm_eolian_h) $(elm_eolian_legacy_h) $(elm_eolian_eot_h)
 CLEANFILES += $(nodist_includesunstable_HEADERS)
 
-<<<<<<< HEAD
-elementaryeolianfilesdir = $(datadir)/eolian/include/elementary-@VMAJ@
-elementaryeolianfiles_DATA = \
-            elm_widget.eo \
-            elm_container.eo \
-            elm_layout.eo \
-            elm_interface_scrollable.eo \
-            elm_pan.eo \
-            elm_frame.eo \
-            elm_hover.eo \
-            elm_access.eo \
-            elm_actionslider.eo \
-            elm_app_client.eo \
-            elm_app_client_view.eo \
-            elm_app_server.eo \
-            elm_app_server_view.eo \
-            elm_atspi_app_object.eo \
-            elm_interface_atspi_accessible.eo \
-            elm_interface_atspi_action.eo \
-            elm_interface_atspi_component.eo \
-            elm_interface_atspi_editable_text.eo \
-            elm_interface_atspi_image.eo \
-            elm_interface_atspi_selection.eo \
-            elm_interface_atspi_text.eo \
-            elm_interface_atspi_value.eo \
-            elm_interface_atspi_widget_action.eo \
-            elm_interface_atspi_window.eo \
-            elm_bg.eo \
-            elm_box.eo \
-            elm_bubble.eo \
-            elm_button.eo \
-            elm_calendar.eo \
-            elm_check.eo \
-            elm_clock.eo \
-            elm_colorselector.eo \
-            elm_conformant.eo \
-            elm_ctxpopup.eo \
-            elm_datetime.eo \
-            elm_dayselector.eo \
-            elm_diskselector.eo \
-            elm_entry.eo \
-            elm_fileselector.eo \
-            elm_fileselector_button.eo \
-            elm_fileselector_entry.eo \
-            elm_flipselector.eo \
-            elm_flip.eo \
-            elm_gengrid.eo \
-            elm_gengrid_pan.eo \
-            elm_genlist.eo \
-            elm_genlist_pan.eo \
-            elm_gesture_layer.eo \
-            elm_glview.eo \
-            elm_grid.eo \
-            elm_hoversel.eo \
-            elm_image.eo \
-            elm_icon.eo \
-            elm_index.eo \
-            elm_interface_fileselector.eo \
-            elm_inwin.eo \
-            elm_label.eo \
-            elm_list.eo \
-            elm_map_pan.eo \
-            elm_map.eo \
-            elm_menu.eo \
-            elm_multibuttonentry.eo \
-            elm_naviframe.eo \
-            elm_panel.eo \
-            elm_mapbuf.eo \
-            elm_notify.eo \
-            elm_panes.eo \
-            elm_photocam.eo \
-            elm_photocam_pan.eo \
-            elm_photo.eo \
-            elm_player.eo \
-            elm_plug.eo \
-            elm_popup.eo \
-            elm_prefs.eo \
-            elm_progressbar.eo \
-            elm_radio.eo \
-            elm_route.eo \
-            elm_scroller.eo \
-            elm_segment_control.eo \
-            elm_separator.eo \
-            elm_slider.eo \
-            elm_slideshow.eo \
-            elm_spinner.eo \
-            elm_systray.eo \
-            elm_table.eo \
-            elm_thumb.eo \
-            elm_toolbar.eo \
-            elm_video.eo \
-            elm_web.eo \
-            elm_win.eo \
-            elm_widget_item.eo \
-            elm_color_item.eo \
-            elm_dayselector_item.eo \
-            elm_hoversel_item.eo \
-            elm_segment_control_item.eo \
-            elm_slideshow_item.eo \
-            elm_flipselector_item.eo \
-            elm_menu_item.eo \
-            elm_ctxpopup_item.eo \
-            elm_index_item.eo \
-            elm_multibuttonentry_item.eo \
-            elm_naviframe_item.eo \
-            elm_genlist_item.eo \
-            elm_gengrid_item.eo \
-            elm_list_item.eo \
-            elm_toolbar_item.eo \
-            elm_diskselector_item.eo \
-            elm_popup_item.eo
-
-=======
->>>>>>> opensource/master
 EXTRA_DIST += ${elementaryeolianfiles_DATA}
 
 includecxxbindingsdir = $(includedir)/elementary-cxx-@VMAJ@
index fa3db0675ec07f1d2b9cab4abc790ffbd321fbc6..84ccc2ec89967febbeb3261aefa46b48460a2109 100644 (file)
@@ -44,15 +44,12 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
 
 static Eina_Bool _key_action_move(Evas_Object *obj, const char *params);
 static void _parent_geom_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED);
-<<<<<<< HEAD
-=======
 static Eina_Bool
 _block_clicked_cb(void *data, Eo *obj EINA_UNUSED,
                   const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED);
 static Eina_Bool
 _timeout_cb(void *data, Eo *obj EINA_UNUSED,
             const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED);
->>>>>>> opensource/master
 
 static const Elm_Action key_actions[] = {
    {"move", _key_action_move},
@@ -396,10 +393,7 @@ _elm_popup_elm_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd)
      elm_layout_signal_emit(sd->content_area, "elm,scroll,enable", "elm");
 
    _visuals_set(obj);
-<<<<<<< HEAD
-=======
    _scroller_size_calc(obj);
->>>>>>> opensource/master
    elm_layout_sizing_eval(obj);
 
    /* access */
@@ -492,10 +486,6 @@ _elm_popup_elm_widget_sub_object_del(Eo *obj, Elm_Popup_Data *sd, Evas_Object *s
    if (sobj == sd->title_icon)
      {
         elm_layout_signal_emit(sd->main_layout, "elm,state,title,icon,hidden", "elm");
-<<<<<<< HEAD
-        sd->title_icon = NULL;
-=======
->>>>>>> opensource/master
      }
    else if ((it =
                evas_object_data_get(sobj, "_popup_icon_parent_item")) != NULL)
@@ -1221,8 +1211,6 @@ _action_button_set(Evas_Object *obj,
      (sd->action_area, buf, sd->buttons[idx]->btn);
 <<<<<<< HEAD
 
-   if (sd->items) _scroller_size_calc(obj);
-
    elm_layout_sizing_eval(obj);
 =======
 >>>>>>> opensource/master
index 2051fd1ec6c836e3e59234bb339f9824090a546f..0491fb80686b84ca2f58fc6d2ba979662962c8af 100644 (file)
@@ -4024,12 +4024,8 @@ _elm_item_container_pos_cb(void *data, Evas_Object *obj, Evas_Coord x, Evas_Coor
      {  /* Call container drop func with specific item pointer */
         int xo = 0;
         int yo = 0;
-<<<<<<< HEAD
-        eo_do(obj, efl_gfx_position_get(&xo, &yo));
-=======
 
         evas_object_geometry_get(obj, &xo, &yo, NULL, NULL);
->>>>>>> opensource/master
         if (st->itemgetcb)
           it = st->itemgetcb(obj, x+xo, y+yo, &xposret, &yposret);
 
@@ -4051,12 +4047,8 @@ _elm_item_container_drop_cb(void *data, Evas_Object *obj , Elm_Selection_Data *e
      {  /* Call container drop func with specific item pointer */
         int xo = 0;
         int yo = 0;
-<<<<<<< HEAD
-        eo_do(obj, efl_gfx_position_get(&xo, &yo));
-=======
 
         evas_object_geometry_get(obj, &xo, &yo, NULL, NULL);
->>>>>>> opensource/master
         if (st->itemgetcb)
           it = st->itemgetcb(obj, ev->x+xo, ev->y+yo, &xposret, &yposret);
 
index 88034b990e0ad0476402dc1f1e61cbfd764b0427..e141c8c8b2749d46d1e3627dd749c791d52266c2 100644 (file)
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-class Elm_Gengrid (Elm_Layout, Elm_Interface_Scrollable,
-                   Evas.Clickable_Interface, Elm_Interface_Atspi_Widget_Action)
-=======
 import elm_general;
 
 enum Elm.Gengrid.Reorder_Type
@@ -13,7 +9,6 @@ enum Elm.Gengrid.Reorder_Type
 class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
                    Evas.Clickable_Interface, Elm_Interface_Atspi_Widget_Action,
                    Elm_Interface_Atspi_Selection)
->>>>>>> opensource/master
 {
    eo_prefix: elm_obj_gengrid;
    methods {
@@ -142,11 +137,7 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
             [[Get the gengrid select mode.]]
          }
          values {
-<<<<<<< HEAD
-            Elm_Object_Select_Mode mode(4); /*@ The select mode */
-=======
             mode: Elm.Object.Select_Mode(Elm.Object.Select_Mode.max); [[The select mode.]]
->>>>>>> opensource/master
          }
       }
       @property reorder_mode {
@@ -242,11 +233,7 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
             ]]
          }
          values {
-<<<<<<< HEAD
-            Elm_Object_Multi_Select_Mode mode(2); /*@ The multi select mode */
-=======
             mode: Elm.Object.Multi_Select_Mode(Elm.Object.Multi_Select_Mode.max); [[The multi select mode.]]
->>>>>>> opensource/master
          }
       }
       @property horizontal {
@@ -555,22 +542,6 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
       Evas.Object_Smart.del;
       Evas.Object_Smart.member_add;
       Evas.Object_Smart.resize;
-<<<<<<< HEAD
-      Elm_Widget.theme_apply;
-      Elm_Widget.focus_next_manager_is;
-      Elm_Widget.focus_direction_manager_is;
-      Elm_Widget.access;
-      Elm_Widget.focus_next;
-      Elm_Widget.focus_direction;
-      Elm_Widget.on_focus;
-      Elm_Widget.on_focus_region;
-      Elm_Widget.event;
-      Elm_Widget.focus_highlight_geometry_get;
-      Elm_Widget.focused_item.get;
-      Elm_Widget.item_loop_enabled.set;
-      Elm_Widget.item_loop_enabled.get;
-      Elm_Layout.sizing_eval;
-=======
       Elm.Widget.theme_apply;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
@@ -585,7 +556,6 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
       Elm.Widget.item_loop_enabled.set;
       Elm.Widget.item_loop_enabled.get;
       Elm.Layout.sizing_eval;
->>>>>>> opensource/master
       Elm_Interface_Scrollable.bounce_allow.set;
       Elm_Interface_Scrollable.policy;
       Elm_Interface_Atspi_Accessible.children.get;
index 38fb8223bfc0d1d6f87e68fc4bf7c1ffd5becd74..95a079c79aefc851f6a78a1cbe5fd8a78756875e 100644 (file)
@@ -83,11 +83,7 @@ class Elm.Gengrid_Item(Elm.Widget_Item)
                      [[Get the index of the item. It is only valid once displayed.]]
                 }
                 values {
-<<<<<<< HEAD
-                     int index(-1); /*@ @return the position inside the list of item. */
-=======
                      index: int(-1); [[the position inside the list of item.]]
->>>>>>> opensource/master
                 }
            }
            @property pos {
@@ -197,24 +193,6 @@ class Elm.Gengrid_Item(Elm.Widget_Item)
       }
       implements {
            Eo.Base.constructor;
-<<<<<<< HEAD
-           Elm_Widget_Item.del_pre;
-           Elm_Widget_Item.disable;
-           Elm_Widget_Item.signal_emit;
-           Elm_Widget_Item.focus.set;
-           Elm_Widget_Item.focus.get;
-           Elm_Widget_Item.part_text.get;
-           Elm_Widget_Item.part_content.get;
-           Elm_Widget_Item.tooltip_text_set;
-           Elm_Widget_Item.tooltip_style.get;
-           Elm_Widget_Item.tooltip_style.set;
-           Elm_Widget_Item.tooltip_window_mode.get;
-           Elm_Widget_Item.tooltip_window_mode.set;
-           Elm_Widget_Item.tooltip_content_cb_set;
-           Elm_Widget_Item.tooltip_unset;
-           Elm_Widget_Item.cursor.set;
-           Elm_Widget_Item.cursor_unset;
-=======
            Elm.Widget_Item.del_pre;
            Elm.Widget_Item.disable;
            Elm.Widget_Item.signal_emit;
@@ -231,7 +209,6 @@ class Elm.Gengrid_Item(Elm.Widget_Item)
            Elm.Widget_Item.tooltip_unset;
            Elm.Widget_Item.cursor.set;
            Elm.Widget_Item.cursor_unset;
->>>>>>> opensource/master
            Elm_Interface_Atspi_Accessible.name.get;
            Elm_Interface_Atspi_Accessible.state_set.get;
            Elm_Interface_Atspi_Accessible.children.get;
index a019044e7af214da9a50a7d111f0d2f9cbd2c629..30052a02246cce3833ac5b410cec43e34f664c39 100644 (file)
@@ -396,15 +396,12 @@ _item_content_realize(Elm_Gen_Item *it,
 
              snprintf(buf, sizeof(buf), "elm,state,%s,visible", key);
              edje_object_signal_emit(target, buf, "elm");
-<<<<<<< HEAD
-=======
 
              if (_elm_config->atspi_mode && eo_isa(content, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
                {
                   eo_do(content, elm_interface_atspi_accessible_parent_set(EO_OBJ(it)));
                   elm_interface_atspi_accessible_children_changed_added_signal_emit(EO_OBJ(it), content);
                }
->>>>>>> opensource/master
           }
      }
 }
@@ -1285,11 +1282,7 @@ _elm_genlist_item_state_update(Elm_Gen_Item *it)
              (it->deco_all_view, SIGNAL_EXPANDED, "elm");
      }
    if (it == (Elm_Gen_Item *)GL_IT(it)->wsd->focused_item &&
-<<<<<<< HEAD
-       elm_widget_focus_highlight_enabled_get(WIDGET(it)))
-=======
        (elm_widget_focus_highlight_enabled_get(WIDGET(it)) || _elm_config->win_auto_focus_enable))
->>>>>>> opensource/master
      edje_object_signal_emit(VIEW(it), SIGNAL_FOCUSED, "elm");
 }
 
@@ -1808,18 +1801,7 @@ _item_realize(Elm_Gen_Item *it,
 
         if (EO_OBJ(it) == sd->focused_item)
           {
-<<<<<<< HEAD
-             const char *focus_raise;
-             if (elm_widget_focus_highlight_enabled_get(WIDGET(it)))
-               edje_object_signal_emit(VIEW(it), SIGNAL_FOCUSED, "elm");
-
-             focus_raise = edje_object_data_get(VIEW(it), "focusraise");
-             if ((focus_raise) && (!strcmp(focus_raise, "on")))
-               evas_object_raise(VIEW(it));
-
-=======
              _elm_genlist_item_focus_update(it);
->>>>>>> opensource/master
              _elm_widget_item_highlight_in_theme(WIDGET(it), EO_OBJ(it));
              _elm_widget_highlight_in_theme_update(WIDGET(it));
              _elm_widget_focus_highlight_start(WIDGET(it));
@@ -2674,20 +2656,8 @@ _elm_genlist_item_focused(Elm_Object_Item *eo_it)
    sd->focused_item = eo_it;
 
    if (it->realized)
-<<<<<<< HEAD
-     {
-        if (elm_widget_focus_highlight_enabled_get(obj))
-          edje_object_signal_emit(VIEW(it), SIGNAL_FOCUSED, "elm");
-
-        focus_raise = edje_object_data_get(VIEW(it), "focusraise");
-        if ((focus_raise) && (!strcmp(focus_raise, "on")))
-          evas_object_raise(VIEW(it));
-     }
-   evas_object_smart_callback_call(obj, SIG_ITEM_FOCUSED, eo_it);
-=======
      _elm_genlist_item_focus_update(it);
    eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_ITEM_FOCUSED, eo_it));
->>>>>>> opensource/master
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
 }
@@ -2715,11 +2685,7 @@ _elm_genlist_item_unfocused(Elm_Object_Item *eo_it)
      }
 
    sd->focused_item = NULL;
-<<<<<<< HEAD
-   evas_object_smart_callback_call(obj, SIG_ITEM_UNFOCUSED, eo_it);
-=======
    eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_ITEM_UNFOCUSED, eo_it));
->>>>>>> opensource/master
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
 }
@@ -3079,11 +3045,7 @@ _key_action_select(Evas_Object *obj, const char *params)
         if (_item_select(it)) goto deleted;
      }
 
-<<<<<<< HEAD
-   evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, EO_OBJ(it));
-=======
    eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_ACTIVATED, EO_OBJ(it)));
->>>>>>> opensource/master
 
    return EINA_TRUE;
 
@@ -6015,19 +5977,12 @@ _elm_genlist_item_elm_widget_item_focus_get(Eo *eo_it, Elm_Gen_Item *it)
 EOLIAN static Eo *
 _elm_genlist_item_eo_base_constructor(Eo *eo_it, Elm_Gen_Item *it)
 {
-<<<<<<< HEAD
-   eo_do_super(eo_it, ELM_GENLIST_ITEM_CLASS, eo_constructor());
-
-   it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
-   eo_do(eo_it, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST_ITEM));
-=======
    eo_it = eo_do_super_ret(eo_it, ELM_GENLIST_ITEM_CLASS, eo_it, eo_constructor());
 
    it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
    eo_do(eo_it, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST_ITEM));
 
    return eo_it;
->>>>>>> opensource/master
 }
 
 static Elm_Gen_Item *
@@ -7239,9 +7194,6 @@ _elm_genlist_item_elm_widget_item_tooltip_window_mode_set(Eo *eo_it, Elm_Gen_Ite
 EAPI Eina_Bool
 elm_genlist_item_tooltip_window_mode_get(const Elm_Object_Item *eo_it)
 {
-<<<<<<< HEAD
-   return eo_do(eo_it, elm_wdg_item_tooltip_window_mode_get());
-=======
    Eina_Bool ret;
    return eo_do_ret(eo_it, ret, elm_wdg_item_tooltip_window_mode_get());
 }
@@ -7250,7 +7202,6 @@ EOLIAN static Eina_Bool
 _elm_genlist_item_elm_widget_item_tooltip_window_mode_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it)
 {
    return it->tooltip.free_size;
->>>>>>> opensource/master
 }
 
 EAPI void
@@ -8078,8 +8029,6 @@ _elm_genlist_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_it, Elm_Ge
    if (sel)
       STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTED);
 
-<<<<<<< HEAD
-=======
    if (elm_genlist_item_type_get(eo_it) == ELM_GENLIST_ITEM_TREE)
      {
         STATE_TYPE_SET(ret, ELM_ATSPI_STATE_EXPANDABLE);
@@ -8087,7 +8036,6 @@ _elm_genlist_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_it, Elm_Ge
            STATE_TYPE_SET(ret, ELM_ATSPI_STATE_EXPANDED);
      }
 
->>>>>>> opensource/master
    return ret;
 }
 
@@ -8110,18 +8058,6 @@ _elm_genlist_item_elm_interface_atspi_accessible_name_get(Eo *eo_it EINA_UNUSED,
 
         EINA_LIST_FREE(texts, key)
           {
-<<<<<<< HEAD
-             char *s = it->itc->func.text_get
-                ((void *)WIDGET_ITEM_DATA_GET(EO_OBJ(it)), WIDGET(it), key);
-
-             s = _elm_util_mkup_to_text(s);
-
-             if (s)
-               {
-                  if (eina_strbuf_length_get(buf) > 0) eina_strbuf_append(buf, ", ");
-                  eina_strbuf_append(buf, s);
-                  free(s);
-=======
              char *str_markup = it->itc->func.text_get
                 ((void *)WIDGET_ITEM_DATA_GET(EO_OBJ(it)), WIDGET(it), key);
              char *str_utf8 = _elm_util_mkup_to_text(str_markup);
@@ -8133,7 +8069,6 @@ _elm_genlist_item_elm_interface_atspi_accessible_name_get(Eo *eo_it EINA_UNUSED,
                   if (eina_strbuf_length_get(buf) > 0) eina_strbuf_append(buf, ", ");
                   eina_strbuf_append(buf, str_utf8);
                   free(str_utf8);
->>>>>>> opensource/master
                }
           }
      }
@@ -8363,8 +8298,6 @@ _elm_genlist_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Genlist_D
    return ret;
 }
 
-<<<<<<< HEAD
-=======
 EOLIAN int
 _elm_genlist_elm_interface_atspi_selection_selected_children_count_get(Eo *objm EINA_UNUSED, Elm_Genlist_Data *pd)
 {
@@ -8465,6 +8398,5 @@ _elm_genlist_elm_interface_atspi_selection_child_deselect(Eo *obj EINA_UNUSED, E
    return EINA_FALSE;
 }
 
->>>>>>> opensource/master
 #include "elm_genlist.eo.c"
 #include "elm_genlist_item.eo.c"
index 6e6ad4797d3b13adead12cbc0b3ad590fa2a2db3..ef35ded795780f8c80e0d3c75930c4af6a20d98d 100644 (file)
@@ -163,21 +163,11 @@ class Elm.Genlist_Item(Elm.Widget_Item)
                 get {
                      [[Get the index of the item. It is only valid once displayed.
 
-<<<<<<< HEAD
-                      The index start from 1.
-
-                      @ingroup Genlist
-                      */
-                }
-                values {
-                     int index(-1); /*@ @return the position inside the list of item. */
-=======
                        The index start from 1.
                      ]]
                 }
                 values {
                      index: int(-1); [[The position inside the list of item.]]
->>>>>>> opensource/master
                 }
            }
            @property decorate_mode {
@@ -248,11 +238,7 @@ class Elm.Genlist_Item(Elm.Widget_Item)
                      ]]
                 }
                 values {
-<<<<<<< HEAD
-                     Elm_Object_Select_Mode mode(4); /*@ The selected mode */
-=======
                      mode: Elm.Object.Select_Mode(Elm.Object.Select_Mode.max); [[The selected mode.]]
->>>>>>> opensource/master
                 }
            }
            @property type {
@@ -265,11 +251,7 @@ class Elm.Genlist_Item(Elm.Widget_Item)
                      ]]
                 }
                 values {
-<<<<<<< HEAD
-                     Elm_Genlist_Item_Type type(4); /*@ Item tupe */
-=======
                      type: Elm.Genlist.Item.Type(Elm.Genlist.Item.Type.max); [[Item type.]]
->>>>>>> opensource/master
                 }
            }
            /*      init { FIXME
@@ -430,23 +412,6 @@ class Elm.Genlist_Item(Elm.Widget_Item)
       }
       implements {
            Eo.Base.constructor;
-<<<<<<< HEAD
-           Elm_Widget_Item.del_pre;
-           Elm_Widget_Item.disable;
-           Elm_Widget_Item.signal_emit;
-           Elm_Widget_Item.focus.set;
-           Elm_Widget_Item.focus.get;
-           Elm_Widget_Item.part_text.get;
-           Elm_Widget_Item.part_content.get;
-           Elm_Widget_Item.tooltip_text_set;
-           Elm_Widget_Item.tooltip_style.set;
-           Elm_Widget_Item.tooltip_style.get;
-           Elm_Widget_Item.tooltip_window_mode.set;
-           Elm_Widget_Item.tooltip_content_cb_set;
-           Elm_Widget_Item.tooltip_unset;
-           Elm_Widget_Item.cursor.set;
-           Elm_Widget_Item.cursor_unset;
-=======
            Elm.Widget_Item.del_pre;
            Elm.Widget_Item.disable;
            Elm.Widget_Item.signal_emit;
@@ -463,7 +428,6 @@ class Elm.Genlist_Item(Elm.Widget_Item)
            Elm.Widget_Item.tooltip_unset;
            Elm.Widget_Item.cursor.set;
            Elm.Widget_Item.cursor_unset;
->>>>>>> opensource/master
            Elm_Interface_Atspi_Accessible.name.get;
            Elm_Interface_Atspi_Accessible.state_set.get;
            Elm_Interface_Atspi_Accessible.children.get;
index d1d40f200d3f207e4539225359f4036ef2793de0..065caa4e423d45d4f5f4eb4d050254c811b6548d 100644 (file)
@@ -1161,13 +1161,8 @@ _elm_list_item_focused(Elm_Object_Item *eo_it)
    focus_raise = edje_object_data_get(VIEW(it), "focusraise");
    if ((focus_raise) && (!strcmp(focus_raise, "on")))
      evas_object_raise(VIEW(it));
-<<<<<<< HEAD
-   evas_object_smart_callback_call
-      (WIDGET(it), SIG_ITEM_FOCUSED, eo_it);
-=======
    eo_do(WIDGET(it), eo_event_callback_call
      (ELM_LIST_EVENT_ITEM_FOCUSED, eo_it));
->>>>>>> opensource/master
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
 }
@@ -1194,11 +1189,7 @@ _elm_list_item_unfocused(Elm_Object_Item *eo_it)
      }
 
    sd->focused_item = NULL;
-<<<<<<< HEAD
-   evas_object_smart_callback_call(obj, SIG_ITEM_UNFOCUSED, eo_it);
-=======
    eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_ITEM_UNFOCUSED, eo_it));
->>>>>>> opensource/master
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
 }
@@ -2141,10 +2132,6 @@ _elm_list_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_it, Elm_List_
    Eina_Bool sel;
 
    eo_do_super(eo_it, ELM_LIST_ITEM_CLASS, ret = elm_interface_atspi_accessible_state_set_get());
-<<<<<<< HEAD
-   eo_do(eo_it, sel = elm_obj_list_item_selected_get());
-
-=======
 
    if (elm_object_item_disabled_get(eo_it))
      return ret;
@@ -2152,7 +2139,6 @@ _elm_list_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_it, Elm_List_
    STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTABLE);
 
    eo_do(eo_it, sel = elm_obj_list_item_selected_get());
->>>>>>> opensource/master
    if (sel)
      STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTED);
    else
@@ -2303,11 +2289,8 @@ _elm_list_item_eo_base_constructor(Eo *eo_it, Elm_List_Item_Data *it)
    eo_it = eo_do_super_ret(eo_it, ELM_LIST_ITEM_CLASS, eo_it, eo_constructor());
    it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
    eo_do(eo_it, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST_ITEM));
-<<<<<<< HEAD
-=======
 
    return eo_it;
->>>>>>> opensource/master
 }
 
 static Elm_List_Item_Data *
index 6b35413772416ebf655513da3b2fbffe1a8f3596..92b8d3fdae7ed249040c72ac069e674556da8888 100644 (file)
@@ -4,15 +4,7 @@ class Elm.List_Item(Elm.Widget_Item)
       methods {
            @property separator {
                 get {
-<<<<<<< HEAD
-                     /*@
-                      Get a value whether item is a separator or not.
-@see elm_list_item_separator_set() for details.  
-                      @ingroup List
-                      */
-=======
                      [[Get a value whether item is a separator or not.]]
->>>>>>> opensource/master
                 }
                 set {
                      [[Set or unset item as a separator.
@@ -114,18 +106,6 @@ class Elm.List_Item(Elm.Widget_Item)
       }
       implements {
            Eo.Base.constructor;
-<<<<<<< HEAD
-           Elm_Widget_Item.disable;
-           Elm_Widget_Item.del_pre;
-           Elm_Widget_Item.signal_emit;
-           Elm_Widget_Item.focus.set;
-           Elm_Widget_Item.focus.get;
-           Elm_Widget_Item.part_text.get;
-           Elm_Widget_Item.part_text.set;
-           Elm_Widget_Item.part_content.get;
-           Elm_Widget_Item.part_content.set;
-           Elm_Widget_Item.part_content_unset;
-=======
            Elm.Widget_Item.disable;
            Elm.Widget_Item.del_pre;
            Elm.Widget_Item.signal_emit;
@@ -136,7 +116,6 @@ class Elm.List_Item(Elm.Widget_Item)
            Elm.Widget_Item.part_content.get;
            Elm.Widget_Item.part_content.set;
            Elm.Widget_Item.part_content_unset;
->>>>>>> opensource/master
            Elm_Interface_Atspi_Accessible.name.get;
            Elm_Interface_Atspi_Accessible.state_set.get;
            Elm_Interface_Atspi_Accessible.children.get;
index e4148cf0d9e2732b505bf9c55dbd85becf535cce..7bcb6ac8483dd36ad725d51df14d52f6d1d7dbfa 100644 (file)
@@ -590,11 +590,8 @@ _grid_clear(Evas_Object *obj,
                        edje_object_signal_emit
                          (wd->resize_obj,
                          "elm,state,busy,stop", "elm");
-<<<<<<< HEAD
-=======
                        eo_do(obj, eo_event_callback_call
                          (ELM_PHOTOCAM_EVENT_LOAD_DETAIL, NULL));
->>>>>>> opensource/master
                     }
                }
           }
@@ -779,9 +776,6 @@ _main_img_preloaded_cb(void *data,
      }
    ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job_cb, data);
-<<<<<<< HEAD
-   evas_object_smart_callback_call(data, SIG_LOADED, NULL);
-=======
    eo_do(data, eo_event_callback_call(ELM_PHOTOCAM_EVENT_LOADED, NULL));
    sd->preload_num--;
    if (!sd->preload_num)
@@ -791,7 +785,6 @@ _main_img_preloaded_cb(void *data,
         eo_do(obj, eo_event_callback_call
           (ELM_PHOTOCAM_EVENT_LOADED_DETAIL, NULL));
      }
->>>>>>> opensource/master
 }
 
 static Eina_Bool
@@ -1011,9 +1004,6 @@ static void
 _scroll_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-<<<<<<< HEAD
-   evas_object_smart_callback_call(obj, SIG_SCROLL, NULL);
-=======
    ELM_PHOTOCAM_DATA_GET(obj, sd);
 
    if (!sd->scr_timer)
@@ -1027,7 +1017,6 @@ _scroll_cb(Evas_Object *obj,
 
    eo_do(obj, eo_event_callback_call
      (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL));
->>>>>>> opensource/master
 }
 
 static Eina_Bool
@@ -1409,10 +1398,7 @@ _elm_photocam_image_orient_set(Eo *obj, Elm_Photocam_Data *sd, Evas_Image_Orient
 
    if (sd->orient == orient) return;
 
-<<<<<<< HEAD
-=======
    sd->orientation_changed = EINA_TRUE;
->>>>>>> opensource/master
    sd->orient = orient;
    g = _grid_create(obj);
    if (g)
@@ -1633,8 +1619,6 @@ _internal_file_set(Eo *obj, Elm_Photocam_Data *sd, const char *file, Eina_File *
    sd->size.imh = h;
    sd->size.w = sd->size.imw / sd->zoom;
    sd->size.h = sd->size.imh / sd->zoom;
-<<<<<<< HEAD
-=======
    evas_object_image_file_set(sd->img, NULL, NULL);
    _photocam_image_file_set(sd->img, sd);
    err = evas_object_image_load_error_get(sd->img);
@@ -1644,7 +1628,6 @@ _internal_file_set(Eo *obj, Elm_Photocam_Data *sd, const char *file, Eina_File *
         if (ret) *ret = err;
         return;
      }
->>>>>>> opensource/master
 
    // load low resolution image
    evas_object_image_load_scale_down_set(sd->img, 8);
@@ -1653,8 +1636,6 @@ _internal_file_set(Eo *obj, Elm_Photocam_Data *sd, const char *file, Eina_File *
    sd->main_load_pending = EINA_TRUE;
 
    sd->calc_job = ecore_job_add(_calc_job_cb, obj);
-<<<<<<< HEAD
-=======
    eo_do(obj, eo_event_callback_call(ELM_PHOTOCAM_EVENT_LOAD, NULL));
    sd->preload_num++;
    if (sd->preload_num == 1)
@@ -1663,16 +1644,12 @@ _internal_file_set(Eo *obj, Elm_Photocam_Data *sd, const char *file, Eina_File *
           (wd->resize_obj, "elm,state,busy,start", "elm");
         eo_do(obj, eo_event_callback_call(ELM_PHOTOCAM_EVENT_LOAD_DETAIL, NULL));
      }
->>>>>>> opensource/master
 
    tz = sd->zoom;
    sd->zoom = 0.0;
    elm_photocam_zoom_set(obj, tz);
    sd->orient = EVAS_IMAGE_ORIENT_NONE;
-<<<<<<< HEAD
-=======
    sd->orientation_changed = EINA_FALSE;
->>>>>>> opensource/master
 
    if (ret) *ret = evas_object_image_load_error_get(sd->img);
 }
@@ -1958,13 +1935,8 @@ done:
         if (!an)
           eo_do(obj, eo_event_callback_call(EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL));
      }
-<<<<<<< HEAD
-   if (sd->zoom != z)
-     evas_object_smart_callback_call(obj, SIG_ZOOM_CHANGE, NULL);
-=======
    if (zoom_changed)
      eo_do(obj, eo_event_callback_call(EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_CHANGE, NULL));
->>>>>>> opensource/master
 }
 
 EOLIAN static double
index 7546be1cca30e110d2dea8d1cc6fc5ab23b4adb0..acfb87a6ba5b69e6e0f83635e38c373b0c5102da 100644 (file)
@@ -159,41 +159,6 @@ class Elm.Photocam (Elm.Widget, Elm_Interface_Scrollable,
                                        ]]
          }
       }
-<<<<<<< HEAD
-      image_orient {
-         set {
-            /*@
-            Set the photocam image orientation.
-
-            This function allows to rotate or flip the photocam image.
-
-            @see elm_photocam_image_orient_get()
-            @see @ref Evas_Image_Orient
-
-            @since 1.14
-            @ingroup Photocam */
-         }
-         get {
-            /*@
-            Get the photocam image orientation.
-
-            @return The photocam image orientation @ref Evas_Image_Orient
-
-            @see elm_photocam_image_orient_set()
-            @see @ref Evas_Image_Orient
-
-            @since 1.14
-            @ingroup Photocam */
-         }
-         values {
-            Evas_Image_Orient orient; /*@ The photocam image orientation @ref Evas_Image_Orient
-            Default is #EVAS_IMAGE_ORIENT_NONE. */
-         }
-      }
-   }
-   methods {
-=======
->>>>>>> opensource/master
       image_region_show {
          [[Set the viewed region of the image
 
index 66cf0a021a5a058ade4e8a7c43a62ed6b47d29d3..8c679478f4c2c15e43cd3053fb366193964287ba 100644 (file)
@@ -63,9 +63,6 @@ _state_set(Evas_Object *obj, Eina_Bool state, Eina_Bool activate)
              elm_layout_signal_emit(obj, "elm,state,radio,on", "elm");
           }
         else
-<<<<<<< HEAD
-          elm_layout_signal_emit(obj, "elm,state,radio,off", "elm");
-=======
           {
              // FIXME: to do animation during state change , we need different signal
              // so that we can distinguish between state change by user or state change
@@ -74,7 +71,6 @@ _state_set(Evas_Object *obj, Eina_Bool state, Eina_Bool activate)
              if (activate) elm_layout_signal_emit(obj, "elm,activate,radio,off", "elm");
              elm_layout_signal_emit(obj, "elm,state,radio,off", "elm");
           }
->>>>>>> opensource/master
         if (_elm_config->atspi_mode)
           {
              if (sd->state)
index 6aa1b8a2caa45b229c8a89e225578bd7b1a5ecb1..6eecd6ccffe859fcd67493c007fa9e1278af9607 100644 (file)
@@ -78,19 +78,6 @@ class Elm.Radio (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
       Eo.Base.constructor;
       Evas.Object_Smart.add;
       Evas.Object_Smart.del;
-<<<<<<< HEAD
-      Elm_Widget.theme_apply;
-      Elm_Widget.activate;
-      Elm_Widget.focus_next_manager_is;
-      Elm_Widget.focus_direction_manager_is;
-      Elm_Widget.disable;
-      Elm_Widget.sub_object_del;
-      Elm_Widget.event;
-      Elm_Container.content_set;
-      Elm_Layout.text_aliases.get;
-      Elm_Layout.content_aliases.get;
-      Elm_Layout.sizing_eval;
-=======
       Elm.Widget.theme_apply;
       Elm.Widget.activate;
       Elm.Widget.focus_next_manager_is;
@@ -101,7 +88,6 @@ class Elm.Radio (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
       Elm.Layout.text_aliases.get;
       Elm.Layout.content_aliases.get;
       Elm.Layout.sizing_eval;
->>>>>>> opensource/master
       Elm_Interface_Atspi_Accessible.state_set.get;
       Elm_Interface_Atspi_Widget_Action.elm_actions.get;
    }
index a939a421d051610d27e9d9e6c54ce150c24c4656..3dfacc6eb7be8d8c5a001a217665bf5ac56cdbca 100644 (file)
@@ -98,20 +98,6 @@ class Elm.Scroller (Elm.Layout, Elm_Interface_Scrollable,
       Evas.Object_Smart.add;
       Evas.Object_Smart.member_add;
       Evas.Object_Smart.resize;
-<<<<<<< HEAD
-      Elm_Widget.theme_apply;
-      Elm_Widget.activate;
-      Elm_Widget.focus_next_manager_is;
-      Elm_Widget.focus_direction_manager_is;
-      Elm_Widget.focus_next;
-      Elm_Widget.focus_direction;
-      Elm_Widget.sub_object_del;
-      Elm_Widget.event;
-      Elm_Container.content_get;
-      Elm_Container.content_set;
-      Elm_Container.content_unset;
-      Elm_Layout.sizing_eval;
-=======
       Elm.Widget.theme_apply;
       Elm.Widget.activate;
       Elm.Widget.focus_next_manager_is;
@@ -124,7 +110,6 @@ class Elm.Scroller (Elm.Layout, Elm_Interface_Scrollable,
       Elm.Container.content_set;
       Elm.Container.content_unset;
       Elm.Layout.sizing_eval;
->>>>>>> opensource/master
       Elm_Interface_Scrollable.page_size.set;
       Elm_Interface_Scrollable.policy.set;
       Elm_Interface_Scrollable.single_direction;
index 784be1bb541515882b4b65c65c94d5d3dc9f189a..ed70cb47e39a213ecc12d27621724cb7f1ca50e1 100644 (file)
@@ -526,9 +526,6 @@ EAPI void                          elm_scroller_loop_set(Evas_Object *obj, Eina_
  */
 EAPI void                          elm_scroller_loop_get(const Evas_Object *obj, Eina_Bool *loop_h, Eina_Bool *loop_v);
 
-<<<<<<< HEAD
-#include "elm_scroller.eo.legacy.h"
-=======
 /**
  * @brief Enable or disable mouse wheel to be used to scroll the scroller.
  *
@@ -561,4 +558,3 @@ EAPI void                          elm_scroller_wheel_disabled_set(Evas_Object *
  * @ingroup Scroller
  */
 EAPI Eina_Bool                     elm_scroller_wheel_disabled_get(const Evas_Object *obj);
->>>>>>> opensource/master
index 2d00a598c231ee9dde2c08e8762710c617674ce5..16c5ac6d45fd0e2f5436c57e25694be7d72cce95 100644 (file)
@@ -9,15 +9,7 @@ class Elm.Segment_Control_Item(Elm.Widget_Item)
                range is from 0 to (count - 1).
                Count is the number of items, that can be get with elm_segment_control_item_count_get()]]
 
-<<<<<<< HEAD
-              @return The position of item in segment control widget.
-
-              @ingroup SegmentControl
-             */
-             return: int(-1);
-=======
              return: int(-1); [[The position of item in segment control widget.]]
->>>>>>> opensource/master
         }
       object_get @const {
              [[Get the real Evas(Edje) object created to implement the view of a given segment_control item.
index 9fda477489a621b88a1c0b57585ec158fed35344..4ff2ec517dc861aa21b845de3300f3a2610f4d4e 100644 (file)
@@ -69,8 +69,6 @@ static const Elm_Action key_actions[] = {
    {NULL, NULL}
 };
 
-<<<<<<< HEAD
-=======
 EO_CALLBACKS_ARRAY_DEFINE(_inc_button_cb,
    { EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _inc_button_clicked_cb},
    { EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, _inc_button_pressed_cb},
@@ -86,7 +84,6 @@ EO_CALLBACKS_ARRAY_DEFINE(_dec_button_cb,
 );
 
 
->>>>>>> opensource/master
 static void _access_increment_decrement_info_say(Evas_Object *obj,
                                                  Eina_Bool is_incremented);
 
@@ -435,14 +432,8 @@ _toggle_entry(Evas_Object *obj)
                     (sd->ent, EVAS_CALLBACK_SHOW, _entry_show_cb, obj);
                }
              elm_entry_single_line_set(sd->ent, EINA_TRUE);
-<<<<<<< HEAD
-
-             evas_object_smart_callback_add
-                (sd->ent, "activated", _entry_activated_cb, obj);
-=======
              eo_do(sd->ent, eo_event_callback_add
                (ELM_ENTRY_EVENT_ACTIVATED, _entry_activated_cb, obj));
->>>>>>> opensource/master
              elm_layout_content_set(obj, "elm.swallow.entry", sd->ent);
           }
         if (!sd->button_layout)
@@ -675,15 +666,9 @@ _button_dec_stop_cb(void *data,
    _spin_stop(data);
 }
 
-<<<<<<< HEAD
-static void
-_inc_button_clicked_cb(void *data,
-                       Evas_Object *obj EINA_UNUSED,
-=======
 static Eina_Bool
 _inc_button_clicked_cb(void *data,
                        Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
->>>>>>> opensource/master
                        void *event_info EINA_UNUSED)
 {
    ELM_SPINNER_DATA_GET(data, sd);
@@ -695,13 +680,6 @@ _inc_button_clicked_cb(void *data,
    if (sd->entry_visible) _entry_value_apply(data);
    if (_elm_config->access_mode)
      _access_increment_decrement_info_say(data, EINA_TRUE);
-<<<<<<< HEAD
-}
-
-static void
-_inc_button_pressed_cb(void *data,
-                       Evas_Object *obj EINA_UNUSED,
-=======
 
    return EINA_TRUE;
 }
@@ -709,7 +687,6 @@ _inc_button_pressed_cb(void *data,
 static Eina_Bool
 _inc_button_pressed_cb(void *data,
                        Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
->>>>>>> opensource/master
                        void *event_info EINA_UNUSED)
 {
    ELM_SPINNER_DATA_GET(data, sd);
@@ -720,13 +697,6 @@ _inc_button_pressed_cb(void *data,
                             _val_inc_start, data);
 
    if (sd->entry_visible) _entry_value_apply(data);
-<<<<<<< HEAD
-}
-
-static void
-_inc_button_unpressed_cb(void *data,
-                         Evas_Object *obj EINA_UNUSED,
-=======
 
    return EINA_TRUE;
 }
@@ -734,7 +704,6 @@ _inc_button_unpressed_cb(void *data,
 static Eina_Bool
 _inc_button_unpressed_cb(void *data,
                          Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
->>>>>>> opensource/master
                          void *event_info EINA_UNUSED)
 {
    ELM_SPINNER_DATA_GET(data, sd);
@@ -745,32 +714,10 @@ _inc_button_unpressed_cb(void *data,
         sd->longpress_timer = NULL;
      }
    _spin_stop(data);
-<<<<<<< HEAD
-}
-=======
->>>>>>> opensource/master
 
-static void
-_text_button_clicked_cb(void *data,
-                        Evas_Object *obj EINA_UNUSED,
-                        void *event_info EINA_UNUSED)
-{
-   _toggle_entry(data);
+   return EINA_TRUE;
 }
 
-<<<<<<< HEAD
-static void
-_dec_button_clicked_cb(void *data,
-                       Evas_Object *obj EINA_UNUSED,
-                       void *event_info EINA_UNUSED)
-{
-   ELM_SPINNER_DATA_GET(data, sd);
-
-   _spin_stop(data);
-   sd->spin_speed = -sd->step;
-   _spin_value(data);
-
-=======
 static Eina_Bool
 _text_button_clicked_cb(void *data,
                         Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
@@ -792,18 +739,10 @@ _dec_button_clicked_cb(void *data,
    sd->spin_speed = -sd->step;
    _spin_value(data);
 
->>>>>>> opensource/master
    if (sd->entry_visible) _entry_value_apply(data);
 
    if (_elm_config->access_mode)
      _access_increment_decrement_info_say(data, EINA_FALSE);
-<<<<<<< HEAD
-}
-
-static void
-_dec_button_pressed_cb(void *data,
-                       Evas_Object *obj EINA_UNUSED,
-=======
 
    return EINA_TRUE;
 }
@@ -811,7 +750,6 @@ _dec_button_pressed_cb(void *data,
 static Eina_Bool
 _dec_button_pressed_cb(void *data,
                        Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
->>>>>>> opensource/master
                        void *event_info EINA_UNUSED)
 {
    ELM_SPINNER_DATA_GET(data, sd);
@@ -822,13 +760,6 @@ _dec_button_pressed_cb(void *data,
                             _val_dec_start, data);
 
    if (sd->entry_visible) _entry_value_apply(data);
-<<<<<<< HEAD
-}
-
-static void
-_dec_button_unpressed_cb(void *data,
-                         Evas_Object *obj EINA_UNUSED,
-=======
 
    return EINA_TRUE;
 }
@@ -836,7 +767,6 @@ _dec_button_unpressed_cb(void *data,
 static Eina_Bool
 _dec_button_unpressed_cb(void *data,
                          Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
->>>>>>> opensource/master
                          void *event_info EINA_UNUSED)
 {
    ELM_SPINNER_DATA_GET(data, sd);
@@ -847,9 +777,6 @@ _dec_button_unpressed_cb(void *data,
         sd->longpress_timer = NULL;
      }
    _spin_stop(data);
-<<<<<<< HEAD
-}
-=======
 
    return EINA_TRUE;
 }
@@ -867,7 +794,9 @@ _inc_dec_button_mouse_move_cb(void *data, Eo *obj EINA_UNUSED,
         ecore_timer_del(sd->longpress_timer);
         sd->longpress_timer = NULL;
      }
->>>>>>> opensource/master
+
+   return EINA_TRUE;
+}
 
 EOLIAN static void
 _elm_spinner_elm_layout_sizing_eval(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED)
@@ -1159,17 +1088,8 @@ _elm_spinner_evas_object_smart_add(Eo *obj, Elm_Spinner_Data *priv)
         priv->inc_button = elm_button_add(obj);
         elm_object_style_set(priv->inc_button, "spinner/increase/default");
 
-<<<<<<< HEAD
-        evas_object_smart_callback_add
-          (priv->inc_button, "clicked", _inc_button_clicked_cb, obj);
-        evas_object_smart_callback_add
-          (priv->inc_button, "pressed", _inc_button_pressed_cb, obj);
-        evas_object_smart_callback_add
-          (priv->inc_button, "unpressed", _inc_button_unpressed_cb, obj);
-=======
         eo_do(priv->inc_button,
               eo_event_callback_array_add(_inc_button_cb(), obj));
->>>>>>> opensource/master
 
         elm_layout_content_set(obj, "elm.swallow.inc_button", priv->inc_button);
         elm_widget_sub_object_add(obj, priv->inc_button);
@@ -1177,13 +1097,8 @@ _elm_spinner_evas_object_smart_add(Eo *obj, Elm_Spinner_Data *priv)
         priv->text_button = elm_button_add(obj);
         elm_object_style_set(priv->text_button, "spinner/default");
 
-<<<<<<< HEAD
-        evas_object_smart_callback_add
-          (priv->text_button, "clicked", _text_button_clicked_cb, obj);
-=======
         eo_do(priv->text_button, eo_event_callback_add
           (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _text_button_clicked_cb, obj));
->>>>>>> opensource/master
 
         elm_layout_content_set(obj, "elm.swallow.text_button", priv->text_button);
         elm_widget_sub_object_add(obj, priv->text_button);
@@ -1191,17 +1106,8 @@ _elm_spinner_evas_object_smart_add(Eo *obj, Elm_Spinner_Data *priv)
         priv->dec_button = elm_button_add(obj);
         elm_object_style_set(priv->dec_button, "spinner/decrease/default");
 
-<<<<<<< HEAD
-        evas_object_smart_callback_add
-          (priv->dec_button, "clicked", _dec_button_clicked_cb, obj);
-        evas_object_smart_callback_add
-          (priv->dec_button, "pressed", _dec_button_pressed_cb, obj);
-        evas_object_smart_callback_add
-          (priv->dec_button, "unpressed", _dec_button_unpressed_cb, obj);
-=======
         eo_do(priv->dec_button,
               eo_event_callback_array_add(_dec_button_cb(), obj));
->>>>>>> opensource/master
 
         elm_layout_content_set(obj, "elm.swallow.dec_button", priv->dec_button);
         elm_widget_sub_object_add(obj, priv->dec_button);
index 4a8238074520f5eee4653551c39c029dbf496467..cd8b40044c144a6586d7161370368bcbb049e646 100644 (file)
@@ -223,17 +223,6 @@ class Elm.Spinner (Elm.Layout, Elm_Interface_Atspi_Value, Elm_Interface_Atspi_Wi
       Eo.Base.constructor;
       Evas.Object_Smart.add;
       Evas.Object_Smart.del;
-<<<<<<< HEAD
-      Elm_Widget.theme_apply;
-      Elm_Widget.focus_next_manager_is;
-      Elm_Widget.focus_direction_manager_is;
-      Elm_Widget.access;
-      Elm_Widget.focus_next;
-      Elm_Widget.focus_direction;
-      Elm_Widget.on_focus;
-      Elm_Widget.event;
-      Elm_Layout.sizing_eval;
-=======
       Elm.Widget.theme_apply;
       Elm.Widget.focus_next_manager_is;
       Elm.Widget.focus_direction_manager_is;
@@ -243,7 +232,6 @@ class Elm.Spinner (Elm.Layout, Elm_Interface_Atspi_Value, Elm_Interface_Atspi_Wi
       Elm.Widget.on_focus;
       Elm.Widget.event;
       Elm.Layout.sizing_eval;
->>>>>>> opensource/master
       Elm_Interface_Atspi_Accessible.name.get;
       Elm_Interface_Atspi_Value.value_and_text.get;
       Elm_Interface_Atspi_Value.value_and_text.set;
index 35a07ce3f42ef4c05cd8402b2d9df9d812f0a81b..687eddcbf2efc8fe29176618d18ca1c8b06ede55 100644 (file)
@@ -539,12 +539,6 @@ void                  _elm_widget_highlight_in_theme_update(Eo *obj);
 // win focus highlight
 void                  _elm_win_focus_highlight_start(Evas_Object *obj);
 void                  _elm_win_focus_highlight_in_theme_update(Evas_Object *obj, Eina_Bool in_theme);
-<<<<<<< HEAD
-void                  _elm_win_focus_highlight_signal_emit(Evas_Object *obj, const char *emission, const char *source);
-void                  _elm_win_focus_highlight_signal_callback_add(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb _focus_highlight_signal_cb, void *data);
-void                  _elm_win_focus_highlight_signal_callback_del(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb _focus_highlight_signal_cb);
-=======
->>>>>>> opensource/master
 Evas_Object          *_elm_win_focus_highlight_object_get(Evas_Object *obj);
 void                  _elm_win_focus_auto_show(Evas_Object *obj);
 void                  _elm_win_focus_auto_hide(Evas_Object *obj);