From 523b59b406caaa6f994cb311d7d1af19d7389a7d Mon Sep 17 00:00:00 2001
From: Vinay Sachdeva <v.sachdeva@samsung.com>
Date: Thu, 18 Apr 2013 20:20:30 +0530
Subject: [PATCH] Fixed Nabi Issues

Change-Id: Ia3390765279a3f52533133d06254529bdeb1df34
Signed-off-by: Vinay Sachdeva <v.sachdeva@samsung.com>
---
 inc/IntAddressbar.h                 |  9 +++++-
 inc/IntMainForm.h                   |  4 +--
 res/screen-size-normal/IDL_FORM.xml | 20 ++++++------
 src/IntAddressbar.cpp               | 27 ++++++++++++++++
 src/IntBookmarkListForm.cpp         | 13 +++-----
 src/IntMainForm.cpp                 | 62 ++++++++++++++++++++-----------------
 src/IntSettingForm.cpp              | 10 +++---
 7 files changed, 91 insertions(+), 54 deletions(-)

diff --git a/inc/IntAddressbar.h b/inc/IntAddressbar.h
index 5852642..ea3b082 100644
--- a/inc/IntAddressbar.h
+++ b/inc/IntAddressbar.h
@@ -66,7 +66,7 @@ class Addressbar
 	void OnKeypadBoundsChanged(Tizen::Ui::Control &source);
 
 	void OnFocusGained(const Tizen::Ui::Control& source);
-	void OnFocusLost(const Tizen::Ui::Control& source){}
+	void OnFocusLost(const Tizen::Ui::Control& source);
 
 	virtual void OnTextValueChanged(const Tizen::Ui::Control& source);
 	virtual void OnTextValueChangeCanceled(const Tizen::Ui::Control& source){}
@@ -118,6 +118,13 @@ class Addressbar
 	void SetUrl(const Tizen::Base::String& url);
 
 	/**
+	 * @brief	 ReSets the Guide Text for the Addressbar control.
+	 *
+	 */
+	void ResetGuideText(void);
+
+
+	/**
 	 * @brief	 Sets the event listener for the Addressbar control.
 	 *
 	 */
diff --git a/inc/IntMainForm.h b/inc/IntMainForm.h
index ba8a22c..9624eff 100644
--- a/inc/IntMainForm.h
+++ b/inc/IntMainForm.h
@@ -178,7 +178,7 @@ public:
 	void SetJavascriptEnabled(void);
 
 	void OnFocusGained(const Tizen::Ui::Control& source);
-	void OnFocusLost(const Tizen::Ui::Control& source){}
+	void OnFocusLost(const Tizen::Ui::Control& source);
 
 
 	// IListViewItemEventListener
@@ -317,7 +317,7 @@ private:
 	Tizen::Ui::Controls::EditField*	__pFindWordEditField;
 	Tizen::Ui::Controls::Button*	__pFindWordNext;
 	Tizen::Ui::Controls::Button*	__pFindWordPrev;
-	Tizen::Ui::Controls::Panel*	__pFindWordPanel;
+//	Tizen::Ui::Controls::Panel*	__pFindWordPanel;
 	Tizen::Ui::Controls::Panel* __pFooterPanel;
 	Tizen::Web::Controls::HitElementResult* __pHitElementResult;
 	Tizen::Ui::Controls::ContextMenu* __pImageMenu;
diff --git a/res/screen-size-normal/IDL_FORM.xml b/res/screen-size-normal/IDL_FORM.xml
index 9da6c6b..5a8f443 100644
--- a/res/screen-size-normal/IDL_FORM.xml
+++ b/res/screen-size-normal/IDL_FORM.xml
@@ -4,7 +4,7 @@
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
 
-<Scene Bversion="2.0.0.201304110859" Dversion="20120315">
+<Scene Bversion="2.0.0.201304161803" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_FORM">
         <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
@@ -18,7 +18,7 @@
     </Panel>
     <Panel id="IDC_FOOTER_PANEL" parent="IDL_FORM">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout bottomRelation="IDL_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="1108.0"/>
