hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=e6bfbd85c9e54c35acd8e70cbe28ffdff739bfbf

commit e6bfbd85c9e54c35acd8e70cbe28ffdff739bfbf
Author: Hermet Park <her...@hermet.pe.kr>
Date:   Sun Apr 17 11:12:53 2016 +0900

    setting: code refactoring
    
    internal variable name change.
    
    there are no tabbar in elementary.
---
 data/themes/default/layout_setting.edc |  4 ++--
 src/bin/setting.c                      | 22 ++++++++++------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/data/themes/default/layout_setting.edc 
b/data/themes/default/layout_setting.edc
index 18b42b7..64b1777 100644
--- a/data/themes/default/layout_setting.edc
+++ b/data/themes/default/layout_setting.edc
@@ -104,7 +104,7 @@ group { name: "setting_layout";
             color: COL_HI;
          }
       }
-      part { name: "elm.swallow.tabbar";
+      part { name: "elm.swallow.toolbar";
          type: SWALLOW;
          scale: 1;
          clip_to: "clipper";
@@ -123,7 +123,7 @@ group { name: "setting_layout";
          clip_to: "clipper";
          description { state: "default" 0.0;
             rel1 {
-               to: "elm.swallow.tabbar";
+               to: "elm.swallow.toolbar";
                relative: 0.0 1.0;
             }
             rel2 {
diff --git a/src/bin/setting.c b/src/bin/setting.c
index b9af353..9a2c76e 100644
--- a/src/bin/setting.c
+++ b/src/bin/setting.c
@@ -12,9 +12,7 @@ typedef enum {
 typedef struct setting_s
 {
    Evas_Object *setting_layout;
-
-   Evas_Object *tabbar;
-
+   Evas_Object *toolbar;
    Evas_Object *general_layout;
 
    Evas_Object *img_path_entry;
@@ -491,7 +489,7 @@ focus_custom_chain_set(setting_data *sd, Evas_Object 
*content)
 {
    //Set a custom chain to set the focus order.
    Eina_List *custom_chain = NULL;
-   custom_chain = eina_list_append(custom_chain, sd->tabbar);
+   custom_chain = eina_list_append(custom_chain, sd->toolbar);
    custom_chain = eina_list_append(custom_chain, sd->general_layout);
    custom_chain = eina_list_append(custom_chain, sd->apply_btn);
    custom_chain = eina_list_append(custom_chain, sd->reset_btn);
@@ -576,15 +574,15 @@ setting_open(void)
    base_win_resize_object_add(layout);
 
    //Tabbar
-   Evas_Object *tabbar = elm_toolbar_add(layout);
-   elm_toolbar_shrink_mode_set(tabbar, ELM_TOOLBAR_SHRINK_EXPAND);
-   elm_toolbar_select_mode_set(tabbar, ELM_OBJECT_SELECT_MODE_ALWAYS);
-   evas_object_size_hint_weight_set(tabbar, EVAS_HINT_EXPAND, 
EVAS_HINT_EXPAND);
+   Evas_Object *toolbar = elm_toolbar_add(layout);
+   elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_EXPAND);
+   elm_toolbar_select_mode_set(toolbar, ELM_OBJECT_SELECT_MODE_ALWAYS);
+   evas_object_size_hint_weight_set(toolbar, EVAS_HINT_EXPAND, 
EVAS_HINT_EXPAND);
 
-   elm_toolbar_item_append(tabbar, NULL, _("General"), toolbar_general_cb, sd);
-   elm_toolbar_item_append(tabbar, NULL, _("Text Editor"), toolbar_text_cb, 
sd);
+   elm_toolbar_item_append(toolbar, NULL, _("General"), toolbar_general_cb, 
sd);
+   elm_toolbar_item_append(toolbar, NULL, _("Text Editor"), toolbar_text_cb, 
sd);
 
-   elm_object_part_content_set(layout, "elm.swallow.tabbar", tabbar);
+   elm_object_part_content_set(layout, "elm.swallow.toolbar", toolbar);
 
    //General layout
    Evas_Object *general_layout = general_layout_create(sd, layout);
@@ -612,7 +610,7 @@ setting_open(void)
    elm_object_part_content_set(layout, "elm.swallow.cancel_btn", cancel_btn);
 
    sd->setting_layout = layout;
-   sd->tabbar = tabbar;
+   sd->toolbar = toolbar;
    sd->apply_btn = apply_btn;
    sd->reset_btn = reset_btn;
    sd->cancel_btn = cancel_btn;

-- 


Reply via email to