From: Hermet Park Date: Thu, 16 Jun 2016 02:14:44 +0000 (+0900) Subject: c/ui_app: rename prefix to ui_viewmgr_app X-Git-Tag: submit/tizen/20160617.075742~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F60%2F74860%2F1;p=platform%2Fcore%2Fuifw%2Fui-viewmgr.git c/ui_app: rename prefix to ui_viewmgr_app Change-Id: Id7e6477eacdedaeb7447d56a81dbd73419f16d9d --- diff --git a/src/examples/efl/c/main.cpp b/src/examples/efl/c/main.cpp index 69607f4..97f2b8f 100644 --- a/src/examples/efl/c/main.cpp +++ b/src/examples/efl/c/main.cpp @@ -26,7 +26,7 @@ main(int argc, char *argv[]) ui_app_lifecycle_callback_s lifecycle_callback = {0, }; //Initialize ui_app. ui_app initializes basic resources including ui_viewmgr internally. - if (!(ret = ui_app_init(PACKAGE, LOCALE_DIR))) + if (!(ret = ui_viewmgr_app_init(PACKAGE, LOCALE_DIR))) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_app_init() is failed. err = %d", ret); return ret; @@ -37,14 +37,14 @@ main(int argc, char *argv[]) lifecycle_callback.app_control = app_control; //Run ui_app. Now it requests to run an application mainloop. - if (!(ret = ui_app_run(argc, argv, &lifecycle_callback, NULL))) + if (!(ret = ui_viewmgr_app_run(argc, argv, &lifecycle_callback, NULL))) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_app_run() is failed. err = %d", ret); return ret; } //Terminate ui_app. Remove all ui_app resources. - if (!(ret = ui_app_term())) + if (!(ret = ui_viewmgr_app_term())) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_app_term() is failed. err = %d", ret); return ret; diff --git a/src/include/efl/mobile/c/ui_app.h b/src/include/efl/mobile/c/ui_app.h deleted file mode 100644 index 4ecefb6..0000000 --- a/src/include/efl/mobile/c/ui_app.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef _UI_APP_CAPI_H_ -#define _UI_APP_CAPI_H_ - -#ifdef __cplusplus -extern "C" { -#endif - - -//FIXME: rename prefix -bool ui_app_init(const char *pkg, const char *locale_dir); -int ui_app_run(int argc, char **argv, ui_app_lifecycle_callback_s *lifecycle_callback, void *data); -ui_viewmgr *ui_app_viewmgr_get(); -bool ui_app_term(void); - -#ifdef __cplusplus -} -#endif - -#endif /* _UI_APP_CAPI_H_ */ diff --git a/src/include/efl/mobile/c/ui_mobile_viewmanager.h b/src/include/efl/mobile/c/ui_mobile_viewmanager.h index 97cd19e..556ff66 100644 --- a/src/include/efl/mobile/c/ui_mobile_viewmanager.h +++ b/src/include/efl/mobile/c/ui_mobile_viewmanager.h @@ -40,7 +40,7 @@ //FIXME: better way? #include "../../../interface/ui_iface_types.h" -#include "ui_app.h" +#include "ui_viewmgr_app.h" #include "ui_menu.h" #include "ui_popup.h" #include "ui_viewmgr.h" diff --git a/src/include/efl/mobile/c/ui_viewmgr.h b/src/include/efl/mobile/c/ui_viewmgr.h index c37a4c8..f650334 100644 --- a/src/include/efl/mobile/c/ui_viewmgr.h +++ b/src/include/efl/mobile/c/ui_viewmgr.h @@ -20,9 +20,9 @@ int ui_viewmgr_view_count_get(ui_viewmgr *viewmgr); bool ui_viewmgr_soft_key_need_get(ui_viewmgr *viewmgr); ui_viewmgr *ui_viewmgr_viewmgr_get(); -#define UI_VIEWMGR_DEACTIVATE() (ui_viewmgr_deactivate(ui_app_viewmgr_get())) -#define UI_VIEWMGR_VIEW_PUSH(x) (ui_viewmgr_view_push(ui_app_viewmgr_get(), x)) -#define UI_VIEWMGR_VIEW_POP() (ui_viewmgr_view_pop(ui_app_viewmgr_get())) +#define UI_VIEWMGR_DEACTIVATE() (ui_viewmgr_deactivate(ui_viewmgr_viewmgr_get())) +#define UI_VIEWMGR_VIEW_PUSH(X) (ui_viewmgr_view_push(ui_viewmgr_viewmgr_get(), (X))) +#define UI_VIEWMGR_VIEW_POP() (ui_viewmgr_view_pop(ui_viewmgr_viewmgr_get())) #ifdef __cplusplus } diff --git a/src/include/efl/mobile/c/ui_viewmgr_app.h b/src/include/efl/mobile/c/ui_viewmgr_app.h new file mode 100644 index 0000000..c547400 --- /dev/null +++ b/src/include/efl/mobile/c/ui_viewmgr_app.h @@ -0,0 +1,17 @@ +#ifndef _UI_VIEWMGR_APP_CAPI_H_ +#define _UI_VIEWMGR_APP_CAPI_H_ + +#ifdef __cplusplus +extern "C" { +#endif + + +bool ui_viewmgr_app_init(const char *pkg, const char *locale_dir); +int ui_viewmgr_app_run(int argc, char **argv, ui_app_lifecycle_callback_s *lifecycle_callback, void *data); +bool ui_viewmgr_app_term(void); + +#ifdef __cplusplus +} +#endif + +#endif /* _UI_VIEWMGR_APP_CAPI_H_ */ diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index d9fe096..c47951b 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -15,7 +15,7 @@ SET(SRCS efl/mobile/ui_standard_view.cpp efl/mobile/ui_key_listener.cpp efl/mobile/ui_viewmgr.cpp - efl/mobile/c/ui_app.cpp + efl/mobile/c/ui_viewmgr_app.cpp efl/mobile/c/ui_menu.cpp efl/mobile/c/ui_popup.cpp efl/mobile/c/ui_view.cpp diff --git a/src/lib/efl/mobile/c/ui_app.cpp b/src/lib/efl/mobile/c/ui_app.cpp deleted file mode 100644 index 8d664d9..0000000 --- a/src/lib/efl/mobile/c/ui_app.cpp +++ /dev/null @@ -1,116 +0,0 @@ -#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h" -#include "../../../../include/efl/mobile/c/ui_mobile_viewmanager.h" - -using namespace efl_viewmanager; - -class ui_app_capi : public ui_app -{ -public: - ui_app_lifecycle_callback_s capi_lifecycle_callback; - void *data; - - bool on_create() - { - if (!ui_app::on_create()) return false; - - if (!this->capi_lifecycle_callback.create) return false; - return this->capi_lifecycle_callback.create(this->data); - } - - void on_terminate() - { - ui_app::on_terminate(); - - if (!this->capi_lifecycle_callback.terminate) return; - this->capi_lifecycle_callback.terminate(this->data); - } - - void on_pause() - { - ui_app::on_pause(); - - if (!this->capi_lifecycle_callback.pause) return; - this->capi_lifecycle_callback.pause(this->data); - } - - void on_resume() - { - ui_app::on_resume(); - - if (!this->capi_lifecycle_callback.resume) return; - this->capi_lifecycle_callback.resume(this->data); - } - - void on_control(app_control_h app_control) - { - ui_app::on_control(app_control); - - if (!this->capi_lifecycle_callback.app_control) return; - this->capi_lifecycle_callback.app_control(app_control, this->data); - } - - ui_app_capi(const char *pkg, const char *locale_dir) - : ui_app(pkg, locale_dir), data(NULL) - { - } - - ~ui_app_capi() - { - } - - int run(int argc, char **argv, ui_app_lifecycle_callback_s *lifecycle_callback, void *data) - { - if (lifecycle_callback) - { - this->capi_lifecycle_callback = *lifecycle_callback; - } - - this->data = data; - - return ui_app::run(argc, argv); - } -}; - -static ui_app_capi *g_app = NULL; - -bool ui_app_init(const char *pkg, const char *locale_dir) -{ - ui_app_capi *app = g_app; - if (app) return true; - - app = new ui_app_capi(pkg, locale_dir); - if (!app) - { - LOGE("Failed to create new ui_app_capi()!"); - return false; - } - - g_app = app; - - return true; -} - -int ui_app_run(int argc, char **argv, ui_app_lifecycle_callback_s *lifecycle_callback, void *data) -{ - ui_app_capi *app = g_app; - if (!app) return -1; - - return app->run(argc, argv, lifecycle_callback, data); -} - -ui_viewmgr *ui_app_viewmgr_get() -{ - ui_app_capi *app = g_app; - if (!app) return NULL; - - return app->get_viewmgr(); -} - -bool ui_app_term(void) -{ - ui_app_capi *app = g_app; - if (app) delete (app); - g_app = NULL; - - return true; -} diff --git a/src/lib/efl/mobile/c/ui_viewmgr_app.cpp b/src/lib/efl/mobile/c/ui_viewmgr_app.cpp new file mode 100644 index 0000000..b5181bc --- /dev/null +++ b/src/lib/efl/mobile/c/ui_viewmgr_app.cpp @@ -0,0 +1,108 @@ +#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h" +#include "../../../../include/efl/mobile/c/ui_mobile_viewmanager.h" + +using namespace efl_viewmanager; + +class ui_app_capi : public ui_app +{ +public: + ui_app_lifecycle_callback_s capi_lifecycle_callback; + void *data; + + bool on_create() + { + if (!ui_app::on_create()) return false; + + if (!this->capi_lifecycle_callback.create) return false; + return this->capi_lifecycle_callback.create(this->data); + } + + void on_terminate() + { + ui_app::on_terminate(); + + if (!this->capi_lifecycle_callback.terminate) return; + this->capi_lifecycle_callback.terminate(this->data); + } + + void on_pause() + { + ui_app::on_pause(); + + if (!this->capi_lifecycle_callback.pause) return; + this->capi_lifecycle_callback.pause(this->data); + } + + void on_resume() + { + ui_app::on_resume(); + + if (!this->capi_lifecycle_callback.resume) return; + this->capi_lifecycle_callback.resume(this->data); + } + + void on_control(app_control_h app_control) + { + ui_app::on_control(app_control); + + if (!this->capi_lifecycle_callback.app_control) return; + this->capi_lifecycle_callback.app_control(app_control, this->data); + } + + ui_app_capi(const char *pkg, const char *locale_dir) + : ui_app(pkg, locale_dir), data(NULL) + { + } + + ~ui_app_capi() + { + } + + int run(int argc, char **argv, ui_app_lifecycle_callback_s *lifecycle_callback, void *data) + { + if (lifecycle_callback) + { + this->capi_lifecycle_callback = *lifecycle_callback; + } + + this->data = data; + + return ui_app::run(argc, argv); + } +}; + +static ui_app_capi *g_app = NULL; + +bool ui_viewmgr_app_init(const char *pkg, const char *locale_dir) +{ + ui_app_capi *app = g_app; + if (app) return true; + + app = new ui_app_capi(pkg, locale_dir); + if (!app) + { + LOGE("Failed to create new ui_app_capi()!"); + return false; + } + + g_app = app; + + return true; +} + +int ui_viewmgr_app_run(int argc, char **argv, ui_app_lifecycle_callback_s *lifecycle_callback, void *data) +{ + ui_app_capi *app = g_app; + if (!app) return -1; + + return app->run(argc, argv, lifecycle_callback, data); +} + +bool ui_viewmgr_app_term(void) +{ + ui_app_capi *app = g_app; + if (app) delete (app); + g_app = NULL; + + return true; +} diff --git a/src/lib/efl/mobile/ui_popup.cpp b/src/lib/efl/mobile/ui_popup.cpp index 7a83feb..f8353d5 100644 --- a/src/lib/efl/mobile/ui_popup.cpp +++ b/src/lib/efl/mobile/ui_popup.cpp @@ -102,8 +102,6 @@ bool ui_popup::set_content(Elm_Popup *popup) } elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0); - - //FIXME: rename style. evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, popup_del_cb, this); evas_object_smart_callback_add(popup, "dismissed", popup_dismissed_cb, this);