TizenRefApp-8334 Implement missing popups in Conversation

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

diff --git a/edje/images/tw_ic_popup_btn_check.png b/edje/images/tw_ic_popup_btn_check.png
new file mode 100755 (executable)
index 0000000..3dce121
Binary files /dev/null and b/edje/images/tw_ic_popup_btn_check.png differ

diff --git a/edje/images/tw_ic_popup_btn_delete.png b/edje/images/tw_ic_popup_btn_delete.png
new file mode 100755 (executable)
index 0000000..58de36c
Binary files /dev/null and b/edje/images/tw_ic_popup_btn_delete.png differ

diff --git a/inc/Resource.h b/inc/Resource.h
index 2aaa4ccc73c0350ad667bb5727722014daa2e2a4..59381f25985f7b663bf7d06b7303a78fec5f1a2c 100644 (file)
--- a/inc/Resource.h
+++ b/inc/Resource.h
@@ -46,6 +46,10 @@
 #define SHOW_ON_DEV_MORE_ICON            MORE_OPTION_DIR"/b_more_option_ic_showondevice.png"
 #define VIEW_BY_ACCOUNT_MORE_ICON        MORE_OPTION_DIR"/b_more_option_ic_viewbyaccount.png"
 
+// Popup Images
+#define CANCEL_BUTTON_POPUP              "tw_ic_popup_btn_delete.png"
+#define OK_BUTTON_POPUP                  "tw_ic_popup_btn_check.png"
+
 
 #define FAIL_ICON                        "sent_fail_icon.png"
 

diff --git a/res/edje/images.edc b/res/edje/images.edc
index 9f3acc039f22aadb546f143e7762b21b0fed1a0f..0941978e6fe5ebf713e11e91cb649a91ac69885e 100755 (executable)
--- a/res/edje/images.edc
+++ b/res/edje/images.edc
@@ -40,4 +40,6 @@ collections {
    RES_IMAGE("thread_view_msg_att_etc.png");
    RES_IMAGE("thread_view_msg_att_schedule.png");
    RES_IMAGE("sent_fail_icon.png");
+   RES_IMAGE("tw_ic_popup_btn_delete.png");
+   RES_IMAGE("tw_ic_popup_btn_check.png");
 }

diff --git a/res/po/ar.po b/res/po/ar.po
index 80f3c0fc6b231f25c942bd9dbc89ee511ceb917a..9c9e45405a376694b1ed25f64564350ba0c33f9e 100644 (file)
--- a/res/po/ar.po
+++ b/res/po/ar.po
@@ -232,3 +232,6 @@ msgstr "رسالة وسائط متعددة"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "انقر هنا لاسترداد الرسالة"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "يتعذر استرداد الرسالة. إن بيانات المحمول متوقفة عن التشغيل."
+

diff --git a/res/po/az.po b/res/po/az.po
index d34959444d600e4c36dc7901f89793a1efab16c5..c11ddc1c6754ed9ff7c2e0a341f6f39da509b359 100644 (file)
--- a/res/po/az.po
+++ b/res/po/az.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Msj bərpa etmək üçün bura vur"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Mesajı çıxarmaq olmadı. Mobil data sönülüdür."
+

diff --git a/res/po/bg.po b/res/po/bg.po
index ca2f77016fecfbb746cfa184d392daf81ee1dcc0..4962c32db43807a23bf4098e706428e0ce16494c 100644 (file)
--- a/res/po/bg.po
+++ b/res/po/bg.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Докоснете тук, за да извлечете съобщението"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Не може да се извлече съобщението. Моб. данни са изключ."
+

diff --git a/res/po/ca.po b/res/po/ca.po
index 31adb30a96ef179c09d9303df8b23e9448e53d42..274a6074c030aa8f0be75285f65c3dd79ce33e44 100644 (file)
--- a/res/po/ca.po
+++ b/res/po/ca.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Toqui aquí per recuperar el missatge"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "No es pot recuperar el missatge. Dades mòbils apagades."
+

