Fixed Nabi Issues56041,56034,55910,53994,48389 and Jira Issue : P131024-02407

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

diff --git a/src/IntHistoryListForm.cpp b/src/IntHistoryListForm.cpp
index 1869630..e523193 100644 (file)
--- a/src/IntHistoryListForm.cpp
+++ b/src/IntHistoryListForm.cpp
@@ -1078,7 +1078,7 @@ HistoryListForm::OnSearchBarModeChanged(SearchBar& source, SearchBarMode mode)
                        __pGroupedListView->SetBounds(0, __pSearchBar->GetY() + __pSearchBar->GetHeight(), GetClientAreaBounds().width, GetClientAreaBounds().height - __pSearchBar->GetHeight());
                Invalidate(true);
                __searchHistory = false;
-               r = __pGroupedListView->UpdateList();
+//             r = __pGroupedListView->UpdateList();
                if (__isNoHistoryPresent == true)
                {
                        GetFooter()->SetItemEnabled(0, false);

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 818b5c9..f2f7e11 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -985,6 +985,8 @@ MainForm::InitSelectTextContextMenuF(FloatPoint p, bool pasteOption, bool onlyPa
        }
 //     FloatPoint q(0.0,0.0);
 //             __pWebViewer->GetBlockRange(p,q);
+       if(p.y < 0)
+               p.y =0;
        if(p.y < 150)
        {
                p.y = p.y + 100;
@@ -1219,6 +1221,7 @@ MainForm::InitFindWordPanel(void)
                AppLogException("There is some problem in the xml file. Please check.");
                return E_FAILURE;
        }
+       __pFindWordCountLabel->SetText(L"0/0");
 
        __pFindWordCountLabelRightToLeft = static_cast<Label*>(__pFindWordControl->GetControl(L"IDC_FIND_COUNT_LABEL2", true));
        if (__pFindWordCountLabelRightToLeft == null)
@@ -1226,6 +1229,7 @@ MainForm::InitFindWordPanel(void)
                AppLogException("There is some problem in the xml file. Please check.");
                return E_FAILURE;
        }
+       __pFindWordCountLabelRightToLeft->SetText(L"0/0");
 
        __pFindWordEditField = static_cast<EditField*>(__pFindWordControl->GetControl(L"IDC_FIND_WORD_EDITFIELD", true));
        if (__pFindWordEditField == null)
@@ -1633,12 +1637,10 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                if(__pFindWordPanelLeftToRight && __pFindWordPanelLeftToRight->GetShowState() == true)
                {
                        __pFindWordEditField->SetFocus();
-//                     __pFindWordCountLabel->SetShowState(false);
                }
                else
                {
                        __pFindWordEditFieldRightToLeft->SetFocus();
-                       __pFindWordCountLabelRightToLeft->SetShowState(false);
                }
        }
        break;
@@ -4307,6 +4309,9 @@ MainForm::RelayoutControls(bool showAddressbar,bool relayoutFooter)
                __webControlHeight = __webControlHeight + 12;
                __webControlHeightF = __webControlHeightF + 12.0f;
        }
+
+
+
        if (__pWebViewer != null && __pWebViewer->GetShowState() == true)
        {
                if(__pWebViewer->GetX() == 0 && __pWebViewer->GetY() == __webControlPosition.y &&__pWebViewer->GetWidth() == GetClientAreaBounds().width &&__pWebViewer->GetHeight() == __webControlHeight )
@@ -4314,11 +4319,12 @@ MainForm::RelayoutControls(bool showAddressbar,bool relayoutFooter)
                }
                else
                {
-                       __pWebViewer->SetBounds(0, __webControlPosition.y, GetClientAreaBounds().width, __webControlHeight );
+                       __pWebViewer->SetBounds(CoordinateSystem::AlignToDevice(FloatRectangle(0.0f, __webControlPositionF.y, GetClientAreaBoundsF().width, __webControlHeightF)));
                        AppLog("xyz:: MainForm::RelayoutControls called __webControlHeight %d",__webControlHeight);
                        __pWebViewer->Invalidate(false);
                }
        }