+        <layout bottomRelation="IDL_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="1168.0"/>
         <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="105.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1200.0" x="0" y="555.0"/>
     </Panel>
     <Label id="IDC_CHECK_LABEL" parent="IDC_FOOTER_PANEL">
@@ -51,15 +51,10 @@
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="63.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63.0" x="26.0" y="25.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_FOOTER_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="10.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="112.0" x="0.0" y="10.0"/>
     </Button>
-    <Button id="IDC_REFRESH_BUTTON" parent="IDC_FOOTER_PANEL">
-        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="I01_search_icon_refresh.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="43.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="42.0" x="454.0" y="40.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="55.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="64.0" x="972.0" y="35.0"/>
-    </Button>
     <EditField id="IDC_URL_EDIT_FIELD" parent="IDC_FOOTER_PANEL">
         <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="false" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="100" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="EditBackground.png" normalColor="" normalColorOpacity="100" normalTextColor="#4E4945" pressedBGBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="32.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="71.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="241.0" x="212.0" y="25.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="78.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_MULTIWINDOW_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_REFRESH_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="748.0" x="224.0" y="19.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="78.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_MULTIWINDOW_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_PAGEBACK_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="832.0" x="224.0" y="19.0"/>
     </EditField>
     <Label id="IDC_PROGRESS_BAR_LABEL" parent="IDC_FOOTER_PANEL">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
@@ -69,12 +64,17 @@
     <Button id="IDC_STOP_BUTTON" parent="IDC_FOOTER_PANEL">
         <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="I01_field_btn_Clear.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="43.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="42.0" x="454.0" y="40.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="55.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="64.0" x="972.0" y="35.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="55.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_URL_EDIT_FIELD" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="64.0" x="982.0" y="35.0"/>
     </Button>
     <Button id="IDC_CLEAR_BUTTON" parent="IDC_FOOTER_PANEL">
         <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="I01_field_btn_Clear.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="43.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="42.0" x="454.0" y="40.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="55.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="64.0" x="972.0" y="35.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="55.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_URL_EDIT_FIELD" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="64.0" x="982.0" y="35.0"/>
+    </Button>
+    <Button id="IDC_REFRESH_BUTTON" parent="IDC_FOOTER_PANEL">
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="I01_search_icon_refresh.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="IDC_STOP_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="43.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_STOP_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_STOP_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_STOP_BUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="42.0" x="454.0" y="40.0"/>
+        <layout bottomRelation="IDC_STOP_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="55.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_STOP_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_STOP_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_STOP_BUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="54.0" x="982.0" y="35.0"/>
     </Button>
     <Panel id="IDC_FIND_ON_PAGE_PANEL" parent="IDL_FORM">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
diff --git a/src/IntAddressbar.cpp b/src/IntAddressbar.cpp
index d2836da..2ab568e 100644
--- a/src/IntAddressbar.cpp
+++ b/src/IntAddressbar.cpp
@@ -305,6 +305,27 @@ Addressbar::UpdateProgressBitmap(void)
 }
 
 void
+Addressbar::ResetGuideText(void)
+{
+	AppLog("Addressbar::ResetGuideText called");
+
+	if (SettingPresentationModel::GetInstance()->GetHomepage().CompareTo((L"IDS_BR_BODY_MOST_VISITED_SITES")) == 0)
+	{
+		__pAddressbarUrlField->SetGuideText(CommonUtil::GetString(L"IDS_BR_BODY_SEARCH_OR_ENTER_URL"));
+	}
+	else if (SettingPresentationModel::GetInstance()->GetHomepage().CompareTo((L"IDS_BR_BODY_BLANK_PAGE")) == 0)
+	{
+		__pAddressbarUrlField->SetGuideText(CommonUtil::GetString(L"IDS_BR_BODY_ABOUT_C_BLANK"));
+	}
+	else
+	{
+		//__pUrlField->SetText(SettingPresentationModel::GetInstance()->GetFavoriteURL());
+		__pAddressbarUrlField->SetGuideText(CommonUtil::GetString(L"IDS_BR_BODY_SEARCH_OR_ENTER_URL"));
+	}
+	__pAddressbarUrlField->Invalidate(true);
+}
+
+void
 Addressbar::SetUrl(const String& url)
 {
 	__displayUrl = url;
@@ -814,6 +835,12 @@ Addressbar::OnFocusGained(const Control& source)
 		__pListener->OnAddressBarKeypadOpened(*this);
 	}
 }
