fix toolbar button with changed concept on naviframe keys

diff --git a/setting-common/src/setting-common-draw-naviframe.c b/setting-common/src/setting-common-draw-naviframe.c
index 6fe9ce2..91805a8 100755 (executable)
--- a/setting-common/src/setting-common-draw-naviframe.c
+++ b/setting-common/src/setting-common-draw-naviframe.c
@@ -120,6 +120,12 @@ Elm_Object_Item *__create_navi_bar_bottom_buttons(char *title_str, char *lbutton
        Evas_Object *mbtn = NULL;
        Evas_Object *rbtn = NULL;
        Evas_Object *lbtn = NULL;
+       Evas_Object *toolbar = NULL;
+
+       toolbar = elm_toolbar_add(navigate_bar);
+       elm_object_style_set(toolbar, "default");
+       elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_EXPAND);
+       elm_toolbar_transverse_expanded_set(toolbar, EINA_TRUE);
 
        /*  arrange buttons into  controlbar*/
        if (0 == safeStrCmp(lbutton_str, _("IDS_COM_BODY_BACK"))) {     /*  do special handling */
@@ -129,21 +135,31 @@ Elm_Object_Item *__create_navi_bar_bottom_buttons(char *title_str, char *lbutton
 
                navi_it = elm_naviframe_item_push(navigate_bar, title_str, lbtn, NULL, eo_view, NULL);  /* add new button */
                elm_object_style_set(lbtn, NAVI_BACK_BUTTON_STYLE);     /* take into effect */
-
+               
                if (!rbutton_str && !mbutton_str) {
                        //do nothing..
                } else if (rbutton_str && mbutton_str) {        /* both exist.. */
-                       mbtn = setting_create_button(navigate_bar, mbutton_str, NAVI_DEF_BUTTON_STYLE, mbutton_click_cb, cb_data);
-                       rbtn = setting_create_button(navigate_bar, rbutton_str, NAVI_DEF_BUTTON_STYLE, rbutton_click_cb, cb_data);
-                       elm_object_item_part_content_set(navi_it, "toolbar_button1", mbtn);
-                       elm_object_item_part_content_set(navi_it, "toolbar_button2", rbtn);
+                       elm_toolbar_item_append(toolbar, NULL, mbutton_str, mbutton_click_cb, cb_data);
+                       elm_toolbar_item_append(toolbar, NULL, rbutton_str, rbutton_click_cb, cb_data);
+
+                       elm_object_item_part_content_set(navi_it, "toolbar", toolbar);
+                       //mbtn = setting_create_button(navigate_bar, mbutton_str, NAVI_DEF_BUTTON_STYLE, mbutton_click_cb, cb_data);
+                       //rbtn = setting_create_button(navigate_bar, rbutton_str, NAVI_DEF_BUTTON_STYLE, rbutton_click_cb, cb_data);
+                       //elm_object_item_part_content_set(navi_it, "toolbar_button1", mbtn);
+                       //elm_object_item_part_content_set(navi_it, "toolbar_button2", rbtn);
                } else if (rbutton_str) {       /* r_btn exist.. */
-                       rbtn = setting_create_button(navigate_bar, rbutton_str, NAVI_DEF_BUTTON_STYLE, rbutton_click_cb, cb_data);
-                       elm_object_item_part_content_set(navi_it, "toolbar_button1", rbtn);
+                       elm_toolbar_item_append(toolbar, NULL, rbutton_str, rbutton_click_cb, cb_data);
+
+                       elm_object_item_part_content_set(navi_it, "toolbar", toolbar);
+                       //rbtn = setting_create_button(navigate_bar, rbutton_str, NAVI_DEF_BUTTON_STYLE, rbutton_click_cb, cb_data);
+                       //elm_object_item_part_content_set(navi_it, "toolbar_button1", rbtn);
                        //elm_object_item_part_content_set(navi_it, "toolbar_button2", setting_create_button(navigate_bar, "", NULL, NULL, NULL));
                } else if (mbutton_str) {       /* m_btn exist.. */
-                       mbtn = setting_create_button(navigate_bar, mbutton_str, NAVI_DEF_BUTTON_STYLE, mbutton_click_cb, cb_data);
-                       elm_object_item_part_content_set(navi_it, "toolbar_button1", mbtn);
+                       elm_toolbar_item_append(toolbar, NULL, mbutton_str, mbutton_click_cb, cb_data);
+
+                       elm_object_item_part_content_set(navi_it, "toolbar", toolbar);
+                       //mbtn = setting_create_button(navigate_bar, mbutton_str, NAVI_DEF_BUTTON_STYLE, mbutton_click_cb, cb_data);
+                       //elm_object_item_part_content_set(navi_it, "toolbar_button1", mbtn);
                        //elm_object_item_part_content_set(navi_it, "toolbar_button2", setting_create_button(navigate_bar, "", NULL, NULL, NULL));
                }
                return navi_it;
@@ -153,10 +169,15 @@ Elm_Object_Item *__create_navi_bar_bottom_buttons(char *title_str, char *lbutton
        {
                lbtn = setting_create_button(navigate_bar, lbutton_str, NAVI_DEF_BUTTON_STYLE, lbutton_click_cb, cb_data);
                elm_object_item_part_content_set(navi_it, "toolbar_more_btn", lbtn);
-               mbtn = setting_create_button(navigate_bar, mbutton_str, NAVI_DEF_BUTTON_STYLE, mbutton_click_cb, cb_data);
-               elm_object_item_part_content_set(navi_it, "toolbar_button1", mbtn);
-               rbtn = setting_create_button(navigate_bar, rbutton_str, NAVI_DEF_BUTTON_STYLE, rbutton_click_cb, cb_data);
-               elm_object_item_part_content_set(navi_it, "toolbar_button2", rbtn);
+               //mbtn = setting_create_button(navigate_bar, mbutton_str, NAVI_DEF_BUTTON_STYLE, mbutton_click_cb, cb_data);
+               //elm_object_item_part_content_set(navi_it, "toolbar_button1", mbtn);
+               //rbtn = setting_create_button(navigate_bar, rbutton_str, NAVI_DEF_BUTTON_STYLE, rbutton_click_cb, cb_data);
+               //elm_object_item_part_content_set(navi_it, "toolbar_button2", rbtn);
+
+               elm_toolbar_item_append(toolbar, NULL, mbutton_str, mbutton_click_cb, cb_data);
+               elm_toolbar_item_append(toolbar, NULL, rbutton_str, rbutton_click_cb, cb_data);
+
+               elm_object_item_part_content_set(navi_it, "toolbar", toolbar);
        }
        else
        {
@@ -337,6 +358,7 @@ Elm_Object_Item *__push_navi_bar_bottom_buttons(char *title_str,
        Evas_Object *mbtn = NULL;
        Evas_Object *rbtn = NULL;
        Evas_Object *lbtn = NULL;
+       Evas_Object *toolbar = NULL;
 
        /*  arrange buttons into  controlbar*/
        if (0 == safeStrCmp(lbutton_str, _("IDS_COM_BODY_BACK"))) {
@@ -358,12 +380,18 @@ Elm_Object_Item *__push_navi_bar_bottom_buttons(char *title_str,
                        elm_object_item_part_content_set(navi_it, "toolbar_button1", mbtn);
                        elm_object_item_part_content_set(navi_it, "toolbar_button2", rbtn);
                } else if (rbutton_str) {
-                       rbtn = setting_create_button(navigate_bar, rbutton_str, NAVI_DEF_BUTTON_STYLE, rbutton_click_cb, cb_data);
-                       elm_object_item_part_content_set(navi_it, "toolbar_button1", rbtn);
+                       elm_toolbar_item_append(toolbar, NULL, rbutton_str, rbutton_click_cb, cb_data);
+
+                       elm_object_item_part_content_set(navi_it, "toolbar", toolbar);
+                       //rbtn = setting_create_button(navigate_bar, rbutton_str, NAVI_DEF_BUTTON_STYLE, rbutton_click_cb, cb_data);
+                       //elm_object_item_part_content_set(navi_it, "toolbar_button1", rbtn);
                        //elm_object_item_part_content_set(navi_it, "toolbar_button2", setting_create_button(navigate_bar, "", NULL, NULL, NULL));
                } else if (mbutton_str) {
-                       mbtn = setting_create_button(navigate_bar, mbutton_str, NAVI_DEF_BUTTON_STYLE, mbutton_click_cb, cb_data);
-                       elm_object_item_part_content_set(navi_it, "toolbar_button1", mbtn);
+                       elm_toolbar_item_append(toolbar, NULL, mbutton_str, mbutton_click_cb, cb_data);
+
+                       elm_object_item_part_content_set(navi_it, "toolbar", toolbar);
+                       //mbtn = setting_create_button(navigate_bar, mbutton_str, NAVI_DEF_BUTTON_STYLE, mbutton_click_cb, cb_data);
+                       //elm_object_item_part_content_set(navi_it, "toolbar_button1", mbtn);
                        //elm_object_item_part_content_set(navi_it, "toolbar_button2", setting_create_button(navigate_bar, "", NULL, NULL, NULL));
                }
        } else {        /*  no need back button on navi_bar */
@@ -381,10 +409,15 @@ Elm_Object_Item *__push_navi_bar_bottom_buttons(char *title_str,
                {
                        lbtn = setting_create_button(navigate_bar, lbutton_str, NAVI_DEF_BUTTON_STYLE, lbutton_click_cb, cb_data);
                        elm_object_item_part_content_set(navi_it, "toolbar_more_btn", lbtn);
-                       mbtn = setting_create_button(navigate_bar, mbutton_str, NAVI_DEF_BUTTON_STYLE, mbutton_click_cb, cb_data);
-                       elm_object_item_part_content_set(navi_it, "toolbar_button1", mbtn);
-                       rbtn = setting_create_button(navigate_bar, rbutton_str, NAVI_DEF_BUTTON_STYLE, rbutton_click_cb, cb_data);
-                       elm_object_item_part_content_set(navi_it, "toolbar_button2", rbtn);
+                       //mbtn = setting_create_button(navigate_bar, mbutton_str, NAVI_DEF_BUTTON_STYLE, mbutton_click_cb, cb_data);
+                       //elm_object_item_part_content_set(navi_it, "toolbar_button1", mbtn);
+                       //rbtn = setting_create_button(navigate_bar, rbutton_str, NAVI_DEF_BUTTON_STYLE, rbutton_click_cb, cb_data);
+                       //elm_object_item_part_content_set(navi_it, "toolbar_button2", rbtn);
+
+                       elm_toolbar_item_append(toolbar, NULL, mbutton_str, mbutton_click_cb, cb_data);
+                       elm_toolbar_item_append(toolbar, NULL, rbutton_str, rbutton_click_cb, cb_data);
+
+                       elm_object_item_part_content_set(navi_it, "toolbar", toolbar);
                }
                else
                {

diff --git a/setting-privacy/src/setting-privacy-service.c b/setting-privacy/src/setting-privacy-service.c
index 79db48b..bd19dc4 100755 (executable)
--- a/setting-privacy/src/setting-privacy-service.c
+++ b/setting-privacy/src/setting-privacy-service.c
@@ -273,7 +273,7 @@ static int setting_privacy_service_create(void *cb)
            setting_create_layout_navi_bar_genlist(ad->win_main_layout,
                                                   ad->win_get,
                                                   ad->pkg_label,
-                                                  NULL, //_("IDS_COM_BODY_BACK"),
+                                                  _("IDS_COM_BODY_BACK"), //_("IDS_COM_BODY_BACK"),
                                                   _("IDS_COM_SK_OK"), //
                                                   NULL, //setting_privacy_service_click_softkey_back_cb,
                                                   setting_privacy_service_click_softkey_ok_cb,