From 55aa1c01de3dc3a3069b5c87d9c4eeb5e5f4edfc Mon Sep 17 00:00:00 2001 From: Vinay Sachdeva Date: Sat, 13 Apr 2013 03:52:50 +0530 Subject: [PATCH] Fixed Nabi Issues : N_SE-34077, N_SE-34127 Change-Id: I76f84b4b2a1100771bfb7e9e6474bd13373f694d Signed-off-by: Vinay Sachdeva --- src/IntMainForm.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp index 5672b5f..58ad489 100644 --- a/src/IntMainForm.cpp +++ b/src/IntMainForm.cpp @@ -734,7 +734,7 @@ MainForm::InitContextMenu(Point& p) __pMenu->AddItem(CommonUtil::GetString(L"IDS_BR_BODY_PRIVACY"), IDA_PRIVATEON_CLICKED,*pBitmap); delete pBitmap; } - r = __pMenu->AddItem(L"History"/*CommonUtil::GetString(L"IDS_BR_OPT_BOOKMARK")*/, IDA_HISTORY_CLICKED); + r = __pMenu->AddItem(CommonUtil::GetString(L"IDS_BR_TAB_HISTORY"), IDA_HISTORY_CLICKED); r = __pMenu->AddItem(CommonUtil::GetString(L"IDS_COM_OPT_BRIGHTNESS"), IDA_BRIGHTNESS_BTN_CLICKED); r = __pMenu->AddItem(CommonUtil::GetString(L"IDS_COM_BODY_SETTINGS"), IDA_SETTINGS_CLICKED); @@ -1420,7 +1420,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId) } AppLogDebug("ONACTION_PERFORMED:IDA_MOREBTN_CLICKED 3"); - if (__pMenu->GetItemCount() == 9) + if (__pMenu->GetItemCount() == 8) { r = __pMenu->SetItemAt(1,L"Add to Bookmarks"/*CommonUtil::GetString(L"IDS_BR_OPT_BOOKMARK")*/, IDA_ADDTOBOOKMARK_CLICKED,*pBitmap); } @@ -2458,7 +2458,7 @@ MainForm::LoadUrl(String& url) bool flag = false; String firstPattern(L"((https?|ftp|gopher|telnet|file|notes|ms-help):((//)|(\\\\))+[\w\d:#@%/;$()~_?\+-=\\\.&]*)"); - String secondPattern(L"^[A-Za-z0-9\.\+-:#@%/;$~?]+\\.[A-Za-z0-9\+-=:#@%/;$~()_?\\\.&]{2,}$"); // URL of type abc.com (i.e without protocol in front of it) + String secondPattern(L"^[A-Za-z0-9\.\+-:#@%/;$~?]+\\.[A-Za-z0-9!\+-=:#@%/;$~()_?\\\.&]{2,}$"); // URL of type abc.com (i.e without protocol in front of it) RegularExpression firstRegex; RegularExpression secondRegex; @@ -2682,6 +2682,7 @@ MainForm::OnAddressBarModeChanged(/*const Addressbar& addBar*/) void MainForm::OnAddressBarKeypadClosed(const Addressbar& addBar, bool footerState) { + __pAddressbar->SetShowState(false); __pFooterPanel->SetShowState(true); RelayoutControls(false); } @@ -3059,7 +3060,8 @@ MainForm::RelayoutControls(bool showAddressbar) Invalidate(true); } -void MainForm::ShowFindWordPanel(bool show , bool isTouchPressed) +void +MainForm::ShowFindWordPanel(bool show , bool isTouchPressed) { if (__pFindWordControl == null) { @@ -3414,7 +3416,7 @@ MainForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen::Ui::Ori { AppLog("MainForm::OnOrientationChanged GetClientAreaBounds %d, %d",GetClientAreaBounds().width,GetClientAreaBounds().height); int widthContextItem = 0; - + ShowFindWordPanel(__pFindWordPanel->GetShowState(), false); Bitmap *pBitmap = CommonUtil::GetNinepatchedBitmapN(IDB_SEARCH_INPUT_FIELD_BG, __pFooterLabel->GetWidth(), __pFooterLabel->GetHeight()); if (pBitmap != null && __pFooterLabel != null) { -- 2.7.4