rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=096df8434d5296073db49caaf9e79ad39e6ec902
commit 096df8434d5296073db49caaf9e79ad39e6ec902 Author: Vyacheslav Reutskiy <v.reuts...@samsung.com> Date: Mon May 16 14:47:30 2016 +0300 eflete: rename member 'right_top' to 'tabs' Use more correctly name Change-Id: Iae9eb4a67c3d76442367229e8c0521f880cc0f04 --- src/bin/eflete.h | 3 ++- src/bin/ui/main_window.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/bin/eflete.h b/src/bin/eflete.h index 3982626..98d8267 100644 --- a/src/bin/eflete.h +++ b/src/bin/eflete.h @@ -93,6 +93,7 @@ struct _App_Data Eina_Stringshare *last_path; Evas_Object *splash; Evas_Object *statusbar; /**< The statusbar object, which contain some items */ + Evas_Object *tabs; struct { Evas_Object *left; Evas_Object *right; @@ -103,7 +104,7 @@ struct _App_Data } property; struct { - Evas_Object *right_top, *history; + Evas_Object *history; Elm_Object_Item *item_history, *item_property; } block; Project *project; diff --git a/src/bin/ui/main_window.c b/src/bin/ui/main_window.c index 5b0bff1..070d355 100644 --- a/src/bin/ui/main_window.c +++ b/src/bin/ui/main_window.c @@ -73,14 +73,14 @@ _history_click(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - elm_layout_signal_emit(ap.block.right_top, "history,show", "eflete"); + elm_layout_signal_emit(ap.tabs, "history,show", "eflete"); } static void _property_click(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - elm_layout_signal_emit(ap.block.right_top, "property,show", "eflete"); + elm_layout_signal_emit(ap.tabs, "property,show", "eflete"); } static void @@ -165,12 +165,12 @@ ui_main_window_add(void) elm_object_part_content_set(ap.panes.right, "left", tabs); /* add tabs with history and signals */ - ap.block.right_top = elm_layout_add(ap.win); - elm_layout_theme_set(ap.block.right_top, "layout", "tabs", "property"); + ap.tabs = elm_layout_add(ap.win); + elm_layout_theme_set(ap.tabs, "layout", "tabs", "property"); - toolbar = elm_toolbar_add(ap.block.right_top); + toolbar = elm_toolbar_add(ap.tabs); elm_object_style_set(toolbar, "editor_tabs_horizontal"); - elm_layout_content_set(ap.block.right_top, "elm.swallow.toolbar", toolbar); + elm_layout_content_set(ap.tabs, "elm.swallow.toolbar", toolbar); elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_SCROLL); elm_toolbar_select_mode_set(toolbar, ELM_OBJECT_SELECT_MODE_ALWAYS); evas_object_size_hint_weight_set(toolbar, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -190,10 +190,10 @@ ui_main_window_add(void) evas_object_smart_callback_add(ap.win, SIGNAL_SHORTCUT_QUIT, _on_done, NULL); ap.property.group = ui_property_add(ap.win); - elm_layout_content_set(ap.block.right_top, "elm.swallow.property", ap.property.group); + elm_layout_content_set(ap.tabs, "elm.swallow.property", ap.property.group); ap.block.history = history_ui_add(); - elm_layout_content_set(ap.block.right_top, "elm.swallow.history", ap.block.history); - elm_object_part_content_set(ap.panes.right, "right", ap.block.right_top); + elm_layout_content_set(ap.tabs, "elm.swallow.history", ap.block.history); + elm_object_part_content_set(ap.panes.right, "right", ap.tabs); ap.menu = ui_menu_add(); --