+void
+Addressbar::OnFocusLost(const Tizen::Ui::Control& source)
+{
+	AppLog("Addressbar::OnFocusLost");
+}
+
 
 void
 Addressbar::OnTextValueChanged(const Control& source)
diff --git a/src/IntBookmarkListForm.cpp b/src/IntBookmarkListForm.cpp
index 8015f81..fd90869 100644
--- a/src/IntBookmarkListForm.cpp
+++ b/src/IntBookmarkListForm.cpp
@@ -583,6 +583,7 @@ BookmarkListForm::CreateItem(int index, int itemWidth)
 	{
 		delete pItem;
 		pItem = null;
+		delete pImage;
 		return NULL;
 	}
 	if ( pBookMark->GetBookmarkType() == BOOKMARK_TYPE_FOLDER )
@@ -671,17 +672,13 @@ BookmarkListForm::CreateItem(int index, int itemWidth)
 			pItem->SetContextItem(__pItemContextSite);
 		}
 	}
-	if(pImage != null)
-	{
-		delete pImage;
-	}
+
+	delete pImage;
 	return pItem;
 
 	CATCH:
-	if(pImage != null)
-	{
-		delete pImage;
-	}
+
+	delete pImage;
 	delete pItem;
 	pItem = null;
 	return null;
diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 960bbb9..94f4d53 100644
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -141,7 +141,7 @@ MainForm::MainForm(void)
 	__pImageMenu = null;
 	__pMenu = null;
 	__pFindWordControl = null;
-	__pFindWordPanel = null;
+
 	__pFindWordBgLabel = null;
 	__pFindWordEditField = null;
 	__pFindWordClear = null;
@@ -495,15 +495,18 @@ MainForm::InitWebControl()
 void
 MainForm::OnFocusGained(const Control& source)
 {
-/*
- * We don't need any action here for focus.
- * The focus of Addressbar will be set after keypad is opened.(OnAddressBarKeypadOpened())
 	if(__pAddressbar != null)
 	{
 		__pFooterUrlField->SetFocusable(false);
 		__pAddressbar->SetAddressbarURLFocus();
+
 	}
-*/
+}
+
+void
+MainForm::OnFocusLost(const Control& source)
+{
+	AppLog("MainForm::OnFocusLost");
 }
 
 void
@@ -854,7 +857,7 @@ MainForm::InitFindWordPanel(void)
 	result r = E_SUCCESS;
 	Bitmap *pIconBitmap = null;
 
-	if (__pFindWordPanel != null)
+	if (__pFindWordControl != null)
 	{
 		AppLogDebug("Findword panel already initialized");
 		if (__pFindWordBgLabel != null)
@@ -869,13 +872,6 @@ MainForm::InitFindWordPanel(void)
 		return r;
 	}
 
-	__pFindWordPanel = static_cast<Panel*>(GetControl(L"IDC_FIND_ON_PAGE_PANEL"));
-	if (__pFindWordPanel == null)
-	{
-		AppLogException("There is some problem in the xml file. Please check.");
-		return E_FAILURE;
-	}
-
 	__pFindWordControl = new (std::nothrow) Panel();
 	r = __pFindWordControl->Construct(L"IDL_FIND_ON_PAGE");
 	if (IsFailed(r))
@@ -884,10 +880,10 @@ MainForm::InitFindWordPanel(void)
 		return E_FAILURE;
 	}
 	AddControl(*__pFindWordControl);
