Code cleaning(2) 09/147509/7
authorRadek Kintop <r.kintop@samsung.com>
Mon, 4 Sep 2017 16:37:31 +0000 (18:37 +0200)
committerRadek Kintop <r.kintop@samsung.com>
Tue, 5 Sep 2017 15:44:16 +0000 (15:44 +0000)
Change-Id: Ie86b19a4ed22110140c6b0b7c874bf7b1b7083f1
Signed-off-by: Radek Kintop <r.kintop@samsung.com>
23 files changed:
setting-common/include/setting-cfg.h
setting-common/include/setting-common-data-error.h
setting-common/include/setting-common-data-slp-setting.h
setting-common/include/setting-common-data-type.h
setting-common/include/setting-common-draw-widget.h
setting-common/include/setting-common-general-func.h
setting-common/include/setting-common-resource.h
setting-common/include/setting-common-string.h
setting-common/src/setting-cfg.c
setting-common/src/setting-common-draw-genlist.c
setting-common/src/setting-common-draw-widget.c
setting-display/src/setting-display-main.c
setting-locktype/src/setting-locktype-main.c
setting-network/src/setting-network-connection-create.c
setting-network/src/setting-network-main.c
setting-profile/CMakeLists.txt
setting-profile/src/setting-profile-common.c
setting-profile/src/setting-profile-sound-main.c
setting-profile/src/setting-profile.c
setting-storage/src/setting-storage-SD.c
setting-storage/src/setting-storage-default.c
setting-time/src/setting-time-main.c
src/setting.c

index 4fe13a700fd1132c9558712e770b31bf37af2123..4425dd002832e4e2adda372e2403fcb16355abf2 100644 (file)
@@ -61,20 +61,6 @@ typedef enum _cfg_error_type {
        Cfg_Error_Type_OutOfMemory = -7,
 } Cfg_Error_Type;
 