diff --git a/res/po/cs.po b/res/po/cs.po
index 498979b73a8ae94d36dd151535915e1b4f1eee5c..8090e06b01c9cee78621bc96bb944ff3b682bc96 100644 (file)
--- a/res/po/cs.po
+++ b/res/po/cs.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Klepnutím sem načtete zprávu"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Zprávu nelze načíst. Mobilní data jsou vypnutá."
+

diff --git a/res/po/da.po b/res/po/da.po
index 7c07c3d71cbb9bbd627e33e6699f48619250fd08..11bb0e846301e5f6d084f01ce431d4b1a46db39b 100644 (file)
--- a/res/po/da.po
+++ b/res/po/da.po
@@ -232,3 +232,6 @@ msgstr "Mms"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Tryk her for at hente beskeden"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Kan ikke hente besked. Mobile data er deaktiveret."
+

diff --git a/res/po/de.po b/res/po/de.po
index 7405a1ce382ee8cc29c349f7907d5e65d3739d8a..40363952ec14071b51ae285ba29547a82fed5cb4 100644 (file)
--- a/res/po/de.po
+++ b/res/po/de.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Hier tippen, um die Nachricht abzurufen."
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Nachricht abrufen nicht möglich. Mobile Daten deaktiviert."
+

diff --git a/res/po/el_GR.po b/res/po/el_GR.po
index 9dfdd55c020c207830575acd8485d2f4f1d736c0..234d6764dbb7af610b8b3946008e4998704c6f2c 100644 (file)
--- a/res/po/el_GR.po
+++ b/res/po/el_GR.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Πατήστε εδώ για να ανακτήσετε το μήνυμα"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Αδυν. ανάκτησης μηνύμ. Τα δεδ. κιν. τηλ. είναι ανενεργά."
+

diff --git a/res/po/en.po b/res/po/en.po
index b0a34a4c16d6b5a1e29de1360dddf343d9df27b4..e1227973b83a27b1ad844231c77cf9d4ee621883 100644 (file)
--- a/res/po/en.po
+++ b/res/po/en.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Tap here to retrieve message"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Unable to retrieve message. Mobile data off."
+

diff --git a/res/po/en_PH.po b/res/po/en_PH.po
index ed660805e11e2d819e5c43f97ed44be411e5c382..858e1f1b2c6ad35b54241cd5fe0e7120f642c682 100644 (file)
--- a/res/po/en_PH.po
+++ b/res/po/en_PH.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Tap here to retrieve message"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Unable to retrieve message. Mobile data off."
+

diff --git a/res/po/en_US.po b/res/po/en_US.po
index da156726dfeef5acd1601fd5651621490eb2eba3..55cbfd0d168dd52888789cb43072ab9aa9765994 100644 (file)
--- a/res/po/en_US.po
+++ b/res/po/en_US.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Tap here to retrieve message"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Unable to retrieve message. Mobile data off."
+

diff --git a/res/po/es_ES.po b/res/po/es_ES.po
index 2962d028c172b3df3f2f95d51135ff6cc1c34c33..d2c0240a854fa9cedaf855bf8c9258ffdbae85c2 100644 (file)
--- a/res/po/es_ES.po
+++ b/res/po/es_ES.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Pulsar aquí para recuperar el mensaje"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Imposible recuperar mensaje. Datos móviles desactivados."
+

diff --git a/res/po/es_US.po b/res/po/es_US.po
index dd5b9c86008b84c439d488b30a8c59cfbddbaeb9..a01982185742b931d014c35cb7bfa4f9212abfa9 100644 (file)
--- a/res/po/es_US.po
+++ b/res/po/es_US.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Pulsar aquí para recuperar mensaje"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "No se recuperó el mensaje. Datos móviles desactivados."
+

