Tizen 2.4.0 rev3 SDK Public Release tizen_2.4
authorjk7744.park <jk7744.park@samsung.com>
Wed, 24 Feb 2016 10:07:57 +0000 (19:07 +0900)
committerjk7744.park <jk7744.park@samsung.com>
Wed, 24 Feb 2016 10:07:57 +0000 (19:07 +0900)
41 files changed:
org.tizen.setting.xml
packaging/org.tizen.setting.spec
resource/langlist.xml
resource/setting-theme.edc
setting-applications/src/setting-applications-defaultapp.c
setting-appmgr/src/setting-appmgr-pkginfo-utils.c
setting-appmgr/src/setting-appmgr-pkginfo.c
setting-appmgr/src/setting-appmgr-runinfo.c
setting-appmgr/src/setting-appmgr-utils.c
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/src/setting-cfg.c
setting-common/src/setting-common-draw-genlist.c
setting-common/src/setting-common-draw-naviframe.c
setting-common/src/setting-common-draw-popup.c
setting-common/src/setting-common-general-func.c
setting-display/src/setting-display-main.c
setting-locktype/src/setting-locktype-main.c
setting-moreconnections/CMakeLists.txt
setting-moreconnections/include/setting-moreconnections.h
setting-moreconnections/src/setting-moreconnections-main.c
setting-moreconnections/src/setting-moreconnections.c
setting-network/include/setting-network.h
setting-network/src/setting-network-con-list.c
setting-network/src/setting-network-con.c
setting-network/src/setting-network-connection-create.c
setting-network/src/setting-network-main.c
setting-network/src/setting-network.c
setting-phone/src/setting-phone-display-language.c
setting-phone/src/setting-phone-language-region.c
setting-phone/src/setting-phone-region-format.c
setting-profile/src/setting-profile-common.c
setting-storage/include/setting-storage.h
setting-storage/src/setting-storage-SD.c
setting-storage/src/setting-storage-main.c
setting-storage/src/setting-storage-miscellaneous.c
setting-storage/src/setting-storage-utils.c
setting-storage/src/setting-storage.c
setting-time/src/setting-time-main.c
src/setting.c

index 0a6e66b..48f759b 100755 (executable)
                <icon>volume.png</icon>
                <label>Volume</label>
        </ui-application>
-       <privileges>
-               <privilege>http://tizen.org/privilege/packagemanager.admin</privilege>
-               <privilege>http://tizen.org/privilege/packagemanager.info</privilege>
-               <privilege>http://tizen.org/privilege/packagemanager.clearcache</privilege>
-       </privileges>
 </manifest>
 
index e07659d..888baf2 100755 (executable)
@@ -95,7 +95,6 @@ BuildRequires:  pkgconfig(eventsystem)
 BuildRequires:  pkgconfig(bundle)
 BuildRequires:  pkgconfig(notification)
 BuildRequires:  pkgconfig(callmgr_client)
-BuildRequires: pkgconfig(capi-location-manager)
 BuildRequires:  libcap-devel
 BuildRequires:  cmake
 BuildRequires:  edje-tools
index dc99333..cb6bf46 100644 (file)
@@ -8,7 +8,6 @@
   <language id="el_GR" string="Ελληνικά" lang="Greek" mcc="202"/>
   <language id="de_DE" string="Deutsch" lang="German" mcc="262"/>
   <language id="en_PH" string="English (Philippines)" lang="English(Philippines)" mcc=""/>
-  <language id="en_GB" string="English (United Kingdom)" lang="English(UK)" mcc="234,235"/>
   <language id="en_US" string="English (United States)" lang="English(US)" mcc="310,311,313,316"/>
   <language id="es_ES" string="Español" lang="Spanish" mcc=""/>
   <language id="es_US" string="Español (Estados Unidos)" lang="Spanish(Latin)" mcc="334"/>
