From 27c201027425cd2ff14c0c98d25e93ac43f04c80 Mon Sep 17 00:00:00 2001 From: Vinay Sachdeva Date: Tue, 30 Apr 2013 03:26:28 +0530 Subject: [PATCH] Fixed Nabi Issues: N_SE-36915,36669,36866,36575,36735,36766 Change-Id: I739a56b77722e6ebfd78790bd3409577225f7314 Signed-off-by: Vinay Sachdeva --- inc/IntMainForm.h | 2 ++ inc/IntSharePopup.h | 4 ++++ res/ara-AE.xml | 2 ++ res/aze-AZ.xml | 4 +++- res/bul-BG.xml | 2 ++ res/cat-ES.xml | 2 ++ res/ces-CZ.xml | 2 ++ res/dan-DK.xml | 2 ++ res/deu-DE.xml | 2 ++ res/ell-GR.xml | 2 ++ res/eng-PH.xml | 2 ++ res/eng-US.xml | 2 ++ res/est-EE.xml | 2 ++ res/eus-ES.xml | 2 ++ res/fin-FI.xml | 2 ++ res/fra-CA.xml | 3 +++ res/fra-FR.xml | 2 ++ res/gle-IE.xml | 2 ++ res/glg-ES.xml | 2 ++ res/hin-IN.xml | 2 ++ res/hrv-HR.xml | 2 ++ res/hun-HU.xml | 2 ++ res/hye-AM.xml | 2 ++ res/isl-IS.xml | 2 ++ res/ita-IT.xml | 2 ++ res/jpn-JP.xml | 2 ++ res/kat-GE.xml | 2 ++ res/kaz-KZ.xml | 2 ++ res/kor-KR.xml | 2 ++ res/lav-LV.xml | 2 ++ res/lit-LT.xml | 2 ++ res/mkd-MK.xml | 2 ++ res/nld-NL.xml | 2 ++ res/nob-NO.xml | 2 ++ res/pol-PL.xml | 2 ++ res/por-BR.xml | 2 ++ res/por-PT.xml | 2 ++ res/ron-RO.xml | 2 ++ res/rus-RU.xml | 2 ++ res/slk-SK.xml | 2 ++ res/slv-SI.xml | 2 ++ res/spa-ES.xml | 2 ++ res/spa-MX.xml | 2 ++ res/srp-RS.xml | 2 ++ res/swe-SE.xml | 2 ++ res/tur-TR.xml | 2 ++ res/ukr-UA.xml | 2 ++ res/uzb-UZ.xml | 2 ++ res/zho-CN.xml | 2 ++ res/zho-HK.xml | 2 ++ res/zho-SG.xml | 2 ++ res/zho-TW.xml | 5 +++-- src/IntHistoryListForm.cpp | 2 ++ src/IntInternetApp.cpp | 6 ++++++ src/IntMainForm.cpp | 24 +++++++++++++++++------- src/IntSharePopup.cpp | 25 +++++++++++++++++++++++-- 56 files changed, 157 insertions(+), 12 deletions(-) diff --git a/inc/IntMainForm.h b/inc/IntMainForm.h index c4cd9d2..224ac26 100644 --- a/inc/IntMainForm.h +++ b/inc/IntMainForm.h @@ -36,6 +36,7 @@ #include "IntMultipleWindowPresentationModel.h" #include "IntSharePopup.h" + enum AddressBarMode { ADDRESSBAR_MODE_INVALID = -1, @@ -268,6 +269,7 @@ public: void SetUrl(const Tizen::Base::String& url); + void OnSharePopupControlStarted(void); private: double findDistance(int x1,int y1,int x2, int y2); void FindNextWord(bool next = true); diff --git a/inc/IntSharePopup.h b/inc/IntSharePopup.h index bdca853..d14593f 100644 --- a/inc/IntSharePopup.h +++ b/inc/IntSharePopup.h @@ -28,6 +28,7 @@ #include #include + class ShareInfo : public Tizen::Base::Object { public: @@ -74,6 +75,7 @@ public: void SetImagePath(Tizen::Base::String aImagePath); Tizen::Base::String GetImagePath(void); + private: Tizen::Base::String __pageTitle; Tizen::Base::String __pageURL; @@ -87,6 +89,7 @@ class SharePopup , public Tizen::Ui::Controls::IListViewItemProvider , public Tizen::Ui::Controls::Popup , public Tizen::Ui::IActionEventListener + , public Tizen::App::IAppControlResponseListener { public: /** @@ -153,6 +156,7 @@ class SharePopup */ void StartEmailAppControl(void); + void OnAppControlCompleteResponseReceived(const Tizen::App::AppId& appId, const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult, const Tizen::Base::Collection::IMap* pExtraData); protected: static const int IDA_CANCEL_BUTTON; diff --git a/res/ara-AE.xml b/res/ara-AE.xml index 3320e7f..76189ae 100644 --- a/res/ara-AE.xml +++ b/res/ara-AE.xml @@ -131,4 +131,6 @@ مسح السجل 02 Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/aze-AZ.xml b/res/aze-AZ.xml index eb85330..a7112f3 100644 --- a/res/aze-AZ.xml +++ b/res/aze-AZ.xml @@ -130,5 +130,7 @@ Heç bir nəticə tapılmamışdır Tarixçəni sil Fev. - Failed to save Image` + Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/bul-BG.xml b/res/bul-BG.xml index 1824e62..07da629 100644 --- a/res/bul-BG.xml +++ b/res/bul-BG.xml @@ -131,4 +131,6 @@ Изтриване на хронология Фев. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/cat-ES.xml b/res/cat-ES.xml index f7acc0e..ae2624b 100644 --- a/res/cat-ES.xml +++ b/res/cat-ES.xml @@ -131,4 +131,6 @@ Esborrar historial Feb. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/ces-CZ.xml b/res/ces-CZ.xml index 28c2e95..4ef5029 100644 --- a/res/ces-CZ.xml +++ b/res/ces-CZ.xml @@ -131,4 +131,6 @@ Smazat historii Úno Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/dan-DK.xml b/res/dan-DK.xml index 794514b..9a6ad05 100644 --- a/res/dan-DK.xml +++ b/res/dan-DK.xml @@ -131,4 +131,6 @@ Ryd historik Feb Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/deu-DE.xml b/res/deu-DE.xml index e45c203..f3c9e27 100644 --- a/res/deu-DE.xml +++ b/res/deu-DE.xml @@ -131,4 +131,6 @@ Verlauf löschen Feb. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/ell-GR.xml b/res/ell-GR.xml index bfbe5ea..d43cce7 100644 --- a/res/ell-GR.xml +++ b/res/ell-GR.xml @@ -131,4 +131,6 @@ Εκκαθάριση ιστορικού Φεβρ Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/eng-PH.xml b/res/eng-PH.xml index 2ccfa1d..a52e109 100644 --- a/res/eng-PH.xml +++ b/res/eng-PH.xml @@ -131,4 +131,6 @@ Clear history Feb. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/eng-US.xml b/res/eng-US.xml index 66d6149..e0d20bd 100644 --- a/res/eng-US.xml +++ b/res/eng-US.xml @@ -131,4 +131,6 @@ Clear history Feb. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/est-EE.xml b/res/est-EE.xml index 1709188..9224829 100644 --- a/res/est-EE.xml +++ b/res/est-EE.xml @@ -131,4 +131,6 @@ Kustuta ajalugu Veeb Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/eus-ES.xml b/res/eus-ES.xml index 7210078..8e944df 100644 --- a/res/eus-ES.xml +++ b/res/eus-ES.xml @@ -131,4 +131,6 @@ Historia ezabatu Ots. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/fin-FI.xml b/res/fin-FI.xml index 113b3ef..4e7d33c 100644 --- a/res/fin-FI.xml +++ b/res/fin-FI.xml @@ -131,4 +131,6 @@ Tyhjennä historia Hel Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/fra-CA.xml b/res/fra-CA.xml index e956fab..87eadc7 100644 --- a/res/fra-CA.xml +++ b/res/fra-CA.xml @@ -131,4 +131,7 @@ Effacer l'historique Fév. Failed to save Image + Delete all saved form data? + Delete all saved passwords? + diff --git a/res/fra-FR.xml b/res/fra-FR.xml index 62bc657..728cd9c 100644 --- a/res/fra-FR.xml +++ b/res/fra-FR.xml @@ -131,4 +131,6 @@ Effacer l'historique Fév. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/gle-IE.xml b/res/gle-IE.xml index 63a3c74..4704d05 100644 --- a/res/gle-IE.xml +++ b/res/gle-IE.xml @@ -131,4 +131,6 @@ Glan stair Feab Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/glg-ES.xml b/res/glg-ES.xml index f1a5909..9c237fc 100644 --- a/res/glg-ES.xml +++ b/res/glg-ES.xml @@ -131,4 +131,6 @@ Borrar historial Feb. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/hin-IN.xml b/res/hin-IN.xml index ae81ee5..b59d9f9 100644 --- a/res/hin-IN.xml +++ b/res/hin-IN.xml @@ -131,4 +131,6 @@ इतिहास साफ़ करें फ़र Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/hrv-HR.xml b/res/hrv-HR.xml index b404e06..7c1af8f 100644 --- a/res/hrv-HR.xml +++ b/res/hrv-HR.xml @@ -131,4 +131,6 @@ Brisanje povijesti Velj Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/hun-HU.xml b/res/hun-HU.xml index 98f50f3..ff4b8f7 100644 --- a/res/hun-HU.xml +++ b/res/hun-HU.xml @@ -131,4 +131,6 @@ Előzmények törlése feb. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/hye-AM.xml b/res/hye-AM.xml index 34866af..01b7d88 100644 --- a/res/hye-AM.xml +++ b/res/hye-AM.xml @@ -131,4 +131,6 @@ Մաքրել պատմությունը Փտրվ Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/isl-IS.xml b/res/isl-IS.xml index 87c0fce..c5ad9c7 100644 --- a/res/isl-IS.xml +++ b/res/isl-IS.xml @@ -131,4 +131,6 @@ Hreinsa feril feb. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/ita-IT.xml b/res/ita-IT.xml index 672750e..cf401f1 100644 --- a/res/ita-IT.xml +++ b/res/ita-IT.xml @@ -131,4 +131,6 @@ Cancella cronologia Feb Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/jpn-JP.xml b/res/jpn-JP.xml index 7f9368d..82d3e33 100644 --- a/res/jpn-JP.xml +++ b/res/jpn-JP.xml @@ -131,4 +131,6 @@ 履歴を消去 2月 Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/kat-GE.xml b/res/kat-GE.xml index b39137e..7197a17 100644 --- a/res/kat-GE.xml +++ b/res/kat-GE.xml @@ -131,4 +131,6 @@ ისტორიის გასუფთავება თებ. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/kaz-KZ.xml b/res/kaz-KZ.xml index ac97f8c..d073071 100644 --- a/res/kaz-KZ.xml +++ b/res/kaz-KZ.xml @@ -131,4 +131,6 @@ Журналды тазарту Ақп Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/kor-KR.xml b/res/kor-KR.xml index 83ab635..02f9030 100644 --- a/res/kor-KR.xml +++ b/res/kor-KR.xml @@ -131,4 +131,6 @@ 기록 삭제 2월 Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/lav-LV.xml b/res/lav-LV.xml index 76b2150..6df780d 100644 --- a/res/lav-LV.xml +++ b/res/lav-LV.xml @@ -131,4 +131,6 @@ Nodzēst vēsturi Feb. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/lit-LT.xml b/res/lit-LT.xml index 4f714fb..a5afe63 100644 --- a/res/lit-LT.xml +++ b/res/lit-LT.xml @@ -131,4 +131,6 @@ Išvalyti istoriją Vas. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/mkd-MK.xml b/res/mkd-MK.xml index d47fcbe..e01e370 100644 --- a/res/mkd-MK.xml +++ b/res/mkd-MK.xml @@ -131,4 +131,6 @@ Избриши историја Фев Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/nld-NL.xml b/res/nld-NL.xml index 4f9d4fd..7d753f7 100644 --- a/res/nld-NL.xml +++ b/res/nld-NL.xml @@ -131,4 +131,6 @@ Geschiedenis wissen feb Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/nob-NO.xml b/res/nob-NO.xml index 5f60817..98152e1 100644 --- a/res/nob-NO.xml +++ b/res/nob-NO.xml @@ -131,4 +131,6 @@ Tøm logg Feb. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/pol-PL.xml b/res/pol-PL.xml index 333e847..af8a4bb 100644 --- a/res/pol-PL.xml +++ b/res/pol-PL.xml @@ -131,4 +131,6 @@ Wyczyść historię Lut. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/por-BR.xml b/res/por-BR.xml index d321e75..4e168e0 100644 --- a/res/por-BR.xml +++ b/res/por-BR.xml @@ -131,4 +131,6 @@ Limpar histórico Fev. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/por-PT.xml b/res/por-PT.xml index c269c0b..309610e 100644 --- a/res/por-PT.xml +++ b/res/por-PT.xml @@ -131,4 +131,6 @@ Limpar histórico Fev. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/ron-RO.xml b/res/ron-RO.xml index 60f8f8c..237819d 100644 --- a/res/ron-RO.xml +++ b/res/ron-RO.xml @@ -131,4 +131,6 @@ Ştergere istoric Feb Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/rus-RU.xml b/res/rus-RU.xml index dfba50c..4d10d8d 100644 --- a/res/rus-RU.xml +++ b/res/rus-RU.xml @@ -131,4 +131,6 @@ Очистить журнал Фев Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/slk-SK.xml b/res/slk-SK.xml index 9569332..033c4ea 100644 --- a/res/slk-SK.xml +++ b/res/slk-SK.xml @@ -131,4 +131,6 @@ Vymazať históriu Feb. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/slv-SI.xml b/res/slv-SI.xml index 043d0b7..98ebfe1 100644 --- a/res/slv-SI.xml +++ b/res/slv-SI.xml @@ -131,4 +131,6 @@ Počisti zgodovino Feb Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/spa-ES.xml b/res/spa-ES.xml index 1625608..7f5e899 100644 --- a/res/spa-ES.xml +++ b/res/spa-ES.xml @@ -131,4 +131,6 @@ Borrar historial Feb. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/spa-MX.xml b/res/spa-MX.xml index 49114de..2d0f35c 100644 --- a/res/spa-MX.xml +++ b/res/spa-MX.xml @@ -131,4 +131,6 @@ Eliminar historial Feb. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/srp-RS.xml b/res/srp-RS.xml index e5efc9e..113530f 100644 --- a/res/srp-RS.xml +++ b/res/srp-RS.xml @@ -131,4 +131,6 @@ Obriši istoriju Feb. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/swe-SE.xml b/res/swe-SE.xml index dff71ac..5529aae 100644 --- a/res/swe-SE.xml +++ b/res/swe-SE.xml @@ -131,4 +131,6 @@ Rensa historik Feb Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/tur-TR.xml b/res/tur-TR.xml index e8c606a..7b3102c 100644 --- a/res/tur-TR.xml +++ b/res/tur-TR.xml @@ -131,4 +131,6 @@ Geçmişi sil Şub. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/ukr-UA.xml b/res/ukr-UA.xml index 413b5d8..1ea0977 100644 --- a/res/ukr-UA.xml +++ b/res/ukr-UA.xml @@ -131,4 +131,6 @@ Очистити журнал Лют Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/uzb-UZ.xml b/res/uzb-UZ.xml index 69f3282..62878b3 100644 --- a/res/uzb-UZ.xml +++ b/res/uzb-UZ.xml @@ -131,4 +131,6 @@ Jurnalni tozalash Fev. Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/zho-CN.xml b/res/zho-CN.xml index 1028595..4f98484 100644 --- a/res/zho-CN.xml +++ b/res/zho-CN.xml @@ -131,4 +131,6 @@ 清除历史记录 2 月 Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/zho-HK.xml b/res/zho-HK.xml index 5e331fb..a4852a6 100644 --- a/res/zho-HK.xml +++ b/res/zho-HK.xml @@ -131,4 +131,6 @@ 清除歷程記錄 2 月 Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/zho-SG.xml b/res/zho-SG.xml index 4633ae1..cadd4be 100644 --- a/res/zho-SG.xml +++ b/res/zho-SG.xml @@ -131,4 +131,6 @@ 清除历史记录 2月 Failed to save Image + Delete all saved form data? + Delete all saved passwords? diff --git a/res/zho-TW.xml b/res/zho-TW.xml index 5fc32be..1b7ce5c 100644 --- a/res/zho-TW.xml +++ b/res/zho-TW.xml @@ -131,5 +131,6 @@ 清除記錄 2 月 Failed to save Image - - + Delete all saved form data? + Delete all saved passwords? + \ No newline at end of file diff --git a/src/IntHistoryListForm.cpp b/src/IntHistoryListForm.cpp index 51618f2..a762a33 100644 --- a/src/IntHistoryListForm.cpp +++ b/src/IntHistoryListForm.cpp @@ -147,6 +147,7 @@ HistoryListForm::OnInitializing(void) { return E_FAILURE; } + __pGroupedListView->AddGroupedListViewItemEventListener(*this); r = __pGroupedListView->SetBounds(Rectangle(0,__pGroupedListView->GetY(),GetClientAreaBounds().width,GetClientAreaBounds().height - __pSearchBar->GetHeight() - __pSearchBar->GetY())); if (IsFailed(r)) @@ -170,6 +171,7 @@ HistoryListForm::OnInitializing(void) return r; } + __pSearchListView->SetBackgroundColor(GetBackgroundColor()); __pSearchListView->SetTextColorOfEmptyList(Color::GetColor(COLOR_ID_BLACK)); __pSearchListView->AddGroupedListViewItemEventListener(*this); r = __pSearchListView->SetShowState(false); diff --git a/src/IntInternetApp.cpp b/src/IntInternetApp.cpp index 4657704..1552c46 100644 --- a/src/IntInternetApp.cpp +++ b/src/IntInternetApp.cpp @@ -193,7 +193,13 @@ InternetApp::OnAppTerminating(AppRegistry& appRegistry, bool forcedTermination) void InternetApp::OnForeground(void) { + Frame* pCurrentFrame = null; + pCurrentFrame = Application::GetInstance()->GetAppFrame()->GetFrame(); + if (pCurrentFrame != null) + { + pCurrentFrame->SetEnabled(true); + } } void diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp index 57259f8..77f8362 100644 --- a/src/IntMainForm.cpp +++ b/src/IntMainForm.cpp @@ -863,13 +863,17 @@ result MainForm::InitSelectTextContextMenu(Tizen::Graphics::Point p, bool pasteO delete __pImageMenu; __pImageMenu = null; } - p.y = p.y + __pAddressbar->GetHeight() + 12; - if(p.y < 100) + AppLog("abcde::contextmenu created at p.y %d",p.y); +// p.y = p.y + __pAddressbar->GetHeight() + 12; + + if(p.y < 150) { + p.y = p.y + 50; direction = CONTEXT_MENU_ANCHOR_DIRECTION_DOWNWARD; } else { +// p.y = p.y - 100; direction = CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD; } __pImageMenu = new (std::nothrow) ContextMenu(); @@ -1522,7 +1526,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId) } if (pBitmap != null) { - r = __pMenu->SetItemAt(0,L"Add to Bookmarks"/*CommonUtil::GetString(L"IDS_BR_OPT_BOOKMARK")*/, IDA_ADDTOBOOKMARK_CLICKED,*pBitmap); + r = __pMenu->SetItemAt(0,CommonUtil::GetString(L"IDS_BR_OPT_ADDTOBOOKMARKS"), IDA_ADDTOBOOKMARK_CLICKED,*pBitmap); delete pBitmap; } } @@ -1597,11 +1601,11 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId) if (__pMenu->GetItemCount() == 8) { - r = __pMenu->SetItemAt(1,L"Add to Bookmarks"/*CommonUtil::GetString(L"IDS_BR_OPT_BOOKMARK")*/, IDA_ADDTOBOOKMARK_CLICKED,*pBitmap); + r = __pMenu->SetItemAt(1,CommonUtil::GetString(L"IDS_BR_OPT_ADDTOBOOKMARKS"), IDA_ADDTOBOOKMARK_CLICKED,*pBitmap); } else { - r = __pMenu->InsertItemAt(1,L"Add to Bookmarks"/*CommonUtil::GetString(L"IDS_BR_OPT_BOOKMARK")*/, IDA_ADDTOBOOKMARK_CLICKED,*pBitmap); + r = __pMenu->InsertItemAt(1,CommonUtil::GetString(L"IDS_BR_OPT_ADDTOBOOKMARKS"), IDA_ADDTOBOOKMARK_CLICKED,*pBitmap); } if (IsFailed(r)) @@ -1613,7 +1617,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId) AppLogDebug("ONACTION_PERFORMED:IDA_MOREBTN_CLICKED 4"); if (__pMenu->GetItemCount() != 8) { - __pMenu->InsertItemAt(1,L"Add to Bookmarks"/*CommonUtil::GetString(L"IDS_BR_OPT_SHARE")*/, IDA_ADDTOBOOKMARK_CLICKED); + __pMenu->InsertItemAt(1,CommonUtil::GetString(L"IDS_BR_OPT_ADDTOBOOKMARKS"), IDA_ADDTOBOOKMARK_CLICKED); // __pMenu->InsertItemAt(2,L"Add to Home"/*CommonUtil::GetString(L"IDS_BR_OPT_SHARE")*/, IDA_ADD_TO_HOME_CLICKED); __pMenu->InsertItemAt(2,CommonUtil::GetString(L"IDS_BR_OPT_SHARE"), IDA_SHARE_CLICKED); @@ -2208,6 +2212,7 @@ void MainForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs) { + AppLog("MainForm::OnSceneActivatedN called"); String* pSelectedScene = NULL; Object* pValue = NULL; String* pUrl = null; @@ -3733,7 +3738,7 @@ MainForm::OnTouchDoublePressed(const Control& source, const Point& currentPositi void MainForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo) { - AppLog("MainForm::OnTouchLongPressed"); + AppLog("abcde::MainForm::OnTouchLongPressed %d, %d" ,currentPosition.x,currentPosition.y); if (__pHitElementResult != null) { @@ -4638,3 +4643,8 @@ MainForm::RemoveHttpTextFromDisplayURL(void) } return updatedDisplayUrl; } + +void MainForm::OnSharePopupControlStarted(void) +{ + __pWebViewer->AddTouchEventListener(*this); +} diff --git a/src/IntSharePopup.cpp b/src/IntSharePopup.cpp index 65618aa..43bc69a 100644 --- a/src/IntSharePopup.cpp +++ b/src/IntSharePopup.cpp @@ -288,6 +288,7 @@ SharePopup::StartEmailAppControl(void) { HashMap extraData; ShareInfo* pShareInfo = null; + Frame* pCurrentFrame = null; result r = E_FAILURE; bool imageAttachment = false; @@ -359,9 +360,15 @@ SharePopup::StartEmailAppControl(void) AppControl* pAc = AppManager::FindAppControlN(L"tizen.email", L"http://tizen.org/appcontrol/operation/compose"); if (pAc) { - pAc->Start(null, null, &extraData, null); + r = pAc->Start(null, null, &extraData, this); delete pAc; } + pCurrentFrame = Application::GetInstance()->GetAppFrame()->GetFrame(); + + if (pCurrentFrame != null && r==E_SUCCESS) + { + pCurrentFrame->SetEnabled(false); + } if (pShareInfo != null) { delete pShareInfo; @@ -375,6 +382,8 @@ SharePopup::StartMessageAppControl(void) { HashMap extraData; ShareInfo* pShareInfo = null; + Frame* pCurrentFrame = null; + result r = E_FAILURE; bool imageAttachment = false; extraData.Construct(); @@ -447,9 +456,16 @@ SharePopup::StartMessageAppControl(void) AppControl* pAc = AppManager::FindAppControlN(L"tizen.messages", L"http://tizen.org/appcontrol/operation/compose"); if (pAc) { - pAc->Start(null, null, &extraData, null); + r = pAc->Start(null, null, &extraData, this); delete pAc; } + + pCurrentFrame = Application::GetInstance()->GetAppFrame()->GetFrame(); + + if (pCurrentFrame != null && r==E_SUCCESS) + { + pCurrentFrame->SetEnabled(false); + } if (pShareInfo != null) { delete pShareInfo; @@ -465,3 +481,8 @@ SharePopup::OnAppControlCompleted(const Tizen::Base::String& providerId, const T { } + +void SharePopup::OnAppControlCompleteResponseReceived(const Tizen::App::AppId& appId, const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult, const Tizen::Base::Collection::IMap* pExtraData) +{ + +} -- 2.7.4