diff --git a/res/po/et.po b/res/po/et.po
index 28fb3474eb1809a604a79ab170850c2c382891fd..6c16fe377c5e69d65591579e7a24903977774879 100644 (file)
--- a/res/po/et.po
+++ b/res/po/et.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Toksake siia, et taastada sõnumit"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Sõn. ei saa laadida. Mob. andmeside on välja lülitatud."
+

diff --git a/res/po/eu.po b/res/po/eu.po
index 490b1b119f92ce719e656d856e3a1bbe61d84cc7..ef91de9f307e34eb1e438193a125f7f29dac7279 100644 (file)
--- a/res/po/eu.po
+++ b/res/po/eu.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Ukitu hau mezua eskuratzeko"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Ezin da mezua eskuratu. Datu mugikorrak desaktibatuta."
+

diff --git a/res/po/fi.po b/res/po/fi.po
index c8c127962f86a8aa077b2d523c7c1f902b8d15a6..262cb79fec57152ff249695664ec2653db24ed37 100644 (file)
--- a/res/po/fi.po
+++ b/res/po/fi.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Palauta viesti napauttamalla tätä"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Viestiä ei voi hakea. Mobiilidata on poistettu käytöstä."
+

diff --git a/res/po/fr.po b/res/po/fr.po
index c4c7334bfad64251fb2e1306ab866a0cbfebd088..7a15d49e614a19d0e93f50d464a9879121113eab 100644 (file)
--- a/res/po/fr.po
+++ b/res/po/fr.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Appuyer ici pour récupérer le message"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Impossible récupérer message. Données mobiles désactivées."
+

diff --git a/res/po/fr_CA.po b/res/po/fr_CA.po
index 244534ad9c6f3bcc9cad7173b222b73e89db7f37..ba928dd291197f69886f053a528a656e6d18788e 100644 (file)
--- a/res/po/fr_CA.po
+++ b/res/po/fr_CA.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Toucher ici pour récupérer le message"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Impossible récupérer message. Données mobiles désactivées."
+

diff --git a/res/po/ga.po b/res/po/ga.po
index 1df19391dc43f0437dad50993f40bce80404acce..960ad93b063d3c8bc73c4b666f013cfabf8249ee 100644 (file)
--- a/res/po/ga.po
+++ b/res/po/ga.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Tapáil anseo leis an teachtaireacht a aisghabháil"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Ní féidir teachtaireacht a aisghabháil. Sonraí móib. as."
+

diff --git a/res/po/gl.po b/res/po/gl.po
index 49d01454627983c0958c0335f57c1c762917c0d9..bbb728a45dc6aa16d929365820a0b04497c9c7c2 100644 (file)
--- a/res/po/gl.po
+++ b/res/po/gl.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Toca aquí para recuperar a mensaxe"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Non se pode recuperar a mensaxe. Datos móbiles desact."
+

diff --git a/res/po/hi.po b/res/po/hi.po
index dedbf4def7ae165ff6ec8b06bd1a4ae389be896e..faa12d64471d29f5fc6fa0cf60df84c46ad2a8ed 100644 (file)
--- a/res/po/hi.po
+++ b/res/po/hi.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "सन्देश पुनर्प्राप्त करने के लिए यहां टैप करें"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "सन्देश पुनर्प्राप्‍त करने में असमर्थ। मोबाइल डाटा बंद है।"
+

diff --git a/res/po/hr.po b/res/po/hr.po
index 34d2efdda7c56647377c7ef7b3a4f1b81e0127bd..3c0b5766143b8f8e125bf87d6d5591807884821f 100644 (file)
--- a/res/po/hr.po
+++ b/res/po/hr.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Dodirnite ovdje za preuzimanje poruke"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Nije moguće preuzeti poruku. Mobilni podaci isključeni."
+

diff --git a/res/po/hu.po b/res/po/hu.po
index bab1910bddd2d72ed97ce89a3a53b00f8fb45d99..599470574be6a66108af4d15079b2b1d2687aec0 100644 (file)
--- a/res/po/hu.po
+++ b/res/po/hu.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Érintse meg az üzenet letöltéséhez"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Kikapcsolt Mobilinternet-kapcsolattal nem lehet letölteni."
+

