From 024b09cd3a6ac0ae2f94e058cf07987d686f0df0 Mon Sep 17 00:00:00 2001 From: Oleksander Kostenko Date: Mon, 4 Jul 2016 14:18:26 +0300 Subject: [PATCH] TSAM-5943 Menu Popup display wrong (Small) on Message on SIM Change-Id: I364737bc3a7e418ce4674c2e952e183d266a9960 Signed-off-by: Oleksander Kostenko --- src/Settings/Controller/inc/MsgOnSimCard.h | 5 +++-- src/Settings/Controller/src/MsgOnSimCard.cpp | 13 ++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Settings/Controller/inc/MsgOnSimCard.h b/src/Settings/Controller/inc/MsgOnSimCard.h index a0ccf76..02b96d5 100644 --- a/src/Settings/Controller/inc/MsgOnSimCard.h +++ b/src/Settings/Controller/inc/MsgOnSimCard.h @@ -29,6 +29,7 @@ #include "SimMsgLayout.h" #include "NoContentLayout.h" #include "SystemSettingsManager.h" +#include "PopupList.h" namespace Msg { @@ -68,8 +69,8 @@ namespace Msg virtual void onHwBackButtonClicked(); // ContextPopup callbacks: - void onCopyToDeviceItemPressed(ContextPopupItem &item); - void onDeleteItemPressed(ContextPopupItem &item); + void onCopyToDeviceItemPressed(PopupListItem &item); + void onDeleteItemPressed(PopupListItem &item); // IMsgStorageListener virtual void onMsgStorageDelete(const MsgIdList &msgIdList); diff --git a/src/Settings/Controller/src/MsgOnSimCard.cpp b/src/Settings/Controller/src/MsgOnSimCard.cpp index 71665ab..2bc2b47 100644 --- a/src/Settings/Controller/src/MsgOnSimCard.cpp +++ b/src/Settings/Controller/src/MsgOnSimCard.cpp @@ -162,21 +162,20 @@ void MsgOnSimCard::showCopyDeletePopup() { if(!m_pList->isEmpty()) { - ContextPopup &popup = getApp().getPopupManager().getCtxPopup(); - popup.appendItem(msg("IDS_MSG_OPT_COPY_TO_DEVICE_ABB"), nullptr, CTXPOPUP_ITEM_PRESSED_CB(MsgOnSimCard, onCopyToDeviceItemPressed), this); - popup.appendItem(msg("IDS_MSG_OPT_DELETE"), nullptr, CTXPOPUP_ITEM_PRESSED_CB(MsgOnSimCard, onDeleteItemPressed), this); - popup.align(getApp().getWindow()); - popup.show(); + PopupList &listPopup = getApp().getPopupManager().getPopupList(); + listPopup.appendItem(msg("IDS_MSG_OPT_COPY_TO_DEVICE_ABB"), POPUPLIST_ITEM_PRESSED_CB(MsgOnSimCard, onCopyToDeviceItemPressed), this); + listPopup.appendItem(msg("IDS_MSG_OPT_DELETE"), POPUPLIST_ITEM_PRESSED_CB(MsgOnSimCard, onDeleteItemPressed), this); + listPopup.show(); } } -void MsgOnSimCard::onCopyToDeviceItemPressed(ContextPopupItem &item) +void MsgOnSimCard::onCopyToDeviceItemPressed(PopupListItem &item) { item.getParent().destroy(); setMode(CopyToDeviceMode); } -void MsgOnSimCard::onDeleteItemPressed(ContextPopupItem &item) +void MsgOnSimCard::onDeleteItemPressed(PopupListItem &item) { item.getParent().destroy(); setMode(DeleteMode); -- 2.7.4