Fixed Nabi Issues

Change-Id: Ie7dfaea0695542d2664b3e02dd09b13c7600d249
Signed-off-by: Vinay Sachdeva <v.sachdeva@samsung.com>

diff --git a/src/IntAddressbar.cpp b/src/IntAddressbar.cpp
index 318fd95..9a0af4a 100644 (file)
--- a/src/IntAddressbar.cpp
+++ b/src/IntAddressbar.cpp
@@ -665,6 +665,7 @@ Addressbar::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                {
                        //__displayUrl = __pUrlField->GetText();
                        __pAddressbarUrlField->Clear();
+                       __pAddressbarUrlField->SetKeypadActionEnabled(false);
                        __pAddressbarUrlField->Invalidate(true);
                }
        }

diff --git a/src/IntEditBookmarkListForm.cpp b/src/IntEditBookmarkListForm.cpp
index 96a9cf5..435d049 100644 (file)
--- a/src/IntEditBookmarkListForm.cpp
+++ b/src/IntEditBookmarkListForm.cpp
@@ -761,12 +761,7 @@ EditBookmarkListForm::OnSceneActivatedN(const SceneId& previousSceneId, const Sc
 
        __selectedItemCount = 0;
 
-       labelString.Append(CommonUtil::GetString(L"IDS_COM_OPT_SELECTED"));
-       labelString.Append(L"\x200E"); // LEFT-TO-RIGHT MARK
-       labelString.Append(L"(");
-       labelString.Append(__pSelectedList->GetCount());
-       labelString.Append(L")");
-       __pInfoLabel->SetText(labelString);
+
        __pListview->UpdateList();
 
        count = __pListview->GetItemCount();
@@ -802,6 +797,16 @@ EditBookmarkListForm::OnSceneActivatedN(const SceneId& previousSceneId, const Sc
                        __pListview->SetItemChecked(index,false);
                }
        }
+
+
+       labelString.Append(CommonUtil::GetString(L"IDS_COM_OPT_SELECTED"));
+       labelString.Append(L"\x200E"); // LEFT-TO-RIGHT MARK
+       labelString.Append(L"(");
+       labelString.Append(__selectedItemCount);
+       labelString.Append(L")");
+       __pInfoLabel->SetText(labelString);
+
+
        if(__selectedItemCount == 0)
        {
                GetFooter()->SetItemEnabled(0, false);

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index f24e010..57259f8 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -1910,13 +1910,41 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        break;
        case IDA_HYPERLINK_OPEN_CLICKED:
        {
-               AppLogDebug("IDA_VIEW_IMAGE_CLICKED");
-               WindowInfo* pNewWindowInfo = null;
                if (__pHitElementResult != null)
                {
                        String srcUrl = __pHitElementResult->GetUrl();
-                       AppLog("MainForm::OnTouchLongPressed srcUrl is %ls",srcUrl.GetPointer());
-                       LoadUrl(srcUrl);
+
+                       WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewScene(srcUrl);
+
+                       if (pNewWindowInfo == null)
+                       {
+                               return;
+                       }
+                       result r = E_SUCCESS;
+                       SceneManager* pSceneManager = SceneManager::GetInstance();
+                       if (pSceneManager == NULL)
+                       {
+                               return;
+                       }
+                       ArrayList* pArgList = new(std::nothrow) ArrayList();
+                       if (pArgList == NULL)
+                       {
+                               return;
+                       }
+                       pArgList->Construct();
+
+                       pArgList->Add(*pNewWindowInfo);
+                       r = pSceneManager->GoForward(ForwardSceneTransition(pNewWindowInfo->sceneID, SCENE_TRANSITION_ANIMATION_TYPE_NONE),pArgList);
+                       if (pArgList != null)
+                       {
+                               delete pArgList;
+                               pArgList = null;
+                       }
+                       if(IsFailed(r))
+                       {
+                               AppLogDebug("MultipleWindowForm::OnActionPerformed GoForward failed %s",GetErrorMessage(r));
+                               return;
+                       }
                }
        }
        break;
@@ -1967,6 +1995,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        break;
        case IDA_FIND_TEXT__CLICKED:
        {
+               OnAddressCancelledClicked(*__pAddressbar);
                AppLogDebug("MainForm::OnActionPerformed find word clicked");
                __currentSearchStr.Clear();
                __currentSearchStr.Append(__currentSelectedStr);
@@ -2154,6 +2183,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                {
                        //__displayUrl = __pUrlField->GetText();
                        __pFooterUrlField->Clear();
+
                }
        }
        break;
@@ -3768,13 +3798,14 @@ void MainForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen:
                        InitSelectTextContextMenu(currentPosition,true, true);
                        if(__pImageMenu)
                        {
-                               __pImageMenu->SetShowState(true);
-                               __pImageMenu->Show();
-                               __pImageMenu->Invalidate(true);
+//                             __pImageMenu->SetShowState(true);
+//                             __pImageMenu->Show();
+//                             __pImageMenu->Invalidate(true);
                        }
                }
                __isLongPressedDone = true;
-               __pWebViewer->SetBlockSelectionPosition(currentPosition);
+               result r =__pWebViewer->SetBlockSelectionPosition(currentPosition);
+               AppLog("setselectionselectedornot %s",GetErrorMessage(r));
 
        }
        __inputEventToBeSupressed = true;