From 767dc23ebc96bb1961a0b1a24d8de541c6a0839e Mon Sep 17 00:00:00 2001 From: Dmytro Dragan Date: Wed, 18 Nov 2015 18:16:28 +0200 Subject: [PATCH] TizenRefApp-5026 Integrate Navibar into Settings view Change-Id: I1757e29e3a9db3be1a994cc442573862e045f55f Signed-off-by: Dmytro Dragan --- src/Settings/Controller/inc/Settings.h | 1 + src/Settings/Controller/src/Settings.cpp | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Settings/Controller/inc/Settings.h b/src/Settings/Controller/inc/Settings.h index 4986690..e5179ee 100644 --- a/src/Settings/Controller/inc/Settings.h +++ b/src/Settings/Controller/inc/Settings.h @@ -43,6 +43,7 @@ namespace Msg private: // NaviFrameItem: virtual void onAttached(ViewItem &item); + virtual void onButtonClicked(const NaviFrameItem &item, NaviButtonId buttonId); // IListViewListener: virtual void onListItemSelected(ListItem &listItem, void *funcData); diff --git a/src/Settings/Controller/src/Settings.cpp b/src/Settings/Controller/src/Settings.cpp index 363c0b4..3538080 100644 --- a/src/Settings/Controller/src/Settings.cpp +++ b/src/Settings/Controller/src/Settings.cpp @@ -365,8 +365,9 @@ void Settings::autoRetRoamingItemHandler(SettingsListItem &item) void Settings::onAttached(ViewItem &item) { FrameController::onAttached(item); - getNaviBar().setTitle("Settings"); getNaviBar().setColor(NaviBar::NaviWhiteColorId); + getNaviBar().setTitle(msgt("IDS_MSG_HEADER_SETTINGS")); + getNaviBar().showButton(NaviPrevButtonId, true); setContent(*m_pList); } @@ -402,3 +403,11 @@ void Settings::onNotiSoundChanged(MsgSettings &msgSetting) updateSoundItem(); m_pSoundItem->update(); } + +void Settings::onButtonClicked(const NaviFrameItem &item, NaviButtonId buttonId) +{ + if(buttonId == NaviPrevButtonId) + { + getParent().pop(); + } +} -- 2.7.4