index 57542a0..e7e5085 100755 (executable)
@@ -5871,114 +5871,6 @@ collections
        }
 
        group {
-               name: "storage_edge";
-               parts {
-                       part {
-                               name: "color_edge";
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 40 50;
-                                       align: 0.5 0.5;
-                                       //max: 10 10;
-                                       visible: 0;
-                                       rel1 { relative: 0.0 0.0;}
-                                       rel2 { relative: 1.0 1.0;}
-                                       //color: 255 0 0 255;
-                               }
-                               description {
-                                       state: "color_system" 0.0;
-                                       inherit: "default" 0.0;
-                                       color: 153 66 194 255;
-                                       visible: 1;
-                               }
-                               description {
-                                       state: "color_app" 0.0;
-                                       inherit: "default" 0.0;
-                                       color: 255 189 8 255;
-                                       visible: 1;
-                               }
-                               description {
-                                       state: "color_pic" 0.0;
-                                       inherit: "default" 0.0;
-                                       color: 119 222 60 255;
-                                       visible: 1;
-                               }
-                               description {
-                                       state: "color_audio" 0.0;
-                                       inherit: "default" 0.0;
-                                       color: 28 140 252 255;
-                                       visible: 1;
-                               }
-                               description {
-                                       state: "color_misc" 0.0;
-                                       inherit: "default" 0.0;
-                                       color: 52 220 250 255;
-                                       visible: 1;
-                               }
-                               description {
-                                       state: "color_cache" 0.0;
-                                       inherit: "default" 0.0;
-                                       color: 26 49 125 255;
-                                       visible: 1;
-                               }
-                               description {
-                                       state: "color_avail" 0.0;
-                                       inherit: "default" 0.0;
-                                       color: 230 226 218 255;
-                                       visible: 1;
-                               }
-                       }
-               }
-               programs {
-                       program { name: "show_color_system";
-                               signal: "elm,state,show,system";
-                               source: "elm";
-                               action: STATE_SET "color_system" 0.0;
-                               target: "color_edge";
-                       }
-                       program { name: "show_color_app";
-                               signal: "elm,state,show,app";
-                               source: "elm";
-                               action: STATE_SET "color_app" 0.0;
-                               target: "color_edge";
-                       }
-                       program { name: "show_color_pic";
-                               signal: "elm,state,show,pic";
-                               source: "elm";
-                               action: STATE_SET "color_pic" 0.0;
-                               target: "color_edge";
-                       }
-                       program { name: "show_color_audio";
-                               signal: "elm,state,show,audio";
-                               source: "elm";
-                               action: STATE_SET "color_audio" 0.0;
-                               target: "color_edge";
-                       }
-                       program { name: "show_color_misc";
-                               signal: "elm,state,show,misc";
-                               source: "elm";
-                               action: STATE_SET "color_misc" 0.0;
-                               target: "color_edge";
-                       }
-                       program { name: "show_color_cache";
-                               signal: "elm,state,show,cache";
-                               source: "elm";
-                               action: STATE_SET "color_cache" 0.0;
-                               target: "color_edge";
-                       }
-                       program { name: "show_color_avail";
-                               signal: "elm,state,show,avail";
-                               source: "elm";
-                               action: STATE_SET "color_avail" 0.0;
-                               target: "color_edge";
-                       }
-               }
-
-       }
-
-       group {
                name: "storage_elem";
                parts {
                        part {
@@ -5987,12 +5879,11 @@ collections
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       //min: 6 0;
-                                       //max: 6 -1;
+                                       min: 6 0;
+                                       max: 6 -1;
                                        visible: 0;
                                        rel1 { relative: 0.0 0.0;}
                                        rel2 { relative: 1.0 1.0;}
-                                       color: 255 0 0 255;
                                }
                        }
                        part {
@@ -6001,8 +5892,8 @@ collections
                                scale: 1;
                                description {
                                        fixed: 1 1;
-                                       //min: 6 0;
-                                       //max: 6 -1;
+                                       min: 6 0;
+                                       max: 6 -1;
                                        align: 0.5 0;
                                        state: "default" 0.0;
                                        rel1 { relative: 0.5 0.0; to: bg;}
@@ -6011,8 +5902,8 @@ collections
                                }
                                description {
                                        fixed: 1 1;
-                                       //min: 6 0;
-                                       //max: 6 -1;
+                                       min: 6 0;
+                                       max: 6 -1;
                                        align: 0.5 0;
                                        state: "color_2" 0.0;
                                        rel1 { relative: 0.5 0.0; to: bg;}
@@ -6021,8 +5912,8 @@ collections
                                }
                                description {
                                        fixed: 1 1;
-                                       //min: 6 0;
-                                       //max: 6 -1;
+                                       min: 6 0;
+                                       max: 6 -1;
                                        align: 0.5 0;
                                        state: "color_3" 0.0;
                                        rel1 { relative: 0.5 0.0; to: bg;}
@@ -6031,8 +5922,8 @@ collections
                                }
                                description {
                                        fixed: 1 1;
-                                       //min: 6 0;
-                                       //max: 6 -1;
+                                       min: 6 0;
+                                       max: 6 -1;
                                        align: 0.5 0;
                                        state: "color_4" 0.0;
                                        rel1 { relative: 0.5 0.0; to: bg;}
@@ -6041,8 +5932,8 @@ collections
                                }
                                description {
                                        fixed: 1 1;
-                                       //min: 6 0;
-                                       //max: 6 -1;
+                                       min: 6 0;
+                                       max: 6 -1;
                                        align: 0.5 0;
                                        state: "color_5" 0.0;
                                        rel1 { relative: 0.5 0.0; to: bg;}
@@ -6051,8 +5942,8 @@ collections
                                }
                                description {
                                        fixed: 1 1;
-                                       //min: 6 0;
-                                       //max: 6 -1;
+                                       min: 6 0;
+                                       max: 6 -1;
                                        align: 0.5 0;
                                        state: "color_6" 0.0;
                                        rel1 { relative: 0.5 0.0; to: bg;}
@@ -6060,8 +5951,8 @@ collections
                                        color: 26 49 125 255;
                                }
                                description {
-                                       //min: 9 0;
-                                       //max: 9 -1;
+                                       min: 9 0;
+                                       max: 9 -1;
                                        align: 0.5 0;
                                        state: "color_7" 0.0;
                                        rel1 { relative: 0.5 0.0; to: bg;}
index 6aba674..3e0f55a 100644 (file)
@@ -150,7 +150,6 @@ static int setting_applications_defaultapp_create(void *cb)
        retvm_if(genlist == NULL, SETTING_RETURN_FAIL, "Cannot set scroller object as contento of layout");
        /*elm_object_style_set(genlist, "dialogue"); */
        elm_genlist_realization_mode_set(genlist, EINA_TRUE);
-       elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
        elm_genlist_clear(genlist);     /* first to clear list */
 
        setting_push_layout_navi_bar(KeyStr_DefaultApplications,
index 3a56d0b..9d18867 100644 (file)
@@ -28,7 +28,6 @@
 static int appmgrUg_pkg_get_privileges_help(const char *privilege,
                                             void *user_data)
 {
-       SETTING_TRACE_BEGIN;
        int ret;
        gchar *desc;
        appmgr_pkginfo *info;
@@ -54,19 +53,13 @@ static int appmgrUg_pkg_get_privileges_help(const char *privilege,
                return 0;
        }
 
-       //SETTING_TRACE("-------------------------------------------------------------------------");
-       //SETTING_TRACE("NAME: %s", name);
-       //SETTING_TRACE("DESC: %s", help);
-       //SETTING_TRACE("-------------------------------------------------------------------------");
-
        desc = g_strconcat("<font_size=28><B>", name, "</B></font_size><br>",
-                          help, "<br><br>", NULL);
+                          help, "<br>", NULL);
        free(help);
        free(name);
 
-#if 0
        appmgrUg_append_separator(info->gl_prv, ad);
-#endif
+
        setting_create_Gendial_field_titleItem(info->gl_prv, &ad->itc_multiline, desc, NULL);
 
        g_free(desc);
@@ -96,8 +89,6 @@ static Eina_Bool appmgrUg_pkg_privilege_info_softkey_cancel_cb(void *data, Elm_O
 static void appmgrUg_pkg_privilege_info_view(void *data, Evas_Object *obj,
                                              void *event_info)
 {
-       SETTING_TRACE_BEGIN;
-
        char *grp = data;
        SettingAppMgrUG *ad;
        appmgr_pkginfo *info;
index b38bda5..c1699a5 100644 (file)
@@ -56,7 +56,7 @@ static inline void appmgrUg_pkg_append_storage(SettingAppMgrUG *ad)
 
        info = ad->pkginfo;
 
-       //appmgrUg_append_separator(ad->gl_pkg, ad);
+       appmgrUg_append_separator(ad->gl_pkg, ad);
 
        setting_create_Gendial_field_titleItem(ad->gl_pkg, &(ad->itc_grp_title),
                                               MGRAPP_STR_STORAGE, NULL);
@@ -116,7 +116,7 @@ static inline void appmgrUg_pkg_append_cache(SettingAppMgrUG *ad)
 
        info = ad->pkginfo;
 
-       //appmgrUg_append_separator(ad->gl_pkg, ad);
+       appmgrUg_append_separator(ad->gl_pkg, ad);
 
        /* title */
        setting_create_Gendial_field_titleItem(ad->gl_pkg, &(ad->itc_grp_title),
@@ -179,7 +179,7 @@ static inline void appmgrUg_pkg_append_default(SettingAppMgrUG *ad)
                return;
        }
 
-       //info->def_sep = appmgrUg_append_separator(ad->gl_pkg, ad);
+       info->def_sep = appmgrUg_append_separator(ad->gl_pkg, ad);
 
        setting_create_Gendial_field_titleItem(ad->gl_pkg, &(ad->itc_grp_title),
                                               MGRAPP_STR_LAUNCH_BY_DEFAULT, NULL);
@@ -207,7 +207,7 @@ static inline void appmgrUg_pkg_append_website(SettingAppMgrUG *ad)
                return;
        }
 
-       //appmgrUg_append_separator(ad->gl_pkg, ad);
+       appmgrUg_append_separator(ad->gl_pkg, ad);
 
        setting_create_Gendial_field_def(ad->gl_pkg, &ad->itc_1txt,
                                         appmgrUg_pkg_webapp_ug, ad, SWALLOW_Type_INVALID, NULL, NULL, 0,
@@ -219,7 +219,7 @@ static inline void appmgrUg_pkg_append_privilege(SettingAppMgrUG *ad)
        SETTING_TRACE_BEGIN;
        int ret;
        appmgr_pkginfo *info;
-       //Elm_Object_Item *sep_it;
+       Elm_Object_Item *sep_it;
        Setting_GenGroupItem_Data *title_itdata;
 
        ret_if(NULL == ad);
@@ -227,7 +227,7 @@ static inline void appmgrUg_pkg_append_privilege(SettingAppMgrUG *ad)
 
        info = ad->pkginfo;
 
-       //sep_it = appmgrUg_append_separator(ad->gl_pkg, ad);
+       sep_it = appmgrUg_append_separator(ad->gl_pkg, ad);
 
        title_itdata = setting_create_Gendial_field_titleItem(ad->gl_pkg, &(ad->itc_grp_title),
                                                              MGRAPP_STR_PRIVILEGE, NULL);
@@ -240,7 +240,7 @@ static inline void appmgrUg_pkg_append_privilege(SettingAppMgrUG *ad)
 
        if (NULL == info->first_prv) {
                SETTING_TRACE_ERROR("No privilege");
-               //elm_object_item_del(sep_it);
+               elm_object_item_del(sep_it);
                if (title_itdata)
                        elm_object_item_del(title_itdata->item);
                return;
@@ -427,7 +427,7 @@ static void appmgrUg_pkg_append_genlist(SettingAppMgrUG *ad)
        SETTING_TRACE_BEGIN;
        Elm_Object_Item *item;
 
-       //appmgrUg_append_separator(ad->gl_pkg, ad);
+       appmgrUg_append_separator(ad->gl_pkg, ad);
 
        /* Title (pkg name, version S) */
        item = elm_genlist_item_append(ad->gl_pkg, &ad->itc_info_title, ad, NULL,
@@ -453,13 +453,9 @@ static void appmgrUg_pkg_append_genlist(SettingAppMgrUG *ad)
 
        appmgrUg_pkg_append_privilege(ad);
 
-       //appmgrUg_append_separator(ad->gl_pkg, ad);
+       appmgrUg_append_separator(ad->gl_pkg, ad);
 }
 
-
-/**
- * [UI] Naviframe : "Application info"
- */
 static int appmgrUg_pkg_create(void *data)
 {
        SETTING_TRACE_BEGIN;
index df7b3c9..213182a 100644 (file)
@@ -232,14 +232,14 @@ static int appmgrUg_run_create(void *data)
 
        elm_genlist_mode_set(ad->gl_run, ELM_LIST_COMPRESS);
 
-       //appmgrUg_append_separator(ad->gl_run, ad);
+       appmgrUg_append_separator(ad->gl_run, ad);
 
        /* Title (pkg name, process N) */
        item = elm_genlist_item_append(ad->gl_run, &ad->itc_info_title, ad, NULL,
                                       ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
-       //appmgrUg_append_separator(ad->gl_run, ad);
+       appmgrUg_append_separator(ad->gl_run, ad);
 
        /* notice */
        snprintf(msg, sizeof(msg), _(MGRAPP_STR_APP_STOP_MSG), ad->sel_label, ad->sel_label);
@@ -249,7 +249,7 @@ static int appmgrUg_run_create(void *data)
        elm_genlist_item_append(ad->gl_run, &ad->itc_1ic, ad, NULL, ELM_GENLIST_ITEM_NONE,
                                NULL, NULL);
 
-       //appmgrUg_append_separator(ad->gl_run, ad);
+       appmgrUg_append_separator(ad->gl_run, ad);
 
        /* group title(applications) */
        setting_create_Gendial_field_titleItem(ad->gl_run, &ad->itc_grp_title,
@@ -257,7 +257,7 @@ static int appmgrUg_run_create(void *data)
 
        appmgrUg_run_append_run_apps(ad);
 
-       //appmgrUg_append_separator(ad->gl_run, ad);
+       appmgrUg_append_separator(ad->gl_run, ad);
 
        setting_view_appmgr_runinfo.is_create = 1;
 
index 2520ce1..2e1f20b 100644 (file)
@@ -250,6 +250,7 @@ Elm_Object_Item *appmgrUg_append_separator(Evas_Object *genlist,
        item = elm_genlist_item_append(genlist, &ad->itc_sep, NULL, NULL,
                                       ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+
        return item;
 }
 
index 20dbf01..4ce920f 100644 (file)
@@ -242,7 +242,6 @@ typedef enum _SWALLOW_Type {
     SWALLOW_Type_1CHECKICON = 5,
     SWALLOW_Type_1RADIO = 6,
     SWALLOW_Type_1TOGGLE =  7,
-       SWALLOW_Type_1CHECK_RIGHT_INVISIBLE,
     SWALLOW_Type_1ICON_1DOTTOOGLE,
        SWALLOW_Type_1ICON_SMALL_ICON,
 
@@ -343,8 +342,6 @@ typedef struct _Setting_GenGroupItem_Data {
        bool enterKeyPressFlag;                 /**< for about UG, enter or space key are not allowed, if they are pressed, it is true */
        bool spaceKeyPressFlag;                 /**<for about UG,if space key is pressed, need to popup a notification>*/
 
-       bool isItemHideFlag;                                    /**< setting > storage only */
-
        int int_slp_setting_binded;                     /**< its relative vconf value must increase from 0, and step is 1. eg, 0, 1, 2, 3.. */
        bool entry_auto_focus;                  /*for enty, if this is true, then entry will be focus state when the entry is created*/
 
index 185232b..a8b56e4 100755 (executable)
@@ -112,6 +112,8 @@ extern const Elm_Genlist_Item_Class itc_bottom_line;
 #define ADD_GL_HELP(scroller, str) \
        {\
                if (str) {\
+                       Elm_Object_Item *item = elm_genlist_item_append(scroller, &(itc_sep_line), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL);\
+                       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);\
                        Setting_GenGroupItem_Data *item_data = setting_create_Gendial_field_def(scroller, &itc_multiline_text,\
                                                                                                NULL,\
                                                                                                NULL,\
index 4ada458..d48b3c5 100644 (file)
@@ -131,7 +131,6 @@ extern int setting_set_i18n(char *pkgname, char *localedir);
 extern int setting_set_i18n_force(char *pkgname, char *localedir);
 
 extern int app_launcher(const char *pkg_name);
-extern int app_group_launcher(const char *pkg_name);
 extern char *substring(const char *str, size_t begin, size_t len);
 extern bool check_blockingmode_sub_item();
 extern int get_datausage_current_month_info(bool bisroaming, char *szUsed);
index e6f9514..3225ae2 100644 (file)
@@ -198,7 +198,7 @@ static Setting_Cfg_Node_T s_cfg_node_array[] = {
 
        /* Group: System */
        {KeyStr_System, NULL, "move://Tab4.top", Cfg_Item_Pos_Level0, 0, 0, Cfg_Item_Title_Node, NULL, NULL, NULL, uuid_DeviceMange, 0,  NULL},
-       {KeyStr_LanguageInput, IMG_LanguageInput, "setting-phone-efl|viewtype:language", Cfg_Item_Pos_Level0, Cfg_Item_Resetable, 0, Cfg_Item_AppLauncher_Node, NULL, KeyStr_System, NULL, uuid_LanguageKeyboard, 0, "org.tizen.setting.language"},
+       {KeyStr_LanguageInput, IMG_LanguageInput, "setting-phone-efl|viewtype:language", Cfg_Item_Pos_Level0, Cfg_Item_Resetable, 0, Cfg_Item_Ug_Node, NULL, KeyStr_System, NULL, uuid_LanguageKeyboard, 0, "org.tizen.setting.language"},
 #if SUPPORT_STORAGE
        {KeyStr_Storage, IMG_Storage, "setting-storage-efl|caller:setting", Cfg_Item_Pos_Level0, Cfg_Item_unResetable, 0, Cfg_Item_AppLauncher_Node, NULL, KeyStr_System, NULL, uuid_Storage, 0, "setting-storage-efl"},
 #endif
index 6954a1b..db778db 100644 (file)
@@ -528,44 +528,6 @@ static char *_gl_Gendial_text2_get(void *data, Evas_Object *obj,
        return ret_str;
 }
 
-static Evas_Object *__add_check_invisible(Setting_GenGroupItem_Data *item_data, Evas_Object *parent)
-{
-       retv_if(!item_data || !parent, NULL);
-
-       if (item_data->isItemHideFlag) return NULL;
-
-       Evas_Object *content = elm_layout_add(parent);
-       Evas_Object *check = elm_check_add(content);
-
-       /* To fix check button flicker issue when rotate the screen*/
-       if (item_data->isItemDisableFlag)
-               elm_object_disabled_set(check, EINA_FALSE);
-
-       elm_check_state_set(check, item_data->chk_status);
-       evas_object_propagate_events_set(check, 0);
-       evas_object_size_hint_align_set(check, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       evas_object_size_hint_weight_set(check, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
-       evas_object_pass_events_set(check, 1);
-
-       item_data->eo_check = check;
-
-       if (item_data->chk_change_cb) {
-               evas_object_smart_callback_add(check, "changed", item_data->chk_change_cb, item_data);
-       } else {
-               evas_object_smart_callback_add(check, "changed", __chk_changed, item_data);
-       }
-       evas_object_show(check);
-
-       /*"list/B/type.3" */
-       elm_layout_theme_set(content, "layout", "list/B/type.4", "default");
-       elm_layout_content_set(content, "elm.swallow.content", check);
-
-       return content;
-}
-
-
-
 static Evas_Object *__add_check(Setting_GenGroupItem_Data *item_data, Evas_Object *parent)
 {
        retv_if(!item_data || !parent, NULL);
@@ -680,6 +642,9 @@ static Evas_Object *__add_radio_right_propagate_events_set(Setting_GenGroupItem_
        evas_object_propagate_events_set(ly_radio, EINA_FALSE);
        evas_object_propagate_events_set(radio, EINA_FALSE);
 #endif
+       //evas_object_repeat_events_set(radio, EINA_TRUE);
+       //elm_object_style_set(radio, "list");
+
        elm_radio_state_value_set(radio,
                                  item_data->chk_status);
        elm_radio_group_add(radio, item_data->rgd);
@@ -1259,9 +1224,6 @@ static void _datefield_set_min_max(Evas_Object *datetime)
        elm_datetime_value_min_set(datetime, &time1);
 }
 
-/**
- * DATE
- */
 static void _datefield_date_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
@@ -1273,8 +1235,6 @@ static void _datefield_date_btn_clicked_cb(void *data, Evas_Object *obj, void *e
        elm_object_part_text_set(popup, "title,text", _("IDS_ST_BODY_SET_DATE"));
 
        Evas_Object *datetime = elm_datetime_add(param->parent);
-       elm_object_style_set(datetime, "date_layout");
-       elm_datetime_format_set(datetime, "%d/%b/%Y");
 #if 1
        _datefield_set_min_max(datetime);
 #endif
@@ -1292,9 +1252,6 @@ static void _datefield_date_btn_clicked_cb(void *data, Evas_Object *obj, void *e
        /*--------------------------------------- */
 }
 
-/**
- * TIME
- */
 static void _datefield_time_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
@@ -1309,13 +1266,10 @@ static void _datefield_time_btn_clicked_cb(void *data, Evas_Object *obj, void *e
 
        char *pa_time_format = get_pa_time_format_str();
        if (pa_time_format) {
-               if (!strncmp(pa_time_format, "IDS_ST_BODY_12_HOURS", strlen("IDS_ST_BODY_12_HOURS"))) {
-                       elm_object_style_set(datetime, "time_layout");
-                       elm_datetime_format_set(datetime, "%d/%b/%Y %I:%M %p");
-               } else {
-                       elm_object_style_set(datetime, "time_layout_24hr");
-                       elm_datetime_format_set(datetime, "%d/%b/%Y %H:%M");
-               }
+               if (!strncmp(pa_time_format, "IDS_ST_BODY_12_HOURS", strlen("IDS_ST_BODY_12_HOURS")))
+                       elm_datetime_format_set(datetime, "%l:%M %P");
+               else
+                       elm_datetime_format_set(datetime, "%H:%M");
        }
 
        evas_object_size_hint_align_set(datetime, 0.5 , 0.5);
@@ -1614,7 +1568,6 @@ static __Content_Drawer __cd_right[SWALLOW_Type_MAX] = {
        {SWALLOW_Type_1ICON_1DOTTOOGLE, __add_dot_toggle},
        {SWALLOW_TYPE_1RADIO_RIGHT_PROPAGATE_EVENTS_SET, __add_radio_right_propagate_events_set},
        {SWALLOW_Type_1RADIO_RIGHT, __add_radio_right},
-       {SWALLOW_Type_1CHECK_RIGHT_INVISIBLE, __add_check_invisible},
 };
 
 static __Content_Drawer __cd_end[SWALLOW_Type_MAX] = {
@@ -1639,7 +1592,7 @@ static Evas_Object *_gl_Gendial_new_content_get(void *data, Evas_Object *obj,
        __Content_Drawer *cd_list = NULL;
        __drawer_fp fp = NULL;
 
-#if 1
+#if 0
        SETTING_TRACE(" ------------> content get [%s]",part);
 #endif
        if (!safeStrCmp(part, "elm.swallow.icon")) { /* LEFT AREA */
@@ -2039,7 +1992,7 @@ static Setting_GenGroupItem_Data *setting_create_Gendial_field_groupitem(
        }
 
        const char *insert_type = evas_object_data_get(genlist, "InsertType");
-       SETTING_TRACE("insert_type:%s", insert_type);
+       /*SETTING_TRACE("insert_type:%s", insert_type); */
        if (!gl_sel) gl_sel = _gl_Gendial_sel;
        if (0 == safeStrCmp(insert_type, "Insert before")) {
                item_data->item =
index 9649777..5099a4b 100644 (file)
@@ -295,6 +295,7 @@ Elm_Object_Item *setting_create_guild_layout(Evas_Object *navi_bar,
        Evas_Object *scroller = elm_genlist_add(navi_bar);
        retvm_if(scroller == NULL, NULL, "Cannot set scroller object  as contento of layout");
        elm_genlist_realization_mode_set(scroller, EINA_TRUE);
+       elm_object_style_set(scroller, "dialogue");
        elm_genlist_clear(scroller);    /* first to clear list */
        elm_genlist_mode_set(scroller, ELM_LIST_COMPRESS);
        evas_object_smart_callback_add(scroller, "realized", __gl_realized_cb, NULL);
@@ -763,6 +764,7 @@ Evas_Object *setting_create_layout_navi_bar_genlist(Evas_Object *win_layout,
                 "Cannot set scroller object as contento of layout");
        elm_genlist_mode_set(*genlist, ELM_LIST_COMPRESS);
        elm_genlist_realization_mode_set(*genlist, EINA_TRUE);
+       elm_object_style_set(*genlist, "dialogue");
        elm_genlist_clear(*genlist);    /* first to clear list */
        evas_object_smart_callback_add(*genlist, "realized", __gl_realized_cb, NULL);
 
@@ -852,12 +854,9 @@ setting_push_layout_navi_bar_genlist(Evas_Object *win_layout,
                retvm_if(*genlist == NULL, NULL,
                         "Cannot set scroller object  as contento of layout");
                elm_genlist_mode_set(*genlist, ELM_LIST_COMPRESS);
-
-               elm_genlist_homogeneous_set(*genlist, EINA_TRUE);
-
                elm_genlist_realization_mode_set(*genlist, EINA_TRUE);
-               //elm_genlist_block_count_set(*genlist, 2);
                gl = *genlist;
+               elm_object_style_set(*genlist, "dialogue");
                elm_genlist_clear(gl);  /* first to clear list */
                evas_object_smart_callback_add(gl, "realized", __gl_realized_cb, NULL);
        }
index f770926..d58cf4e 100755 (executable)
@@ -438,13 +438,7 @@ Evas_Object *setting_create_popup_with_progressbar(void *data,
                elm_object_part_text_set(layout, "elm.text", _(text));
 
        progressbar = elm_progressbar_add(layout);
-
-       if (!safeStrCmp("default", progressbar_style)) {
-               // do nothing
-       } else {
-               elm_object_style_set(progressbar, progressbar_style);
-       }
-
+       elm_object_style_set(progressbar, progressbar_style);
        evas_object_size_hint_align_set(progressbar, EVAS_HINT_FILL, 0.5);
        evas_object_size_hint_weight_set(progressbar, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        elm_progressbar_pulse(progressbar, EINA_TRUE);
index 2a8fa81..56bead5 100644 (file)
@@ -1899,45 +1899,10 @@ EXPORT_PUBLIC int app_launcher(const char *pkg_name)
                /*get no bundle from ug args */
                app_control_create(&service);
        }
-
-       app_control_set_operation(service, APP_CONTROL_OPERATION_PICK);
        /*service_set_operation(service, SERVICE_OPERATION_DEFAULT); */
-       if (path)
-               app_control_set_app_id(service, path);
-       app_control_set_window(service, elm_win_xwindow_get(ug_get_window()));
-
-       int launch_ret = app_control_send_launch_request(service, NULL, NULL);
-       SETTING_TRACE("after app_service_create - %s : %d ", pkg_name, launch_ret);
-       if (launch_ret == APP_CONTROL_ERROR_NONE) {
-               /* on success */
-               SETTING_TRACE("on success");
-               ret = 0;
-       } else {
-               /* on error */
-               SETTING_TRACE("on error");
-               ret = -1;
-       }
-       app_control_destroy(service);
-       service = NULL;
-
-       FREE(path);
-
-       return ret;
-}
-
-EXPORT_PUBLIC int app_group_launcher(const char *pkg_name)
-{
-       int ret = -1;
-       char *path = NULL;
-       path = get_ug_path_from_ug_args((void *)pkg_name);
-       app_control_h service = get_bundle_from_ug_args((void *)pkg_name);
-       if (!service) {
-               /*get no bundle from ug args */
-               app_control_create(&service);
-       }
+       /*service_set_package(service, pkg_name); */
 
        app_control_set_operation(service, APP_CONTROL_OPERATION_PICK);
-       app_control_set_launch_mode(service, APP_CONTROL_LAUNCH_MODE_GROUP);
        /*service_set_operation(service, SERVICE_OPERATION_DEFAULT); */
        if (path)
                app_control_set_app_id(service, path);
@@ -1962,8 +1927,6 @@ EXPORT_PUBLIC int app_group_launcher(const char *pkg_name)
        return ret;
 }
 
-
-
 EXPORT_PUBLIC char *substring(const char *str, size_t begin, size_t len)
 {
        if (str == 0 || strlen(str) == 0 || strlen(str) < begin || strlen(str) < (begin + len))
index f53b550..2841662 100644 (file)
@@ -761,7 +761,7 @@ setting_display_main_mouse_up_Gendial_list_cb(void *data, Evas_Object *obj,
        if (!safeStrCmp("IDS_ST_BODY_BRIGHTNESS_M_POWER_SAVING", list_item->keyStr)) {
                setting_view_change(&setting_view_display_main,
                                    &setting_view_display_brightness, ad);
-       } else if (!safeStrCmp("IDS_ST_HEADER_AUTO_ROTATE_SCREEN_ABB", list_item->keyStr)) {
+       } else if (!safeStrCmp(KEYSTR_SCREEN_ROTATION, list_item->keyStr)) {
                setting_update_gl_item_chk_status(list_item, !(list_item->chk_status));
                vconf_set_bool(VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, list_item->chk_status);
        } else if (!safeStrCmp(KeyStr_Font, list_item->keyStr)) {
index 1b794c5..cb73ff4 100644 (file)
@@ -343,15 +343,27 @@ void __add_locktype_items(void *data)
 
        if (!isEmulBin()) {
                /* 4) simple password */
-               ad->data_locktype_simple =
-                       setting_create_Gendial_field_def(ad->genlist,
-                                                                                       &(itc_1text_1icon_3),
-                                                                                       setting_locktype_main_mouse_up_Gendial_list_cb, /*add to sel_cb */
-                                                                                       ad,     /* sel data */
-                                                                                       SWALLOW_Type_INVALID,
-                                                                                       NULL, NULL, SETTING_SCREEN_LOCK_TYPE_SIMPLE_PASSWORD,
-                                                                                       "IDS_ST_BODY_SIMPLE_PASSWORD",
-                                                                                       NULL, NULL);
+               if (locktype == SETTING_SCREEN_LOCK_TYPE_SIMPLE_PASSWORD) {
+                       ad->data_locktype_simple =
+                           setting_create_Gendial_field_def(ad->genlist,
+                                                       &(itc_1text_1icon_3),
+                                                       setting_locktype_main_mouse_up_Gendial_list_cb, /*add to sel_cb */
+                                                       ad,     /* sel data */
+                                                       SWALLOW_Type_INVALID,
+                                                       NULL, NULL, SETTING_SCREEN_LOCK_TYPE_SIMPLE_PASSWORD,
+                                                       "IDS_ST_BODY_SIMPLE_PASSWORD",
+                                                       NULL, NULL);
+               } else {
+                       ad->data_locktype_simple =
+                           setting_create_Gendial_field_def(ad->genlist,
+                                                       &(itc_1text_1icon_3),
+                                                       setting_locktype_main_mouse_up_Gendial_list_cb, /*add to sel_cb */
+                                                       ad,     /* sel data */
+                                                       SWALLOW_Type_INVALID,
+                                                       NULL, NULL, SETTING_SCREEN_LOCK_TYPE_SIMPLE_PASSWORD,
+                                                       "IDS_ST_BODY_SIMPLE_PASSWORD",
+                                                       NULL, NULL);
+               }
                if (ad->data_locktype_simple) {
                        ad->data_locktype_simple->userdata = ad;
                } else {
@@ -359,15 +371,28 @@ void __add_locktype_items(void *data)
                }
 
                /* 5) password */
-               ad->data_locktype_password = 
-                       setting_create_Gendial_field_def(ad->genlist,
-                                                                                       &(itc_1text_1icon_3),
-                                                                                       setting_locktype_main_mouse_up_Gendial_list_cb, /*add to sel_cb */
-                                                                                       ad,     /* sel data */
-                                                                                       SWALLOW_Type_INVALID,
-                                                                                       NULL, NULL, SETTING_SCREEN_LOCK_TYPE_PASSWORD,
-                                                                                       "IDS_ST_BODY_PASSWORD",
-                                                                                       NULL, NULL);
+               if (locktype == SETTING_SCREEN_LOCK_TYPE_PASSWORD) {
+                       ad->data_locktype_password =
+                           setting_create_Gendial_field_def(ad->genlist,
+                                                       &(itc_1text_1icon_3),
+                                                       setting_locktype_main_mouse_up_Gendial_list_cb, /*add to sel_cb */
+                                                       ad,     /* sel data */
+                                                       SWALLOW_Type_INVALID,
+                                                       NULL, NULL, SETTING_SCREEN_LOCK_TYPE_PASSWORD,
+                                                       "IDS_ST_BODY_PASSWORD",
+                                                       NULL, NULL);
+               } else {
+                       ad->data_locktype_password =
+
+                           setting_create_Gendial_field_def(ad->genlist,
+                                                       &(itc_1text_1icon_3),
+                                                       setting_locktype_main_mouse_up_Gendial_list_cb, /*add to sel_cb */
+                                                       ad,     /* sel data */
+                                                       SWALLOW_Type_INVALID,
+                                                       NULL, NULL, SETTING_SCREEN_LOCK_TYPE_PASSWORD,
+                                                       "IDS_ST_BODY_PASSWORD",
+                                                       NULL, NULL);
+               }
                if (ad->data_locktype_password) {
                        ad->data_locktype_password->userdata = ad;
                } else {
@@ -552,13 +577,12 @@ setting_locktype_main_mouse_up_Gendial_list_cb(void *data, Evas_Object *obj,
 
        ad->selected_lock_type = list_item->keyStr;
 
-#if 0
        /* If lock_type is same with old_lock_type, return. */
        if (lock_type == old_type) {
                SETTING_TRACE_DEBUG("[Screen Lock Type] Selected same type");
                return;
        }
-#endif
+
        int index = -1;
        char *pkg_name = NULL;
 
@@ -600,30 +624,20 @@ setting_locktype_main_mouse_up_Gendial_list_cb(void *data, Evas_Object *obj,
                        break;
 #endif
                case SETTING_SCREEN_LOCK_TYPE_SIMPLE_PASSWORD:
-                       if(SETTING_SCREEN_LOCK_TYPE_SIMPLE_PASSWORD == old_type){
-                               __change_simple_password_cb(list_item,NULL,NULL);
-                       } else {
-                               ad->pw_type = SETTING_LOCKTYPE_PW_SIMPLE_PASSWD;
-                               if(old_type != SETTING_SCREEN_LOCK_TYPE_PASSWORD)
-                               {
-                                       FREE(ad->input_pwd);
-                                       ad->input_pwd = (char*)strdup("0000");
-                               }
-                               setting_locktype_create_password_sg(ad);
+                       ad->pw_type = SETTING_LOCKTYPE_PW_SIMPLE_PASSWD;
+                       if (old_type != SETTING_SCREEN_LOCK_TYPE_PASSWORD) {
+                               FREE(ad->input_pwd);
+                               ad->input_pwd = (char *)strdup("0000");
                        }
+                       setting_locktype_create_password_sg(ad);
                        break;
                case SETTING_SCREEN_LOCK_TYPE_PASSWORD:
-                       if(SETTING_SCREEN_LOCK_TYPE_PASSWORD == old_type){
-                               __change_password_cb(list_item,NULL,NULL);
-                       }else{
-                               ad->pw_type = SETTING_LOCKTYPE_PW_PASSWORD;
-                               if(old_type != SETTING_SCREEN_LOCK_TYPE_SIMPLE_PASSWORD)
-                               {
-                                       FREE(ad->input_pwd);
-                                       ad->input_pwd = (char*)strdup("0000");
-                               }
-                               setting_locktype_create_password_sg(ad);
+                       ad->pw_type = SETTING_LOCKTYPE_PW_PASSWORD;
+                       if (old_type != SETTING_SCREEN_LOCK_TYPE_SIMPLE_PASSWORD) {
+                               FREE(ad->input_pwd);
+                               ad->input_pwd = (char *)strdup("0000");
                        }
+                       setting_locktype_create_password_sg(ad);
                        break;
                case SETTING_SCREEN_LOCK_TYPE_OTHER:
                        if (old_type == SETTING_SCREEN_LOCK_TYPE_PASSWORD
index 556e251..e25e759 100644 (file)
@@ -2,7 +2,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs_moreconnections REQUIRED
+pkg_check_modules(pkgs REQUIRED
                elementary
                ecore
                ecore-x
@@ -16,10 +16,9 @@ pkg_check_modules(pkgs_moreconnections REQUIRED
                capi-system-device
                deviced
                efl-extension
-           capi-location-manager
                json-glib-1.0)
 
-FOREACH(flag ${pkgs_moreconnections_CFLAGS})
+FOREACH(flag ${pkgs_display_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
@@ -42,6 +41,6 @@ ADD_LIBRARY(${SETTING_MORECONNECTIONS_UG} SHARED
        )
 
 TARGET_LINK_LIBRARIES(${SETTING_MORECONNECTIONS_UG} -L${CMAKE_BINARY_DIR}/${SETTING_COMMON} -lsetting-common)
-TARGET_LINK_LIBRARIES(${SETTING_MORECONNECTIONS_UG} ${pkgs_moreconnections_LDFLAGS})
+TARGET_LINK_LIBRARIES(${SETTING_MORECONNECTIONS_UG} ${pkgs_display_LDFLAGS})
 
 INSTALL(TARGETS ${SETTING_MORECONNECTIONS_UG} DESTINATION ${PREFIX}/lib/ug)
index 9f516f4..0b3b99b 100644 (file)
@@ -29,7 +29,6 @@
 #include <setting-common-view.h>
 #include <setting-common-data-type.h>
 #include <setting-cfg.h>
-#include <locations.h>
 
 #define KeyStr_On                              "IDS_ST_BODY_ON"
 #define KeyStr_Off                             "IDS_ST_BODY_ALERTTYPE_OFF"
index e44b372..92704b0 100644 (file)
@@ -74,48 +74,21 @@ static void setting_moreconnections_main_mouse_up_Gendial_list_cb(void *data,
        }
 }
 
-/**
- * @brief aboutUG vconf changed callback
- *
- * @param key the changed vconf key node.
- * @param data application data
- * @param event_info event type
- */
-static void __setting_moreconnections_main_vconf_changed_cb(keynode_t *key, void *data)
-{
-       SETTING_TRACE_BEGIN;
-       setting_retm_if(NULL == key, "key is NULL");
-       setting_retm_if(NULL == data, "data is NULL");
-       SettingMoreConnectionsUG *ad = (SettingMoreConnectionsUG *) data;
-
-       int status = vconf_keynode_get_int(key);
-       char *vconf_name = vconf_keynode_get_name(key);
-
-       if (!safeStrCmp(vconf_name, VCONFKEY_LOCATION_USE_MY_LOCATION)) {
-               SETTING_TRACE("status: %d", status);
-               char *sub_desc = setting_location_is_enable(data);
-               ad->location_service->sub_desc = (char *)strdup(sub_desc);
-               elm_object_item_data_set(ad->location_service->item, ad->location_service);
-               elm_genlist_item_update(ad->location_service->item);
-       } else {
-               SETTING_TRACE_ERROR("vconf_name is error");
-       }
-}
-
 char *setting_location_is_enable(void *data)
 {
-       SETTING_TRACE_BEGIN;
+       int is_enable;
 
-       bool is_enabled = FALSE;
-       int ret = location_manager_is_enabled_method(LOCATIONS_METHOD_HYBRID, &is_enabled);
-       SETTING_TRACE("hybrid: %d, ", is_enabled);
+       if (0 != vconf_get_int(VCONFKEY_LOCATION_USE_MY_LOCATION, &is_enable))
+               SETTING_TRACE_ERROR("Fail to get vconf");
 
-       if (true == is_enabled)
+       if (1 == is_enable)
                return KeyStr_On;
-       else if (false == is_enabled)
+       else if (0 == is_enable)
                return KeyStr_Off;
        else
-               return SETTING_VCONF_ERR_RETURN_STR_NULL;
+               setting_retvm_if(data == NULL, SETTING_VCONF_ERR_RETURN_STR_NULL, "vconf error");
+
+       return SETTING_VCONF_ERR_RETURN_INVALID_INT;
 }
 
 /**************************************************
@@ -134,7 +107,6 @@ int setting_moreconnections_main_generate_genlist(void *data)
        Setting_GenGroupItem_Data *item_data = NULL;
 
        char *sub_desc = setting_location_is_enable(data);
-
        ad->location_service = setting_create_Gendial_field_def(scroller, &(ad->itc_2text_2),
                                                                setting_moreconnections_main_mouse_up_Gendial_list_cb,
                                                                ad, SWALLOW_Type_INVALID,
@@ -160,7 +132,6 @@ int setting_moreconnections_main_generate_genlist(void *data)
                SETTING_TRACE_ERROR("ad->VPN is NULL");
        }
 #endif
-
        SETTING_TRACE_END;
        return SETTING_RETURN_SUCCESS;
 }
@@ -196,14 +167,6 @@ static int setting_moreconnections_main_create(void *cb)
        ad->genlist = scroller;
 
        setting_moreconnections_main_generate_genlist((void *)ad);
-
-       int ret = vconf_notify_key_changed(VCONFKEY_LOCATION_USE_MY_LOCATION, __setting_moreconnections_main_vconf_changed_cb, ad);
-       if (ret != 0) {
-               SETTING_TRACE_ERROR(" >>>>>>>>>>>>>> call vconf_notify_key_changed failed");
-       } else {
-               SETTING_TRACE_ERROR(" >>>>>>>>>>>>>> call vconf_notify_key_changed succeeded");
-       }
-
        setting_view_moreconnections_main.is_create = 1;
        SETTING_TRACE_END;
        return SETTING_RETURN_SUCCESS;
@@ -217,22 +180,13 @@ static int setting_moreconnections_main_destroy(void *cb)
        retv_if(!(setting_view_moreconnections_main.is_create), SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
        SettingMoreConnectionsUG *ad = (SettingMoreConnectionsUG *) cb;
-
-       int ret = vconf_ignore_key_changed(VCONFKEY_LOCATION_USE_MY_LOCATION, __setting_moreconnections_main_vconf_changed_cb);
-       if (ret != 0) {
-               SETTING_TRACE_ERROR(" >>>>>>>>>>>>>> call vconf_ignore_key_changed failed");
-       } else {
-               SETTING_TRACE_ERROR(" >>>>>>>>>>>>>> call vconf_ignore_key_changed succeeded");
-       }
+       setting_view_moreconnections_main.is_create = 0;
 
        if (ad->ly_main != NULL) {
                evas_object_del(ad->ly_main);
                ad->ly_main = NULL;
        }
 
-
-       setting_view_moreconnections_main.is_create = 0;
-
        SETTING_TRACE_END;
        return SETTING_RETURN_SUCCESS;
 }
index 1c19f4b..1b26519 100644 (file)
@@ -94,12 +94,6 @@ static void setting_moreconnections_ug_on_destroy(ui_gadget_h ug, app_control_h
                                                   void *priv)
 {
        SETTING_TRACE_BEGIN;
-       SettingMoreConnectionsUG *moreconnectionsUG = priv;
-
-
-       /*  called when this shared gadget is terminated. similar with app_exit */
-    setting_view_destroy(&setting_view_moreconnections_main, moreconnectionsUG);
-
        SETTING_TRACE_END;
 }
 
index abd8c03..18f50b7 100644 (file)
@@ -192,7 +192,6 @@ struct _SettingNetworkUG {
        Evas_Object *popup;
        Evas_Object *popup_chk;
 
-       Evas_Object *popup_auth_type;
        Evas_Object *popup_data_on;
        Evas_Object *popup_data_off;
 
@@ -202,9 +201,6 @@ struct _SettingNetworkUG {
        Elm_Object_Item *navi_it_profile_del_list;
        Evas_Object *bottom_btn;
 
-       /*connection-create */
-       Evas_Object *con_create_gl;  /* connection create */
-
        /*Evas_Object *conformant; */
        Evas_Object *back_btn;
        Evas_Object *l_button;
index 2474714..f16f843 100644 (file)
@@ -153,13 +153,13 @@ static int __con_list_recreate(void *cb)
                                             ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_select_mode_set(first_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
-       Evas_Object *radio_group;
+       Evas_Object *radio;
        Setting_GenGroupItem_Data *item_data = NULL;
 
-       radio_group = elm_radio_add(scroller);
-       elm_radio_state_value_set(radio_group, -1);
-       ad->rdg = radio_group;
-       //setting_disable_evas_object(radio_group);
+       radio = elm_radio_add(scroller);
+       elm_radio_state_value_set(radio, -1);
+       ad->rdg = radio;
+       setting_disable_evas_object(radio);
 
        int srvType = ad->profile_service_type;
 
@@ -205,7 +205,7 @@ static int __con_list_recreate(void *cb)
                item_data->chk_status = idx;
                item_data->chk_change_cb = setting_network_con_list_chk_changed;
                item_data->stop_change_cb = setting_network_con_list_go_button_cb;
-               item_data->rgd = radio_group;
+               item_data->rgd = radio;
                item_data->userdata = ad;
                item_data->sub_desc = (char *)g_strdup(apn);
                item_data->keyStr2 = (char *)g_strdup(id);
@@ -219,20 +219,12 @@ static int __con_list_recreate(void *cb)
                                            ELM_GENLIST_ITEM_NONE,
                                            setting_network_con_list_item_Gendial_mouse_up_cb, ad);
 
-               SETTING_TRACE_ERROR(">>>> chk_status : <%d>, state_value_get for %s ---> (%d) value_get[%d], ptr : %x, org(%x)",
-                                               item_data->chk_status, 
-                                               item_data->keyStr, 
-                                               elm_radio_state_value_get(item_data->eo_check), 
-                                               elm_radio_value_get(item_data->eo_check),
-                                               item_data->chk_change_cb,
-                                               (void*)setting_network_con_list_chk_changed);
-
                SETTING_TRACE("profile_h:%p, apn:%s, id:%s", profile_h, apn, id);
                if (!safeStrCmp(def_apn, apn) && !safeStrCmp(def_name, name) && !safeStrCmp(def_id, id)) {
                        SETTING_TRACE("Matched [idx:%d, apn:%s, id:%s]!", idx, apn, id);
                        if (srvType == CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET) {
                                ad->selected_profile = item_data; /*the selected item */
-                               elm_radio_value_set(radio_group, idx);
+                               elm_radio_value_set(radio, idx);
                                if (ad->internet_conn) {
                                        G_FREE(ad->internet_conn->sub_desc);
                                        FREE(ad->apn_internet);
@@ -265,7 +257,7 @@ static int __con_list_recreate(void *cb)
                elm_object_item_disabled_set(elm_toolbar_last_item_get(toolbar), EINA_TRUE);
        }
        if (srvType == CONNECTION_CELLULAR_SERVICE_TYPE_MMS) {
-               if (idx > 0) elm_radio_value_set(radio_group, 0);/*the first one */
+               if (idx > 0) elm_radio_value_set(radio, 0);/*the first one */
                if (ad->selected_profile && !isEmptyStr(ad->selected_profile->keyStr) && ad->mms_conn) {
                        SETTING_TRACE("ad->selected_profile->keyStr:%s", ad->selected_profile->keyStr);
                        G_FREE(ad->mms_conn->sub_desc);
@@ -518,6 +510,7 @@ void __set_default_profile(void *data)
 
                        if (CONNECTION_CELLULAR_SERVICE_TYPE_MMS == srvType) {
                                setting_create_popup(ad, ad->win_get, NULL, _("IDS_MSGF_POP_UNSUPPORTED"), NULL, 0, false, false, 0);
+                               /*elm_radio_value_set(list_item->eo_check, old_type); */
                                if (ad->selected_profile)
                                        elm_radio_value_set(list_item->eo_check, ad->selected_profile->chk_status);
                                break;
@@ -570,6 +563,18 @@ static void setting_network_con_list_item_Gendial_mouse_up_cb(void *data, Evas_O
        FREE(ad->access_name);
        ad->access_name = strdup(list_item->keyStr2);
        setting_view_change(&setting_view_network_con_list, &setting_view_network_connection_create, ad);
+
+       #if 0
+       SETTING_TRACE("clicking item[%s]", _(list_item->keyStr));
+       if (list_item->chk_status == elm_radio_value_get(list_item->eo_check)) {
+               SettingNetworkUG *ad = data;
+               elm_genlist_realized_items_update(ad->con_list_gl);
+               return;
+       }
+
+       elm_radio_value_set(list_item->eo_check, list_item->chk_status);
+       __set_default_profile(list_item);
+       #endif
 }
 void setting_network_con_list_chk_changed(void *data, Evas_Object *obj, void *event_info)
 {
index d0e5054..330c9d7 100644 (file)
@@ -493,7 +493,7 @@ setting_network_con_reset_popup_cb(void *data, Evas_Object *obj, void *event_inf
 
                // waiting popup should be here
                ad->popup_conreset_complete = setting_create_popup_with_progressbar(ad, ad->win_get,
-                               PROGRESSBAR_STYLE, NULL, IDS_ST_SK2_PLEASE_WAIT, NULL, 0, TRUE, TRUE, 0);
+                               PROGRESSBAR_STYLE, NULL, IDS_ST_SK2_PLEASE_WAIT, NULL, 3, TRUE, TRUE, 0);
 
                if (ad->connection) {
                        ret = connection_reset_profile(ad->connection, CONNECTION_RESET_DEFAULT_PROFILE,
index 6a63e06..d32dd74 100644 (file)
@@ -123,43 +123,30 @@ void __sub_list_sel_cb(void *data, Evas_Object *obj, void *event_info)
        Elm_Object_Item *subitem = (Elm_Object_Item *) event_info;
        Elm_Object_Item *parentItem = elm_genlist_item_parent_get(subitem);
        elm_genlist_item_selected_set(subitem, 0);
-
-       Setting_GenGroupItem_Data *data_subItem = elm_object_item_data_get(subitem);
-       Setting_GenGroupItem_Data *data_parentItem = (Setting_GenGroupItem_Data *)data;
+       Setting_GenGroupItem_Data *data_subItem =
+           elm_object_item_data_get(subitem);
+       Setting_GenGroupItem_Data *data_parentItem = elm_object_item_data_get(parentItem);      /* parent data */
        ret_if(NULL == data_subItem || NULL == data_parentItem);
 
-       SettingNetworkUG *ad = data_parentItem->userdata;
-       ret_if(NULL == ad);
-
-       int chk_status = data_subItem->chk_status;
-       elm_radio_value_set(data_subItem->rgd, chk_status);
+       elm_radio_value_set(data_subItem->rgd, data_subItem->chk_status);
 
        data_parentItem->sub_desc = (char *)g_strdup(_(data_subItem->keyStr));
        elm_object_item_data_set(data_parentItem->item, data_parentItem);
-//     elm_genlist_item_fields_update(data_parentItem->item, "*", ELM_GENLIST_ITEM_FIELD_TEXT);
+       /*elm_genlist_item_update(data_parentItem->item); */
+       elm_genlist_item_fields_update(data_parentItem->item, "*", ELM_GENLIST_ITEM_FIELD_TEXT);
 
-       if (data_parentItem == ad->data_auth_type)
-       {
-               elm_genlist_item_expanded_set( ad->data_auth_type->item, FALSE );
-               elm_genlist_item_update( ad->data_auth_type->item );
-
-               setting_network_connection_display_auth_type(ad, chk_status);
+       SettingNetworkUG *ad = data_parentItem->userdata;
+       if (data_parentItem == ad->data_auth_type) {
+               elm_genlist_item_expanded_set(ad->data_auth_type->item, FALSE);
+               elm_genlist_item_update(ad->data_auth_type->item);
 
-               //remove network mode popup
-               if (ad->popup_auth_type) {
-                       evas_object_del(ad->popup_auth_type);
-                       ad->popup_auth_type = NULL;
-               }
-       }
-       else if (data_parentItem == ad->data_srv_type)
-       {
+               setting_network_connection_display_auth_type(data, data_subItem->chk_status);
+       } else if (data_parentItem == ad->data_srv_type) {
                if (ad->srvType != data_subItem->chk_status)
                        ad->srvType = data_subItem->chk_status;
-               if( ad->srvType != CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET)
-               {
-                       if (!ad->data_hm_url)
-                       {
-                               //need home url
+               if (ad->srvType != CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET) {
+                       if (!ad->data_hm_url) {
+                               /*need home url */
                                ad->data_hm_url =
                                    setting_create_Gendial_field_def(obj,
                                                                     &itc_editfield,
@@ -172,6 +159,7 @@ void __sub_list_sel_cb(void *data, Evas_Object *obj, void *event_info)
                                if (ad->data_hm_url) {
                                        ad->data_hm_url->userdata = ad;
                                        ad->data_hm_url->input_type = ELM_INPUT_PANEL_LAYOUT_URL;
+                                       ad->data_hm_url->isSinglelineFlag = TRUE;
                                        ad->data_hm_url->limit_filter_data = calloc(1, sizeof(Elm_Entry_Filter_Accept_Set));
                                        if (ad->data_hm_url->limit_filter_data) {
                                                ad->data_hm_url->limit_filter_data->max_byte_count = MAX_HOME_URL_LEN_MAX - 1;
@@ -192,114 +180,6 @@ void __sub_list_sel_cb(void *data, Evas_Object *obj, void *event_info)
        }
 }
 
-void __auth_type_popup_del(void *data, Evas_Object *obj, void *event_info)
-{
-       SettingNetworkUG *ad = data;
-
-       ret_if(data == NULL);
-
-       evas_object_del(ad->popup_auth_type);
-       ad->popup_auth_type = NULL;
-}
-
-static void __create_auth_type_popup(void *data, Evas_Object *obj,
-                                               void *event_info)
-{
-       ret_if(NULL == data || NULL == event_info);
-       SETTING_TRACE_BEGIN;
-       SettingNetworkUG *ad = (SettingNetworkUG *) data;
-       Elm_Object_Item *parentItem = event_info;       /* parent item */
-       elm_genlist_item_selected_set(parentItem, 0);
-       Setting_GenGroupItem_Data *data_parentItem = elm_object_item_data_get(parentItem);      /* parent data */
-
-       /* create popup */
-       if(ad->popup_auth_type) {
-               evas_object_del(ad->popup_auth_type);
-               ad->popup_auth_type = NULL;
-       }
-       Evas_Object *scroller = NULL;
-       ad->popup_auth_type = setting_create_popup_with_list(&scroller, ad, ad->win_get,
-                                                                                                            data_parentItem->keyStr,
-                                                                                                                __auth_type_popup_del,
-                                                                                                                0, false, false, 0);
-       _P(ad->popup_auth_type);
-
-       Evas_Object *rgd;
-
-       Setting_GenGroupItem_Data *list_item = NULL;
-       if (data_parentItem == ad->data_auth_type) {
-               rgd = elm_radio_add(scroller);
-               elm_radio_value_set(rgd, -1);
-
-               list_item = setting_create_Gendial_field_1radio(scroller,
-                                                    &itc_multiline_1text_1icon,
-                                                    __sub_list_sel_cb, data_parentItem,
-                                                    SWALLOW_Type_1RADIO_RIGHT, rgd,
-                                                    CONNECTION_CELLULAR_AUTH_TYPE_PAP,
-                                                    "IDS_ST_MBODY_PAP",
-                                                    NULL);
-
-               list_item = setting_create_Gendial_field_1radio(scroller,
-                                                    &itc_multiline_1text_1icon,
-                                                    __sub_list_sel_cb, data_parentItem,
-                                                    SWALLOW_Type_1RADIO_RIGHT, rgd,
-                                                    CONNECTION_CELLULAR_AUTH_TYPE_CHAP,
-                                                    "IDS_ST_POP_CHAP",
-                                                    NULL);
-
-               list_item = setting_create_Gendial_field_1radio(scroller,
-                                                    &itc_multiline_1text_1icon,
-                                                    __sub_list_sel_cb, data_parentItem,
-                                                    SWALLOW_Type_1RADIO_RIGHT, rgd,
-                                                    CONNECTION_CELLULAR_AUTH_TYPE_NONE,
-                                                    "IDS_ST_BODY_NONE",
-                                                    NULL);
-
-               elm_radio_value_set(rgd, ad->chkType);
-               elm_object_signal_emit(rgd, "elm,event,pass,enabled", "elm");
-       }
-       else if (data_parentItem == ad->data_srv_type) {
-               rgd = elm_radio_add(scroller);
-               elm_radio_value_set(rgd, -1);
-
-               list_item = setting_create_Gendial_exp_sub_field(scroller,
-                                                    &itc_1icon_1text_sub,
-                                                    __sub_list_sel_cb, ad,
-                                                    parentItem,
-                                                    SWALLOW_Type_1RADIO_RIGHT, rgd,
-                                                    CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET,
-                                                    "IDS_ST_BODY_INTERNET_CONNECTION",
-                                                    __sub_list_rd_change);
-
-               list_item = setting_create_Gendial_exp_sub_field(scroller,
-                                                    &itc_1icon_1text_sub,
-                                                    __sub_list_sel_cb, ad,
-                                                    parentItem,
-                                                    SWALLOW_Type_1RADIO_RIGHT, rgd,
-                                                    CONNECTION_CELLULAR_SERVICE_TYPE_MMS,
-                                                    STR_SETTING_MMS_CONNECTIONS,
-                                                    __sub_list_rd_change);
-
-               int r = 0;
-               char tmp_str[SETTING_STR_SLP_LEN + 1] = {0,};
-               r = snprintf(tmp_str, SETTING_STR_SLP_LEN, "%s %s", _(INTERNET), PLUS_MMS);
-               if(r < 0)
-                       SETTING_TRACE("snprintf failed");
-
-               list_item = setting_create_Gendial_exp_sub_field(scroller,
-                                                    &itc_1icon_1text_sub,
-                                                    __sub_list_sel_cb, ad,
-                                                    parentItem,
-                                                    SWALLOW_Type_1RADIO_RIGHT, rgd,
-                                                    CONNECTION_CELLULAR_SERVICE_TYPE_APPLICATION,
-                                                    tmp_str,
-                                                    __sub_list_rd_change);
-
-               elm_radio_value_set(rgd, ad->srvType);
-               elm_object_signal_emit(rgd, "elm,event,pass,enabled", "elm");
-       }
-}
-
 static void __setting_network_connection_exp_cb(void *data, Evas_Object *obj,
                                                 void *event_info)
 {
@@ -803,12 +683,11 @@ static int setting_network_connection_create(void *cb)
        retvm_if(scroller == NULL, SETTING_DRAW_ERR_FAIL_SCROLLER,
                 "Cannot set scroller object  as contento of layout");
        elm_genlist_realization_mode_set(scroller, EINA_TRUE);
+       elm_object_style_set(scroller, "dialogue");
        elm_genlist_mode_set(scroller, ELM_LIST_COMPRESS);
        elm_genlist_clear(scroller);    /* first to clear list */
        evas_object_smart_callback_add(scroller, "realized", __gl_realized_cb, NULL);
 
-       ad->con_create_gl = scroller;
-
        _init_context(ad);
 
        const char *title = NULL;
@@ -956,13 +835,12 @@ static int setting_network_connection_create(void *cb)
        elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
        ad->data_auth_type =
-           setting_create_Gendial_field_def(scroller,
-                                                   &itc_2text_3_parent,
-                                                   __create_auth_type_popup, ad,
-                                                   SWALLOW_Type_INVALID,
-                                                   NULL, NULL, 0,
-                                                   "IDS_ST_BODY_AUTH_TYPE",
-                                                   (char *)ad->ed_auth_type_desc, NULL);
+           setting_create_Gendial_exp_parent_field(scroller,
+                                                   &itc_2text_3_parent,
+                                                   NULL, NULL,
+                                                   SWALLOW_Type_INVALID,
+                                                   "IDS_ST_BODY_AUTH_TYPE",
+                                                   (char *)ad->ed_auth_type_desc);
        /* ad->data_auth_type->int_slp_setting_binded = INT_SLP_SETTING_INVALID; */
        if (ad->data_auth_type) {
                ad->data_auth_type->userdata = ad;
@@ -1680,8 +1558,6 @@ setting_network_connection_click_softkey_save_cb(void *data,
                 SETTING_FONT_RED, SETTING_FONT_BLACK);
        }
 
-       elm_object_tree_focus_allow_set(ad->con_create_gl, EINA_FALSE);
-
        setting_create_popup(ad, ad->win_get, NULL, KeyStr_Saved, __save_response_cb, 1, FALSE, FALSE, 0);
 
        if (ctxpopup != NULL) {
@@ -1700,8 +1576,6 @@ setting_network_connection_click_softkey_back_cb(void *data, Elm_Object_Item *it
 
        SettingNetworkUG *ad = (SettingNetworkUG *) data;
 
-       elm_object_tree_focus_allow_set(ad->con_create_gl, EINA_FALSE);
-
        SETTING_TRACE("ad->con_name:%s", ad->con_name);
        if (!safeStrCmp(STR_SETTING_NEW_CONNECTIONS, ad->con_name)
            || ad->profile_topper_view == &setting_view_network_con) { /*new a profile,need to select the "Service type" */
index 0382936..6e8afb3 100644 (file)
@@ -535,7 +535,7 @@ static void __check_sim_card(void *cb)
                case VCONFKEY_TELEPHONY_SIM_NOT_PRESENT:
                        ad->popup = setting_create_popup(ad, ad->win_get,
                                                         NULL, _("IDS_ST_POP_INSERT_SIM_CARD_TO_ACCESS_NETWORK_SERVICES"),
-                                                        __popup_cb, 0, true, true,
+                                                        __popup_cb, 0, false, false,
                                                                                         1, keyStr_OK);
                        SETTING_TRACE("%s*** [ERR] No SIM. sim_slot_type=%d ***%s",
                                      SETTING_FONT_RED, value, SETTING_FONT_BLACK);
@@ -545,7 +545,7 @@ static void __check_sim_card(void *cb)
                case VCONFKEY_TELEPHONY_SIM_UNKNOWN:
                        ad->popup = setting_create_popup(ad, ad->win_get,
                                                         NULL, _("IDS_ST_POP_INSERT_SIM_CARD_TO_ACCESS_NETWORK_SERVICES"),
-                                                         __popup_cb, 0, true, true,
+                                                         __popup_cb, 0, false, false,
                                                                                          1, keyStr_OK);
                        SETTING_TRACE("%s*** [ERR] Invalid SIM. sim_slot_type=%d ***%s",
                                      SETTING_FONT_RED, value, SETTING_FONT_BLACK);
@@ -1087,7 +1087,7 @@ void __change_search_view_on_resp_cb(void *data, Evas_Object *obj,
        }
 }
 
-static void _setting_network_popup_mobile_data_rollback(void *data)
+static void _setting_network_popup_rollback(void *data)
 {
        SETTING_TRACE_BEGIN;
        setting_retm_if(data == NULL, "Data parameter is NULL");
@@ -1105,48 +1105,18 @@ static void _setting_network_popup_mobile_data_rollback(void *data)
        setting_update_gl_item_chk_status(ad->data_mobile_data, value);
 }
 
-static void _setting_network_popup_data_roaming_rollback(void *data)
-{
-       SETTING_TRACE_BEGIN;
-       setting_retm_if(data == NULL, "Data parameter is NULL");
-       SettingNetworkUG *ad = (SettingNetworkUG *) data;
-
-       int err = 0;
-       int value = 0;
-
-       int err_data_romaing = setting_network_get_state_data_roaming(&value);
-       SETTING_TRACE("value = %d", value);
-
-       /* rollback */
-       setting_get_bool_slp_key(BOOL_SLP_SETTING_DATA_ROAMING, &value, &err);
-       setting_update_gl_item_chk_status(ad->data_roaming, value);
-}
-
-
-static void _setting_network_popup_mobile_data_hide_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       setting_retm_if(data == NULL, "Data parameter is NULL");
-       SettingNetworkUG *ad = (SettingNetworkUG *) data;
-
-       _setting_network_popup_mobile_data_rollback(ad);
-       elm_popup_dismiss(obj);
-}
 
-static void _setting_network_popup_data_roaming_hide_cb(void *data, Evas_Object *obj, void *event_info)
+static void _setting_network_popup_hide_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
        setting_retm_if(data == NULL, "Data parameter is NULL");
        SettingNetworkUG *ad = (SettingNetworkUG *) data;
 
-       /* rollback */
-       _setting_network_popup_data_roaming_rollback(ad);
+       _setting_network_popup_rollback(ad);
        elm_popup_dismiss(obj);
 }
 
 
-
-
 static void
 setting_network_main_item_Gendial_mouse_up_cb(void *data, Evas_Object *obj, void *event_info)
 {
@@ -1204,7 +1174,7 @@ setting_network_main_item_Gendial_mouse_up_cb(void *data, Evas_Object *obj, void
                                                                                                        "IDS_ST_HEADER_TURN_OFF_MOBILE_DATA",
                                                                                                        "IDS_ST_POP_UNLESS_YOU_CONNECT_TO_A_WI_FI_NETWORK_YOU_WILL_NOT_BE_ABLE_TO_USE_THE_INTERNET_EMAIL_OR_OTHER_APPS_MSG",
                                                                                                        setting_network_use_packet_resp_cb,
-                                                                                                       _setting_network_popup_mobile_data_hide_cb,
+                                                                                                       _setting_network_popup_hide_cb,
                                                                                                        0,
                                                                                                        FALSE,
                                                                                                        FALSE,
@@ -1232,7 +1202,7 @@ setting_network_main_item_Gendial_mouse_up_cb(void *data, Evas_Object *obj, void
                                                                                                        "IDS_ST_HEADER_TURN_ON_MOBILE_DATA",
                                                                                                        "IDS_ST_POP_MOBILE_DATA_WILL_BE_TURNED_ON_CONNECTING_TO_MOBILE_NETWORKS_MAY_RESULT_IN_ADDITIONAL_CHARGES_DEPENDING_ON_YOUR_PAYMENT_PLAN",
                                                                                                        setting_network_use_packet_resp_cb,
-                                                                                                       _setting_network_popup_mobile_data_hide_cb,
+                                                                                                       _setting_network_popup_hide_cb,
                                                                                                        0,
                                                                                                        FALSE,
                                                                                                        FALSE,
@@ -1245,17 +1215,12 @@ setting_network_main_item_Gendial_mouse_up_cb(void *data, Evas_Object *obj, void
                setting_update_gl_item_chk_status(list_item, !(list_item->chk_status));
 
                if (list_item->chk_status) {
-                       ad->popup =  setting_create_popup2(ad, ad->win_get,
+                       ad->popup =  setting_create_popup(ad, ad->win_get,
                                                                                          "IDS_ST_HEADER_ENABLE_DATA_ROAMING",
                                                                                          "IDS_ST_POP_ROAMING_WILL_INCUR_EXTRA_CHARGES_CONTINUE_Q",
                                                                                          __setting_network_data_roaming_resp_cb,
-                                                                                        _setting_network_popup_data_roaming_hide_cb,
-                                                                                         0,
-                                                                                         FALSE,
-                                                                                         FALSE,
-                                                                                         2,
-                                                                                         "IDS_ST_BUTTON_ENABLE",
-                                                                                         "IDS_ST_BUTTON_CANCEL_ABB");
+                                                                                         0, false, false,
+                                                                                         2, "IDS_ST_BUTTON_ENABLE", "IDS_ST_BUTTON_CANCEL_ABB");
                }
        } else if (!safeStrCmp(CONNECTION_DSC, list_item->keyStr)) {
                ret = setting_view_change(&setting_view_network_main,
@@ -1293,7 +1258,7 @@ setting_network_main_chk_btn_cb(void *data, Evas_Object *obj, void *event_info)
                                                                "IDS_ST_HEADER_TURN_OFF_MOBILE_DATA",
                                                                "IDS_ST_POP_UNLESS_YOU_CONNECT_TO_A_WI_FI_NETWORK_YOU_WILL_NOT_BE_ABLE_TO_USE_THE_INTERNET_EMAIL_OR_OTHER_APPS_MSG",
                                                                setting_network_use_packet_resp_cb,
-                                                               _setting_network_popup_mobile_data_hide_cb,
+                                                               _setting_network_popup_hide_cb,
                                                                0,
                                                                FALSE,
                                                                FALSE,
@@ -1324,7 +1289,7 @@ setting_network_main_chk_btn_cb(void *data, Evas_Object *obj, void *event_info)
                                                                "IDS_ST_HEADER_TURN_ON_MOBILE_DATA",
                                                                "IDS_ST_POP_MOBILE_DATA_WILL_BE_TURNED_ON_CONNECTING_TO_MOBILE_NETWORKS_MAY_RESULT_IN_ADDITIONAL_CHARGES_DEPENDING_ON_YOUR_PAYMENT_PLAN",
                                                                setting_network_use_packet_resp_cb,
-                                                               _setting_network_popup_mobile_data_hide_cb,
+                                                               _setting_network_popup_hide_cb,
                                                                0,
                                                                FALSE,
                                                                FALSE,
@@ -1336,17 +1301,12 @@ setting_network_main_chk_btn_cb(void *data, Evas_Object *obj, void *event_info)
                SETTING_TRACE(" TOUCH HANDLING DATA ROAMING");
                if (list_item->chk_status) {
                        SETTING_TRACE(" TOUCH HANDLING DATA ROAMING - set true");
-                       ad->popup =  setting_create_popup2(ad, ad->win_get,
-                                                                                         "IDS_ST_HEADER_ENABLE_DATA_ROAMING",
-                                                                                         "IDS_ST_POP_ROAMING_WILL_INCUR_EXTRA_CHARGES_CONTINUE_Q",
-                                                                                         __setting_network_data_roaming_resp_cb,
-                                                                                        _setting_network_popup_data_roaming_hide_cb,
-                                                                                         0,
-                                                                                         FALSE,
-                                                                                         FALSE,
-                                                                                         2,
-                                                                                         "IDS_ST_BUTTON_ENABLE",
-                                                                                         "IDS_ST_BUTTON_CANCEL_ABB");
+                       ad->popup = setting_create_popup(ad, ad->win_get,
+                                                                                        "IDS_ST_HEADER_ENABLE_DATA_ROAMING",
+                                                                                        "IDS_ST_POP_ROAMING_WILL_INCUR_EXTRA_CHARGES_CONTINUE_Q",
+                                                                                        __setting_network_data_roaming_resp_cb,
+                                                                                        0, false, false,
+                                                                                        2, "IDS_ST_BUTTON_ENABLE", "IDS_ST_BUTTON_CANCEL_ABB");
                } else {
                        SETTING_TRACE(" TOUCH HANDLING DATA ROAMING - set false");
                        setting_network_set_state_data_roaming(SETTING_ON_OFF_BTN_OFF);
@@ -1420,7 +1380,7 @@ static void setting_network_use_packet_resp_cb(void *data, Evas_Object *obj,
        } else if (POPUP_RESPONSE_CANCEL == response_type) {
 
                /* rollback */
-               _setting_network_popup_mobile_data_rollback(ad);
+               _setting_network_popup_rollback(ad);
        }
        if (ad->popup_data_off) {
                evas_object_del(ad->popup_data_off);
index c7323c1..07da0b0 100644 (file)
@@ -863,6 +863,7 @@ void setting_tapi_get_plmn_mode_cb(TapiHandle *handle, int result, void *data, v
        }
 }
 
+#define DOCOMO_PLMN_ID "44010"
 /**
  *
  */
@@ -1001,15 +1002,13 @@ void setting_tapi_search_network_cb(TapiHandle *handle, int result, void *data,
                        char speciliztion[MAX_COMMON_BUFFER_LEN] = {0, };
                        __process_special_char(speciliztion, name);
 
-#if 1
-                       // check the code 
                        SETTING_TRACE("name:%s", speciliztion);
                        item_data = setting_create_Gendial_field_1radio(
                                        ad->genlist_sel_network,
                                        &itc_multiline_1text_1icon,
                                        setting_network_Gendial_select_plmn_cb,
                                        ad,
-                                                       SWALLOW_TYPE_1RADIO_RIGHT_PROPAGATE_EVENTS_SET,
+                                                       SWALLOW_Type_1RADIO_RIGHT,
                                        ad->chk_sel,
                                        TAPI_NETWORK_SELECTIONMODE_MANUAL + valid_cnt + 1,
                                        speciliztion,
@@ -1020,15 +1019,12 @@ void setting_tapi_search_network_cb(TapiHandle *handle, int result, void *data,
                                continue;
                        }
                        item_data->userdata = ad;
-#endif
-#if 1
                        if (TAPI_NETWORK_SELECTIONMODE_AUTOMATIC != ad->sel_net
                            && 0 == safeStrCmp(pa_net_name, ad->plmn_info.network_list[cnt].network_name)
                            && ad->plmn_info.network_list[cnt].access_technology == ad->sel_act) {
                                /* [ UI UPDATE ]*/
                                elm_radio_value_set(ad->chk_sel, item_data->chk_status);/*let select nothing */
                        }
-#endif
                        cnt++;
                        valid_cnt++;
                }
@@ -1047,19 +1043,18 @@ void setting_tapi_search_network_cb(TapiHandle *handle, int result, void *data,
                /* [ UI UPDATE ]*/
                setting_create_popup(ad, ad->win_get, NULL, keyStr_Failed_Searched, NULL, POPUP_INTERVAL, FALSE, FALSE, 0);
        }
-
-#if 1
        if (0 == valid_cnt && TAPI_NETWORK_SELECTIONMODE_AUTOMATIC == ad->sel_net && ad->data_auto_network_item) {
 
                /* [ UI UPDATE ]*/
                ad->data_auto_network_item->chk_status = TRUE;
+               /*elm_object_item_data_set(ad->data_auto_network_item->item, ad->data_auto_network_item); */
+               /*elm_genlist_item_item_class_update(ad->data_auto_network_item->item, &(itc_2text_1icon_6)); */
                char *sub_text = setting_customize_text(ad->data_auto_network_item->sub_desc, 0, BLUE_COLOR, NULL);
                ad->data_auto_network_item->sub_desc = (char *)g_strdup(sub_text);
                FREE(sub_text);
                elm_object_item_data_set(ad->data_auto_network_item->item, ad->data_auto_network_item);
                elm_genlist_item_update(ad->data_auto_network_item->item);
        }
-#endif
 }
 
 
index 8faf15b..c222169 100644 (file)
@@ -319,6 +319,12 @@ static int setting_phone_display_language_create(void *cb)
 
        evas_object_smart_callback_add(ad->gl_lang, "realized", __gl_realized_cb, NULL);
 
+       Elm_Object_Item *item = NULL;
+       item =
+           elm_genlist_item_append(scroller, &itc_seperator, NULL, NULL,
+                                   ELM_GENLIST_ITEM_NONE, NULL, NULL);
+       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+
        /* scroller is a genlist */
        ad->chk_lang = elm_radio_add(scroller);
        elm_radio_state_value_set(ad->chk_lang, -1);
@@ -354,6 +360,10 @@ static int setting_phone_display_language_create(void *cb)
                idx++;
        }
 
+       /*item = elm_genlist_item_append(scroller, &itc_bottom_seperator, NULL, NULL,
+                               ELM_GENLIST_ITEM_NONE, NULL, NULL);
+       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);*/
+
        setting_view_phone_display_language.is_create = 1;
 
        return SETTING_RETURN_SUCCESS;
index 99795bf..e29bc4b 100644 (file)
@@ -150,7 +150,7 @@ static void setting_phone_lang_create_keyboard_ug(SettingPhoneUG *ad)
 static void setting_phone_lang_create_voice_recognition_ug(SettingPhoneUG *ad)
 {
        SETTING_TRACE_BEGIN;
-       if (app_group_launcher("setting-voice-efl|show_what:stt") == 0) {
+       if (app_launcher("setting-voice-efl|show_what:stt") == 0) {
                ad->event_freeze_timer = ecore_timer_add(1, setting_phone_language_region_freeze_event_timer_cb, ad);
                evas_object_freeze_events_set(ad->navi_bar, EINA_TRUE);
        }
@@ -163,7 +163,7 @@ static void setting_phone_lang_create_voice_recognition_ug(SettingPhoneUG *ad)
 static void setting_phone_lang_create_text_speech_ug(SettingPhoneUG *ad)
 {
        SETTING_TRACE_BEGIN;
-       if (app_group_launcher("setting-voice-efl|show_what:tts") == 0) {
+       if (app_launcher("setting-voice-efl|show_what:tts") == 0) {
                ad->event_freeze_timer = ecore_timer_add(1, setting_phone_language_region_freeze_event_timer_cb, ad);
                evas_object_freeze_events_set(ad->navi_bar, EINA_TRUE);
        }
@@ -241,9 +241,9 @@ static void setting_phone_lang_item_Gendial_mouse_up_cb(void *data,
        } else if (!safeStrCmp("IDS_VC_MBODY_NOTIFICATION_READ_OUT", list_item->keyStr)) {
                setting_phone_lang_create_readout_ug(ad);
        } else if (!safeStrCmp("IDS_ST_BODY_VOICE_CONTROL", list_item->keyStr)) {
-               app_group_launcher("org.tizen.voice-setting|show:voice-control");
+               app_launcher("org.tizen.voice-setting|show:voice-control");
        } else if (!safeStrCmp("IDS_ST_BODY_TTS", list_item->keyStr)) {
-               app_group_launcher("org.tizen.voice-setting|show:tts");
+               app_launcher("org.tizen.voice-setting|show:tts");
        }
 }
 
index 89403bf..a703152 100644 (file)
@@ -227,8 +227,7 @@ static int setting_phone_region_format_get_region_fmt(char *list[],
                //****************************************************************************
                // current font doesn't support the font
                // filter out if result == 'bo'
-               if (0 == safeStrCmp(result, "bo")
-                       || 0 == safeStrCmp(result, "dz") ) continue;
+               if (0 == safeStrCmp(result, "bo")) continue;
                //****************************************************************************
                //****************************************************************************
                //****************************************************************************
index bdfe64d..a6807f4 100644 (file)
@@ -172,11 +172,7 @@ static Evas_Object *__sound_slider_new_icon_get(void *data, Evas_Object *obj, co
 
                        Edje_Message_Float_Set *msg = alloca(sizeof(Edje_Message_Float_Set) + (sizeof(double)));
                        msg->count = 1;
-                       /* Warning area point has to be calculated considering rounding off.
-                        * For example, value 10's area will be 9.5~10.4.
-                        * So, if warning area has to be started at 10, we need to calculate the start point with 9.5.
-                        * Warning start point = (Warning min value - 0.5) / (Max_Value - Min_Value) */
-                       msg->val[0] = 0.633333;
+                       msg->val[0] = 0.66667;
                        edje_object_message_send(_EDJ(slider), EDJE_MESSAGE_FLOAT_SET, 0, msg);
                        elm_slider_indicator_format_set(slider, "%1.0f");
                        elm_slider_indicator_show_set(slider, 1);
index ed17be1..b33590a 100644 (file)
@@ -147,26 +147,20 @@ struct _SettingStorageUG {
        Setting_GenGroupItem_Data *data_installapp;
 
        /* miscellaneous files list */
-       int misc_view_mode;                             /** 0 : default 1 : delete layout */
-
        Elm_Object_Item *main_misces_navi_it;
+       Evas_Object *main_gl_misces;
+       Evas_Object *main_misces_lo_noitem;
        Elm_Object_Item *misces_navi_it;
-
-       Evas_Object *gl_misces;                 /** genlist for misc list */
+       Evas_Object *gl_misces;
        Evas_Object *misces_lo_noitem;
-
        Eina_Bool misces_is_select_all;
        Eina_List *misces_list;
        Eina_List *misces_sel_list;
        int misces_sz_all;
        int misces_checked;
        int misces_deleted;
-       bool misces_ctx_popup_selected;
        void *del_worker;
-
-       Evas_Object *ly_select_all;             /** misc > 'select all' layout */
-       Evas_Object* ly_default;
-
+       Evas_Object *select_all_layout;
        Evas_Object *title_left_btn;
        Evas_Object *title_right_btn;
 
index 8f67fc8..2e611ff 100644 (file)
@@ -110,7 +110,7 @@ static void storageUg_SD_handle_mount_unmount(void *data)
                int ret;
 
                ad->popup = setting_create_popup_with_progressbar(ad, ad->win,
-                                                                 PROGRESSBAR_STYLE, NULL, "IDS_ST_POP_MOUNTING_SD_CARD_ING", storageUg_popup_del, 0, TRUE, TRUE, 0);
+                                                                 PROGRESSBAR_STYLE, NULL, NULL, storageUg_popup_del, 0, TRUE, TRUE, 0);
 
                ad->mmc_content.mmc_cb = storageUg_SD_finish_progress;
                ad->mmc_content.user_data = ad;
@@ -164,7 +164,7 @@ static void storageUg_SD_format(int result, void *data)
                return;
        }
 
-       ad->popup = setting_create_popup_with_progressbar(ad, ad->win, "default",
+       ad->popup = setting_create_popup_with_progressbar(ad, ad->win, PROGRESSBAR_STYLE,
                                                          NULL, STORAGEUG_STR_FORMATTING_SD, NULL, 0, TRUE, TRUE, 0);
 
        ad->mmc_content.mmc_cb = storageUg_SD_finish_format;
@@ -378,6 +378,9 @@ static inline void storageUg_SD_info_inserted_not_mounted(SettingStorageUG *ad)
                                                    ad);
        warn_if(NULL == ad->sd_mount, "ad->sd_mount is NULL");
 
+       ad->sd_format = storageUg_SD_gl_insert_after(ad->gl_main, &itc_1text,
+                                                    ad->sd_mount->item, storageUg_SD_sel, ad, STORAGEUG_STR_FORMAT_SD, NULL,
+                                                    ad);
        if (ad->sd_format) {
                int status = -1;
 
index 6cd0d2b..8d3dc94 100644 (file)
@@ -272,23 +272,12 @@ Evas_Object *storageUg_color_item_content_get(void *data, Evas_Object *obj,
        setting_retvm_if(data == NULL, NULL, "data is NULL");
        Setting_GenGroupItem_Data *list_item = data;
        int color = list_item->color;
-
-       SETTING_TRACE_ERROR("part : %s", part);
-
-       if (!strcmp(part, "elm.swallow.icon")) {
+       if (!strcmp(part, "elm.icon.1")) {
                Evas_Object *layout = elm_layout_add(obj);
-
-               Eina_Bool result = elm_layout_file_set(layout, SETTING_THEME_EDJ_NAME, "storage_edge");
-               evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-               evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
-               if (!result) {
-                       SETTING_TRACE_ERROR(" ERROR -- elm_layout_file_set(layout, SETTING_THEME_EDJ_NAME, storage_edge)");
-                       return NULL;
-               }
+               elm_layout_file_set(layout, SETTING_THEME_EDJ_NAME, "storage_elem");
 
                switch (color) {
                case 1:
-                       elm_object_signal_emit(layout, "elm,state,show,system", "elm");
                        break;
                case 2:
                        elm_object_signal_emit(layout, "elm,state,show,app", "elm");
@@ -605,11 +594,10 @@ static inline Evas_Object *storageUg_main_genlist(Evas_Object *parent)
        elm_genlist_realization_mode_set(genlist, EINA_FALSE);
        elm_genlist_block_count_set(genlist, 2);
 #else
-       //elm_genlist_realization_mode_set(genlist, EINA_TRUE);
-       elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
-       elm_genlist_homogeneous_set(genlist, EINA_TRUE);
+       elm_genlist_realization_mode_set(genlist, EINA_TRUE);
        elm_genlist_block_count_set(genlist, 2);
 #endif
+       elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
        evas_object_show(genlist);
 
        evas_object_smart_callback_add(genlist, "realized", __gl_realized_cb, NULL);
index 932df8b..33f1dcd 100644 (file)
  * limitations under the License.
  *
  */
+#include <media_content.h>
+
 #include "setting-storage-utils.h"
 #include "setting-storage-async-worker.h"
 #include "setting-storage-miscellaneous.h"
 
-
-#include <media_content.h>
-#include <efl_extension.h>
-
 #define STR_DELETE_ITEMS       "IDS_ST_HEADER_DELETE_ITEMS_ABB2"
 typedef struct {
        char *id;
@@ -33,192 +31,8 @@ typedef struct {
        SettingStorageUG *ad;
 } Node_Info;
 
-
-static void storageUg_misces_sel_all_clicked(void *data, Evas_Object *obj, void *event_info);
-static inline void storageUg_misces_gl_append_select_all_item(SettingStorageUG *ad);
-static inline void storageUg_misces_gl_remove_select_all_item(SettingStorageUG *ad);
-
 static setting_view setting_view_storage_misc;
 
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-static Evas_Object* ctxpopup;
-
-static void
-ctxpopup_dismissed_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       evas_object_del(ctxpopup);
-       ctxpopup = NULL;
-}
-
-static void
-move_more_ctxpopup(Evas_Object *ctxpopup)
-{
-       SETTING_TRACE_BEGIN;
-       Evas_Object *win;
-       Evas_Coord w, h;
-       int pos = -1;
-
-       /* We convince the top widget is a window */
-       win = elm_object_top_widget_get(ctxpopup);
-       elm_win_screen_size_get(win, NULL, NULL, &w, &h);
-       pos = elm_win_rotation_get(win);
-
-       switch (pos) {
-               case 0:
-               case 180:
-                       evas_object_move(ctxpopup, (w / 2), h);
-                       break;
-               case 90:
-                       evas_object_move(ctxpopup,  (h / 2), w);
-                       break;
-               case 270:
-                       evas_object_move(ctxpopup, (h / 2), w);
-                       break;
-       }
-}
-
-static void
-naviframe_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       Evas_Object *ctxpopup = data;
-       move_more_ctxpopup(ctxpopup);
-}
-
-static void
-more_ctxpopup_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       Evas_Object *nf = data;
-       evas_object_event_callback_del_full(nf, EVAS_CALLBACK_RESIZE, naviframe_resize_cb, ctxpopup);
-}
-
-static void
-win_rotation_changed_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       Evas_Object *ctxpopup = data;
-       move_more_ctxpopup(ctxpopup);
-}
-
-//static inline void storageUg_misces_gl_remove_select_all_item(SettingStorageUG *ad);
-static void _genlist_check_hide(SettingStorageUG *ad, bool hide)
-{
-       SETTING_TRACE_BEGIN;
-       int count = 0;
-       Evas_Object *gl = ad->gl_misces;
-       Elm_Object_Item *it = elm_genlist_first_item_get(gl);
-       while (it)
-       {
-               Setting_GenGroupItem_Data *sel = (Setting_GenGroupItem_Data *)elm_object_item_data_get(it);
-               //sel->isItemHideFlag = 0;
-               sel->isItemHideFlag = hide;
-
-               // reset if check boxs get hidden
-               if (hide == true) {
-                       sel->chk_status = 0; 
-               }
-               SETTING_TRACE(" item_update %d ", count++);
-               elm_genlist_item_fields_update(it, "elm.swallow.end", ELM_GENLIST_ITEM_FIELD_CONTENT);
-               it = elm_genlist_item_next_get(it);
-       }
-}
-
-/**
- * [UI-CALLBACK] 'Delete' button handler on ctxpopup
- */
-static void
-setting_storage_ctx_click_softkey_cb(void *data,
-                                                 Evas_Object *obj,
-                                                 void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retm_if(data == NULL, "Data parameter is NULL");
-
-       SettingStorageUG  *ad = (SettingStorageUG*) data;
-
-       //-------------------------------------------------------------------------------------------
-       // check genlist check box show/hide
-       //-------------------------------------------------------------------------------------------
-       ad->misces_ctx_popup_selected = true;
-
-#if 0
-       int count = 0;
-       Eina_List *l = elm_genlist_realized_items_get(ad->gl_misces);
-       Elm_Object_Item *it;
-       EINA_LIST_FREE(l, it)
-       {
-               Setting_GenGroupItem_Data *sel = (Setting_GenGroupItem_Data *)elm_object_item_data_get(it);
-
-               sel->isItemHideFlag = 0;
-
-               SETTING_TRACE(" item_update %d ", count++);
-               elm_genlist_item_fields_update(it, "elm.swallow.end", ELM_GENLIST_ITEM_FIELD_CONTENT);
-
-       }
-#else
-       storageUg_misces_gl_append_select_all_item(ad);
-       _genlist_check_hide(ad, false);
-#endif
-
-       if (ctxpopup != NULL) {
-               evas_object_del(ctxpopup);
-               ctxpopup = NULL;
-       }
-}
-
-
-
-/* Icon + Text (More button style : Naviframe Toolbar) */
-static void create_ctxpopup_more_button_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       SettingStorageUG  *ad = (SettingStorageUG*) data;
-       Evas_Object *it_obj;
-       Evas_Object *nf = ad->navi;
-       Evas_Object *win;
-       Elm_Object_Item *it;
-
-       if (ctxpopup != NULL) {
-               evas_object_del(ctxpopup);
-       }
-
-       ctxpopup = elm_ctxpopup_add(nf);
-       elm_ctxpopup_auto_hide_disabled_set(ctxpopup, EINA_TRUE);
-       elm_object_style_set(ctxpopup, "more/default");
-       eext_object_event_callback_add(ctxpopup, EEXT_CALLBACK_BACK, eext_ctxpopup_back_cb, NULL);
-       eext_object_event_callback_add(ctxpopup, EEXT_CALLBACK_MORE, eext_ctxpopup_back_cb, NULL);
-       evas_object_smart_callback_add(ctxpopup, "dismissed", ctxpopup_dismissed_cb, NULL);
-       evas_object_event_callback_add(ctxpopup, EVAS_CALLBACK_DEL, more_ctxpopup_del_cb, nf);
-       evas_object_event_callback_add(nf, EVAS_CALLBACK_RESIZE, naviframe_resize_cb, ctxpopup);
-
-       /* We convince the top widget is a window */
-//     win = elm_object_top_widget_get(nf);
-//     evas_object_smart_callback_add(win, "rotation,changed", win_rotation_changed_cb, ctxpopup);
-
-       //---------------------------------------------------------------------------------------------
-       elm_ctxpopup_item_append(ctxpopup, _("IDS_ST_BODY_DELETE"), NULL, setting_storage_ctx_click_softkey_cb, ad);
-       //---------------------------------------------------------------------------------------------
-
-
-
-
-       elm_ctxpopup_direction_priority_set(ctxpopup, ELM_CTXPOPUP_DIRECTION_UP, ELM_CTXPOPUP_DIRECTION_UNKNOWN, ELM_CTXPOPUP_DIRECTION_UNKNOWN, ELM_CTXPOPUP_DIRECTION_UNKNOWN);
-       move_more_ctxpopup(ctxpopup);
-       evas_object_show(ctxpopup);
-}
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-/**
- * back button handler
- *
- * 1. "default" -> delete : back to default
- */
 static Eina_Bool storageUg_misces_back_cb(void *data, Elm_Object_Item *it)
 {
        SettingStorageUG *ad = data;
@@ -231,60 +45,6 @@ static Eina_Bool storageUg_misces_back_cb(void *data, Elm_Object_Item *it)
        return EINA_TRUE;
 }
 
-static inline Evas_Object *_create_ly_misces_no_item(Evas_Object *parent)
-{
-       Evas_Object *layout, *icon;
-
-       layout = elm_layout_add(parent);
-       elm_layout_theme_set(layout, "layout", "nocontents", "default");
-       evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
-       icon = elm_image_add(layout);
-       elm_image_file_set(icon, SETTING_ICON_PATH_CFG "/00_nocontents_text.png", NULL);
-       elm_object_part_content_set(layout, "nocontents.image", icon);
-
-       elm_object_domain_translatable_part_text_set(layout, "elm.text", SETTING_PACKAGE,
-                                                    STORAGEUG_STR_NO_FILES);
-       elm_layout_signal_emit(layout, "text,disabled", "");
-
-       return layout;
-}
-
-static inline Evas_Object *_create_ly_app_default(Evas_Object *parent)
-{
-       Evas_Object *layout;
-
-       layout = elm_layout_add(parent);
-       elm_layout_theme_set(layout, "layout", "application", "default");
-       evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
-       return layout;
-}
-
-static inline void _update_navibar_buttons(SettingStorageUG *ad)
-{
-       /*update delete item buttons*/
-       if (ad->misces_checked > 0) {
-               if (ad->misces_navi_it && elm_object_item_part_content_get(ad->misces_navi_it, "title_left_btn") == NULL) {
-                       elm_object_item_part_content_set(ad->misces_navi_it, "title_left_btn", ad->title_left_btn);
-               }
-               if (ad->misces_navi_it && elm_object_item_part_content_get(ad->misces_navi_it, "title_right_btn") == NULL) {
-                       elm_object_item_part_content_set(ad->misces_navi_it, "title_right_btn", ad->title_right_btn);
-               }
-       } else {
-               if (ad->misces_navi_it && elm_object_item_part_content_get(ad->misces_navi_it, "title_left_btn") != NULL) {
-                       elm_object_item_part_content_unset(ad->misces_navi_it, "title_left_btn");
-                       evas_object_hide(ad->title_left_btn);
-               }
-               if (ad->misces_navi_it && elm_object_item_part_content_get(ad->misces_navi_it, "title_right_btn") != NULL) {
-                       elm_object_item_part_content_unset(ad->misces_navi_it, "title_right_btn");
-                       evas_object_hide(ad->title_right_btn);
-               }
-       }
-}
-
 static bool storageUg_misces_media_item_cb(media_info_h media, void *data)
 {
        Node_Info *node;
@@ -386,7 +146,7 @@ static inline void storageUg_meisces_get_list(SettingStorageUG *ad)
                return;
        }
 
-       ad->misces_sz_all = eina_list_count(ad->misces_list);
+       ad->misces_sz_all = eina_list_count(ad->misces_list);;
 }
 
 static void storageUg_misces_handle_selecting(SettingStorageUG *ad)
@@ -426,14 +186,10 @@ static int storageUg_compare_str(const void *data1, const void *data2)
 static void storageUg_misces_handle_sel_list(SettingStorageUG *ad, char *id,
                                              int checked)
 {
-       SETTING_TRACE_BEGIN;
-
        if (checked) {
-               SETTING_TRACE("----- checked : %d ", ad->misces_checked);
                ad->misces_checked++;
                ad->misces_sel_list = eina_list_append(ad->misces_sel_list, strdup(id));
        } else {
-               SETTING_TRACE("----- un-checked : %d", ad->misces_checked);
                Eina_List *found;
 
                ad->misces_checked--;
@@ -443,14 +199,36 @@ static void storageUg_misces_handle_sel_list(SettingStorageUG *ad, char *id,
                ad->misces_sel_list = eina_list_remove_list(ad->misces_sel_list, found);
        }
 
+       /*update select all check state*/
+       Evas_Object *check = elm_object_part_content_get(ad->select_all_layout, "elm.icon");
+       if (ad->misces_checked >= ad->misces_sz_all) {
+               elm_check_state_set(check, EINA_TRUE);
+       } else {
+               elm_check_state_set(check, EINA_FALSE);
+       }
        /*update delete item buttons*/
-       _update_navibar_buttons(ad);
+       if (ad->misces_checked > 0) {
+               if (ad->misces_navi_it && elm_object_item_part_content_get(ad->misces_navi_it, "title_left_btn") == NULL) {
+                       elm_object_item_part_content_set(ad->misces_navi_it, "title_left_btn", ad->title_left_btn);
+               }
+               if (ad->misces_navi_it && elm_object_item_part_content_get(ad->misces_navi_it, "title_right_btn") == NULL) {
+                       elm_object_item_part_content_set(ad->misces_navi_it, "title_right_btn", ad->title_right_btn);
+               }
+       } else {
+               if (ad->misces_navi_it && elm_object_item_part_content_get(ad->misces_navi_it, "title_left_btn") != NULL) {
+                       elm_object_item_part_content_unset(ad->misces_navi_it, "title_left_btn");
+                       evas_object_hide(ad->title_left_btn);
+               }
+               if (ad->misces_navi_it && elm_object_item_part_content_get(ad->misces_navi_it, "title_right_btn") != NULL) {
+                       elm_object_item_part_content_unset(ad->misces_navi_it, "title_right_btn");
+                       evas_object_hide(ad->title_right_btn);
+               }
+       }
 }
 
 static void storageUg_misces_genlist_sel(void *data, Evas_Object *obj,
                                          void *event_info)
 {
-       SETTING_TRACE_BEGIN;
        Node_Info *node;
        SettingStorageUG *ad = data;
        Elm_Object_Item *item = event_info;
@@ -468,29 +246,11 @@ static void storageUg_misces_genlist_sel(void *data, Evas_Object *obj,
                storageUg_misces_handle_sel_list(ad, node->id, d_item->chk_status);
                storageUg_misces_handle_selecting(ad);
        }
-
-#if 0
-       if (NULL == ad->misces_lo_noitem) {
-               ad->misces_lo_noitem = _create_ly_misces_no_item(ad->navi);
-
-               Evas_Object *btn = elm_object_item_part_content_get(ad->misces_navi_it, "title_right_btn");
-               elm_object_disabled_set(btn, EINA_TRUE);
-               ad->gl_misces = NULL;
-
-               if (ad->misces_lo_noitem) {
-                       elm_object_item_part_content_set(ad->misces_navi_it, "elm.swallow.content", ad->misces_lo_noitem);
-               }
-       }
-#endif
-
-
 }
 
 static void storageUg_misces_genlist_chk_cb(void *data, Evas_Object *obj,
                                             void *event_info)
 {
-       SETTING_TRACE_BEGIN;
-
        Node_Info *node;
        SettingStorageUG *ad;
        Setting_GenGroupItem_Data *d_item = data;
@@ -498,19 +258,32 @@ static void storageUg_misces_genlist_chk_cb(void *data, Evas_Object *obj,
        ret_if(data == NULL);
 
        node = d_item->userdata;
-       if (node)
-       {
-               ad = node->ad;
-               d_item->chk_status = elm_check_state_get(obj);
+       ad = node->ad;
+       d_item->chk_status = elm_check_state_get(obj);
 
-               storageUg_misces_handle_sel_list(ad, node->id, d_item->chk_status);
-               storageUg_misces_handle_selecting(ad);
-       } else {
-               SETTING_TRACE_ERROR(">>>>>>>>> node is NULL");
-       }
+       storageUg_misces_handle_sel_list(ad, node->id, d_item->chk_status);
+       storageUg_misces_handle_selecting(ad);
 }
 
+static inline Evas_Object *storageUg_misces_no_item(Evas_Object *parent)
+{
+       Evas_Object *layout, *icon;
+
+       layout = elm_layout_add(parent);
+       elm_layout_theme_set(layout, "layout", "nocontents", "default");
+       evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+       icon = elm_image_add(layout);
+       elm_image_file_set(icon, SETTING_ICON_PATH_CFG "/00_nocontents_text.png", NULL);
+       elm_object_part_content_set(layout, "nocontents.image", icon);
 
+       elm_object_domain_translatable_part_text_set(layout, "elm.text", SETTING_PACKAGE,
+                                                    STORAGEUG_STR_NO_FILES);
+       elm_layout_signal_emit(layout, "text,disabled", "");
+
+       return layout;
+}
 
 static inline void storageUg_misces_clear_sel_list(Eina_List *list)
 {
@@ -522,123 +295,8 @@ static inline void storageUg_misces_clear_sel_list(Eina_List *list)
        eina_list_free(list);
 }
 
-
-
-/**
- * "Select All" - check button handler
- */
-static inline void setting_storage_select_all_chk_btn_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retm_if(data == NULL, "Data parameter is NULL");
-       Setting_GenGroupItem_Data *list_item = (Setting_GenGroupItem_Data *) data;
-       SettingStorageUG *ad = (SettingStorageUG *)list_item->userdata;
-
-       list_item->chk_status = elm_check_state_get(obj);       /*  for genlist update status */
-       ad->misces_is_select_all = elm_check_state_get(obj);
-
-       SETTING_TRACE_ERROR("1");
-
-
-
-       Eina_List *l = NULL;
-       Evas_Object *toolbar;
-       Node_Info *node = NULL;
-       Setting_GenGroupItem_Data *item_data = NULL;
-
-
-       SETTING_TRACE_ERROR("2 : ad->misces_is_select_all--->%d", ad->misces_is_select_all);
-       SETTING_TRACE_ERROR("ad->misces_list--->%x", ad->misces_list);
-       EINA_LIST_FOREACH(ad->misces_list, l, node) {
-               if (node && node->data) {
-                       item_data = node->data;
-                       SETTING_TRACE_ERROR("2.1");
-                       if (item_data) {
-                               item_data->chk_status = ad->misces_is_select_all;
-                               SETTING_TRACE_ERROR("2.2");
-                               elm_object_item_data_set(item_data->item, item_data);
-                               SETTING_TRACE_ERROR("2.3");
-                               storageUg_misces_handle_sel_list(ad, node->id, item_data->chk_status);
-                               SETTING_TRACE_ERROR("2.4");
-                       }
-               }
-       }
-
-       SETTING_TRACE_ERROR("3");
-       elm_genlist_realized_items_update(ad->gl_misces);
-
-       SETTING_TRACE_ERROR("4");
-       bool select_all_state = ad->misces_is_select_all;
-       if (select_all_state) {
-               char text[MAX_DISPLAY_NAME_LEN_ON_UI] = {0};
-
-               snprintf(text, sizeof(text), _(STORAGEUG_STR_N_SELECTED), ad->misces_sz_all);
-               elm_object_item_part_text_set(ad->misces_navi_it, "subtitle", text);
-
-               toolbar = elm_object_item_part_content_get(ad->misces_navi_it, "toolbar");
-               elm_object_item_disabled_set(elm_toolbar_last_item_get(toolbar), EINA_FALSE);
-               ad->misces_checked = ad->misces_sz_all;
-       } else {
-               elm_object_item_part_text_set(ad->misces_navi_it, "subtitle", "");
-               elm_object_item_signal_emit(ad->misces_navi_it, "elm,state,subtitle,hide", "elm");
-
-               toolbar = elm_object_item_part_content_get(ad->misces_navi_it, "toolbar");
-               elm_object_item_disabled_set(elm_toolbar_last_item_get(toolbar), EINA_TRUE);
-               ad->misces_checked = 0;
-               SETTING_TRACE_ERROR("********** SET TO ZERO ad->misces_checked = 0");
-       }
-       SETTING_TRACE_ERROR("5");
-}
-
-/**
- * Delete 'Select All' item in genlist
- */
-static inline void storageUg_misces_gl_remove_select_all_item(SettingStorageUG *ad)
-{
-       SETTING_TRACE_BEGIN;
-       Evas_Object *gl = ad->gl_misces;
-
-       Elm_Object_Item *it = elm_genlist_first_item_get(gl);
-       if (it) {
-               elm_object_item_del     (it);
-       }
-}
-
-
-
-/**
- * "Select All" check button
- */
-static inline void storageUg_misces_gl_append_select_all_item(SettingStorageUG *ad)
-{
-       SETTING_TRACE_BEGIN;
-       int checked = 0;
-       Setting_GenGroupItem_Data *item_data = NULL;
-       //ad->gl_misces
-
-       evas_object_data_set(ad->gl_misces, "InsertType", "Prepend");
-
-       item_data = setting_create_Gendial_field_def(ad->gl_misces,
-                                                            &(itc_1text_1icon), storageUg_misces_sel_all_clicked, ad,
-                                                                SWALLOW_Type_1ICON_1RADIO, NULL, NULL, checked, _("IDS_ST_BODY_SELECT_ALL"), NULL,
-                                                            setting_storage_select_all_chk_btn_cb);
-
-       if (item_data) {
-               item_data->userdata = ad;
-               item_data->isItemHideFlag = TRUE;
-       } else {
-               SETTING_TRACE_ERROR("item_data is NULL");
-       }
-
-       evas_object_data_set(ad->gl_misces, "InsertType", "");
-}
-
-
-
 static inline void storageUg_misces_gl_append_items(SettingStorageUG *ad)
 {
-       SETTING_TRACE_BEGIN;
        int checked;
        Node_Info *node;
        Eina_List *found, *cur, *tmp_sel_list;
@@ -662,14 +320,13 @@ static inline void storageUg_misces_gl_append_items(SettingStorageUG *ad)
 
                item_data = setting_create_Gendial_field_def(ad->gl_misces,
                                                             &(itc_1text_1icon), storageUg_misces_genlist_sel, ad,
-                                                                SWALLOW_Type_1CHECK_RIGHT_INVISIBLE, NULL, NULL, checked, node->name, node->path,
+                                                            SWALLOW_Type_1CHECK_RIGHT, NULL, NULL, checked, node->name, node->path,
                                                             storageUg_misces_genlist_chk_cb);
 
                if (item_data) {
                        item_data->userdata = node;
                        node->data = item_data;
                        node->ad = ad;
-                       item_data->isItemHideFlag = TRUE;
                } else {
                        SETTING_TRACE_ERROR("item_data is NULL");
                }
@@ -687,13 +344,15 @@ static inline Evas_Object *storageUg_misces_genlist(Evas_Object *parent)
                SETTING_TRACE_ERROR("elm_genlist_add() Fail");
                return NULL;
        }
-       elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
-       elm_genlist_homogeneous_set(genlist, EINA_TRUE);
-       elm_genlist_block_count_set(genlist, 2);
+
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
+       elm_scroller_policy_set(genlist, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
        evas_object_show(genlist);
 
+       evas_object_smart_callback_add(genlist, "realized", __gl_realized_cb, NULL);
+
        return genlist;
 }
 
@@ -705,9 +364,7 @@ static void storageUg_misces_delete_list(SettingStorageUG *ad)
 
        ad->misces_checked = 0;
        Setting_GenGroupItem_Data *item_data = NULL;
-
-       /* Elm_Object_Item *it = elm_genlist_first_item_get(ad->gl_misces); */
-       Elm_Object_Item *it = elm_genlist_nth_item_get(ad->gl_misces, 1); /* second */
+       Elm_Object_Item *it = elm_genlist_first_item_get(ad->gl_misces);
 
        while (it) {
                item_data = elm_object_item_data_get(it);
@@ -717,14 +374,11 @@ static void storageUg_misces_delete_list(SettingStorageUG *ad)
                        if (item_data->chk_status) {
                                elm_object_item_del(item_data->item);
                                Node_Info *node = item_data->userdata;
-                               if (node)
-                               {
-                                       ad->misces_list = eina_list_remove(ad->misces_list, node);
-                                       FREE(node->id);
-                                       FREE(node->path);
-                                       FREE(node->name);
-                                       FREE(node);
-                               }
+                               ad->misces_list = eina_list_remove(ad->misces_list, node);
+                               FREE(node->id);
+                               FREE(node->path);
+                               FREE(node->name);
+                               FREE(node);
                        }
                }
        }
@@ -744,21 +398,19 @@ static void storageUg_misces_delete_list(SettingStorageUG *ad)
                        evas_object_hide(btn_cancel);
                }
                if (NULL == ad->misces_lo_noitem) {
-                       ad->misces_lo_noitem = _create_ly_misces_no_item(ad->navi);
+                       ad->misces_lo_noitem = storageUg_misces_no_item(ad->navi);
                }
 
+
                ad->gl_misces = NULL;
 
                if (ad->misces_lo_noitem) {
                        elm_object_item_part_content_set(ad->misces_navi_it, "elm.swallow.content", ad->misces_lo_noitem);
                }
+
        }
 }
 
-/**
- *
- * int misces_sz_all
- */
 static void storageUg_misces_add_list(SettingStorageUG *ad)
 {
        Evas_Object *toolbar, *btn;
@@ -773,7 +425,7 @@ static void storageUg_misces_add_list(SettingStorageUG *ad)
 
        if (0 == ad->misces_sz_all) {
                if (NULL == ad->misces_lo_noitem) {
-                       lo_new = ad->misces_lo_noitem = _create_ly_misces_no_item(ad->navi);
+                       lo_new = ad->misces_lo_noitem = storageUg_misces_no_item(ad->navi);
 
                        btn = elm_object_item_part_content_get(ad->misces_navi_it, "title_right_btn");
                        if (NULL != btn)
@@ -787,7 +439,6 @@ static void storageUg_misces_add_list(SettingStorageUG *ad)
                        lo_new = ad->gl_misces = storageUg_misces_genlist(ad->navi);
 
                storageUg_misces_gl_append_items(ad);
-
                ad->misces_lo_noitem = NULL;
        }
 
@@ -795,7 +446,6 @@ static void storageUg_misces_add_list(SettingStorageUG *ad)
                elm_object_item_part_content_set(ad->misces_navi_it, "elm.swallow.content", lo_new);
        }
 
-       /* disable toolbar object */
        if (0 == ad->misces_checked) {
                toolbar = elm_object_item_part_content_get(ad->misces_navi_it, "toolbar");
                if (NULL != toolbar)
@@ -811,7 +461,7 @@ void storageUg_misces_delete_files_cb(int fn_result, SettingStorageUG *ad)
 
        /* update genlist */
        SETTING_TRACE("After deleting, updating the file list");
-
+       /*      storageUg_misces_add_list(ad); */
        storageUg_misces_delete_list(ad);
 
        if (SETTING_RETURN_SUCCESS != fn_result) {
@@ -831,11 +481,6 @@ void storageUg_misces_delete_files_cb(int fn_result, SettingStorageUG *ad)
        }
 }
 
-
-/**
- * [controller] delete actual files with ad->misces_list
- * 
- */
 static int storageUg_misces_delete_files(SettingStorageUG *ad)
 {
        Eina_List *l = NULL;
@@ -864,10 +509,6 @@ static int storageUg_misces_delete_files(SettingStorageUG *ad)
        return SETTING_RETURN_SUCCESS;
 }
 
-
-/**
- * [UI] Done button -> create popup -> button handler
- */
 static void storageUg_misces_delete_resp(void *data, Evas_Object *obj,
                                          void *event_info)
 {
@@ -889,8 +530,6 @@ static void storageUg_misces_delete_resp(void *data, Evas_Object *obj,
                return;
        }
 
-       SETTING_TRACE(">>>>> checked : %d before deletion ", ad->misces_checked);
-
        if (ad->misces_checked) {
                ad->popup = setting_create_popup_with_progressbar(ad, ad->win, PROGRESSBAR_STYLE,
                                                                  NULL, NULL, storageUg_popup_del, 0, TRUE, TRUE, 0);
@@ -906,11 +545,8 @@ static void storageUg_misces_delete_resp(void *data, Evas_Object *obj,
        }
 }
 
-
-/**
- * Done button handler for 'delete'
- */
-static void storageUg_misces_delete_cb(void *data, Evas_Object *obj, void *event_info)
+static void storageUg_misces_delete_cb(void *data, Evas_Object *obj,
+                                       void *event_info)
 {
        SettingStorageUG *ad = (SettingStorageUG *) data;
 
@@ -922,52 +558,33 @@ static void storageUg_misces_delete_cb(void *data, Evas_Object *obj, void *event
                                                                         2, STORAGEUG_STR_DELETE, STORAGEUG_STR_CANCEL);
 }
 
-
-/**
- * Genlist Touch handler
- * @todo setting_storage_select_all_chk_btn_cb is similar to this function
- */
-static void storageUg_misces_sel_all_clicked(void *data, Evas_Object *obj, void *event_info)
+static void storageUg_misces_sel_all_clicked(void *data, Evas_Object *obj,
+                                             void *event_info)
 {
-       SETTING_TRACE_BEGIN;
        Eina_List *l = NULL;
        Evas_Object *toolbar;
        Node_Info *node = NULL;
        SettingStorageUG *ad = data;
-       //Setting_GenGroupItem_Data *list_item = (Setting_GenGroupItem_Data *) data;
-
        Setting_GenGroupItem_Data *item_data = NULL;
 
-       SETTING_TRACE_ERROR("1");
-
        ret_if(data == NULL);
 
        ad->misces_is_select_all = elm_check_state_get(obj);
 
-       SETTING_TRACE_ERROR("2 : ad->misces_is_select_all--->%d", ad->misces_is_select_all);
-       SETTING_TRACE_ERROR("ad->misces_list--->%x", ad->misces_list);
        EINA_LIST_FOREACH(ad->misces_list, l, node) {
                if (node && node->data) {
                        item_data = node->data;
-                       SETTING_TRACE_ERROR("2.1");
                        if (item_data) {
-                               item_data->chk_status = (ad->misces_is_select_all == 1) ? 0 : 1;
-                               SETTING_TRACE_ERROR("2.2");
+                               item_data->chk_status = ad->misces_is_select_all;
                                elm_object_item_data_set(item_data->item, item_data);
-                               SETTING_TRACE_ERROR("2.3");
                                storageUg_misces_handle_sel_list(ad, node->id, item_data->chk_status);
-                               SETTING_TRACE_ERROR("2.4");
                        }
                }
        }
 
-       SETTING_TRACE_ERROR("3");
        elm_genlist_realized_items_update(ad->gl_misces);
 
-       SETTING_TRACE_ERROR("4");
-       bool select_all_state = (ad->misces_is_select_all == 1) ? 0 : 1;
-
-       if (select_all_state) {
+       if (ad->misces_is_select_all) {
                char text[MAX_DISPLAY_NAME_LEN_ON_UI] = {0};
 
                snprintf(text, sizeof(text), _(STORAGEUG_STR_N_SELECTED), ad->misces_sz_all);
@@ -983,79 +600,50 @@ static void storageUg_misces_sel_all_clicked(void *data, Evas_Object *obj, void
                toolbar = elm_object_item_part_content_get(ad->misces_navi_it, "toolbar");
                elm_object_item_disabled_set(elm_toolbar_last_item_get(toolbar), EINA_TRUE);
                ad->misces_checked = 0;
-               SETTING_TRACE_ERROR("********** SET TO ZERO ad->misces_checked = 0");
        }
-       SETTING_TRACE_ERROR("5");
 }
 
-/**
- * Naviframe 'cancel' button handler
- */
-static void
-storageUg_misces_cancel_cb(void *data, Evas_Object *obj, void *event_info)
+static inline Evas_Object *storageUg_misces_create_sel_all(Evas_Object *parent,
+                                                           SettingStorageUG *ad)
 {
-       SETTING_TRACE_BEGIN;
-       setting_retm_if(data == NULL, "data is NULL");
-       SettingStorageUG *ad = data;
-
-       //ad->misces_ctx_popup_selected = true;
-       if (ad->misces_ctx_popup_selected) {
+       Evas_Object *btn, *icon;
 
-               SETTING_TRACE_ERROR("ad->misces_ctx_popup_selected == true");
+       btn = elm_button_add(parent);
+       elm_object_style_set(btn, "naviframe/title_icon");
 
-               // change UI style
-               ad->misces_ctx_popup_selected = false;
+       icon = elm_icon_add(btn);
+       elm_image_file_set(icon, SETTING_ICON_PATH_CFG"select_all.png", NULL);
 
-               // 1. remove 1st item of genlist
-               storageUg_misces_gl_remove_select_all_item(ad);
-               // 2. remove all 'toggle' from all list
-               _genlist_check_hide(ad, true);
+       evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_BOTH, 1 , 1);
+       elm_image_resizable_set(icon, EINA_TRUE, EINA_TRUE);
 
-               // remove sub text of naviframe title
-               elm_object_item_part_text_set(ad->misces_navi_it, "subtitle", "");
-               elm_object_item_signal_emit(ad->misces_navi_it, "elm,state,subtitle,hide", "elm");
-
-               Evas_Object *toolbar = NULL;
-               toolbar = elm_object_item_part_content_get(ad->misces_navi_it, "toolbar");
-               elm_object_item_disabled_set(elm_toolbar_last_item_get(toolbar), EINA_TRUE);
-               ad->misces_checked = 0;
-
-               #if 0
-               // delete all items
-               if (ad->misces_list) {
-                       storageUg_misces_clear_list(ad->misces_list);
-                       ad->misces_list = NULL;
-               }
-               #endif
+       elm_object_part_content_set(btn, "icon", icon);
+       evas_object_smart_callback_add(btn, "clicked", storageUg_misces_sel_all_clicked, ad);
 
-               // change button style
-               _update_navibar_buttons(ad);
+       evas_object_show(btn);
 
-               SETTING_TRACE_ERROR("********** SET TO ZERO ad->misces_checked = 0");
-
-       } else {
-               SETTING_TRACE_ERROR("ad->misces_ctx_popup_selected == false, go naviframe_back");
-               elm_naviframe_item_pop(ad->navi);
-       }
-
-       SETTING_TRACE_END;
+       return btn;
 }
-
 static void
-setting_storage_click_softkey_delete_cb(void *data, Evas_Object *obj, void *event_info)
+storageUg_misces_cancel_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
-       /* error check */
-       retm_if(data == NULL, "Data parameter is NULL");
-
-       SettingStorageUG *ad = (SettingStorageUG *) data;
-
-       return;
+       setting_retm_if(data == NULL, "data is NULL");
+       SettingStorageUG *ad = data;
+       elm_naviframe_item_pop(ad->navi);
+       SETTING_TRACE_END;
+}
+static void
+layout_select_all_down_cb(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
+{
+       Evas_Object *layout = obj;
+       SettingStorageUG *ad = data;
+       Evas_Object *check = elm_object_part_content_get(ad->select_all_layout, "elm.icon");
+       Eina_Bool state = elm_check_state_get(check);
+       elm_check_state_set(check, !state);
+       storageUg_misces_sel_all_clicked(ad, check, NULL);
 }
 
-//--------------------------------------------------
-//     name: "storageview_layout";
-//--------------------------------------------------
 static int storageUg_misces_create(void *data)
 {
        SettingStorageUG *ad = data;
@@ -1067,22 +655,39 @@ static int storageUg_misces_create(void *data)
        storageUg_meisces_get_list(ad);
 
        if (ad->misces_sz_all > 0) {
+               Evas_Object *box = elm_box_add(ad->navi);
+               evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+               evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+               /*select all layout*/
+               Evas_Object *layout = elm_layout_add(box);
+               elm_layout_theme_set(layout, "genlist", "item", "select_all/default");
+               evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
+               evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+               evas_object_show(layout);
+               ad->select_all_layout = layout;
+
+               Evas_Object *check = elm_check_add(layout);
+               evas_object_propagate_events_set(check, EINA_FALSE);
+               elm_object_part_content_set(layout, "elm.icon", check);
+               elm_object_part_text_set(layout, "elm.text.main", _("IDS_ST_BODY_SELECT_ALL"));
+               evas_object_smart_callback_add(check, "changed", storageUg_misces_sel_all_clicked, ad);
+               evas_object_event_callback_add(layout, EVAS_CALLBACK_MOUSE_DOWN, layout_select_all_down_cb, ad);
+               evas_object_show(layout);
+               elm_box_pack_end(box, layout);
 
                /*misc file list*/
                storageUg_misces_add_list(ad);
-               // focus a list
                elm_object_focus_set(ad->gl_misces, EINA_TRUE);
+               evas_object_show(ad->gl_misces);
+               elm_box_pack_end(box, ad->gl_misces);
+               evas_object_show(box);
 
-               // IDS_ST_BODY_MISCELLANEOUS_FILES
-               // STR_DELETE_ITEMS
-               ad->misces_navi_it = setting_push_layout_navi_bar(_(IDS_ST_BODY_MISCELLANEOUS_FILES),
-                                                                                                                       NULL, NULL, NULL,
-                                                                                                                       (setting_call_back_func)storageUg_misces_back_cb,
-                                                                                                                       NULL,
-                                                                                                                       NULL,
-                                                                                                                       ad, NULL, ad->navi, NULL);
+               ad->misces_navi_it = setting_push_layout_navi_bar(_(STR_DELETE_ITEMS),
+                                                                 STORAGEUG_STR_BACK, NULL, NULL,
+                                                                 (setting_call_back_func)storageUg_misces_back_cb, storageUg_misces_delete_cb,
+                                                                 NULL, ad, box, ad->navi, NULL);
 
-               elm_object_item_part_content_set(ad->misces_navi_it, "elm.swallow.content", ad->gl_misces);
 
                /* Title Cancel Button */
                ad->title_left_btn = elm_button_add(ad->navi);
@@ -1094,18 +699,12 @@ static int storageUg_misces_create(void *data)
                elm_object_style_set(ad->title_right_btn, "naviframe/title_done");
                evas_object_smart_callback_add(ad->title_right_btn, "clicked", storageUg_misces_delete_cb, ad);
        } else {
-
-               ad->misces_navi_it = setting_push_layout_navi_bar(_(IDS_ST_BODY_MISCELLANEOUS_FILES),
-                                                                                                                       NULL,
-                                                                                                                       NULL,
-                                                                                                                       NULL,
-                                                                                                                       (setting_call_back_func)storageUg_misces_back_cb,
-                                                                                                                       NULL,
-                                                                                                                       NULL,
-                                                                                                                       ad, NULL, ad->navi, NULL);
-
+               ad->misces_navi_it = setting_push_layout_navi_bar(_(STR_DELETE_ITEMS),
+                                                                 STORAGEUG_STR_BACK, NULL, NULL,
+                                                                 (setting_call_back_func)storageUg_misces_back_cb, NULL,
+                                                                 NULL, ad, NULL, ad->navi, NULL);
                if (NULL == ad->misces_lo_noitem) {
-                       ad->misces_lo_noitem = _create_ly_misces_no_item(ad->navi);
+                       ad->misces_lo_noitem = storageUg_misces_no_item(ad->navi);
 
                        Evas_Object *btn = elm_object_item_part_content_get(ad->misces_navi_it, "title_right_btn");
                        elm_object_disabled_set(btn, EINA_TRUE);
@@ -1116,13 +715,6 @@ static int storageUg_misces_create(void *data)
                        }
                }
        }
-       elm_naviframe_item_pop_cb_set(ad->misces_navi_it, storageUg_misces_back_cb, ad);
-
-       // Add ctx popup handler
-       Evas_Object* btn = elm_button_add(ad->navi);
-       elm_object_style_set(btn, "naviframe/more/default");
-       evas_object_smart_callback_add(btn, "clicked", create_ctxpopup_more_button_cb, ad);
-       elm_object_item_part_content_set(ad->misces_navi_it, "toolbar_more_btn", btn);
 
        setting_view_storage_misc.is_create = 1;
 
index 87ade33..9b638bc 100644 (file)
@@ -38,24 +38,20 @@ void storageUg_get_internal_storage_status(double *total, double *avail)
        int ret;
        double tmp_total;
        struct statvfs s;
-       const unsigned int GB = (1024 * 1024) * 1024;
-       const double sz_32G = 32. * GB;
-       const double sz_16G = 16. * GB;
-       const double sz_8G = 8. * GB;
+       const double sz_32G = 32. * 1073741824;
+       const double sz_16G = 16. * 1073741824;
+       const double sz_8G = 8. * 1073741824;
 
        ret_if(NULL == total);
        ret_if(NULL == avail);
 
        ret = storage_get_internal_memory_size(&s);
        if (0 == ret) {
-               SETTING_TRACE("Total = %lu, Available = %lu", (s.f_frsize * s.f_blocks),
-                             (s.f_bsize * s.f_bavail));
+               SETTING_TRACE("Total = %ld, Available = %ld", s.f_frsize * s.f_blocks,
+                             s.f_bsize * s.f_bavail);
                tmp_total = (double)s.f_frsize * s.f_blocks;
-               #if 0
-               *avail = (double)s.f_bfree * s.f_frsize;
-               #else
                *avail = (double)s.f_bsize * s.f_bavail;
-               #endif
+
                if (sz_16G < tmp_total)
                        *total = sz_32G;
                else if (sz_8G < tmp_total)
@@ -91,12 +87,7 @@ void storageUg_get_external_storage_status(const char *path, double *total,
                SETTING_TRACE("f_frsize = %ld f_blocks = %ld f_bsize = %ld f_bavail = %ld ",
                              s.f_frsize, s.f_blocks, s.f_bsize, s.f_bavail);
                *total = (double)s.f_frsize * s.f_blocks;
-               #if 0
                *avail = (double)s.f_bsize * s.f_bavail;
-               #else
-               *avail = (double)s.f_bfree * s.f_frsize;
-               SETTING_TRACE("NEW STYLE, %ld", *avail);
-               #endif
        }
 }
 
@@ -104,8 +95,8 @@ void storageUg_size_to_str(double size, char *desc, int desc_size)
 {
        double tmp_size = 0.0;
        const int KILOBYTE_VALUE = 1024;
-       const int MEGABYTE_VALUE = KILOBYTE_VALUE * 1024;
-       const int GIGABYTE_VALUE = MEGABYTE_VALUE * 1024;
+       const int MEGABYTE_VALUE = 1048576;
+       const int GIGABYTE_VALUE = 1073741824;
 
        if (size < MEGABYTE_VALUE) {    /* size < 1MB: show x.xKB */
                tmp_size = size / KILOBYTE_VALUE;
index 84cdf84..b2c4497 100644 (file)
@@ -138,7 +138,7 @@ static inline Evas_Object *storageUg_create_navi(Evas_Object *parent,
        elm_naviframe_prev_btn_auto_pushed_set(navi, EINA_FALSE);
 
        eext_object_event_callback_add(navi, EEXT_CALLBACK_BACK, storageUg_navi_back, ad);
-       eext_object_event_callback_add(navi, EEXT_CALLBACK_MORE, eext_naviframe_more_cb, ad);
+       /*eext_object_event_callback_add(navi, EEXT_CALLBACK_MORE, eext_naviframe_more_cb, NULL); */
 
        evas_object_show(navi);
        return navi;
index 00fb438..72277c0 100644 (file)
@@ -1121,19 +1121,20 @@ static void __setting_update_datefield_cb(void *cb)
                struct tm *ts = localtime_r(&cctime, &ts_ret);
                SETTING_TRACE("year : %d, month : %d, day : %d, hour : %d, min : %d",
                              ts_ret.tm_year, ts_ret.tm_mon, ts_ret.tm_mday, ts_ret.tm_hour, ts_ret.tm_min);
+               SETTING_TRACE("time : %s", ctime(&cctime));
                if (ts) {
 
-                       char* region = NULL;
-                       int err = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &region );
-                       char *date = __setting_phone_lang_get_by_pattern(region, "MMM/d/yyyy");
+                       char* lang = NULL;
+                       int err = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, &lang);
+                       char *date = __setting_phone_lang_get_by_pattern(lang, "MMM/d/yyyy");
                        char *time;
                        static char date_arr[DEF_BUF_SIZE], time_arr[DEF_BUF_SIZE];
                        char *pa_time_format = get_pa_time_format_str();
                        setting_retvm_if(NULL == pa_time_format, FALSE, "pa_time_format is NULL");
                        if (!strncmp(pa_time_format, "IDS_ST_BODY_12_HOURS", strlen("IDS_ST_BODY_12_HOURS")))
-                               time = __setting_phone_lang_get_by_pattern(region, "hhmm");
+                               time = __setting_phone_lang_get_by_pattern(lang, "hhmm");
                        else
-                               time = __setting_phone_lang_get_by_pattern(region, "Hm");
+                               time = __setting_phone_lang_get_by_pattern(lang, "Hm");
 
                        strncpy(date_arr, date, DEF_BUF_SIZE);
                        strncpy(time_arr, time, DEF_BUF_SIZE);
@@ -1364,6 +1365,12 @@ static void setting_time_main_mouse_up_Gendial_list_cb(void *data, Evas_Object *
        SettingTimeUG *ad = (SettingTimeUG *) data;
        SETTING_TRACE("clicking item[%s]", _(list_item->keyStr));
 
+#if 0
+       if (ad->data_time && ad->data_time != list_item) {
+               elm_object_focus_set(ad->data_time->eo_check, EINA_FALSE);
+       }
+#endif
+
        if (ad->data_tz == list_item) {
                ad->is_datefield_selected = EINA_FALSE;
                if (1 == setting_time_check_automatic_time_update_state()) {
@@ -1404,13 +1411,12 @@ static void setting_time_main_mouse_up_Gendial_list_cb(void *data, Evas_Object *
                } else {
                        __time_auto_update(ad);
                }
-       } else if (ad->data_time_fmt == list_item)      {
-               int err = 0;
-               setting_update_gl_item_chk_status(list_item, !list_item->chk_status);
-               int value = VCONFKEY_TIME_FORMAT_12;
-               if (list_item->chk_status)
-                       value = VCONFKEY_TIME_FORMAT_24;
-               setting_set_int_slp_key(INT_SLP_SETTING_REGIONFORMAT_TIME1224, value, &err);
+
+       } else if (ad->data_time_fmt == list_item
+                  || ad->data_date_fmt == list_item) {
+               ad->is_datefield_selected = EINA_FALSE;
+               bool status = !elm_genlist_item_expanded_get(item);
+               elm_genlist_item_expanded_set(item, status);
        }
 }
 
index c3ec739..b1c6ae6 100644 (file)
@@ -210,26 +210,28 @@ static void setting_main_lang_changed_cb(app_event_info_h event_info, void *data
        /*setting_main_appdata *ad = data; */
        setting_main_appdata *ad = g_main_ad;
 
+       char *tab_str[] = {
+               Keystr_Connection,
+               KeyStr_Device,
+               KeyStr_MotionControl,
+               "IDS_ST_BODY_GENERAL",
+               KeyStr_DownloadedAPPs
+       };
        int i = 0;
-       elm_object_item_part_text_set(ad->navibar_main_it, "elm.text.title", _("IDS_ST_OPT_SETTINGS"));
-       //setting_navi_items_update(ad->navibar_main);
 
-       char* localeLanguage = NULL;
-       system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, &localeLanguage);
-       elm_language_set(localeLanguage);
-       free(localeLanguage);
+       elm_object_item_part_text_set(ad->navibar_main_it, "elm.text.title", _("IDS_ST_OPT_SETTINGS"));
+       setting_navi_items_update(ad->navibar_main);
 
        if (ad->isInUGMode && ad->ug) {
-               // app launching
                Evas_Object *layout = (Evas_Object *)ug_get_layout(ad->ug);
                if (layout) {
                        Evas_Object *navi_bar = NULL;
                        navi_bar = elm_object_part_content_get(layout, "elm.swallow.content");
                        setting_navi_items_update(navi_bar);
                }
-
                ug_send_event(UG_EVENT_LANG_CHANGE);
        }
+
 }
 
 /**