TizenRefApp-7195 "Done" button instead of "Delete" button

Change-Id: I5d3f20bea8e1b9552427aa1367e38f0738bd6830
Signed-off-by: Dmytro Dragan <dm.dragan@samsung.com>

diff --git a/src/Conversation/Main/Controller/src/Conversation.cpp b/src/Conversation/Main/Controller/src/Conversation.cpp
index 3b378ba49607d5778f694248b9114c01bd97abdf..af71d1e627c78cde3343d8e6f5feafadb2afa589 100644 (file)
--- a/src/Conversation/Main/Controller/src/Conversation.cpp
+++ b/src/Conversation/Main/Controller/src/Conversation.cpp
@@ -887,6 +887,7 @@ void Conversation::updateNavibar()
             updateSelectMsgTitle();
             naviBar.showButton(NaviCancelButtonId, true);
             naviBar.showButton(NaviOkButtonId, true);
+            naviBar.setButtonText(NaviOkButtonId, msgt("IDS_MSG_ACBUTTON_DELETE_ABB"));
             naviBar.disabledButton(NaviOkButtonId, true);
             naviBar.setDownButtonState(false);
             if(m_pRecipPanel)

diff --git a/src/MsgThread/Controller/src/MsgThread.cpp b/src/MsgThread/Controller/src/MsgThread.cpp
index 55c64b03f07e24156ce9ceb456cda370660d89e0..88175cbe734c70113304b5da1bf012925d5fbe49 100644 (file)
--- a/src/MsgThread/Controller/src/MsgThread.cpp
+++ b/src/MsgThread/Controller/src/MsgThread.cpp
@@ -209,6 +209,7 @@ void MsgThread::setDeleteMode(bool value)
     {
         updateSelectItemsTitle();
         naviBar.disabledButton(NaviOkButtonId, value);
+        naviBar.setButtonText(NaviOkButtonId, msgt("IDS_MSG_ACBUTTON_DELETE_ABB"));
     }
     naviBar.showButton(NaviCancelButtonId, value);
     m_pThreadList->setDeleteMode(value);

diff --git a/src/Settings/Controller/src/MsgOnSimCard.cpp b/src/Settings/Controller/src/MsgOnSimCard.cpp
index 5226c7c50020ffbbb496e66b3638e7ecc00657ee..4be1989cff788aaf4d28cbd1a623d07f95bf5d3e 100644 (file)
--- a/src/Settings/Controller/src/MsgOnSimCard.cpp
+++ b/src/Settings/Controller/src/MsgOnSimCard.cpp
@@ -276,7 +276,13 @@ void MsgOnSimCard::setTitleWithButtons(bool value)
     getNaviBar().clear();
     getNaviBar().showButton(NaviOkButtonId, value);
     if(value)
+    {
         getNaviBar().disabledButton(NaviOkButtonId, true);
+        if (m_SimMode == DeleteMode)
+            getNaviBar().setButtonText(NaviOkButtonId, msgt("IDS_MSG_ACBUTTON_DELETE_ABB"));
+        else
+            getNaviBar().setButtonText(NaviOkButtonId, msgt("IDS_MSG_ACBUTTON_DONE_ABB"));
+    }
     getNaviBar().showButton(NaviCancelButtonId, value);
     getNaviBar().showButton(NaviPrevButtonId, !value);