From cc88a1f875bd69bd9a976af3d15b798f84f5fcfb Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 24 Sep 2019 17:02:52 -0400 Subject: [PATCH] efl_ui/timepicker: rename and namespace visibility signals Summary: this is consistent with efl api 'visible' property ref T8231 Depends on D10098 Reviewers: segfaultxavi Reviewed By: segfaultxavi Subscribers: segfaultxavi, cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T8231 Differential Revision: https://phab.enlightenment.org/D10099 --- data/elementary/themes/edc/efl/timepicker.edc | 12 ++++++------ src/lib/elementary/efl_ui_timepicker.c | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/data/elementary/themes/edc/efl/timepicker.edc b/data/elementary/themes/edc/efl/timepicker.edc index 79f9d044e3..9560fd5264 100644 --- a/data/elementary/themes/edc/efl/timepicker.edc +++ b/data/elementary/themes/edc/efl/timepicker.edc @@ -322,7 +322,7 @@ group { "efl/timepicker"; } programs { program { "visible_ampm"; - signal: "efl,state,ampm,visible"; + signal: "efl,ampm,visible,on"; source: "efl"; script { set_state(PART:"base", "default", 0.0); @@ -331,7 +331,7 @@ group { "efl/timepicker"; } } program { "invisible_ampm"; - signal: "efl,state,ampm,invisible"; + signal: "efl,ampm,visible,off"; source: "efl"; script { set_state(PART:"base", "24layout", 0.0); @@ -340,7 +340,7 @@ group { "efl/timepicker"; } } program { "visible_colon_field0"; - signal: "efl,state,colon,visible,field0"; + signal: "efl,colon_field0,visible,on"; source: "efl"; action: STATE_SET "default"; target: "padding_center1"; @@ -349,7 +349,7 @@ group { "efl/timepicker"; target: "padding_center2"; } program { "invisible_colon_field0"; - signal: "efl,state,colon,invisible,field0"; + signal: "efl,colon_field0,visible,off"; source: "efl"; action: STATE_SET "invisible"; target: "padding_center1"; @@ -358,7 +358,7 @@ group { "efl/timepicker"; target: "padding_center2"; } program { "visible_colon_field1"; - signal: "efl,state,colon,visible,field1"; + signal: "efl,colon_field1,visible,on"; source: "efl"; action: STATE_SET "default"; target: "padding_center3"; @@ -367,7 +367,7 @@ group { "efl/timepicker"; target: "padding_center4"; } program { "invisible_colon_field1"; - signal: "efl,state,colon,invisible,field1"; + signal: "efl,colon_field1,visible,off"; source: "efl"; action: STATE_SET "invisible"; target: "padding_center3"; diff --git a/src/lib/elementary/efl_ui_timepicker.c b/src/lib/elementary/efl_ui_timepicker.c index 2fc578dd61..335e26230e 100644 --- a/src/lib/elementary/efl_ui_timepicker.c +++ b/src/lib/elementary/efl_ui_timepicker.c @@ -173,16 +173,16 @@ _fields_init(Eo *obj) //TODO: monitoring locale change and update field location. if (field == 0) { - elm_object_signal_emit(obj, "efl,state,colon,visible,field1", "efl"); - elm_object_signal_emit(obj, "efl,state,colon,invisible,field0", "efl"); + elm_object_signal_emit(obj, "efl,colon_field1,visible,on", "efl"); + elm_object_signal_emit(obj, "efl,colon_field0,visible,off", "efl"); } else { - elm_object_signal_emit(obj, "efl,state,colon,visible,field0", "efl"); - elm_object_signal_emit(obj, "efl,state,colon,invisible,field1", "efl"); + elm_object_signal_emit(obj, "efl,colon_field0,visible,on", "efl"); + elm_object_signal_emit(obj, "efl,colon_field1,visible,off", "efl"); } - elm_layout_signal_emit(obj, "efl,state,ampm,visible", "efl"); + elm_layout_signal_emit(obj, "efl,ampm,visible,on", "efl"); edje_object_message_signal_process(elm_layout_edje_get(obj)); efl_content_set(efl_part(obj, buf), pd->ampm); } @@ -251,9 +251,9 @@ _efl_ui_timepicker_is_24hour_set(Eo *obj, Efl_Ui_Timepicker_Data *pd, Eina_Bool pd->is_24hour = is_24hour; if (pd->is_24hour == EINA_TRUE) - elm_layout_signal_emit(obj, "efl,state,ampm,invisible", "efl"); + elm_layout_signal_emit(obj, "efl,ampm,visible,off", "efl"); else - elm_layout_signal_emit(obj, "efl,state,ampm,visible", "efl"); + elm_layout_signal_emit(obj, "efl,ampm,visible,on", "efl"); _field_value_update(obj); }