-#define SEARCH_TYPE_ERROR "0"
-#define SEARCH_TYPE_UG_NODE "1"
-#define SEARCH_TYPE_UI_NODE "2"
-#define SEARCH_TYPE_TITLE_NODE "3"
-#define SEARCH_TYPE_APP_NODE "4"
-#define SEARCH_TYPE_VIEW_NODE "5"
-#define SEARCH_TYPE_APPLAUNCHER_NODE "6"
-#define SEARCH_TYPE_APPLAUNCHER_VIEW_NODE "7"
-
-#define SEARCH_TYPE_UG_NODE_TOGGLE "1"SEARCH_TYPE_UG_NODE
-#define SEARCH_TYPE_UI_NODE_TOGGLE "1"SEARCH_TYPE_UI_NODE
-#define SEARCH_TYPE_VIEW_NODE_TOGGLE "1"SEARCH_TYPE_VIEW_NODE
-#define SEARCH_TYPE_APPLAUNCHER_NODE_TOGGLE "1"SEARCH_TYPE_APPLAUNCHER_NODE
-
 /**
  * 1, 4, 5, 6 - ug mode
  * 2, 3,
index 6bf1c337e41930530f4f9a62c06607df3786db84..38828f8ba041c7cd44aa4335162090e9d48dba6a 100644 (file)
@@ -49,20 +49,6 @@ typedef enum {
        SETTING_ENTRY_REQUIRED_CORRECT_DIGIT_PW,
 } setting_draw_error;
 
-/* time error (start 200)*/
-
-/* ps & view error (start 300)*/
-typedef enum {
-       SETTING_PS_FORK_ERR = 300,
-       SETTING_PS_EXECV_ERR
-} setting_ps_view_error;
-
-/* file IO error (start 400)*/
-typedef enum {
-       SETTING_IO_NOT_OPEN_FILE = 400,
-       SETTING_IO_IOCTL_ERR
-} setting_IO_error;
-
 /* network error (start 500)*/
 typedef enum {
        SETTING_TAPI_SIM_TYPE_ERR = 500,
@@ -84,23 +70,5 @@ typedef enum {
        SETTING_DNET_RETURN_INVALID_PROXY_ADDR
 } setting_net_error;
 
-/* vconf error (start 600)*/
-typedef enum {
-       SETTING_VCONF_ERR_RETURN_STR_NULL = 600,
-       SETTING_VCONF_ERR_RETURN_INVALID_INT
-} setting_vconf_error;
-
-/* multi media error (start 700)*/
-typedef enum {
-       SETTING_MMPLAYER_STOP_ERR = 700,
-       SETTING_MMPLAYER_UNREALIZE_ERR,
-       SETTING_MMPLAYER_DESTROY_ERR,
-       SETTING_MMPLAYER_CREATE_ERR,
-       SETTING_MMPLAYER_SETATTRS_ERR,
-       SETTING_MMPLAYER_REALIZE_ERR,
-       SETTING_MMPLAYER_START_ERR,
-       SETTING_MMPLAYER_SET_VOLUME_ERR,
-       SETTING_MMPLAYER_NOT_FOUND_SOUND_FILE
-} setting_mm_error;
 
 #endif                         /* __SETTING_COMMON_DATA_ERROR_H__ */
index 3069edbf4c263997d2b8f26ad3f9f8e9e04f7fe1..16be0d095e876238f0c1f39e63ff88f8093f07ee 100644 (file)
@@ -219,18 +219,6 @@ typedef enum {
 
        BOOL_SLP_SETTING_AUTOMATIC_TIME_UPDATE,
 
-       /*BOOL_SLP_SETTING_TICKER_NOTI_MESSAGES,
-       BOOL_SLP_SETTING_TICKER_NOTI_EMAIL,
-       BOOL_SLP_SETTING_TICKER_NOTI_IM,
-       BOOL_SLP_SETTING_TICKER_NOTI_FACEBOOK,
-       BOOL_SLP_SETTING_TICKER_NOTI_TWITTER,
-
-       BOOL_SLP_SETTING_NOTI_DISPLAY_CONTENT_MESSASGES,
-       BOOL_SLP_SETTING_NOTI_DISPLAY_CONTENT_EMAIL,
-       BOOL_SLP_SETTING_NOTI_DISPLAY_CONTENT_IM,
-       BOOL_SLP_SETTING_NOTI_DISPLAY_CONTENT_FACEBOOK,
-       BOOL_SLP_SETTING_NOTI_DISPLAY_CONTENT_TWITTER,*/
-
        BOOL_SLP_SETTING_FLIGHT_MODE,
        BOOL_SLP_SETTING_NET_RESTRICTION_MODE,
        BOOL_SLP_SETTING_DATA_ROAMING,
index 7afbb4499177a3206b9bf6f00773ec42b4b08688..ee9443d81fc2cd864fd5d6a9aa0dd0c4c8e94ab0 100644 (file)
 /* including Elementary lib */
 #include <Elementary.h>
 /* including debuging type */
-#include <setting-debug.h>
+#include "setting-debug.h"
 /* including one class of data type */
-#include <setting-common-resource.h>
+#include "setting-common-resource.h"
 /* including another class of data type */
-#include <setting-common-data-error.h>
+#include "setting-common-data-error.h"
 
-#include <setting-cfg.h>
+#include "setting-cfg.h"
 
-#ifndef PREFIX
-#define PREFIX "/opt"
-#endif
-
-#ifndef bool
-#define bool Eina_Bool
-#endif
 #define PWD_FILE       _TZ_SYS_DATA"/setting/set_info"
 
 #define SETTING_GENLIST_1ICON_STYLE                    "full"
 #define SETTING_GENLIST_LEFT_ICON_CONTENT_ICON_STYLE   "full"
 #define SETTING_GENLIST_ENTRY_STYLE                    "entry.main"
 
-#define SETTING_POSTINST_FILE "/var/lib/dpkg/info/org.tizen.setting.postinst"
-
 #define SETTING_PACKAGE                "setting"
 #define SYSTEM_PACKAGE         "sys_string"
 #define SETTING_LOCALEDIR      _TZ_SYS_RO_APP\
        "/org.tizen.setting/res/locale"
 
-#define MODE_SYSPOPUP_PACKAGE          "mode-syspopup"
-#define MODE_SYSPOPUP_LOCALEDIR        _TZ_SYS_RO_APP\
-       "/org.tizen.mode-syspopup/res/locale"
-
-#define SYSTEM_ICON_PATH       _TZ_SYS_RO_APP"/org.tizen.setting/res/icons"
 #define SETTING_ICON_PATH      _TZ_SYS_RO_APP"/org.tizen.setting/res/icons"
-#define SETTING_UG_ICON_PATH   _TZ_SYS_RO_UG"/res/icon/org.tizen.setting"
 
 #define SETTING_APP_MGR_ICON_SIZE      117
 
-#define SETTING_UG_PATH                _TZ_SYS_RO_UG"/lib"
-#define SETTING_UG_PATH_USR    _TZ_SYS_RO_UG"/lib"
-
-#define SETTING_PATH_MEMORY_OPT                "/opt/usr"
-#define SETTING_PATH_SDCARD_OPT                _TZ_SYS_MEDIA"/sdcard"
-#define SETTING_PATH_PARENT_SDCARD_OPT _TZ_SYS_MEDIA"/sdcard/.."
-
-
-#define SETTING_KILOBYTE_VALUE         1024
-#define SETTING_MEGABYTE_VALUE         1048576
-#define SETTING_GIGABYTE_VALUE         1073741824
-
-#define SETTING_MAX_STR_LEN            30
-
-
 #define SETTING_EDJ_PATH               EDJDIR
 #define SETTINGS_EDJ                   SETTING_EDJ_PATH"/settings.edj"
 #define SETTING_THEME_EDJ_NAME         SETTING_EDJ_PATH"/setting-theme.edj"
-#define SETTING_5STEP_SLIDER_EDJ_NAME  SETTING_EDJ_PATH"/font-slider.edj"
-#define SETTING_GENLIST_EDJ_NAME       SETTING_EDJ_PATH"/setting-genlist.edj"
-
-#define SETTING_THEME_COLOR_THEME_EDJ_NAME             SETTING_EDJ_PATH"/setting-color-theme.edj"
-
-#define RCS_CHECHING_FILE              _TZ_SYS_SHARE"/ims/.RCS_ENABLED"
-
-/* inoti (broadcasting without data */
-#define SETTING_TIME_CHANGED   "setting_time_changed"
 
 /* anci c color type */
 #define SETTING_FONT_RED "\033[31m"
 #define SETTING_FONT_BLACK "\033[0m"
 #define SETTING_FONT_BGREEN "\033[36m"
 
-#define THEME_STYLE "beat"
-
-#define IMG_EC_ARROW_OPEN  SETTING_ICON_PATH"org.tizen.setting.png"
-#define IMG_EC_ARROW_CLOSE SETTING_ICON_PATH"org.tizen.setting.png"
-
-#define SETTING_IDLE_IMAGE_PATH "/etc/idle_image/"
-
-/*"naviframe_control/default" */
-#define NAVI_DEF_BUTTON_STYLE  "naviframe/toolbar/default"
-#define NAVI_BACK_BUTTON_STYLE "naviframe/title_left"
 #define NAVI_BACK_ARROW_BUTTON_STYLE "naviframe/end_btn/default"
-/*"naviframe_control/default" */
-#define NAVI_MORE_BUTTON_STYLE "naviframe/more/default"
 
 
-#define NAVI_CONTROLBAR_PART "controlbar"
-
-#define BTN_STYLE_DEF "naviframe/title/default"
-#define NAVI_BTN_STYLE_LEFT "title_left_btn"
-#define NAVI_BTN_STYLE_RIGHT "title_right_btn"
-#define NAVI_BTN_STYLE_MORE "title_more_btn"
-#define NAVI_BTN_STYLE_PREV "prev_btn"
-
 #define PROGRESSBAR_STYLE "process_medium"
-#define SETTING_FONT_CONF_FILE _TZ_SYS_ETC"/fonts/conf.avail/99-slp.conf"
 #define SETTING_DEFAULT_FONT_CONF_FILE _TZ_SYS_DATA\
        "/etc/fonts/conf.avail/99-slp.conf"
 
-
-
-/*#define GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR_STYLE     "#3B73B6FF" */
-#define BLUE_COLOR             "#3B73B6" /*3B73B6FF <== 59 115 182 255 */
-#define GRAY_COLOR "#7B7B7B"
-#define RED_COLOR "#FF0000"
-#define WHITE_COLOR "#FFFFFF"
-
 /**
 * @brief slider, button, and etc.
 *
 
 typedef void (*setting_call_back_func)(
                void *data, Evas_Object *obj, void *event_info);
-typedef Eina_Bool(*setting_naviframe_cb)(void *data, Elm_Object_Item *it);
 
 #define WIDGET_SCALE_FACTOR            (get_widgets_factor())
-#define SETTING_PADDING_WIDTH          (8 * WIDGET_SCALE_FACTOR)
-#define SETTING_PADDING_HEIGHT         (8 * WIDGET_SCALE_FACTOR)
-#define SETTING_HALF_SCREEN_WIDTH \
-       (SETTING_PADDING_WIDTH * 22 * WIDGET_SCALE_FACTOR)
 
-#define SYS_NOTI_NAME_LEN              128
+
 #define MAX_DISPLAY_NAME_LEN_ON_UI     128
 #define MAX_COMMON_BUFFER_LEN          1024
 #define BUF_SIZE                       512
 
 #define MAX_SEARCH_STR_LEN 40
 
-#define HELP_MSG_BUFF_SIZE             1000
 #define MAX_SPECIALIZITION_LEN         1000
 
 #define PHONE_LOCK_ATTEMPS_MAX         5
 #define SIM_LOCK_ATTEMPS_MAX           5
-#define PHONE_LOCK_BLOCK_SECONDS       30
-#define SIM_LOCK_BLOCK_SECONDS         30
 #define LOCK_TIMESTAMP_LEN             64
-#define MAX_DATETIME_FORMAT_LEN                64
-#define MAX_DATE_FORMAT_LEN            10
 
 #define SMALL_FONT_DPI                 (-80)
 #define MIDDLE_FONT_DPI                        (-100)
@@ -197,14 +119,7 @@ typedef Eina_Bool(*setting_naviframe_cb)(void *data, Elm_Object_Item *it);
 #define STR_LABEL_FONT_SIZE_HUGE               "76"
 #define STR_LABEL_FONT_SIZE_GIANT              "100"
 
-
-#define __STR_EMUL                     "emul"
-#define __LEN_STR_EMUL                 4
-
 #define MAX_SYSTEM_SERVICE_NUM         30
-#define SYSTEM_SERVICE_LIST_PATH \
-       "/opt/osp/system/configuration/system-services.list"
-#define MAX_PKG_NAME_LEN                       128
 
 #define MIN_MOVE_DISTANCE 30
 
@@ -230,14 +145,6 @@ typedef struct {
        /*int number;                           // no -  UI */
 } setting_lang_entry;
 
-typedef enum _Theme_Type {
-       Theme_Invalid = -1,
-       Theme_Tizen = 0,
-       Theme_Tizen_Black = 1,
-       Theme_Tizen_Blue,
-       Theme_ERROR
-} Theme_Type;
-
 typedef enum _GENDIAL_Type {
        GENDIAL_Type_1text_1icon_2 = 0,
        GENDIAL_Type_1icon_2text = 1,
@@ -278,12 +185,6 @@ typedef enum _SWALLOW_Type {
        SWALLOW_Type_MAX
 } SWALLOW_Type;
 
-typedef enum {
-       UNDEFINED_LIB_SYMBOL = -2,/*  undefined symbol : -2 */
-       LOAD_LIB_FAILED = -1,/*  load failed : -1 */
-       OPERATE_LIB_SUCESS = 0,
-} OPERATE_LIB_ERROR;
-
 typedef enum _POPUP_BTN_RESPONSE_TYPE {
        POPUP_RESPONSE_INVALID = -1,
        POPUP_RESPONSE_OK = 0,
@@ -410,69 +311,6 @@ typedef struct _Setting_GenGroupItem_Data {
 
 } Setting_GenGroupItem_Data;
 
-typedef enum {
-       SETTING_VCONF_INT_TYPE = 0,
-       SETTING_VCONF_BOOL_TYPE,
-       SETTING_VCONF_STR_TYPE
-} setting_vconf_type;
-
-#define MAX_RESET_MENU_NUM 100
-
-typedef struct _item_table {
-       char *item_name;        /* pointer to the key string */
-       char *ug_args;
-       Setting_GenGroupItem_Data *data_GenItem;
-} Item_Table;
-
-typedef struct _AllowListItem AllowListItem;
-
-struct _AllowListItem {
-       char *person_id;
-       char *name;
-       char *thumb_path;
-};
-/**
- * @todo is 50 sufficient value?
- */
-typedef struct _Setting_Done_List_Data {
-       /* external input arguements */
-       Evas_Object *window;
-       void *UG_data;
-       Evas_Object *ly_parent;
-       Evas_Object *controllbar;
-       Elm_Object_Item *navi_it;
-       const char navi_title[MAX_DISPLAY_NAME_LEN_ON_UI];
-
-       /* internal output%input arguements */
-       Item_Table chk_items[MAX_RESET_MENU_NUM];
-       int cur_item_selnum;
-       int cur_item_num;
-       Evas_Object *selInfoPop;
-       Evas_Object *selInfoPop_layout;
-       Elm_Genlist_Item_Class itc_1text_1icon;
-       Elm_Genlist_Item_Class itc_1text_2icon;
-       /*Elm_Genlist_Item_Class itc_seperator;*/
-       Evas_Object *select_all_checkbox;
-       Eina_Bool select_all_checked;
-       Eina_List *list;
-
-       AllowListItem allow_items[MAX_RESET_MENU_NUM];
-} Setting_Done_List_Data;
-
-
-#define MAX_BUTTON_TEXT_LEN 20
-#define MAX_BUTTON_NUM 20
-typedef struct _setting_btn_data {
-       Evas_Object *parent;
-       const char      *btn_text[MAX_BUTTON_NUM];
-       const char      *btn_icon[MAX_BUTTON_NUM];
-       setting_call_back_func btn_click_cb;
-       void *btn_cb_data;
-       Evas_Object *ctxpopup;
-       Elm_Object_Item *item[MAX_BUTTON_NUM];
-} Setting_Btn_Data;
-
-#define USEC_PER_SEC  1000000UL
 typedef struct {
        const char *key_font_name;
        int font_size;
index 475609ace3a3a09379839136017edfea253f98a5..f8b0abd8dc3b62322c7348862331676e9d803a1b 100755 (executable)
 #define SETTING_COMMON_DRAW_WIDGET_CONTROLBAR_ITEM_LEN 3
 #define POPUP_INTERVAL 2.0
 
-/*
- extern const Elm_Genlist_Item_Class itc_seperator;
- extern const Elm_Genlist_Item_Class itc_bottom_seperator;
- */
-
 extern const Elm_Genlist_Item_Class itc_1text;
 extern const Elm_Genlist_Item_Class itc_1text_1icon_2;
 extern const Elm_Genlist_Item_Class itc_1text_1icon_2_tb;
@@ -75,23 +70,6 @@ extern const Elm_Genlist_Item_Class itc_editfield;
 extern const Elm_Genlist_Item_Class itc_multiline_2text;
 extern const Elm_Genlist_Item_Class itc_1text_1icon_divider;
 
-#define ADD_GL_LABLE(scroller, str) \
-       {\
-               if (str) {\
-                       Setting_GenGroupItem_Data *item_data = \
-                               setting_create_Gendial_field_def(\
-                                       scroller, &itc_multiline_text,\
-                                       NULL,\
-                                       NULL,\
-                                       SWALLOW_Type_LAYOUT_SPECIALIZTION,\
-                                       NULL, NULL, 0, str, NULL, NULL);\
-                       setting_retvm_if(NULL == item_data, NULL, \
-                                       "item_data is NULL");\
-                       elm_genlist_item_select_mode_set(item_data->item, \
-                                       ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);\
-               } \
-       }
-
 /*//TODO: Remove this */
 #define ADD_GL_HELP(scroller, str) \
        {\
@@ -110,93 +88,6 @@ extern const Elm_Genlist_Item_Class itc_1text_1icon_divider;
                } \
        }
 
-/*//TODO: Remove this */
-#define ADD_GL_HELP_NO_SEP(scroller, str) \
-       {\
-               if (str) {\
-                       Setting_GenGroupItem_Data *item_data = \
-                               setting_create_Gendial_field_def(\
-                                       scroller, &itc_multiline_text,\
-                                       NULL,\
-                                       NULL,\
-                                       SWALLOW_Type_LAYOUT_SPECIALIZTION_X,\
-                                       NULL, NULL, 0, str, NULL, NULL);\
-                       setting_retvm_if(NULL == item_data, NULL, \
-                                       "item_data is NULL");\
-                       elm_genlist_item_select_mode_set(item_data->item, \
-                                       ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);\
-               } \
-       }
-
-#define ADD_GL_BUTTON(scroller, btn_str, btn_cb, cb_data) \
-       {\
-               if (btn_str) {\
-                       Setting_GenGroupItem_Data *item_data = \
-                               setting_create_Gendial_field_def(\
-                                       scroller, &(itc_1icon_with_no_line),\
-                                       NULL, cb_data, SWALLOW_Type_1BUTTON,\
-                                       NULL, NULL, 0, btn_str, NULL,\
-                                       btn_cb);\
-                       setting_retvm_if(NULL == item_data, NULL, \
-                                       "item_data is NULL");\
-                       item_data->userdata = cb_data;\
-               } \
-       }
-
-#define ADD_GL_GIF(scroller, png_list) \
-       {\
-               if (png_list && *png_list) {\
-                       Setting_GenGroupItem_Data *item_data = \
-                               setting_create_Gendial_field_def(\
-                                       scroller, &(itc_1icon_with_no_line),\
-                                       NULL, NULL, SWALLOW_Type_1GIF,\
-                                       NULL, NULL, 0, NULL, NULL,\
-                                       NULL);\
-                       setting_retvm_if(NULL == item_data, NULL,\
-                                       "item_data is NULL");\
-                       item_data->belongs_to = (int_of_ptr_size)png_list;\
-                       if (item_data)\
-                               elm_genlist_item_select_mode_set(\
-                                               item_data->item, \
-                                               ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);\
-               } \
-       }
-
-#define ADD_GL_GIF_2(scroller, png_array) \
-       {\
-               Setting_GenGroupItem_Data *item_data = \
-                       setting_create_Gendial_field_def(\
-                               scroller, &(itc_1icon_with_no_line),\
-                               NULL, NULL, SWALLOW_Type_1GIF,\
-                               NULL, NULL, 0, NULL, NULL,\
-                               NULL);\
-               item_data->belongs_to = (int)png_array;\
-               elm_genlist_item_select_mode_set(item_data->item, \
-                               ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);\
-       }
-
-#define ADD_GL_RADIO(scroller, rdg, radio_idx, keyStr, sel_cb, cb_data) \
-       {\
-               if (!rdg) {\
-                       rdg = elm_radio_add(scroller);\
-                       elm_radio_state_value_set(rdg, -1);\
-               } \
-               if (keyStr && rdg) {\
-                       Setting_GenGroupItem_Data *item_data = \
-                               setting_create_Gendial_field_1radio(\
-                                       scroller, &(itc_1text_1icon_2),\
-                                       sel_cb,\
-                                       cb_data,\
-                                       SWALLOW_Type_1RADIO,\
-                                       rdg, radio_idx,\
-                                       keyStr,\
-                                       NULL);\
-                       if (item_data) {\
-                               item_data->userdata = cb_data;\
-                       } \
-               } \
-       }
-
 #define _P(pEvasObj) do { \
                evas_object_event_callback_add(pEvasObj, EVAS_CALLBACK_DEL, \
                                setting_protect_cb, &(pEvasObj));\
@@ -252,11 +143,6 @@ extern Setting_GenGroupItem_Data *setting_create_Gendial_field_helpitem_without_
                Evas_Object *genlist, const Elm_Genlist_Item_Class *itc,
                SWALLOW_Type swallow_type, const char *keyStr);
 
-extern Setting_GenGroupItem_Data *setting_create_Gendial_field_insert_help_without_bottom_separator(
-               Evas_Object *genlist, const Elm_Genlist_Item_Class *itc,
-               Elm_Object_Item *after_it, SWALLOW_Type swallow_type,
-               const char *keyStr);
-
 /**
  * Common function to create a genlist item
  * @return a pointer to Setting_GenGroupItem_Data
@@ -333,10 +219,7 @@ extern void setting_enable_expandable_genlist(Evas_Object *genlist, void *data,
  */
 extern Evas_Object *setting_create_slider(Evas_Object *window,
                Setting_GenGroupItem_Data *item_data);
-extern Evas_Object *setting_create_progressbar(
-               Evas_Object *parent,
-               Setting_GenGroupItem_Data *item_data,
-               const char *item_style);
+
 /**
  * To create slider object of a genlist item
  * @return a slider container object
@@ -363,13 +246,6 @@ extern Evas_Object *setting_create_image(Evas_Object *parent,
 extern Evas_Object *setting_create_gif(Evas_Object *parent,
                const char **png_list);
 
-/**
- * Set the vconf value via its binded check object.
- * @return 0: sucess, other: failed
- */
-extern int setting_reset_slp_key_by_status(Evas_Object *obj,
-               setting_bool_slp_list key);
-
 /**
  * Set the status of radio group object via its binded vconf value.
  * @return  0: sucess, other: failed
@@ -399,23 +275,6 @@ extern Evas_Object *setting_create_button(Evas_Object *parent,
 extern Evas_Object *setting_create_textbox(Evas_Object *parent,
                const char *content);
 
-/****done_list****/
-
-/*The API is going to register a message to NOTIFICATION_STATUS_MESSAGE_KEY,
- *     and the message will be shown in indicator
- * @ Quickpannel App save the value of var message, and it supply
- *     notification_status_monitor_message_cb_set,
- * @ in which, Indicator can set process of
- *     vconf(NOTIFICATION_STATUS_MESSAGE_KEY) change event,in the
- *     call __message_callback,
- * @ it will invoke indicator_part_text_emit_by_win(win,"message.text.compare",
- *     text); to show message you registered
- */
-extern void setting_create_indicator_notification(const char *message);
-
-extern Evas_Object *setting_create_done_list_with_image(
-               Setting_Done_List_Data *list_data, const char *title);
-
 /**
  * Get searchbar text and register redraw_cb by idler.
  *
@@ -440,34 +299,6 @@ extern int setting_searchbar_redraw(void *data, Evas_Object *search_bar,
 extern Evas_Object *setting_create_searchbar(void *data, Evas_Object *parent,
                Evas_Smart_Cb change_cb, Evas_Smart_Cb cancel_cb);
 
-/**
- * Make it no effect when clicking on a evas object, such as, layout, genlist
- *
- */
-extern void setting_disable_evas_object(Evas_Object *obj);
-
-/**
- * Make it normal acting when clicking on a evas object, such as, layout,
- * genlist
- *
- */
-extern void setting_enable_evas_object(Evas_Object *obj);
-
-/**
- * To disable a specialized genlist item
- *
- */
-extern void setting_disable_genlist_item(Elm_Object_Item *item);
-
-/**
- * To enable a specialized genlist item
- *
- */
-extern void setting_enable_genlist_item(Elm_Object_Item *item);
-
-extern void setting_genlist_item_disabled_set(
-               Setting_GenGroupItem_Data *item_data, int disable);
-
 /**
  * To resize a evas object, such as, icon, button..
  *
@@ -509,7 +340,6 @@ extern void setting_dim_evas_object(Evas_Object *obj, bool b_transparenct);
 extern char *setting_customize_text(const char *input_str, const int font_size,
                const char *color, const char *align);
 
-extern void setting_check_genlist_item_bottom_line(Elm_Object_Item *item);
 extern void __gl_realized_cb(void *data, Evas_Object *obj, void *event_info);
 
 extern void setting_update_gl_item_chk_status(
@@ -517,10 +347,6 @@ extern void setting_update_gl_item_chk_status(
 
 extern void setting_conformant_keypad_state(Evas_Object *conform, bool enable);
 
-extern void setting_tabbar_enable_swip_effect(Evas_Object *ly_main,
-               Evas_Object *tabbar);
-extern void setting_tabbar_disable_swip_effect(Evas_Object *ly_main,
-               Evas_Object *tabbar);
 extern void setting_decorate_image_RGBA(Evas_Object *obj, int r, int g, int b,
                int a);
 extern void setting_protect_cb(void *data, Evas *e, Evas_Object *obj,
index e66221ea780a8fadf3b280b431f2fe23818eb97c..42c7d2d1c65a1be7ca9ce500bc1497c4cd5f6d9e 100755 (executable)
@@ -56,7 +56,6 @@
 
 #define btn_type(obj) get_popup_btn_response_type(obj)
 
-#define sncat(to, size, from) strncat(to, from, size-strlen(to)-1)
 #define SAFE_STRDUP(src) (src) ? strdup(src) : NULL
 
 extern char *get_application_default_icon(const char *appid);
@@ -72,7 +71,6 @@ extern char *get_pa_display_language_str();
 extern char *get_pa_time_format_str();
 extern char *get_pa_date_format_str();
 extern char *get_pa_select_network();
-extern char *get_pa_noti_readout_str();
 extern double get_widgets_factor();
 extern char *setting_gettext(const char *s);
 extern char *setting_gettext2(const char *s, const char *domainname);
@@ -105,13 +103,8 @@ extern int app_launcher_svc(const char *pkg_name, app_control_h service,
                app_control_reply_cb callback, void *user_data);
 extern int app_group_launcher(const char *pkg_name);
 
-extern bool check_blockingmode_sub_item();
-extern int get_datausage_current_month_info(bool bisroaming, char *szUsed);
-extern int get_current_datausage_this_month(double *total, double *szUsed);
 extern bool get_tethering_status();
 extern const char *get_font_size_str(int value);
 extern char *get_pa_backlight_time_value_str();
 
-char *strcasestr(const char *haystack, const char *needle);
-
 #endif                         /* __SETTING_COMMON_GENERAL_FUNC_H__ */
index ab3830507cf67c85ef44b22b08c02b5af729c998..a1eea80955d0f929baaf9eff50a21ba9a2ad18c7 100755 (executable)
 #include "setting-common-string.h"
 
 
-/*/////// IMAGES /////////// */
-
-#define IMG_SETTING    _TZ_SYS_RO_ICONS"/default/small/org.tizen.setting.png"
-
 /* connectivity IMG*/
 #define IMG_WiFi       SETTING_LIST_ICON_PATH_CFG"settings_wifi.png"
 #define IMG_Bluetooth  SETTING_LIST_ICON_PATH_CFG"settings_bluetooth.png"
-#define IMG_FlightMode SETTING_LIST_ICON_PATH_CFG"settings_flight.png"
 #define IMG_MobileAP   SETTING_LIST_ICON_PATH_CFG"settings_tethering.png"
-#define IMG_WiFiDirect SETTING_LIST_ICON_PATH_CFG"settings_wifi_direct.png"
-#define IMG_NFC                SETTING_LIST_ICON_PATH_CFG"settings_nfc_and_payment.png"
+#define IMG_FlightMode SETTING_LIST_ICON_PATH_CFG"settings_flight.png"
 #define IMG_Network    SETTING_LIST_ICON_PATH_CFG"settings_mobile_networks.png"
-#define IMG_More_Connections \
-       SETTING_LIST_ICON_PATH_CFG"settings_more_connections.png"
-#define IMG_Tizenconnect       SETTING_LIST_ICON_PATH_CFG"settings_convergence.png"
-#define IMG_Location   SETTING_LIST_ICON_PATH_CFG"settings_ic_location.png"
 
 /* Device IMG*/
 #define IMG_Sounds \
index a73e53c5475d383ff4be9b2284d51bfe3b00420f..e390bbfee9f27f193165594e414d740e69ba9872 100755 (executable)
 
 #include <setting-common-po-string.h>
 
-#define TTS_CONTENT_MENU_CLICK_INFO \
-       "IDS_ST_BODY_TO_OPEN_THE_MENU_DOUBLE_TAP_IT_T_TTS"
-#define TTS_CONTENT_BACK_CLICK_INFO \
-       "IDS_ST_BODY_DOUBLE_TAP_TO_CLOSE_THE_MENU_T_TTS"
-
 #define EXCEED_LIMITATION_STR "IDS_ST_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
-#define EXCEED_MINLENGTH_LIMITATION_STR "The content is too short"
 
 #define SETTING_ICON_PATH_CFG  _TZ_SYS_RO_APP"/org.tizen.setting/res/icons/"
 #define SETTING_LIST_ICON_PATH_CFG SETTING_ICON_PATH_CFG"list_icon/"
 
 #define SETTING_IMAGE_PATH_CFG _TZ_SYS_RO_APP"/org.tizen.setting/res/images/"
-#define SETTING_OPEN_SOURCE_LICENSE_PATH "file:///usr/share/license.html"
 
-#define SETTING_OTHER_UG_ICON_PATH \
-       _TZ_SYS_RO_ICONS"/default/small/"
 #define SETTING_DEFAULT_CALL_TONE \
        _TZ_SYS_GLOBALUSER_DATA"/settings/Ringtones/ringtone_sdk.mp3"
 #define SETTING_DEFAULT_CALL_TONE_SDK \
        _TZ_SYS_GLOBALUSER_DATA"/settings/Ringtones/ringtone_sdk.mp3"
-#define SETTING_DEFAULT_CALL_VIB \
-       _TZ_SYS_GLOBALUSER_DATA"/settings/Vibrations/haptic/default/Ticktock.ivt"
-#define DEF_RINGTONE\
-       _TZ_SYS_GLOBALUSER_DATA"/settings/Ringtones/ringtone_sdk.mp3"
-#define SETTING_MMC_PATH \
-       _TZ_SYS_MEDIA"/sdcard/"
 
-/***************new V7.0*************/
-/* be used to compare with model_str from system_info_get_platform_string(
- * SYSTEM_INFO_KEY_MODEL, &model_str) */
+
 #define KeyStr_Emulator                "Emulator"
-#define KeyStr_Back            "IDS_ST_BUTTON_BACK"
 /* connectivity keyStr*/
 #define KeyStr_Accessibility   "IDS_ST_BODY_ACCESSIBILITY"
 #define KeyStr_Connections     "IDS_ST_BODY_CONNECTIONS"
 #define KeyStr_Personal                "IDS_ST_HEADER_PERSONALISATION"
 
 #define KeyStr_Device          "IDS_ST_BODY_DEVICE"
-#define KeyStr_FlightMode      "IDS_ST_BODY_FLIGHT_MODE"
-
 #define KeyStr_WiFi            "IDS_ST_BODY_WI_FI"
-#define KeyStr_WiFiDirect      "IDS_ST_HEADER_WI_FI_DIRECT"
 #define KeyStr_Bluetooth       "IDS_TPLATFORM_OPT_BLUETOOTH"
 #define KeyStr_MobileAP                "IDS_MOBILEAP_BODY_TETHERING"
-#define KeyStr_Location                "IDS_LBS_HEADER_LOCATION"
-#define KeyStr_Network         "IDS_ST_BODY_NETWORK"
-#define KeyStr_MobileNetworks  "IDS_ST_BODY_MOBILE_NETWORKS"
 #define KeyStr_DataRoaming     "IDS_ST_BODY_DATA_ROAMING"
 #define KeyStr_UseMobileData   "IDS_ST_MBODY_MOBILE_DATA"
 #define KeyStr_DeveloperOption "IDS_ST_BODY_DEVELOPER_OPTIONS"
-#define KeyStr_MoreConnectionSettings "IDS_ST_HEADER_MORE_CONNECTION_SETTINGS"
+
 #ifdef USE_TIZEN_CONNECT
 #define KeyStr_Tizenconnect    "IDS_ST_HEADER_TIZEN_CONNECT"
 #endif
 
 /* system keyStr*/
 #define KeyStr_System          "IDS_ST_BODY_SYSTEM"
-#define KeyStr_Menuscreen      "IDS_ST_HEADER_HOME_SCREEN_ABB"
-#define KeyStr_Homescreen      "IDS_ST_HEADER_HOME_SCREEN_ABB"
 #define KeyStr_Sounds          "IDS_ST_HEADER_SOUND"
 #define KeyStr_Wallpaper       "IDS_LCKSCN_BODY_WALLPAPERS"
 #define KeyStr_LockScreen      "IDS_ST_HEADER_LOCK_SCREEN"
 #define KeyStr_Font            "IDS_ST_BODY_FONT"
 
 
-
-#define KeyStr_MotionControl           "IDS_ST_BODY_MOTION"
-#define KeyStr_Motions                 "IDS_ST_MBODY_MOTIONS_AND_GESTURES"
-
 #define KeyStr_Display                 "IDS_ST_HEADER_DISPLAY"
 #define KeyStr_ApplicationsItem                "IDS_ST_BODY_APPLICATIONS"
 #define KeyStr_ApplicationManager      "IDS_ST_BODY_APPLICATION_MANAGER"
 #define KeyStr_VoiceInOut              "IDS_ST_BODY_VOICE"
 #define KeyStr_LanguageInput           "IDS_ST_HEADER_LANGUAGE_AND_INPUT"
 #define KeyStr_Battery         "IDS_ST_BODY_BATTERY"
-
+#define KeyStr_FlightMode      "IDS_ST_BODY_FLIGHT_MODE"
+#define KeyStr_MobileNetworks  "IDS_ST_BODY_MOBILE_NETWORKS"
 #define KeyStr_LanguageRegion          "IDS_ST_BODY_LANGUAGE_AND_REGION_ABB"
 #define KeyStr_License                 "IDS_ST_BODY_LICENCE"
 #define KeyStr_EventsNotifications     "IDS_CLD_HEADER_EVENT_NOTIFICATION"
 #define KeyStr_AboutDevice             "IDS_ST_BODY_ABOUT_DEVICE"
 #define KeyStr_MenuWidgets             "IDS_ST_BODY_MENU_AND_WIDGETS"
 #define KeyStr_Accessibility           "IDS_ST_BODY_ACCESSIBILITY"
-#define KeyStr_Screen_reader           "IDS_ST_MBODY_SCREEN_READER_HTTS"
-#define KeyStr_Guestmode               "Guest mode"    /*unused 2.0 */
-#define KeyStr_Accessories             "IDS_HEALTH_OPT_ACCESSORIES"
-#define keystr_LedIndicator            "IDS_ST_BODY_LED_INDICATOR"
-#define KeyStr_EasyMode                        "IDS_ST_BODY_EASY_MODE"
-
 
-/* applications keyStr*/
-#define KeyStr_Applications            "IDS_ST_BODY_APPLICATIONS"
 #define KeyStr_Accounts                        "IDS_ST_BODY_ACCOUNTS"
 #define KeyStr_Privacy                 "IDS_ST_HEADER_PRIVACY_AND_SECURITY_ABB"
-
-#define KeyStr_NFC                     "IDS_ST_BODY_NFC"
 #define KeyStr_Storage                 "IDS_ST_BODY_STORAGE"
-
-/* applications keyStr*/
-#define KeyStr_DownloadedAPPs          "IDS_ST_BODY_APPLICATION"
-#define KeyStr_ManageApps              "IDS_ST_BODY_APPLICATION_MANAGER"
-
-
 #define KeyStr_Save                    "IDS_ST_BODY_SAVE"
 
 
 /*//////////////Common Strings/////////////// */
 
-#define KeyStr_Item_Sel                        "Item(s) Selected"
 #define UNSUPPORTED_FUNCTION           "IDS_MSGF_POP_UNSUPPORTED"
-#define KeyStr_Select_All              "IDS_ST_BODY_SELECT_ALL"
-#define KeyStr_Select_Item     "IDS_ST_HEADER_SELECT_VIBRATION_PATTERNS_ABB"
-#define KeyStr_INFO                    "IDS_PB_BODY_INFO"
-#define KeyStr_DeviceMange             "IDS_ST_HEADER_DEVICE_MANAGER"
 #define KeyStr_Loading                 "IDS_ST_POP_LOADING_ING"
 
 #endif /* __SETTING_COMMON_STRING_H__ */
index 2ee9093cf9305e8375f18a52dbfc5173f52f1a76..3e4fc0b4acc43a50c49a4475b53e5ed782015902 100755 (executable)
  *
  */
 
-#include <setting-cfg.h>
-#include <setting-debug.h>
-#include <stdio.h>
+#include "setting-cfg.h"
+#include "setting-debug.h"
 #include <Elementary.h>
 #include <json-glib/json-glib.h>
-#include <setting-common-general-func.h>
-#include <setting-common-data-type.h>
-#include <setting-common-data-slp-setting.h>
-#include <unistd.h>
+#include "setting-common-general-func.h"
+#include "setting-common-data-type.h"
+#include "setting-common-data-slp-setting.h"
 #include <vconf.h>
 #include <ui-gadget-module.h>
 
index 0e7ae817a7b8732f929f75f7f71c36681a0d83e6..91d7ab5d0178e25518b81aac2c21cc99c480e6bc 100644 (file)
@@ -1777,51 +1777,6 @@ void setting_enable_expandable_genlist(Evas_Object *genlist, void *data,
                        "longpressed");
 }
 
-/**
- * To disable a specialized genlist item
- *
- * @param[in] item
- */
-EXPORT_PUBLIC
-void setting_disable_genlist_item(Elm_Object_Item *item)
-{
-       if (item) {
-               /* make it be dim displayed */
-               elm_object_item_disabled_set(item, EINA_TRUE);
-               /*elm_genlist_item_update(item); */
-       }
-}
-
-/**
- * To enable a specialized genlist item
- *
- * @param[in] item
- */
-EXPORT_PUBLIC
-void setting_enable_genlist_item(Elm_Object_Item *item)
-{
-       if (item) {
-               /* make it be normally displayed */
-               elm_object_item_disabled_set(item, EINA_FALSE);
-               /*elm_genlist_item_update(item); */
-       }
-}
-
-EXPORT_PUBLIC
-void setting_genlist_item_disabled_set(Setting_GenGroupItem_Data *item_data,
-               int disable)
-{
-       if (item_data && item_data->item) {
-               /* make it be dim displayed */
-               elm_object_item_disabled_set(item_data->item, disable);
-       }
-}
-
-EXPORT_PUBLIC
-void setting_check_genlist_item_bottom_line(Elm_Object_Item *item)
-{
-}
-
 EXPORT_PUBLIC
 void __gl_realized_cb(void *data, Evas_Object *obj, void *event_info)
 {
@@ -1833,9 +1788,6 @@ void __gl_realized_cb(void *data, Evas_Object *obj, void *event_info)
        /*? Setting_GenGroupItem_Data *list_item =
         * (Setting_GenGroupItem_Data *) */
        elm_object_item_data_get(item);
-
-       /*/ #if SUPPORT_TTS */
-       setting_check_genlist_item_bottom_line(item);
 }
 
 /*for check,radio,slider etc.. */
index ddfc3271c5197051afe855a95a63682a0fa1e322..b091d9e3eb304b0be8c02bd755fcd485273d3846 100644 (file)
@@ -243,37 +243,6 @@ EXPORT_PUBLIC Evas_Object *setting_create_slider(
        return slider;
 }
 
-/**
- * To create progressbar object of a genlist item
- *
- *@return a progressbar container object
- */
-EXPORT_PUBLIC Evas_Object *setting_create_progressbar(
-               Evas_Object *parent,
-               Setting_GenGroupItem_Data *item_data,
-               const char *item_style)
-{
-       /* "elm/slider/horizontal/default" */
-       Evas_Object *progressbar = elm_progressbar_add(parent);
-       retv_if(progressbar == NULL, NULL);
-       if (item_style)
-               elm_object_style_set(progressbar, item_style);
-
-       evas_object_size_hint_weight_set(progressbar, EVAS_HINT_EXPAND, 0.0);
-       evas_object_size_hint_align_set(progressbar, EVAS_HINT_FILL, 0.5);
-
-       if (item_data->l_swallow_path) {
-               Evas_Object *icon2 = elm_icon_add(progressbar);
-               elm_image_file_set(icon2, item_data->r_swallow_path, NULL);
-               evas_object_size_hint_aspect_set(
-                               icon2, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-               elm_object_part_content_set(progressbar, "icon", icon2);
-       }
-
-       elm_progressbar_pulse_set(progressbar, EINA_TRUE);
-       return progressbar;
-}
-
 #define DEMO_STEP 0.8
 typedef struct _setting_gif_data {
        Ecore_Timer *update_timer;
@@ -449,33 +418,6 @@ Evas_Object *setting_create_textbox(Evas_Object *parent, const char *content)
        return obj;
 }
 
-/**
-* Make it no effect when clicking on a evas object and its sub-objects,
-* such as, layout, genlist
-*
-* @param[in] obj
-*/
-EXPORT_PUBLIC
-void setting_disable_evas_object(Evas_Object *obj)
-{
-       /* layout\genlist\scroller\elm_entry  etc.. */
-       if (obj)
-               evas_object_pass_events_set(obj, EINA_TRUE);
-}
-
-/**
-* Make it normal acting when clicking on a evas object, such as, layout,
-* genlist
-*
-* @param[in] obj
-*/
-EXPORT_PUBLIC
-void setting_enable_evas_object(Evas_Object *obj)
-{
-       if (obj)
-               evas_object_pass_events_set(obj, EINA_FALSE);
-}
-
 /**
 * To resize a evas object, such as, icon, button..
 *
@@ -757,166 +699,6 @@ EXPORT_PUBLIC void setting_conformant_keypad_state(
        }
 }
 
-#define MIN_SWIP_DISTANCE_X 300
-#define MIN_SWIP_DISTANCE_Y 75
-
-static void __tabbar_mouse_down_cb(
-               void *data, Evas *e,
-               Evas_Object *obj,
-               void *event_info)
-{
-       /*SETTING_TRACE_BEGIN; */
-       retm_if(event_info == NULL, "Invalid argument: event info is NULL");
-       retm_if(data == NULL, "Invalid argument: data is NULL");
-       Evas_Event_Mouse_Down *ev = (Evas_Event_Mouse_Down *)event_info;
-       Evas_Point *point_down = data;
-       point_down->x = ev->output.x;
-       point_down->y = ev->output.y;
-}
-
-static void __tabbar_mouse_up_cb(
-               void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-       /*SETTING_TRACE_BEGIN; */
-       retm_if(event_info == NULL, "Invalid argument: event info is NULL");
-       retm_if(data == NULL, "Invalid argument: data is NULL");
-       Evas_Point *point_down = data;
-       Evas_Event_Mouse_Up *ev = (Evas_Event_Mouse_Up *)event_info;
-
-       int x_offset = ev->output.x - point_down->x;
-       int y_offset = ev->output.y - point_down->y;
-
-       bool skip = TRUE;
-
-       Evas_Object *navi = NULL;
-       Elm_Object_Item *top_item = NULL;
-       Evas_Object *eo_view = NULL;
-       Evas_Object *tabbar = NULL;
-       /*char *tabbar_t = NULL; */
-       if ((navi = elm_object_part_content_get(obj, "elm.swallow.content"))
-               && (top_item = elm_naviframe_top_item_get(navi))) {
-               /*SETTING_TRACE("top_item:%p", top_item); */
-               if ((eo_view = elm_object_item_content_get(top_item))
-                       && (tabbar = elm_object_part_content_get(
-                                       eo_view, "elm.swallow.tabbar"))
-                       && 0 == safeStrCmp(evas_object_type_get(tabbar),
-                                       "elm_toolbar")) {
-                       /*SETTING_TRACE("Skip Case 1"); */
-                       skip = FALSE;
-               }
-
-               if (skip && (tabbar = elm_object_item_part_content_get(
-                               top_item, "tabbar"))
-                       && 0 == safeStrCmp(evas_object_type_get(tabbar),
-                                       "elm_toolbar")) {
-                       /*SETTING_TRACE("Skip case 2"); */
-                       skip = FALSE;
-               }
-       }
-       if (skip)
-               return;
-       /*SETTING_TRACE("tabbar:%p", tabbar); */
-       /*SETTING_TRACE("SWIPE VALUE : x=(%d) : y=(%d)", x_offset, y_offset); */
-       if (-x_offset > MIN_SWIP_DISTANCE_X
-                       && abs(y_offset) < MIN_SWIP_DISTANCE_Y) {
-
-               Elm_Object_Item *cur_item =
-                               elm_toolbar_selected_item_get(tabbar);
-               if (cur_item) {
-                       Elm_Object_Item *dest_item =
-                                       elm_toolbar_item_next_get(cur_item);
-                       elm_toolbar_item_selected_set(dest_item, EINA_TRUE);
-               }
-
-       } else if (x_offset > MIN_SWIP_DISTANCE_X
-                       && abs(y_offset) < MIN_SWIP_DISTANCE_Y) {
-               Elm_Object_Item *cur_item =
-                               elm_toolbar_selected_item_get(tabbar);
-               if (cur_item) {
-                       Elm_Object_Item *dest_item =
-                                       elm_toolbar_item_prev_get(cur_item);
-                       elm_toolbar_item_selected_set(dest_item, EINA_TRUE);
-               }
-
-       }
-
-}
-static void __tabbar_btn_del_cb(
-               void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-       /*SETTING_TRACE_BEGIN; */
-       ret_if(!data);
-       Evas_Point *point_down = data;
-       FREE(point_down);/*delete the date. */
-       evas_object_data_set(obj, "tabbar", NULL);
-}
-
-static void __tabbar_mouse_move_cb(
-               void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-       /*SETTING_TRACE_BEGIN; */
-}
-
-EXPORT_PUBLIC void setting_tabbar_enable_swip_effect(
-               Evas_Object *ly_main, Evas_Object *tabbar)
-{
-       SETTING_TRACE_BEGIN;
-       if (ly_main) {
-               evas_object_data_set(ly_main, "tabbar", tabbar);
-               Evas_Point *point_down = calloc(1, sizeof(Evas_Point));
-               evas_object_event_callback_add(
-                               ly_main,
-                               EVAS_CALLBACK_MOUSE_DOWN,
-                               __tabbar_mouse_down_cb,
-                               point_down);
-               evas_object_event_callback_add(
-                               ly_main,
-                               EVAS_CALLBACK_MOUSE_UP,
-                               __tabbar_mouse_up_cb,
-                               point_down);
-               evas_object_event_callback_add(
-                               ly_main,
-                               EVAS_CALLBACK_MOUSE_MOVE,
-                               __tabbar_mouse_move_cb,
-                               point_down);
-               evas_object_event_callback_add(
-                               ly_main,
-                               EVAS_CALLBACK_DEL,
-                               __tabbar_btn_del_cb,
-                               point_down);
-       }
-}
-
-EXPORT_PUBLIC void setting_tabbar_disable_swip_effect(
-               Evas_Object *ly_main, Evas_Object *tabbar)
-{
-       SETTING_TRACE_BEGIN;
-       if (ly_main) {
-               evas_object_data_set(ly_main, "tabbar", tabbar);
-               /*Evas_Point *point_down = calloc(1,sizeof(Evas_Point)); */
-               evas_object_event_callback_del(
-                               ly_main,
-                               EVAS_CALLBACK_MOUSE_DOWN,
-                               __tabbar_mouse_down_cb);
-               evas_object_event_callback_del(
-                               ly_main,
-                               EVAS_CALLBACK_MOUSE_UP,
-                               __tabbar_mouse_up_cb);
-               evas_object_event_callback_del(
-                               ly_main,
-                               EVAS_CALLBACK_MOUSE_MOVE,
-                               __tabbar_mouse_move_cb);
-               evas_object_event_callback_del(
-                               ly_main,
-                               EVAS_CALLBACK_DEL,
-                               __tabbar_btn_del_cb);
-               /* evas_object_event_callback_del(
-                * Evas_Object *obj,
-                * Evas_Callback_Type type,
-                * Evas_Object_Event_Cb func) */
-       }
-}
-
 EXPORT_PUBLIC void
 setting_decorate_image_RGBA(Evas_Object *obj, int r, int g, int b, int a)
 {
index be361bb3a96681169a824472b9c7656868d1a4fa..64ac16b3b5e1061aebe9e72ff17e8bb33b086f62 100755 (executable)
@@ -133,10 +133,11 @@ static int get_max_inactivity_time_device_lock_handler(int *max_inactivity_time)
 static void _dpm_handle(int radio_num, int max_inactivity_time,
                Setting_GenGroupItem_Data *data)
 {
-       if (max_inactivity_time<=0 || timeout_val_list[radio_num] <= max_inactivity_time)
-               setting_enable_genlist_item(data->item);
+       if (max_inactivity_time <= 0 ||
+               timeout_val_list[radio_num] <= max_inactivity_time)
+               elm_object_item_disabled_set(data->item, EINA_FALSE);
        else
-               setting_disable_genlist_item(data->item);
+               elm_object_item_disabled_set(data->item, EINA_TRUE);
 }
 
 static void setting_display_screen_timeout_popup(void *data)
@@ -398,9 +399,9 @@ static int setting_display_main_create(void *cb)
        if (ad->data_br) {
                if (_get_battery_lvl_less_than_low()) {
                        elm_slider_value_set(ad->data_br->eo_check, 1);
-                       setting_disable_genlist_item(ad->data_br->item);
+                       elm_object_item_disabled_set(ad->data_br->item, EINA_TRUE);
                } else {
-                       setting_enable_genlist_item(ad->data_br->item);
+                       elm_object_item_disabled_set(ad->data_br->item, EINA_FALSE);
                }
        }
 
@@ -445,9 +446,9 @@ static int setting_display_main_update(void *cb)
                                ad->data_br->item, ad->data_br);
                if (_get_battery_lvl_less_than_low()) {
                        elm_slider_value_set(ad->data_br->eo_check, 1);
-                       setting_disable_genlist_item(ad->data_br->item);
+                       elm_object_item_disabled_set(ad->data_br->item, EINA_TRUE);
                } else {
-                       setting_enable_genlist_item(ad->data_br->item);
+                       elm_object_item_disabled_set(ad->data_br->item, EINA_FALSE);
                }
                elm_genlist_item_update(ad->data_br->item);
        }
