TizenRefApp-6543 Manage start and end time in "Set schedule"

Change-Id: I802064abe59ee4cbd2af08a3451cf6c9e93599bb
Signed-off-by: Oleksander Kostenko <o.kostenko@samsung.com>

diff --git a/inc/set-scedule-info.h b/inc/set-scedule-info.h
index c568b0320ee3d4f92021cdbfde34e20184295b1c..c474d84dfbb2840d7da6ba463e64d9ee7d3b0144 100644 (file)
--- 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 ece399f7f62b6380d213d999f9dce2edba72a4a0..02313c5dbcea535ff21355c8be2711d1a31fe9e5 100644 (file)
--- 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 9167f31463d5830c02e05ef748eb90dbf3537ab8..7c529d12589bb024056a999f615f751bc9594518 100644 (file)
--- 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 73c8b4916b1c66bd5dcedee97eee9adce3bf76a2..8628246b12547257d0cb25ddbcb35bbdde316200 100644 (file)
--- 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 729123ac9a32842332837ddc0c19396830dff7ed..ba29da3425bc54aa1456b04aff98c587a51a650b 100644 (file)
--- 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 7fa03fdd8d72fa05f65db874828c2e767412818b..aae2eece4290b2f75d197eeaae8fb23509ed925b 100644 (file)
--- 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 4af853be96a6f02a968ea0b978e5c80f1fa4b62f..0570c870c63217dbf8deb9b76ecd1749aa3ab737 100644 (file)
--- 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 58395dc22a9bafe02de15b3e6aec54f83bff2d10..7f3135aa25e4cd433b43be7fcdd64e7b0d1aa567 100644 (file)
--- 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 d6ff587f9296fa0a17168d45fcb3247578d25935..893cce1aefe24b87376cae2252c4f4cbe8ad4b55 100644 (file)
--- 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 6e9f0e8abcc66cdd1d2072621c5014c1ff8a4fec..099888b9662007129d27fd8ae8979771c8404f68 100644 (file)
--- 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 8315a23a6916ea612b3b59427256dfeafbb5e71d..d4acc0dc489c57bad643e15bd739d31a8cc64442 100644 (file)
--- 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 028c2ea75fa37e7bb471e2060742c3a77b5d5335..214c7bf29655f16957102ace787d2857b65f090c 100644 (file)
--- 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 a2b7e3663e68865f3c467595fc9a42e6e9bdfa5f..6dabceaccfbb5d3f1f7faf55d44e1caa4676135a 100644 (file)
--- 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 818595c96bd5c7e21f141a6fa8fe909fce27c983..13cce0bb728fa67a5d066db72eac00ff6ff4afd9 100644 (file)
--- 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 c824850c43652cb887a1b2339421a6cc48ca77b9..746c25001344bbff51a62ac8e38ad534b9998c6e 100644 (file)
--- 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 0fb1c3057d4b842eb605a7ed6ce75dbf3946a02b..325f05ac1a8a02cc7bd7af80235b19f9faf48a9d 100644 (file)
--- 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 8544afc3d87167eab1fd358798cb733eee9f9189..3b964dc438e02027739f3621c038624ce7d5d398 100644 (file)
--- 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 52df4e2e15638d82aa1f6e22ab8e4d17b2c43705..083bea914b466a12ce36caf85b1d030c22bfde4a 100644 (file)
--- 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 6043de4bce20e9c39ab03572eb4f76edee97ffdf..22bb02bcb342bf4d0f3dcfde5869604699f0c3a1 100644 (file)
--- 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 ac6b7b4fdef1e3ae5ab200ccad269a609de6469e..0b77eb3ca81c3283e228279a581ef0f4fba1919b 100644 (file)
--- 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 3f6936226f3eeaf3a6616f213f07df05bd84f5c0..b701352eb68d78707d4bd5b222f429c8efb1c0e4 100644 (file)
--- 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 e139aef6718e69721a67fad939d7e8b4ee8c5358..05d1a79fee4d4de04ee745f171a4578b7986776d 100644 (file)
--- 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 8604d98a3b2c34a65fa54a488807a5800b0c707f..8675f9dc56ba503382be1a303b63ad01253d363a 100644 (file)
--- 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 4175c1e8286f0c9b5174a0f2b64fd7a9343c58b5..0a77b2aea9d870cdc5c15d3b8332566db214ca2d 100644 (file)
--- 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 e1f13bf2a54664a5fa5328edcec49b372c115304..0ec9ac1223801f1b7a0bfe08ac836560163eeded 100644 (file)
--- 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 b29bc39294f96290d3334cbaed83e877e1f84f28..539c8c5235b8cb6ae4967c252cada51a7daeb1ec 100644 (file)
--- 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 a08f2a1e699eaa7cfd6ea12e8dc4e69159723532..8ac19c49b84b6a1df5a24162b9a5048d355bce95 100644 (file)
--- 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 91e2ddc013d66cddc2f136484db9e4ba256de3df..371899162656155075382f3036a73932781834cb 100644 (file)
--- 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 ab675855940c724036daed5a3c6ab210c5fec6d4..f881756904e854a3de4ed739d42a107f442451e3 100644 (file)
--- 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 efc839b71f8e76eb19ee0120e82f8af7b87d4c64..bd4b6c13dadc099bc7ca2421e0794dba72b7df24 100644 (file)
--- 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 9975f311d38953298f00f3277a0b07b558205fbb..a4c00e01aa5b6abb2d985d7a93c001b37cbd08d6 100644 (file)
--- 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 0c68627346aff921710a56700f8d14a6718fec96..9b8514e5be3afa2fc1ebce521efd2f044bed8bb5 100644 (file)
--- 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 f19a15bb1bfba745a7cafb3f2125badc7d3a06ea..5ed5e5464f6b90b15f963759514ab63c1162844c 100644 (file)
--- 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 3203b385c3fa427b1c288ce8105dae0d4c93207d..b7d622a0a415d4100067f246c4e6c1fc45b0fd1f 100644 (file)
--- 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 004834d8dbc0d7ed069acee2e892fc3474f00b0f..595284216f9561cf6d7d1d3cfd06cc591b937fa8 100644 (file)
--- 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 e48910cd657a01f34207219c70de7680bc708086..e676e2c2da716ad3fe987cf600420b26b3e52cd3 100644 (file)
--- 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 8e8c863dc00a85c951d20d81b260b3715bb4976f..b8acea05b171e46c8695adc6376a4d6f5b9f309a 100644 (file)
--- 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 966a3288b47d5151e2d7cca5f1fd8d28b39749aa..a35cf29e73488978c4657a3330e4101aded65f37 100644 (file)
--- 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 5cbb015e2986e091e9cce0954a03bb40c748ce0d..6cb9f2f68c8d815a6009f5b98e507c7c77fea1ee 100644 (file)
--- 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 6b3af220d440fd877ef1cace58a8c0e6732bbbb1..0632cf45e18e1c14d93a975dc2ef452c077b10f3 100644 (file)
--- 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 f1edc4e7c1edc1c6ba432ea0512c8f064f81d2bc..0266cb439885a2cf6645a163a795e43dca853389 100644 (file)
--- 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 4cb357ce0f9ce168693a2d7e83bf7f2940f1b9fb..b54f34f865f0c3eeb0d1f9121ce23f9a03720d09 100644 (file)
--- 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 db7e9c7bf8f3005d893341de9d4ec751c7f05b99..30afb7edfb939e3f2c3048f47fe26163c3766deb 100644 (file)
--- 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 7774c153cbf96dad84be38465a5ed3f6fd6fb7d5..b8133b8613ed44bc8e5f75a18daafc6d23f0e02b 100644 (file)
--- 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 5244b21a0ebfcc5b11e63d3f12cdbd3593fbacdc..09ee089b40ced056fed4ee93fbad555ca0048071 100644 (file)
--- 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 2ca7a9700a57e2055c725bb95e967211138b346e..dcb885e94e00e42a760c231483d77d3c3fe20f38 100644 (file)
--- 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 0737b56afa240f89529906a858818a8a04091b31..0d3e5aeccd96ffebe86c52203a57c8303a07e1b1 100644 (file)
--- 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 7bd2bae54713c5f7f95a2c6cbb5e412d3a767727..83f92d8a5ee36b4e7ba63fe5949306d8484317ab 100644 (file)
--- 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 b11fb1c63edb31aadf277641ccba5bed9a100da0..3f084377a4bf2445f678e5672061dcb96130ff9c 100644 (file)
--- 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 3499db1ca12d65d0e174f58b6f9840c3b0884b05..9483198a7e6394265ee5ed05e933b916cf7da090 100644 (file)
--- 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 a8ff2e65239eabea721ccf6d55ee08c14d1298fb..954c0ee8c8224365f158a03f3f9743d665ff548d 100644 (file)
--- 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 b79a606c4acb07c88ee4d95fd5cd30a2310cbcdf..b346b0d9dc93d50810f9cb50a903216cf21472dd 100644 (file)
--- 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 d327d1a9c95458943e891cacc8394d1e585a7201..2c45c2b5838e26477517c8654c8e06a897898281 100644 (file)
--- 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 ff5f006013644f485d8590f3f7dc84edcfe2dc0a..03e31f21d96d9941740b32868e3c3035f9b322db 100755 (executable)
--- 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), "<font_size=30>%s</font_size>", 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), "<font_size=30>%s</font_size>",
-                               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), "<font_size=30>%s</font_size>", 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), "<font_size=30>%s</font_size>", 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), "<font_size=30>%s<br/>%s</font_size>", "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), "<font_size=30>%s<br/>%s</font_size>", "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), "<font_size=30>%s</font_size>", 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 165caa837353a97c69552027b44935f1c4af079e..760081d757a8be4fb31b9e424275685f37c79f71 100644 (file)
--- 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 0e41c1589b88f912d3e1852b1e0dc8527c323b96..e0d9a5d2a66e934c5ed36e69564cd40fbba4590d 100644 (file)
--- a/src/set-schedule-info.c
+++ b/src/set-schedule-info.c
@@ -17,8 +17,10 @@
 
 #include "set-scedule-info.h"
 #include <system_settings.h>
+#include <time.h>
 
 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), "<font_size=80><color=#000000>%s</color></font_size>", cc->text);
         elm_object_text_set(cc->label, buf);
-    } else {
+    }
+    else
+    {
         snprintf(buf, sizeof(buf), "<font_size=80><color=#66ff66>%s</color></font_size>", 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;