diff --git a/res/po/hy.po b/res/po/hy.po
index b089e16f6da212f9615c656305f855ff53f68130..4c6e2b7667ae7a210eb2a9fed9e26037df445aa0 100644 (file)
--- a/res/po/hy.po
+++ b/res/po/hy.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Թակեք այստեղ՝ հաղորդագրությունն առբերելու համար"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Անհնար է առբերել հղրդգրությունը: Շարժ. տվյալներն անջ. են:"
+

diff --git a/res/po/is.po b/res/po/is.po
index 64ed6c028cfbd5cdba4fb72170a54b59079a90d6..41901fb0c80dd2e7c4e50baf28b1d1a92e868997 100644 (file)
--- a/res/po/is.po
+++ b/res/po/is.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Pikkaðu hér til að sækja skilaboð"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Ekki er hægt að sækja skilaboð. Slökkt á farsímagögnum."
+

diff --git a/res/po/it_IT.po b/res/po/it_IT.po
index 0f5beb0ff7489d4f78ace8573e0f4342292dc238..41f9bcbbf22188a570bf95558cebbffe42728ea6 100644 (file)
--- a/res/po/it_IT.po
+++ b/res/po/it_IT.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Tocca qui per recuperare il messaggio"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Impossibile recuperare il messaggio. Conness. dati spenta."
+

diff --git a/res/po/ja_JP.po b/res/po/ja_JP.po
index fb35838527a002633e2b60d9e7bff845a7f9f9bc..ad016b091a4da30bd8927eec05bd2543b9623b58 100644 (file)
--- a/res/po/ja_JP.po
+++ b/res/po/ja_JP.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "メッセージを取得するには、ここをタップしてください"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "メッセージを取得できません。モバイルデータがOFFです。"
+

diff --git a/res/po/ka.po b/res/po/ka.po
index a0bf5e56edc50e5aad0cc48195f86acfdf08a70b..1294f2db608425ffb8bbe6da78f10bbae1ff1735 100644 (file)
--- a/res/po/ka.po
+++ b/res/po/ka.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "შეტყობინების მისაღებად, შეეხეთ აქ"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "შეტყობინებას ვერ მიიღებთ. მობილური მონაცემები გამორთულია."
+

diff --git a/res/po/kk.po b/res/po/kk.po
index 438fe3c41a0f7d40159f6524c00e5b1df52c7deb..af4c2e5fac656be3b82ee704c36730f8243cff7c 100644 (file)
--- a/res/po/kk.po
+++ b/res/po/kk.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Хабарды шығару үшін мына жерді түртіңіз"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Хабарды қалпына келтіру мүм. емес. Ұялы деректер өшірулі."
+

diff --git a/res/po/ko_KR.po b/res/po/ko_KR.po
index 3e42508e3ad53f582bf7fad7800b8f11201368f8..cfa61be1ba354870216abae43d4dc97f59e75109 100644 (file)
--- a/res/po/ko_KR.po
+++ b/res/po/ko_KR.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "메시지를 가져오려면 여기를 누르세요"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "모바일 데이터가 해제되어 메시지를 가져올 수 없습니다."
+

diff --git a/res/po/lt.po b/res/po/lt.po
index f9dce1354ee294b3bc2b06e5642b36739637ddf1..8e4c3b06726eb79146c772fa69e927be1e6366fa 100644 (file)
--- a/res/po/lt.po
+++ b/res/po/lt.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Bakstelėkite čia ir atkurkite žinutę"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Neįmanoma gauti žinutės. Mobilieji duomenys išjungti."
+

diff --git a/res/po/lv.po b/res/po/lv.po
index 53d7b8d1d60d801464660a8b4101a01c8287465f..e95a956d43d8ea35bca72599282dc86f86b4721e 100644 (file)
--- a/res/po/lv.po
+++ b/res/po/lv.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Pieskarieties šeit, lai izgūtu ziņu"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Nevar izgūt ziņu. Mobilie dati ir izslēgti."
+