index d1371c03020a7f8900351451616d66562c548fd9..4e0dcff5c2bf7b7b64a38d3160cb1604f5314f29 100755 (executable)
@@ -80,21 +80,24 @@ static struct _locktype_item locktype_table[] = {
 
 static void _update_menu_items(SettingLocktype *ad)
 {
-        char *get_str = vconf_get_str(VCONFKEY_ODE_CRYPTO_STATE);
-
-        if (!safeStrCmp("encrypted", get_str)) {
-                if (ad->data_locktype_none)
-                        setting_disable_genlist_item(ad->data_locktype_none->item);
-                if (ad->data_locktype_swipe)
-                        setting_disable_genlist_item(ad->data_locktype_swipe->item);
-        } else {
-                if (ad->data_locktype_none)
-                        setting_enable_genlist_item(ad->data_locktype_none->item);
-                if (ad->data_locktype_swipe)
-                        setting_enable_genlist_item(ad->data_locktype_swipe->item);
-        }
-
-        free(get_str);
+       char *get_str = vconf_get_str(VCONFKEY_ODE_CRYPTO_STATE);
+
+       if (!safeStrCmp("encrypted", get_str)) {
+               if (ad->data_locktype_none)
+                       elm_object_item_disabled_set(ad->data_locktype_none->item,
+                                                                               EINA_TRUE);
+               if (ad->data_locktype_swipe)
+                       elm_object_item_disabled_set(ad->data_locktype_swipe->item,
+                                                                               EINA_TRUE);
+       } else {
+               if (ad->data_locktype_none)
+                       elm_object_item_disabled_set(ad->data_locktype_none->item,
+                                                                               EINA_FALSE);
+               if (ad->data_locktype_swipe)
+                       elm_object_item_disabled_set(ad->data_locktype_swipe->item,
+                                                                               EINA_FALSE);
+       }
+       free(get_str);
 }
 
 static void _popup_resp_cb(void *data, Evas_Object *obj, void *event_info)
@@ -546,36 +549,36 @@ void __add_locktype_items(void *data)
 
        if (quality == (int)DPM_PASSWORD_QUALITY_UNSPECIFIED) {
                /* no dim*/
-       } else if (quality & (int)DPM_PASSWORD_QUALITY_SIMPLE_PASSWORD
-                       || quality & (int)DPM_PASSWORD_QUALITY_SOMETHING
-                       || quality & (int)DPM_PASSWORD_QUALITY_NUMERIC) {
+       } else if ((quality & (int)DPM_PASSWORD_QUALITY_SIMPLE_PASSWORD)
+                               || (quality & (int)DPM_PASSWORD_QUALITY_SOMETHING)
+                               || (quality & (int)DPM_PASSWORD_QUALITY_NUMERIC)) {
                /* dim swipe, none */
                if (ad->data_locktype_none)
-                       setting_disable_genlist_item(
-                                       ad->data_locktype_none->item);
+                       elm_object_item_disabled_set(ad->data_locktype_none->item,
+                                                                               EINA_TRUE);
                if (ad->data_locktype_swipe)
-                       setting_disable_genlist_item(
-                                       ad->data_locktype_swipe->item);
+                       elm_object_item_disabled_set(ad->data_locktype_swipe->item,
+                                                                               EINA_TRUE);
                if (minimum_length >= 5)
-                       /* dim simple password */
+               /* dim simple password */
                        if (ad->data_locktype_simple)
-                               setting_disable_genlist_item(
-                                               ad->data_locktype_simple->item);
-       } else if (quality & (int)DPM_PASSWORD_QUALITY_ALPHABETIC
-                       || quality & (int)DPM_PASSWORD_QUALITY_ALPHANUMERIC) {
+                               elm_object_item_disabled_set(ad->data_locktype_simple->item,
+                                                                                       EINA_TRUE);
+
+       } else if ((quality & (int)DPM_PASSWORD_QUALITY_ALPHABETIC)
+                               || (quality & (int)DPM_PASSWORD_QUALITY_ALPHANUMERIC)) {
                /* dim swipe, none, simple password */
                if (ad->data_locktype_none)
-                       setting_disable_genlist_item(
-                                       ad->data_locktype_none->item);
+                       elm_object_item_disabled_set(ad->data_locktype_none->item,
+                                                                               EINA_TRUE);
                if (ad->data_locktype_swipe)
-                       setting_disable_genlist_item(
-                                       ad->data_locktype_swipe->item);
+                       elm_object_item_disabled_set(ad->data_locktype_swipe->item,
+                                                                               EINA_TRUE);
                if (ad->data_locktype_simple)
-                       setting_disable_genlist_item(
-                                       ad->data_locktype_simple->item);
+                       elm_object_item_disabled_set(ad->data_locktype_simple->item,
+                                                                               EINA_TRUE);
        }
 
-       /* End */
        elm_radio_value_set(radio, locktype);
 
        SETTING_TRACE_END;
index e56d5ef2e830a33a6ae416e0d109aad7e837e373..365d562c17858693d803d2a4839e3390027f5484 100755 (executable)
@@ -1277,24 +1277,26 @@ static int _view_create(void *cb)
        SETTING_TRACE("==> s_info.is_editable:%d", s_info.is_editable);
        if (!s_info.is_editable) {
                if (s_info.data_srv_type)
-                       setting_disable_genlist_item(s_info.data_srv_type->item);
+                       elm_object_item_disabled_set(s_info.data_srv_type->item, EINA_TRUE);
                if (s_info.data_profile_name)
-                       setting_disable_genlist_item(
-                                       s_info.data_profile_name->item);
+                       elm_object_item_disabled_set(s_info.data_profile_name->item,
+                                                                               EINA_TRUE);
                if (s_info.data_acs_name)
-                       setting_disable_genlist_item(s_info.data_acs_name->item);
+                       elm_object_item_disabled_set(s_info.data_acs_name->item,
+                                                                       EINA_TRUE);
                if (s_info.data_hm_url)
-                       setting_disable_genlist_item(s_info.data_hm_url->item);
+                       elm_object_item_disabled_set(s_info.data_hm_url->item, EINA_TRUE);
                if (s_info.data_user_name)
-                       setting_disable_genlist_item(s_info.data_user_name->item);
+                       elm_object_item_disabled_set(s_info.data_user_name->item,
+                                                                               EINA_TRUE);
                if (s_info.data_pwd)
-                       setting_disable_genlist_item(s_info.data_pwd->item);
+                       elm_object_item_disabled_set(s_info.data_pwd->item, EINA_TRUE);
                if (s_info.data_pxy_addr)
-                       setting_disable_genlist_item(s_info.data_pxy_addr->item);
+                       elm_object_item_disabled_set(s_info.data_pxy_addr->item, EINA_TRUE);
                if (s_info.data_pxy_port)
-                       setting_disable_genlist_item(s_info.data_pxy_port->item);
+                       elm_object_item_disabled_set(s_info.data_pxy_port->item, EINA_TRUE);
                if (s_info.data_hm_url)
-                       setting_disable_genlist_item(s_info.data_hm_url->item);
+                       elm_object_item_disabled_set(s_info.data_hm_url->item, EINA_TRUE);
        }
 
        ecore_idler_add(__connection_idler, ad);
@@ -1769,11 +1771,11 @@ static void _check_entry_empty(SettingNetwork *ad)
                }
        } while (0);
        Evas_Object *done_btn = elm_object_item_part_content_get(s_info.navi_it,
-                       NAVI_BTN_STYLE_LEFT);
+                       "title_left_btn");
        if (isFoundEmptyEntry) {
                /* it had not yet been disabled */
                if (!evas_object_pass_events_get(done_btn)) {
-                       setting_disable_evas_object(done_btn);
+                       evas_object_pass_events_set(done_btn, EINA_TRUE);
                        setting_dim_evas_object(done_btn, TRUE);
                } else {
                        /* do nothing..if invoke setting_dim_evas_object many
@@ -1784,7 +1786,7 @@ static void _check_entry_empty(SettingNetwork *ad)
                         * doesn't support until now as I now. */
                }
        } else {
-               setting_enable_evas_object(done_btn);
+               evas_object_pass_events_set(done_btn, EINA_FALSE);
                setting_undo_dim_evas_object(done_btn, TRUE);
        }
 }
