From e23729be711a733a9dc9554cc6d6e4175da8ec7f Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Mon, 23 Dec 2019 10:38:18 +0900 Subject: [PATCH] backup progress --- data/elementary/meson.build | 6 +- meson.build | 10 +-- src/lib/elementary/Efl_Ui.h | 20 ++--- src/lib/elementary/Elementary.h | 12 +-- src/lib/elementary/elm_priv.h | 8 +- src/lib/elementary/meson.build | 132 ++++++++++++++++---------------- 6 files changed, 94 insertions(+), 94 deletions(-) diff --git a/data/elementary/meson.build b/data/elementary/meson.build index ed7d1e4204..6929a044c0 100644 --- a/data/elementary/meson.build +++ b/data/elementary/meson.build @@ -1,8 +1,8 @@ subdir('config') -subdir('desktop') +#subdir('desktop') subdir('themes') -subdir('objects') -subdir('edje_externals') +#subdir('objects') +#subdir('edje_externals') install_subdir('images', install_dir : join_paths(dir_data, 'elementary'), diff --git a/meson.build b/meson.build index 222a79bcff..0e5b362c94 100644 --- a/meson.build +++ b/meson.build @@ -297,7 +297,7 @@ subprojects = [ ['emotion' ,[] , true, true, false, false, true, true, ['eina', 'efl', 'eo'], []], ['ethumb' ,[] , true, true, true, false, false, false, ['eina', 'efl', 'eo'], []], ['ethumb_client' ,[] , false, true, true, false, false, true, ['eina', 'efl', 'eo', 'ethumb'], []], -['elementary' ,[] , true, true, true, true, true, true, ['eina', 'efl', 'eo', 'eet', 'evas', 'ecore', 'ecore-evas', 'ecore-file', 'ecore-input', 'edje', 'ethumb-client', 'emotion', 'ecore-imf', 'ecore-con', 'eldbus', 'efreet', 'efreet-mime', 'efreet-trash', 'eio'], ['atspi']], +['elementary' ,[] , false, true, false, false, false, false, ['eina', 'efl', 'eo', 'eet', 'evas', 'ecore', 'ecore-evas', 'ecore-file', 'ecore-input', 'edje', 'ethumb-client', 'emotion', 'ecore-imf', 'ecore-con', 'eldbus', 'efreet', 'efreet-mime', 'efreet-trash', 'eio'], ['atspi']], ['efl_wl' ,['wl'] , false, true, true, false, false, false, ['evas', 'ecore'], []], ['elua' ,['elua'] , false, true, true, false, true, false, ['eina', 'luajit'], []], ['ecore_wayland' ,['wl-deprecated'] , false, true, false, false, false, false, ['eina'], []], @@ -427,7 +427,7 @@ if sys_windows == false endif subdir('cmakeconfig') subdir(join_paths('src', 'bindings')) -subdir(join_paths('src', 'edje_external')) +#subdir(join_paths('src', 'edje_external')) subdir(join_paths('data')) if get_option('build-tests') @@ -457,9 +457,9 @@ endforeach doxygen = find_program('doxygen', required : false) -if doxygen.found() - subdir('doc') -endif +#if doxygen.found() +# subdir('doc') +#endif # # Configure files diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h index 209fa44f46..1f9b4e5a86 100644 --- a/src/lib/elementary/Efl_Ui.h +++ b/src/lib/elementary/Efl_Ui.h @@ -230,7 +230,7 @@ typedef void (*Context_Item_Clicked_Cb)(void *data, Eo *obj, void *event_info); # include # include -# include +//# include # include # include @@ -244,7 +244,7 @@ typedef void (*Context_Item_Clicked_Cb)(void *data, Eo *obj, void *event_info); /* FIXME: Multibuttonentry must not use elm_widget_item */ # include -# include +//# include # include # include # include @@ -273,14 +273,14 @@ typedef Eo Efl_Ui_Spotlight_Indicator; # include # include -# include -# include -# include +//# include +//# include +//# include # include # include # include # include -# include +//# include # include # include # include @@ -300,7 +300,7 @@ typedef Eo Efl_Ui_Spotlight_Indicator; # include # include # include -# include +//# include # include # include # include @@ -325,9 +325,9 @@ typedef Eo Efl_Ui_Spotlight_Indicator; # include # include -# include -# include -# include +//# include +//# include +//# include /** * Initialize Elementary diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h index a3fa4f4412..7cfcd0e8d1 100644 --- a/src/lib/elementary/Elementary.h +++ b/src/lib/elementary/Elementary.h @@ -172,12 +172,12 @@ EAPI extern Elm_Version *elm_version; /* other includes */ #include -#include +//#include #include -#include -#include -#include -#include +//#include +//#include +//#include +//#include #include #include #include @@ -202,7 +202,7 @@ EAPI extern Elm_Version *elm_version; #include #include #include -#include +//#include #include #include diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h index ca3ab0620f..8d2ffadd65 100644 --- a/src/lib/elementary/elm_priv.h +++ b/src/lib/elementary/elm_priv.h @@ -87,9 +87,9 @@ #include "elm_diskselector_eo.h" #include "elm_diskselector_item_eo.h" #include "elm_entry_eo.h" -#include "elm_fileselector_button_eo.h" -#include "elm_fileselector_entry_eo.h" -#include "elm_fileselector_eo.h" +//#include "elm_fileselector_button_eo.h" +//#include "elm_fileselector_entry_eo.h" +//#include "elm_fileselector_eo.h" #include "elm_flipselector_eo.h" #include "elm_flipselector_item_eo.h" #include "elm_gengrid_eo.h" @@ -108,7 +108,7 @@ #include "elm_image_eo.h" #include "elm_index_eo.h" #include "elm_index_item_eo.h" -#include "elm_interface_fileselector_eo.h" +//#include "elm_interface_fileselector_eo.h" #include "elm_inwin_eo.h" #include "elm_label_eo.h" #include "elm_list_eo.h" diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build index 8872c2c25c..441db65ec1 100644 --- a/src/lib/elementary/meson.build +++ b/src/lib/elementary/meson.build @@ -1,9 +1,9 @@ pub_legacy_eo_files = [ - 'efl_ui_clock_legacy.eo', +# 'efl_ui_clock_legacy.eo', 'elm_ctxpopup_part.eo', 'elm_dayselector_part.eo', 'elm_entry_part.eo', - 'elm_fileselector_entry_part.eo', +# 'elm_fileselector_entry_part.eo', 'elm_flip_part.eo', 'elm_hover_part.eo', 'elm_mapbuf_part.eo', @@ -16,7 +16,7 @@ pub_legacy_eo_files = [ 'elm_label_part.eo', 'elm_actionslider_part.eo', 'elm_bubble_part.eo', - 'elm_fileselector_part.eo', +# 'elm_fileselector_part.eo', ] pub_eo_file_target = [] @@ -41,9 +41,9 @@ pub_eo_files = [ 'efl_ui_widget_scrollable_content.eo', 'efl_ui_animation_view.eo', 'efl_ui_bg.eo', - 'efl_ui_button.eo', - 'efl_ui_calendar.eo', - 'efl_ui_calendar_item.eo', +# 'efl_ui_button.eo', +# 'efl_ui_calendar.eo', +# 'efl_ui_calendar_item.eo', 'efl_ui_check.eo', 'efl_ui_flip.eo', 'efl_ui_frame.eo', @@ -51,9 +51,9 @@ pub_eo_files = [ 'efl_ui_image_zoomable.eo', 'efl_ui_layout.eo', 'efl_ui_layout_base.eo', - 'efl_ui_navigation_bar.eo', - 'efl_ui_navigation_bar_part.eo', - 'efl_ui_navigation_bar_part_back_button.eo', +# 'efl_ui_navigation_bar.eo', +# 'efl_ui_navigation_bar_part.eo', +# 'efl_ui_navigation_bar_part_back_button.eo', 'efl_ui_navigation_layout.eo', 'efl_ui_panes.eo', 'efl_ui_progressbar.eo', @@ -64,10 +64,10 @@ pub_eo_files = [ 'efl_ui_slider.eo', 'efl_ui_slider_interval.eo', 'efl_ui_spin.eo', - 'efl_ui_spin_button.eo', +# 'efl_ui_spin_button.eo', 'efl_ui_panel.eo', - 'efl_ui_datepicker.eo', - 'efl_ui_timepicker.eo', +# 'efl_ui_datepicker.eo', +# 'efl_ui_timepicker.eo', 'efl_ui_tags.eo', 'efl_ui_video.eo', 'efl_ui_win.eo', @@ -82,15 +82,15 @@ pub_eo_files = [ 'efl_ui_textbox.eo', 'efl_ui_popup.eo', 'efl_ui_popup_part_backwall.eo', - 'efl_ui_alert_popup.eo', - 'efl_ui_alert_popup_part_title.eo', +# 'efl_ui_alert_popup.eo', +# 'efl_ui_alert_popup_part_title.eo', 'efl_ui_textbox_async.eo', 'efl_ui_text_factory_images.eo', 'efl_ui_text_factory_emoticons.eo', 'efl_ui_text_factory_fallback.eo', 'efl_ui_textpath.eo', 'efl_ui_l10n.eo', - 'efl_ui_clock.eo', +# 'efl_ui_clock.eo', 'efl_ui_image_factory.eo', 'efl_ui_focus_manager.eo', 'efl_ui_focus_manager_calc.eo', @@ -156,7 +156,7 @@ pub_eo_files = [ 'efl_ui_tab_page.eo', 'efl_ui_widget_focus_manager.eo', 'efl_ui_legacy.eo', - 'efl_ui_button_legacy_part.eo', +# 'efl_ui_button_legacy_part.eo', 'efl_ui_radio_legacy_part.eo', 'efl_ui_check_legacy_part.eo', 'efl_ui_progressbar_legacy_part.eo', @@ -274,30 +274,30 @@ elementary_headers_unstable = [ 'efl_access_text.h', 'efl_access_widget_action.h', 'efl_access_window.h', - 'elm_interface_fileselector.h', +# 'elm_interface_fileselector.h', 'elm_interface_scrollable.h', 'elm_interfaces.h', 'elm_widget.h', 'elm_widget_actionslider.h', 'elm_widget_box.h', 'elm_widget_bubble.h', - 'efl_ui_button_private.h', +# 'efl_ui_button_private.h', 'efl_ui_bg_private.h', 'elm_widget_calendar.h', - 'efl_ui_calendar_private.h', +# 'efl_ui_calendar_private.h', 'efl_ui_check_private.h', 'elm_widget_clock.h', 'elm_widget_colorselector.h', 'elm_widget_conform.h', 'elm_widget_container.h', - 'elm_widget_combobox.h', +# 'elm_widget_combobox.h', 'elm_widget_ctxpopup.h', 'elm_widget_dayselector.h', 'elm_widget_diskselector.h', 'elm_widget_entry.h', - 'elm_widget_fileselector.h', - 'elm_widget_fileselector_button.h', - 'elm_widget_fileselector_entry.h', +# 'elm_widget_fileselector.h', +# 'elm_widget_fileselector_button.h', +# 'elm_widget_fileselector_entry.h', 'efl_ui_widget_flip.h', 'elm_widget_flipselector.h', 'efl_ui_widget_frame.h', @@ -307,11 +307,11 @@ elementary_headers_unstable = [ 'elm_widget_glview.h', 'elm_widget_grid.h', 'elm_widget_hover.h', - 'elm_widget_hoversel.h', +# 'elm_widget_hoversel.h', 'elm_widget_icon.h', 'efl_ui_widget_image.h', 'efl_ui_popup_private.h', - 'efl_ui_alert_popup_private.h', +# 'efl_ui_alert_popup_private.h', 'elm_widget_index.h', 'elm_widget_inwin.h', 'elm_widget_label.h', @@ -322,7 +322,7 @@ elementary_headers_unstable = [ 'elm_widget_menu.h', 'elm_widget_multibuttonentry.h', 'elm_widget_naviframe.h', - 'efl_ui_navigation_bar_private.h', +# 'efl_ui_navigation_bar_private.h', 'efl_ui_navigation_layout_private.h', 'elm_widget_notify.h', 'elm_widget_panel.h', @@ -345,10 +345,10 @@ elementary_headers_unstable = [ 'elm_widget_slideshow.h', 'elm_widget_spinner.h', 'efl_ui_spin_private.h', - 'efl_ui_spin_button_private.h', +# 'efl_ui_spin_button_private.h', 'efl_ui_panel_private.h', - 'efl_ui_datepicker_private.h', - 'efl_ui_timepicker_private.h', +# 'efl_ui_datepicker_private.h', +# 'efl_ui_timepicker_private.h', 'efl_ui_tags_private.h', 'elm_widget_table.h', 'elm_widget_thumb.h', @@ -356,7 +356,7 @@ elementary_headers_unstable = [ 'efl_ui_video_private.h', 'efl_ui_item_private.h', 'elm_widget_web.h', - 'efl_ui_clock.h', +# 'efl_ui_clock.h', 'elm_code.h', 'elm_code_widget_legacy.h', 'elm_code_widget_selection.h', @@ -381,17 +381,17 @@ elementary_headers_unstable = [ elementary_pub_headers = [ 'elc_ctxpopup.h', 'elc_ctxpopup_legacy.h', - 'elc_combobox.h', - 'elc_combobox_legacy.h', - 'elc_fileselector.h', - 'elc_fileselector_legacy.h', - 'elc_fileselector_common.h', - 'elc_fileselector_button.h', - 'elc_fileselector_button_legacy.h', - 'elc_fileselector_entry.h', - 'elc_fileselector_entry_legacy.h', - 'elc_hoversel.h', - 'elc_hoversel_legacy.h', +# 'elc_combobox.h', +# 'elc_combobox_legacy.h', +# 'elc_fileselector.h', +# 'elc_fileselector_legacy.h', +# 'elc_fileselector_common.h', +# 'elc_fileselector_button.h', +# 'elc_fileselector_button_legacy.h', +# 'elc_fileselector_entry.h', +# 'elc_fileselector_entry_legacy.h', +# 'elc_hoversel.h', +# 'elc_hoversel_legacy.h', 'elc_multibuttonentry.h', 'elc_multibuttonentry_eo.h', 'elc_multibuttonentry_legacy.h', @@ -421,7 +421,7 @@ elementary_pub_headers = [ 'elm_bubble_legacy.h', 'elm_button.h', 'efl_ui_widget_common.h', - 'efl_ui_button_eo.h', +# 'efl_ui_button_eo.h', 'elm_button_legacy.h', 'elm_cache.h', 'elm_calendar.h', @@ -442,7 +442,7 @@ elementary_pub_headers = [ 'elm_conform.h', 'elm_conform_legacy.h', 'elm_cursor.h', - 'elm_datetime.h', +# 'elm_datetime.h', 'elm_dayselector.h', 'elm_dayselector_legacy.h', 'elm_debug.h', @@ -595,8 +595,8 @@ elementary_pub_headers = [ 'efl_ui_animation_view_eo.legacy.h', 'efl_ui_bg_eo.legacy.h', 'efl_ui_bg_legacy_eo.legacy.h', - 'efl_ui_button_eo.legacy.h', - 'efl_ui_button_legacy_eo.legacy.h', +# 'efl_ui_button_eo.legacy.h', +# 'efl_ui_button_legacy_eo.legacy.h', 'efl_ui_check_eo.legacy.h', 'efl_ui_check_legacy_eo.legacy.h', 'efl_ui_flip_eo.legacy.h', @@ -639,8 +639,8 @@ elementary_pub_headers = [ 'elm_diskselector_eo.legacy.h', 'elm_diskselector_item_eo.legacy.h', 'elm_entry_eo.legacy.h', - 'elm_fileselector_button_eo.legacy.h', - 'elm_fileselector_entry_eo.legacy.h', +# 'elm_fileselector_button_eo.legacy.h', +# 'elm_fileselector_entry_eo.legacy.h', 'elm_fileselector_eo.legacy.h', 'elm_flipselector_eo.legacy.h', 'elm_flipselector_item_eo.legacy.h', @@ -654,12 +654,12 @@ elementary_pub_headers = [ 'elm_glview_eo.legacy.h', 'elm_grid_eo.legacy.h', 'elm_hover_eo.legacy.h', - 'elm_hoversel_eo.legacy.h', - 'elm_hoversel_item_eo.legacy.h', +# 'elm_hoversel_eo.legacy.h', +# 'elm_hoversel_item_eo.legacy.h', 'elm_icon_eo.legacy.h', 'elm_index_eo.legacy.h', 'elm_index_item_eo.legacy.h', - 'elm_interface_fileselector_eo.legacy.h', +# 'elm_interface_fileselector_eo.legacy.h', 'elm_inwin_eo.legacy.h', 'elm_label_eo.legacy.h', 'elm_list_eo.legacy.h', @@ -719,13 +719,13 @@ elementary_src = [ 'elementary_config.h', 'els_box.h', 'elc_ctxpopup.c', - 'elc_fileselector.c', - 'elc_fileselector_button.c', - 'elc_fileselector_entry.c', - 'elc_hoversel.c', +# 'elc_fileselector.c', +# 'elc_fileselector_button.c', +# 'elc_fileselector_entry.c', +# 'elc_hoversel.c', 'elc_multibuttonentry.c', 'elc_naviframe.c', - 'efl_ui_navigation_bar.c', +# 'efl_ui_navigation_bar.c', 'efl_ui_navigation_layout.c', 'elc_player.c', 'elc_popup.c', @@ -739,9 +739,9 @@ elementary_src = [ 'efl_ui_bg.c', 'elm_box.c', 'elm_bubble.c', - 'efl_ui_button.c', +# 'efl_ui_button.c', 'elm_calendar.c', - 'efl_ui_calendar.c', +# 'efl_ui_calendar.c', 'efl_ui_check.c', 'elm_clock.c', 'elm_code_line.c', @@ -758,10 +758,10 @@ elementary_src = [ 'elm_code_widget_private.h', 'elm_colorselector.c', 'elm_color_class.c', - 'elc_combobox.c', +# 'elc_combobox.c', 'elm_config.c', 'elm_conform.c', - 'elm_datetime.c', +# 'elm_datetime.c', 'elm_dayselector.c', 'elm_dbus_menu.c', 'elm_diskselector.c', @@ -793,7 +793,7 @@ elementary_src = [ 'efl_access_value.c', 'efl_access_widget_action.c', 'efl_access_window.c', - 'elm_interface_fileselector.c', +# 'elm_interface_fileselector.c', 'elm_interface_scrollable.c', 'elm_inwin.c', 'elm_label.c', @@ -825,10 +825,10 @@ elementary_src = [ 'efl_ui_slider.c', 'efl_ui_slider_interval.c', 'efl_ui_spin.c', - 'efl_ui_spin_button.c', +# 'efl_ui_spin_button.c', 'efl_ui_panel.c', - 'efl_ui_datepicker.c', - 'efl_ui_timepicker.c', +# 'efl_ui_datepicker.c', +# 'efl_ui_timepicker.c', 'efl_ui_tags.c', 'elm_slideshow.c', 'elm_spinner.c', @@ -867,7 +867,7 @@ elementary_src = [ 'efl_ui_box_layout.c', 'efl_ui_box_private.h', 'efl_ui_popup.c', - 'efl_ui_alert_popup.c', +# 'efl_ui_alert_popup.c', 'efl_ui_table.c', 'efl_ui_table_static.c', 'efl_ui_table_layout.c', @@ -876,8 +876,8 @@ elementary_src = [ 'efl_ui_text_factory_images.c', 'efl_ui_text_factory_emoticons.c', 'efl_ui_text_factory_fallback.c', - 'efl_ui_clock.c', - 'efl_ui_clock_private.h', +# 'efl_ui_clock.c', +# 'efl_ui_clock_private.h', 'efl_ui_image_factory.c', 'efl_ui_focus_manager.c', 'efl_ui_focus_manager_calc.c',