enlightenment/enventor
enlightenment
/
enventor
6
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

setting: code refactoring 

internal variable name change.

there are no tabbar in elementary.
This commit is contained in:
Hermet Park 2016-04-17 11:12:53 +09:00
parent 8a837c3b4a
commit e6bfbd85c9
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/themes/default/layout_setting.edc
View File

@ -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 {

22
src/bin/setting.c
View File

@ -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;