diff --git a/data/elementary/themes/Makefile.am b/data/elementary/themes/Makefile.am index 1cf4e6e304..e6777477ed 100644 --- a/data/elementary/themes/Makefile.am +++ b/data/elementary/themes/Makefile.am @@ -149,7 +149,6 @@ elementary/themes/edc/elm/textpath.edc \ elementary/themes/edc/elm/thumb.edc \ elementary/themes/edc/elm/toolbar.edc \ elementary/themes/edc/elm/tooltip.edc \ -elementary/themes/edc/elm/uiclock.edc \ elementary/themes/edc/elm/video.edc \ elementary/themes/edc/elm/win.edc \ \ diff --git a/data/elementary/themes/default.edc b/data/elementary/themes/default.edc index 40d1920a07..b48a26b0b2 100644 --- a/data/elementary/themes/default.edc +++ b/data/elementary/themes/default.edc @@ -36,7 +36,6 @@ collections { #include "edc/elm/access.edc" #include "edc/elm/photo.edc" #include "edc/elm/focus.edc" -#include "edc/elm/uiclock.edc" #include "edc/elm/player.edc" #include "edc/elm/thumb.edc" #include "edc/elm/pointer.edc" diff --git a/data/elementary/themes/edc/elm/uiclock.edc b/data/elementary/themes/edc/elm/uiclock.edc deleted file mode 100644 index 348c2f221f..0000000000 --- a/data/elementary/themes/edc/elm/uiclock.edc +++ /dev/null @@ -1,207 +0,0 @@ -#define DATETIME_FIELD(_pos) \ - part { \ - name: "field"#_pos; type: SWALLOW; \ - scale: 1; \ - clip_to: "clip"; \ - description { state: "default" 0.0; \ - visible: 0; \ - min: 0 0; \ - align: 0.0 0.5; \ - fixed: 1 1; \ - rel1.relative: 1.0 0.0; \ - rel1.to: "separator"#_pos; \ - rel2.relative: 1.0 1.0; \ - rel2.to: "separator"#_pos; \ - } \ - description { state: "enable" 0.0; \ - inherit: "default" 0.0; \ - visible: 1; \ - min: 8 10; \ - } \ - } \ - programs{ \ - program { name: "field_"#_pos"enabled"; \ - signal: "field"#_pos",enable"; source: "elm"; \ - action: STATE_SET "enable" 0.0; \ - target: "field"#_pos; \ - } \ - program { name: "field_"#_pos"disabled"; \ - signal: "field"#_pos",disable"; source: "elm"; \ - action: STATE_SET "default" 0.0; \ - target: "field"#_pos; \ - } \ - } -#define DATETIME_SEPARATOR(_pos, _after) \ - part { \ - name: "separator"#_pos; type: TEXT; \ - scale: 1; \ - effect: SHADOW BOTTOM; \ - clip_to: "disclip"; \ - description { state: "default" 0.0; \ - visible: 0; \ - min: 0 0; \ - align: 0.0 0.5; \ - fixed: 1 0; \ - rel1 { \ - relative: 1.0 0.0; \ - to: "field"#_after; \ - } \ - rel2 { \ - relative: 1.0 1.0; \ - to: "field"#_after; \ - } \ - color_class: "datetime_separator_text"; \ - text { \ - font: "Sans"; size: 10; \ - min: 1 0; \ - ellipsis: -1; \ - align: 0.5 0.5; \ - text_class: "datetime_separator_text"; \ - } \ - } \ - description { state: "enable" 0.0; \ - inherit: "default" 0.0; \ - visible: 1; \ - min: 8 10; \ - } \ - } \ - part { \ - name: "separator"#_pos"d"; type: TEXT; \ - scale: 1; \ - effect: SHADOW BOTTOM; \ - clip_to: "disclip2"; \ - description { state: "default" 0.0; \ - visible: 0; \ - rel1.to: "separator"#_pos; \ - rel2.to: "separator"#_pos; \ - color_class: "datetime_separator_text_disabled"; \ - text { \ - text_source: "separator"#_pos; \ - font: "Sans"; size: 10; \ - text_class: "datetime_separator_text_disabled"; \ - } \ - } \ - description { state: "enable" 0.0; \ - inherit: "default" 0.0; \ - visible: 1; \ - } \ - } \ - programs { \ - program { \ - signal: "field"#_after",enable"; source: "elm"; \ - action: STATE_SET "enable" 0.0; \ - target: "separator"#_pos; \ - target: "separator"#_pos"d"; \ - } \ - program { \ - signal: "field"#_after",disable"; source: "elm"; \ - action: STATE_SET "default" 0.0; \ - target: "separator"#_pos; \ - target: "separator"#_pos"d"; \ - } \ - } -group { name: "elm/uiclock/base/default"; - parts { - part { name: "bg"; type: RECT; - description { state: "default" 0.0; - color_class: "datetime_bg"; - } - } - part { name: "clip"; type: RECT; - description { state: "default" 0.0; - rel1.to: "separator0"; - rel2.to: "separator7"; - } - } - part { name: "disclip"; type: RECT; - clip_to: "clip"; - description { state: "default" 0.0; - rel1.to: "separator0"; - rel2.to: "separator7"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { name: "disclip2"; type: RECT; - clip_to: "clip"; - description { state: "default" 0.0; - rel1.to: "separator0"; - rel2.to: "separator7"; - visible: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "separator0"; type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: 8 10; - align: 0.0 0.5; - fixed: 1 0; - rel2.relative: 0.0 1.0; - } - } - DATETIME_FIELD(0) - DATETIME_SEPARATOR(1,0) - DATETIME_FIELD(1) - DATETIME_SEPARATOR(2,1) - DATETIME_FIELD(2) - DATETIME_SEPARATOR(3,2) - DATETIME_FIELD(3) - DATETIME_SEPARATOR(4,3) - DATETIME_FIELD(4) - DATETIME_SEPARATOR(5,4) - DATETIME_FIELD(5) - DATETIME_SEPARATOR(6,5) - DATETIME_FIELD(6) - DATETIME_SEPARATOR(7,6) - DATETIME_FIELD(7) - DATETIME_SEPARATOR(8,7) - part { name: "separator9"; type: SPACER; - description { state: "default" 0.0; - rel1.to: "separator7"; - rel1.relative: 1.0 0.0; - min: 8 10; - } - } - part { name: "discover"; type: RECT; - description { state: "default" 0.0; - rel1.to: "separator0"; - rel2.to: "separator7"; - visible: 0; - color: 0 0 0 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "elm.access"; type: RECT; repeat_events: 1; - description { state: "default" 0.0; - color: 0 0 0 0; - } - } - } - programs { - program { - signal: "elm,state,disabled"; source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "disclip"; - target: "disclip2"; - target: "discover"; - } - program { - signal: "elm,state,enabled"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "disclip"; - target: "disclip2"; - target: "discover"; - } - } -} -#undef DATETIME_SEPARATOR -#undef DATETIME_FIELD diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c index 80f201ab26..95c569ae64 100644 --- a/src/lib/elementary/efl_ui_clock.c +++ b/src/lib/elementary/efl_ui_clock.c @@ -396,19 +396,13 @@ _reload_format(Evas_Object *obj) { snprintf(buf, sizeof(buf), EDC_PART_FIELD_ENABLE_SIG_STR, field->location); - if (elm_widget_is_legacy(obj)) - elm_layout_signal_emit(obj, buf, "elm"); - else - elm_layout_signal_emit(obj, buf, "efl"); + elm_layout_signal_emit(obj, buf, "efl"); } else { snprintf(buf, sizeof(buf), EDC_PART_FIELD_DISABLE_SIG_STR, field->location); - if (elm_widget_is_legacy(obj)) - elm_layout_signal_emit(obj, buf, "elm"); - else - elm_layout_signal_emit(obj, buf, "efl"); + elm_layout_signal_emit(obj, buf, "efl"); } if (field->location + 1) { @@ -541,10 +535,7 @@ _efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd) { snprintf(buf, sizeof(buf), EDC_PART_FIELD_ENABLE_SIG_STR, field->location); - if (elm_widget_is_legacy(obj)) - elm_layout_signal_emit(obj, buf, "elm"); - else - elm_layout_signal_emit(obj, buf, "efl"); + elm_layout_signal_emit(obj, buf, "efl"); if (field->location) { @@ -558,10 +549,7 @@ _efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd) { snprintf(buf, sizeof(buf), EDC_PART_FIELD_DISABLE_SIG_STR, field->location); - if (elm_widget_is_legacy(obj)) - elm_layout_signal_emit(obj, buf, "elm"); - else - elm_layout_signal_emit(obj, buf, "efl"); + elm_layout_signal_emit(obj, buf, "efl"); } } @@ -1005,10 +993,7 @@ _efl_ui_clock_field_visible_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Ui_Clock_Typ snprintf(buf, sizeof(buf), EDC_PART_FIELD_ENABLE_SIG_STR, field->location); - if (elm_widget_is_legacy(obj)) - elm_layout_signal_emit(obj, buf, "elm"); - else - elm_layout_signal_emit(obj, buf, "efl"); + elm_layout_signal_emit(obj, buf, "efl"); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); edje_object_message_signal_process(wd->resize_obj); @@ -1025,10 +1010,7 @@ _efl_ui_clock_field_visible_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Ui_Clock_Typ snprintf(buf, sizeof(buf), EDC_PART_FIELD_DISABLE_SIG_STR, field->location); - if (elm_widget_is_legacy(obj)) - elm_layout_signal_emit(obj, buf, "elm"); - else - elm_layout_signal_emit(obj, buf, "efl"); + elm_layout_signal_emit(obj, buf, "efl"); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); edje_object_message_signal_process(wd->resize_obj);