diff options
| author | segwon <segwon.han@samsung.com> | 2016-11-15 21:41:28 +0900 |
|---|---|---|
| committer | segwon <segwon.han@samsung.com> | 2016-11-15 21:51:51 +0900 |
| commit | a77400c0e118cf0c7369db1df11c630f769c2099 (patch) | |
| tree | bed7336f3b058e83ec9064d294d42f3f4df75968 /inc | |
| parent | fa919adeb3e63090a45dfe4c53cfade1d7e190c8 (diff) | |
| download | d2d-conv-setting-a77400c0e118cf0c7369db1df11c630f769c2099.tar.gz d2d-conv-setting-a77400c0e118cf0c7369db1df11c630f769c2099.tar.bz2 d2d-conv-setting-a77400c0e118cf0c7369db1df11c630f769c2099.zip | |
Addition ACL(discovery/permit/deny) module.submit/tizen/20161121.012034accepted/tizen/mobile/20161121.234656
Signed-off-by: segwon <segwon.han@samsung.com>
Change-Id: Ic1229fd8e7a673726d88797e5df16cda55d6e17f
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/convergence.h | 18 | ||||
| -rw-r--r-- | inc/language.h | 4 | ||||
| -rw-r--r-- | inc/main.h | 34 |
3 files changed, 26 insertions, 30 deletions
diff --git a/inc/convergence.h b/inc/convergence.h deleted file mode 100644 index c190ece..0000000 --- a/inc/convergence.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef CONVERGENCE_H_ -#define CONVERGENCE_H_ - -#include <dlog.h> -#include <glib.h> -#include <d2d_conv_internal.h> - -#ifdef LOG_TAG -#undef LOG_TAG -#endif -#define LOG_TAG "D2D-CONV-SETTING" - -/* convergence power manager */ -extern void convergence_power_on(); -extern void convergence_power_off(); -extern int get_convergence_power_state(); - -#endif /* CONVERGENCE_H_ */ diff --git a/inc/language.h b/inc/language.h deleted file mode 100644 index 1150946..0000000 --- a/inc/language.h +++ /dev/null @@ -1,4 +0,0 @@ -#include <libintl.h> - -#define POWER_ON_SIGN_TEXT dgettext(PACKAGE, "CONV_SETTING_APP_POWER_ON") -#define POWER_OFF_SIGN_TEXT dgettext(PACKAGE, "CONV_SETTING_APP_POWER_OFF")
\ No newline at end of file @@ -1,42 +1,60 @@ #ifndef __main_H__ #define __main_H__ +#include <stdlib.h> #include <app.h> #include <Elementary.h> #include <system_settings.h> #include <efl_extension.h> +#include <device/haptic.h> #include <dlog.h> #include <glib.h> -#include "convergence.h" -#include "language.h" +#include <libintl.h> +#include <d2d_conv_manager.h> +#include <d2d_conv_internal.h> #ifdef LOG_TAG #undef LOG_TAG #endif #define LOG_TAG "D2D-CONV-SETTING" +#ifdef PACKAGE +#undef PACKAGE +#endif #define PACKAGE "org.tizen.d2d-conv-setting" -typedef enum state -{ +typedef enum state { POWER_OFF = 0, POWER_ON, - SCAN_START, - SCAN_STOP, + DISCOVERY_START, + DISCOVERY_STOP, CHANGE_LANGUAGE - } state_e; +#define POWER_ON_SIGN_TEXT dgettext(PACKAGE, "CONV_SETTING_APP_POWER_ON") +#define DEVICE_LIST_SELECT_POPUP_TITLE_TEXT dgettext(PACKAGE, "CONV_DEVICE_LIST_SELECT_POPUP_TITLE") +#define DISCOVERED_LIST_SELECT_POPUP_CONTENT_TEXT dgettext(PACKAGE, "CONV_DISCOVERED_LIST_SELECT_POPUP_CONTENT") +#define PERMITTED_LIST_SELECT_POPUP_CONTENT_TEXT dgettext(PACKAGE, "CONV_PERMITTED_LIST_SELECT_POPUP_CONTENT") +#define DENIED_LIST_SELECT_POPUP_CONTENT_TEXT dgettext(PACKAGE, "CONV_DENIED_LIST_SELECT_POPUP_CONTENT") +#define DEVICE_LIST_SELECT_POPUP_CANCEL_BUTTON_TEXT dgettext(PACKAGE, "CONV_DEVICE_LIST_SELECT_POPUP_CANCEL_BUTTON") +#define DEVICE_LIST_SELECT_POPUP_PERMIT_BUTTON_TEXT dgettext(PACKAGE, "CONV_DEVICE_LIST_SELECT_POPUP_PERMIT_BUTTON") +#define DEVICE_LIST_SELECT_POPUP_DENY_BUTTON_TEXT dgettext(PACKAGE, "CONV_DEVICE_LIST_SELECT_POPUP_DENY_BUTTON") +#define DEVICE_LIST_SELECT_POPUP_REMOVE_BUTTON_TEXT dgettext(PACKAGE, "CONV_DEVICE_LIST_SELECT_POPUP_REMOVE_BUTTON") /* state event lisetner */ typedef void (*event_listener)(state_e state); extern void add_state_change_event_listener(event_listener listener); extern void state_change_event(state_e state); - /* setting ui */ extern void create_setting_menu(Evas_Object *parent); extern void create_setting_item_power(Evas_Object *parent); extern void create_setting_item_sign(Evas_Object *parent); +extern void create_setting_item_discovery_button(Evas_Object *parent); +extern void create_setting_item_device_list(Evas_Object *parent); +extern void create_setting_item_popup(Evas_Object *parent); + +/* util */ +extern void do_haptic(int count); #endif /* __main_H__ */ |