HW Key Changes. Removal of unsupported and deprecated API's. NABI issue fix

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

diff --git a/src/IntMultipleWindowForm.cpp b/src/IntMultipleWindowForm.cpp
index 920365c..5d5adf2 100644 (file)
--- a/src/IntMultipleWindowForm.cpp
+++ b/src/IntMultipleWindowForm.cpp
@@ -46,6 +46,9 @@ MultipleWindowForm::MultipleWindowForm(void)
 , __pListDeleteImage(null)
 ,__pConfirmationPopup(null)
 {
+       __startPosition.x = -1;
+       __startPosition.y = -1;
+       __fontSize = 44;
 }
 
 MultipleWindowForm::~MultipleWindowForm(void)
@@ -85,6 +88,7 @@ MultipleWindowForm::OnInitializing(void)
        FooterItem closeButton;
        FooterItem newButton;
 
+       __fontSize = CommonUtil::GetFontSize();
        SceneManager* pSceneManager = SceneManager::GetInstance();
 
        if (pSceneManager == null)
@@ -121,15 +125,16 @@ MultipleWindowForm::OnInitializing(void)
        {
                __pList->SetItemProvider(*this);
                __pList->AddListViewItemEventListener(*this);
+
        }
 
        AddOrientationEventListener(*this);
 //     r = pFooter->SetStyle(FOOTER_STYLE_BUTTON_TEXT);
        r = closeButton.Construct(IDA_BUTTON_CLOSEALL);
-       r = closeButton.SetText(CommonUtil::GetString(L"IDS_BR_CLOSE_ALL"));
+       r = closeButton.SetText(CommonUtil::GetString(L"IDS_BR_OPT_CLOSE_ALL"));
        r = pFooter->AddItem(closeButton);
        r = newButton.Construct(IDA_BUTTON_NEW);
-       r = newButton.SetText(CommonUtil::GetString(L"IDS_BR_SK1_NEW_WINDOW"));
+       r = newButton.SetText(CommonUtil::GetString(L"IDS_BR_OPT_NEW_WINDOW"));
        r = pFooter->AddItem(newButton);
 
        return r;
@@ -194,13 +199,13 @@ MultipleWindowForm::OnActionPerformed(const Control& source, int actionId)
                return;
        }
 
-       String closeWarning = CommonUtil::GetString(L"IDS_BR_CLOSE_ALL_WINDOWS_Q");
+       String closeWarning = CommonUtil::GetString(L"IDS_BR_POP_CLOSE_ALL_OPENED_WINDOWS_AND_GO_TO_THE_HOMEPAGE");
 
        switch (actionId)
        {
        case IDA_BUTTON_NEW:
        {
-               WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewScene();
+               WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewSceneN();
 
                if (pNewWindowInfo == null)
                {
@@ -294,7 +299,7 @@ MultipleWindowForm::OnActionPerformed(const Control& source, int actionId)
                        SceneRegister::DestroyAndUnRegisterScene(pWindowInfo->sceneID);
                }
                pAllWindowList->RemoveAll(true);
-               WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewScene();
+               WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewSceneN();
 
                if (pNewWindowInfo == null)
                {
@@ -533,7 +538,7 @@ MultipleWindowForm::CreateItem(int index, int itemWidth)
        }
 
        Rectangle screenBounds = GetBounds();
-       r = pItem->Construct(Dimension(itemWidth, 128), style);
+       r = pItem->Construct(Dimension(itemWidth, 128 + (__fontSize - 44)), style);
        if (IsFailed(r))
        {
                return NULL;
@@ -563,18 +568,18 @@ MultipleWindowForm::CreateItem(int index, int itemWidth)
        }
 
 
-       listImageRect.SetBounds(screenBounds.x + 16, screenBounds.y + 28,width, 72);
-       pagetTitleRect.SetBounds(listImageRect.x + width + 16,10, screenBounds.width - 2 * width - 24 - 64, 60);
+       listImageRect.SetBounds(screenBounds.x + 16, screenBounds.y + 28 + (__fontSize - 44)/2,width, 72  );
+       pagetTitleRect.SetBounds(listImageRect.x + width + 16,10, screenBounds.width - 2 * width - 24 - 64, 60 + (__fontSize - 44));
        pageURLRect.SetBounds(pagetTitleRect.x, pagetTitleRect.y + pagetTitleRect.height, screenBounds.width - 2 * width - 120, 48);
        if(__pListDeleteImage != null)
        {
-               deleteImageRect.SetBounds(screenBounds.width - __pListDeleteImage->GetWidth() - 24, (128 - __pListDeleteImage->GetHeight() - 8)/2, __pListDeleteImage->GetWidth() + 8, __pListDeleteImage->GetHeight() + 8);
+               deleteImageRect.SetBounds(screenBounds.width - __pListDeleteImage->GetWidth() - 24, (128 + (__fontSize - 44) - __pListDeleteImage->GetHeight() - 8)/2, __pListDeleteImage->GetWidth() + 8, __pListDeleteImage->GetHeight() + 8);
        }
        pItem->AddElement(listImageRect, IDA_FORMAT_BITMAP, *__pListIconImage, null, null);
 
        if (pageTitle.CompareTo(L"") != 0)
        {
-               pItem->AddElement(pagetTitleRect, IDA_FORMAT_TITLE_STRING, pageTitle, 44, CUSTOM_COLOR_TRANSPARENT, CUSTOM_COLOR_TRANSPARENT, CUSTOM_COLOR_TRANSPARENT, true);
+               pItem->AddElement(pagetTitleRect, IDA_FORMAT_TITLE_STRING, pageTitle, __fontSize, CUSTOM_COLOR_TRANSPARENT, CUSTOM_COLOR_TRANSPARENT, CUSTOM_COLOR_TRANSPARENT, true);
        }
 
        if (pageURL.CompareTo(L"") != 0)