diff --git a/res/po/mk.po b/res/po/mk.po
index 7da890e79dab46bf71c08ea68432410552653a0d..9c54907ab4f056cf786ed12b20be8623f592d965 100644 (file)
--- a/res/po/mk.po
+++ b/res/po/mk.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Допрете тука за да ја вратите пораката"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Не може да се преземе пораката. Моб. податоци се исклуч."
+

diff --git a/res/po/nb.po b/res/po/nb.po
index 2701f1d183e364865ce4c520d15efa36f4ee4500..7cc8f2ab8dde75d78e9467145fac6afff65842d4 100644 (file)
--- a/res/po/nb.po
+++ b/res/po/nb.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Trykk her for å hente melding"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Kan ikke hente melding. Mobildata er av."
+

diff --git a/res/po/nl.po b/res/po/nl.po
index d7bc99dec470469c81aded27eb2eb012d4f5249e..039c9416461c1355f20c5b8e8fca4ed75d6893e7 100644 (file)
--- a/res/po/nl.po
+++ b/res/po/nl.po
@@ -232,3 +232,6 @@ msgstr "Mms"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Tik hier om bericht op te halen"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Kan bericht niet ophalen. Mobiele gegevens uit."
+

diff --git a/res/po/pl.po b/res/po/pl.po
index 323ea90b427b2d8fcd597430f0214e0037c81333..10d82b2efb465ac091caab3417c87328c99a8737 100644 (file)
--- a/res/po/pl.po
+++ b/res/po/pl.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Dotknij tutaj, aby pobrać wiadomość"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Nie można pobrać wiadomości. Dane komórkowe wyłączone."
+

diff --git a/res/po/pt_BR.po b/res/po/pt_BR.po
index 7058f7294b51d7762a1c8d46b30b7ec54cf2afcc..6100a011fd280288b5aa644b9c5c9a7a92389f07 100644 (file)
--- a/res/po/pt_BR.po
+++ b/res/po/pt_BR.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Tocar aqui para recuperar mensagem"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Não é possível recuperar msg. Dados móveis desligados."
+

diff --git a/res/po/pt_PT.po b/res/po/pt_PT.po
index d0b66fed3c7080bf260c3c430451493928ae75f2..fa56aebb1e8629ab5adf40843e45bb62c7d9d173 100644 (file)
--- a/res/po/pt_PT.po
+++ b/res/po/pt_PT.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Toque aqui para obter mensagem"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Impossível obter mensagem. Dados móveis desligados."
+

diff --git a/res/po/ro.po b/res/po/ro.po
index 812b6b36e8549123a02d8a32bfe7e9e5719f07e7..ccd288df70e00d576c894710ac3e2467e5679cc4 100644 (file)
--- a/res/po/ro.po
+++ b/res/po/ro.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Atingeți aici pentru a prelua mesajul"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Mesajul nu se poate prelua. Date mobile oprite."
+

diff --git a/res/po/ru_RU.po b/res/po/ru_RU.po
index 5c90f5d5a20a4ce7f6bc87b80fdec7a69ef3912f..6de6108926fce114efede9d55228ed13eb3a1c06 100644 (file)
--- a/res/po/ru_RU.po
+++ b/res/po/ru_RU.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Коснитесь здесь, чтобы получить сообщение"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Не удалось получить сообщение. Мобильн. данные отключены."
+

diff --git a/res/po/sk.po b/res/po/sk.po
index 879b3cd595993a4d070d3854b3e7ec5ea82c908e..149c37588742b64daaa41ac27d9cd18b9a6b0955 100644 (file)
--- a/res/po/sk.po
+++ b/res/po/sk.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Ťuknutím sem môžete načítať správu"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Správa sa nedá načítať. Mobil. dátové pripoj. je vypnuté."
+

