diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/mh_common_utility.h | 3 | ||||
| -rw-r--r-- | include/mh_func_onoff.h | 1 | ||||
| -rw-r--r-- | include/mh_view_main.h | 8 | ||||
| -rw-r--r-- | include/mobile_hotspot.h | 22 |
4 files changed, 24 insertions, 10 deletions
diff --git a/include/mh_common_utility.h b/include/mh_common_utility.h index e224374..2e3003b 100644 --- a/include/mh_common_utility.h +++ b/include/mh_common_utility.h @@ -32,11 +32,12 @@ extern "C" { void _prepare_popup(mh_appdata_t *ad, int type, const char *str); Eina_Bool _create_popup(mh_appdata_t *ad); Evas_Object *_create_bg(Evas_Object *parent, const char *style); -Evas_Object *_create_layout(Evas_Object *parent); +Evas_Object *_create_win_layout(mh_appdata_t *ad); Evas_Object *_create_naviframe(Evas_Object *parent); void _handle_usb_mode_change(keynode_t *key, void *data); Eina_Bool _hide_imf(Evas_Object *entry); int _get_vconf_hotspot_mode(void); +Eina_Bool _get_no_of_connected_device(tethering_h handle, int *no, tethering_type_e type); #ifdef __cplusplus } diff --git a/include/mh_func_onoff.h b/include/mh_func_onoff.h index 81bb5fb..b7ebdf8 100644 --- a/include/mh_func_onoff.h +++ b/include/mh_func_onoff.h @@ -28,6 +28,7 @@ extern "C" { #include "mh_view_main.h" #include "mh_common_utility.h" +int _get_vconf_usb_state(void); void _enabled_cb(tethering_error_e result, tethering_type_e type, bool is_requested, void *user_data); void _disabled_cb(tethering_error_e result, tethering_type_e type, tethering_disabled_cause_e cause, void *user_data); void _connection_changed_cb(tethering_client_h client, bool opened, void *user_data); diff --git a/include/mh_view_main.h b/include/mh_view_main.h index a3f0f72..d326fa4 100644 --- a/include/mh_view_main.h +++ b/include/mh_view_main.h @@ -36,15 +36,19 @@ extern "C" { #define MH_DEVICE_LIST_NO_NAME "No name" #define MH_DEFAULT_DEVICE_NAME "No name" +#define MH_CONNECTED_DEVICE_WILL_BE_DISCONNECTED "Connected device will be disconnected" +#define MH_CONSUMES_MORE_BATTERY_POWER "Tethering consumes more battery power and increases your data usage. Continue?" + void ap_update_data_onoff(void *data); void ap_update_data_device(mh_appdata_t *ad); Eina_Bool ap_update_data_packet_usage(mh_appdata_t *ad); void _start_update_data_packet_usage(mh_appdata_t *ad); void _stop_update_data_packet_usage(mh_appdata_t *ad); void ap_draw_contents(mh_appdata_t *ad); -void ap_callback_del(void *data); -void _update_usb_item(mh_appdata_t *ad, int usb_state); +void ap_callback_del(mh_appdata_t *ad); void _update_wifi_item(mh_appdata_t *ad, int wifi_state); +void _update_bt_item(mh_appdata_t *ad, int bt_state); +void _update_usb_item(mh_appdata_t *ad, int usb_state); void _update_main_view(mh_appdata_t *ad); #ifdef __cplusplus diff --git a/include/mobile_hotspot.h b/include/mobile_hotspot.h index e08e8b7..1cf8bbd 100644 --- a/include/mobile_hotspot.h +++ b/include/mobile_hotspot.h @@ -33,7 +33,7 @@ extern "C" { #endif #if !defined(EDJDIR) -#define EDJDIR "/usr/ug/res/edje/ug-mobile-ap" +#define EDJDIR "/usr/ug/res/edje/ug-setting-mobile-ap-ug" #endif #if !defined(PREFIX) @@ -80,7 +80,10 @@ extern "C" { #define __MOBILE_AP_FUNC_ENTER__ DBG("Entering: +\n") #define __MOBILE_AP_FUNC_EXIT__ DBG("Exit: -\n") -#define MOBILE_AP_IMG_DIR PREFIX"/res/images/ug-mobile-ap" +#define TETHERING_IMAGES_EDJ "tethering_images.edj" +#define WIFI_ICON "Wifi.png" +#define BT_ICON "Bluetooth.png" +#define USB_ICON "USB.png" #define MH_DEFAULT_PASSWORD "qwertyuiop" @@ -105,7 +108,9 @@ typedef enum { /* Two buttons pop-up */ MH_POP_WIFI_OFF_CONF, MH_POP_WIFI_ON_CONF, + MH_POP_BT_ON_CONF, MH_POP_USB_ON_CONF, + MH_POP_ENTER_TO_WIFI_SETUP_CONF, /* One button pop-up */ MH_POP_INFORMATION, @@ -125,7 +130,6 @@ typedef enum { } mh_state_e; typedef struct ap_app_main { - Evas_Object *conform; Evas_Object *genlist; Evas_Object *back_btn; @@ -137,7 +141,6 @@ typedef struct ap_app_main { Elm_Genlist_Item_Class *end_sp_itc; Elm_Genlist_Item_Class *wifi_itc; Elm_Genlist_Item_Class *setup_itc; - Elm_Genlist_Item_Class *setup_help_itc; Elm_Genlist_Item_Class *bt_itc; Elm_Genlist_Item_Class *usb_itc; Elm_Genlist_Item_Class *help_itc; @@ -149,7 +152,6 @@ typedef struct ap_app_main { Elm_Object_Item *wifi_item; Elm_Object_Item *setup_item; - Elm_Object_Item *setup_help_item; Elm_Object_Item *bt_item; Elm_Object_Item *usb_item; Elm_Object_Item *device_item; @@ -158,14 +160,17 @@ typedef struct ap_app_main { int hotspot_mode; int wifi_state; + int bt_state; int usb_state; + bool old_wifi_state; } mh_main_view_t; typedef struct { - Evas_Object *conform; + Elm_Object_Item *navi_it; Evas_Object *genlist; Evas_Object *back_btn; + Evas_Object *title_back_btn; Evas_Object *hide_btn; Evas_Object *security_btn; Evas_Object *pw_layout; @@ -188,6 +193,7 @@ typedef struct { char device_name[DEVICE_NAME_LENGTH_MAX + 1]; char wifi_passphrase[WIFI_PASSPHRASE_LENGTH_MAX + 1]; + char wifi_passphrase_new[WIFI_PASSPHRASE_LENGTH_MAX + 1]; } mh_wifi_setting_view_t; typedef struct { @@ -207,6 +213,9 @@ typedef struct { connection_h conn_handle; Evas_Object *win; + Evas_Object *layout; + Evas_Object *bg; + Evas_Object *naviframe; Evas_Object *popup; @@ -223,7 +232,6 @@ typedef struct { } mh_appdata_t; typedef struct { - Evas_Object *base; mh_appdata_t *ad; ui_gadget_h ug; } mh_ugdata_t; |