diff options
| author | Eugene Kurzberg <i.kurtsberg@samsung.com> | 2017-08-02 14:42:38 +0300 |
|---|---|---|
| committer | Eugene Kurzberg <i.kurtsberg@samsung.com> | 2017-08-02 14:43:14 +0300 |
| commit | 3c62201e600b6d77f3f5ec81a017564ce2ee2357 (patch) | |
| tree | 6aa65c2915207e5577c9d491d45cbeca23a716d5 | |
| parent | f77bfe7f3c4a485fc2dfe444553879d471b72286 (diff) | |
| download | alarm-3c62201e600b6d77f3f5ec81a017564ce2ee2357.tar.gz alarm-3c62201e600b6d77f3f5ec81a017564ce2ee2357.tar.bz2 alarm-3c62201e600b6d77f3f5ec81a017564ce2ee2357.zip | |
TizenRefApp-8947 Weekdays displayed for one-time alarm widgetsubmit/tizen/20170822.135208submit/tizen/20170803.133748
Change-Id: Ib0d2043e88112cfa6a445f4a852629a81a55def9
Signed-off-by: Eugene Kurzberg <i.kurtsberg@samsung.com>
| -rw-r--r-- | alarm-widget/src/AlarmWidget.cpp | 13 | ||||
| -rw-r--r-- | lib-common/inc/Common/Model/Alarm.h | 3 |
2 files changed, 10 insertions, 6 deletions
diff --git a/alarm-widget/src/AlarmWidget.cpp b/alarm-widget/src/AlarmWidget.cpp index c98c052..2473960 100644 --- a/alarm-widget/src/AlarmWidget.cpp +++ b/alarm-widget/src/AlarmWidget.cpp @@ -71,12 +71,8 @@ Evas_Object *AlarmWidget::createContentLayout(Evas_Object *parent) elm_layout_signal_callback_add(layout, "mouse,clicked,*", "rect.event", (Edje_Signal_Cb) makeCallback(&AlarmWidget::onContentPressed), this); - elm_object_part_text_set(layout, PART_TIME, formatTime(m_Alarm->getDate(), TIME_SIZE)); - elm_object_part_text_set(layout, PART_REPEAT, formatRepeat(m_Alarm->getRepeat())); - Evas_Object *check = elm_check_add(layout); evas_object_propagate_events_set(check, EINA_FALSE); - elm_check_state_set(check, m_Alarm->isEnabled()); elm_object_style_set(check, STYLE_CHECK_ALARM_ON_OFF); elm_object_part_content_set(layout, PART_ON_OFF, check); evas_object_smart_callback_add(check, "changed", makeCallback(&AlarmWidget::onCheckedPressed), this); @@ -98,11 +94,17 @@ Evas_Object *AlarmWidget::createEmptyLayout(Evas_Object *parent) void AlarmWidget::updateContentLayout(int changes) { + int repeatMask = m_Alarm->getRepeat(); if (changes & Alarm::ChangedDate) { elm_object_part_text_set(m_Layout, PART_TIME, formatTime(m_Alarm->getDate(), TIME_SIZE)); + if (!repeatMask) { + elm_object_part_text_set(m_Layout, PART_REPEAT, formatDate(m_Alarm->getDate()).c_str()); + } } if (changes & Alarm::ChangedRepeat) { - elm_object_part_text_set(m_Layout, PART_REPEAT, formatRepeat(m_Alarm->getRepeat())); + if (repeatMask) { + elm_object_part_text_set(m_Layout, PART_REPEAT, formatRepeat(m_Alarm->getRepeat())); + } } if (changes & Alarm::ChangedEnabled) { Evas_Object *check = elm_object_part_content_get(m_Layout, PART_ON_OFF); @@ -118,6 +120,7 @@ void AlarmWidget::updateEmptyState() m_Layout = createEmptyLayout(parent); } else { m_Layout = createContentLayout(parent); + updateContentLayout(Alarm::ChangedAll); } elm_object_part_content_set(parent, "elm.swallow.content", m_Layout); diff --git a/lib-common/inc/Common/Model/Alarm.h b/lib-common/inc/Common/Model/Alarm.h index 7b9c612..27a7ce2 100644 --- a/lib-common/inc/Common/Model/Alarm.h +++ b/lib-common/inc/Common/Model/Alarm.h @@ -35,7 +35,8 @@ namespace Common { ChangedDate = 1 << 0, ChangedRepeat = 1 << 1, - ChangedEnabled = 1 << 2 + ChangedEnabled = 1 << 2, + ChangedAll = -1 }; Alarm(); |