Fixed Nabi Issues 49466,55718,55225,52332

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

diff --git a/inc/IntEditBookmarkListForm.h b/inc/IntEditBookmarkListForm.h
index 22be5dd..099cf15 100644 (file)
--- a/inc/IntEditBookmarkListForm.h
+++ b/inc/IntEditBookmarkListForm.h
@@ -27,6 +27,7 @@
 #include <FBase.h>
 #include <FUi.h>
 #include "IntConfirmationPopup.h"
+#include "IntNotificationPanel.h"
 
 class EditBookmarkListForm
        : public Tizen::Ui::Controls::Form
@@ -115,6 +116,7 @@ private:
        Tizen::Base::Collection::ArrayList* __pSelectedList;
        int __selectedItemCount;
        int __fontSize;
+       NotificationPanel* __pNotification;
   };
 
 #endif /* _INT_EDIT_BOOKMARK_LIST_FORM_H_ */

diff --git a/res/spa-ES.xml b/res/spa-ES.xml
index c0b5195..2b4e028 100644 (file)
--- a/res/spa-ES.xml
+++ b/res/spa-ES.xml
@@ -96,7 +96,7 @@
     <text id="IDS_BR_OPT_VIEW_BY_ABB">Vista por</text>
     <text id="IDS_COM_BODY_TUE">Mar.</text>
     <text id="IDS_COM_BODY_MON">Lunes</text>
-    <text id="IDS_BR_HEADER_MULTI_WINDOW">Multi window</text>
+    <text id="IDS_BR_HEADER_MULTI_WINDOW">Ventana múltiple</text>
     <text id="IDS_BR_POP_ALREADY_EXISTS">Ya existe</text>
     <text id="IDS_BR_BODY_COPY_URL">Copiar URL</text>
     <text id="IDS_BR_BODY_REMEMBER_PREFERENCE">Recordar preferencias</text>

diff --git a/src/IntBookmarkListForm.cpp b/src/IntBookmarkListForm.cpp
index 9fec390..e2803ef 100644 (file)
--- a/src/IntBookmarkListForm.cpp
+++ b/src/IntBookmarkListForm.cpp
@@ -1011,7 +1011,8 @@ BookmarkListForm::OnSearchBarModeChanged(Tizen::Ui::Controls::SearchBar& source,
        result r = E_FAILURE;
        AppLog("ABCD::BookmarkListForm::OnSearchBarModeChanged %d",GetClientAreaBounds().height);
 
-       __pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), __pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight());
+       if(__pSearchBar)
+               __pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), __pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight());
        __pSearchListView->Invalidate(false);
 
        if (mode == SEARCH_BAR_MODE_NORMAL)
@@ -1023,7 +1024,8 @@ BookmarkListForm::OnSearchBarModeChanged(Tizen::Ui::Controls::SearchBar& source,
                __searchBookmark = false;
                r = __pListview->UpdateList();
 //             __pSearchListView->SetBounds(0,0,GetClientAreaBounds().width,GetClientAreaBounds().height -__pSearchBar->GetHeight());
-               __pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight()));
+               if(__pSearchBar)
+                       __pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight()));
                TryCatch( !IsFailed(r),,"BookmarkListForm::OnSearchBarModeChanged Update list failed %s",GetErrorMessage(r));
                CATCH:return;
        }

diff --git a/src/IntBrightnessForm.cpp b/src/IntBrightnessForm.cpp
index 51e0963..fdf88d4 100644 (file)
--- a/src/IntBrightnessForm.cpp
+++ b/src/IntBrightnessForm.cpp
@@ -248,7 +248,7 @@ BrightnessForm::OnFormBackRequested(Form& source)
                r = pAppRegistry->Set(sliderKey,sliderValue);
                FooterItemStatus footerStatus;
                GetFooter()->GetItemStatus(0,footerStatus);
-               if (footerStatus == FOOTER_ITEM_STATUS_SELECTED)
+               if (footerStatus == FOOTER_ITEM_STATUS_SELECTED || footerStatus == FOOTER_ITEM_STATUS_HIGHLIGHTED)
                {
                        r = pAppRegistry->Set(tabKey,0);
                }
@@ -301,7 +301,7 @@ BrightnessForm::OnActionPerformed(const Control& source, int actionId)
        r = pAppRegistry->Set(sliderKey,sliderValue);
        FooterItemStatus footerStatus;
        GetFooter()->GetItemStatus(0,footerStatus);
