Fixed Nabi Issues

[apps/osp/Internet.git] / src / IntMultipleWindowForm.cpp

diff --git a/src/IntMultipleWindowForm.cpp b/src/IntMultipleWindowForm.cpp
index 6805a4c..b95ae84 100644 (file)
--- a/src/IntMultipleWindowForm.cpp
+++ b/src/IntMultipleWindowForm.cpp
@@ -29,6 +29,7 @@
 #include "IntMultipleWindowForm.h"
 #include "IntMultipleWindowPresentationModel.h"
 #include "IntSceneRegister.h"
+#include "IntSettingPresentationModel.h"
 
 using namespace Tizen::App;
 using namespace Tizen::Base;
@@ -103,7 +104,7 @@ MultipleWindowForm::OnInitializing(void)
                return E_FAILURE;
        }
 
-       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
+//     SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
 
        r = pSceneManager->AddSceneEventListener(IDSCN_MULTIPLE_WINDOW, *this);
 
@@ -304,12 +305,25 @@ MultipleWindowForm::OnActionPerformed(const Control& source, int actionId)
                        SceneRegister::DestroyAndUnRegisterScene(pWindowInfo->sceneID);
                }
                pAllWindowList->RemoveAll(true);
-               WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewSceneN();
+               String homePage = SettingPresentationModel::GetInstance()->GetHomepage();
+               if (homePage == (L"IDS_BR_BODY_MOST_VISITED_SITES") || homePage == (L"IDS_BR_BODY_BLANK_PAGE"))
+               {
+                       homePage = L"";
+               }
+               else if (homePage == CommonUtil::GetString(L"IDS_BR_BODY_USER_HOMEPAGE"))
+               {
+                       AppLog("InternetApp::OnAppInitialized homaepage = userhomepage");
+                       homePage = SettingPresentationModel::GetInstance()->GetFavoriteUrl();
+                       AppLog("InternetApp::OnAppInitialized fav URL = %ls ",homePage.GetPointer());
+               }
+
+               WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewSceneN(homePage);
 
                if (pNewWindowInfo == null)
                {
                        return;
                }
+               pNewWindowInfo->isAppcontrolTriggered = true;
                result r = E_SUCCESS;
                SceneManager* pSceneManager = SceneManager::GetInstance();
                if (pSceneManager == NULL)
@@ -532,14 +546,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();