Merge "add delemeter to full-path, removing delemeter from path-name" into 2.0_beta

[apps/core/preloaded/settings.git] / include / setting.h

diff --git a/include/setting.h b/include/setting.h
index ca164c2..4399746 100755 (executable)
--- a/include/setting.h
+++ b/include/setting.h
@@ -33,6 +33,7 @@
 /*  TAPI*/
 #include <tapi_common.h>
 #include <ITapiModem.h>
+
 #include <sensors.h>
 
 #define EDIT_PREFERRED_STR "IDS_ST_BUTTON2_EDIT_PREFERRED"
@@ -42,13 +43,10 @@
 #define SETTING_MAX_PID_LEN 128
 
 #define NO_UG_FOUND_MSG                        _("Unsupported menu")
-#define MORE_CONNECT_STR                       "IDS_ST_BODY_BLUETOOTH_USB_UTILITIES_ETC"
-#define MORE_SYSTEM_STR                        "IDS_ST_BODY_DATE_AND_TIME_KEYBOARD_LICENCE_ETC"
 #define USB_NEED_OFF "Please turn USB tethering off first in Mobile hotspot"
 
 #define SETTING_NFC_DESC "IDS_ST_BODY_ALLOW_DATA_EXCHANGE_WHEN_DEVICE_TOUCHES_ANOTHER_DEVICE"
 #define SETTING_WIFI_DIRECT_DESC "IDS_ST_BODY_SET_UP_PEER_TO_PEER_CONNECTIVITY_ABB"
-#define SETTING_KIES_VIA_WIFI_DESC "IDS_ST_BODY_CONNECT_TO_KIES_VIA_WI_FI"
 
 /**
 * @brief
@@ -100,6 +98,8 @@ typedef enum _FLIGHT_MODE_OPEARTION{
        FM_LEAVE,//Some "flightmode leave" request is waiting for processing
 } FLIGHT_MODE_OPEARTION;
 
+
+#define MAX_MORE_MENU_NUM      6
 /**
 * @brief main view context
 */
@@ -107,7 +107,7 @@ typedef struct _setting_main_appdata {
 
        ui_gadget_h ug;
        TapiHandle *handle;
-
+               
        Eina_Bool bAppPause;
        Eina_Bool updateItems[GL_ITEM_MAX];
 
@@ -143,7 +143,6 @@ typedef struct _setting_main_appdata {
        Setting_GenGroupItem_Data *data_wifi;
        Setting_GenGroupItem_Data *data_bt;
        Setting_GenGroupItem_Data *data_rotationMode;
-       Setting_GenGroupItem_Data *data_mobileApp;
 
        Setting_GenGroupItem_Data *data_bright;
 
@@ -168,6 +167,10 @@ typedef struct _setting_main_appdata {
        Eina_List *listened_list;
        sensor_h sf_handle;
 
+       const char *more_connective_menus[MAX_MORE_MENU_NUM];
+       const char *more_system_menus[MAX_MORE_MENU_NUM];
+       
+
 } setting_main_appdata;
 
 /* launch view */