From e3ca2ad9f1b786b387f5df5be545ea1686a9a1ae Mon Sep 17 00:00:00 2001 From: SangHyeon Lee Date: Mon, 30 Apr 2018 18:54:32 +0900 Subject: [PATCH] efl.ui.view_list : update example text/content name on legacy to efl update examples and edc as our new naming rule changes. --- .../elementary/efl_ui_view_list_example.edc | 62 +++++++++++----------- .../elementary/efl_ui_view_list_example_1.c | 2 +- .../elementary/efl_ui_view_list_example_2.c | 4 +- .../elementary/efl_ui_view_list_example_3.c | 12 ++--- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/examples/elementary/efl_ui_view_list_example.edc b/src/examples/elementary/efl_ui_view_list_example.edc index 3b46863..75bafe1 100644 --- a/src/examples/elementary/efl_ui_view_list_example.edc +++ b/src/examples/elementary/efl_ui_view_list_example.edc @@ -9,8 +9,8 @@ collections { group { - name: "elm/list/item/custom"; - alias: "elm/list/item/default"; + name: "efl/list_item:custom"; + alias: "efl/list_item"; data.item: "selectraise" "on"; data.item: "focusraise" "on"; parts { @@ -34,12 +34,12 @@ group { } } program { - signal: "elm,state,odd"; source: "elm"; + signal: "efl,state,odd"; source: "efl"; action: STATE_SET "odd" 1.0; target: "base"; } program { - signal: "elm,state,even"; source: "elm"; + signal: "efl,state,even"; source: "efl"; action: STATE_SET "default" 0.0; target: "base"; } @@ -74,41 +74,41 @@ group { } } program { - signal: "elm,state,selected"; source: "elm"; + signal: "efl,state,selected"; source: "efl"; action: STATE_SET "selected" 0.0; target: "sel_shadow"; target: "sel_base"; target: "sel_bevel"; } program { - signal: "elm,state,unselected"; source: "elm"; + signal: "efl,state,unselected"; source: "efl"; action: STATE_SET "default" 0.0; target: "sel_shadow"; target: "sel_base"; target: "sel_bevel"; } program { - signal: "elm,state,disabled"; source: "elm"; + signal: "efl,state,disabled"; source: "efl"; action: STATE_SET "disabled" 0.0; target: "event"; } program { - signal: "elm,state,enabled"; source: "elm"; + signal: "efl,state,enabled"; source: "efl"; action: STATE_SET "default" 0.0; target: "event"; } //##// - part { name: "elm.text"; type: TEXT; mouse_events: 0; + part { name: "efl.text"; type: TEXT; mouse_events: 0; effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; rel1.offset: 2 3; rel1.relative: 1.0 0.0; - rel1.to_x: "elm.swallow.icon"; + rel1.to_x: "efl.icon"; rel2.offset: -3 -3; rel2.relative: 0.0 1.0; - rel2.to_x: "elm.swallow.end"; + rel2.to_x: "efl.end"; color: FN_COL_DEFAULT; color_class: "list_item"; text { font: FN; size: 10; @@ -131,12 +131,12 @@ group { effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; - rel1.to: "elm.text"; - rel2.to: "elm.text"; + rel1.to: "efl.text"; + rel2.to: "efl.text"; color: FN_COL_DISABLE; color_class: "list_item_disabled"; text { font: FN; size: 10; - text_source: "elm.text"; + text_source: "efl.text"; align: 0.0 0.5; text_class: "list_item"; } @@ -156,13 +156,13 @@ group { scale: 1; description { state: "default" 0.0; rel1.offset: -2 -3; - rel1.to: "elm.text"; + rel1.to: "efl.text"; rel2.offset: 1 1; - rel2.to: "elm.text"; + rel2.to: "efl.text"; color: FN_COL_HIGHLIGHT; color_class: "list_item_selected"; text { font: FN; size: 10; - text_source: "elm.text"; + text_source: "efl.text"; align: 0.0 0.5; text_class: "list_item"; } @@ -178,35 +178,35 @@ group { } } program { - signal: "elm,state,selected"; source: "elm"; + signal: "efl,state,selected"; source: "efl"; action: STATE_SET "selected" 0.0; - target: "elm.text"; + target: "efl.text"; target: "label2"; target: "label3"; } program { - signal: "elm,state,unselected"; source: "elm"; + signal: "efl,state,unselected"; source: "efl"; action: STATE_SET "default" 0.0; - target: "elm.text"; + target: "efl.text"; target: "label2"; target: "label3"; } program { - signal: "elm,state,disabled"; source: "elm"; + signal: "efl,state,disabled"; source: "efl"; action: STATE_SET "disabled" 0.0; - target: "elm.text"; + target: "efl.text"; target: "label2"; target: "label3"; } program { - signal: "elm,state,enabled"; source: "elm"; + signal: "efl,state,enabled"; source: "efl"; action: STATE_SET "default" 0.0; - target: "elm.text"; + target: "efl.text"; target: "label2"; target: "label3"; } //##// - part { name: "elm.swallow.icon"; type: SWALLOW; + part { name: "efl.icon"; type: SWALLOW; description { state: "default" 0.0; fixed: 1 0; align: 0.0 0.5; @@ -216,7 +216,7 @@ group { rel2.offset: 2 -3; } } - part { name: "elm.swallow.end"; type: SWALLOW; + part { name: "efl.end"; type: SWALLOW; description { state: "default" 0.0; fixed: 1 0; align: 1.0 0.5; @@ -254,22 +254,22 @@ group { } } program { - signal: "elm,state,selected"; source: "elm"; + signal: "efl,state,selected"; source: "efl"; action: STATE_SET "selected" 0.0; target: "sel_shine"; } program { - signal: "elm,state,unselected"; source: "elm"; + signal: "efl,state,unselected"; source: "efl"; action: STATE_SET "default" 0.0; target: "sel_shine"; } program { - signal: "elm,state,disabled"; source: "elm"; + signal: "efl,state,disabled"; source: "efl"; action: STATE_SET "disabled" 0.0; target: "event_block"; } program { - signal: "elm,state,enabled"; source: "elm"; + signal: "efl,state,enabled"; source: "efl"; action: STATE_SET "default" 0.0; target: "event_block"; } diff --git a/src/examples/elementary/efl_ui_view_list_example_1.c b/src/examples/elementary/efl_ui_view_list_example_1.c index 621f81e..5e86875 100644 --- a/src/examples/elementary/efl_ui_view_list_example_1.c +++ b/src/examples/elementary/efl_ui_view_list_example_1.c @@ -84,7 +84,7 @@ elm_main(int argc, char **argv) factory = efl_add(EFL_UI_LAYOUT_FACTORY_CLASS, win); efl_ui_model_connect(factory, "signal/elm,state,%v", "odd_style"); - efl_ui_model_connect(factory, "elm.text", "name"); + efl_ui_model_connect(factory, "efl.text", "name"); efl_ui_layout_factory_theme_config(factory, "list_item", NULL, "default"); li = efl_add(EFL_UI_VIEW_LIST_CLASS, win); diff --git a/src/examples/elementary/efl_ui_view_list_example_2.c b/src/examples/elementary/efl_ui_view_list_example_2.c index fac0e5d..7b5ef4c 100644 --- a/src/examples/elementary/efl_ui_view_list_example_2.c +++ b/src/examples/elementary/efl_ui_view_list_example_2.c @@ -24,7 +24,7 @@ _realized_cb(void *data, const Efl_Event *event) evas_object_size_hint_weight_set(ie->layout, EVAS_HINT_EXPAND, 0); evas_object_size_hint_align_set(ie->layout, EVAS_HINT_FILL, EVAS_HINT_FILL); - efl_ui_factory_model_connect(ie->layout, "elm.swallow.icon", imf); + efl_ui_factory_model_connect(ie->layout, "efl.icon", imf); } EAPI_MAIN int @@ -45,7 +45,7 @@ elm_main(int argc, char **argv) model = efl_add(EIO_MODEL_CLASS, efl_main_loop_get(), eio_model_path_set(efl_added, dirname)); factory = efl_add(EFL_UI_LAYOUT_FACTORY_CLASS, win); - efl_ui_model_connect(factory, "elm.text", "filename"); + efl_ui_model_connect(factory, "efl.text", "filename"); efl_ui_layout_factory_theme_config(factory, "list_item", NULL, "default"); li = efl_add(EFL_UI_VIEW_LIST_CLASS, win); diff --git a/src/examples/elementary/efl_ui_view_list_example_3.c b/src/examples/elementary/efl_ui_view_list_example_3.c index c2e8281..9e7507f 100644 --- a/src/examples/elementary/efl_ui_view_list_example_3.c +++ b/src/examples/elementary/efl_ui_view_list_example_3.c @@ -150,8 +150,8 @@ _realized_1_cb(void *data EINA_UNUSED, const Efl_Event *event) evas_object_size_hint_weight_set(ie->layout, EVAS_HINT_EXPAND, 0); evas_object_size_hint_align_set(ie->layout, EVAS_HINT_FILL, EVAS_HINT_FILL); - efl_ui_model_connect(ie->layout, "elm.text", "name"); - efl_ui_model_connect(ie->layout, "signal/elm,state,%v", "odd_style"); + efl_ui_model_connect(ie->layout, "efl.text", "name"); + efl_ui_model_connect(ie->layout, "signal/efl,state,%v", "odd_style"); } static void @@ -163,7 +163,7 @@ _realized_2_cb(void *data EINA_UNUSED, const Efl_Event *event) elm_object_focus_allow_set(ie->layout, EINA_TRUE); evas_object_size_hint_weight_set(ie->layout, EVAS_HINT_EXPAND, 0); evas_object_size_hint_align_set(ie->layout, EVAS_HINT_FILL, EVAS_HINT_FILL); - efl_ui_model_connect(ie->layout, "elm.text", "occupation"); + efl_ui_model_connect(ie->layout, "efl.text", "occupation"); } static Efl_Model* @@ -222,7 +222,7 @@ elm_main(int argc, char **argv) priv->model = _make_model(); factory = efl_add(EFL_UI_LAYOUT_FACTORY_CLASS, win); - efl_ui_model_connect(factory, "elm.text", "filename"); + efl_ui_model_connect(factory, "efl.text", "filename"); efl_ui_layout_factory_theme_config(factory, "list_item", NULL, "default"); priv->list1 = efl_add(EFL_UI_VIEW_LIST_CLASS, win, efl_ui_view_model_set(efl_added, priv->model)); @@ -233,8 +233,8 @@ elm_main(int argc, char **argv) efl_ui_view_list_layout_factory_set(priv->list1, factory); factory = efl_add(EFL_UI_LAYOUT_FACTORY_CLASS, win); - efl_ui_model_connect(factory, "elm.text", "filename"); - efl_ui_model_connect(factory, "signal/elm,state,%v", "selected"); + efl_ui_model_connect(factory, "efl.text", "filename"); + efl_ui_model_connect(factory, "signal/efl,state,%v", "selected"); efl_ui_layout_factory_theme_config(factory, "list_item", NULL, "default"); priv->list2 = efl_add(EFL_UI_VIEW_LIST_CLASS, win, efl_ui_view_model_set(efl_added, priv->model)); efl_event_callback_add(priv->list2, EFL_UI_VIEW_LIST_EVENT_ITEM_REALIZED, _realized_2_cb, priv->list2); -- 2.7.4