From 33318311c06dd5d7cfb0307d474bd14d22916104 Mon Sep 17 00:00:00 2001 From: Hyunseok Yang Date: Fri, 12 Jul 2013 16:00:22 +0900 Subject: [PATCH] change popup button negative,positive Change-Id: I7974ed16fd392c76303485113ea13d481446a4ee Signed-off-by: Hyunseok Yang --- src/controls/FWebCtrl_AuthConfirmPopup.cpp | 4 ++-- src/controls/FWebCtrl_CertificateConfirmPopup.cpp | 8 ++++---- src/controls/FWebCtrl_PromptPopup.cpp | 4 ++-- src/controls/FWebCtrl_SelectBox.cpp | 6 ++++-- src/controls/FWebCtrl_UserConfirmPopup.cpp | 5 +++-- src/controls/FWebCtrl_WebImpl.cpp | 2 +- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/controls/FWebCtrl_AuthConfirmPopup.cpp b/src/controls/FWebCtrl_AuthConfirmPopup.cpp index 4f23f08..271c78b 100755 --- a/src/controls/FWebCtrl_AuthConfirmPopup.cpp +++ b/src/controls/FWebCtrl_AuthConfirmPopup.cpp @@ -159,14 +159,14 @@ _AuthConfirmPopup::Construct(const String& host, const String& realm, Authentica ArrayList idList; r = idList.Construct(); SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - idList.Add(*(new Integer(ID_BUTTON_AUTH_PROCESS))); idList.Add(*(new Integer(ID_BUTTON_AUTH_CANCEL))); + idList.Add(*(new Integer(ID_BUTTON_AUTH_PROCESS))); ArrayList titleList; r = titleList.Construct(); SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_COM_BUTTON_LOGIN")))); titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_COM_SK_CANCEL")))); + titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_COM_BUTTON_LOGIN")))); r = CreateAndAddButtons(idList, titleList, pButtonPanel); SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); diff --git a/src/controls/FWebCtrl_CertificateConfirmPopup.cpp b/src/controls/FWebCtrl_CertificateConfirmPopup.cpp index 0ffec33..8c8a6dd 100755 --- a/src/controls/FWebCtrl_CertificateConfirmPopup.cpp +++ b/src/controls/FWebCtrl_CertificateConfirmPopup.cpp @@ -124,13 +124,13 @@ _CertificateConfirmPopup::Construct(_CertificatePopupMode certPopupMode, Ewk_Cer rect.height = 2*pPopupData->labelDim.height; rect.width = pPopupData->labelDim.width; - idList.Add(*(new Integer(ID_BUTTON_CERTIFICATE_ALLOW))); - idList.Add(*(new Integer(ID_BUTTON_CERTIFICATE_VIEW))); idList.Add(*(new Integer(ID_BUTTON_CERTIFICATE_CANCEL))); + idList.Add(*(new Integer(ID_BUTTON_CERTIFICATE_VIEW))); + idList.Add(*(new Integer(ID_BUTTON_CERTIFICATE_ALLOW))); - titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_OPT_ALLOW")))); - titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_OPT_VIEW")))); titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_OPT_CANCEL")))); + titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_OPT_VIEW")))); + titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_OPT_ALLOW")))); } r = _WebPopup::Construct(true, Dimension(pPopupData->popupDim.width, popupMaxHeight)); diff --git a/src/controls/FWebCtrl_PromptPopup.cpp b/src/controls/FWebCtrl_PromptPopup.cpp index 9ae605e..7937488 100755 --- a/src/controls/FWebCtrl_PromptPopup.cpp +++ b/src/controls/FWebCtrl_PromptPopup.cpp @@ -141,14 +141,14 @@ _PromptPopup::Construct(const String& message, const String& defaultVale, Evas_ ArrayList idList; r = idList.Construct(); SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - idList.Add(*(new Integer(ID_BUTTON_PROMPT_OK))); idList.Add(*(new Integer(ID_BUTTON_PROMPT_CANCEL))); + idList.Add(*(new Integer(ID_BUTTON_PROMPT_OK))); ArrayList titleList; r = titleList.Construct(); SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - titleList.Add(*(new String(pSysResource->GetString("sys_string", "IDS_COM_SK_OK")))); titleList.Add(*(new String(pSysResource->GetString("sys_string", "IDS_COM_POP_CANCEL")))); + titleList.Add(*(new String(pSysResource->GetString("sys_string", "IDS_COM_SK_OK")))); r = CreateAndAddButtons(idList, titleList, pButtonPanel); SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); diff --git a/src/controls/FWebCtrl_SelectBox.cpp b/src/controls/FWebCtrl_SelectBox.cpp index 6d8d94f..0a6e241 100755 --- a/src/controls/FWebCtrl_SelectBox.cpp +++ b/src/controls/FWebCtrl_SelectBox.cpp @@ -225,15 +225,18 @@ _SelectBox::Construct(bool isMultiSelect, const String& title, int listCount, Ev ArrayList idList; r = idList.Construct(); SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); + + idList.Add(*(new Integer(ID_BUTTON_CANCEL))); if (__multiSelection) { idList.Add(*(new Integer(ID_BUTTON_SELECTION))); } - idList.Add(*(new Integer(ID_BUTTON_CANCEL))); ArrayList titleList; r = titleList.Construct(); SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); + + titleList.Add(*(new String(pSysResource->GetString("sys_string", "IDS_COM_POP_CANCEL")))); if (__multiSelection) { titleList.Add(*(new String(pSysResource->GetString("sys_string", "IDS_COM_BODY_DONE")))); @@ -241,7 +244,6 @@ _SelectBox::Construct(bool isMultiSelect, const String& title, int listCount, Ev __pToggledArray = eina_inarray_new(sizeof(int), 0); SysTryReturnResult(NID_WEB_CTRL, __pToggledArray, E_OUT_OF_MEMORY, "Memory Allocation failed."); } - titleList.Add(*(new String(pSysResource->GetString("sys_string", "IDS_COM_POP_CANCEL")))); r = CreateAndAddButtons(idList, titleList, pButtonPanel); SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); diff --git a/src/controls/FWebCtrl_UserConfirmPopup.cpp b/src/controls/FWebCtrl_UserConfirmPopup.cpp index 90d89b3..0f79b18 100755 --- a/src/controls/FWebCtrl_UserConfirmPopup.cpp +++ b/src/controls/FWebCtrl_UserConfirmPopup.cpp @@ -173,16 +173,17 @@ _UserConfirmPopup::Construct(_UserConfirmMode userConfirmMode, void* pEventInfo, r = titleList.Construct(); SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - idList.Add(*(new Integer(ID_BUTTON_USER_ALLOW))); if (userConfirmMode == USER_SCRIPT_ALERT) { + idList.Add(*(new Integer(ID_BUTTON_USER_ALLOW))); titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BUTTON_OK")))); } else { idList.Add(*(new Integer(ID_BUTTON_USER_CANCEL))); - titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_OPT_ALLOW")))); + idList.Add(*(new Integer(ID_BUTTON_USER_ALLOW))); titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_OPT_CANCEL")))); + titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_OPT_ALLOW")))); } r = CreateAndAddButtons(idList, titleList, pButtonPanel); diff --git a/src/controls/FWebCtrl_WebImpl.cpp b/src/controls/FWebCtrl_WebImpl.cpp index 4a70777..d3f8135 100755 --- a/src/controls/FWebCtrl_WebImpl.cpp +++ b/src/controls/FWebCtrl_WebImpl.cpp @@ -1571,7 +1571,7 @@ OnWebPageBlockSelected(void* pUserData, Evas_Object* pView, void* pEventInfo) { _WebImpl* pImpl = reinterpret_cast< _WebImpl* >(pUserData); SysAssertf(pImpl, "Failed to request"); - AppLogDebug("sssssssssssssssssss1"); + if (pImpl->GetUiEventListener()) { result r = E_SUCCESS; -- 2.7.4