diff --git a/res/po/sl.po b/res/po/sl.po
index d4e07b355f4afdb9c1cfd710266b80b43906df5c..5800207f048838b90156ec1f698797bca0cfb2e4 100644 (file)
--- a/res/po/sl.po
+++ b/res/po/sl.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Pritisnite tukaj, da pridobite sporočilo"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Sporočila ni mogoče pridobiti. Mob. pod. so izklopljeni."
+

diff --git a/res/po/sr.po b/res/po/sr.po
index ae2d18f0da14a281965c9e7b159a2b9857ff1e7a..3fc5ad3ce137f5d3c17cc2a01992e3765dede3d1 100644 (file)
--- a/res/po/sr.po
+++ b/res/po/sr.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Kucnite ovde da biste primili poruke"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Nije moguće primiti poruku. Mobilni podaci su isključeni."
+

diff --git a/res/po/sv.po b/res/po/sv.po
index d53475d1323a0f841ac66c7f95f1517a1fec0ac7..a9cdf57e324074c83ae08657135cb542797477ed 100644 (file)
--- a/res/po/sv.po
+++ b/res/po/sv.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Tryck här för att hämta meddelandet"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Det går inte att hämta meddelandet. Mobildata avstängt."
+

diff --git a/res/po/tr_TR.po b/res/po/tr_TR.po
index 76275f9b11a5f0bedba0dd9ab0caf75859d48aef..ed7a03475348dd728ad5593a3c9ab883fbb6e21c 100644 (file)
--- a/res/po/tr_TR.po
+++ b/res/po/tr_TR.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Mesajı almak için buraya dokunun"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Mesaj alınamıyor. Mobil veri kapalı."
+

diff --git a/res/po/uk.po b/res/po/uk.po
index c7a0af5180c52c18d4334b39b5d0d5bf7dba8b20..f039946487e83ffc451ade9b2890358a5cd8becf 100644 (file)
--- a/res/po/uk.po
+++ b/res/po/uk.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Торкніться тут, щоб отримати повідомлення"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Не вдалося отримати повідомлення. Мобільні дані вимкнено."
+

diff --git a/res/po/uz.po b/res/po/uz.po
index 56568bf7bfe2155e511cc5009656c7c8606c8d37..691ff264105a7a72c5d3561d76e480d0b7b54f53 100644 (file)
--- a/res/po/uz.po
+++ b/res/po/uz.po
@@ -232,3 +232,6 @@ msgstr "MMS"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "Xabarni olish uchun bu yerga teging"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "Xabarni qayta olib bo‘lmaydi. Mobil internet o‘chiq."
+

diff --git a/res/po/zh_CN.po b/res/po/zh_CN.po
index 8a97436269f9c30e56192ef34e8fe6e0c5737880..e93d40ebf85d8a70019480df0ffbc7f4d3095ead 100644 (file)
--- a/res/po/zh_CN.po
+++ b/res/po/zh_CN.po
@@ -232,3 +232,6 @@ msgstr "彩信"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "点击此处可获取信息"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "由于手机流量已关闭，无法获取信息。"
+

diff --git a/res/po/zh_HK.po b/res/po/zh_HK.po
index 89795ebca9d4d750a1462836c9668b6c6756d8f7..7f4220d34fd7a08cc7f01194e575516578d57c76 100644 (file)
--- a/res/po/zh_HK.po
+++ b/res/po/zh_HK.po
@@ -232,3 +232,6 @@ msgstr "多媒體訊息"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "輕觸此處以取回訊息"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "無法取回訊息。流動數據已關閉。"
+

diff --git a/res/po/zh_TW.po b/res/po/zh_TW.po
index 255794432d150889d7fac6656e3b9638b4135fc8..218a19aec9cff49e8739140765f7eb7aab3ee6d2 100644 (file)
--- a/res/po/zh_TW.po
+++ b/res/po/zh_TW.po
@@ -232,3 +232,6 @@ msgstr "多媒體訊息"
 msgid "WDS_MSG_NPBODY_TAP_HERE_TO_RETRIEVE_MESSAGE"
 msgstr "輕觸此處以擷取訊息"
 
