From: Woochan Lee Date: Thu, 26 May 2016 05:08:47 +0000 (+0900) Subject: File name changed. X-Git-Tag: submit/tizen/20160617.075742~30 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=29ced0505342abd60ebd560444f4ee3a7d5eb2c1;p=platform%2Fcore%2Fuifw%2Fui-viewmgr.git File name changed. Remove _c postfix. Change-Id: If6c974806b067249c83858972e0c86bad5377407 --- diff --git a/src/include/efl/mobile/c/ui_app.h b/src/include/efl/mobile/c/ui_app.h new file mode 100644 index 0000000..12f0eb9 --- /dev/null +++ b/src/include/efl/mobile/c/ui_app.h @@ -0,0 +1,17 @@ +#ifndef _UI_APP_C_H_ +#define _UI_APP_C_H_ + +namespace efl_viewmanager +{ + +#ifdef __cplusplus +extern "C" { +#endif + int ui_app_init(const char *pkg, const char *locale_dir); + int ui_app_run(int argc, char **argv, ui_app_lifecycle_callback_s *event_callback, void *data); +#ifdef __cplusplus +} +#endif + +} +#endif /* _UI_APP_C_H_ */ diff --git a/src/include/efl/mobile/c/ui_app_c.h b/src/include/efl/mobile/c/ui_app_c.h deleted file mode 100644 index 12f0eb9..0000000 --- a/src/include/efl/mobile/c/ui_app_c.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef _UI_APP_C_H_ -#define _UI_APP_C_H_ - -namespace efl_viewmanager -{ - -#ifdef __cplusplus -extern "C" { -#endif - int ui_app_init(const char *pkg, const char *locale_dir); - int ui_app_run(int argc, char **argv, ui_app_lifecycle_callback_s *event_callback, void *data); -#ifdef __cplusplus -} -#endif - -} -#endif /* _UI_APP_C_H_ */ diff --git a/src/include/efl/mobile/c/ui_menu.h b/src/include/efl/mobile/c/ui_menu.h new file mode 100644 index 0000000..0c6a5ae --- /dev/null +++ b/src/include/efl/mobile/c/ui_menu.h @@ -0,0 +1,16 @@ +#ifndef _UI_MENU_C_H_ +#define _UI_MENU_C_H_ + +namespace efl_viewmananger +{ + +#ifdef __cplusplus +extern "C" { +#endif + bool ui_menu_content_set(ui_menu *menu, Elm_Ctxpopup *ctxpopup); +#ifdef __cplusplus +} +#endif +} + +#endif /* _UI_MENU_C_H_ */ diff --git a/src/include/efl/mobile/c/ui_menu_c.h b/src/include/efl/mobile/c/ui_menu_c.h deleted file mode 100644 index 0c6a5ae..0000000 --- a/src/include/efl/mobile/c/ui_menu_c.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef _UI_MENU_C_H_ -#define _UI_MENU_C_H_ - -namespace efl_viewmananger -{ - -#ifdef __cplusplus -extern "C" { -#endif - bool ui_menu_content_set(ui_menu *menu, Elm_Ctxpopup *ctxpopup); -#ifdef __cplusplus -} -#endif -} - -#endif /* _UI_MENU_C_H_ */ diff --git a/src/include/efl/mobile/c/ui_popup.h b/src/include/efl/mobile/c/ui_popup.h new file mode 100644 index 0000000..c64b1f2 --- /dev/null +++ b/src/include/efl/mobile/c/ui_popup.h @@ -0,0 +1,18 @@ +#ifndef _UI_POPUP_C_H_ +#define _UI_POPUP_C_H_ + +namespace efl_viewmananger +{ + +#ifdef __cplusplus +extern "C" { +#endif + bool ui_popup_content_set(ui_popup *popup, Elm_Popup *elm_popup); + bool ui_popup_activate(ui_popup *popup); + void ui_popup_del(ui_popup *popup); +#ifdef __cplusplus +} +#endif + +} +#endif /* _UI_POPUP_C_H_ */ diff --git a/src/include/efl/mobile/c/ui_popup_c.h b/src/include/efl/mobile/c/ui_popup_c.h deleted file mode 100644 index c64b1f2..0000000 --- a/src/include/efl/mobile/c/ui_popup_c.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _UI_POPUP_C_H_ -#define _UI_POPUP_C_H_ - -namespace efl_viewmananger -{ - -#ifdef __cplusplus -extern "C" { -#endif - bool ui_popup_content_set(ui_popup *popup, Elm_Popup *elm_popup); - bool ui_popup_activate(ui_popup *popup); - void ui_popup_del(ui_popup *popup); -#ifdef __cplusplus -} -#endif - -} -#endif /* _UI_POPUP_C_H_ */ diff --git a/src/include/efl/mobile/c/ui_view.h b/src/include/efl/mobile/c/ui_view.h new file mode 100644 index 0000000..1441edb --- /dev/null +++ b/src/include/efl/mobile/c/ui_view.h @@ -0,0 +1,66 @@ +#ifndef _UI_VIEW_C_H_ +#define _UI_VIEW_C_H_ + +namespace efl_viewmananger +{ + +#ifdef __cplusplus +extern "C" { +#endif + typedef bool (*ui_view_lifecycle_load_cb) (ui_view *view, void *data); + typedef bool (*ui_view_lifecycle_unload_cb) (ui_view *view, void *data); + typedef bool (*ui_view_lifecycle_pause_cb) (ui_view *view, void *data); + typedef bool (*ui_view_lifecycle_resume_cb) (ui_view *view, void *data); + typedef bool (*ui_view_lifecycle_activate_cb) (ui_view *view, void *data); + typedef bool (*ui_view_lifecycle_deactivate_cb) (ui_view *view, void *data); + typedef bool (*ui_view_lifecycle_destroy_cb) (ui_view *view, void *data); + + typedef bool (*ui_view_event_rotate_cb) (ui_view *view, int degree, void *data); + typedef bool (*ui_view_event_portrait_cb) (ui_view *view, void *data); + typedef bool (*ui_view_event_landscape_cb) (ui_view *view, void *data); + typedef bool (*ui_view_event_back_cb) (ui_view *view, void *data); + typedef bool (*ui_view_event_menu_cb) (ui_menu *menu, void *data); + + typedef struct + { + ui_view_lifecycle_load_cb load; + ui_view_lifecycle_unload_cb unload; + ui_view_lifecycle_pause_cb pause; + ui_view_lifecycle_resume_cb resume; + ui_view_lifecycle_activate_cb activate; + ui_view_lifecycle_deactivate_cb deactivate; + ui_view_lifecycle_destroy_cb destroy; + } ui_view_lifecycle_callback_s; + + typedef struct + { + ui_view_event_rotate_cb rotate; + ui_view_event_portrait_cb portrait; + ui_view_event_landscape_cb landscape; + ui_view_event_back_cb back; + ui_view_event_menu_cb menu; + } ui_view_event_callback_s; + + ui_view* ui_standard_view_create(const char *name); + bool ui_view_lifecycle_callbacks_set(ui_view *view, + ui_view_lifecycle_callback_s *lifecycle_callback, void *data); + Evas_Object* ui_view_base_get(ui_view *view); + bool ui_view_content_set(ui_view *view, Evas_Object *content); + bool ui_standard_view_content_set(ui_view *view, Evas_Object *content, + const char *title, const char *subtitle, + Evas_Object *title_left_btn, Evas_Object *title_right_btn); + bool ui_standard_view_title_badge_set(ui_view *view, const char *badge_text); + bool ui_view_indicator_set(ui_view *view, ui_view_indicator indicator); + bool ui_standard_view_toolbar_set(ui_view *view, Elm_Toolbar *toolbar); + void ui_view_removable_content(ui_view *view, bool remove); + bool ui_view_event_callbacks_set(ui_view *view, + ui_view_event_callback_s *event_callback, void *data); + bool ui_standard_view_title_right_btn_set(ui_view *view, Evas_Object *title_right_btn); + bool ui_standard_view_title_visible_set(ui_view *view, bool visible, bool anim); + +#ifdef __cplusplus +} +#endif + +} +#endif /* _UI_VIEW_C_H_ */ diff --git a/src/include/efl/mobile/c/ui_view_c.h b/src/include/efl/mobile/c/ui_view_c.h deleted file mode 100644 index 1441edb..0000000 --- a/src/include/efl/mobile/c/ui_view_c.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef _UI_VIEW_C_H_ -#define _UI_VIEW_C_H_ - -namespace efl_viewmananger -{ - -#ifdef __cplusplus -extern "C" { -#endif - typedef bool (*ui_view_lifecycle_load_cb) (ui_view *view, void *data); - typedef bool (*ui_view_lifecycle_unload_cb) (ui_view *view, void *data); - typedef bool (*ui_view_lifecycle_pause_cb) (ui_view *view, void *data); - typedef bool (*ui_view_lifecycle_resume_cb) (ui_view *view, void *data); - typedef bool (*ui_view_lifecycle_activate_cb) (ui_view *view, void *data); - typedef bool (*ui_view_lifecycle_deactivate_cb) (ui_view *view, void *data); - typedef bool (*ui_view_lifecycle_destroy_cb) (ui_view *view, void *data); - - typedef bool (*ui_view_event_rotate_cb) (ui_view *view, int degree, void *data); - typedef bool (*ui_view_event_portrait_cb) (ui_view *view, void *data); - typedef bool (*ui_view_event_landscape_cb) (ui_view *view, void *data); - typedef bool (*ui_view_event_back_cb) (ui_view *view, void *data); - typedef bool (*ui_view_event_menu_cb) (ui_menu *menu, void *data); - - typedef struct - { - ui_view_lifecycle_load_cb load; - ui_view_lifecycle_unload_cb unload; - ui_view_lifecycle_pause_cb pause; - ui_view_lifecycle_resume_cb resume; - ui_view_lifecycle_activate_cb activate; - ui_view_lifecycle_deactivate_cb deactivate; - ui_view_lifecycle_destroy_cb destroy; - } ui_view_lifecycle_callback_s; - - typedef struct - { - ui_view_event_rotate_cb rotate; - ui_view_event_portrait_cb portrait; - ui_view_event_landscape_cb landscape; - ui_view_event_back_cb back; - ui_view_event_menu_cb menu; - } ui_view_event_callback_s; - - ui_view* ui_standard_view_create(const char *name); - bool ui_view_lifecycle_callbacks_set(ui_view *view, - ui_view_lifecycle_callback_s *lifecycle_callback, void *data); - Evas_Object* ui_view_base_get(ui_view *view); - bool ui_view_content_set(ui_view *view, Evas_Object *content); - bool ui_standard_view_content_set(ui_view *view, Evas_Object *content, - const char *title, const char *subtitle, - Evas_Object *title_left_btn, Evas_Object *title_right_btn); - bool ui_standard_view_title_badge_set(ui_view *view, const char *badge_text); - bool ui_view_indicator_set(ui_view *view, ui_view_indicator indicator); - bool ui_standard_view_toolbar_set(ui_view *view, Elm_Toolbar *toolbar); - void ui_view_removable_content(ui_view *view, bool remove); - bool ui_view_event_callbacks_set(ui_view *view, - ui_view_event_callback_s *event_callback, void *data); - bool ui_standard_view_title_right_btn_set(ui_view *view, Evas_Object *title_right_btn); - bool ui_standard_view_title_visible_set(ui_view *view, bool visible, bool anim); - -#ifdef __cplusplus -} -#endif - -} -#endif /* _UI_VIEW_C_H_ */ diff --git a/src/include/efl/mobile/c/ui_viewmgr.h b/src/include/efl/mobile/c/ui_viewmgr.h new file mode 100644 index 0000000..e25dca1 --- /dev/null +++ b/src/include/efl/mobile/c/ui_viewmgr.h @@ -0,0 +1,17 @@ +#ifndef _UI_VIEWMGR_C_H_ +#define _UI_VIEWMGR_C_H_ + +using namespace efl_viewmananger; + +#ifdef __cplusplus +extern "C" { +#endif + //TODO + #define UI_VIEWMGR_VIEW_DEACTIVATE() (ui_app::get_instance()->get_viewmgr())->deactivate() + #define UI_VIEWMGR_VIEW_PUSH(x) (ui_app::get_instance()->get_viewmgr())->push_view(x) + #define UI_VIEWMGR_VIEW_POP() (ui_app::get_instance()->get_viewmgr())->pop_view() +#ifdef __cplusplus +} +#endif + +#endif /* _UI_VIEWMGR_C_H_ */ diff --git a/src/include/efl/mobile/c/ui_viewmgr_c.h b/src/include/efl/mobile/c/ui_viewmgr_c.h deleted file mode 100644 index e25dca1..0000000 --- a/src/include/efl/mobile/c/ui_viewmgr_c.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef _UI_VIEWMGR_C_H_ -#define _UI_VIEWMGR_C_H_ - -using namespace efl_viewmananger; - -#ifdef __cplusplus -extern "C" { -#endif - //TODO - #define UI_VIEWMGR_VIEW_DEACTIVATE() (ui_app::get_instance()->get_viewmgr())->deactivate() - #define UI_VIEWMGR_VIEW_PUSH(x) (ui_app::get_instance()->get_viewmgr())->push_view(x) - #define UI_VIEWMGR_VIEW_POP() (ui_app::get_instance()->get_viewmgr())->pop_view() -#ifdef __cplusplus -} -#endif - -#endif /* _UI_VIEWMGR_C_H_ */ diff --git a/src/include/efl/mobile/ui_mobile_viewmanager.h b/src/include/efl/mobile/ui_mobile_viewmanager.h index 3ade19b..4680cb3 100644 --- a/src/include/efl/mobile/ui_mobile_viewmanager.h +++ b/src/include/efl/mobile/ui_mobile_viewmanager.h @@ -26,11 +26,11 @@ #include "ui_menu.h" #include "ui_popup.h" #include "ui_app.h" -#include "c/ui_app_c.h" -#include "c/ui_menu_c.h" -#include "c/ui_popup_c.h" -#include "c/ui_viewmgr_c.h" -#include "c/ui_view_c.h" +#include "c/ui_app.h" +#include "c/ui_menu.h" +#include "c/ui_popup.h" +#include "c/ui_viewmgr.h" +#include "c/ui_view.h" #define UI_VIEWMGR (ui_app::get_instance()->get_viewmgr()) diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 6506d04..b4878e1 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -13,10 +13,10 @@ SET(SRCS efl/mobile/ui_standard_view.cpp efl/mobile/ui_key_listener.cpp efl/mobile/ui_viewmgr.cpp - efl/mobile/c/ui_app_c.cpp - efl/mobile/c/ui_menu_c.cpp - efl/mobile/c/ui_popup_c.cpp - efl/mobile/c/ui_view_c.cpp + efl/mobile/c/ui_app.cpp + efl/mobile/c/ui_menu.cpp + efl/mobile/c/ui_popup.cpp + efl/mobile/c/ui_view.cpp ) ADD_LIBRARY(${LIBNAME} SHARED ${SRCS}) diff --git a/src/lib/efl/mobile/c/ui_app.cpp b/src/lib/efl/mobile/c/ui_app.cpp new file mode 100644 index 0000000..f3b0cf1 --- /dev/null +++ b/src/lib/efl/mobile/c/ui_app.cpp @@ -0,0 +1,18 @@ +#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h" +#include "../../../../include/efl/mobile/c/ui_app.h" + +using namespace efl_viewmanager; + +extern "C" { + int ui_app_init(const char *pkg, const char *locale_dir) + { + //TODO + return 1; + } + + int ui_app_run(int argc, char **argv, ui_app_lifecycle_callback_s *event_callback, void *data) + { + //TODO + return 1; + } +} diff --git a/src/lib/efl/mobile/c/ui_app_c.cpp b/src/lib/efl/mobile/c/ui_app_c.cpp deleted file mode 100644 index 1402e82..0000000 --- a/src/lib/efl/mobile/c/ui_app_c.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h" -#include "../../../../include/efl/mobile/c/ui_app_c.h" - -using namespace efl_viewmanager; - -extern "C" { - int ui_app_init(const char *pkg, const char *locale_dir) - { - //TODO - return 1; - } - - int ui_app_run(int argc, char **argv, ui_app_lifecycle_callback_s *event_callback, void *data) - { - //TODO - return 1; - } -} diff --git a/src/lib/efl/mobile/c/ui_menu.cpp b/src/lib/efl/mobile/c/ui_menu.cpp new file mode 100644 index 0000000..68e353f --- /dev/null +++ b/src/lib/efl/mobile/c/ui_menu.cpp @@ -0,0 +1,13 @@ +#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h" +#include "../../../../include/efl/mobile/c/ui_menu.h" + +using namespace efl_viewmanager; + +extern "C" { + bool ui_menu_content_set(ui_menu *menu, Elm_Ctxpopup *ctxpopup) + { + //TODO + return 1; + } +} + diff --git a/src/lib/efl/mobile/c/ui_menu_c.cpp b/src/lib/efl/mobile/c/ui_menu_c.cpp deleted file mode 100644 index 2600f8e..0000000 --- a/src/lib/efl/mobile/c/ui_menu_c.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h" -#include "../../../../include/efl/mobile/c/ui_menu_c.h" - -using namespace efl_viewmanager; - -extern "C" { - bool ui_menu_content_set(ui_menu *menu, Elm_Ctxpopup *ctxpopup) - { - //TODO - return 1; - } -} - diff --git a/src/lib/efl/mobile/c/ui_popup.cpp b/src/lib/efl/mobile/c/ui_popup.cpp new file mode 100644 index 0000000..0bc829f --- /dev/null +++ b/src/lib/efl/mobile/c/ui_popup.cpp @@ -0,0 +1,23 @@ +#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h" +#include "../../../../include/efl/mobile/c/ui_popup.h" + +using namespace efl_viewmanager; + +extern "C" { + bool ui_popup_content_set(ui_popup *popup, Elm_Popup *elm_popup) + { + //TODO + return 1; + } + + bool ui_popup_activate(ui_popup *popup) + { + //TODO + return 1; + } + + void ui_popup_del(ui_popup *popup) + { + //TODO + } +} diff --git a/src/lib/efl/mobile/c/ui_popup_c.cpp b/src/lib/efl/mobile/c/ui_popup_c.cpp deleted file mode 100644 index d2f067e..0000000 --- a/src/lib/efl/mobile/c/ui_popup_c.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h" -#include "../../../../include/efl/mobile/c/ui_popup_c.h" - -using namespace efl_viewmanager; - -extern "C" { - bool ui_popup_content_set(ui_popup *popup, Elm_Popup *elm_popup) - { - //TODO - return 1; - } - - bool ui_popup_activate(ui_popup *popup) - { - //TODO - return 1; - } - - void ui_popup_del(ui_popup *popup) - { - //TODO - } -} diff --git a/src/lib/efl/mobile/c/ui_view.cpp b/src/lib/efl/mobile/c/ui_view.cpp new file mode 100644 index 0000000..491086e --- /dev/null +++ b/src/lib/efl/mobile/c/ui_view.cpp @@ -0,0 +1,80 @@ +#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h" +#include "../../../../include/efl/mobile/c/ui_view.h" + +using namespace efl_viewmanager; + +extern "C" { + ui_view* ui_standard_view_create(const char *name) + { + //TODO + return NULL; + } + + bool ui_view_lifecycle_callbacks_set(ui_view *view, + ui_view_lifecycle_callback_s *lifecycle_callback, void *data) + { + //TODO + return 1; + } + Evas_Object* ui_view_base_get(ui_view *view) + { + //TODO + return NULL; + } + + bool ui_view_content_set(ui_view *view, Evas_Object *content) + { + //TODO + return 1; + } + + bool ui_standard_view_content_set(ui_view *view, Evas_Object *content, + const char *title, const char *subtitle, + Evas_Object *title_left_btn, Evas_Object *title_right_btn) + { + //TODO + return 1; + } + + bool ui_standard_view_title_badge_set(ui_view *view, const char *badge_text) + { + //TODO + return 1; + } + + bool ui_view_indicator_set(ui_view *view, ui_view_indicator indicator) + { + //TODO + return 1; + } + + bool ui_standard_view_toolbar_set(ui_view *view, Elm_Toolbar *toolbar) + { + //TODO + return 1; + } + + void ui_view_removable_content(ui_view *view, bool remove) + { + //TODO + } + + bool ui_view_event_callbacks_set(ui_view *view, + ui_view_event_callback_s *event_callback, void *data) + { + //TODO + return 1; + } + + bool ui_standard_view_title_right_btn_set(ui_view *view, Evas_Object *title_right_btn) + { + //TODO + return 1; + } + + bool ui_standard_view_title_visible_set(ui_view *view, bool visible, bool anim) + { + //TODO + return 1; + } +} diff --git a/src/lib/efl/mobile/c/ui_view_c.cpp b/src/lib/efl/mobile/c/ui_view_c.cpp deleted file mode 100644 index 40d099e..0000000 --- a/src/lib/efl/mobile/c/ui_view_c.cpp +++ /dev/null @@ -1,80 +0,0 @@ -#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h" -#include "../../../../include/efl/mobile/c/ui_view_c.h" - -using namespace efl_viewmanager; - -extern "C" { - ui_view* ui_standard_view_create(const char *name) - { - //TODO - return NULL; - } - - bool ui_view_lifecycle_callbacks_set(ui_view *view, - ui_view_lifecycle_callback_s *lifecycle_callback, void *data) - { - //TODO - return 1; - } - Evas_Object* ui_view_base_get(ui_view *view) - { - //TODO - return NULL; - } - - bool ui_view_content_set(ui_view *view, Evas_Object *content) - { - //TODO - return 1; - } - - bool ui_standard_view_content_set(ui_view *view, Evas_Object *content, - const char *title, const char *subtitle, - Evas_Object *title_left_btn, Evas_Object *title_right_btn) - { - //TODO - return 1; - } - - bool ui_standard_view_title_badge_set(ui_view *view, const char *badge_text) - { - //TODO - return 1; - } - - bool ui_view_indicator_set(ui_view *view, ui_view_indicator indicator) - { - //TODO - return 1; - } - - bool ui_standard_view_toolbar_set(ui_view *view, Elm_Toolbar *toolbar) - { - //TODO - return 1; - } - - void ui_view_removable_content(ui_view *view, bool remove) - { - //TODO - } - - bool ui_view_event_callbacks_set(ui_view *view, - ui_view_event_callback_s *event_callback, void *data) - { - //TODO - return 1; - } - - bool ui_standard_view_title_right_btn_set(ui_view *view, Evas_Object *title_right_btn) - { - //TODO - return 1; - } - - bool ui_standard_view_title_visible_set(ui_view *view, bool visible, bool anim) - { - //TODO - return 1; - } -}