-       if (footerStatus == FOOTER_ITEM_STATUS_SELECTED)
+       if (footerStatus == FOOTER_ITEM_STATUS_SELECTED || footerStatus == FOOTER_ITEM_STATUS_HIGHLIGHTED)
        {
                r = pAppRegistry->Set(tabKey,0);
        }

diff --git a/src/IntEditBookmarkListForm.cpp b/src/IntEditBookmarkListForm.cpp
index 805deb2..d9cfc46 100644 (file)
--- a/src/IntEditBookmarkListForm.cpp
+++ b/src/IntEditBookmarkListForm.cpp
@@ -29,7 +29,6 @@
 #include "IntCommonLib.h"
 #include "IntEditBookmarkListForm.h"
 #include "IntFaviconManager.h"
-#include "IntNotificationPanel.h"
 #include "IntSceneRegister.h"
 #include "IntTypes.h"
 
@@ -75,6 +74,7 @@ EditBookmarkListForm::EditBookmarkListForm(void)
        __pConfirmationPopup = null;
        __pSelectedList = null;
        __fontSize = 44;
+       __pNotification = null;
 }
 
 EditBookmarkListForm::~EditBookmarkListForm(void)
@@ -89,6 +89,8 @@ EditBookmarkListForm::~EditBookmarkListForm(void)
                __pSelectedList->RemoveAll(false);
                delete __pSelectedList;
        }
+//     if(__pNotification)
+//             delete __pNotification;
 }
 
 bool
@@ -305,10 +307,15 @@ EditBookmarkListForm::OnActionPerformed(const Tizen::Ui::Control& source, int ac
                        __pInfoPanel->Show();
                }
 
-               NotificationPanel* pNotification = new (std::nothrow) NotificationPanel(*this);
+//             if(__pNotification)
+//             {
+////                   delete __pNotification;
+//                     __pNotification = null;
+//             }
+               __pNotification = new (std::nothrow) NotificationPanel(*this);
                String notification = CommonUtil::GetString(L"IDS_BR_POP_DELETED");
-               pNotification->SetText(notification);
-               pNotification->ShowNotification();
+               __pNotification->SetText(notification);
+               __pNotification->ShowNotification();
 
                if(__pConfirmationPopup)
                {
@@ -935,6 +942,9 @@ void EditBookmarkListForm::OnOrientationChanged(const Tizen::Ui::Control &source
        int itemCount = 0;
        ArrayList* pCheckedItems  = NULL ;
 
+       if(__pNotification)
+               __pNotification->SetShowState(false);
+
        if (__pListview != null)
        {
                AppLog("the list Y axis is %d", __pListview->GetY());

diff --git a/src/IntEditHomePageForm.cpp b/src/IntEditHomePageForm.cpp
index f63ee23..800e50f 100644 (file)
--- a/src/IntEditHomePageForm.cpp
+++ b/src/IntEditHomePageForm.cpp
@@ -81,8 +81,9 @@ EditHomePageForm::OnInitializing(void)
        {
                __pUrlEditField->AddTextEventListener(*this);
                __pUrlEditField->SetOverlayKeypadCommandButtonVisible(false);
+               AppLog("width of editfield edithomepage %d",__pUrlEditField->GetWidth());
        }
-       AppLog("width of editfield edithomepage %d",__pUrlEditField->GetWidth());
+
        return r;
 }
 

diff --git a/src/IntHistoryListForm.cpp b/src/IntHistoryListForm.cpp
index 5d83254..1869630 100644 (file)
--- a/src/IntHistoryListForm.cpp
+++ b/src/IntHistoryListForm.cpp
@@ -1051,7 +1051,8 @@ void
 HistoryListForm::OnSearchBarModeChanged(SearchBar& source, SearchBarMode mode)
 {
        result r = E_FAILURE;
-       __pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), __pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight());
+       if(__pSearchBar)
+               __pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), __pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight());
        __pSearchListView->Invalidate(false);
 
        if (mode == SEARCH_BAR_MODE_NORMAL)

diff --git a/src/IntInternetApp.cpp b/src/IntInternetApp.cpp
index 147cb41..33e694c 100644 (file)
--- a/src/IntInternetApp.cpp
+++ b/src/IntInternetApp.cpp
@@ -289,6 +289,7 @@ InternetApp::OnForeground(void)
 void
 InternetApp::OnBackground(void)
 {
+       AppLog("InternetApp::OnBackground");
        Form* pCurrentForm = null;
        if(SceneManager::GetInstance()->GetCurrentScene() != null)
                pCurrentForm = (SceneManager::GetInstance()->GetCurrentScene()->GetForm());

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 1852498..818b5c9 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -3538,7 +3538,8 @@ MainForm::OnFocusGained(const Tizen::Ui::Control& source)
                __pFindWordNext->SetEnabled(false);
                __pFindWordPrev->SetEnabled(false);
 
-               __pWebViewer->SearchTextAllAsync(L"",true);
+               if(__pWebViewer)
+                       __pWebViewer->SearchTextAllAsync(L"",true);
                __pFindWordControl->SetShowState(false);
        }
        RelayoutControls(false);
