Fixed Nabi Issues

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

diff --git a/res/eng-GB.xml b/res/eng-GB.xml
index 6063f94..2a61b45 100644 (file)
--- a/res/eng-GB.xml
+++ b/res/eng-GB.xml
@@ -97,7 +97,6 @@
     <text id="IDS_COM_BODY_TUE">Tue</text>
     <text id="IDS_COM_BODY_MON">Mon</text>
     <text id="IDS_BR_HEADER_MULTI_WINDOW">Multi window</text>
-    <text id="IDS_BR_BODY_ABOUT_C_BLANK">about: blank</text>
     <text id="IDS_BR_POP_ALREADY_EXISTS">Already exists</text>
     <text id="IDS_BR_BODY_COPY_URL">Copy URL</text>
     <text id="IDS_BR_BODY_REMEMBER_PREFERENCE">Remember preference</text>

diff --git a/res/eng-US.xml b/res/eng-US.xml
index cc6fd34..94b509a 100644 (file)
--- a/res/eng-US.xml
+++ b/res/eng-US.xml
@@ -97,7 +97,6 @@
     <text id="IDS_COM_BODY_TUE">Tue</text>
     <text id="IDS_COM_BODY_MON">Mon</text>
     <text id="IDS_BR_HEADER_MULTI_WINDOW">Multi window</text>
-    <text id="IDS_BR_BODY_ABOUT_C_BLANK">about: blank</text>
     <text id="IDS_BR_POP_ALREADY_EXISTS">Already exists</text>
     <text id="IDS_BR_BODY_COPY_URL">Copy Web address</text>
     <text id="IDS_BR_BODY_REMEMBER_PREFERENCE">Remember preference</text>

diff --git a/src/IntAddBookmarkForm.cpp b/src/IntAddBookmarkForm.cpp
index cb8a31e..bb71a70 100644 (file)
--- a/src/IntAddBookmarkForm.cpp
+++ b/src/IntAddBookmarkForm.cpp
@@ -891,7 +891,7 @@ AddBookmarkForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId
                                return;
                        }
 
-                       if(pWindowInfo->pageTitle.CompareTo(CommonUtil::GetString(L"IDS_BR_BODY_ABOUT_C_BLANK")) != 0)
+                       if(pWindowInfo->pageTitle.CompareTo(CommonUtil::GetString(L"IDS_BR_BODY_BLANK_PAGE")) != 0)
                                pageTitle = pWindowInfo->pageTitle;
 
                        if(pWindowInfo->pageUrl.IsEmpty() == false)

