Code clean at setting.c

Change-Id: I2e0605f2d52d6b4667db46811d0f8d5de4334fc6
Signed-off-by: jinwang.an <jinwang.an@samsung.com>

diff --git a/src/setting.c b/src/setting.c
index a585e04bd36b826b0c4ed07ebf0b3f6d974aa9c6..9d808e259e3b37c1917057a6011d0e790e8b6f9a 100644 (file)
--- a/src/setting.c
+++ b/src/setting.c
@@ -32,29 +32,36 @@
 #include "setting.h"
 #include "setting_view_toast.h"
 
+typedef struct _extra_app_data {
+       char *app_id;
+       char *extra_data_name;
+       char *extra_value;
+       char *set_operation;
+       bool launch_group_mode;;
+} extra_app_data;
+
 static struct _main_menu_item setting_menu_its[] = {
-       { SETTING_MAIN_MENU_WATCH_FACE_STYLES,  "WDS_CLOCK_MBODY_WATCH_FACES_AND_STYLES",               "b_settings_list_watchface_style.png",          clock_cb                        },
-       { SETTING_MAIN_MENU_SOUND,                              "IDS_ST_OPT_SOUND_ABB2",                "b_setting_list_sound.png",                     sound_cb                        },
-       { SETTING_MAIN_MENU_DEVICE,                             "IDS_ST_BODY_DEVICE",                   "b_settings_list_device.png",                   device_cb                       },
-       { SETTING_MAIN_MENU_DISPLAY,                    "IDS_ST_MBODY_DISPLAY_ABB",             "b_setting_list_display.png",           display_cb                      },
-       { SETTING_MAIN_MENU_CALL,                               "IDS_ST_BODY_CALL",             "b_setting_list_call.png",              call_cb                 },
-       { SETTING_MAIN_MENU_MESSAGES,                   "IDS_ST_BODY_MESSAGE",          "b_setting_list_message.png",           message_cb                      },
-       { SETTING_MAIN_MENU_CONNECTIONS,                "IDS_ST_BODY_CONNECTIONS",              "b_setting_list_connections.png",               connection_cb   },
-       { SETTING_MAIN_MENU_INPUT,                              "IDS_ST_HEADER_INPUT",                  "b_setting_list_input.png",                     keyboard_cb                     },
-       { SETTING_MAIN_MENU_AUTOFILL,                           "Autofill Service",                     "b_setting_list_input.png",                     autofill_cb                     },
-       { SETTING_MAIN_MENU_ACCESSIBILITY,              "IDS_ST_BODY_ACCESSIBILITY",    "b_setting_list_accessibility.png",             accessiblity_cb},
-       { SETTING_MAIN_MENU_ACCOUNTS,                   "IDS_ST_BODY_ACCOUNTS",                 "b_setting_list_account.png",           account_cb},
+       { SETTING_MAIN_MENU_WATCH_FACE_STYLES,  "WDS_CLOCK_MBODY_WATCH_FACES_AND_STYLES",               "b_settings_list_watchface_style.png",          clock_cb},
+       { SETTING_MAIN_MENU_SOUND,                              "IDS_ST_OPT_SOUND_ABB2",                                                "b_setting_list_sound.png",                                     sound_cb},
+       { SETTING_MAIN_MENU_DEVICE,                             "IDS_ST_BODY_DEVICE",                                                   "b_settings_list_device.png",                           device_cb},
+       { SETTING_MAIN_MENU_DISPLAY,                    "IDS_ST_MBODY_DISPLAY_ABB",                                             "b_setting_list_display.png",                           display_cb},
+       { SETTING_MAIN_MENU_CALL,                               "IDS_ST_BODY_CALL",                                                             "b_setting_list_call.png",                                      call_cb},
+       { SETTING_MAIN_MENU_MESSAGES,                   "IDS_ST_BODY_MESSAGE",                                                  "b_setting_list_message.png",                           message_cb},
+       { SETTING_MAIN_MENU_CONNECTIONS,                "IDS_ST_BODY_CONNECTIONS",                                              "b_setting_list_connections.png",                       connection_cb},
+       { SETTING_MAIN_MENU_INPUT,                              "IDS_ST_HEADER_INPUT",                                                  "b_setting_list_input.png",                                     keyboard_cb},
+       { SETTING_MAIN_MENU_AUTOFILL,                   "Autofill Service",                                                             "b_setting_list_input.png",                                     autofill_cb},
+       { SETTING_MAIN_MENU_ACCESSIBILITY,              "IDS_ST_BODY_ACCESSIBILITY",                                    "b_setting_list_accessibility.png",                     accessiblity_cb},
+       { SETTING_MAIN_MENU_ACCOUNTS,                   "IDS_ST_BODY_ACCOUNTS",                                                 "b_setting_list_account.png",                           account_cb},
 #if FEATURE_SETTING_EMUL
-       { SETTING_MAIN_MENU_DEVELOPER_OPTIONS,  "IDS_ST_BODY_DEVELOPER_OPTIONS",                        "b_settings_list_developer.png",                        developer_cb},
+       { SETTING_MAIN_MENU_DEVELOPER_OPTIONS,  "IDS_ST_BODY_DEVELOPER_OPTIONS",                                "b_settings_list_developer.png",                        developer_cb},
 #endif
-       { SETTING_MAIN_MENU_GEAR_INFO,                  "WDS_ST_MBODY_GEAR_INFO_ABB",   "b_setting_list_gear_info.png",                 gear_info_cb            },
+       { SETTING_MAIN_MENU_GEAR_INFO,                  "WDS_ST_MBODY_GEAR_INFO_ABB",                                   "b_setting_list_gear_info.png",                         gear_info_cb},
        { SETTING_MAIN_MENU_MAX, NULL, NULL, NULL }
 };
 
 static bool running = false;
 static Ecore_Timer *running_timer = NULL;
 static Ecore_Timer *scrl_timer = NULL;