@@ -4258,7 +4259,8 @@ MainForm::OnWebWindowCloseRequested(Tizen::Web::Controls::Web& source)
                                        return;
                                }
                        }
-                       r = pSceneManager->GoForward(ForwardSceneTransition(pNewWindowInfo->sceneID ,SCENE_TRANSITION_ANIMATION_TYPE_NONE,SCENE_HISTORY_OPTION_ADD_HISTORY,SCENE_DESTROY_OPTION_DESTROY));
+                       if(pNewWindowInfo)
+                               r = pSceneManager->GoForward(ForwardSceneTransition(pNewWindowInfo->sceneID ,SCENE_TRANSITION_ANIMATION_TYPE_NONE,SCENE_HISTORY_OPTION_ADD_HISTORY,SCENE_DESTROY_OPTION_DESTROY));
 
                        break;
                }
@@ -4497,7 +4499,8 @@ void MainForm::OnTextFound(int totalCount, int currentOrdinal)
        {
                AppLog("Word not found");
                //Show error notification to user
-               __pFindWordNext->SetEnabled(false);
+               if(__pFindWordNext)
+                       __pFindWordNext->SetEnabled(false);
                if(__pFindWordCountLabel && __pFindWordCountLabel->GetShowState() == true)
                {
                        __pFindWordCountLabel->SetText(L"0/0");
@@ -4508,7 +4511,8 @@ void MainForm::OnTextFound(int totalCount, int currentOrdinal)
                        __pFindWordCountLabelRightToLeft->SetText(L"0/0");
                        __pFindWordCountLabelRightToLeft->Invalidate(false);
                }
-               __pFindWordNext->Invalidate(false);
+               if(__pFindWordNext)
+                       __pFindWordNext->Invalidate(false);
                __pFindWordPrev->Invalidate(false);
 
                return;
@@ -4516,11 +4520,13 @@ void MainForm::OnTextFound(int totalCount, int currentOrdinal)
 
        if (totalCount == 1 || totalCount == currentOrdinal)
        {
-               __pFindWordNext->SetEnabled(false);
+               if(__pFindWordNext)
+                       __pFindWordNext->SetEnabled(false);
        }
        else
        {
-               __pFindWordNext->SetEnabled(true);
+               if(__pFindWordNext)
+                       __pFindWordNext->SetEnabled(true);
        }
 
        String countStr = L"";

diff --git a/src/IntSettingForm.cpp b/src/IntSettingForm.cpp
index 41aaba5..9624508 100644 (file)
--- a/src/IntSettingForm.cpp
+++ b/src/IntSettingForm.cpp
@@ -570,6 +570,7 @@ SettingForm::CreateGroupItem(int groupIndex, int itemWidth)
 
        case 4:
                text = L" ";
+               __pList->SetItemEnabled(groupIndex,-1,false);
                break;
 
        default:

diff --git a/src/IntSharePopup.cpp b/src/IntSharePopup.cpp
index c2a87e4..b6cfe70 100644 (file)
--- a/src/IntSharePopup.cpp
+++ b/src/IntSharePopup.cpp
@@ -376,8 +376,9 @@ SharePopup::GetItemCount(void)
        {
                AppControl * pControl = dynamic_cast<AppControl*>(__pAppControlList->GetAt(pos));
                AppLog("pControl->GetAppName() %ls",pControl->GetAppName().GetPointer());
-               if(pControl->GetAppName().Equals(L"Messages",false) == true || pControl->GetAppName().Equals(L"Email",false) == true )
+               if( (pControl->GetAppName().Equals(L"Messages",false) == true && pControl->GetAppId().Equals(L"8r4r5ddzzn.Messages",false) == true)  || (pControl->GetAppName().Equals(L"Email",false) == true && pControl->GetAppId().Equals(L"vxqbrefica.Email",false) == true) )
                {
+                       AppLog("Removed pControl->GetAppName %ls pControl->GetAppId() %ls",pControl->GetAppName().GetPointer(),pControl->GetAppId().GetPointer());
                        __pAppControlList->RemoveAt(pos,true);
                        pos--;
                        count --;