From b0d0b0aa0aa7edab6fa4422da8e62223792176f1 Mon Sep 17 00:00:00 2001 From: Manoj Das Date: Wed, 10 Apr 2013 19:06:52 +0530 Subject: [PATCH] NABI issues Change-Id: Ie5f9f18b2d42b5fd1629a84d9933a35cc89e58f4 --- .../I01_toolbar_input_field_findword.9.png | Bin 0 -> 1754 bytes res/screen-size-normal/IDL_FIND_ON_PAGE.xml | 59 ++++++++++----------- res/screen-size-normal/IDL_FORM.xml | 36 ++++++------- src/IntAddressbar.cpp | 54 ------------------- src/IntBookmarkPresentationModel.cpp | 2 +- src/IntEditBookmarkListForm.cpp | 6 ++- src/IntMainForm.cpp | 51 ++++++++++++------ src/IntMultipleWindowForm.cpp | 24 ++++++--- src/IntSettingForm.cpp | 59 ++++++++++++--------- 9 files changed, 138 insertions(+), 153 deletions(-) create mode 100644 res/screen-density-xhigh/I01_toolbar_input_field_findword.9.png diff --git a/res/screen-density-xhigh/I01_toolbar_input_field_findword.9.png b/res/screen-density-xhigh/I01_toolbar_input_field_findword.9.png new file mode 100644 index 0000000000000000000000000000000000000000..a9b2e740f4ccc3bf86ae68a40c21bb1849a0c81f GIT binary patch literal 1754 zcmV<01||84P)xNkM%O1s_Zp9z?;23W}(RS5p&LAt$TlcPU+09yR$p)oSm=- zhI`%VuCDK!>guZMo+&8s=Rf&hEw1SPJ3Bj*o0}WCzrUBKrzd%ReKl7s7L(78<%wISvG{av1)pJi`vPv++4WN>g$>gwvGzP?_Hi;JbOuuzJMip<6T z^BebQLtFaL7a7PxCb9!f+Qr3%JU%`eOF20?k%55$sjRG&l9CdsuCA7rmKN#i>XMLDzP-H}z}Ac3bjs0|KJ-NfvXF^v#$YUDF*a>|OPCULdwVM# z9UW3yS}N`B?J_wzDLXqm=4k`^iVF&P^j&;^~)E$7Z3M+yLZOGQP6^z`(|#>R#*eO<|% ztRtKE8I!Tm0bS4u-54WhPXF%iPVga^d{a}CQHZIK3xeXwMhA33Cv-zcbVcWX>bo#! zrc`Zht@QWzn6An_bVOHlM0d~0Iz2r#%kc5>v00|a$H&e5|7pd_6qr}- z(G4BZ6`j!?3}EquFa~3Qm6a8#si~3q`FXRtWMdWciX@ebj_8Wc=ne+3c;e&{ys)q! zjg5`6zP@fuI0z(J$wFsz2Lo8ZlvS%j;P&>mG&eV!|1#ITwgRu@qq`ML*2p5-B_eKU zXppU~tw58crk*)LCi~NH7;zsCgT`O6WrF;RyjC0Ftwj_2M=01 zuz|6ytu6CJnq+chWW=NZVe(7K9wHdQ3TCjU<*TqJ63FiEZj&zs%|hJj3sx|LJ*|2c zjE;_unhe|z39eh)4i@zGUR|<(A(Q<;)$SJhg>(01Bv=)J*YNOgq^F&d$)ZL~1t&J5FteAJ7gGg{LV)RHU2p&wZ~`}9WRW>j zZouP5dD>Zvd~g9LwyFZj;O6G0*@bmtJ1Y0#f&!ndRz)OAuA}?-Q6VE0PPkZFTCzKI z0bNk@6sApUGaNw|)U-7Qjz zF*PhIiuqkKi-QX|`J2iZvdkasbLB&WZ;OHpII$8{z>mwz%Xy+K2idHg*qnJ(ODn0S z9$W7=XU;)}u%+1s4fr7Um${ojIA0rDBEyxJW46K@?sd zKb22oVul0dBB2yassLu6L6NR&x!q7Zc7-rq`8Y-$_QS4v zRNU3^X~@z8`C&gk{i_4{It?jc>E*P%2JOBTn`1bTP6L)qtSe0Z3M^pC+Dk)9q{dcZ zAPWq*ldO}Z&OHp4Wwj*N&f94k>Z`I47StCT(cRNmW#eNkR*Im#DvQppVkIXFN_C%C z*6W!lfPpZE9$q}9$O8LRMth)H( zlOt9Fd1BOY$i5*g7nKJk2p!NR=T?-;!t|v`b@pC=VMD)|p%2IR1jUnQ{m_>BifoZ) zB}aXu;~P<4`JQabwSKyd=>aHKATIsT)=w1*{X83Ov^{;15t>i8B_o=;PyELK0UrM$ wK>eG0Ok*rZKL%)fn;@G{G=Q>v_j$?x05MN1NmxR=_W%F@07*qoM6N<$f?@ke-~a#s literal 0 HcmV?d00001 diff --git a/res/screen-size-normal/IDL_FIND_ON_PAGE.xml b/res/screen-size-normal/IDL_FIND_ON_PAGE.xml index 41150e8..b92bb60 100644 --- a/res/screen-size-normal/IDL_FIND_ON_PAGE.xml +++ b/res/screen-size-normal/IDL_FIND_ON_PAGE.xml @@ -3,56 +3,55 @@ This XML file was automatically generated by UiBuilder - do not modify by hand. --> - - + - - + + - - + + - - - + + + diff --git a/res/screen-size-normal/IDL_FORM.xml b/res/screen-size-normal/IDL_FORM.xml index aa638d1..b7903e2 100644 --- a/res/screen-size-normal/IDL_FORM.xml +++ b/res/screen-size-normal/IDL_FORM.xml @@ -3,7 +3,7 @@ This XML file was automatically generated by UiBuilder - do not modify by hand. --> - + 720
@@ -13,38 +13,38 @@ - + - - + + + - - + - + diff --git a/src/IntAddressbar.cpp b/src/IntAddressbar.cpp index b950f90..6a9f35f 100644 --- a/src/IntAddressbar.cpp +++ b/src/IntAddressbar.cpp @@ -496,26 +496,6 @@ Addressbar::SetFaviconBitmap(const Tizen::Graphics::Bitmap& favicon) __pFavIcon = new(std::nothrow) Bitmap(); __pFavIcon->Construct(favicon,Rectangle(0,0,favicon.GetWidth(),favicon.GetHeight())); - - if (flag == true) - { - Bitmap* pButtonImage = GetLockedImageN(); - - if (pButtonImage != null) - { - // __pFaviconLabel->SetBackgroundBitmap(*pButtonImage); - // __pFaviconLabel->Invalidate(true); - delete pButtonImage; - } - } - else - { - /*if (__pFaviconLabel != null) - { - __pFaviconLabel->SetBackgroundBitmap(*__pFavIcon); - __pFaviconLabel->Invalidate(true); - }*/ - } } void Addressbar::SaveAddressbarEditText() @@ -532,40 +512,6 @@ Addressbar::UpdateFaviconBitmap(bool isPrivateOn) bool flag = false; flag = url.StartsWith(secureSiteText,0); - /*if (isPrivateOn == true) - { - __pUrlField->SetBounds(__pLabelPrivateOn->GetBounds().x + __pLabelPrivateOn->GetBounds().width,__pUrlField->GetBounds().y , __pAddressbarBg->GetBounds().width - __pLabelPrivateOn->GetBounds().width - __pRefreshBtn->GetBounds().width - __pSearchLabel->GetBounds().width,__pUrlField->GetBounds().height ); - __pLabelPrivateOn->SetShowState(true); - - } - else - { - __pUrlField->SetBounds(__pLabelPrivateOn->GetBounds().x ,__pUrlField->GetBounds().y , __pAddressbarBg->GetBounds().width - __pRefreshBtn->GetBounds().width - __pSearchLabel->GetBounds().width,__pUrlField->GetBounds().height ); - __pLabelPrivateOn->SetShowState(false); - }*/ - - - if (flag == true) - { - Bitmap* pButtonImage = GetLockedImageN(); - - if (pButtonImage != null) - { - // __pFaviconLabel->SetBackgroundBitmap(*pButtonImage); - // __pFaviconLabel->Invalidate(true); - delete pButtonImage; - } - } - else - { - /*if (__pFaviconLabel != null) - { - __pFaviconLabel->SetBackgroundBitmap(*__pFavIcon); - __pFaviconLabel->Invalidate(true); - }*/ - } - - __pAddressbarBg->Invalidate(true); } diff --git a/src/IntBookmarkPresentationModel.cpp b/src/IntBookmarkPresentationModel.cpp index 20bf177..8460bb4 100644 --- a/src/IntBookmarkPresentationModel.cpp +++ b/src/IntBookmarkPresentationModel.cpp @@ -111,7 +111,7 @@ result BookmarkPresentationModel::SaveFolder(BookmarkData& bookmark) { bookmark.SetParentId("-1"); - SaveBookmark(bookmark); + SaveTempBookmark(bookmark); /* result r = E_FAILURE; String bookmarkFolderTable(BOOKMARK_FOLDER_TABLE); diff --git a/src/IntEditBookmarkListForm.cpp b/src/IntEditBookmarkListForm.cpp index 5d60475..d40de10 100644 --- a/src/IntEditBookmarkListForm.cpp +++ b/src/IntEditBookmarkListForm.cpp @@ -264,6 +264,8 @@ EditBookmarkListForm::OnActionPerformed(const Tizen::Ui::Control& source, int ac } GetFooter()->SetItemEnabled(0,false); GetFooter()->Invalidate(true); + // removing all the element from selected list + __pSelectedList->RemoveAll(false); labelString.Append(CommonUtil::GetString(L"IDS_COM_OPT_SELECTED")); labelString.Append(L"(0)"); @@ -390,10 +392,10 @@ EditBookmarkListForm::CreateItem(int index, int itemWidth) const int x_Margin_Url = 104; const int y_Margin_Url = 70; const int height_Url = 40; - const int width_Url = GetClientAreaBounds().width - 104 - 120 - 16; + const int width_Url = GetClientAreaBounds().width - 104 - 120 - 16 - 48; const int itemHeight = 112; const int textSize = 32; - const int width_Title = GetClientAreaBounds().width - 104 - 120 - 16; + const int width_Title = GetClientAreaBounds().width - 104 - 120 - 16 - 48; pItem = new(std::nothrow) CustomItem(); if (pItem == null) diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp index f56c407..ac8f81c 100644 --- a/src/IntMainForm.cpp +++ b/src/IntMainForm.cpp @@ -53,6 +53,7 @@ using namespace Tizen::Web; using namespace Tizen::Web::Controls; static const wchar_t* IDB_SEARCH_INPUT_FIELD_BG = L"I01_toolbar_input_field.9.png"; +static const wchar_t* IDB_FINDWORD_INPUT_FIELD_BG = L"I01_toolbar_input_field_findword.9.png"; static const wchar_t* IDB_BTN_BACK = L"I01_icon_Back.png"; static const wchar_t* IDB_BTN_BACK_PRESS = L"I01_icon_Back_press.png"; static const wchar_t* IDB_CONTRLBAR_ICON_BOOKMARK = L"I01_search_list_icon_favorite.png"; @@ -840,10 +841,9 @@ MainForm::InitFindWordPanel(void) AppLogDebug("Findword panel already initialized"); if (__pFindWordBgLabel != null) { - Bitmap *pBitmap = CommonUtil::GetNinepatchedBitmapN(L"I01_search_input_field_bg.9.png", __pFindWordBgLabel->GetWidth(), __pFindWordBgLabel->GetHeight()); + Bitmap *pBitmap = CommonUtil::GetNinepatchedBitmapN(IDB_FINDWORD_INPUT_FIELD_BG, __pFindWordBgLabel->GetWidth(), __pFindWordBgLabel->GetHeight()); if (pBitmap != null) { - AppLogDebug("InitFindWordPanel: Coming here"); __pFindWordBgLabel->SetBackgroundBitmap(*pBitmap); delete pBitmap; } @@ -1193,6 +1193,13 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId) __pMenu->Invalidate(false); __pFindWordEditField->SetFocus(); + /* + if (__pWebViewer != null) + { + // releasing the set block + __pWebViewer->ReleaseBlock(); + } + */ ShowFindWordPanel(true); } break; @@ -1429,13 +1436,13 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId) return ; } AppLogDebug("ONACTION_PERFORMED:IDA_MOREBTN_CLICKED 4"); - if (__pMenu->GetItemCount() != 9) + if (__pMenu->GetItemCount() != 8) { __pMenu->InsertItemAt(1,L"Add to Bookmarks"/*CommonUtil::GetString(L"IDS_BR_OPT_SHARE")*/, IDA_ADDTOBOOKMARK_CLICKED); - __pMenu->InsertItemAt(2,L"Add to Home"/*CommonUtil::GetString(L"IDS_BR_OPT_SHARE")*/, IDA_ADD_TO_HOME_CLICKED); - __pMenu->InsertItemAt(3,CommonUtil::GetString(L"IDS_BR_OPT_SHARE"), IDA_SHARE_CLICKED); - __pMenu->InsertItemAt(4,CommonUtil::GetString(L"IDS_BR_OPT_FIND_ON_PAGE_ABB"), IDA_FINDONPAGE_CLICKED); +// __pMenu->InsertItemAt(2,L"Add to Home"/*CommonUtil::GetString(L"IDS_BR_OPT_SHARE")*/, IDA_ADD_TO_HOME_CLICKED); + __pMenu->InsertItemAt(2,CommonUtil::GetString(L"IDS_BR_OPT_SHARE"), IDA_SHARE_CLICKED); + __pMenu->InsertItemAt(3,CommonUtil::GetString(L"IDS_BR_OPT_FIND_ON_PAGE_ABB"), IDA_FINDONPAGE_CLICKED); __pMenu->SetMaxVisibleItemsCount(6); } if( GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE || GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE) @@ -1764,6 +1771,13 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId) { AppLogDebug("Enter something"); } + + if (__pWebViewer != null) + { + // releasing the set block + __pWebViewer->ReleaseBlock(); + } + } break; case IDA_SHARE_TEXT_CLICKED: @@ -3029,16 +3043,19 @@ MainForm::RelayoutControls(bool showAddressbar) { __webControlPosition.y += __pAddressbar->GetHeight(); __webControlHeight -= __pAddressbar->GetHeight(); + __pAddressbar->SetBounds(0, 0, __pAddressbar->GetWidth(), __pAddressbar->GetHeight()); } else if(__pFindWordPanel != null && __pFindWordPanel->GetShowState() == true) { __webControlPosition.y += __pFindWordPanel->GetHeight(); __webControlHeight -= __pFindWordPanel->GetHeight(); + __pFindWordPanel->SetBounds(0, 0, GetClientAreaBounds().width, __pFindWordPanel->GetHeight()); } if(__pFooterPanel != null && __pFooterPanel->GetShowState() == true) { __webControlHeight -= __pFooterPanel->GetHeight(); + __pFooterPanel->SetBounds(0, __webControlPosition.y + __webControlHeight, GetClientAreaBounds().width, __pFooterPanel->GetHeight()); } if (__pWebViewer != null && __pWebViewer->GetShowState() == true) { @@ -3046,7 +3063,9 @@ MainForm::RelayoutControls(bool showAddressbar) __pWebViewer->Invalidate(false); } if(__pMostVisitedListView != null && __pAddressbar != null && __pFooterPanel != null) + { __pMostVisitedListView->SetBounds(Tizen::Graphics::Rectangle(0,__webControlPosition.y , GetClientAreaBounds().width, __webControlHeight)); + } Invalidate(true); } @@ -3408,6 +3427,16 @@ MainForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen::Ui::Ori delete pBitmap; } + if (__pFindWordBgLabel != null) + { + Bitmap *pBitmap = CommonUtil::GetNinepatchedBitmapN(IDB_FINDWORD_INPUT_FIELD_BG, __pFindWordBgLabel->GetWidth(), __pFindWordBgLabel->GetHeight()); + if (pBitmap != null) + { + __pFindWordBgLabel->SetBackgroundBitmap(*pBitmap); + delete pBitmap; + } + } + if(__pMenu != null) __pMenu->SetShowState(false); if( GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE || GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE_REVERSE) @@ -3419,16 +3448,6 @@ MainForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen::Ui::Ori widthContextItem = WIDTH_CONTEXT_MENU_BUTTON_PORTRAIT; } - if (__pFindWordBgLabel != null) - { - // __pFindWordBgLabel->SetSize(GetClientAreaBounds().width,GetClientAreaBounds().height); - Bitmap *pBitmap = CommonUtil::GetNinepatchedBitmapN(L"I01_search_input_field_bg.9.png", __pFindWordBgLabel->GetWidth(), __pFindWordBgLabel->GetHeight()); - if (pBitmap != null) - { - __pFindWordBgLabel->SetBackgroundBitmap(*pBitmap); - delete pBitmap; - } - } if (__pFooterPanel) { AppLog("__pFooterPanel->GetShowState() is true"); diff --git a/src/IntMultipleWindowForm.cpp b/src/IntMultipleWindowForm.cpp index fdb944b..4237ede 100644 --- a/src/IntMultipleWindowForm.cpp +++ b/src/IntMultipleWindowForm.cpp @@ -44,6 +44,7 @@ MultipleWindowForm::MultipleWindowForm(void) : __pList(null) , __pListIconImage(null) , __pListDeleteImage(null) +,__pConfirmationPopup(null) { } @@ -256,19 +257,26 @@ MultipleWindowForm::OnActionPerformed(const Control& source, int actionId) case IDA_BUTTON_CLOSEALL: { - __pConfirmationPopup = new(std::nothrow) ConfirmationPopup(); - __pConfirmationPopup->Initialize(); - __pConfirmationPopup->RemoveActionListener(*this); - __pConfirmationPopup->AddActionListener(*this); - __pConfirmationPopup->setMessage(closeWarning); - __pConfirmationPopup->Show(); + 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: @@ -321,6 +329,10 @@ MultipleWindowForm::OnActionPerformed(const Control& source, int actionId) } __pConfirmationPopup->SetShowState(false); __pConfirmationPopup->Show(); + + delete __pConfirmationPopup; + __pConfirmationPopup = null; + } break; default: diff --git a/src/IntSettingForm.cpp b/src/IntSettingForm.cpp index 176f971..2926c2b 100644 --- a/src/IntSettingForm.cpp +++ b/src/IntSettingForm.cpp @@ -116,8 +116,28 @@ SettingForm::InitializeSettingValues(void) settingInfo[SETTING_FAVORITE_URL].subText = L""; settingInfo[SETTING_FAVORITE_URL].itemType = ITEM_TYPE_RADIO; - if (SettingPresentationModel::GetInstance()->GetHomepage().CompareTo(CommonUtil::GetString(L"IDS_BR_BODY_USER_HOMEPAGE")) == 0) + String homePage = SettingPresentationModel::GetInstance()->GetHomepage(); + if (homePage.CompareTo((L"IDS_BR_BODY_MOST_VISITED_SITES")) == 0) { + settingInfo[SETTING_MOST_VISITED_SITE].isSelected = true; + settingInfo[SETTING_BLANK_PAGE].isSelected = false; + settingInfo[SETTING_CURRENT_PAGE].isSelected = false; + settingInfo[SETTING_FAVORITE_URL].isSelected = false; + SettingPresentationModel::GetInstance()->SetHomepage(CommonUtil::GetString(L"IDS_BR_BODY_MOST_VISITED_SITES")); + } + else if (homePage.CompareTo((L"IDS_BR_BODY_BLANK_PAGE")) == 0) + { + settingInfo[SETTING_MOST_VISITED_SITE].isSelected = false; + settingInfo[SETTING_BLANK_PAGE].isSelected = true; + settingInfo[SETTING_CURRENT_PAGE].isSelected = false; + settingInfo[SETTING_FAVORITE_URL].isSelected = false; + SettingPresentationModel::GetInstance()->SetHomepage(CommonUtil::GetString(L"IDS_BR_BODY_BLANK_PAGE")); + } + else + { + settingInfo[SETTING_MOST_VISITED_SITE].isSelected = false; + settingInfo[SETTING_BLANK_PAGE].isSelected = false; + settingInfo[SETTING_CURRENT_PAGE].isSelected = false; settingInfo[SETTING_FAVORITE_URL].isSelected = true; } @@ -520,21 +540,6 @@ SettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) delete pItem; return null; } -/* - Bitmap* pNormalBackgroundBitmap = CommonUtil::GetNinepatchedBitmapN(IDB_LIST_GROUP_BG9,itemWidth,112); - Bitmap* pPressedBackgroundBitmap = CommonUtil::GetNinepatchedBitmapN(IDB_LIST_GROUP_BG_PRESS9,itemWidth,112); - - if (pNormalBackgroundBitmap != NULL) - { - pItem->SetBackgroundBitmap(LIST_ITEM_DRAWING_STATUS_NORMAL,pNormalBackgroundBitmap); - delete pNormalBackgroundBitmap; - } - - if (pPressedBackgroundBitmap != NULL) - { - pItem->SetBackgroundBitmap(LIST_ITEM_DRAWING_STATUS_PRESSED,pPressedBackgroundBitmap); - delete pPressedBackgroundBitmap; - }*/ pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_NORMAL,ITEM_BACKGROUND_COLOR); pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED,ITEM_BACKGROUND_COLOR_HIGHLIGHTED); @@ -544,16 +549,8 @@ SettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) } pItem->SetText(settingInfo[effectiveIndex].titleText); - - //if (pBitmap != null) - // pItem->AddElement(Rectangle(0, 0, 10, 112), IDA_LIST_LEFT_SIDE_MARGIN, *pBitmap, null); - pItem->Make(); -// if (__pList) -// { -// __pList->SetItemChecked(groupIndex, itemIndex, settingInfo[effectiveIndex].isSelected); -// AppLog("asdasda %s %d,%d-> %d",GetErrorMessage(r),groupIndex, itemIndex, settingInfo[effectiveIndex].isSelected); -// } + return pItem; } @@ -858,7 +855,7 @@ SettingForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId& cu { if (pValue->CompareTo(L"Done") == 0) { - SettingPresentationModel::GetInstance()->SetHomepage(CommonUtil::GetString(L"IDS_BR_BODY_USER_HOMEPAGE")); + // SettingPresentationModel::GetInstance()->SetHomepage(CommonUtil::GetString(L"IDS_BR_BODY_USER_HOMEPAGE")); } else if (pValue->CompareTo(L"Cancel") == 0) { @@ -869,6 +866,7 @@ SettingForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId& cu settingInfo[SETTING_BLANK_PAGE].isSelected = false; settingInfo[SETTING_CURRENT_PAGE].isSelected = false; settingInfo[SETTING_FAVORITE_URL].isSelected = false; + SettingPresentationModel::GetInstance()->SetHomepage(CommonUtil::GetString(L"IDS_BR_BODY_MOST_VISITED_SITES")); } else if (homePage.CompareTo((L"IDS_BR_BODY_BLANK_PAGE")) == 0) @@ -877,7 +875,16 @@ SettingForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId& cu settingInfo[SETTING_BLANK_PAGE].isSelected = true; settingInfo[SETTING_CURRENT_PAGE].isSelected = false; settingInfo[SETTING_FAVORITE_URL].isSelected = false; + SettingPresentationModel::GetInstance()->SetHomepage(CommonUtil::GetString(L"IDS_BR_BODY_BLANK_PAGE")); + } + else + { + settingInfo[SETTING_MOST_VISITED_SITE].isSelected = false; + settingInfo[SETTING_BLANK_PAGE].isSelected = false; + settingInfo[SETTING_CURRENT_PAGE].isSelected = false; + settingInfo[SETTING_FAVORITE_URL].isSelected = true; } + } } } -- 2.7.4