rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=0cda268a18acc5508e4ca2a1aad09dfb0c928d65
commit 0cda268a18acc5508e4ca2a1aad09dfb0c928d65 Author: Andrii Kroitor <[email protected]> Date: Mon Nov 9 11:19:04 2015 +0200 rename part_list into group_navigator --- data/themes/default/widgets/layout.edc | 2 +- po/POTFILES.in | 2 +- src/bin/Makefile.am | 2 +- src/bin/ui/{part_list.c => group_navigator.c} | 32 +++++++++++----------- src/bin/ui/{part_list.h => group_navigator.h} | 16 +++++------ src/bin/ui/tabs.c | 2 +- src/bin/ui/workspace/workspace.c | 38 +++++++++++++-------------- src/bin/ui/workspace/workspace.h | 2 +- 8 files changed, 48 insertions(+), 48 deletions(-) diff --git a/data/themes/default/widgets/layout.edc b/data/themes/default/widgets/layout.edc index c453f5e..e64d001 100644 --- a/data/themes/default/widgets/layout.edc +++ b/data/themes/default/widgets/layout.edc @@ -489,7 +489,7 @@ group { name: "elm/layout/navigator/default"; } } -group { name: "elm/layout/part_list/default"; +group { name: "elm/layout/group_navigator/default"; parts { part { name: "bg"; type: RECT; diff --git a/po/POTFILES.in b/po/POTFILES.in index a743d06..0d0b12f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -70,7 +70,7 @@ src/bin/ui/menu.c src/bin/ui/modal_window/modal_window.c src/bin/ui/project_navigator.c src/bin/ui/notification/notify.c -src/bin/ui/part_list.c +src/bin/ui/group_navigator.c src/bin/ui/preference/preference.c src/bin/ui/project_close.c src/bin/ui/property.c diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index e69885d..d444ef9 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -26,7 +26,7 @@ libete_a_SOURCES = \ ../../src/bin/editor/editor_states.c \ ../../src/bin/editor/editor_text.c \ ../../src/bin/ui/history_ui.c \ -../../src/bin/ui/part_list.c \ +../../src/bin/ui/group_navigator.c \ ../../src/bin/ui/cursor.c \ ../../src/bin/ui/menu.c \ ../../src/bin/ui/main_window.c \ diff --git a/src/bin/ui/part_list.c b/src/bin/ui/group_navigator.c similarity index 96% rename from src/bin/ui/part_list.c rename to src/bin/ui/group_navigator.c index a6cbcdf..8ab867c 100644 --- a/src/bin/ui/part_list.c +++ b/src/bin/ui/group_navigator.c @@ -20,14 +20,14 @@ #define EFL_BETA_API_SUPPORT #define EFL_EO_API_SUPPORT -#include "part_list.h" +#include "group_navigator.h" #include "signals.h" #include "string_common.h" #include "main_window.h" #include "editor.h" #include "new_history.h" -#define PART_LIST_DATA "part_list_data" +#define GROUP_NAVIGATOR_DATA "group_navigator_data" typedef struct { @@ -277,7 +277,7 @@ _on_activated(void *data, part = elm_object_item_data_get(pl->selected_part_item); part->current_state = elm_object_item_data_get(glit); - evas_object_smart_callback_call(pl->layout, SIGNAL_PART_LIST_PART_STATE_SELECTED, + evas_object_smart_callback_call(pl->layout, SIGNAL_GROUP_NAVIGATOR_PART_STATE_SELECTED, (void *)part); } } @@ -426,7 +426,7 @@ _selected_cb(void *data, pl->selected_part_item = glit; part->current_item_name = item_name; pl->group->current_part = part; - evas_object_smart_callback_call(pl->layout, SIGNAL_PART_LIST_PART_SELECTED, + evas_object_smart_callback_call(pl->layout, SIGNAL_GROUP_NAVIGATOR_PART_SELECTED, (void *)part); elm_genlist_item_item_class_update(glit, pl->itc_part_selected); } @@ -508,7 +508,7 @@ _popup_add_part_ok_clicked(void *data, void *event_info __UNUSED__) { const Edje_Part_Type type = *((const Edje_Part_Type *)data); - Part_List *pl = evas_object_data_get(obj, PART_LIST_DATA); + Part_List *pl = evas_object_data_get(obj, GROUP_NAVIGATOR_DATA); const char *name; Part_ *part; Elm_Object_Item *glit; @@ -545,7 +545,7 @@ _on_menu_add_part_clicked(void *data, void *ei __UNUSED__) { const Edje_Part_Type type = *((const Edje_Part_Type *)data); - Part_List *pl = evas_object_data_get(obj, PART_LIST_DATA); + Part_List *pl = evas_object_data_get(obj, GROUP_NAVIGATOR_DATA); Eina_Stringshare *title; Evas_Object *box, *item; @@ -570,7 +570,7 @@ _on_menu_add_part_clicked(void *data, elm_object_content_set(ap.popup, box); BUTTON_ADD(box, pl->popup.btn_add, _("Add")); - evas_object_data_set(pl->popup.btn_add, PART_LIST_DATA, pl); + evas_object_data_set(pl->popup.btn_add, GROUP_NAVIGATOR_DATA, pl); evas_object_smart_callback_add(pl->popup.btn_add, "clicked", _popup_add_part_ok_clicked, data); elm_object_part_content_set(ap.popup, "button1", pl->popup.btn_add); elm_object_disabled_set(pl->popup.btn_add, true); @@ -694,7 +694,7 @@ _on_menu_add_state_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ei __UNUSED__) { - Part_List *pl = evas_object_data_get(obj, PART_LIST_DATA); + Part_List *pl = evas_object_data_get(obj, GROUP_NAVIGATOR_DATA); Part_ *part; State *state; Eina_Stringshare *title; @@ -817,7 +817,7 @@ _on_btn_minus_clicked(void *data, Evas_Object * -part_list_add(Group *group) +group_navigator_add(Group *group) { Evas_Object *icon; Part_List *pl; @@ -830,10 +830,10 @@ part_list_add(Group *group) pl = mem_calloc(1, sizeof(Part_List)); pl->layout = elm_layout_add(ap.win); - elm_layout_theme_set(pl->layout, "layout", "part_list", "default"); + elm_layout_theme_set(pl->layout, "layout", "group_navigator", "default"); evas_object_show(pl->layout); - evas_object_data_set(pl->layout, PART_LIST_DATA, pl); + evas_object_data_set(pl->layout, GROUP_NAVIGATOR_DATA, pl); pl->group = group; @@ -907,7 +907,7 @@ part_list_add(Group *group) elm_object_text_set(pl->layout, pl->group->name); pl->menu = elm_menu_add(ap.win); - evas_object_data_set(pl->menu, PART_LIST_DATA, pl); + evas_object_data_set(pl->menu, GROUP_NAVIGATOR_DATA, pl); pl->add_state_menu_item = elm_menu_item_add(pl->menu, NULL, NULL, _("State"), _on_menu_add_state_clicked, NULL); elm_object_item_disabled_set(pl->add_state_menu_item, true); @@ -943,11 +943,11 @@ part_list_add(Group *group) } void -part_list_part_select(Evas_Object *obj, Part_ *part) +group_navigator_part_select(Evas_Object *obj, Part_ *part) { Part_ *pr; Elm_Object_Item *part_item; - Part_List *pl = evas_object_data_get(obj, PART_LIST_DATA); + Part_List *pl = evas_object_data_get(obj, GROUP_NAVIGATOR_DATA); assert(pl != NULL); @@ -973,11 +973,11 @@ part_list_part_select(Evas_Object *obj, Part_ *part) } void -part_list_part_update(Evas_Object *obj, Part_ *part) +group_navigator_part_update(Evas_Object *obj, Part_ *part) { Part_ *pr; Elm_Object_Item *part_item; - Part_List *pl = evas_object_data_get(obj, PART_LIST_DATA); + Part_List *pl = evas_object_data_get(obj, GROUP_NAVIGATOR_DATA); assert(pl != NULL); assert(part != NULL); diff --git a/src/bin/ui/part_list.h b/src/bin/ui/group_navigator.h similarity index 74% rename from src/bin/ui/part_list.h rename to src/bin/ui/group_navigator.h index be79bf7..40f3fd9 100644 --- a/src/bin/ui/part_list.h +++ b/src/bin/ui/group_navigator.h @@ -17,8 +17,8 @@ * along with this program; If not, see www.gnu.org/licenses/lgpl.html. */ -#ifndef PART_LIST_H -#define PART_LIST_H +#ifndef GROUP_NAVIGATOR_H +#define GROUP_NAVIGATOR_H #include "eflete.h" #include "group_manager.h" @@ -35,7 +35,7 @@ * * @ingroup Partlist */ -#define SIGNAL_PART_LIST_PART_SELECTED "SIGNAL_PART_LIST_PART_SELECTED" +#define SIGNAL_GROUP_NAVIGATOR_PART_SELECTED "SIGNAL_GROUP_NAVIGATOR_PART_SELECTED" /** * emited when part state is activated in part list. @@ -43,23 +43,23 @@ * * @ingroup Partlist */ -#define SIGNAL_PART_LIST_PART_STATE_SELECTED "SIGNAL_PART_LIST_PART_STATE_SELECTED" +#define SIGNAL_GROUP_NAVIGATOR_PART_STATE_SELECTED "SIGNAL_GROUP_NAVIGATOR_PART_STATE_SELECTED" /** * @ingroup Partlist */ Evas_Object * -part_list_add(Group *group); +group_navigator_add(Group *group); /** * @ingroup Partlist */ void -part_list_part_select(Evas_Object *obj, Part_ *part); +group_navigator_part_select(Evas_Object *obj, Part_ *part); /** * @ingroup Partlist */ void -part_list_part_update(Evas_Object *obj, Part_ *part); -#endif /* PART_LIST_H */ +group_navigator_part_update(Evas_Object *obj, Part_ *part); +#endif /* GROUP_NAVIGATOR_H */ diff --git a/src/bin/ui/tabs.c b/src/bin/ui/tabs.c index f7b7a94..ed9d3b4 100644 --- a/src/bin/ui/tabs.c +++ b/src/bin/ui/tabs.c @@ -248,7 +248,7 @@ _part_renamed(void *data __UNUSED__, part = pm_resource_unsorted_get(tabs.current_group->parts, ren->old_name); gm_part_rename(part, ren->new_name); - workspace_part_list_update_part(tabs.current_workspace, part); + workspace_group_navigator_update_part(tabs.current_workspace, part); TODO("update live_view here"); } diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c index 001e62e..4426ec3 100644 --- a/src/bin/ui/workspace/workspace.c +++ b/src/bin/ui/workspace/workspace.c @@ -23,7 +23,7 @@ #include "groupedit.h" #include "container.h" #include "eflete.h" -#include "part_list.h" +#include "group_navigator.h" #include "signals.h" #include "new_history.h" #include "editor.h" @@ -115,7 +115,7 @@ struct _Ws_Smart_Data Group *group; Evas_Object *panes; - Evas_Object *part_list; + Evas_Object *group_navigator; struct { Evas_Object *highlight; /**< A highlight object */ @@ -1353,11 +1353,11 @@ _on_groupedit_part_select(void *data, WS_DATA_GET(workspace, sd); - part_list_part_select(sd->part_list, part); + group_navigator_part_select(sd->group_navigator, part); } static void -_on_part_list_part_select(void *data, +_on_group_navigator_part_select(void *data, Evas_Object *obj __UNUSED__, void *event_info) { @@ -1374,7 +1374,7 @@ _on_part_list_part_select(void *data, } static void -_on_part_list_part_state_select(void *data, +_on_group_navigator_part_state_select(void *data, Evas_Object *obj __UNUSED__, void *event_info) { @@ -1398,11 +1398,11 @@ _on_groupedit_part_unselect(void *data, WS_DATA_GET(workspace, sd); _workspace_highlight_unset(workspace); - part_list_part_select(sd->part_list, NULL); + group_navigator_part_select(sd->group_navigator, NULL); } static void -_on_part_list_part_unselect(void *data, +_on_group_navigator_part_unselect(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { @@ -1432,15 +1432,15 @@ workspace_add(Evas_Object *parent, Group *group) } WS_DATA_GET(obj, sd); - sd->part_list = part_list_add(group); - evas_object_size_hint_weight_set(sd->part_list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(sd->part_list, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_smart_member_add(sd->part_list, obj); - elm_object_part_content_set(sd->panes, "right", sd->part_list); - evas_object_smart_callback_add(sd->part_list, SIGNAL_PART_LIST_PART_SELECTED, - _on_part_list_part_select, obj); - evas_object_smart_callback_add(sd->part_list, SIGNAL_PART_LIST_PART_STATE_SELECTED, - _on_part_list_part_state_select, obj); + sd->group_navigator = group_navigator_add(group); + evas_object_size_hint_weight_set(sd->group_navigator, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(sd->group_navigator, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_smart_member_add(sd->group_navigator, obj); + elm_object_part_content_set(sd->panes, "right", sd->group_navigator); + evas_object_smart_callback_add(sd->group_navigator, SIGNAL_GROUP_NAVIGATOR_PART_SELECTED, + _on_group_navigator_part_select, obj); + evas_object_smart_callback_add(sd->group_navigator, SIGNAL_GROUP_NAVIGATOR_PART_STATE_SELECTED, + _on_group_navigator_part_state_select, obj); /* create conteiner with handlers */ sd->container.obj = container_add(sd->scroller); @@ -1471,7 +1471,7 @@ workspace_add(Evas_Object *parent, Group *group) evas_object_smart_callback_add(sd->groupedit, SIGNAL_GROUPEDIT_PART_UNSELECTED, _on_groupedit_part_unselect, obj); evas_object_smart_callback_add(ap.win, SIGNAL_PART_UNSELECTED, - _on_part_list_part_unselect, obj); + _on_group_navigator_part_unselect, obj); evas_object_smart_callback_add(sd->groupedit, "container,changed", _ws_ruler_abs_zero_move_cb, obj); evas_object_smart_callback_add(sd->groupedit, "object,area,changed", @@ -1546,12 +1546,12 @@ ws_groupedit_get(Evas_Object *obj) } void -workspace_part_list_update_part(Evas_Object *obj, Part_ *part) +workspace_group_navigator_update_part(Evas_Object *obj, Part_ *part) { WS_DATA_GET(obj, sd); assert(part != NULL); - part_list_part_update(sd->part_list, part); + group_navigator_part_update(sd->group_navigator, part); } #define PADDING_SIZE 40 diff --git a/src/bin/ui/workspace/workspace.h b/src/bin/ui/workspace/workspace.h index b0b89b5..8cda075 100644 --- a/src/bin/ui/workspace/workspace.h +++ b/src/bin/ui/workspace/workspace.h @@ -71,7 +71,7 @@ ws_groupedit_get(Evas_Object *obj); * @ingroup Workspace */ void -workspace_part_list_update_part(Evas_Object *obj, Part_ *part); +workspace_group_navigator_update_part(Evas_Object *obj, Part_ *part); /** * Force recal for editable object from the workspace. --
