From 50c5dde5b7f0abacdd09ae7e0094e81eb88fab31 Mon Sep 17 00:00:00 2001 From: Evgen Servetnik Date: Tue, 15 Aug 2017 17:24:12 +0300 Subject: [PATCH] TizenRefApp-9129 Fix NaivBar Title in Messages on SIM card. Change-Id: Id2c2288dd90e8c8823859606ecb4678aad84ed79 Signed-off-by: Evgen Servetnik --- res/edje/colors_define.inl | 4 ++-- src/Settings/Controller/src/MsgOnSimCard.cpp | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/res/edje/colors_define.inl b/res/edje/colors_define.inl index 0dce2798..65745fcd 100644 --- a/res/edje/colors_define.inl +++ b/res/edje/colors_define.inl @@ -1,6 +1,6 @@ -#define CONV_BG_COLOR 250 250 250 255 #define TITLE_BG_BLUE 61 185 204 255 -#define TITLE_BG_WHITE CONV_BG_COLOR +#define TITLE_BG_WHITE 250 250 250 255 +#define CONV_BG_COLOR TITLE_BG_WHITE #define BUBBLE_NAVI_TITLE_COLOR 250 250 250 255 #define BUBBLE_NAVI_TITLE_TEXT_COLOR 46 139 153 255 diff --git a/src/Settings/Controller/src/MsgOnSimCard.cpp b/src/Settings/Controller/src/MsgOnSimCard.cpp index ba670055..480f7a6a 100644 --- a/src/Settings/Controller/src/MsgOnSimCard.cpp +++ b/src/Settings/Controller/src/MsgOnSimCard.cpp @@ -237,8 +237,12 @@ void MsgOnSimCard::setTitleTranslatable() { if (m_SimMode == NormalMode) getNaviBar().setTitle(msg("IDS_MSG_HEADER_MESSAGES_ON_SIM_CARD_ABB")); - else if (m_SimMode == DeleteMode || m_SimMode == CopyToDeviceMode) - getNaviBar().setTitle(msgArgs("IDS_MSG_HEADER_PD_SELECTED_ABB3", m_CheckCount)); + else if (m_SimMode == DeleteMode || m_SimMode == CopyToDeviceMode) { + if (m_CheckCount > 0) + getNaviBar().setTitle(msgArgs("IDS_MSG_HEADER_PD_SELECTED_ABB3", m_CheckCount)); + else + getNaviBar().setTitle(msgt("IDS_MSG_HEADER_SELECT_ITEMS_ABB3")); + } } void MsgOnSimCard::setTitleWithButtons(bool value) -- 2.34.1