index 353ea777cc130c5fdd06a6272474ac730af751e1..19b4336950068b61fd8771dc0d9350739544b337 100755 (executable)
@@ -18,7 +18,7 @@
  * limitations under the License.
  *
  */
-#include <setting-network-main.h>
+#include "setting-network-main.h"
 #include <efl_extension.h>
 #include "setting-network-service-providers.h"
 
@@ -191,12 +191,13 @@ static void _activate_state_data_roaming(void *data, bool state)
 
        if (state == true) {
                if (s_info.data_roaming && s_info.data_roaming->item) {
-                       setting_enable_genlist_item(s_info.data_roaming->item);
+                       elm_object_item_disabled_set(s_info.data_roaming->item,
+                                                                               EINA_FALSE);
                        SETTING_TRACE("AFTER enable data roaming");
                }
        } else {
                if (s_info.data_roaming && s_info.data_roaming->item) {
-                       setting_disable_genlist_item(s_info.data_roaming->item);
+                       elm_object_item_disabled_set(s_info.data_roaming->item, EINA_TRUE);
                        SETTING_TRACE("AFTER disable data roaming");
                }
        }
@@ -253,24 +254,20 @@ static void __net_restriction_mode_vconf_change_cb(keynode_t *key, void *data)
        if (!safeStrCmp(vconf_name, VCONFKEY_SETAPPL_NETWORK_RESTRICT_MODE)) {
                if (status) {
                        if (s_info.data_mobile_data)
-                               setting_disable_genlist_item(
-                                               s_info.data_mobile_data->item);
-
+                               elm_object_item_disabled_set(s_info.data_mobile_data->item,
+                                                                                       EINA_TRUE);
                        if (s_info.data_roaming)
-                               setting_disable_genlist_item(
-                                               s_info.data_roaming->item);
+                               elm_object_item_disabled_set(s_info.data_roaming->item,
+                                                                                       EINA_TRUE);
                } else {
                        if (s_info.data_mobile_data)
-                               setting_enable_genlist_item(
-                                               s_info.data_mobile_data->item);
-
+                               elm_object_item_disabled_set(s_info.data_mobile_data->item,
+                                                                                       EINA_FALSE);
                        if (s_info.data_roaming)
-                               setting_enable_genlist_item(
-                                               s_info.data_roaming->item);
+                               elm_object_item_disabled_set(s_info.data_roaming->item,
+                                                                                       EINA_FALSE);
                }
        }