-
 static Evas_Object *_create_bg(Evas_Object *parent);
 static Evas_Object *_create_layout_main(Evas_Object *parent);
 static Evas_Object *_create_naviframe_layout(Evas_Object *parent);
@@ -64,8 +71,6 @@ static Eina_Bool _app_ctrl_timer_cb(void *data);
 static Eina_Bool _scroller_timer_cb(void *data);
 static void _update_main_menu_title(void *data);
 
-static Elm_Object_Item *g_gear_info_item = NULL;
-
 static char *
 _gl_menu_title_text_get(void *data, Evas_Object *obj, const char *part)
 {
@@ -74,13 +79,25 @@ _gl_menu_title_text_get(void *data, Evas_Object *obj, const char *part)
        return strdup(buf);
 }
 
-typedef struct _extra_app_data {
-       char *app_id;
-       char *extra_data_name;
-       char *extra_value;
-       char *set_operation;
-       bool launch_group_mode;;
-} extra_app_data;
+static Eina_Bool _app_ctrl_timer_cb(void *data)
+{
+       DBG("reset flag");
+       running = false;
+       running_timer = NULL;
+       return ECORE_CALLBACK_CANCEL;
+}
+
+static Eina_Bool _scroller_timer_cb(void *data)
+{
+       DBG("hide scroller bar");
+
+       Evas_Object *genlist = data;
+
+       if (genlist)
+               elm_layout_signal_emit(genlist, "do-hide-vbar", "");
+
+       return ECORE_CALLBACK_CANCEL;
+}
 
 static void launch_extra_app(extra_app_data data)
 {
@@ -135,8 +152,6 @@ void clock_cb(void *data, Evas_Object *obj, void *event_info)
        }
        nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, NULL);
        back_button_cb_push(&back_key_generic_cb, data, NULL, ad->main_genlist, "main_genlist");
-//     evas_object_event_callback_add(nf_it , EVAS_CALLBACK_DEL, _clear_clock_cb, ad);
-       /*elm_naviframe_item_pop_cb_set(nf_it, _clear_clock_cb, ad); */
        elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE);
 
        elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
@@ -403,26 +418,6 @@ void developer_cb(void *data, Evas_Object *obj, void *event_info)
        ad->MENU_TYPE = SETTING_DEVELOPER_OPTIONS;
 }
 
