[UI] Toolbar added to the 'service providers' view.

Change-Id: Ie5427bc0c378dc3f9b261745471428386690d1af
Signed-off-by: Michal Skorupinski <m.skorupinsk@samsung.com>

diff --git a/setting-network/include/setting-network.h b/setting-network/include/setting-network.h
index 0928d52502a812efb7bb503361ed24975705d306..e248bfd2f93080ee1d58724faf34d5a86f2385dc 100644 (file)
--- a/setting-network/include/setting-network.h
+++ b/setting-network/include/setting-network.h
@@ -232,5 +232,6 @@ void setting_tapi_set_band_cb(TapiHandle *handle, int result, void *data,
 void setting_network_popup_delete(void *data);
 char *setting_network_get_default_profile_name(int conType, SettingNetwork *ad);
 void setting_network_mode_app_control(SettingNetwork *ad);
+bool setting_network_add_sim_toolbar(SettingNetwork *ad, Elm_Object_Item *page, Evas_Smart_Cb func);
 
 #endif                         /* __SETTING_NETWORK_H__ */

diff --git a/setting-network/src/setting-network-con.c b/setting-network/src/setting-network-con.c
index 435f9ef6873f8bbfcf1d0e4a3cee2f21ba3f1b02..4651cf55fa054c0eab604914a211517a05e56bd3 100644 (file)
--- a/setting-network/src/setting-network-con.c
+++ b/setting-network/src/setting-network-con.c
@@ -229,35 +229,14 @@ static void _sim_selected_cb(void *data, Evas_Object *obj, void *event_info)
        SettingNetwork *ad = (SettingNetwork *)data;
        Elm_Widget_Item *selected_item = elm_toolbar_selected_item_get(obj);
 
-       if (selected_item == elm_toolbar_first_item_get(obj)) {
+       if (selected_item == elm_toolbar_first_item_get(obj))
                ad->connections_sim_selected = 0;
-       } else {
+       else
                ad->connections_sim_selected = 1;
-       }
 
        __setting_network_con_genlist_create(data);
 }
 
-static bool _add_toolbar(SettingNetwork *ad, Elm_Object_Item *page)
-{
-       Evas_Object *toolbar =  elm_toolbar_add(ad->md.naviframe);
-       if (!toolbar) {
-               dlog_print(DLOG_ERROR, LOG_TAG, "[%s:%d] toolbar == NULL", __FILE__, __LINE__);
-               return false;
-       }
-
-       elm_object_style_set(toolbar, "tabbar_with_title");
-       elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_EXPAND);
-
-       elm_toolbar_transverse_expanded_set(toolbar, EINA_TRUE);
-       elm_toolbar_item_append(toolbar, NULL, "Sim 1", _sim_selected_cb, (void *)ad);
-       elm_toolbar_item_append(toolbar, NULL, "Sim 2", _sim_selected_cb, (void *)ad);
-       elm_toolbar_select_mode_set(toolbar, ELM_OBJECT_SELECT_MODE_ALWAYS);
-       elm_object_item_part_content_set(page, "tabbar", toolbar);
-
-       return true;
-}
-
 /**
  * Connections
  */
@@ -282,7 +261,7 @@ static int setting_network_con_create(void *cb)
                        ad->md.naviframe);
 
        elm_naviframe_item_style_set(navi_it, "tabbar");
-       _add_toolbar(ad, navi_it);
+       setting_network_add_sim_toolbar(ad, navi_it, _sim_selected_cb);
 
        __setting_network_con_genlist_create(ad);
 

diff --git a/setting-network/src/setting-network-select-network.c b/setting-network/src/setting-network-select-network.c
index 030f648ebc8940d7d432c3774202161e12deefef..1f986e15a5fa1e097bccbc5fe851f7092a940594 100644 (file)
--- a/setting-network/src/setting-network-select-network.c
+++ b/setting-network/src/setting-network-select-network.c
@@ -61,6 +61,8 @@ static struct select_network_info {
        bool b_set_auto_network;
        bool b_set_manul_network;
 
+       int sim_selected;
+
        Evas_Point point_down;
 } s_info = {
        .ad = NULL,
@@ -1053,21 +1055,31 @@ static void _network_main_gl_mouse_move(void *data, Evas *e, Evas_Object *obj, v
                        ELM_GENLIST_ITEM_FIELD_TEXT);
 }
 
+static void _sim_selected_cb(void *data, Evas_Object *obj, void *event_info)
+{
+
+}
+
+
 
 static int _view_create(void *cb)
 {
        SETTING_TRACE_BEGIN;
        s_info.ad = (SettingNetwork *)cb;
 
-       setting_create_genlist_and_push_to_naviframe(
+       Elm_Object_Item *page = setting_create_genlist_and_push_to_naviframe(
                        "IDS_COM_BODY_NETWORK_OPERATORS",
                        _("IDS_ST_BUTTON_BACK"), _naviframe_item_pop_cb, NULL,
                        &s_info.genlist_sel_network, s_info.ad->md.naviframe);
 
+       elm_naviframe_item_style_set(page, "tabbar");
+       setting_network_add_sim_toolbar(s_info.ad, page, _sim_selected_cb);
+
        /* scroller is a genlist */
        s_info.chk_sel = elm_radio_add(s_info.genlist_sel_network);
        elm_radio_state_value_set(s_info.chk_sel, -1);
        /*retrieve here */
+
        vconf_get_int(VCONFKEY_SETAPPL_SELECT_NETWORK_INT, &s_info.sel_net);
        SETTING_TRACE("s_info.sel_net:%d", s_info.sel_net);
 

diff --git a/setting-network/src/setting-network.c b/setting-network/src/setting-network.c
index d26a74c1560fbe72ae5275dcfe62d94934753bdc..759c901b3b324374d98ed5e64ae073841b907503 100644 (file)
--- a/setting-network/src/setting-network.c
+++ b/setting-network/src/setting-network.c
@@ -28,6 +28,28 @@
 #define SETTING_NETWORK_PACKAGE_NAME "org.tizen.setting-network"
 #define MAX_ID_LEN 512
 
+bool setting_network_add_sim_toolbar(SettingNetwork *ad, Elm_Object_Item *page, Evas_Smart_Cb func)
+{
+       Elm_Widget_Item *item;
+       Evas_Object *toolbar =  elm_toolbar_add(ad->md.naviframe);
+       if (!toolbar) {
+               dlog_print(DLOG_ERROR, LOG_TAG, "[%s:%d] toolbar == NULL", __FILE__, __LINE__);
+               return false;
+       }
+
+       elm_object_style_set(toolbar, "tabbar_with_title");
+       elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_EXPAND);
+
+       elm_toolbar_transverse_expanded_set(toolbar, EINA_TRUE);
+       item = elm_toolbar_item_append(toolbar, NULL, "Sim 1", func, (void *)ad);
+       elm_toolbar_item_append(toolbar, NULL, "Sim 2", func, (void *)ad);
+       elm_toolbar_select_mode_set(toolbar, ELM_OBJECT_SELECT_MODE_ALWAYS);
+       elm_object_item_part_content_set(page, "tabbar", toolbar);
+
+       elm_toolbar_item_selected_set(item, EINA_TRUE);
+
+       return true;
+}
 /**
  * @brief Get default MMS profile name
  * @return Pointer to profile name or NULL in case of error/unavailable