+
        if(__pMostVisitedListView != null && __pAddressbar != null && __pFooterPanel != null)
        {
                __pMostVisitedListView->SetBounds(Tizen::Graphics::Rectangle(0,__webControlPosition.y , GetClientAreaBounds().width, __webControlHeight));

diff --git a/src/IntSettingForm.cpp b/src/IntSettingForm.cpp
index 9624508..c0b5a30 100644 (file)
--- a/src/IntSettingForm.cpp
+++ b/src/IntSettingForm.cpp
@@ -350,6 +350,75 @@ SettingForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, int gr
        }
        else if (settingInfo[effectiveIndex].itemType == ITEM_TYPE_RADIO)
        {
+
+               switch (effectiveIndex)
+               {
+               case SETTING_CURRENT_PAGE:
+                       //SettingPresentationModel::GetInstance()->SetHomepage(settingInfo[SETTING_FAVORITE_URL].titleText);
+                       AppLog("setting current page currentURL is =%ls",__currentURL.GetPointer());
+                       if (__currentURL.CompareTo(L"") != 0)
+                       {
+                               AppLog("setting current page currentURL is =%ls",__currentURL.GetPointer());
+                               SettingPresentationModel::GetInstance()->SetHomepage(CommonUtil::GetString(L"IDS_BR_BODY_USER_HOMEPAGE"));
+                               SettingPresentationModel::GetInstance()->SetFavoriteValue(__currentURL);
+                               settingInfo[SETTING_FAVORITE_URL].titleText = __currentURL;
+       //                      listView.RefreshList(groupIndex, effectiveIndex, LIST_REFRESH_TYPE_ITEM_MODIFY);
+       //                      listView.RefreshList(groupIndex, itemIndex, LIST_REFRESH_TYPE_ITEM_MODIFY);
+       //                      listView.UpdateList();
+                       }
+                       break;
+               case SETTING_BLANK_PAGE:
+                       //SettingPresentationModel::GetInstance()->SetHomepage(settingInfo[SETTING_BLANK_PAGE].titleText);
+                       SettingPresentationModel::GetInstance()->SetHomepage((L"IDS_BR_BODY_BLANK_PAGE"));
+                       AppLog("GetHomepage() %ls",SettingPresentationModel::GetInstance()->GetHomepage().GetPointer());
+       //              listView.RefreshList(groupIndex, itemIndex, LIST_REFRESH_TYPE_ITEM_MODIFY);
+       //              listView.UpdateList();
+
+                       break;
+               case SETTING_MOST_VISITED_SITE:
+                       SettingPresentationModel::GetInstance()->SetHomepage(L"IDS_BR_BODY_MOST_VISITED_SITES");
+       //              listView.RefreshList(groupIndex, itemIndex, LIST_REFRESH_TYPE_ITEM_MODIFY);
+       //              listView.UpdateList();
+                       break;
+
+               case SETTING_FAVORITE_URL:
+                       //SettingPresentationModel::GetInstance()->SetHomepage(settingInfo[SETTING_FAVORITE_URL].titleText);
+                       SceneManager::GetInstance()->GoForward(ForwardSceneTransition(IDSCN_EDIT_HOMEPAGE_VIEW, SCENE_TRANSITION_ANIMATION_TYPE_LEFT));
+                       break;
+
+               case SETTING_FIT_TO_WIDTH:
+                       SettingPresentationModel::GetInstance()->SetDefaultView(L"IDS_BR_BODY_FIT_TO_WIDTH");
+       //              listView.RefreshList(groupIndex, itemIndex, LIST_REFRESH_TYPE_ITEM_MODIFY);
+       //              listView.UpdateList();
+                       break;
+
+               case SETTING_READABLE:
+                       SettingPresentationModel::GetInstance()->SetDefaultView(L"IDS_BR_BODY_READABLE");
+       //              listView.RefreshList(groupIndex, itemIndex, LIST_REFRESH_TYPE_ITEM_MODIFY);
+       //              listView.UpdateList();
+                       break;
+
+               case SETTING_SEARCH_ENGINE_YAHOO:
+                       SettingPresentationModel::GetInstance()->SetSearchEngine(settingInfo[SETTING_SEARCH_ENGINE_YAHOO].titleText);
+       //              listView.RefreshList(groupIndex, itemIndex, LIST_REFRESH_TYPE_ITEM_MODIFY);
+       //              listView.UpdateList();
+                       break;
+
+               case SETTING_SEARCH_ENGINE_NAVER:
+                       SettingPresentationModel::GetInstance()->SetSearchEngine(settingInfo[SETTING_SEARCH_ENGINE_NAVER].titleText);
+       //              listView.RefreshList(groupIndex, itemIndex, LIST_REFRESH_TYPE_ITEM_MODIFY);
+       //              listView.UpdateList();
+                       break;
+
+               case SETTING_SEARCH_ENGINE_GOOGLE:
+                       SettingPresentationModel::GetInstance()->SetSearchEngine(settingInfo[SETTING_SEARCH_ENGINE_GOOGLE].titleText);
+       //              listView.RefreshList(groupIndex, itemIndex, LIST_REFRESH_TYPE_ITEM_MODIFY);
+       //              listView.UpdateList();
+                       break;
+
+
+               }
+
                int parentIndex = 0;
                for (parentIndex = effectiveIndex; parentIndex > SETTING_INVALID; parentIndex--)
                {
@@ -402,50 +471,6 @@ SettingForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, int gr
 
        switch (effectiveIndex)
        {
-       case SETTING_CURRENT_PAGE:
-               //SettingPresentationModel::GetInstance()->SetHomepage(settingInfo[SETTING_FAVORITE_URL].titleText);
-               AppLog("setting current page currentURL is =%ls",__currentURL.GetPointer());
-               if (__currentURL.CompareTo(L"") != 0)
-               {
-                       AppLog("setting current page currentURL is =%ls",__currentURL.GetPointer());
-                       SettingPresentationModel::GetInstance()->SetHomepage(CommonUtil::GetString(L"IDS_BR_BODY_USER_HOMEPAGE"));
-                       SettingPresentationModel::GetInstance()->SetFavoriteValue(__currentURL);
-                       settingInfo[SETTING_FAVORITE_URL].titleText = __currentURL;
-//                     listView.RefreshList(groupIndex, effectiveIndex, LIST_REFRESH_TYPE_ITEM_MODIFY);
-//                     listView.RefreshList(groupIndex, itemIndex, LIST_REFRESH_TYPE_ITEM_MODIFY);
-//                     listView.UpdateList();
-               }
-               break;
-       case SETTING_BLANK_PAGE:
-               //SettingPresentationModel::GetInstance()->SetHomepage(settingInfo[SETTING_BLANK_PAGE].titleText);
-               SettingPresentationModel::GetInstance()->SetHomepage((L"IDS_BR_BODY_BLANK_PAGE"));
-               AppLog("GetHomepage() %ls",SettingPresentationModel::GetInstance()->GetHomepage().GetPointer());
-//             listView.RefreshList(groupIndex, itemIndex, LIST_REFRESH_TYPE_ITEM_MODIFY);
-//             listView.UpdateList();
-
-               break;
-       case SETTING_MOST_VISITED_SITE:
-               SettingPresentationModel::GetInstance()->SetHomepage(L"IDS_BR_BODY_MOST_VISITED_SITES");
-//             listView.RefreshList(groupIndex, itemIndex, LIST_REFRESH_TYPE_ITEM_MODIFY);
-//             listView.UpdateList();
-               break;
-
-       case SETTING_FAVORITE_URL:
-               //SettingPresentationModel::GetInstance()->SetHomepage(settingInfo[SETTING_FAVORITE_URL].titleText);
-               SceneManager::GetInstance()->GoForward(ForwardSceneTransition(IDSCN_EDIT_HOMEPAGE_VIEW, SCENE_TRANSITION_ANIMATION_TYPE_LEFT));
-               break;
-
-       case SETTING_FIT_TO_WIDTH:
-               SettingPresentationModel::GetInstance()->SetDefaultView(L"IDS_BR_BODY_FIT_TO_WIDTH");
-//             listView.RefreshList(groupIndex, itemIndex, LIST_REFRESH_TYPE_ITEM_MODIFY);
-//             listView.UpdateList();
-               break;
-
-       case SETTING_READABLE:
-               SettingPresentationModel::GetInstance()->SetDefaultView(L"IDS_BR_BODY_READABLE");
-//             listView.RefreshList(groupIndex, itemIndex, LIST_REFRESH_TYPE_ITEM_MODIFY);
-//             listView.UpdateList();
-               break;
 
        case SETTING_RUN_JAVASCRIPT:
                SettingPresentationModel::GetInstance()->SetRunJavascriptEnabled(settingInfo[SETTING_RUN_JAVASCRIPT].isSelected);
@@ -495,23 +520,6 @@ SettingForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, int gr
                SettingPresentationModel::GetInstance()->SetRememberPassword(settingInfo[SETTING_REMEMBER_PASSWORD].isSelected);
                break;
 
-       case SETTING_SEARCH_ENGINE_YAHOO:
-               SettingPresentationModel::GetInstance()->SetSearchEngine(settingInfo[SETTING_SEARCH_ENGINE_YAHOO].titleText);
-//             listView.RefreshList(groupIndex, itemIndex, LIST_REFRESH_TYPE_ITEM_MODIFY);
-//             listView.UpdateList();
-               break;
-
-       case SETTING_SEARCH_ENGINE_NAVER:
-               SettingPresentationModel::GetInstance()->SetSearchEngine(settingInfo[SETTING_SEARCH_ENGINE_NAVER].titleText);
-//             listView.RefreshList(groupIndex, itemIndex, LIST_REFRESH_TYPE_ITEM_MODIFY);
-//             listView.UpdateList();
-               break;
-
-       case SETTING_SEARCH_ENGINE_GOOGLE:
-               SettingPresentationModel::GetInstance()->SetSearchEngine(settingInfo[SETTING_SEARCH_ENGINE_GOOGLE].titleText);
-//             listView.RefreshList(groupIndex, itemIndex, LIST_REFRESH_TYPE_ITEM_MODIFY);
-//             listView.UpdateList();
-               break;
 
        case SETTING_RESET_TO_DEFAULT:
                //OpenResetPopup();

diff --git a/src/IntSharePopup.cpp b/src/IntSharePopup.cpp
index b6cfe70..48fac0c 100644 (file)
--- a/src/IntSharePopup.cpp
+++ b/src/IntSharePopup.cpp
@@ -331,7 +331,7 @@ SharePopup::CreateItem(int index, int itemWidth)
        {
                AppLogDebug("SharePopUp CreateItem 0");
                // IDS_SHARE_VIA_MESSAGE
-               pItem->AddElement(Rectangle(45,0, GetClientAreaBounds().width, listItemHeight), ID_FORMAT_MESSAGE_STRING, CommonUtil::GetString(L"IDS_BR_OPT_MESSAGES"), true);
+               pItem->AddElement(Rectangle(45,0, GetClientAreaBounds().width, listItemHeight), ID_FORMAT_MESSAGE_STRING, CommonUtil::GetString(L"IDS_BR_OPT_SENDURLVIA_MESSAGE"), true);
        }
        break;
        case 1: