From 7e8b78d78c2180b2bd38f6980ae6f8a003ed7f8b Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Fri, 6 Feb 2015 16:34:42 +0000 Subject: [PATCH] attempt at better tclock theming (add only_visible states on time/date) --- src/e_mod_main.c | 8 ++++++++ tclock.edc | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/e_mod_main.c b/src/e_mod_main.c index 324ddb3..b10c906 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -267,12 +267,16 @@ _tclock_config_updated(Config_Item *ci) if (!inst->ci->show_time) edje_object_signal_emit(inst->tclock, "time_hidden", ""); + else if (!inst->ci->show_date) + edje_object_signal_emit(inst->tclock, "time_only_visible", ""); else edje_object_signal_emit(inst->tclock, "time_visible", ""); edje_object_message_signal_process(inst->tclock); if (!inst->ci->show_date) edje_object_signal_emit(inst->tclock, "date_hidden", ""); + else if (!inst->ci->show_time) + edje_object_signal_emit(inst->tclock, "date_only_visible", ""); else edje_object_signal_emit(inst->tclock, "date_visible", ""); edje_object_message_signal_process(inst->tclock); @@ -297,12 +301,16 @@ _tclock_cb_check(void *data EINA_UNUSED) { if (!inst->ci->show_time) edje_object_signal_emit(inst->tclock, "time_hidden", ""); + else if (!inst->ci->show_date) + edje_object_signal_emit(inst->tclock, "time_only_visible", ""); else edje_object_signal_emit(inst->tclock, "time_visible", ""); edje_object_message_signal_process(inst->tclock); if (!inst->ci->show_date) edje_object_signal_emit(inst->tclock, "date_hidden", ""); + else if (!inst->ci->show_time) + edje_object_signal_emit(inst->tclock, "date_only_visible", ""); else edje_object_signal_emit(inst->tclock, "date_visible", ""); edje_object_message_signal_process(inst->tclock); diff --git a/tclock.edc b/tclock.edc index ac27d98..0470078 100644 --- a/tclock.edc +++ b/tclock.edc @@ -39,6 +39,12 @@ collections { inherit: "default" 0.0; visible: 1; } + description { + state: "only_visible" 0.0; + inherit: "default" 0.0; + rel2.relative: 1.0 1.0; + visible: 1; + } } part { name: "tclock_date"; @@ -77,6 +83,12 @@ collections { inherit: "default" 0.0; visible: 1; } + description { + state: "only_visible" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.0 0.0; + visible: 1; + } } part { name: "over"; @@ -104,18 +116,32 @@ collections { } program { name: "p3"; + signal: "time_only_visible"; + source: ""; + action: STATE_SET "only_visible" 0.0; + target: "tclock_time"; + } + program { + name: "p4"; signal: "date_hidden"; source: ""; action: STATE_SET "hidden" 0.0; target: "tclock_date"; } program { - name: "p4"; + name: "p5"; signal: "date_visible"; source: ""; action: STATE_SET "visible" 0.0; target: "tclock_date"; } + program { + name: "p6"; + signal: "date_only_visible"; + source: ""; + action: STATE_SET "only_visible" 0.0; + target: "tclock_date"; + } } } }