From 2777d4f5a261f86959a68b663ada9a9af0455028 Mon Sep 17 00:00:00 2001 From: Oleksander Kostenko Date: Wed, 29 Jun 2016 14:31:02 +0300 Subject: [PATCH] TizenRefApp-6543 Manage start and end time in "Set schedule" Change-Id: I802064abe59ee4cbd2af08a3451cf6c9e93599bb Signed-off-by: Oleksander Kostenko --- inc/set-scedule-info.h | 2 +- res/edje/time_button_layout.edc | 1 + res/po/ar.po | 3 ++ res/po/az.po | 3 ++ res/po/bg.po | 3 ++ res/po/ca.po | 3 ++ res/po/cs.po | 3 ++ res/po/da.po | 3 ++ res/po/de.po | 3 ++ res/po/el_GR.po | 3 ++ res/po/en.po | 3 ++ res/po/en_PH.po | 3 ++ res/po/en_US.po | 3 ++ res/po/es_ES.po | 3 ++ res/po/es_US.po | 3 ++ res/po/et.po | 3 ++ res/po/eu.po | 3 ++ res/po/fi.po | 3 ++ res/po/fr.po | 3 ++ res/po/fr_CA.po | 3 ++ res/po/ga.po | 3 ++ res/po/gl.po | 3 ++ res/po/hi.po | 3 ++ res/po/hr.po | 3 ++ res/po/hu.po | 3 ++ res/po/hy.po | 3 ++ res/po/is.po | 3 ++ res/po/it_IT.po | 3 ++ res/po/ja_JP.po | 3 ++ res/po/ka.po | 3 ++ res/po/kk.po | 3 ++ res/po/ko_KR.po | 3 ++ res/po/lt.po | 3 ++ res/po/lv.po | 3 ++ res/po/mk.po | 3 ++ res/po/nb.po | 3 ++ res/po/nl.po | 3 ++ res/po/pl.po | 3 ++ res/po/pt_BR.po | 3 ++ res/po/pt_PT.po | 3 ++ res/po/ro.po | 3 ++ res/po/ru_RU.po | 3 ++ res/po/sk.po | 3 ++ res/po/sl.po | 3 ++ res/po/sr.po | 3 ++ res/po/sv.po | 3 ++ res/po/tr_TR.po | 3 ++ res/po/uk.po | 3 ++ res/po/uz.po | 3 ++ res/po/zh_CN.po | 3 ++ res/po/zh_HK.po | 3 ++ res/po/zh_TW.po | 3 ++ src/allowed-calls.c | 2 +- src/common-efl.c | 101 +++++++++++++++++++++++++--------------- src/do-not-disturb-efl.c | 2 +- src/set-schedule-info.c | 70 ++++++++++++++++++++-------- 56 files changed, 268 insertions(+), 60 deletions(-) diff --git a/inc/set-scedule-info.h b/inc/set-scedule-info.h index c568b03..c474d84 100644 --- a/inc/set-scedule-info.h +++ b/inc/set-scedule-info.h @@ -28,6 +28,6 @@ void set_schedule_check_changed_cb(void *data, Evas_Object *obj, void *event_info); void gl_set_schedule_selected(ug_data *data); bool get_schedule(); -Evas_Object *start_end_time_item(Evas_Object* parent); +Evas_Object* start_end_time_item(Evas_Object* parent, bool is_start_time_item); #endif //__SET_SCHEDULE_INFO_H__ diff --git a/res/edje/time_button_layout.edc b/res/edje/time_button_layout.edc index ece399f..02313c5 100644 --- a/res/edje/time_button_layout.edc +++ b/res/edje/time_button_layout.edc @@ -23,6 +23,7 @@ collections { scale: 1; description { state: "default" 0.0; min: 300 78; + max: 300 78; color: 250 250 250 255; } } diff --git a/res/po/ar.po b/res/po/ar.po index 9167f31..7c529d1 100644 --- a/res/po/ar.po +++ b/res/po/ar.po @@ -112,3 +112,6 @@ msgstr "أحداث التقويم" msgid "IDS_ST_BODY_ALARMS" msgstr "المنبهات" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "اليوم التالي" + diff --git a/res/po/az.po b/res/po/az.po index 73c8b49..8628246 100644 --- a/res/po/az.po +++ b/res/po/az.po @@ -112,3 +112,6 @@ msgstr "Təqvim olayları" msgid "IDS_ST_BODY_ALARMS" msgstr "Xəbərdarlıq siqnalları" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "növbət gün" + diff --git a/res/po/bg.po b/res/po/bg.po index 729123a..ba29da3 100644 --- a/res/po/bg.po +++ b/res/po/bg.po @@ -112,3 +112,6 @@ msgstr "Събития в календара" msgid "IDS_ST_BODY_ALARMS" msgstr "Аларми" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "следв. ден" + diff --git a/res/po/ca.po b/res/po/ca.po index 7fa03fd..aae2eec 100644 --- a/res/po/ca.po +++ b/res/po/ca.po @@ -112,3 +112,6 @@ msgstr "Esdeveniments de calendari" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarmes" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "dia següent" + diff --git a/res/po/cs.po b/res/po/cs.po index 4af853b..0570c87 100644 --- a/res/po/cs.po +++ b/res/po/cs.po @@ -112,3 +112,6 @@ msgstr "Události v kalendáři" msgid "IDS_ST_BODY_ALARMS" msgstr "Budík" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "další den" + diff --git a/res/po/da.po b/res/po/da.po index 58395dc..7f3135a 100644 --- a/res/po/da.po +++ b/res/po/da.po @@ -112,3 +112,6 @@ msgstr "Kalenderevents" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarmer" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "næste dag" + diff --git a/res/po/de.po b/res/po/de.po index d6ff587..893cce1 100644 --- a/res/po/de.po +++ b/res/po/de.po @@ -112,3 +112,6 @@ msgstr "Kalendereinträge" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarme" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "nächster Tag" + diff --git a/res/po/el_GR.po b/res/po/el_GR.po index 6e9f0e8..099888b 100644 --- a/res/po/el_GR.po +++ b/res/po/el_GR.po @@ -112,3 +112,6 @@ msgstr "Συμβάντα ημερολογίου" msgid "IDS_ST_BODY_ALARMS" msgstr "Ειδοποίηση" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "επ. ημέρα" + diff --git a/res/po/en.po b/res/po/en.po index 8315a23..d4acc0d 100644 --- a/res/po/en.po +++ b/res/po/en.po @@ -112,3 +112,6 @@ msgstr "Calendar events" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarms" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "next day" + diff --git a/res/po/en_PH.po b/res/po/en_PH.po index 028c2ea..214c7bf 100644 --- a/res/po/en_PH.po +++ b/res/po/en_PH.po @@ -112,3 +112,6 @@ msgstr "Calendar events" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarms" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "next day" + diff --git a/res/po/en_US.po b/res/po/en_US.po index a2b7e36..6dabcea 100644 --- a/res/po/en_US.po +++ b/res/po/en_US.po @@ -112,3 +112,6 @@ msgstr "Calendar events" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarms" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "next day" + diff --git a/res/po/es_ES.po b/res/po/es_ES.po index 818595c..13cce0b 100644 --- a/res/po/es_ES.po +++ b/res/po/es_ES.po @@ -112,3 +112,6 @@ msgstr "Eventos de calendario" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarmas" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "próximo día" + diff --git a/res/po/es_US.po b/res/po/es_US.po index c824850..746c250 100644 --- a/res/po/es_US.po +++ b/res/po/es_US.po @@ -112,3 +112,6 @@ msgstr "Eventos del Calendario" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarmas" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "día siguiente" + diff --git a/res/po/et.po b/res/po/et.po index 0fb1c30..325f05a 100644 --- a/res/po/et.po +++ b/res/po/et.po @@ -112,3 +112,6 @@ msgstr "Kalendrisündmused" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarmid" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "järg. päev" + diff --git a/res/po/eu.po b/res/po/eu.po index 8544afc..3b964dc 100644 --- a/res/po/eu.po +++ b/res/po/eu.po @@ -112,3 +112,6 @@ msgstr "Egutegiko gertaerak" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarmak" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "hurr. eguna" + diff --git a/res/po/fi.po b/res/po/fi.po index 52df4e2..083bea9 100644 --- a/res/po/fi.po +++ b/res/po/fi.po @@ -112,3 +112,6 @@ msgstr "Kalenterimerkinnät" msgid "IDS_ST_BODY_ALARMS" msgstr "Hälytykset" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "seur. päivä" + diff --git a/res/po/fr.po b/res/po/fr.po index 6043de4..22bb02b 100644 --- a/res/po/fr.po +++ b/res/po/fr.po @@ -112,3 +112,6 @@ msgstr "Evénements du calendrier" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarmes" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "jour suivant" + diff --git a/res/po/fr_CA.po b/res/po/fr_CA.po index ac6b7b4..0b77eb3 100644 --- a/res/po/fr_CA.po +++ b/res/po/fr_CA.po @@ -112,3 +112,6 @@ msgstr "Évènements du calendrier" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarmes" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "jour suivant" + diff --git a/res/po/ga.po b/res/po/ga.po index 3f69362..b701352 100644 --- a/res/po/ga.po +++ b/res/po/ga.po @@ -112,3 +112,6 @@ msgstr "Imeachtaí féilire" msgid "IDS_ST_BODY_ALARMS" msgstr "Aláraim" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "lá dár gcionn" + diff --git a/res/po/gl.po b/res/po/gl.po index e139aef..05d1a79 100644 --- a/res/po/gl.po +++ b/res/po/gl.po @@ -112,3 +112,6 @@ msgstr "Eventos do calendario" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarmas" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "día seguinte" + diff --git a/res/po/hi.po b/res/po/hi.po index 8604d98..8675f9d 100644 --- a/res/po/hi.po +++ b/res/po/hi.po @@ -112,3 +112,6 @@ msgstr "कैलेंडर प्रसंग" msgid "IDS_ST_BODY_ALARMS" msgstr "अलार्म" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "अगला दिन" + diff --git a/res/po/hr.po b/res/po/hr.po index 4175c1e..0a77b2a 100644 --- a/res/po/hr.po +++ b/res/po/hr.po @@ -112,3 +112,6 @@ msgstr "Događaji iz kalendara" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarmi" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "sljed. dan" + diff --git a/res/po/hu.po b/res/po/hu.po index e1f13bf..0ec9ac1 100644 --- a/res/po/hu.po +++ b/res/po/hu.po @@ -112,3 +112,6 @@ msgstr "Naptáresemények" msgid "IDS_ST_BODY_ALARMS" msgstr "Ébresztőóra" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "másnap" + diff --git a/res/po/hy.po b/res/po/hy.po index b29bc39..539c8c5 100644 --- a/res/po/hy.po +++ b/res/po/hy.po @@ -112,3 +112,6 @@ msgstr "Օրացույցի իրադարձություններ" msgid "IDS_ST_BODY_ALARMS" msgstr "Ազդանշաններ" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "հաջորդ օր" + diff --git a/res/po/is.po b/res/po/is.po index a08f2a1..8ac19c4 100644 --- a/res/po/is.po +++ b/res/po/is.po @@ -112,3 +112,6 @@ msgstr "Dagatalsatburðir" msgid "IDS_ST_BODY_ALARMS" msgstr "Vekjaraklukka" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "næsta dag" + diff --git a/res/po/it_IT.po b/res/po/it_IT.po index 91e2ddc..3718991 100644 --- a/res/po/it_IT.po +++ b/res/po/it_IT.po @@ -112,3 +112,6 @@ msgstr "Eventi Calendario" msgid "IDS_ST_BODY_ALARMS" msgstr "Sveglie" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "giorno succ." + diff --git a/res/po/ja_JP.po b/res/po/ja_JP.po index ab67585..f881756 100644 --- a/res/po/ja_JP.po +++ b/res/po/ja_JP.po @@ -112,3 +112,6 @@ msgstr "カレンダーイベント" msgid "IDS_ST_BODY_ALARMS" msgstr "アラーム" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "翌日" + diff --git a/res/po/ka.po b/res/po/ka.po index efc839b..bd4b6c1 100644 --- a/res/po/ka.po +++ b/res/po/ka.po @@ -112,3 +112,6 @@ msgstr "კალენდრის მოვლენები" msgid "IDS_ST_BODY_ALARMS" msgstr "სიგნალები" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "მეორე დღე" + diff --git a/res/po/kk.po b/res/po/kk.po index 9975f31..a4c00e0 100644 --- a/res/po/kk.po +++ b/res/po/kk.po @@ -112,3 +112,6 @@ msgstr "Күнтізбе оқиғалары" msgid "IDS_ST_BODY_ALARMS" msgstr "Дабылдар" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "келесі күн" + diff --git a/res/po/ko_KR.po b/res/po/ko_KR.po index 0c68627..9b8514e 100644 --- a/res/po/ko_KR.po +++ b/res/po/ko_KR.po @@ -112,3 +112,6 @@ msgstr "캘린더 일정" msgid "IDS_ST_BODY_ALARMS" msgstr "알람" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "다음 날" + diff --git a/res/po/lt.po b/res/po/lt.po index f19a15b..5ed5e54 100644 --- a/res/po/lt.po +++ b/res/po/lt.po @@ -112,3 +112,6 @@ msgstr "Kalendoriaus įvykiai" msgid "IDS_ST_BODY_ALARMS" msgstr "Signalai" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "kita diena" + diff --git a/res/po/lv.po b/res/po/lv.po index 3203b38..b7d622a 100644 --- a/res/po/lv.po +++ b/res/po/lv.po @@ -112,3 +112,6 @@ msgstr "Kalendāra notikumi" msgid "IDS_ST_BODY_ALARMS" msgstr "Modinātāji" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "nāk. dienā" + diff --git a/res/po/mk.po b/res/po/mk.po index 004834d..5952842 100644 --- a/res/po/mk.po +++ b/res/po/mk.po @@ -112,3 +112,6 @@ msgstr "Календарски настани" msgid "IDS_ST_BODY_ALARMS" msgstr "Аларми" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "след. ден" + diff --git a/res/po/nb.po b/res/po/nb.po index e48910c..e676e2c 100644 --- a/res/po/nb.po +++ b/res/po/nb.po @@ -112,3 +112,6 @@ msgstr "Kalenderhendelser" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarm" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "neste dag" + diff --git a/res/po/nl.po b/res/po/nl.po index 8e8c863..b8acea0 100644 --- a/res/po/nl.po +++ b/res/po/nl.po @@ -112,3 +112,6 @@ msgstr "Agenda-items" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarmen" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "volg. dag" + diff --git a/res/po/pl.po b/res/po/pl.po index 966a328..a35cf29 100644 --- a/res/po/pl.po +++ b/res/po/pl.po @@ -112,3 +112,6 @@ msgstr "Zdarzenia kalendarza" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarmy" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "nast. dnia" + diff --git a/res/po/pt_BR.po b/res/po/pt_BR.po index 5cbb015..6cb9f2f 100644 --- a/res/po/pt_BR.po +++ b/res/po/pt_BR.po @@ -112,3 +112,6 @@ msgstr "Eventos do calendário" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarmes" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "dia seg." + diff --git a/res/po/pt_PT.po b/res/po/pt_PT.po index 6b3af22..0632cf4 100644 --- a/res/po/pt_PT.po +++ b/res/po/pt_PT.po @@ -112,3 +112,6 @@ msgstr "Eventos do calendário" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarmes" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "dia seguinte" + diff --git a/res/po/ro.po b/res/po/ro.po index f1edc4e..0266cb4 100644 --- a/res/po/ro.po +++ b/res/po/ro.po @@ -112,3 +112,6 @@ msgstr "Evenimente Calendar" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarmă" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "ziua următ." + diff --git a/res/po/ru_RU.po b/res/po/ru_RU.po index 4cb357c..b54f34f 100644 --- a/res/po/ru_RU.po +++ b/res/po/ru_RU.po @@ -112,3 +112,6 @@ msgstr "События календаря" msgid "IDS_ST_BODY_ALARMS" msgstr "Будильник" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "след. день" + diff --git a/res/po/sk.po b/res/po/sk.po index db7e9c7..30afb7e 100644 --- a/res/po/sk.po +++ b/res/po/sk.po @@ -112,3 +112,6 @@ msgstr "Udalosti v kalendári" msgid "IDS_ST_BODY_ALARMS" msgstr "Upozornenia" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "nasl. deň" + diff --git a/res/po/sl.po b/res/po/sl.po index 7774c15..b8133b8 100644 --- a/res/po/sl.po +++ b/res/po/sl.po @@ -112,3 +112,6 @@ msgstr "Koledar dogodkov" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarmi" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "nasled. dan" + diff --git a/res/po/sr.po b/res/po/sr.po index 5244b21..09ee089 100644 --- a/res/po/sr.po +++ b/res/po/sr.po @@ -112,3 +112,6 @@ msgstr "Kalendarski događaji" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarmi" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "sled. dana" + diff --git a/res/po/sv.po b/res/po/sv.po index 2ca7a97..dcb885e 100644 --- a/res/po/sv.po +++ b/res/po/sv.po @@ -112,3 +112,6 @@ msgstr "Kalenderhändelse" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarm" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "nästa dag" + diff --git a/res/po/tr_TR.po b/res/po/tr_TR.po index 0737b56..0d3e5ae 100644 --- a/res/po/tr_TR.po +++ b/res/po/tr_TR.po @@ -112,3 +112,6 @@ msgstr "Takvim etkinlikleri" msgid "IDS_ST_BODY_ALARMS" msgstr "Alarmlar" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "sonrki gün" + diff --git a/res/po/uk.po b/res/po/uk.po index 7bd2bae..83f92d8 100644 --- a/res/po/uk.po +++ b/res/po/uk.po @@ -112,3 +112,6 @@ msgstr "Події календаря" msgid "IDS_ST_BODY_ALARMS" msgstr "Будильники" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "наст. день" + diff --git a/res/po/uz.po b/res/po/uz.po index b11fb1c..3f08437 100644 --- a/res/po/uz.po +++ b/res/po/uz.po @@ -112,3 +112,6 @@ msgstr "Kalendar hodisalari" msgid "IDS_ST_BODY_ALARMS" msgstr "Budilnik" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "keyin. kun" + diff --git a/res/po/zh_CN.po b/res/po/zh_CN.po index 3499db1..9483198 100644 --- a/res/po/zh_CN.po +++ b/res/po/zh_CN.po @@ -112,3 +112,6 @@ msgstr "日历事件" msgid "IDS_ST_BODY_ALARMS" msgstr "闹钟" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "次日" + diff --git a/res/po/zh_HK.po b/res/po/zh_HK.po index a8ff2e6..954c0ee 100644 --- a/res/po/zh_HK.po +++ b/res/po/zh_HK.po @@ -112,3 +112,6 @@ msgstr "日曆事件" msgid "IDS_ST_BODY_ALARMS" msgstr "鬧鐘" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "次日" + diff --git a/res/po/zh_TW.po b/res/po/zh_TW.po index b79a606..b346b0d 100644 --- a/res/po/zh_TW.po +++ b/res/po/zh_TW.po @@ -112,3 +112,6 @@ msgstr "日曆活動" msgid "IDS_ST_BODY_ALARMS" msgstr "鬧鐘" +msgid "IDS_ST_SBODY_NEXT_DAY_M_LC_ABB" +msgstr "次日" + diff --git a/src/allowed-calls.c b/src/allowed-calls.c index d327d1a..2c45c2b 100644 --- a/src/allowed-calls.c +++ b/src/allowed-calls.c @@ -196,7 +196,7 @@ static void create_allow_calls_from_popup() /* genlist */ genlist = elm_genlist_add(box); - itc.item_style = "1line";; + itc.item_style = "type1"; itc.func.text_get = gl_text_get_cb; itc.func.content_get = NULL; itc.func.state_get = NULL; diff --git a/src/common-efl.c b/src/common-efl.c index ff5f006..03e31f2 100755 --- a/src/common-efl.c +++ b/src/common-efl.c @@ -23,6 +23,7 @@ #define ICON_SIZE 82 extern ug_data g_ug_data; +extern isNextDay; Evas_Object *create_layout(Evas_Object *parent) { @@ -306,7 +307,7 @@ void append_gl_item_list(Evas_Object *genlist, Eina_List* list, int style) { int count = 0; if (style == ITEM_STYLE_ONE_LINE){ - itc->item_style = "1line"; + itc->item_style = "type1"; } else if(style == ITEM_STYLE_ONE_ICON){ itc->item_style = "one_icon"; } else { @@ -339,49 +340,73 @@ void append_gl_item_list(Evas_Object *genlist, Eina_List* list, int style) { static char *_gl_option_text_get_cb(void *data, Evas_Object *obj, const char *part) { - char buf[1024]; + char buf[1024] = {0,}; - retv_if(!data, NULL); - if (!strcmp(data, "app-notifications")) { - if (!strcmp("elm.text.multiline", part)) { - snprintf(buf, sizeof(buf), "%s", APP_STRING("IDS_QP_BODY_SELECT_THE_APPS_YOU_WANT_TO_RECEIVE_NOTIFICATIONS_FROM_BELOW")); - return strdup(buf); - } - } else if(!strcmp(data, "do-not-disturb")) { - if (!strcmp("elm.text.multiline", part)) { - snprintf(buf, sizeof(buf), "%s", - APP_STRING("IDS_ST_BODY_MUTE_ALL_ALERTS_AND_SHOW_NOTIFICATIONS_IN_THE_NOTIFICATION_PANEL_ONLY_AND_NOT_IN_POP_UPS_OR_ON_THE_STATUS_BAR_MSG")); - return strdup(buf); - } + retv_if(!data, NULL); + if(!strcmp(data, "app-notifications")) + { + if(!strcmp("elm.text.multiline", part)) + { + snprintf(buf, sizeof(buf), "%s", APP_STRING("IDS_QP_BODY_SELECT_THE_APPS_YOU_WANT_TO_RECEIVE_NOTIFICATIONS_FROM_BELOW")); + return strdup(buf); + } + } + else if(!strcmp(data, "do-not-disturb")) + { + if(!strcmp("elm.text.multiline", part)) + { + snprintf(buf, sizeof(buf), "%s", APP_STRING("IDS_ST_BODY_MUTE_ALL_ALERTS_AND_SHOW_NOTIFICATIONS_IN_THE_NOTIFICATION_PANEL_ONLY_AND_NOT_IN_POP_UPS_OR_ON_THE_STATUS_BAR_MSG")); + return strdup(buf); + } - if (!strcmp(part, "elm.text")) { - return strdup(APP_STRING("IDS_ST_HEADER_DO_NOT_DISTURB_ABB")); - } - } else if(!strcmp(data, "set-schedule-multiline")) { - if (!strcmp("elm.text", part)) { - return strdup(APP_STRING("IDS_ST_MBODY_SET_SCHEDULE_M_TIME")); - } - if (!strcmp("elm.text.multiline", part)) { - snprintf(buf, sizeof(buf), "%s
%s", "M T W T F S S", "10:00 p.m. ~ 7:00 a.m."); //TODO: - return strdup(buf); - } - } else if(!strcmp(data, "set-schedule")) { - if (!strcmp("elm.text", part)) { + if(!strcmp(part, "elm.text")) + { + return strdup(APP_STRING("IDS_ST_HEADER_DO_NOT_DISTURB_ABB")); + } + } + else if(!strcmp(data, "set-schedule-multiline")) + { + if(!strcmp("elm.text", part)) + { return strdup(APP_STRING("IDS_ST_MBODY_SET_SCHEDULE_M_TIME")); } - } else if(!strcmp(data, "start-time") && !strcmp("elm.text", part)) { - return strdup(APP_STRING("IDS_ST_BODY_START_TIME")); - } else if(!strcmp(data, "end-time") && !strcmp("elm.text", part)) { - return strdup(APP_STRING("IDS_ST_BODY_END_TIME")); - } else if(!strcmp(data, "allowed-calls")) { - if (!strcmp("elm.text.multiline", part)) { + if(!strcmp("elm.text.multiline", part)) + { + snprintf(buf, sizeof(buf), "%s
%s", "M T W T F S S", "10:00 p.m. ~ 7:00 a.m."); //TODO: + return strdup(buf); + } + } + else if(!strcmp(data, "set-schedule")) + { + if(!strcmp("elm.text", part)) + { + return strdup(APP_STRING("IDS_ST_MBODY_SET_SCHEDULE_M_TIME")); + } + } + else if(!strcmp(data, "start-time") && !strcmp("elm.text", part)) + { + return strdup(APP_STRING("IDS_ST_BODY_START_TIME")); + } + else if(!strcmp(data, "end-time") && !strcmp("elm.text", part)) + { + return strdup(APP_STRING("IDS_ST_BODY_END_TIME")); + } + else if(!strcmp(data, "end-time") && !strcmp("elm.text.sub", part) && isNextDay) + { + return strdup(APP_STRING("IDS_ST_SBODY_NEXT_DAY_M_LC_ABB")); + } + else if(!strcmp(data, "allowed-calls")) + { + if(!strcmp("elm.text.multiline", part)) + { snprintf(buf, sizeof(buf), "%s", APP_STRING("IDS_QP_TAB4_ALL_M_RECEIVED_ALL")); return strdup(buf); } - if (!strcmp("elm.text", part)) { + if(!strcmp("elm.text", part)) + { return strdup(APP_STRING("IDS_ST_MBODY_ALLOWED_CALLS_ABB")); } - } + } return NULL; } @@ -417,12 +442,12 @@ static Evas_Object* _gl_option_content_get_cb(void *data, Evas_Object *obj, cons if(!strcmp(data, "start-time") && !strcmp("elm.swallow.end", part)) { - return start_end_time_item(obj); + return start_end_time_item(obj, true); } if(!strcmp(data, "end-time") && !strcmp("elm.swallow.end", part)) { - return start_end_time_item(obj); + return start_end_time_item(obj, false); } return NULL; } @@ -460,7 +485,7 @@ Elm_Widget_Item *append_gl_allow_all(Evas_Object *genlist) if (!itc) return NULL; - itc->item_style = "1line"; + itc->item_style = "type1"; itc->func.text_get = _gl_app_notif_allow_all_text_get_cb; itc->func.content_get = _gl_app_notif_allow_all_content_get_cb; itc->func.del = gl_del_cb; diff --git a/src/do-not-disturb-efl.c b/src/do-not-disturb-efl.c index 165caa8..760081d 100644 --- a/src/do-not-disturb-efl.c +++ b/src/do-not-disturb-efl.c @@ -38,7 +38,7 @@ void do_not_disturb_append_item_in_list(Evas_Object* genlist) { append_gl_start_option(genlist, "multiline", "do-not-disturb"); // TODO: append when API will be implemented, will be move to final release -// append_gl_start_option(genlist, "multiline", "set-schedule-multiline"); + append_gl_start_option(genlist, "multiline", "set-schedule-multiline"); // append_gl_start_option(genlist, "multiline", "allowed-calls"); Eina_List *allowed_list = eina_list_merge(get_first_excepted_apps_list(), get_excepted_apps_list()); append_gl_full_item(genlist, do_not_disturb_allowed_apps_cont_cb, allowed_list); diff --git a/src/set-schedule-info.c b/src/set-schedule-info.c index 0e41c15..e0d9a5d 100644 --- a/src/set-schedule-info.c +++ b/src/set-schedule-info.c @@ -17,8 +17,10 @@ #include "set-scedule-info.h" #include +#include extern ug_data g_ug_data; +bool isNextDay = true; enum TimeFormat { @@ -52,9 +54,11 @@ typedef struct datetime Evas_Object *datetime; Evas_Object *popup; struct tm saved_time; - bool is_start_button; + bool is_start_time; } datetime_s; +datetime_s start_time_p, end_time_p; + void set_schedule_check_changed_cb(void *data, Evas_Object *obj, void *event_info) { NOTISET_TRACE_BEGIN; @@ -103,6 +107,7 @@ bool get_schedule() static Evas_Object *create_week_repeat_layout(Evas_Object* parent) { + Evas_Object *layout = elm_layout_add(parent); char *res_path = app_get_resource_path(); @@ -130,7 +135,9 @@ static void week_button_clicked_cb(void *data, Evas_Object *obj, void *event_inf { snprintf(buf, sizeof(buf), "%s", cc->text); elm_object_text_set(cc->label, buf); - } else { + } + else + { snprintf(buf, sizeof(buf), "%s", cc->text); elm_object_text_set(cc->label, buf); } @@ -209,19 +216,25 @@ static void popup_cancel_btn_clicked_cb(void *data , Evas_Object *obj , void *ev static void popup_set_btn_clicked_cb(void *data , Evas_Object *obj , void *event_info) { NOTISET_TRACE_BEGIN; - char buff[TIME_STRING_SIZE] = {0}; + char buff[TIME_STRING_SIZE] = { 0 }; const char *format; datetime_s *dt = data; + elm_datetime_value_get(dt->datetime, &dt->saved_time); format = elm_datetime_format_get(dt->datetime); - if (!strcmp(format, POPUP_TIME_12_FORMAT)) { + if(!strcmp(format, POPUP_TIME_12_FORMAT)) strftime(buff, TIME_STRING_SIZE, TIME_12_FORMAT, &dt->saved_time); - elm_object_text_set(dt->button, buff); - } else { + else strftime(buff, TIME_STRING_SIZE, TIME_24_FORMAT, &dt->saved_time); - elm_object_text_set(dt->button, buff); - } + + double diff_time = difftime(mktime(&end_time_p.saved_time), mktime(&start_time_p.saved_time)); + isNextDay = diff_time <= 0 ? true : false; + NOTISET_DBG("diff_time = %f", diff_time); + + elm_genlist_item_update(elm_genlist_last_item_get(g_ug_data.list_sub)); + + elm_object_text_set(dt->button, buff); evas_object_del(dt->popup); } @@ -308,23 +321,42 @@ static Evas_Object *create_start_end_time_layout(Evas_Object* parent) return layout; } -Evas_Object *start_end_time_item(Evas_Object* parent) +Evas_Object* start_end_time_item(Evas_Object* parent, bool is_start_time_item) { - Evas_Object *layout = create_start_end_time_layout(parent); - + Evas_Object* layout = create_start_end_time_layout(parent); + datetime_s dt; char buff[TIME_STRING_SIZE] = {0}; time_t local_time = time(0); struct tm *time_info = localtime(&local_time); - datetime_s *dt = calloc(1, sizeof(datetime_s)); - dt->saved_time = *time_info; + dt.is_start_time = is_start_time_item; + dt.saved_time = *time_info; + dt.saved_time.tm_min = 0; + dt.saved_time.tm_sec = 0; - if(get_time_format() == time_format_12H) { - strftime(buff, TIME_STRING_SIZE, TIME_12_FORMAT, &dt->saved_time); - dt->button = create_time_button(layout, buff, TIME_12_FORMAT, dt); - } else if(get_time_format() == time_format_24H) { - strftime(buff, TIME_STRING_SIZE, TIME_24_FORMAT, &dt->saved_time); - dt->button = create_time_button(layout, buff, TIME_24_FORMAT, dt); + long int curr_end_time = (long int)mktime(&end_time_p.saved_time); + long int curr_start_time = (long int)mktime(&start_time_p.saved_time); + if(dt.is_start_time && curr_start_time == -1) + { + start_time_p = dt; + start_time_p.saved_time.tm_hour = 22; + } + else if(!dt.is_start_time && curr_end_time == -1) + { + end_time_p = dt; + end_time_p.saved_time.tm_hour = 8; + } + + char *timeFormat = get_time_format() == time_format_12H ? TIME_12_FORMAT : TIME_24_FORMAT; + if(is_start_time_item) + { + strftime(buff, TIME_STRING_SIZE, timeFormat, &start_time_p.saved_time); + start_time_p.button = create_time_button(layout, buff, timeFormat, &start_time_p); + } + else + { + strftime(buff, TIME_STRING_SIZE, timeFormat, &end_time_p.saved_time); + end_time_p.button = create_time_button(layout, buff, timeFormat, &end_time_p); } return layout; -- 2.7.4