//
// Copyright (c) 2012 Samsung Electronics Co., Ltd.
//
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Flora License, Version 1.1 (the License);
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
: __pList(null)
, __pListIconImage(null)
, __pListDeleteImage(null)
+,__pConfirmationPopup(null)
{
+ __startPosition.x = -1;
+ __startPosition.y = -1;
+ __fontSize = 44;
}
MultipleWindowForm::~MultipleWindowForm(void)
FooterItem closeButton;
FooterItem newButton;
+ __fontSize = CommonUtil::GetFontSize();
SceneManager* pSceneManager = SceneManager::GetInstance();
if (pSceneManager == null)
{
__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;
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)
{
case IDA_BUTTON_CLOSEALL:
{
- __pConfirmationPopup = new(std::nothrow) ConfirmationPopup();
- __pConfirmationPopup->Initialize();
- __pConfirmationPopup->RemoveActionListener(*this);
- __pConfirmationPopup->AddActionListener(*this);
- __pConfirmationPopup->setMessage(closeWarning);
- __pConfirmationPopup->Show();
+ if(__pConfirmationPopup)
+ {
+ delete __pConfirmationPopup;
+ __pConfirmationPopup = null;
+ }
+ if (!__pConfirmationPopup)
+ {
+ __pConfirmationPopup = new(std::nothrow) ConfirmationPopup();
+ __pConfirmationPopup->Initialize();
+ __pConfirmationPopup->RemoveActionListener(*this);
+ __pConfirmationPopup->AddActionListener(*this);
+ __pConfirmationPopup->setMessage(closeWarning);
+ __pConfirmationPopup->Show();
+ }
}
break;
case IDA_CONFIRMATION_NO:
{
__pConfirmationPopup->SetShowState(false);
__pConfirmationPopup->Show();
+
+ delete __pConfirmationPopup;
+ __pConfirmationPopup = null;
+
}
break;
case IDA_CONFIRMATION_YES:
SceneRegister::DestroyAndUnRegisterScene(pWindowInfo->sceneID);
}
pAllWindowList->RemoveAll(true);
- WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewScene();
+ WindowInfo* pNewWindowInfo = MultipleWindowPresentationModel::GetInstance()->CreateNewMainViewSceneN();
if (pNewWindowInfo == null)
{
}
__pConfirmationPopup->SetShowState(false);
__pConfirmationPopup->Show();
+
+ delete __pConfirmationPopup;
+ __pConfirmationPopup = null;
+
}
break;
default:
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();
- r = pItem->Construct(Dimension(itemWidth, 128), style);
+ r = pItem->Construct(Dimension(itemWidth, 128 + (__fontSize - 44)), style);
if (IsFailed(r))
{
return NULL;
__pListIconImage = pAppResource->GetBitmapN(L"I01_icon_default_favicon.png");
}
- AppLog("deleteimg %d %d",__pListDeleteImage->GetWidth(),__pListDeleteImage->GetHeight());
- listImageRect.SetBounds(screenBounds.x + 16, screenBounds.y + 28,width, 72);
- pagetTitleRect.SetBounds(listImageRect.x + width + 16,10, screenBounds.width - 2 * width - 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, 72 + (__fontSize - 44));
pageURLRect.SetBounds(pagetTitleRect.x, pagetTitleRect.y + pagetTitleRect.height, screenBounds.width - 2 * width - 120, 48);
- deleteImageRect.SetBounds(screenBounds.width - __pListDeleteImage->GetWidth() - 24, (128 - __pListDeleteImage->GetHeight() - 8)/2, __pListDeleteImage->GetWidth() + 8, __pListDeleteImage->GetHeight() + 8);
+ if(__pListDeleteImage != null)
+ {
+ 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)