+msgid "WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"
+msgstr "無法擷取訊息。行動數據已關閉。"
+

diff --git a/src/Common/View/inc/Popup.h b/src/Common/View/inc/Popup.h
index a007f1a159c8844867c9b5ecf088019679c5e31b..da3b8e15bf4d33e4f801db27393780edb8ff2622 100644 (file)
--- a/src/Common/View/inc/Popup.h
+++ b/src/Common/View/inc/Popup.h
@@ -20,8 +20,8 @@
 #include "BasePopup.h"
 
 namespace Msg {
-    class Popup;
 
+    class Popup;
     typedef void (*PopupButtonCb)(Popup &popup, void *userData);
 
     class Popup

diff --git a/src/Conversation/Controller/inc/ConvFrame.h b/src/Conversation/Controller/inc/ConvFrame.h
index 84d766ecf69781a480e782494b45ec36a7e114e7..33f2f523e78a084363b85184c053e007823b4e9e 100644 (file)
--- a/src/Conversation/Controller/inc/ConvFrame.h
+++ b/src/Conversation/Controller/inc/ConvFrame.h
@@ -65,6 +65,9 @@ namespace Msg
             void onUnblockNumberClicked(MoreOption &obj);
             void onDeleteClicked(MoreOption &obj);
 
+            // Popup:
+            void showNumberBlockUnblockPopup(bool isBlocked);
+
             // Delete mode cb:
             void onDelButtonClicked(Evas_Object *obj, void *event);
             void onSelectButtonClicked(Evas_Object *obj, void *event);

diff --git a/src/Conversation/Controller/inc/ConvListItem.h b/src/Conversation/Controller/inc/ConvListItem.h
index c2376e87fa9327e60381acd8c97ea2f6866d25da..cbd2a8c3746a11082488614044c967014844f9b3 100644 (file)
--- a/src/Conversation/Controller/inc/ConvListItem.h
+++ b/src/Conversation/Controller/inc/ConvListItem.h
@@ -23,6 +23,7 @@
 #include "Message.h"
 #include "WorkingDir.h"
 #include "BubbleEntity.h"
+#include "Popup.h"
 
 #include <list>
 
@@ -52,12 +53,21 @@ namespace Msg {
             std::string getMsgType() override;
 
         private:
-            // IBubbleViewItemListener
-            void onAction(BubbleViewItem &item) override;
-
             void updateViewStatus();
             void prepareContent(const MsgConversationItem &item);
 
+            // Popups:
+            void showMobileDataOffPopup();
+            void showFailedToRetrievePopup();
+            void showRetrieveMmsPopup();
+
+            // Popup callback:
+            void onCancelButtonClicked(Popup &popup);
+            void onRetrieveButtonClicked(Popup &popup);
+
+            // IBubbleViewItemListener:
+            void onAction(BubbleViewItem &item) override;
+
         private:
             MsgId m_MsgId;
             time_t m_Time;

diff --git a/src/Conversation/Controller/src/ConvFrame.cpp b/src/Conversation/Controller/src/ConvFrame.cpp
index 19f5d2d3bcf35b1537386affb7e3aacd701851cb..2d0db16d33f8c29c6a01bb3688891a048b61cd1f 100644 (file)
--- a/src/Conversation/Controller/src/ConvFrame.cpp
+++ b/src/Conversation/Controller/src/ConvFrame.cpp
@@ -188,6 +188,14 @@ void ConvFrame::updateDeleteViews()
     }
 }
 