-
-       return;
 }
 
 static Eina_Bool _view_pop_cb(void *data, Elm_Object_Item *it)
index 0ede89011bc646402217833c74f00fbf8c02a847..50071b2fb87685ab7eb0c99565c56e25468f043a 100755 (executable)
@@ -18,7 +18,6 @@ pkg_check_modules(pkgs_profile REQUIRED
        feedback
        notification
        vconf
-       appcore-efl
 )
 
 FOREACH(flag ${pkgs_profile_CFLAGS})
@@ -35,7 +34,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
-ADD_DEFINITIONS("-shared")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
 
@@ -47,8 +45,8 @@ ADD_EXECUTABLE(${PROJECT_SETTING_PROFILE}
 
 TARGET_LINK_LIBRARIES(${PROJECT_SETTING_PROFILE} -L${CMAKE_BINARY_DIR}/${SETTING_COMMON} -lsetting-common)
 TARGET_LINK_LIBRARIES(${PROJECT_SETTING_PROFILE} ${pkgs_profile_LDFLAGS} -pie)
-
 INSTALL(PROGRAMS ${PROJECT_SETTING_PROFILE} DESTINATION ${TZ_SYS_RO_APP}/${SETTING_PKG_NAME}/bin)
+
 # support volume popup
 SET(SETTING_VOLUME_POPUP setting_volume_popup)
 ADD_EXECUTABLE(${SETTING_VOLUME_POPUP}
index 5d9cbeec5a4d4890dc79bb198216daee936d9172..4cfc5a9c7364f8aa65ff45d13a54b8dbba8e82e6 100755 (executable)
@@ -26,7 +26,6 @@
 #include <metadata_extractor.h>
 #include <player.h>
 
-/*resolve P130805-7070 */
 #define SETTING_DEFAULT_FOLDER_PATH    _TZ_SYS_GLOBALUSER_DATA"/settings/"
 #define SDCARD_PATH    _TZ_SYS_MEDIA"/sdcard/"
 #define EXP 0.001
@@ -41,8 +40,7 @@ SliderIcons slider_icons[SND_SLIDER_MAX] = {
        {SND_SLIDER_CALL,       ICON_CALL_MUTE,         ICON_CALL_NORMAL},
        {SND_SLIDER_NOTI,       ICON_NOTI_MUTE,         ICON_NOTI_NORMAL},
        {SND_SLIDER_MEDIA,      ICON_MEDIA_MUTE,        ICON_MEDIA_NORMAL},
-       {SND_SLIDER_SYSTEM,     ICON_SYSTEM_MUTE,       ICON_SYSTEM_NORMAL},
-       /*{SND_SLIDER_MAX,      "",                     ""} */
+       {SND_SLIDER_SYSTEM,     ICON_SYSTEM_MUTE,       ICON_SYSTEM_NORMAL}
 };
 
 static void __mm_player_prepared_cb(void *user_data);
@@ -712,7 +710,7 @@ static void __enable_sound_menu(void *data)
        /*1.Enable "Vibrate when ringing" */
        if (ad->data_sound_when_ring) {
                item_to_update = ad->data_sound_when_ring;
-               setting_genlist_item_disabled_set(item_to_update, EINA_FALSE);
+               elm_object_item_disabled_set(item_to_update->item, EINA_FALSE);
        }
 
        if (ad->data_call_volume) {
@@ -811,7 +809,9 @@ static void __disable_sound_menu(void *data)
 
        /*1.Disable      "Vibrate when ringing" */
        item_to_update = ad->data_sound_when_ring;
-       setting_genlist_item_disabled_set(item_to_update, EINA_TRUE);
+       if (item_to_update)
+               elm_object_item_disabled_set(item_to_update->item, EINA_TRUE);
+
        /* Disable Call Volume slider if Silent ringtone is selected */
        if (ad->data_call_alert_tone && !safeStrCmp(
                        ad->data_call_alert_tone->sub_desc, "Silent")) {
@@ -922,10 +922,10 @@ static void __sound_vconf_change_cb(keynode_t *key, void *data)
 
                setting_sound_update_slider_icon(ad->data_call_volume,
                                SND_SLIDER_CALL);
-               /*FIX P141016-02659 Only In sound mode should enable
-                * "vibrate when ringing" */
-               setting_genlist_item_disabled_set(ad->data_sound_when_ring,
-                               !status);
+
+               if (ad->data_sound_when_ring)
+                       elm_object_item_disabled_set(ad->data_sound_when_ring->item,
+                                                                               !status);
        } else if (!safeStrCmp(vconf_name,
                        VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL)) {
                status = vconf_keynode_get_bool(key);
index 006abb9eaf72703d1c49fdbb87aeda91c26791d1..f34f40acadf248216ba04a3da6680f2bd7b9ebbc 100755 (executable)
@@ -26,8 +26,6 @@
 #include "setting-profile.h"
 #include "setting-common-general-func.h"
 
-#include <appcore-common.h>
-
 #define DO_NOT_DISTURB_OP \
        "http://tizen.org/appcontrol/operation/setting/do_not_disturb"
 #define APP_NOTIFICATIONS_OP \
@@ -39,6 +37,7 @@
 #define SETTING_DEFAULT_NOTI_VOL_INT           11
 #define SETTING_DEFAULT_MEDIA_VOL_INT          9
 #define SETTING_DEFAULT_SYSTEM_VOL_INT         9
+
 #define NOTIFICATION_STR_ON_LOCK_SCREEN \
        "IDS_QP_TMBODY_NOTIFICATIONS_ON_LOCK_SCREEN"
 #define NOTIFICATION_STR_ON_LOCK_SCREEN_HIDE "IDS_ST_OPT_HIDE_CONTENT"
@@ -70,7 +69,7 @@
                item = setting_create_Gendial_field_def( \
                                genlist, \
                                &(item_style), \
-                               __mouse_up_Gendial_list_cb, \
+                               _mouse_up_Gendial_list_cb, \
                                data, \
                                SWALLOW_Type_1ICON_1RADIO, \
                                NULL, \
@@ -78,7 +77,7 @@
                                value, \
                                keystr, \
                                NULL, \
-                               __sound_chk_cb); \
+                               _sound_chk_cb); \
                if (item) { \
                        item->userdata = data; \
                } else { \
@@ -95,7 +94,7 @@
                _item = setting_create_Gendial_field_def( \
                                genlist, \
                                &(item_style), \
-                               __mouse_up_Gendial_list_cb, \
+                               _mouse_up_Gendial_list_cb, \
                                data, \
                                SWALLOW_Type_1ICON_1RADIO, \
                                NULL, \
                                value, \
                                keystr, \
                                NULL, \
-                               __sound_chk_cb); \
+                               _sound_chk_cb); \
                if (_item) { \
                        _item->userdata = data;\
                } else { \
                } \
        }
 
-static int __view_create(void *cb);
-static int __view_destroy(void *cb);
-static Eina_Bool __view_pop_cb(void *data, Elm_Object_Item *it);
-static void __mouse_up_Gendial_list_cb(void *data, Evas_Object *obj,
+static int _view_create(void *cb);
+static int _view_destroy(void *cb);
+static Eina_Bool _view_pop_cb(void *data, Elm_Object_Item *it);
+static void _mouse_up_Gendial_list_cb(void *data, Evas_Object *obj,
                void *event_info);
 
 setting_view setting_view_sound_main = {
-       .create = __view_create,
-       .destroy = __view_destroy,
+       .create = _view_create,
+       .destroy = _view_destroy,
        .update = NULL,
        .cleanup = NULL
 };
@@ -239,7 +238,7 @@ const char *setting_notifiaction_on_lock_screen(void *data)
  *
  ***************************************************/
 
-static Eina_Bool __play_ringtone_sound_idle_cb(void *data)
+static Eina_Bool _play_ringtone_sound_idle_cb(void *data)
 {
        double current;
        char *pa_tone_path = NULL;
@@ -312,7 +311,7 @@ static Eina_Bool __play_ringtone_sound_idle_cb(void *data)
        return EINA_FALSE;
 }
 
-void __start_change_cb(void *data, Evas_Object *obj, void *event_info)
+void _start_change_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
        Setting_GenGroupItem_Data *list_item = NULL;
@@ -330,7 +329,7 @@ void __start_change_cb(void *data, Evas_Object *obj, void *event_info)
        setting_sound_stop_sound(ad);
 }
 
-static void __call_slider_change_cb(
+static void _call_slider_change_cb(
                void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
@@ -380,25 +379,20 @@ static void __call_slider_change_cb(
                setting_sound_update_slider_icon(list_item, SND_SLIDER_CALL);
 
                elm_slider_value_set(obj, list_item->chk_status);
-               SETTING_TRACE_DEBUG("[TIME] change sound mode : %d msec ",
-                               appcore_measure_time());
        }
 
        setting_sound_create_warning_popup_during_call(ad);
        if (ad->calling_popup)
                return;
 
-       if (ad->play_ringtone_idler) {
-               ecore_idler_del(ad->play_ringtone_idler);
-               ad->play_ringtone_idler = NULL;
-       }
+       ecore_idler_del(ad->play_ringtone_idler);
        ad->play_ringtone_idler = ecore_idler_add(
-                       __play_ringtone_sound_idle_cb, list_item);
+                       _play_ringtone_sound_idle_cb, list_item);
 
        SETTING_TRACE("list_item->chk_status:%d", list_item->chk_status);
 }
 
-static void __noti_slider_change_cb(
+static void _noti_slider_change_cb(
                void *data, Evas_Object *obj, void *event_info)
 {
        Setting_GenGroupItem_Data *list_item = (Setting_GenGroupItem_Data *) data;
@@ -471,7 +465,7 @@ static void __noti_slider_change_cb(
 }
 
 
-static void __media_slider_change_cb(
+static void _media_slider_change_cb(
                void *data, Evas_Object *obj, void *event_info)
 {
        char *pa_tone_path = NULL;
@@ -541,7 +535,7 @@ static void __media_slider_change_cb(
        }
 }
 
-static void __sys_slider_change_cb(
+static void _sys_slider_change_cb(
                void *data, Evas_Object *obj, void *event_info)
 {
        /* error check */
@@ -585,7 +579,7 @@ static void __sys_slider_change_cb(
        }
 }
 
-void __stop_change_cb(void *data, Evas_Object *obj, void *event_info)
+void _stop_change_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
        Setting_GenGroupItem_Data *list_item = NULL;
@@ -604,7 +598,7 @@ void __stop_change_cb(void *data, Evas_Object *obj, void *event_info)
        SETTING_TRACE_END;
 }
 
-static void __sound_chk_cb(void *data, Evas_Object *obj,
+static void _sound_chk_cb(void *data, Evas_Object *obj,
                                                   void *event_info)
 {
        SETTING_TRACE_BEGIN;
@@ -619,10 +613,10 @@ static void __sound_chk_cb(void *data, Evas_Object *obj,
        list_item->chk_status = elm_check_state_get(obj);
        /* rollback */
        setting_update_gl_item_chk_status(list_item, !list_item->chk_status);
-       __mouse_up_Gendial_list_cb(ad, NULL, list_item->item);
+       _mouse_up_Gendial_list_cb(ad, NULL, list_item->item);
 }
 
-static void __get_lite_main_list(void *data)
+static void _get_lite_main_list(void *data)
 {
        SETTING_TRACE_BEGIN;
        ret_if(!data);
@@ -733,7 +727,7 @@ static void __get_lite_main_list(void *data)
                        setting_create_Gendial_field_def(
                                        genlist,
                                        &itc_2text_2,
-                                       __mouse_up_Gendial_list_cb,
+                                       _mouse_up_Gendial_list_cb,
                                        ad,
                                        SWALLOW_Type_INVALID,
                                        NULL,
@@ -776,10 +770,10 @@ static void __get_lite_main_list(void *data)
                        mm_value,
                        optional_txt,
                        ad,
-                       __call_slider_change_cb,
+                       _call_slider_change_cb,
                        max_ringtone_vol,
-                       __start_change_cb,
-                       __stop_change_cb);
+                       _start_change_cb,
+                       _stop_change_cb);
        __BACK_POINTER_SET(ad->data_call_volume);
 
        /* Disable Call Volume slider if Silent ringtone is selected */
@@ -814,7 +808,7 @@ static void __get_lite_main_list(void *data)
                        setting_create_Gendial_field_def(
                                        genlist,
                                        &itc_2text_2,
-                                       __mouse_up_Gendial_list_cb,
+                                       _mouse_up_Gendial_list_cb,
                                        ad,
                                        SWALLOW_Type_INVALID,
                                        NULL,
@@ -851,10 +845,10 @@ static void __get_lite_main_list(void *data)
                        mm_value,
                        optional_txt,
                        ad,
-                       __noti_slider_change_cb,
+                       _noti_slider_change_cb,
                        max_noti_vol,
-                       __start_change_cb,
-                       __stop_change_cb);
+                       _start_change_cb,
+                       _stop_change_cb);
        __BACK_POINTER_SET(ad->data_noti_volume);
 
        free(app_id);
@@ -883,10 +877,10 @@ static void __get_lite_main_list(void *data)
                        mm_value,
                        "IDS_ST_BODY_MEDIA",
                        ad,
-                       __media_slider_change_cb,
+                       _media_slider_change_cb,
                        max_media_vol,
-                       __start_change_cb,
-                       __stop_change_cb);
+                       _start_change_cb,
+                       _stop_change_cb);
 
        __BACK_POINTER_SET(ad->data_media_volume);
 
@@ -904,9 +898,9 @@ static void __get_lite_main_list(void *data)
                        ad->data_touch_volume, genlist, ad->itc_layout,
                        left_icon, NULL/*IMG_SLIDER_BTN_SYSTEM_VOLUME*/,
                        mm_value, "IDS_ST_BODY_SYSTEM", ad,
-                       __sys_slider_change_cb,
+                       _sys_slider_change_cb,
                        max_system_vol,
-                       __start_change_cb, __stop_change_cb);
+                       _start_change_cb, _stop_change_cb);
 
        __BACK_POINTER_SET(ad->data_touch_volume);
 
@@ -926,12 +920,13 @@ static void __get_lite_main_list(void *data)
                                vconf_value,
                                ad);
                __BACK_POINTER_SET(ad->data_sound_when_ring);
-               setting_genlist_item_disabled_set(
-                               ad->data_sound_when_ring, !sound_value);
 
+               if (ad->data_sound_when_ring)
+                       elm_object_item_disabled_set(ad->data_sound_when_ring->item,
+                                                                               !sound_value);
                /* 8. Feedback */
                setting_create_Gendial_field_def(genlist, &itc_1text,
-                               __mouse_up_Gendial_list_cb,
+                               _mouse_up_Gendial_list_cb,
                                data, SWALLOW_Type_INVALID, NULL,
                                NULL, 0,
                                "IDS_ST_MBODY_OTHER_SOUNDS", NULL, NULL);
@@ -947,7 +942,7 @@ static void __get_lite_main_list(void *data)
                ad->data_do_not_disturb = setting_create_Gendial_field_def(
                                genlist,
                                &itc_2text_2,
-                               __mouse_up_Gendial_list_cb,
+                               _mouse_up_Gendial_list_cb,
                                data,
                                SWALLOW_Type_INVALID,
                                NULL,
@@ -960,7 +955,7 @@ static void __get_lite_main_list(void *data)
                setting_create_Gendial_field_def(
                                genlist,
                                &itc_2text_2,
-                               __mouse_up_Gendial_list_cb,
+                               _mouse_up_Gendial_list_cb,
                                data,
                                SWALLOW_Type_INVALID,
                                NULL,
@@ -976,7 +971,7 @@ static void __get_lite_main_list(void *data)
                ad->data_notifiaction_on_lock_screen = setting_create_Gendial_field_def(
                                genlist,
                                &itc_2text_2,
-                               __mouse_up_Gendial_list_cb,
+                               _mouse_up_Gendial_list_cb,
                                data,
                                SWALLOW_Type_INVALID,
                                NULL,
@@ -990,12 +985,16 @@ static void __get_lite_main_list(void *data)
 
        }
        if (!sound_value) {
-               setting_genlist_item_disabled_set(ad->data_noti_volume, 1);
-               setting_genlist_item_disabled_set(ad->data_touch_volume, 1);
+               if (ad->data_noti_volume)
+                       elm_object_item_disabled_set(ad->data_noti_volume->item,
+                                                                               EINA_TRUE);
+               if (ad->data_touch_volume)
+                       elm_object_item_disabled_set(ad->data_touch_volume->item,
+                                                                               EINA_TRUE);
        }
 }
 
-static void __click_softkey_back_cb(void *data,
+static void _click_softkey_back_cb(void *data,
                Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
@@ -1004,7 +1003,7 @@ static void __click_softkey_back_cb(void *data,
        elm_naviframe_item_pop(ad->md.naviframe);
 }
 
-static int __view_create(void *cb)
+static int _view_create(void *cb)
 {
        Evas_Object *back_button = NULL;
 
@@ -1020,14 +1019,14 @@ static int __view_create(void *cb)
        /* 1.Grab Hard Key */
        setting_sound_key_grab(ad);
        SETTING_TRACE("viewtype: %s", ad->viewtype);
-       __get_lite_main_list(ad);
+       _get_lite_main_list(ad);
 
        back_button = setting_create_button(ad->md.naviframe,
                        _(NULL), NAVI_BACK_ARROW_BUTTON_STYLE,
-                       __click_softkey_back_cb, ad);
+                       _click_softkey_back_cb, ad);
        elm_layout_content_set(ad->md.naviframe, "prev_btn",
                        back_button);
-       elm_naviframe_item_pop_cb_set(ad->md.naviframe_it, __view_pop_cb, ad);
+       elm_naviframe_item_pop_cb_set(ad->md.naviframe_it, _view_pop_cb, ad);
        elm_object_item_domain_text_translatable_set(
                        ad->md.naviframe_it, SETTING_PACKAGE,
                        EINA_TRUE);
@@ -1038,7 +1037,7 @@ static int __view_create(void *cb)
        return SETTING_RETURN_SUCCESS;
 }
 
-static int __view_destroy(void *cb)
+static int _view_destroy(void *cb)
 {
        /* error check */
        retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
@@ -1063,7 +1062,7 @@ static int __view_destroy(void *cb)
        return SETTING_RETURN_SUCCESS;
 }
 
-static Eina_Bool __view_pop_cb(void *data, Elm_Object_Item *it)
+static Eina_Bool _view_pop_cb(void *data, Elm_Object_Item *it)
 {
        SETTING_TRACE_BEGIN;
        SettingSoundData *ad = data;
@@ -1079,7 +1078,7 @@ static Eina_Bool __view_pop_cb(void *data, Elm_Object_Item *it)
  *
  ***************************************************/
 
-static void __update_slider_item(Setting_GenGroupItem_Data *item_to_update,
+static void _update_slider_item(Setting_GenGroupItem_Data *item_to_update,
                sound_type_e sound_type_to_update, const char *ringtone_file,
                int icon_type)
 {
@@ -1126,7 +1125,7 @@ static void __update_slider_item(Setting_GenGroupItem_Data *item_to_update,
        }
 }
 
-static void __set_ringtone_path(Evas_Object *genlist, char *path, char *vconf,
+static void _set_ringtone_path(Evas_Object *genlist, char *path, char *vconf,
                system_settings_key_e key,
                Setting_GenGroupItem_Data *ringtone_item,
                Setting_GenGroupItem_Data *slider_item,
@@ -1161,13 +1160,13 @@ static void __set_ringtone_path(Evas_Object *genlist, char *path, char *vconf,
        elm_object_item_data_set(ringtone_item->item, ringtone_item);
        elm_genlist_item_update(ringtone_item->item);
        elm_genlist_realized_items_update(genlist);
-       __update_slider_item(slider_item, sound_type, ringtone_file, type);
+       _update_slider_item(slider_item, sound_type, ringtone_file, type);
 
        free(ringtone_file);
        SETTING_TRACE_END;
 }
 
-static void __result_myfile_cb(app_control_h request,
+static void _result_myfile_cb(app_control_h request,
                                        app_control_h reply, app_control_result_e result,
                                        void *priv)
 {
@@ -1189,14 +1188,14 @@ static void __result_myfile_cb(app_control_h request,
 
        if (paths[0] != NULL) {
                if (0 == safeStrCmp(ad->ringtone_type, "IDS_ST_MBODY_RINGTONE")) {
-                       __set_ringtone_path(ad->md.genlist, paths[0],
+                       _set_ringtone_path(ad->md.genlist, paths[0],
                                        VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR,
                                        SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE,
                                        ad->data_call_alert_tone, ad->data_call_volume,
                                        SOUND_TYPE_RINGTONE, SND_SLIDER_CALL);
 
                } else if (0 == safeStrCmp(ad->ringtone_type, "IDS_ST_BODY_NOTIFICATION")) {
-                       __set_ringtone_path(ad->md.genlist, paths[0],
+                       _set_ringtone_path(ad->md.genlist, paths[0],
                                        VCONFKEY_SETAPPL_NOTI_RINGTONE_PATH_STR,
                                        SYSTEM_SETTINGS_KEY_SOUND_NOTIFICATION,
                                        ad->data_msg_alert_tone, ad->data_noti_volume,
@@ -1207,7 +1206,8 @@ static void __result_myfile_cb(app_control_h request,
        free(paths);
 }
 
-static char *__prepare_ringtone_path(char *vconf, system_settings_key_e key, char *default_emul, char *default_arm)
+static char *_prepare_ringtone_path(char *vconf, system_settings_key_e key,
+                                                                       char *default_emul, char *default_arm)
 {
        int ret = 0;
        char *vconf_ringtone = vconf_get_str(vconf);
@@ -1236,8 +1236,7 @@ static char *__prepare_ringtone_path(char *vconf, system_settings_key_e key, cha
        return pa_cur_ringtone;
 }
 
-static void __create_myfile_ug(
-               SettingSoundData *ad, char *titleID)
+static void _create_myfile_ug(SettingSoundData *ad, char *titleID)
 {
        ret_if(ad == NULL);
        const char *selected_files_arr[] = {NULL};
@@ -1247,7 +1246,7 @@ static void __create_myfile_ug(
                return;
 
        if (0 == safeStrCmp(ad->ringtone_type, "IDS_ST_MBODY_RINGTONE")) {
-               pa_cur_ringtone = __prepare_ringtone_path(
+               pa_cur_ringtone = _prepare_ringtone_path(
                                VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR,
                                SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE,
                                SETTING_DEFAULT_CALL_TONE_SDK,
@@ -1256,7 +1255,7 @@ static void __create_myfile_ug(
        }
 
        if (0 == safeStrCmp(ad->ringtone_type, "IDS_ST_BODY_NOTIFICATION")) {
-               pa_cur_ringtone = __prepare_ringtone_path(
+               pa_cur_ringtone = _prepare_ringtone_path(
                                VCONFKEY_SETAPPL_NOTI_RINGTONE_PATH_STR,
                                SYSTEM_SETTINGS_KEY_SOUND_NOTIFICATION,
                                SETTING_DEFAULT_MSG_TONE,
@@ -1277,14 +1276,14 @@ static void __create_myfile_ug(
        app_control_set_app_id(svc, "org.tizen.setting-ringtone");
        app_control_set_launch_mode(svc, APP_CONTROL_LAUNCH_MODE_GROUP);
        if (APP_CONTROL_ERROR_NONE !=
-                       app_control_send_launch_request(svc, __result_myfile_cb, ad))
+                       app_control_send_launch_request(svc, _result_myfile_cb, ad))
                SETTING_TRACE_ERROR("org.tizen.setting-ringtone launch request failed");
 
        app_control_destroy(svc);
        free(pa_cur_ringtone);
 }
 
-static void __back_button_click_cb(void *data, Evas_Object *obj,
+static void _back_button_click_cb(void *data, Evas_Object *obj,
                void *event_info)
 {
        SettingSoundData *ad = data;
@@ -1292,7 +1291,7 @@ static void __back_button_click_cb(void *data, Evas_Object *obj,
        elm_naviframe_item_pop(ad->md.naviframe);
 }
 
-static void __mouse_up_Gendial_list_cb(void *data,
+static void _mouse_up_Gendial_list_cb(void *data,
                Evas_Object *obj,
                void *event_info)
 {
@@ -1323,7 +1322,7 @@ static void __mouse_up_Gendial_list_cb(void *data,
        if (!safeStrCmp("IDS_ST_MBODY_RINGTONE", list_item->keyStr)
                || !safeStrCmp("IDS_ST_BODY_NOTIFICATION", list_item->keyStr)) {
                ad->ringtone_type = list_item->keyStr;
-               __create_myfile_ug(ad, list_item->keyStr);
+               _create_myfile_ug(ad, list_item->keyStr);
                setting_sound_key_ungrab(ad);
        } else if (!safeStrCmp("IDS_ST_MBODY_DO_NOT_DISTURB_ABB",
                        list_item->keyStr)) {
@@ -1441,8 +1440,7 @@ static void __mouse_up_Gendial_list_cb(void *data,
                elm_object_item_domain_text_translatable_set(navi_it,
                                SETTING_PACKAGE, EINA_TRUE);
                back_button = setting_create_button(ad->md.naviframe, _("IDS_ST_BUTTON_BACK"),
-                               NAVI_BACK_ARROW_BUTTON_STYLE, __back_button_click_cb, ad);
+                               NAVI_BACK_ARROW_BUTTON_STYLE, _back_button_click_cb, ad);
                elm_layout_content_set(ad->md.naviframe, "prev_btn", back_button);
        }
 }
-
index c976c8ce501bfadb9ef0ddab9abd776267ade11c..cdcc963cbff91290567b444b7b2959b7c1dedf80 100644 (file)
@@ -29,16 +29,11 @@ static bool _setting_sound_app_create(void *priv)
        SettingSoundData *ad = priv;
        retv_if(!ad, NULL);
 
-       if (app_init(&ad->md, VOLUME_APP_NAME)
-                       != SETTING_RETURN_SUCCESS) {
+       if (app_init(&ad->md, VOLUME_APP_NAME) != SETTING_RETURN_SUCCESS) {
                SETTING_TRACE_ERROR("Cannot initialize application");
                return false;
        }
 
-       elm_theme_extension_add(NULL, EDJDIR"/settings.edj");
-       elm_theme_extension_add(NULL, EDJDIR"/setting-genlist.edj");
-       elm_theme_extension_add(NULL, EDJDIR"/setting-theme.edj");
-
        if (setting_sound_init(ad) == NULL)
                return false;
 
@@ -53,10 +48,8 @@ static void _setting_sound_app_pause(void *priv)
        ret_if(priv == NULL);
        SettingSoundData *sound_data = (SettingSoundData *)priv;
 
-       if (sound_data->calling_popup) {
-               evas_object_del(sound_data->calling_popup);
-               sound_data->calling_popup = NULL;
-       }
+       evas_object_del(sound_data->calling_popup);
+       sound_data->calling_popup = NULL;
 
        /* if click home key, players have to be closed */
        setting_sound_stop_sound(sound_data);
index 5c8e6a424c9073944995499cff70a53e8feb2860..44c56a9cf0583ac6bb73dead58a25643eab36fe3 100755 (executable)
@@ -345,7 +345,7 @@ static inline void storage_SD_info_inserted_not_mounted(SettingStorage *ad)
                vconf_get_int(VCONFKEY_SYSMAN_MMC_MOUNT, &status);
                if (VCONFKEY_SYSMAN_MMC_MOUNT_COMPLETED == status
                                || VCONFKEY_SYSMAN_MMC_MOUNT_ALREADY == status) {
-                       setting_disable_genlist_item(ad->sd_format->item);
+                       elm_object_item_disabled_set(ad->sd_format->item, EINA_TRUE);
                }
        } else {
                SETTING_TRACE_ERROR("ad->sd_format is NULL");
index 1bfe64b0fcd671f7669a1d731036a6b9d9891dc3..35fe8812a6277a3da4a47ceb222aa86613b93b07 100755 (executable)
@@ -193,7 +193,7 @@ static Setting_GenGroupItem_Data *storage_default_items_create(
        memory_card->disableflag = EINA_FALSE;
 
        if (ad->mmc_status != VCONFKEY_SYSMAN_MMC_MOUNTED) {
-               setting_disable_genlist_item(memory_card->item);
+               elm_object_item_disabled_set(memory_card->item, EINA_TRUE);
                memory_card->disableflag = EINA_TRUE;
        }
 
@@ -299,10 +299,10 @@ static int storage_default_create(void *data)
                        STORAGE_STR_SHARED_CONTENTS, NULL);
        elm_genlist_item_select_mode_set(it->item, ELM_OBJECT_SELECT_MODE_NONE);
 
-       it =    setting_create_Gendial_field_def(genlist, &itc_multiline_text,
-                       NULL, NULL, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, 
-                       _("IDS_SM_BODY_SELECT_THE_DEFAULT_STORAGE_LOCATION_FOR_CONTENT_SHARED_VIA_BLUETOOTH_OR_WI_FI_DIRECT"),
-                       NULL, NULL);
+       it = setting_create_Gendial_field_def(genlist, &itc_multiline_text,
+                       NULL, NULL, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0,
+                       _("IDS_SM_BODY_SELECT_THE_DEFAULT_STORAGE_LOCATION_FOR_CONTENT_SHARED_VIA_BLUETOOTH_OR_WI_FI_DIRECT"),
+                       NULL, NULL);
        setting_retvm_if(NULL == it, SETTING_RETURN_FAIL, "item_data is NULL");
        elm_genlist_item_select_mode_set(it->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
        ad->help_bt = it;
@@ -317,10 +317,10 @@ static int storage_default_create(void *data)
                        grp_title, NULL);
        elm_genlist_item_select_mode_set(it->item, ELM_OBJECT_SELECT_MODE_NONE);
 
-       it =    setting_create_Gendial_field_def(genlist, &itc_multiline_text,
-                       NULL, NULL, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, 
-                       _("IDS_SM_BODY_SELECT_THE_DEFAULT_LOCATION_FOR_INSTALLING_APPS_WHERE_APPS_CAN_BE_SAVED_DEPENDS_ON_THE_TYPE_OF_APP_AND_THE_AVAILABILITY_OF_THE_LOCATION"),
-                       NULL, NULL);
+       it = setting_create_Gendial_field_def(genlist, &itc_multiline_text,
+                       NULL, NULL, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0,
+                       _("IDS_SM_BODY_SELECT_THE_DEFAULT_LOCATION_FOR_INSTALLING_APPS_WHERE_APPS_CAN_BE_SAVED_DEPENDS_ON_THE_TYPE_OF_APP_AND_THE_AVAILABILITY_OF_THE_LOCATION"),
+                       NULL, NULL);
        setting_retvm_if(NULL == it, SETTING_RETURN_FAIL, "item_data is NULL");
        elm_genlist_item_select_mode_set(it->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
        ad->help_installapp = it;
@@ -328,7 +328,6 @@ static int storage_default_create(void *data)
        ad->data_installapp = storage_default_items_create(ad, genlist,
                        INT_SLP_SETTING_DEFAULT_MEM_INSTALLAPPLICATIONS);
 
-
        ret = vconf_notify_key_changed(storage_MMC_stat,
                        storage_default_mmc_changed_cb, ad);
        if (ret != 0) {
@@ -336,8 +335,6 @@ static int storage_default_create(void *data)
                                storage_MMC_stat, ret);
        }
 
-
-
        setting_view_storage_default.is_create = 1;
 
        return SETTING_RETURN_SUCCESS;
@@ -365,35 +362,32 @@ static int storage_default_update(void *data)
        SETTING_TRACE_BEGIN;
 
        SettingStorage *ad = data;
+       Evas_Object *btn = NULL;
 
        retv_if(data == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
-       if(ad->default_genlist)
+       if (ad->default_genlist)
                elm_genlist_realized_items_update(ad->default_genlist);
 
-       if(ad->help_bt) {
-               if(ad->help_bt->keyStr)
+       if (ad->help_bt) {
+               if (ad->help_bt->keyStr)
                        G_FREE(ad->help_bt->keyStr);
                ad->help_bt->keyStr = strdup(_("IDS_SM_BODY_SELECT_THE_DEFAULT_STORAGE_LOCATION_FOR_CONTENT_SHARED_VIA_BLUETOOTH_OR_WI_FI_DIRECT"));
                elm_genlist_item_update(ad->help_bt->item);
        }
-       if(ad->help_installapp) {
-               if(ad->help_installapp->keyStr)
+       if (ad->help_installapp) {
+               if (ad->help_installapp->keyStr)
                        G_FREE(ad->help_installapp->keyStr);
                ad->help_installapp->keyStr = strdup(_("IDS_SM_BODY_SELECT_THE_DEFAULT_LOCATION_FOR_INSTALLING_APPS_WHERE_APPS_CAN_BE_SAVED_DEPENDS_ON_THE_TYPE_OF_APP_AND_THE_AVAILABILITY_OF_THE_LOCATION"));
                elm_genlist_item_update(ad->help_installapp->item);
        }
 
-       Elm_Object_Item *it = elm_naviframe_top_item_get (ad->md.naviframe);
-       if(it) {
-               Evas_Object *btn;
+       Elm_Object_Item *it = elm_naviframe_top_item_get(ad->md.naviframe);
+       if (it) {
                btn = elm_object_item_part_content_get(it, "title_left_btn");
-               if(btn)
-                       elm_object_part_text_set(btn, NULL, _("IDS_MSG_ACBUTTON_CANCEL_ABB"));
-
+               elm_object_part_text_set(btn, NULL, _("IDS_MSG_ACBUTTON_CANCEL_ABB"));
                btn = elm_object_item_part_content_get(it, "title_right_btn");
-               if(btn)
-                       elm_object_part_text_set(btn, NULL, _("IDS_MSG_ACBUTTON_DONE_ABB"));
+               elm_object_part_text_set(btn, NULL, _("IDS_MSG_ACBUTTON_DONE_ABB"));
        }
 
        return SETTING_RETURN_SUCCESS;
index c3004badfcb44ede67c125e203afe8d132fb3cfc..09e1a7cbf545ee7dc062b60f6b3c1d82ed0dc437 100755 (executable)
@@ -289,8 +289,8 @@ static void __update_time_via_sim_card(void *data)
        ret = _alarmmgr_set_systime_helper(t_current);
        setting_retm_if(ret == -1, "_alarmmgr_set_systime_helper call failed");
        if (ad->data_time) {
-               setting_enable_evas_object(ad->data_time->btn_left);
-               setting_enable_evas_object(ad->data_time->btn_right);
+               evas_object_pass_events_set(ad->data_time->btn_left, EINA_FALSE);
+               evas_object_pass_events_set(ad->data_time->btn_right, EINA_FALSE);
        }
 
        /* time change - event */
@@ -319,39 +319,32 @@ static void setting_time_main_bool_vconf_change_cb(keynode_t *key, void *data)
 
                        if (!ad->data_auto->chk_status) {
                                if (ad->data_tz) {
-                                       setting_enable_genlist_item(
-                                                       ad->data_tz->item);
+                                       elm_object_item_disabled_set(ad->data_tz->item,
+                                                                                               EINA_FALSE);
                                }
 
                                if (ad->data_time) {
                                        ad->data_time->isItemDisableFlag = FALSE;
-                                       /*setting_ensable_evas_object(
-                                        * ad->data_time->eo_check); */
-                                       setting_enable_evas_object(
-                                                       ad->data_time->btn_left);
-                                       setting_enable_evas_object(
-                                                       ad->data_time->btn_right);
-                                       setting_enable_genlist_item(
-                                                       ad->data_time->item);
+                                       evas_object_pass_events_set(ad->data_time->btn_left,
+                                                                                               EINA_FALSE);
+                                       evas_object_pass_events_set(ad->data_time->btn_right,
+                                                                                               EINA_FALSE);
+                                       elm_object_item_disabled_set(ad->data_time->item,
+                                                                                               EINA_FALSE);
                                }
-
-
                        } else {
                                if (ad->data_tz) {
-                                       setting_disable_genlist_item(
-                                                       ad->data_tz->item);
+                                       elm_object_item_disabled_set(ad->data_tz->item, EINA_TRUE);
                                }
 
                                if (ad->data_time) {
                                        ad->data_time->isItemDisableFlag = FALSE;
-                                       /*setting_disable_evas_object(
-                                        * ad->data_time->eo_check); */
-                                       setting_disable_evas_object(
-                                                       ad->data_time->btn_left);
-                                       setting_disable_evas_object(
-                                                       ad->data_time->btn_right);
-                                       setting_disable_genlist_item(
-                                                       ad->data_time->item);
+                                       evas_object_pass_events_set(ad->data_time->btn_left,
+                                                                                               EINA_TRUE);
+                                       evas_object_pass_events_set(ad->data_time->btn_right,
+                                                                                               EINA_TRUE);
+                                       elm_object_item_disabled_set(ad->data_time->item,
+                                                                                               EINA_TRUE);
                                }
 
                                __update_time_via_sim_card(ad);
@@ -366,53 +359,49 @@ static void __sim_time_info_chg_cb(keynode_t *key, void *data)
        ret_if(NULL == data);
        SettingTimeData *ad = data;
        char *vconf_name = vconf_keynode_get_name(key);
-       /*SETTING_TRACE("vconf_name:%s", vconf_name);*/
+
        if (!safeStrCmp(vconf_name, VCONFKEY_TELEPHONY_NITZ_GMT)
-               || !safeStrCmp(vconf_name, VCONFKEY_TELEPHONY_NITZ_EVENT_GMT)
-               || !safeStrCmp(vconf_name, VCONFKEY_TELEPHONY_NITZ_ZONE)) {
+                       || !safeStrCmp(vconf_name, VCONFKEY_TELEPHONY_NITZ_EVENT_GMT)
+                       || !safeStrCmp(vconf_name, VCONFKEY_TELEPHONY_NITZ_ZONE)) {
                int value = 0;
                int err = 0;
-               setting_get_bool_slp_key(
-                               BOOL_SLP_SETTING_AUTOMATIC_TIME_UPDATE,
-                               &value, &err);
+               setting_get_bool_slp_key(BOOL_SLP_SETTING_AUTOMATIC_TIME_UPDATE,
+                                                               &value, &err);
                if (value) {
                        int ret = 0;
                        int t_nitz = 0;
                        int t_offset = 0;
-                       ret += vconf_get_int(VCONFKEY_TELEPHONY_NITZ_GMT,
-                                       &t_nitz);
+                       ret += vconf_get_int(VCONFKEY_TELEPHONY_NITZ_GMT, &t_nitz);
                        ret += vconf_get_int(VCONFKEY_TELEPHONY_NITZ_EVENT_GMT,
-                                       &t_offset);
-                       char *tzpath = vconf_get_str(
-                                       VCONFKEY_TELEPHONY_NITZ_ZONE);
+                                                               &t_offset);
+                       char *tzpath = vconf_get_str(VCONFKEY_TELEPHONY_NITZ_ZONE);
                        if (ret != 0 || isEmptyStr(tzpath)) {
                                if (ad->data_auto) {
-                                       setting_disable_genlist_item(
-                                                       ad->data_auto->item);
+                                       elm_object_item_disabled_set(ad->data_auto->item,
+                                                                                               EINA_TRUE);
+
                                }
                                if (ad->data_tz) {
-                                       setting_enable_genlist_item(
-                                                       ad->data_tz->item);
+                                       elm_object_item_disabled_set(ad->data_tz->item,
+                                                                                               EINA_FALSE);
                                }
                                if (ad->data_time) {
-                                       setting_enable_genlist_item(
-                                                       ad->data_time->item);
+                                       elm_object_item_disabled_set(ad->data_time->item,
+                                                                                               EINA_FALSE);
                                }
                                return;
                        }
                        FREE(tzpath);
 
                        if (ad->data_auto) {
-                               setting_enable_genlist_item(
-                                               ad->data_auto->item);
+                               elm_object_item_disabled_set(ad->data_auto->item,
+                                                                                       EINA_FALSE);
                        }
                        if (ad->data_tz) {
-                               setting_disable_genlist_item(
-                                               ad->data_tz->item);
+                               elm_object_item_disabled_set(ad->data_tz->item, EINA_TRUE);
                        }
                        if (ad->data_time) {
-                               setting_disable_genlist_item(
-                                               ad->data_time->item);
+                               elm_object_item_disabled_set(ad->data_time->item, EINA_TRUE);
                        }
 
                        __update_time_via_sim_card(ad);
@@ -1010,10 +999,10 @@ static int setting_time_main_create(void *cb)
 
        if (auto_flag) {
                if (ad->data_tz)
-                       setting_disable_genlist_item(ad->data_tz->item);
+                       elm_object_item_disabled_set(ad->data_tz->item, EINA_TRUE);
 
                if (ad->data_time)
-                       setting_disable_genlist_item(ad->data_time->item);
+                       elm_object_item_disabled_set(ad->data_time->item, EINA_TRUE);
        }
 
        evas_object_show(ad->md.genlist);
@@ -1379,14 +1368,15 @@ static void __time_auto_update(void *data)
        setting_set_bool_slp_key(BOOL_SLP_SETTING_AUTOMATIC_TIME_UPDATE,
                        SETTING_ON_OFF_BTN_ON, &err);
        if (ad->data_tz)
-               setting_disable_genlist_item(ad->data_tz->item);
+               elm_object_item_disabled_set(ad->data_tz->item, EINA_TRUE);
 
        if (ad->data_time) {
                ad->data_time->isItemDisableFlag = FALSE;
-               /*setting_disable_evas_object(ad->data_time->eo_check); */
-               setting_disable_evas_object(ad->data_time->btn_left);
-               setting_disable_evas_object(ad->data_time->btn_right);
-               setting_disable_genlist_item(ad->data_time->item);
+               evas_object_pass_events_set(ad->data_time->btn_left,
+                                                                       EINA_TRUE);
+               evas_object_pass_events_set(ad->data_time->btn_right,
+                                                                       EINA_TRUE);
+               elm_object_item_disabled_set(ad->data_time->item, EINA_TRUE);
        }
 
        __update_time_via_sim_card(ad);
@@ -1418,18 +1408,15 @@ static void setting_time_main_chk_btn_cb(void *data, Evas_Object *obj,
                        setting_update_gl_item_chk_status(ad->data_auto, 0);
 
                        if (ad->data_tz)
-                               setting_enable_genlist_item(ad->data_tz->item);
+                               elm_object_item_disabled_set(ad->data_tz->item, EINA_FALSE);
 
                        if (ad->data_time) {
                                ad->data_time->isItemDisableFlag = FALSE;
-                               /*setting_disable_evas_object(
-                                * ad->data_time->eo_check); */
-                               setting_enable_evas_object(
-                                               ad->data_time->btn_left);
-                               setting_enable_evas_object(
-                                               ad->data_time->btn_right);
-                               setting_enable_genlist_item(
-                                               ad->data_time->item);
+                               evas_object_pass_events_set(ad->data_time->btn_left,
+                                                                                       EINA_FALSE);
+                               evas_object_pass_events_set(ad->data_time->btn_right,
+                                                                                       EINA_FALSE);
+                               elm_object_item_disabled_set(ad->data_time->item, EINA_FALSE);
                        }
                } else {
                        __time_auto_update(ad);
@@ -1531,14 +1518,13 @@ static void setting_time_main_mouse_up_Gendial_list_cb(
                         SETTING_ON_OFF_BTN_OFF, &err);
 
                        if (ad->data_tz)
-                               setting_enable_genlist_item(ad->data_tz->item);
+                               elm_object_item_disabled_set(ad->data_tz->item, EINA_FALSE);
 
                        if (ad->data_time) {
                                ad->data_time->isItemDisableFlag = FALSE;
-                               setting_enable_evas_object(
-                                               ad->data_time->eo_check);
-                               setting_enable_genlist_item(
-                                               ad->data_time->item);
+                               evas_object_pass_events_set(ad->data_time->eo_check,
+                                                                                       EINA_FALSE);
+                               elm_object_item_disabled_set(ad->data_time->item, EINA_FALSE);
                        }
 
                } else {
index c2419b0d00a0000e0033f25b6fc3628e9ad654a1..b39b3362a5e376ba8e53a05edc6c8bf6b9f46453 100755 (executable)
@@ -198,7 +198,7 @@ static void setting_main_app_ctl(app_control_h service, void *data)
        /* Disable data_network if flight mode is ON */
        vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &flight_mode);
        if (flight_mode && ad->data_network)
-               setting_disable_genlist_item(ad->data_network->item);
+               elm_object_item_disabled_set(ad->data_network->item, EINA_TRUE);
 }
 
 int main(int argc, char *argv[])