-	__pFindWordControl->SetBounds(0,0, __pFindWordPanel->GetWidth(), __pFindWordPanel->GetHeight());
+	__pFindWordControl->SetBounds(0,0, __pFindWordControl->GetWidth(), __pFindWordControl->GetHeight());
 	SetControlAlwaysOnTop(*__pFindWordControl,true);
-	__pFindWordPanel->SetShowState(false);
-	__pFindWordPanel->Invalidate(false);
+	__pFindWordControl->SetShowState(false);
+	__pFindWordControl->Invalidate(false);
 
 	__pFindWordBgLabel = static_cast<Label*>(__pFindWordControl->GetControl(L"IDC_LABEL1", true));
 	if (__pFindWordBgLabel != null)
@@ -1612,7 +1608,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 		__currentSearchStr = L"";
 		__pFindWordNext->SetEnabled(false);
 		__pFindWordPrev->SetEnabled(false);
-		__pFindWordPanel->Invalidate(true);
+		__pFindWordControl->Invalidate(true);
 	}
 	break;
 	case IDA_FINDWORD_NEXT_CLICKED:
@@ -2443,6 +2439,8 @@ MainForm::OnUrlSubmitted(Addressbar& addBar)
 	AppLog("MainForm::OnUrlSubmitted url is %ls", url.GetPointer());
 
 //	__pFooterPanel->SetShowState(true);
+	if(__pFooterUrlField)
+		__pFooterUrlField->SetCursorPosition(__pFooterUrlField->GetTextLength());
 	OnAddressCancelledClicked(*__pAddressbar);
 //	__pAddressbar->SetShowState(false);
 //	RelayoutControls(false);
@@ -2661,8 +2659,10 @@ MainForm::OnAddressCancelledClicked(const Addressbar& addBar)
 	__pFooterPanel->SetShowState(true);
 	if(__pWebViewer)
 		__pWebViewer->SetFocus();
-	else
+	else if(__pMostVisitedListView)
 		__pMostVisitedListView->SetFocus();
+	else if(__pMultiWindowButton)
+		__pMultiWindowButton->SetFocus();
 	__pFooterUrlField->SetFocusable(true);
 	__pMoreButton->SetFocus();
 
@@ -3084,7 +3084,7 @@ MainForm::ShowFindWordPanel(bool show , bool isTouchPressed)
 		__pFindWordEditField->SetText(__currentSearchStr);
 		//__pFindWordCountLabel->SetText(L"");
 		__pFindWordCountLabel->SetText(L"0/0");
-		__pFindWordPanel->SetShowState(true);
+		__pFindWordControl->SetShowState(true);
 	}
 	else
 	{
@@ -3246,7 +3246,7 @@ MainForm::FindNextWord(bool next)
 	__pFindWordPrev->Invalidate(false);
 	__pFindWordNext->Invalidate(false);
 	__pFindWordCountLabel->Invalidate(false);
-	__pFindWordPanel->Invalidate(true);
+	__pFindWordControl->Invalidate(true);
 }
 void
 MainForm::OnWebKeypadWillOpen(Tizen::Web::Controls::Web& source)
@@ -3295,10 +3295,10 @@ MainForm::OnTouchDoublePressed(const Control& source, const Point& currentPositi
 		//Header double - clicked
 		AppLog("Header double clicked");
 	}
-	if(__pFindWordPanel)
+	if(__pFindWordControl)
 	{
-		AppLog("MainForm::OnTouchPressed %d",__pFindWordPanel->GetShowState());
-		ShowFindWordPanel(__pFindWordPanel->GetShowState(), true);
+		AppLog("MainForm::OnTouchPressed %d",__pFindWordControl->GetShowState());
+		ShowFindWordPanel(__pFindWordControl->GetShowState(), true);
 	}
 
 