-static Eina_Bool _app_ctrl_timer_cb(void *data)
-{
-       DBG("reset flag");
-       running = false;
-       running_timer = NULL;
-       return ECORE_CALLBACK_CANCEL;
-}
-
-static Eina_Bool _scroller_timer_cb(void *data)
-{
-       DBG("hide scroller bar");
-
-       Evas_Object *genlist = data;
-
-       if (genlist)
-               elm_layout_signal_emit(genlist, "do-hide-vbar", "");
-
-       return ECORE_CALLBACK_CANCEL;
-}
-
 void account_cb(void *data, Evas_Object *obj, void *event_info)
 {
        DBG("enter");
@@ -491,8 +486,8 @@ void accessiblity_cb(void *data, Evas_Object *obj, void *event_info)
 static void _quit_cb(void *data, Evas_Object *obj, void *ei)
 {
        /*
-       //To make your application go to background,
-       //Call the elm_win_lower() instead
+       To make your application go to background,
+       Call the elm_win_lower() instead
        Evas_Object *win = (Evas_Object *) data;
        elm_win_lower(win);
        */
@@ -691,7 +686,7 @@ static void _gl_del(void *data, Evas_Object *obj)
        FREE(id);
 }
 
-static Evas_Object *_create_mainlist_winset(Evas_Object *parent, appdata *ad)
+static Evas_Object *_create_main_menu(Evas_Object *parent, appdata *ad)
 {
        Evas_Object *genlist = NULL;
        struct _main_menu_item *menu_its = NULL;
@@ -728,7 +723,6 @@ static Evas_Object *_create_mainlist_winset(Evas_Object *parent, appdata *ad)
        elm_genlist_item_class_free(title_item);
        DBG("Setting - Main menu item count: %d", item_count);
 
-       /*while (menu_its[ idx ].name != NULL) { */
        for (idx = 0; idx < item_count - 1; idx++) {
                Item_Data *id = calloc(sizeof(Item_Data), 1);
                if (id) {
@@ -736,13 +730,11 @@ static Evas_Object *_create_mainlist_winset(Evas_Object *parent, appdata *ad)
                        id->item = elm_genlist_item_append(
                                                   genlist,                     /* genlist object */
                                                   itc,                         /* item class */
-                                                  id,                                  /* data */
+                                                  id,                          /* data */
                                                   NULL,
                                                   ELM_GENLIST_ITEM_NONE,
                                                   menu_its[idx].func,
                                                   ad);
-                       if (menu_its[idx].menu_num == SETTING_MAIN_MENU_GEAR_INFO) /*gear info item backup*/
-                               g_gear_info_item = id->item;
                }
 
        }
@@ -783,7 +775,7 @@ static void _create_view_layout(appdata *ad)
        setting_ret_if(!ad);
        setting_ret_if(!ad->nf);
 
-       genlist = _create_mainlist_winset(ad->win_main, ad);
+       genlist = _create_main_menu(ad->win_main, ad);
        connect_to_wheel_with_genlist(genlist, ad);
 
        ad->main_navi = nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, genlist, "empty");
@@ -813,11 +805,6 @@ static Evas_Object *create_win(const char *name)
 
        return eo;
 }
-int _time_cb(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
-{
-       DBG("_time_cb");
-       return 0;
-}
 
 static void _exit_app(void *data, Evas_Object *obj, void *event_info)
 {
@@ -827,17 +814,11 @@ static void _exit_app(void *data, Evas_Object *obj, void *event_info)
 
 bool app_create(void *data)
 {
-       /*DBG("[TIME] 3. it taked %d msec from main to setting_main_app_create ", appcore_measure_time()); */
-       /*appcore_measure_start(); */
-
        DBG("Setting - app_create");
 
        appdata *ad = (appdata *) data;
-       char *locale;
-
        setting_retv_if(!data, false);
-
-       DBG("app_create start.");
+       char *locale;
 
        feedback_initialize();
        ad->win_main = create_win(PACKAGE);
@@ -868,15 +849,7 @@ bool app_create(void *data)
 
        ad->circle_surface = eext_circle_surface_naviframe_add(ad->nf);
 
-       DBG("app_create finish.");
-
-       DBG("[TIME] 4. setting_main_app_create taked %d msec ", appcore_measure_time());
-       /*appcore_measure_start(); */
-
-       DBG("app_create finish.");
-
        back_button_cb_push(&_exit_app, NULL, NULL, NULL, "EXIT!! NO genlist");
-       /*ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, _hw_back_key_cb, NULL);*/
 
        return true;
 }