+void ConvFrame::showNumberBlockUnblockPopup(bool isBlocked)
+{
+    const char *text = isBlocked ? "WDS_LOGS_TPOP_CALLS_MSGS_TO_GEAR_NUMBER_FROM_THIS_NUMBER_ARE_BLOCKED_ABB"
+                                 : "WDS_LOGS_TPOP_CALLS_MSGS_TO_GEAR_NUMBER_FROM_THIS_NUMBER_ARE_UNBLOCKED_ABB";
+
+    ToastPopup::toast(msgt(text), nullptr);
+}
+
 void ConvFrame::onAttached(ViewItem &item)
 {
     MSG_LOG("");
@@ -282,6 +290,7 @@ void ConvFrame::onRecipientsClicked(MoreOption &obj)
 void ConvFrame::onBlockNumberClicked(MoreOption &obj)
 {
     MSG_LOG("");
+    showNumberBlockUnblockPopup(true);
 }
 
 void ConvFrame::onUnblockNumberClicked(MoreOption &obj)

diff --git a/src/Conversation/Controller/src/ConvListItem.cpp b/src/Conversation/Controller/src/ConvListItem.cpp
index e2281505f7fefe2717e49e7cec6158d7930a97ee..41314cc8e38f486312d3195090ae4d4f8852f3ee 100644 (file)
--- a/src/Conversation/Controller/src/ConvListItem.cpp
+++ b/src/Conversation/Controller/src/ConvListItem.cpp
@@ -26,6 +26,9 @@
 #include "Logger.h"
 #include "ListView.h"
 #include "App.h"
+#include "ToastPopup.h"
+#include "IconTextPopup.h"
+#include "Callback.h"
 
 #include <algorithm>
 
@@ -100,11 +103,45 @@ void ConvListItem::updateTime()
     m_TimeStr.clear();
 }
 
+void ConvListItem::showMobileDataOffPopup()
+{
+    ToastPopup::toast(msgt("WDS_MSG_TPOP_UNABLE_TO_RETRIEVE_MESSAGE_MOBILE_DATA_OFF_ABB"), nullptr);
+}
+
+void ConvListItem::showFailedToRetrievePopup()
+{
+    auto *popup = new IconTextPopup;
+    popup->setText(msgt("WDS_WNOTI_TPOP_FAILED"));
+    popup->setIcon(IconTextPopup::FailedIcon);
+    popup->setTimeOut();
+    popup->show();
+}
+
+void ConvListItem::showRetrieveMmsPopup()
+{
+    auto *popup = new StandardPopup(StandardPopup::buttons2Style);
+    popup->setText(msgt("WDS_MSG_POP_RETRIEVE_MULTIMEDIA_MESSAGE_Q"));
+    popup->addLeftButton(CANCEL_BUTTON_POPUP, makeCbLast(&ConvListItem::onCancelButtonClicked), this);
+    popup->addRightButton(OK_BUTTON_POPUP, makeCbLast(&ConvListItem::onRetrieveButtonClicked), this);
+    popup->show();
+}
+
 void ConvListItem::prepareContent(const MsgConversationItem &item)
 {
     m_BubbleEntityList = m_BubbleEntityFactory.create(item);
 }
 
+void ConvListItem::onCancelButtonClicked(Popup &popup)
+{
+    MSG_LOG("");
+    popup.destroy();
+}
+
+void ConvListItem::onRetrieveButtonClicked(Popup &popup)
+{
+    MSG_LOG("");
+}
+
 Evas_Object *ConvListItem::getBubbleContent()
 {
     if (m_BubbleEntityList.empty())

diff --git a/src/Settings/Controller/inc/SettingsBlockListFrame.h b/src/Settings/Controller/inc/SettingsBlockListFrame.h
index 2550a91c2a3193b4cba942b75d562a46577cca10..fa3b1da7b3471b460f3cc35fc57e4b4c0410fc3c 100644 (file)
--- a/src/Settings/Controller/inc/SettingsBlockListFrame.h
+++ b/src/Settings/Controller/inc/SettingsBlockListFrame.h
@@ -22,6 +22,7 @@
 namespace Msg
 {
     class ListView;
+    class ListItem;
 
     class SettingsBlockListFrame
         : public FrameController