From: Jiyoun Park Date: Fri, 22 Dec 2017 03:25:36 +0000 (+0900) Subject: rebase_build: fix rebase merge problem X-Git-Tag: submit/sandbox/upgrade/efl120/20180319.053334~686 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=235b9edc3b2b4209bc780f28c988626b6d72ee04;p=platform%2Fupstream%2Fefl.git rebase_build: fix rebase merge problem --- diff --git a/src/Makefile_Ecore_Wl2.am b/src/Makefile_Ecore_Wl2.am index baeab6e..fb1e787 100644 --- a/src/Makefile_Ecore_Wl2.am +++ b/src/Makefile_Ecore_Wl2.am @@ -15,6 +15,8 @@ lib/ecore_wl2/ecore_wl2_input.c \ lib/ecore_wl2/ecore_wl2_output.c \ lib/ecore_wl2/ecore_wl2_display.c \ lib/ecore_wl2/ecore_wl2.c \ +lib/ecore_wl2/tizen-policy-ext-client-protocol.h \ +lib/ecore_wl2/tizen-policy-ext-protocol.c \ lib/ecore_wl2/ecore_wl2_private.h \ lib/ecore_wl2/ecore_wl2_buffer.c \ lib/ecore_wl2/ecore_wl2_surface.c \ @@ -27,8 +29,7 @@ static_libs/libdrm/i915_drm.h \ static_libs/libdrm/intel_bufmgr.h \ static_libs/libdrm/vc4_drm.h \ static_libs/libdrm/LICENSE -lib/ecore_wl2/tizen-policy-ext-client-protocol.h \ -lib/ecore_wl2/tizen-policy-ext-protocol.c \ + nodist_lib_ecore_wl2_libecore_wl2_la_SOURCES = \ lib/ecore_wl2/efl-aux-hints-protocol.c \ diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index 470e8dd..ccf6a2f 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -2,14 +2,136 @@ ### Library elm_public_eolian_files = \ + lib/elementary/elm_widget.eo \ + lib/elementary/efl_ui_bg.eo \ + lib/elementary/efl_ui_button.eo \ + lib/elementary/efl_ui_calendar.eo \ + lib/elementary/efl_ui_calendar_item.eo \ + lib/elementary/efl_ui_check.eo \ + lib/elementary/efl_ui_flip.eo \ + lib/elementary/efl_ui_frame.eo \ + lib/elementary/efl_ui_image.eo \ + lib/elementary/efl_ui_image_zoomable.eo \ + lib/elementary/efl_ui_layout.eo \ + lib/elementary/efl_ui_multibuttonentry.eo \ + lib/elementary/efl_ui_nstate.eo \ + lib/elementary/efl_ui_panes.eo \ + lib/elementary/efl_ui_progressbar.eo \ + lib/elementary/efl_ui_radio.eo \ + lib/elementary/efl_ui_slider.eo \ + lib/elementary/efl_ui_slider_interval.eo \ + lib/elementary/efl_ui_spin.eo \ + lib/elementary/efl_ui_spin_button.eo \ + lib/elementary/efl_ui_video.eo \ + lib/elementary/efl_ui_win.eo \ + lib/elementary/efl_ui_win_inlined.eo \ + lib/elementary/efl_ui_win_socket.eo \ + lib/elementary/efl_ui_box.eo \ + lib/elementary/efl_ui_box_flow.eo \ + lib/elementary/efl_ui_box_stack.eo \ + lib/elementary/efl_ui_grid.eo \ + lib/elementary/efl_ui_grid_static.eo \ + lib/elementary/efl_ui_text_interactive.eo \ + lib/elementary/efl_ui_text.eo \ + lib/elementary/efl_ui_popup.eo \ + lib/elementary/efl_ui_popup_part.eo \ + lib/elementary/efl_ui_popup_alert.eo \ + lib/elementary/efl_ui_popup_alert_part.eo \ + lib/elementary/efl_ui_popup_alert_scroll.eo \ + lib/elementary/efl_ui_popup_alert_scroll_part.eo \ + lib/elementary/efl_ui_popup_alert_text.eo \ + lib/elementary/efl_ui_popup_alert_text_part.eo \ + lib/elementary/efl_ui_popup_anchor.eo \ + lib/elementary/efl_ui_text_editable.eo \ + lib/elementary/efl_ui_text_async.eo \ + lib/elementary/efl_ui_textpath.eo \ + lib/elementary/efl_ui_translatable.eo \ + lib/elementary/efl_ui_clock.eo \ + lib/elementary/efl_ui_cursor.eo \ + lib/elementary/efl_ui_image_factory.eo \ + lib/elementary/efl_ui_focus_manager.eo \ + lib/elementary/efl_ui_focus_manager_calc.eo \ + lib/elementary/efl_ui_focus_manager_sub.eo \ + lib/elementary/efl_ui_focus_manager_root_focus.eo \ + lib/elementary/efl_ui_focus_object.eo \ + lib/elementary/efl_ui_focus_user.eo \ + lib/elementary/efl_ui_focus_layer.eo \ + lib/elementary/efl_ui_focus_composition.eo \ + lib/elementary/efl_ui_focus_util.eo \ + lib/elementary/efl_ui_button_part.eo \ + lib/elementary/efl_ui_flip_part.eo \ + lib/elementary/efl_ui_layout_factory.eo \ + lib/elementary/efl_ui_layout_part.eo \ + lib/elementary/efl_ui_layout_part_box.eo \ + lib/elementary/efl_ui_layout_part_content.eo \ + lib/elementary/efl_ui_layout_part_text.eo \ + lib/elementary/efl_ui_layout_part_table.eo \ + lib/elementary/efl_ui_layout_part_bg.eo \ + lib/elementary/efl_ui_layout_part_legacy.eo \ + lib/elementary/efl_ui_list.eo \ + lib/elementary/efl_ui_list_model.eo \ + lib/elementary/efl_ui_list_pan.eo \ + lib/elementary/efl_ui_list_relayout.eo \ + lib/elementary/efl_ui_multibuttonentry_part.eo \ + lib/elementary/efl_ui_panes_part.eo \ + lib/elementary/efl_ui_progressbar_part.eo \ + lib/elementary/efl_ui_slider_part_indicator.eo \ + lib/elementary/efl_ui_textpath_part.eo \ + lib/elementary/efl_ui_widget_part.eo \ + lib/elementary/efl_ui_widget_part_bg.eo \ + lib/elementary/efl_ui_widget_part_shadow.eo \ + lib/elementary/efl_ui_win_part.eo \ + lib/elementary/efl_access.eo \ + lib/elementary/efl_access_action.eo \ + lib/elementary/efl_access_component.eo \ + lib/elementary/efl_access_editable_text.eo \ + lib/elementary/efl_access_image.eo \ + lib/elementary/efl_access_selection.eo \ + lib/elementary/efl_access_text.eo \ + lib/elementary/efl_access_value.eo \ + lib/elementary/efl_access_widget_action.eo \ + lib/elementary/efl_access_window.eo \ + lib/elementary/efl_config_global.eo \ + lib/elementary/elm_code_widget.eo \ + $(NULL) + +# More public files -- FIXME +elm_public_eolian_files += \ + lib/elementary/elm_spinner.eo \ + lib/elementary/elm_multibuttonentry_item.eo \ + lib/elementary/elm_interface_scrollable.eo \ lib/elementary/elm_atspi_bridge.eo \ lib/elementary/elm_atspi_ewk_wrapper.eo \ lib/elementary/elm_atspi_app_object.eo \ lib/elementary/elm_atspi_proxy.eo \ - lib/elementary/elm_bg.eo \ - lib/elementary/efl_ui_button.eo \ + lib/elementary/efl_ui_image_zoomable_pan.eo \ + lib/elementary/elm_pan.eo \ + lib/elementary/elm_toolbar.eo \ + lib/elementary/elm_toolbar_item.eo \ + lib/elementary/elm_view_list.eo \ + lib/elementary/elm_view_form.eo \ + lib/elementary/elm_web.eo \ + lib/elementary/elm_widget_item.eo \ + $(NULL) + +# Private classes (not exposed or shipped) +elm_private_eolian_files = \ + lib/elementary/efl_ui_internal_text_interactive.eo \ + lib/elementary/efl_ui_focus_composition_adapter.eo \ + lib/elementary/efl_ui_win_part.eo \ + lib/elementary/efl_ui_focus_rectangle.eo \ + lib/elementary/efl_ui_focus_parent_provider.eo \ + lib/elementary/efl_ui_focus_parent_provider_standard.eo \ + lib/elementary/efl_ui_focus_parent_provider_gen.eo \ + tests/elementary/focus_test.eo \ + tests/elementary/focus_test_sub_main.eo \ + $(NULL) + +# Legacy classes - not part of public EO API +elm_legacy_eolian_files = \ + lib/elementary/elm_interface_fileselector.eo \ lib/elementary/elm_calendar.eo \ - lib/elementary/efl_ui_check.eo \ + lib/elementary/elm_calendar_item.eo \ lib/elementary/elm_clock.eo \ lib/elementary/elm_colorselector.eo \ lib/elementary/elm_combobox.eo \ @@ -18,9 +140,6 @@ elm_public_eolian_files = \ lib/elementary/elm_dayselector.eo \ lib/elementary/elm_entry.eo \ lib/elementary/elm_fileselector.eo \ - lib/elementary/efl_ui_flip.eo \ - lib/elementary/efl_ui_flip_part.eo \ - lib/elementary/efl_ui_frame.eo \ lib/elementary/elm_gengrid.eo \ lib/elementary/elm_gengrid_pan.eo \ lib/elementary/elm_genlist.eo \ @@ -28,85 +147,35 @@ elm_public_eolian_files = \ lib/elementary/elm_gesture_layer.eo \ lib/elementary/elm_glview.eo \ lib/elementary/elm_hover.eo \ - lib/elementary/efl_ui_image.eo \ lib/elementary/elm_index.eo \ - lib/elementary/elm_interface_atspi_accessible.eo \ - lib/elementary/efl_access_action.eo \ - lib/elementary/efl_access_component.eo \ - lib/elementary/efl_access_editable_text.eo \ - lib/elementary/efl_access_image.eo \ - lib/elementary/efl_access_selection.eo \ - lib/elementary/efl_access_text.eo \ - lib/elementary/efl_access_value.eo \ - lib/elementary/efl_access_widget_action.eo \ - lib/elementary/efl_access_window.eo \ - lib/elementary/elm_interface_fileselector.eo \ - lib/elementary/elm_interface_scrollable.eo \ lib/elementary/elm_label.eo \ - lib/elementary/efl_ui_layout.eo \ lib/elementary/elm_list.eo \ lib/elementary/elm_map.eo \ lib/elementary/elm_map_pan.eo \ lib/elementary/elm_menu.eo \ - lib/elementary/elm_multibuttonentry.eo \ lib/elementary/elm_notify.eo \ - lib/elementary/efl_ui_nstate.eo \ - lib/elementary/elm_pan.eo \ lib/elementary/elm_panel.eo \ - lib/elementary/efl_ui_panes.eo \ - lib/elementary/efl_ui_image_zoomable.eo \ - lib/elementary/efl_ui_image_zoomable_pan.eo \ lib/elementary/elm_player.eo \ lib/elementary/elm_plug.eo \ lib/elementary/elm_popup.eo \ - lib/elementary/efl_ui_progressbar.eo \ - lib/elementary/efl_ui_radio.eo \ lib/elementary/elm_route.eo \ lib/elementary/elm_scroller.eo \ - lib/elementary/efl_ui_slider.eo \ - lib/elementary/efl_ui_slider_interval.eo \ - lib/elementary/elm_spinner.eo \ lib/elementary/elm_sys_notify_interface.eo \ lib/elementary/elm_sys_notify.eo \ lib/elementary/elm_sys_notify_dbus.eo \ lib/elementary/elm_systray.eo \ - lib/elementary/elm_toolbar.eo \ - lib/elementary/efl_ui_video.eo \ - lib/elementary/elm_view_list.eo \ - lib/elementary/elm_view_form.eo \ - lib/elementary/elm_web.eo \ - lib/elementary/elm_widget.eo \ - lib/elementary/efl_ui_widget_part.eo \ - lib/elementary/efl_ui_win.eo \ - lib/elementary/efl_ui_win_inlined.eo \ - lib/elementary/efl_ui_win_socket.eo \ - lib/elementary/elm_widget_item.eo \ lib/elementary/elm_color_item.eo \ lib/elementary/elm_dayselector_item.eo \ lib/elementary/elm_flipselector_item.eo \ lib/elementary/elm_menu_item.eo \ lib/elementary/elm_ctxpopup_item.eo \ lib/elementary/elm_index_item.eo \ - lib/elementary/elm_multibuttonentry_item.eo \ + lib/elementary/elm_widget_item_static_focus.eo \ lib/elementary/elm_genlist_item.eo \ lib/elementary/elm_gengrid_item.eo \ lib/elementary/elm_list_item.eo \ - lib/elementary/elm_toolbar_item.eo \ lib/elementary/elm_popup_item.eo \ - lib/elementary/efl_ui_box.eo \ - lib/elementary/efl_ui_box_flow.eo \ - lib/elementary/efl_ui_box_stack.eo \ - lib/elementary/efl_ui_grid.eo \ - lib/elementary/efl_ui_grid_static.eo \ - lib/elementary/efl_ui_layout_part.eo \ - lib/elementary/efl_ui_layout_part_box.eo \ - lib/elementary/efl_ui_layout_part_content.eo \ - lib/elementary/efl_ui_layout_part_text.eo \ - lib/elementary/efl_ui_layout_part_table.eo \ - lib/elementary/efl_ui_layout_part_legacy.eo \ - lib/elementary/efl_ui_button_part.eo \ lib/elementary/elm_ctxpopup_part.eo \ - lib/elementary/efl_ui_panes_part.eo \ lib/elementary/elm_dayselector_part.eo \ lib/elementary/elm_entry_part.eo \ lib/elementary/elm_fileselector_entry_part.eo \ @@ -117,43 +186,12 @@ elm_public_eolian_files = \ lib/elementary/elm_notify_part.eo \ lib/elementary/elm_panel_part.eo \ lib/elementary/elm_player_part.eo \ - lib/elementary/efl_ui_progressbar_part.eo \ lib/elementary/elm_popup_part.eo \ lib/elementary/elm_scroller_part.eo \ lib/elementary/elm_label_part.eo \ lib/elementary/elm_actionslider_part.eo \ lib/elementary/elm_bubble_part.eo \ lib/elementary/elm_fileselector_part.eo \ - lib/elementary/elm_multibuttonentry_part.eo \ - lib/elementary/elm_code_widget.eo \ - lib/elementary/efl_ui_text_interactive.eo \ - lib/elementary/efl_ui_text.eo \ - lib/elementary/efl_ui_text_editable.eo \ - lib/elementary/efl_ui_text_async.eo \ - lib/elementary/efl_config_global.eo \ - lib/elementary/efl_ui_clock.eo \ - lib/elementary/efl_ui_cursor.eo \ - lib/elementary/efl_ui_image_factory.eo \ - lib/elementary/efl_ui_focus_manager.eo \ - lib/elementary/efl_ui_focus_manager_calc.eo \ - lib/elementary/efl_ui_focus_manager_sub.eo \ - lib/elementary/efl_ui_focus_manager_root_focus.eo \ - lib/elementary/efl_ui_focus_object.eo \ - lib/elementary/efl_ui_focus_user.eo \ - lib/elementary/efl_ui_textpath.eo \ - lib/elementary/efl_ui_textpath_part.eo \ - $(NULL) - -# Private classes (not exposed or shipped) -elm_private_eolian_files = \ - lib/elementary/efl_ui_internal_text_interactive.eo \ - lib/elementary/efl_ui_win_part.eo \ - tests/elementary/focus_test.eo \ - tests/elementary/focus_test_sub_main.eo \ - $(NULL) - -# Legacy classes - not part of public EO API -elm_legacy_eolian_files = \ lib/elementary/elm_access.eo \ lib/elementary/elm_actionslider.eo \ lib/elementary/elm_box.eo \ @@ -180,10 +218,13 @@ elm_legacy_eolian_files = \ lib/elementary/elm_slideshow_item.eo \ lib/elementary/elm_table.eo \ lib/elementary/elm_thumb.eo \ + lib/elementary/efl_ui_list_precise_layouter.eo \ $(NULL) elm_eolian_type_files = \ - lib/elementary/elm_general.eot + lib/elementary/elm_general.eot \ + lib/elementary/efl_ui.eot \ + lib/elementary/efl_ui_list_types.eot elm_public_eolian_c = $(elm_public_eolian_files:%.eo=%.eo.c) elm_public_eolian_h = $(elm_public_eolian_files:%.eo=%.eo.h) \ @@ -235,11 +276,12 @@ includesunstable_HEADERS = \ lib/elementary/elm_interfaces.h \ lib/elementary/elm_widget.h \ lib/elementary/elm_widget_actionslider.h \ - lib/elementary/elm_widget_bg.h \ lib/elementary/elm_widget_box.h \ lib/elementary/elm_widget_bubble.h \ lib/elementary/efl_ui_button_private.h \ + lib/elementary/efl_ui_bg_private.h \ lib/elementary/elm_widget_calendar.h \ + lib/elementary/efl_ui_calendar_private.h \ lib/elementary/efl_ui_check_private.h \ lib/elementary/elm_widget_clock.h \ lib/elementary/elm_widget_colorselector.h \ @@ -264,6 +306,11 @@ includesunstable_HEADERS = \ lib/elementary/elm_widget_hoversel.h \ lib/elementary/elm_widget_icon.h \ lib/elementary/efl_ui_widget_image.h \ + lib/elementary/efl_ui_popup_private.h \ + lib/elementary/efl_ui_popup_alert_private.h \ + lib/elementary/efl_ui_popup_alert_scroll_private.h \ + lib/elementary/efl_ui_popup_alert_text_private.h \ + lib/elementary/efl_ui_popup_anchor_private.h \ lib/elementary/elm_widget_index.h \ lib/elementary/elm_widget_inwin.h \ lib/elementary/elm_widget_label.h \ @@ -272,7 +319,7 @@ includesunstable_HEADERS = \ lib/elementary/elm_widget_map.h \ lib/elementary/elm_widget_mapbuf.h \ lib/elementary/elm_widget_menu.h \ - lib/elementary/elm_widget_multibuttonentry.h \ + lib/elementary/efl_ui_multibuttonentry_private.h \ lib/elementary/elm_widget_naviframe.h \ lib/elementary/elm_widget_notify.h \ lib/elementary/elm_widget_panel.h \ @@ -292,10 +339,14 @@ includesunstable_HEADERS = \ lib/elementary/efl_ui_slider_private.h \ lib/elementary/elm_widget_slideshow.h \ lib/elementary/elm_widget_spinner.h \ + lib/elementary/efl_ui_spin_private.h \ + lib/elementary/efl_ui_spin_button_private.h \ lib/elementary/elm_widget_table.h \ lib/elementary/elm_widget_thumb.h \ lib/elementary/elm_widget_toolbar.h \ lib/elementary/efl_ui_video_private.h \ + lib/elementary/efl_ui_list_private.h \ + lib/elementary/efl_ui_list_segarray.h \ lib/elementary/elm_widget_web.h \ lib/elementary/efl_ui_clock.h \ lib/elementary/elm_code.h \ @@ -308,7 +359,9 @@ includesunstable_HEADERS = \ lib/elementary/elm_code_indent.h \ lib/elementary/elm_code_file.h \ lib/elementary/elm_code_parse.h \ - lib/elementary/elm_code_syntax.h + lib/elementary/elm_code_syntax.h \ + lib/elementary/efl_ui_multibuttonentry.h \ + lib/elementary/Efl_Ui.h includesunstabledir = $(includedir)/elementary-@VMAJ@ nodist_includesunstable_HEADERS = \ @@ -317,12 +370,10 @@ nodist_includesunstable_HEADERS = \ includesub_HEADERS = \ lib/elementary/elc_ctxpopup.h \ - lib/elementary/elc_ctxpopup_eo.h \ lib/elementary/elc_ctxpopup_legacy.h \ lib/elementary/elc_combobox.h \ lib/elementary/elc_combobox_legacy.h \ lib/elementary/elc_fileselector.h \ - lib/elementary/elc_fileselector_eo.h \ lib/elementary/elc_fileselector_legacy.h \ lib/elementary/elc_fileselector_common.h \ lib/elementary/elc_fileselector_button.h \ @@ -332,14 +383,13 @@ includesub_HEADERS = \ lib/elementary/elc_hoversel.h \ lib/elementary/elc_hoversel_legacy.h \ lib/elementary/elc_multibuttonentry.h \ - lib/elementary/elc_multibuttonentry_eo.h \ + lib/elementary/efl_ui_multibuttonentry_eo.h \ lib/elementary/elc_multibuttonentry_legacy.h \ lib/elementary/elc_multibuttonentry_common.h \ lib/elementary/elc_naviframe.h \ lib/elementary/elc_naviframe_legacy.h \ lib/elementary/elc_naviframe_common.h \ lib/elementary/elc_popup.h \ - lib/elementary/elc_popup_eo.h \ lib/elementary/elc_popup_legacy.h \ lib/elementary/elm_access.h \ lib/elementary/elm_actionslider.h \ @@ -349,7 +399,7 @@ includesub_HEADERS = \ lib/elementary/elm_atspi_proxy.h \ lib/elementary/elm_authors.h \ lib/elementary/elm_bg.h \ - lib/elementary/elm_bg_eo.h \ + lib/elementary/efl_ui_bg_eo.h \ lib/elementary/elm_bg_legacy.h \ lib/elementary/elm_box.h \ lib/elementary/elm_box_legacy.h \ @@ -361,29 +411,25 @@ includesub_HEADERS = \ lib/elementary/elm_button_legacy.h \ lib/elementary/elm_cache.h \ lib/elementary/elm_calendar.h \ - lib/elementary/elm_calendar_eo.h \ lib/elementary/elm_calendar_legacy.h \ lib/elementary/elm_calendar_common.h \ + lib/elementary/efl_ui_calendar.h \ lib/elementary/elm_check.h \ lib/elementary/efl_ui_check_eo.h \ lib/elementary/elm_check_legacy.h \ lib/elementary/elm_clock.h \ - lib/elementary/elm_clock_eo.h \ lib/elementary/elm_clock_legacy.h \ lib/elementary/elm_cnp.h \ lib/elementary/elm_colorselector.h \ - lib/elementary/elm_colorselector_eo.h \ lib/elementary/elm_colorselector_legacy.h \ lib/elementary/elm_colorselector_common.h \ lib/elementary/elm_color_class.h \ lib/elementary/elm_config.h \ lib/elementary/elm_conform.h \ - lib/elementary/elm_conform_eo.h \ lib/elementary/elm_conform_legacy.h \ lib/elementary/elm_cursor.h \ lib/elementary/elm_datetime.h \ lib/elementary/elm_dayselector.h \ - lib/elementary/elm_dayselector_eo.h \ lib/elementary/elm_dayselector_legacy.h \ lib/elementary/elm_debug.h \ lib/elementary/elm_deprecated.h \ @@ -410,25 +456,20 @@ includesub_HEADERS = \ lib/elementary/elm_general.h \ lib/elementary/elm_gengrid.h \ lib/elementary/elm_gengrid_common.h \ - lib/elementary/elm_gengrid_eo.h \ lib/elementary/elm_gengrid_legacy.h \ lib/elementary/elm_genlist.h \ lib/elementary/elm_genlist_common.h \ - lib/elementary/elm_genlist_eo.h \ lib/elementary/elm_genlist_legacy.h \ lib/elementary/elm_gesture_layer.h \ lib/elementary/elm_gesture_layer_common.h \ - lib/elementary/elm_gesture_layer_eo.h \ lib/elementary/elm_gesture_layer_legacy.h \ lib/elementary/elm_getting_started.h \ lib/elementary/elm_glview.h \ lib/elementary/elm_glview_common.h \ - lib/elementary/elm_glview_eo.h \ lib/elementary/elm_glview_legacy.h \ lib/elementary/elm_grid.h \ lib/elementary/elm_grid_legacy.h \ lib/elementary/elm_hover.h \ - lib/elementary/elm_hover_eo.h \ lib/elementary/elm_hover_legacy.h \ lib/elementary/elm_icon.h \ lib/elementary/elm_icon_legacy.h \ @@ -436,42 +477,35 @@ includesub_HEADERS = \ lib/elementary/elm_image_eo.h \ lib/elementary/elm_image_legacy.h \ lib/elementary/elm_index.h \ - lib/elementary/elm_index_eo.h \ lib/elementary/elm_index_legacy.h \ ${top_builddir}/elm_intro.h \ lib/elementary/elm_inwin.h \ lib/elementary/elm_inwin_legacy.h \ lib/elementary/elm_label.h \ - lib/elementary/elm_label_eo.h \ lib/elementary/elm_label_legacy.h \ lib/elementary/elm_layout.h \ lib/elementary/elm_layout_common.h \ lib/elementary/elm_layout_legacy.h \ lib/elementary/elm_list.h \ - lib/elementary/elm_list_eo.h \ lib/elementary/elm_list_legacy.h \ lib/elementary/elm_macros.h \ lib/elementary/elm_map.h \ lib/elementary/elm_map_common.h \ - lib/elementary/elm_map_eo.h \ lib/elementary/elm_map_legacy.h \ lib/elementary/elm_mapbuf.h \ lib/elementary/elm_mapbuf_legacy.h \ lib/elementary/elm_menu.h \ - lib/elementary/elm_menu_eo.h \ lib/elementary/elm_menu_legacy.h \ lib/elementary/elm_mirroring.h \ lib/elementary/elm_need.h \ lib/elementary/elm_notify.h \ lib/elementary/elm_notify_common.h \ - lib/elementary/elm_notify_eo.h \ lib/elementary/elm_notify_legacy.h \ lib/elementary/efl_ui_nstate.h \ lib/elementary/elm_object.h \ lib/elementary/elm_object_item.h \ lib/elementary/elm_panel.h \ lib/elementary/elm_panel_common.h \ - lib/elementary/elm_panel_eo.h \ lib/elementary/elm_panel_legacy.h \ lib/elementary/elm_panes.h \ lib/elementary/efl_ui_panes_eo.h \ @@ -482,7 +516,6 @@ includesub_HEADERS = \ lib/elementary/efl_ui_image_zoomable_eo.h \ lib/elementary/elm_photocam_legacy.h \ lib/elementary/elm_plug.h \ - lib/elementary/elm_plug_eo.h \ lib/elementary/elm_plug_legacy.h \ lib/elementary/elm_prefs.h \ lib/elementary/elm_prefs_common.h \ @@ -496,12 +529,10 @@ includesub_HEADERS = \ lib/elementary/efl_ui_radio_eo.h \ lib/elementary/elm_radio_legacy.h \ lib/elementary/elm_route.h \ - lib/elementary/elm_route_eo.h \ lib/elementary/elm_route_legacy.h \ lib/elementary/elm_scale.h \ lib/elementary/elm_scroll.h \ lib/elementary/elm_scroller.h \ - lib/elementary/elm_scroller_eo.h \ lib/elementary/elm_scroller_legacy.h \ lib/elementary/elm_segment_control.h \ lib/elementary/elm_segment_control_legacy.h \ @@ -515,11 +546,9 @@ includesub_HEADERS = \ lib/elementary/elm_slideshow_common.h \ lib/elementary/elm_slideshow_legacy.h \ lib/elementary/elm_spinner.h \ - lib/elementary/elm_spinner_eo.h \ lib/elementary/elm_spinner_legacy.h \ lib/elementary/elm_store.h \ lib/elementary/elm_systray.h \ - lib/elementary/elm_systray_eo.h \ lib/elementary/elm_systray_common.h \ lib/elementary/elm_systray_watcher.h \ lib/elementary/elm_sys_notify.h \ @@ -564,7 +593,7 @@ lib_elementary_libelementary_la_SOURCES = \ lib/elementary/elc_fileselector_button.c \ lib/elementary/elc_fileselector_entry.c \ lib/elementary/elc_hoversel.c \ - lib/elementary/elc_multibuttonentry.c \ + lib/elementary/efl_ui_multibuttonentry.c \ lib/elementary/elc_naviframe.c \ lib/elementary/elc_player.c \ lib/elementary/elc_popup.c \ @@ -575,11 +604,12 @@ lib_elementary_libelementary_la_SOURCES = \ lib/elementary/elm_atspi_bridge.c \ lib/elementary/elm_atspi_ewk_wrapper.c \ lib/elementary/elm_atspi_proxy.c \ - lib/elementary/elm_bg.c \ + lib/elementary/efl_ui_bg.c \ lib/elementary/elm_box.c \ lib/elementary/elm_bubble.c \ lib/elementary/efl_ui_button.c \ lib/elementary/elm_calendar.c \ + lib/elementary/efl_ui_calendar.c \ lib/elementary/efl_ui_check.c \ lib/elementary/elm_clock.c \ lib/elementary/elm_cnp.c \ @@ -621,7 +651,7 @@ lib_elementary_libelementary_la_SOURCES = \ lib/elementary/elm_icon.c \ lib/elementary/efl_ui_image.c \ lib/elementary/elm_index.c \ - lib/elementary/elm_interface_atspi_accessible.c \ + lib/elementary/efl_access.c \ lib/elementary/efl_access_action.c \ lib/elementary/efl_access_component.c \ lib/elementary/efl_access_editable_text.c \ @@ -661,6 +691,8 @@ lib_elementary_libelementary_la_SOURCES = \ lib/elementary/elm_separator.c \ lib/elementary/efl_ui_slider.c \ lib/elementary/efl_ui_slider_interval.c \ + lib/elementary/efl_ui_spin.c \ + lib/elementary/efl_ui_spin_button.c \ lib/elementary/elm_slideshow.c \ lib/elementary/elm_spinner.c \ lib/elementary/elm_store.c \ @@ -693,6 +725,11 @@ lib_elementary_libelementary_la_SOURCES = \ lib/elementary/efl_ui_box_stack.c \ lib/elementary/efl_ui_box_layout.c \ lib/elementary/efl_ui_box_private.h \ + lib/elementary/efl_ui_popup.c \ + lib/elementary/efl_ui_popup_alert.c \ + lib/elementary/efl_ui_popup_alert_scroll.c \ + lib/elementary/efl_ui_popup_alert_text.c \ + lib/elementary/efl_ui_popup_anchor.c \ lib/elementary/efl_ui_grid.c \ lib/elementary/efl_ui_grid_static.c \ lib/elementary/efl_ui_grid_private.h \ @@ -707,6 +744,17 @@ lib_elementary_libelementary_la_SOURCES = \ lib/elementary/efl_ui_focus_manager_root_focus.c \ lib/elementary/efl_ui_textpath.c \ lib/elementary/tizen_util.c \ + lib/elementary/efl_ui_focus_layer.c \ + lib/elementary/efl_ui_focus_composition.c \ + lib/elementary/efl_ui_focus_parent_provider.c \ + lib/elementary/efl_ui_focus_parent_provider_standard.c \ + lib/elementary/efl_ui_focus_parent_provider_gen.c \ + lib/elementary/efl_ui_focus_util.c \ + lib/elementary/elm_widget_item_static_focus.c \ + lib/elementary/efl_ui_list.c \ + lib/elementary/efl_ui_list_precise_layouter.c \ + lib/elementary/efl_ui_list_segarray.c \ + lib/elementary/efl_ui_layout_factory.c \ $(NULL) @@ -796,6 +844,17 @@ bin/elementary/test_dayselector.c \ bin/elementary/test_disable.c \ bin/elementary/test_diskselector.c \ bin/elementary/test_dnd.c \ +bin/elementary/test_efl_anim_alpha.c \ +bin/elementary/test_efl_anim_rotate.c \ +bin/elementary/test_efl_anim_scale.c \ +bin/elementary/test_efl_anim_translate.c \ +bin/elementary/test_efl_anim_group_parallel.c \ +bin/elementary/test_efl_anim_group_sequential.c \ +bin/elementary/test_efl_anim_event_anim.c \ +bin/elementary/test_efl_anim_pause.c \ +bin/elementary/test_efl_anim_repeat.c \ +bin/elementary/test_efl_anim_start_delay.c \ +bin/elementary/test_efl_anim_interpolator.c \ bin/elementary/test_eio.c \ bin/elementary/test_entry.c \ bin/elementary/test_entry_anchor.c \ @@ -852,6 +911,9 @@ bin/elementary/test_notify.c \ bin/elementary/test_nstate.c \ bin/elementary/test_panel.c \ bin/elementary/test_panes.c \ +bin/elementary/test_ui_panes.c \ +bin/elementary/test_part_bg.c \ +bin/elementary/test_part_shadow.c \ bin/elementary/test_photo.c \ bin/elementary/test_photocam.c \ bin/elementary/test_popup.c \ @@ -863,7 +925,10 @@ bin/elementary/test_scroller.c \ bin/elementary/test_segment_control.c \ bin/elementary/test_separator.c \ bin/elementary/test_slider.c \ -bin/elementary/test_slider_interval.c \ +bin/elementary/test_ui_slider.c \ +bin/elementary/test_ui_slider_interval.c \ +bin/elementary/test_ui_spin.c \ +bin/elementary/test_ui_spin_button.c \ bin/elementary/test_slideshow.c \ bin/elementary/test_spinner.c \ bin/elementary/test_store.c \ @@ -878,6 +943,7 @@ bin/elementary/test_transit_bezier.c \ bin/elementary/test_ui_box.c \ bin/elementary/test_ui_clock.c \ bin/elementary/test_ui_grid.c \ +bin/elementary/test_ui_popup.c \ bin/elementary/test_ui_textpath.c \ bin/elementary/test_video.c \ bin/elementary/test_weather.c \ @@ -892,6 +958,8 @@ bin/elementary/test_win_dialog.c \ bin/elementary/test_win_modal.c \ bin/elementary/test_efl_ui_text.c \ bin/elementary/test_win_stack.c \ +bin/elementary/test_win_indicator.c \ +bin/elementary/test_gesture_framework.c \ bin/elementary/test.h bin_elementary_elementary_test_LDADD = @USE_ELEMENTARY_LIBS@ @@ -1420,7 +1488,7 @@ GENERATED_JS_BINDINGS += $(generated_elementary_js_bindings) endif -if HAVE_CXX11 +if HAVE_CXX elementary_eolian_cxx_hh = $(elm_public_eolian_files:%.eo=%.eo.hh) elementary_eolian_cxx_impl_hh = $(elm_public_eolian_files:%.eo=%.eo.impl.hh) endif diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h index 08e730f..c157824 100644 --- a/src/lib/ecore/ecore_private.h +++ b/src/lib/ecore/ecore_private.h @@ -278,6 +278,18 @@ int _ecore_pipe_wait(Ecore_Pipe *p, double wait); void *_ecore_pipe_del(Ecore_Pipe *p); +//TIZEN_ONLY: ecore: stabilize wayland event handling in multithread +typedef struct _Ecore_Awake_Handler +{ + EINA_INLIST; + Ecore_Awake_Cb func; + void *data; +} Ecore_Awake_Handler; + +void _ecore_main_awake_handler_call(void); +int _ecore_main_fdh_mark_active(fd_set *rfds, fd_set *wfds, fd_set *exfds); +// + Ecore_Fd_Handler *_ecore_main_fd_handler_add(Eo *obj, Efl_Loop_Data *pd, Eo *handler, @@ -305,18 +317,6 @@ _ecore_main_win32_handler_del(Eo *obj, void _ecore_main_content_clear(Efl_Loop_Data *pd); -//TIZEN_ONLY: ecore: stabilize wayland event handling in multithread -typedef struct _Ecore_Awake_Handler -{ - EINA_INLIST; - Ecore_Awake_Cb func; - void *data; -} Ecore_Awake_Handler; - -void _ecore_main_awake_handler_call(void); -int _ecore_main_fdh_mark_active(fd_set *rfds, fd_set *wfds, fd_set *exfds); -// - void _ecore_main_shutdown(void); #if defined (_WIN32) || defined (__lv2ppu__) || defined (HAVE_EXOTIC) diff --git a/src/lib/elementary/efl_access.eo b/src/lib/elementary/efl_access.eo index 70ad50f..af8d1f5 100644 --- a/src/lib/elementary/efl_access.eo +++ b/src/lib/elementary/efl_access.eo @@ -318,7 +318,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object) eo_prefix: efl_access; data: Efl_Access_Data; methods { - @property localized_role_name @protected { + @property localized_role_name @protected @beta { [[Gets an localized string describing accessible object role name.]] get { } @@ -326,7 +326,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object) localized_name: string; [[Localized accessible object role name]] } } - @property name { + @property name @beta { [[Accessible name of the object.]] get { } @@ -351,7 +351,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object) } } // - @property relation_set @protected { + @property relation_set @protected @beta { [[Gets an all relations between accessible object and other accessible objects.]] get { } @@ -359,7 +359,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object) relations: Efl.Access.Relation_Set; [[Accessible relation set]] } } - @property role { + @property role @beta { [[The role of the object in accessibility domain.]] get { } @@ -406,7 +406,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object) return: bool; } // - @property children @protected { + @property children @protected @beta { [[Gets object's accessible children.]] get { } @@ -414,7 +414,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object) children: list @owned; [[List of widget's children]] } } - @property role_name @protected { + @property role_name @protected @beta { [[Gets human-readable string indentifying object accessibility role.]] get { } @@ -422,7 +422,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object) role_name: string; [[Accessible role name]] } } - @property attributes @protected { + @property attributes @protected @beta { [[Gets key-value pairs indentifying object extra attributes. Must be free by a user.]] get { } @@ -431,7 +431,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object) } } attribute_append { - [[Add key-value pair identifying widget extra attribute + [[Add key-value pair identifying object extra attribute \@if WEARABLE \@since_tizen 3.0 \@endif @@ -466,32 +466,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object) reading_info: Efl.Access.Reading.Info.Type; [[Reading information types]] } } - attribute_append { - [[Add key-value pair identifying object extra attributes - ]] - params { - @in key: string; [[The string key to give extra information]] - @in value: string; [[The string value to give extra information]] - } - } - attributes_clear { - [[Removes all attributes in accessible object. - - \@internal - ]] - } - @property reading_info_type @protected { - get { - [[Gets reading information types of an accessible object.]] - } - set { - [[Sets reading information of an accessible object.]] - } - values { - reading_info: Efl.Access.Reading.Info.Type; [[Reading information types]] - } - } - @property index_in_parent @protected { + @property index_in_parent @protected @beta { [[Gets index of the child in parent's children list.]] get { } @@ -499,7 +474,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object) idx: int; [[Index in children list]] } } - @property description { + @property description @beta { [[Contextual information about object.]] get { } @@ -509,7 +484,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object) description: string; [[Accessible contextual information]] } } - @property parent { + @property parent @beta { [[Object's accessible parent.]] get { } @@ -519,7 +494,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object) parent: Efl.Access; [[Accessible parent]] } } - @property state_set @protected { + @property state_set @protected @beta { [[Gets set describing object accessible states.]] get { } @@ -548,7 +523,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object) } } // - event_handler_add @class @protected { + event_handler_add @class @protected @beta { [[Register accessibility event listener]] params { @in cb: Efl_Event_Cb; [[Callback]] @@ -556,21 +531,21 @@ mixin Efl.Access (Efl.Interface, Efl.Object) } return: ptr(Efl.Access.Event.Handler); [[Event handler]] } - event_handler_del @class @protected { + event_handler_del @class @protected @beta { [[Deregister accessibility event listener]] params { @in handler: ptr(Efl.Access.Event.Handler); [[Event handler]] } } - event_emit @class @protected { - [[Emit event]] + event_emit @class @protected @beta { + [[Emit event]] params { @in accessible: Efl.Access; [[Accessibility object.]] - @in event: ptr(const(Efl.Event.Description)); [[Accessibility event type.]] + @cref event: Efl.Event.Description; [[Accessibility event type.]] @in event_info: void_ptr; [[Accessibility event details.]] } } - @property translation_domain { + @property translation_domain @beta { [[The translation domain of "name" and "description" properties. @@ -592,7 +567,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object) domain: string; [[Translation domain]] } } - @property type { + @property type @beta { [[Type of accessibility object]] get { } @@ -602,7 +577,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object) type: Efl.Access.Type; [[Object type]] } } - relationship_append { + relationship_append @beta { [[Defines the relationship between two accessible objects. Adds unique relation between source object and relation_object of a @@ -621,7 +596,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object) @in relation_object: const(Efl.Access); [[Object to relate to]] } } - relationship_remove { + relationship_remove @beta { [[Removes the relationship between two accessible objects. If relation_object is NULL function removes all relations @@ -632,10 +607,10 @@ mixin Efl.Access (Efl.Interface, Efl.Object) @in relation_object: const(Efl.Access); [[Object to remove relation from]] } } - relationships_clear { + relationships_clear @beta { [[Removes all relationships in accessible object.]] } - @property root @class { + @property root @class @beta { get { [[Get root object of accessible object hierarchy]] values { diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo index 1d0f7e0..bc6447f 100644 --- a/src/lib/elementary/elm_hoversel.eo +++ b/src/lib/elementary/elm_hoversel.eo @@ -2,7 +2,7 @@ import elm_general; class Elm.Hoversel (Efl.Ui.Button, Efl.Ui.Selectable, Efl.Ui.Clickable, - Elm.Interface.Atspi_Widget_Action) + Efl.Access.Widget.Action) { [[Elementary hoversel class]] legacy_prefix: elm_hoversel;