From: Dmytro Dragan Date: Wed, 14 Sep 2016 13:20:40 +0000 (+0300) Subject: TizenRefApp-7195 "Done" button instead of "Delete" button X-Git-Tag: submit/tizen/20160916.133943^2~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a41b37a035123c1b50811367e9b38a6c279c5949;p=profile%2Fmobile%2Fapps%2Fnative%2Fmessage.git TizenRefApp-7195 "Done" button instead of "Delete" button Change-Id: I5d3f20bea8e1b9552427aa1367e38f0738bd6830 Signed-off-by: Dmytro Dragan --- diff --git a/src/Conversation/Main/Controller/src/Conversation.cpp b/src/Conversation/Main/Controller/src/Conversation.cpp index 3b378ba4..af71d1e6 100644 --- 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 55c64b03..88175cbe 100644 --- 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 5226c7c5..4be1989c 100644 --- 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);