From: Lukasz Stanislawski Date: Sun, 13 Nov 2016 18:10:27 +0000 (+0100) Subject: EditAlarmView: change title on alarm create X-Git-Tag: submit/tizen/20170120.120822~54 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=202d7ef85487fd9666e2871f006c66efee15d130;p=profile%2Fmobile%2Fapps%2Fnative%2Fclock.git EditAlarmView: change title on alarm create When creating new alarm show "Create" set title, when editing "Edit" Change-Id: If1f0bb5bf077e45639f68c40fdc712e987482321 --- diff --git a/clock/inc/View/EditAlarmView.h b/clock/inc/View/EditAlarmView.h index 0dcc506..6d072b1 100644 --- a/clock/inc/View/EditAlarmView.h +++ b/clock/inc/View/EditAlarmView.h @@ -38,6 +38,13 @@ namespace view { std::string melody; model::AlarmType type; }; + /** + * @brief Possible view modes. + */ + enum class Mode { + Edit, /* Edit existing alarm mode */ + Create, /* Create new alarm mode */ + }; typedef std::function EditDoneCallback; typedef std::function EditCancelCallback; @@ -51,6 +58,11 @@ namespace view { const AlarmViewInfo& GetData() const { return data_; } void SetData(const AlarmViewInfo &info); + + /** + * @brief Set view mode. + */ + void SetMode(Mode mode) { mode_ = mode; } protected: virtual void CreateContent(Evas_Object *parent); virtual void DestroyContent(); @@ -75,6 +87,7 @@ namespace view { AlarmViewInfo data_; bool is_muted_; + Mode mode_; static void OnCancelButtonClickedCb(void *data, Evas_Object *obj, void *event); static void OnConfirmButtonClickedCb(void *data, Evas_Object *obj, void *event); @@ -98,6 +111,7 @@ namespace view { void UpdateVolumeIcon(bool mute); utils::RingtonePicker picker_; void RingtonePathUpdateCallback(); + const char *GetTitle(); }; } /* view */ diff --git a/clock/res/po/ar.po b/clock/res/po/ar.po index 3488c02..9d85d6b 100644 --- a/clock/res/po/ar.po +++ b/clock/res/po/ar.po @@ -112,3 +112,6 @@ msgstr "كل يوم خميس" msgid "IDS_CLOCK_MBODY_EVERY_WEDNESDAY" msgstr "كل يوم أربعاء" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "إنشاء" diff --git a/clock/res/po/bg.po b/clock/res/po/bg.po index aab8c47..a750910 100644 --- a/clock/res/po/bg.po +++ b/clock/res/po/bg.po @@ -112,3 +112,6 @@ msgstr "Всеки вторник" msgid "IDS_CLOCK_MBODY_EVERY_MONDAY" msgstr "Всеки понеделник" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Създай" diff --git a/clock/res/po/ca.po b/clock/res/po/ca.po index 5d0e5f5..9256d90 100644 --- a/clock/res/po/ca.po +++ b/clock/res/po/ca.po @@ -112,3 +112,6 @@ msgstr "Cada dimarts" msgid "IDS_CLOCK_MBODY_EVERY_MONDAY" msgstr "Cada dilluns" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Crear" diff --git a/clock/res/po/cs.po b/clock/res/po/cs.po index c3b0ae4..4c11839 100644 --- a/clock/res/po/cs.po +++ b/clock/res/po/cs.po @@ -112,3 +112,6 @@ msgstr "Každé pondělí" msgid "IDS_CLOCK_MBODY_EVERY_SUNDAY" msgstr "Každá neděle" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Vytvořit" diff --git a/clock/res/po/da.po b/clock/res/po/da.po index 4e194c0..6ff7e6a 100644 --- a/clock/res/po/da.po +++ b/clock/res/po/da.po @@ -112,3 +112,6 @@ msgstr "Hver søndag" msgid "IDS_CLOCK_MBODY_EVERY_SATURDAY" msgstr "Hver lørdag" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Opret" diff --git a/clock/res/po/de_DE.po b/clock/res/po/de_DE.po index 5947e87..df06857 100644 --- a/clock/res/po/de_DE.po +++ b/clock/res/po/de_DE.po @@ -112,3 +112,6 @@ msgstr "Jeden Dienstag" msgid "IDS_CLOCK_MBODY_EVERY_MONDAY" msgstr "Jeden Montag" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Erstellen" diff --git a/clock/res/po/el_GR.po b/clock/res/po/el_GR.po index d785401..81728e9 100644 --- a/clock/res/po/el_GR.po +++ b/clock/res/po/el_GR.po @@ -112,3 +112,6 @@ msgstr "Κάθε Κυριακή" msgid "IDS_CLOCK_MBODY_EVERY_SATURDAY" msgstr "Κάθε Σάββατο" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Δημ/ργία" diff --git a/clock/res/po/en.po b/clock/res/po/en.po index b81611a..8195346 100644 --- a/clock/res/po/en.po +++ b/clock/res/po/en.po @@ -151,3 +151,6 @@ msgstr "Every Friday" msgid "IDS_CLOCK_MBODY_EVERY_THURSDAY" msgstr "Every Thursday" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Create" diff --git a/clock/res/po/en_US.po b/clock/res/po/en_US.po index 365f826..ae89c81 100644 --- a/clock/res/po/en_US.po +++ b/clock/res/po/en_US.po @@ -169,3 +169,6 @@ msgstr "Every Wednesday" msgid "IDS_CLOCK_MBODY_EVERY_TUESDAY" msgstr "Every Tuesday" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Create" diff --git a/clock/res/po/es_ES.po b/clock/res/po/es_ES.po index 02c492c..2a07510 100644 --- a/clock/res/po/es_ES.po +++ b/clock/res/po/es_ES.po @@ -112,3 +112,6 @@ msgstr "Cada jueves" msgid "IDS_CLOCK_MBODY_EVERY_WEDNESDAY" msgstr "Cada miércoles" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Crear" diff --git a/clock/res/po/fi.po b/clock/res/po/fi.po index 9781885..361c346 100644 --- a/clock/res/po/fi.po +++ b/clock/res/po/fi.po @@ -112,3 +112,6 @@ msgstr "Joka perjantai" msgid "IDS_CLOCK_MBODY_EVERY_THURSDAY" msgstr "Joka torstai" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Luo" diff --git a/clock/res/po/fr_FR.po b/clock/res/po/fr_FR.po index 399a24f..6723c59 100644 --- a/clock/res/po/fr_FR.po +++ b/clock/res/po/fr_FR.po @@ -112,3 +112,6 @@ msgstr "Chaque mardi" msgid "IDS_CLOCK_MBODY_EVERY_MONDAY" msgstr "Chaque lundi" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Créer" diff --git a/clock/res/po/he.po b/clock/res/po/he.po index 1ecc230..fb445c1 100644 --- a/clock/res/po/he.po +++ b/clock/res/po/he.po @@ -109,3 +109,6 @@ msgstr "כל יום שלישי" msgid "IDS_CLOCK_MBODY_EVERY_MONDAY" msgstr "כל יום שני" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "צור" diff --git a/clock/res/po/hi.po b/clock/res/po/hi.po index 0c64701..78d06ce 100644 --- a/clock/res/po/hi.po +++ b/clock/res/po/hi.po @@ -112,3 +112,6 @@ msgstr "प्रत्‍येक रविवार" msgid "IDS_CLOCK_MBODY_EVERY_SATURDAY" msgstr "प्रत्‍येक शनिवार" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "बनाएँ" diff --git a/clock/res/po/hr.po b/clock/res/po/hr.po index 4c8a193..480d623 100644 --- a/clock/res/po/hr.po +++ b/clock/res/po/hr.po @@ -112,3 +112,6 @@ msgstr "Svakog ponedjeljka" msgid "IDS_CLOCK_MBODY_EVERY_SUNDAY" msgstr "Svake nedjelje" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Novi" diff --git a/clock/res/po/hu.po b/clock/res/po/hu.po index b65c6f6..5ce31d8 100644 --- a/clock/res/po/hu.po +++ b/clock/res/po/hu.po @@ -112,3 +112,6 @@ msgstr "Minden csütörtökön" msgid "IDS_CLOCK_MBODY_EVERY_WEDNESDAY" msgstr "Minden szerdán" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Létrehoz" diff --git a/clock/res/po/id.po b/clock/res/po/id.po index 749fe74..f443bf3 100644 --- a/clock/res/po/id.po +++ b/clock/res/po/id.po @@ -109,3 +109,6 @@ msgstr "Tiap Senin" msgid "IDS_CLOCK_MBODY_EVERY_SUNDAY" msgstr "Tiap Minggu" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Membuat" diff --git a/clock/res/po/it_IT.po b/clock/res/po/it_IT.po index a5f16c4..bbcb8ac 100644 --- a/clock/res/po/it_IT.po +++ b/clock/res/po/it_IT.po @@ -112,3 +112,6 @@ msgstr "Ogni martedì" msgid "IDS_CLOCK_MBODY_EVERY_MONDAY" msgstr "Ogni lunedì" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Crea" diff --git a/clock/res/po/ja_JP.po b/clock/res/po/ja_JP.po index 93f92a7..ad8404c 100644 --- a/clock/res/po/ja_JP.po +++ b/clock/res/po/ja_JP.po @@ -112,3 +112,6 @@ msgstr "毎週​月曜日" msgid "IDS_CLOCK_MBODY_EVERY_SUNDAY" msgstr "毎週​日曜日" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "作成" diff --git a/clock/res/po/ko_KR.po b/clock/res/po/ko_KR.po index a87e65b..8662d90 100644 --- a/clock/res/po/ko_KR.po +++ b/clock/res/po/ko_KR.po @@ -112,3 +112,6 @@ msgstr "수요일마다" msgid "IDS_CLOCK_MBODY_EVERY_TUESDAY" msgstr "화요일마다" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "추가" diff --git a/clock/res/po/lt.po b/clock/res/po/lt.po index d74a598..6034adf 100644 --- a/clock/res/po/lt.po +++ b/clock/res/po/lt.po @@ -112,3 +112,6 @@ msgstr "Kiekvieną ketvirtadienį" msgid "IDS_CLOCK_MBODY_EVERY_WEDNESDAY" msgstr "Kiekvieną trečiadienį" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Kurti" diff --git a/clock/res/po/lv.po b/clock/res/po/lv.po index 5462705..978e258 100644 --- a/clock/res/po/lv.po +++ b/clock/res/po/lv.po @@ -112,3 +112,6 @@ msgstr "Katru trešdienu" msgid "IDS_CLOCK_MBODY_EVERY_TUESDAY" msgstr "Katru otrdienu" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Izveidot" diff --git a/clock/res/po/ms.po b/clock/res/po/ms.po index a0472c6..a04ea3d 100644 --- a/clock/res/po/ms.po +++ b/clock/res/po/ms.po @@ -109,3 +109,6 @@ msgstr "Setiap Isnin" msgid "IDS_CLOCK_MBODY_EVERY_SUNDAY" msgstr "Setiap Ahad" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Reka" diff --git a/clock/res/po/nl_NL.po b/clock/res/po/nl_NL.po index 226051f..04135e0 100644 --- a/clock/res/po/nl_NL.po +++ b/clock/res/po/nl_NL.po @@ -112,3 +112,6 @@ msgstr "Elke zondag" msgid "IDS_CLOCK_MBODY_EVERY_SATURDAY" msgstr "Elke zaterdag" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Maken" diff --git a/clock/res/po/no.po b/clock/res/po/no.po index 1d1c01c..e84cafc 100644 --- a/clock/res/po/no.po +++ b/clock/res/po/no.po @@ -109,3 +109,6 @@ msgstr "Hver fredag" msgid "IDS_CLOCK_MBODY_EVERY_THURSDAY" msgstr "Hver torsdag" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Opprett" diff --git a/clock/res/po/pl.po b/clock/res/po/pl.po index c141773..20095cb 100644 --- a/clock/res/po/pl.po +++ b/clock/res/po/pl.po @@ -112,3 +112,6 @@ msgstr "Co poniedziałek" msgid "IDS_CLOCK_MBODY_EVERY_SUNDAY" msgstr "Co niedzielę" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Utwórz" diff --git a/clock/res/po/pt_PT.po b/clock/res/po/pt_PT.po index 026c6aa..648d1c3 100644 --- a/clock/res/po/pt_PT.po +++ b/clock/res/po/pt_PT.po @@ -112,3 +112,6 @@ msgstr "Todas as quartas-feiras" msgid "IDS_CLOCK_MBODY_EVERY_TUESDAY" msgstr "Todas as terças-feiras" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Criar" diff --git a/clock/res/po/ro.po b/clock/res/po/ro.po index 8aac7b2..1357039 100644 --- a/clock/res/po/ro.po +++ b/clock/res/po/ro.po @@ -112,3 +112,6 @@ msgstr "În fiecare sâmbătă" msgid "IDS_CLOCK_MBODY_EVERY_FRIDAY" msgstr "În fiecare vineri" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Creare" diff --git a/clock/res/po/ru_RU.po b/clock/res/po/ru_RU.po index ee29842..475d163 100644 --- a/clock/res/po/ru_RU.po +++ b/clock/res/po/ru_RU.po @@ -112,3 +112,6 @@ msgstr "?ажд?й ?е?ве?г" msgid "IDS_CLOCK_MBODY_EVERY_WEDNESDAY" msgstr "?ажд?? ??ед?" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Создать" diff --git a/clock/res/po/sk.po b/clock/res/po/sk.po index 3b06d61..52b0c0a 100644 --- a/clock/res/po/sk.po +++ b/clock/res/po/sk.po @@ -112,3 +112,6 @@ msgstr "Každý utorok" msgid "IDS_CLOCK_MBODY_EVERY_MONDAY" msgstr "Každý pondelok" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Vytvoriť" diff --git a/clock/res/po/sl.po b/clock/res/po/sl.po index cdec5f3..45c1736 100644 --- a/clock/res/po/sl.po +++ b/clock/res/po/sl.po @@ -112,3 +112,6 @@ msgstr "Vsak torek" msgid "IDS_CLOCK_MBODY_EVERY_MONDAY" msgstr "Vsak ponedeljek" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Ustvari" diff --git a/clock/res/po/sr.po b/clock/res/po/sr.po index c44cf76..54b57cc 100644 --- a/clock/res/po/sr.po +++ b/clock/res/po/sr.po @@ -112,3 +112,6 @@ msgstr "Svakog petka" msgid "IDS_CLOCK_MBODY_EVERY_THURSDAY" msgstr "Svakog četvrtka" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Kreiraj" diff --git a/clock/res/po/sv.po b/clock/res/po/sv.po index 04335fd..b8ab7e9 100644 --- a/clock/res/po/sv.po +++ b/clock/res/po/sv.po @@ -112,3 +112,6 @@ msgstr "Varje tisdag" msgid "IDS_CLOCK_MBODY_EVERY_MONDAY" msgstr "Varje måndag" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Skapa" diff --git a/clock/res/po/th.po b/clock/res/po/th.po index 3761915..a38e14a 100644 --- a/clock/res/po/th.po +++ b/clock/res/po/th.po @@ -109,3 +109,6 @@ msgstr "ทุก​วัน​เสาร์" msgid "IDS_CLOCK_MBODY_EVERY_FRIDAY" msgstr "ทุก​วัน​ศุกร์" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "สร้าง" diff --git a/clock/res/po/tr_TR.po b/clock/res/po/tr_TR.po index c3b7925..d9b0e0b 100644 --- a/clock/res/po/tr_TR.po +++ b/clock/res/po/tr_TR.po @@ -112,3 +112,6 @@ msgstr "Her Salı" msgid "IDS_CLOCK_MBODY_EVERY_MONDAY" msgstr "Her Pazartesi" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Oluştur" diff --git a/clock/res/po/uk.po b/clock/res/po/uk.po index 85f978c..05d88c7 100644 --- a/clock/res/po/uk.po +++ b/clock/res/po/uk.po @@ -112,3 +112,6 @@ msgstr "Щоп’ятниці" msgid "IDS_CLOCK_MBODY_EVERY_THURSDAY" msgstr "Щочетверга" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Створити" diff --git a/clock/res/po/vi.po b/clock/res/po/vi.po index 8d89dbe..503e973 100644 --- a/clock/res/po/vi.po +++ b/clock/res/po/vi.po @@ -109,3 +109,6 @@ msgstr "Mọi Thứ 6" msgid "IDS_CLOCK_MBODY_EVERY_THURSDAY" msgstr "Mọi Thứ 5" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "Tạo" diff --git a/clock/res/po/zh_CN.po b/clock/res/po/zh_CN.po index b54238d..3069fea 100644 --- a/clock/res/po/zh_CN.po +++ b/clock/res/po/zh_CN.po @@ -112,3 +112,6 @@ msgstr "每周五" msgid "IDS_CLOCK_MBODY_EVERY_THURSDAY" msgstr "每周四" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "新建" diff --git a/clock/res/po/zh_HK.po b/clock/res/po/zh_HK.po index 0249d99..a919db1 100644 --- a/clock/res/po/zh_HK.po +++ b/clock/res/po/zh_HK.po @@ -112,3 +112,6 @@ msgstr "逢星期四" msgid "IDS_CLOCK_MBODY_EVERY_WEDNESDAY" msgstr "逢星期三" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "建立" diff --git a/clock/res/po/zh_TW.po b/clock/res/po/zh_TW.po index c3526a9..0b505fc 100644 --- a/clock/res/po/zh_TW.po +++ b/clock/res/po/zh_TW.po @@ -112,3 +112,6 @@ msgstr "每週六" msgid "IDS_CLOCK_MBODY_EVERY_FRIDAY" msgstr "每週五" + +msgid "IDS_CLOCK_HEADER_CREATE_ABB2" +msgstr "建立" diff --git a/clock/src/Presenter/EditAlarmPresenter.cpp b/clock/src/Presenter/EditAlarmPresenter.cpp index 80f6c99..e804d28 100644 --- a/clock/src/Presenter/EditAlarmPresenter.cpp +++ b/clock/src/Presenter/EditAlarmPresenter.cpp @@ -33,6 +33,7 @@ EditAlarmPresenter::EditAlarmPresenter(model::Alarm *alarm, view::EditAlarmView& view_.RegisterEditDoneCallback(std::bind(&EditAlarmPresenter::OnEditDone, this)); view_.RegisterEditCancelCallback(std::bind(&EditAlarmPresenter::OnEditCancel, this)); view_.SetData(GetInfoForAlarm(alarm)); + view_.SetMode(alarm_ == nullptr ? EditAlarmView::Mode::Create : EditAlarmView::Mode::Edit); view_.PushPage(); } diff --git a/clock/src/View/EditAlarmView.cpp b/clock/src/View/EditAlarmView.cpp index e390416..9cb9eba 100644 --- a/clock/src/View/EditAlarmView.cpp +++ b/clock/src/View/EditAlarmView.cpp @@ -168,6 +168,17 @@ void EditAlarmView::OnConfirmButtonClickedCb(void *data, Evas_Object *obj, void view->PopPage(); } +const char *EditAlarmView::GetTitle() +{ + switch (mode_) { + case Mode::Edit: + return "IDS_CLOCK_HEADER_EDIT_ABB3"; + case Mode::Create: + return "IDS_CLOCK_HEADER_CREATE_ABB2"; + } + return NULL; +} + void EditAlarmView::CreateContent(Evas_Object *parent) { // set page style - "basic" style is supported by default tizen theme @@ -196,7 +207,8 @@ void EditAlarmView::CreateContent(Evas_Object *parent) evas_object_show(content_); // fill created parts in object item - elm_object_item_translatable_part_text_set(navi_item_, "elm.text.title", "IDS_CLOCK_HEADER_EDIT_ABB3"); + elm_object_item_translatable_part_text_set(navi_item_, "elm.text.title", + GetTitle()); elm_object_item_part_content_set(navi_item_, "title_left_btn", left_btn_); elm_object_item_part_content_set(navi_item_, "title_right_btn", right_btn_); elm_object_item_content_set(navi_item_, content_);