diff --git a/src/IntAddressbar.cpp b/src/IntAddressbar.cpp
index 9cd26cf..d5234ed 100644 (file)
--- a/src/IntAddressbar.cpp
+++ b/src/IntAddressbar.cpp
@@ -197,7 +197,7 @@ Addressbar::Initialize(const Rectangle& rect)
        }
        else if (SettingPresentationModel::GetInstance()->GetHomepage().CompareTo((L"IDS_BR_BODY_BLANK_PAGE")) == 0)
        {
-               __pAddressbarUrlField->SetGuideText(CommonUtil::GetString(L"IDS_BR_BODY_ABOUT_C_BLANK"));
+               __pAddressbarUrlField->SetGuideText(CommonUtil::GetString(L"IDS_BR_BODY_BLANK_PAGE"));
        }
        else
        {
@@ -301,7 +301,7 @@ Addressbar::ResetGuideText(void)
        }
        else if (SettingPresentationModel::GetInstance()->GetHomepage().CompareTo((L"IDS_BR_BODY_BLANK_PAGE")) == 0)
        {
-               __pAddressbarUrlField->SetGuideText(CommonUtil::GetString(L"IDS_BR_BODY_ABOUT_C_BLANK"));
+               __pAddressbarUrlField->SetGuideText(CommonUtil::GetString(L"IDS_BR_BODY_BLANK_PAGE"));
        }
        else
        {

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 049663c..88e4eee 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -653,7 +653,7 @@ MainForm::InitFooter(void)
        }
        else if (SettingPresentationModel::GetInstance()->GetHomepage().CompareTo((L"IDS_BR_BODY_BLANK_PAGE")) == 0)
        {
-               __pFooterUrlField->SetGuideText(CommonUtil::GetString(L"IDS_BR_BODY_ABOUT_C_BLANK"));
+               __pFooterUrlField->SetGuideText(CommonUtil::GetString(L"IDS_BR_BODY_BLANK_PAGE"));
        }
        else
        {
@@ -1179,7 +1179,7 @@ MainForm::CreateItem (int index, int itemWidth)
        if (pageURL.GetLength() == 0)
        {
                String nourl;
-               pAppResource->GetString(L"IDS_BR_BODY_ABOUT_C_BLANK", nourl);
+               pAppResource->GetString(L"IDS_BR_BODY_BLANK_PAGE", nourl);
                pageURL = L"<"+ nourl +">";
 
        }
@@ -2813,7 +2813,7 @@ MainForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
        }
        else if(__pWindowInfo != null)
        {
-               if(__pWindowInfo->pageUrl.GetLength() > 0 &&previousSceneId != IDSCN_BRIGHTNESS && previousSceneId != IDSCN_HISTORY_LIST && previousSceneId != IDSCN_MULTIPLE_WINDOW && previousSceneId != IDSCN_MULTIPLE_WINDOW_GRID && previousSceneId != IDSCN_BOOKMARK_VIEW && previousSceneId != IDSCN_SETTINGS && previousSceneId != IDSCN_MAIN_VIEW)
+               if(__pWindowInfo->pageUrl.GetLength() > 0 &&previousSceneId != IDSCN_BRIGHTNESS && previousSceneId != IDSCN_HISTORY_LIST && previousSceneId != IDSCN_MULTIPLE_WINDOW && previousSceneId != IDSCN_MULTIPLE_WINDOW_GRID && previousSceneId != IDSCN_BOOKMARK_VIEW && previousSceneId != IDSCN_SETTINGS && previousSceneId.Contains(IDSCN_MAIN_VIEW) == false)
                {
                        LoadUrl(__pWindowInfo->pageUrl);
                }

diff --git a/src/IntMultipleWindowForm.cpp b/src/IntMultipleWindowForm.cpp
index 6805a4c..5a932e7 100644 (file)
--- a/src/IntMultipleWindowForm.cpp
+++ b/src/IntMultipleWindowForm.cpp
@@ -275,7 +275,7 @@ MultipleWindowForm::OnActionPerformed(const Control& source, int actionId)
                        __pConfirmationPopup->RemoveActionListener(*this);
                        __pConfirmationPopup->AddActionListener(*this);
                        __pConfirmationPopup->setMessage(closeWarning);
-                       __pConfirmationPopup->Show();
+//                     __pConfirmationPopup->Show();
                }
        }
        break;
@@ -532,14 +532,14 @@ MultipleWindowForm::CreateItem(int index, int itemWidth)
        if (pageURL.GetLength() == 0)
        {
                String nourl;
-               pAppResource->GetString(L"IDS_BR_BODY_ABOUT_C_BLANK", nourl);
+               pAppResource->GetString(L"IDS_BR_BODY_BLANK_PAGE", nourl);
                pageURL = L"<"+ nourl +">";
        }
 
        if (pageTitle.GetLength() == 0)
        {
                String nourl;
-               pAppResource->GetString(L"IDS_BR_BODY_ABOUT_C_BLANK", pageTitle);
+               pAppResource->GetString(L"IDS_BR_BODY_BLANK_PAGE", pageTitle);
        }
 
        Rectangle screenBounds = GetBounds();

diff --git a/src/IntMultipleWindowPresentationModel.cpp b/src/IntMultipleWindowPresentationModel.cpp
index a225d52..a6cc5c5 100644 (file)
--- a/src/IntMultipleWindowPresentationModel.cpp
+++ b/src/IntMultipleWindowPresentationModel.cpp
@@ -219,7 +219,7 @@ MultipleWindowPresentationModel::CreateNewMainViewSceneN(const String& Url, bool
        {
                return null;
        }
-       pWindowInfo->pageTitle = CommonUtil::GetString(L"IDS_BR_BODY_ABOUT_C_BLANK");
+       pWindowInfo->pageTitle = CommonUtil::GetString(L"IDS_BR_BODY_BLANK_PAGE");
        pWindowInfo->pageUrl = Url;
        pWindowInfo->isAppcontrolTriggered = isAppControlTriggered;
        MultipleWindowPresentationModel::GetInstance()->AddWindoInfo(pWindowInfo);

diff --git a/src/IntSettingForm.cpp b/src/IntSettingForm.cpp
index 91d2d82..1fa28a1 100644 (file)
--- a/src/IntSettingForm.cpp
+++ b/src/IntSettingForm.cpp
@@ -518,7 +518,7 @@ SettingForm::CreateGroupItem(int groupIndex, int itemWidth)
        {
                return null;
        }
-       r = pItem->Construct(Dimension(itemWidth, 46));
+       r = pItem->Construct(Dimension(itemWidth, 76));
        if (IsFailed(r))
        {
                delete pItem;