From d3d5a8054c2c969b72efea6bc4f66e6d776f7c2a Mon Sep 17 00:00:00 2001 From: Denis Dolzhenko Date: Tue, 29 Aug 2017 15:44:45 +0300 Subject: [PATCH] Remove Settings MoreOption item from MsgThread. Change-Id: Ie88ab6527bbf41b9e964757d273ce4400ab80a42 Signed-off-by: Denis Dolzhenko --- src/MsgThread/Controller/inc/MsgThreadFrame.h | 1 - src/MsgThread/Controller/src/MsgThreadFrame.cpp | 8 -------- 2 files changed, 9 deletions(-) diff --git a/src/MsgThread/Controller/inc/MsgThreadFrame.h b/src/MsgThread/Controller/inc/MsgThreadFrame.h index d017239..ea5fc11 100644 --- a/src/MsgThread/Controller/inc/MsgThreadFrame.h +++ b/src/MsgThread/Controller/inc/MsgThreadFrame.h @@ -80,7 +80,6 @@ namespace Msg { // More option: void onNewMessageClicked(MoreOption &obj); void onDeleteClicked(MoreOption &obj); - void onSettingsClicked(MoreOption &obj); // IThreadListListener: void onItemSelected(ThreadId id) override; diff --git a/src/MsgThread/Controller/src/MsgThreadFrame.cpp b/src/MsgThread/Controller/src/MsgThreadFrame.cpp index b1b2fcb..cc59c4e 100644 --- a/src/MsgThread/Controller/src/MsgThreadFrame.cpp +++ b/src/MsgThread/Controller/src/MsgThreadFrame.cpp @@ -26,7 +26,6 @@ #include "Resource.h" #include "RecipFrame.h" #include "ConvFrame.h" -#include "SettingsFrame.h" #include "ThreadListItem.h" #include "DefaultLayout.h" #include "BottomButton.h" @@ -132,7 +131,6 @@ void MsgThreadFrame::prepareMoreOption() m_pMoreOption->setDirection(EEXT_MORE_OPTION_DIRECTION_RIGHT); m_pMoreOption->appendItem(msgt("WDS_MSG_OPT_NEW_MESSAGE_ABB"), NEW_MSG_MORE_ICON, makeCbLast(&MsgThreadFrame::onNewMessageClicked), this); m_pMoreOption->appendItem(msgt("WDS_MSG_OPT_DELETE_ABB"), DELETEG_MORE_ICON, makeCbLast(&MsgThreadFrame::onDeleteClicked), this); - m_pMoreOption->appendItem("Settings", nullptr, makeCbLast(&MsgThreadFrame::onSettingsClicked), this); // TODO: only for test m_pLayout->setMoreOption(*m_pMoreOption); } } @@ -272,12 +270,6 @@ void MsgThreadFrame::onDeleteClicked(MoreOption &obj) setMode(DeleteMode); } -void MsgThreadFrame::onSettingsClicked(MoreOption &obj) -{ - MSG_LOG(""); - getParent().push(*new SettingsFrame(getParent())); -} - void MsgThreadFrame::onItemSelected(ThreadId id) { MSG_LOG(""); -- 2.34.1