@@ -3432,8 +3432,8 @@ MainForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen::Ui::Ori
 {
 	AppLog("MainForm::OnOrientationChanged GetClientAreaBounds %d, %d",GetClientAreaBounds().width,GetClientAreaBounds().height);
 	int widthContextItem = 0;
-	if(__pFindWordPanel != null)
-		ShowFindWordPanel(__pFindWordPanel->GetShowState(), false);
+	if(__pFindWordControl != null)
+		ShowFindWordPanel(__pFindWordControl->GetShowState(), false);
 	if ( __pFooterLabel != null)
 	{
 		Bitmap *pBitmap = CommonUtil::GetNinepatchedBitmapN(IDB_SEARCH_INPUT_FIELD_BG, __pFooterLabel->GetWidth(), __pFooterLabel->GetHeight());
@@ -3537,11 +3537,17 @@ void
 MainForm::OnSettingsChange(int settingvalue)
 {
 	AppLogDebug("MainForm::OnSettingsChange entered");
+
+	if(settingvalue == (int)REGISTRY_SETTING_HOMEPAGE)
+	{
+		__pAddressbar->ResetGuideText();
+	}
 	if (__pWebViewer == null)
 	{
 		AppLogDebug("Webviewer is not initialized yet.");
 		return;
 	}
+
 	if (settingvalue == (int) REGISTRY_SETTING_DEFAULT_VIEW)
 	{
 		WebSetting settings = __pWebViewer->GetSetting();
@@ -3680,10 +3686,10 @@ MainForm::findDistance(int x1,int y1,int x2, int y2)
 void
 MainForm::OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
 {
-	if(__pFindWordPanel)
+	if(__pFindWordControl)
 	{
-		AppLog("MainForm::OnTouchPressed %d",__pFindWordPanel->GetShowState());
-		ShowFindWordPanel(__pFindWordPanel->GetShowState(), true);
+		AppLog("MainForm::OnTouchPressed %d",__pFindWordControl->GetShowState());
+		ShowFindWordPanel(__pFindWordControl->GetShowState(), true);
 	}
 	__isLongPressedDone = false;
 
diff --git a/src/IntSettingForm.cpp b/src/IntSettingForm.cpp
index 2926c2b..aa90d60 100644
--- a/src/IntSettingForm.cpp
+++ b/src/IntSettingForm.cpp
@@ -123,7 +123,7 @@ SettingForm::InitializeSettingValues(void)
 		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"));
+		SettingPresentationModel::GetInstance()->SetHomepage(L"IDS_BR_BODY_MOST_VISITED_SITES");
 	}
 	else if (homePage.CompareTo((L"IDS_BR_BODY_BLANK_PAGE")) == 0)
 	{
@@ -131,7 +131,7 @@ SettingForm::InitializeSettingValues(void)
 		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"));
+		SettingPresentationModel::GetInstance()->SetHomepage(L"IDS_BR_BODY_BLANK_PAGE");
 	}
 	else
 	{
@@ -363,7 +363,7 @@ SettingForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, int gr
 		if (__currentURL.CompareTo(L"") != 0)
 		{
 			AppLog("setting current page currentURL is =%ls",__currentURL.GetPointer());
-			SettingPresentationModel::GetInstance()->SetHomepage(CommonUtil::GetString(L"IDS_BR_BODY_USER_HOMEPAGE"));
+			SettingPresentationModel::GetInstance()->SetHomepage(L"IDS_BR_BODY_USER_HOMEPAGE");
 			SettingPresentationModel::GetInstance()->SetFavoriteValue(__currentURL);
 			settingInfo[SETTING_FAVORITE_URL].titleText = __currentURL;
 //			listView.RefreshList(groupIndex, effectiveIndex, LIST_REFRESH_TYPE_ITEM_MODIFY);
@@ -866,7 +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"));
+						SettingPresentationModel::GetInstance()->SetHomepage(L"IDS_BR_BODY_MOST_VISITED_SITES");
 
 					}
 					else if (homePage.CompareTo((L"IDS_BR_BODY_BLANK_PAGE")) == 0)
@@ -875,7 +875,7 @@ 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"));
+						SettingPresentationModel::GetInstance()->SetHomepage(L"IDS_BR_BODY_BLANK_PAGE");
 					}
 					else
 					{
-- 
2.7.4