MainForm UI Implementation as per new UX Document
authorVinay Sachdeva <v.sachdeva@samsung.com>
Fri, 22 Mar 2013 23:19:14 +0000 (04:49 +0530)
committerVinay Sachdeva <v.sachdeva@samsung.com>
Fri, 22 Mar 2013 23:19:14 +0000 (04:49 +0530)
Change-Id: I28bf7438b77635dc5f8d653b3c57f6fe13ea7818
Signed-off-by: Vinay Sachdeva <v.sachdeva@samsung.com>
13 files changed:
inc/IntAddressbar.h
inc/IntIAddressbarEventListener.h
inc/IntMainForm.h
res/screen-density-xhigh/I01_URL_bookmark_icon.png [new file with mode: 0644]
res/screen-density-xhigh/I01_URL_toolbar_button.png [new file with mode: 0644]
res/screen-density-xhigh/I01_toolbar_icon_back_press_web.png [new file with mode: 0644]
res/screen-density-xhigh/I01_toolbar_icon_back_web.png [new file with mode: 0644]
res/screen-density-xhigh/I01_toolbar_icon_forward_press_web.png [new file with mode: 0644]
res/screen-density-xhigh/I01_toolbar_icon_forward_web.png [new file with mode: 0644]
res/screen-size-normal/IDL_ADDRESSBAR.xml
res/screen-size-normal/IDL_FORM.xml
src/IntAddressbar.cpp
src/IntMainForm.cpp

index f23e23d..9d995ef 100644 (file)
 #include <FUi.h>
 #include "IntIAddressbarEventListener.h"
 
-enum AddressBarMode
+/*enum AddressBarMode
 {
        ADDRESSBAR_MODE_INVALID = -1,
        ADDRESSBAR_MODE_READER = 0,
        ADDRESSBAR_MODE_LOADING,
        ADDRESSBAR_MODE_LOADING_COMPLETE,
        ADDRESSBAR_MODE_EDIT,
-};
+};*/
 
 class Addressbar
 : public Tizen::Ui::Controls::Panel
@@ -74,7 +74,7 @@ class Addressbar
        /**
         * @brief        Gets the current addressbar Mode.
         */
-       AddressBarMode GetAddressbarMode(void);
+       //AddressBarMode GetAddressbarMode(void);
 
        /**
         * brief         To remove the Http from the Url editfield
@@ -121,7 +121,7 @@ class Addressbar
        /**
         * @brief        Sets the current addressbar Mode.
         */
-       void SetAddressbarMode(AddressBarMode addMode);
+       //void SetAddressbarMode(AddressBarMode addMode);
 
        /**
         * brief         Sets the backward Button enable or disable as per the input parameter isEnabled.
@@ -148,6 +148,9 @@ class Addressbar
         */
        void UpdateProgress(const int percentage);
 
+       void SetAddressbarURLFocus();
+
+       Tizen::Base::String GetAddressbarURL();
   private:
        /**
         * @brief        Updates the progressbar Value.
@@ -164,7 +167,7 @@ class Addressbar
        static const int IDA_CLEAR_URL;
 
   private:
-       AddressBarMode __currentAddMode;
+       //AddressBarMode __currentAddMode;
        Tizen::Base::String __displayUrl;
        Tizen::Base::String __editTextUrl;
 
@@ -174,21 +177,24 @@ class Addressbar
 
        Tizen::Ui::Controls::Label* __pAddressbarBg;
        Tizen::Ui::Controls::Panel* __pBgPanel;
-       Tizen::Ui::Controls::Button* __pCancelBtn;
+       //Tizen::Ui::Controls::Button* __pCancelBtn;
        Tizen::Ui::Controls::Button* __pClearBtn;
        Tizen::Graphics::Bitmap* __pFavIcon;
        Tizen::Ui::Controls::Label* __pFaviconLabel;
-       Tizen::Ui::Controls::Button* __pGoBackBtn;
-       Tizen::Ui::Controls::Button* __pGoForwardBtn;
+       //Tizen::Ui::Controls::Button* __pGoBackBtn;
+//     Tizen::Ui::Controls::Button* __pGoForwardBtn;
        Tizen::Ui::Controls::Label* __pLabelPrivateOn;
        IAddressbarEventListener* __pListener;
        Tizen::Ui::Controls::Label* __pPrivateIconLabel;
        Tizen::Ui::Controls::Label* __pProgressbarLabel;
-       Tizen::Ui::Controls::Button* __pReaderBtn;
-       Tizen::Ui::Controls::Button* __pRefreshBtn;
+//     Tizen::Ui::Controls::Button* __pReaderBtn;
+//     Tizen::Ui::Controls::Button* __pRefreshBtn;
        Tizen::Ui::Controls::Button* __pStopBtn;
        Tizen::Ui::Controls::Label* __pSearchLabel;
-       Tizen::Ui::Controls::EditField* __pUrlField;
+       Tizen::Ui::Controls::EditField* __pAddressbarUrlField;
+       Tizen::Ui::Controls::Label* __pToolBarLabel;
+       Tizen::Ui::Controls::Label* __pAddressbarURLLabel;
+       Tizen::Ui::Controls::Button* __pAddressBackBtn;
   };
 
 #endif /* _INT_ADDRESSBAR_H_ */
index 03e9178..8d2a79e 100644 (file)
@@ -42,10 +42,10 @@ public:
        virtual void OnAddressBarKeypadClosed(const Addressbar&) = 0;
        virtual void OnAddressBarKeypadOpened(const Addressbar&) = 0;
        virtual void OnAddressBarKeypadWillOpen(const Addressbar&) = 0;
-       virtual void OnAddressBarModeChanged(const Addressbar&) = 0;
+       //virtual void OnAddressBarModeChanged(const Addressbar&) = 0;
        virtual void OnAddressCancelledClicked(const Addressbar&) = 0;
-       virtual void OnBackClicked(const Addressbar&) = 0;
-       virtual void OnForwardClicked(const Addressbar&) = 0;
+       //virtual void OnBackClicked(const Addressbar&) = 0;
+       //virtual void OnForwardClicked(const Addressbar&) = 0;
        virtual void OnReaderClicked(const Addressbar&) = 0;
        virtual void OnRefreshClicked(const Addressbar&) = 0;
        virtual void OnStopClicked(Addressbar&) = 0;
index 89f6cf5..ad52e72 100644 (file)
 #include "IntMultipleWindowPresentationModel.h"
 #include "IntSharePopup.h"
 
+enum AddressBarMode
+{
+       ADDRESSBAR_MODE_INVALID = -1,
+       ADDRESSBAR_MODE_READER = 0,
+       ADDRESSBAR_MODE_LOADING,
+       ADDRESSBAR_MODE_LOADING_COMPLETE,
+       ADDRESSBAR_MODE_EDIT,
+};
+
 class MainForm
        : public Tizen::Ui::Controls::Form
        , public Tizen::Ui::Controls::IListViewItemEventListener
@@ -99,11 +108,11 @@ public:
 
        void OnAddressBarKeypadWillOpen(const Addressbar&);
 
-       void OnAddressBarModeChanged(const Addressbar&);
+       void OnAddressBarModeChanged(/*const Addressbar&*/);
 
-       void OnBackClicked(const Addressbar&);
+       void OnBackClicked(/*const Addressbar&*/);
 
-       void OnForwardClicked(const Addressbar&);
+       void OnForwardClicked(/*const Addressbar&*/);
 
        void OnReaderClicked(const Addressbar&);
 
@@ -219,6 +228,21 @@ public:
        virtual void  OnTextValueChanged (const Tizen::Ui::Control &source);
 
        void UpdateImageContent(Tizen::Base::ByteBuffer* aBuffer, Tizen::Base::String imageName);
+
+       void SetForwardButtonEnabled(bool isEnabled);
+       void SetBackButtonEnabled(bool isEnabled);
+
+       void UpdateProgress(int percentage);
+       int GetProgress(void);
+       void UpdateProgressBitmap(void);
+
+       /**
+        * @brief        Sets the current addressbar Mode.
+        */
+       void SetAddressbarMode(AddressBarMode addMode);
+
+       void SetUrl(const Tizen::Base::String& url);
+
 private:
        double findDistance(int x1,int y1,int x2, int y2);
        void FindNextWord(bool next = true);
@@ -236,6 +260,8 @@ private:
        void ShowFindWordPanel(bool show = true, bool isTouchPressed = false);
        void ShowMostVisitedSitesPanel(void);
        void StartWordSearch();
+       AddressBarMode GetAddressbarMode(void);
+       Tizen::Base::String RemoveHttpTextFromDisplayURL(void);
 
 private:
 
@@ -256,6 +282,15 @@ private:
        int     __currentWordIndex;
        bool __isLoaded;
        bool __inputEventToBeSupressed;
+
+       bool __isLoadingData;
+       bool __isLoadingCompleted;
+       int __progressPercentage;
+
+       AddressBarMode __currentAddMode;
+       Tizen::Base::String __displayUrl;
+       Tizen::Base::String __editTextUrl;
+
        Addressbar* __pAddressbar;
        Tizen::Graphics::Point __contextMenuPosition;
        Tizen::Ui::Controls::Label* __pArticleReaderLabel;
@@ -275,7 +310,7 @@ private:
        Tizen::Ui::Controls::ContextMenu* __pMenu;
        Tizen::Ui::Controls::Button* __pMoreButton;
        Tizen::Ui::Controls::Button* __pMultiWindowButton;
-       Tizen::Ui::Controls::Button* __pNewWindowButton;
+//     Tizen::Ui::Controls::Button* __pNewWindowButton;
        SharePopup*     __pPopUp;
        AddressBarMode __prevAddressBarMode;
        Tizen::Ui::Controls::Button* __pReaderCloseBtn;
@@ -292,6 +327,14 @@ private:
 
        Tizen::Ui::Controls::ListContextItem* __pItemContext;
        Tizen::Base::Collection::ArrayList* __pMostVisitedSites;
+       Tizen::Ui::Controls::EditField* __pFooterUrlField;
+       Tizen::Ui::Controls::Button* __pGoBackBtn;
+       Tizen::Ui::Controls::Button* __pGoForwardBtn;
+       Tizen::Ui::Controls::Button* __pRefreshBtn;
+       Tizen::Ui::Controls::Label* __pProgressbarLabel;
+       Tizen::Ui::Controls::Label* __pFooterLabel;
+       Tizen::Ui::Controls::Button* __pStopBtn;
+       Tizen::Ui::Controls::Button* __pClearBtn;
 };
 
 #endif  //_INT_MAIN_FORM_H_
diff --git a/res/screen-density-xhigh/I01_URL_bookmark_icon.png b/res/screen-density-xhigh/I01_URL_bookmark_icon.png
new file mode 100644 (file)
index 0000000..1e7976a
Binary files /dev/null and b/res/screen-density-xhigh/I01_URL_bookmark_icon.png differ
diff --git a/res/screen-density-xhigh/I01_URL_toolbar_button.png b/res/screen-density-xhigh/I01_URL_toolbar_button.png
new file mode 100644 (file)
index 0000000..030a380
Binary files /dev/null and b/res/screen-density-xhigh/I01_URL_toolbar_button.png differ
diff --git a/res/screen-density-xhigh/I01_toolbar_icon_back_press_web.png b/res/screen-density-xhigh/I01_toolbar_icon_back_press_web.png
new file mode 100644 (file)
index 0000000..99a8dd0
Binary files /dev/null and b/res/screen-density-xhigh/I01_toolbar_icon_back_press_web.png differ
diff --git a/res/screen-density-xhigh/I01_toolbar_icon_back_web.png b/res/screen-density-xhigh/I01_toolbar_icon_back_web.png
new file mode 100644 (file)
index 0000000..46b9d57
Binary files /dev/null and b/res/screen-density-xhigh/I01_toolbar_icon_back_web.png differ
diff --git a/res/screen-density-xhigh/I01_toolbar_icon_forward_press_web.png b/res/screen-density-xhigh/I01_toolbar_icon_forward_press_web.png
new file mode 100644 (file)
index 0000000..09fd4fe
Binary files /dev/null and b/res/screen-density-xhigh/I01_toolbar_icon_forward_press_web.png differ
diff --git a/res/screen-density-xhigh/I01_toolbar_icon_forward_web.png b/res/screen-density-xhigh/I01_toolbar_icon_forward_web.png
new file mode 100644 (file)
index 0000000..bc944cc
Binary files /dev/null and b/res/screen-density-xhigh/I01_toolbar_icon_forward_web.png differ
index 38ff4a1..9269724 100644 (file)
@@ -3,7 +3,7 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">
-<ScenePanel Bversion="3.0.0.201301251814" Dversion="20120315">
+<ScenePanel Bversion="2.0.0.201303041025" Dversion="20120315">
     <Panel id="IDL_ADDRESSBAR">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
         <layout height="94" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="94" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_ADDRESSBAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_ADDRESSBAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="94" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="0"/>
     </Label>
-    <Button id="IDC_FORWARD_BUTTON" parent="IDL_ADDRESSBAR">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="I01_controlbar_icon_Play_disabled.png" disabledColor="#848484" disabledColorOpacity="40" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_controlbar_icon_Play_temp.png" normalColor="#848484" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_controlbar_icon_Play_temp_press.png" pressedColor="#008CD2" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="5" marginLeft="3" marginRight="0" marginTop="5" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="78" x="91" y="5"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="3" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="74" x="93" y="3"/>
-    </Button>
     <Panel id="IDC_BG_PANEL" parent="IDL_ADDRESSBAR">
         <property backgroundColor="#FFFFFF" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="10" marginRight="10" marginTop="0" mode="Portrait" rightRelation="None" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="531" x="179" y="3"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="16" marginRight="16" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1081" x="183" y="3"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="10" marginRight="10" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="623" x="18" y="3"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="16" marginRight="16" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1132" x="32" y="3"/>
     </Panel>
     <Label id="IDC_ADDRESSBAR_BG_LABEL" parent="IDC_BG_PANEL">
         <property backgroundBitmapPath="EditBackground.png" backgroundColor="#FFFFFF" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="531" x="0" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1081" x="0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="623" x="0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1132" x="0" y="0"/>
     </Label>
-    <Button id="IDC_REFRESH_BUTTON" parent="IDC_BG_PANEL">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_search_icon_refresh.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="I01_search_icon_refresh.png" pressedBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="72" x="459" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDC_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="74" x="1007" y="0"/>
-    </Button>
     <Button id="IDC_STOP_BUTTON" parent="IDC_BG_PANEL">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_field_btn_Clear_temp.png" normalColor="" normalColorOpacity="100" normalTextColor="#000000" pressedBGBitmapPath="" pressedBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="IDC_BG_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDC_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="72" x="459" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDC_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="74" x="1007" y="0"/>
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="EditBackground.png" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_field_btn_Clear_temp.png" normalColor="" normalColorOpacity="100" normalTextColor="#000000" pressedBGBitmapPath="" pressedBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="IDC_BG_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDC_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="72" x="551" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDC_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="74" x="1058" y="0"/>
     </Button>
-    <Button id="IDC_READER_BUTTON" parent="IDC_BG_PANEL">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="I01_PlugIn_icon_Article_reader_temp.png" normalColor="#848484" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="#008CD2" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="IDC_BG_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="72" x="459" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDC_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="74" x="1007" y="0"/>
-    </Button>
-    <Label id="IDC_FAVICON_BUTTON" parent="IDC_BG_PANEL">
-        <property backgroundBitmapPath="I01_icon_default_favicon.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="42" x="10" y="14"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="42" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="42" x="10" y="16"/>
-    </Label>
     <EditField id="IDC_URL_EDITFIELD" parent="IDC_BG_PANEL">
         <property commandButtonVisible="true" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="false" groupStyle="GROUP_STYLE_NONE" guideText="::IDS_BR_BODY_SEARCH_OR_ENTER_URL" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="#4E4945" horizontalMargin="0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="2048" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="EditBackground.png" normalColor="" normalColorOpacity="100" normalTextColor="#4E4945" pressedBGBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="32" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="18" viewMode="false"/>
-        <layout bottomRelation="IDC_BG_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDC_REFRESH_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="407" x="52" y="0"/>
-        <layout bottomRelation="IDC_BG_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="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="955" x="52" y="1"/>
+        <layout bottomRelation="IDC_BG_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDC_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="527" x="96" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1132" x="128" y="1"/>
     </EditField>
     <Button id="IDC_CLEAR_BUTTON" parent="IDC_BG_PANEL">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_field_btn_Clear_temp.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="I01_field_btn_Clear_temp.png" pressedBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="IDC_BG_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="72" x="459" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDC_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="74" x="1007" y="0"/>
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="EditBackground.png" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_field_btn_Clear_temp.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="I01_field_btn_Clear_temp.png" pressedBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="IDC_BG_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDC_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="72" x="551" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDC_BG_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="74" x="1058" y="0"/>
     </Button>
-    <Label id="IDC_SEARCH_BUTTON" parent="IDC_BG_PANEL">
-        <property backgroundBitmapPath="I01_search_icon.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="42" x="10" y="14"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="42" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="42" x="10" y="16"/>
+    <Label id="IDC_TOOLBAR_LABEL" parent="IDC_BG_PANEL">
+        <property backgroundBitmapPath="I01_URL_toolbar_button.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="96" x="0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="96" x="0" y="0"/>
     </Label>
-    <Label id="IDC_LABEL_PRIVATE_ON" parent="IDC_BG_PANEL">
-        <property backgroundBitmapPath="private_on.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_FAVICON_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="43" x="52" y="14"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_FAVICON_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="42" x="52" y="16"/>
+    <Label id="IDC_URL_LABEL" parent="IDC_BG_PANEL">
+        <property backgroundBitmapPath="I01_URL_bookmark_icon.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="50" x="22" y="10"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="34" x="22" y="0"/>
     </Label>
-    <Button id="IDC_BACKWARD_BUTTON" parent="IDL_ADDRESSBAR">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="I01_controlbar_icon_backward_disabled.png" disabledColor="#848484" disabledColorOpacity="40" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_controlbar_icon_backward_temp.png" normalColor="#848484" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_controlbar_icon_backward_temp_press.png" pressedColor="#008CD2" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="10" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="78" x="10" y="5"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_ADDRESSBAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="16" marginRight="0" marginTop="3" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDL_ADDRESSBAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="74" x="16" y="3"/>
-    </Button>
-    <Button id="IDC_CANCEL_BUTTON" parent="IDL_ADDRESSBAR">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="::IDS_BR_SK_CANCEL" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="5" marginLeft="0" marginRight="10" marginTop="5" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="159" x="551" y="5"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="16" marginTop="0" mode="Landscape" rightRelation="IDL_ADDRESSBAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_BG_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="159" x="1105" y="3"/>
-    </Button>
     <Label id="IDC_PROGRESS_BAR_LABEL" parent="IDL_ADDRESSBAR">
         <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
         <layout bottomRelation="IDL_ADDRESSBAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="12" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="82"/>
         <layout bottomRelation="IDL_ADDRESSBAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="12" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_ADDRESSBAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="82"/>
     </Label>
+    <Button id="IDC_ADDRESS_BACK_BUTTON" parent="IDL_ADDRESSBAR">
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="I01_icon_Back.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="I01_icon_Back_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="651" y="3"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="94" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="48" x="1211" y="0"/>
+    </Button>
 </ScenePanel>
index 7ad4fb1..455936b 100644 (file)
@@ -3,57 +3,81 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-
-<Scene Bversion="3.0.0.201301290951" Dversion="20120315">
+<Scene Bversion="2.0.0.201303182057" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_FORM">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <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"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR" type="LAYOUT_RELATIVE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR" type="LAYOUT_RELATIVE"/>
     </Form>
     <Panel id="IDC_ADDRESSBAR_PANEL" parent="IDL_FORM">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="94" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="94" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDL_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="0" x="0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="94.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="94.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="IDL_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="0.0"/>
     </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="114" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="1106"/>
-        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="105" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="555"/>
+        <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="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="105.0" horizontalFitPolicy="FIT_POLICY_FIXED" 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="1280.0" x="0.0" y="555.0"/>
     </Panel>
-    <Label id="IDC_LABEL1" parent="IDC_FOOTER_PANEL">
-        <property backgroundBitmapPath="I01_toolbar_bg_02.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="114" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="105" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_PARENT" width="1280" x="0" y="0"/>
+    <Label id="IDC_CHECK_LABEL" parent="IDC_FOOTER_PANEL">
+        <property accessibilityHint="" backgroundBitmapPath="I01_toolbar_bg_02.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.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="720.0" x="0.0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="105.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="46.0" x="24.0" y="0.0"/>
+    </Label>
+    <Label id="IDC_FOOTER_LABEL" parent="IDC_FOOTER_PANEL">
+        <property accessibilityHint="" backgroundBitmapPath="I01_toolbar_bg_02.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
+        <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="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="300.0" x="212.0" y="25.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="534.0" x="376.0" y="10.0"/>
     </Label>
     <Button id="IDC_PAGEBACK_BUTTON" parent="IDC_FOOTER_PANEL">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_icon_Back.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_icon_Back_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="60" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="104" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="144" x="576" y="10"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="256" x="1024" y="10"/>
-    </Button>
-    <Button id="IDC_BOOKMARK_BUTTON" parent="IDC_FOOTER_PANEL">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_search_list_icon_favorite.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_controlbar_icon_bookmark.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="60" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="104" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="144" x="288" y="10"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="false" height="95" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="256" x="512" y="10"/>
-    </Button>
-    <Button id="IDC_NEW_WINDOW" parent="IDC_FOOTER_PANEL">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="I01_controlbar_icon_create_disable.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="opennewwindow.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="opennewwindow.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="60" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="104" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="144" x="0" y="10"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_FOOTER_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="10" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_FOOTER_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="256" x="0" y="10"/>
+        <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="EditBackground.png" normalBitmapPath="I01_toolbar_icon_back_web.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_toolbar_icon_back_press_web.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="60.0" verticalAlign="ALIGN_MIDDLE"/>
+        <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="542.0" y="25.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="112.0" x="963.0" y="10.0"/>
     </Button>
     <Button id="IDC_MORE_BUTTON" parent="IDC_FOOTER_PANEL">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_controlbar_icon_more.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_controlbar_icon_more.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="60" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="104" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="144" x="432" y="10"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_BOOKMARK_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="256" x="768" y="10"/>
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="I01_controlbar_icon_create_disable.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_controlbar_icon_more.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_controlbar_icon_more.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="60.0" verticalAlign="ALIGN_MIDDLE"/>
+        <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="" leftRelationType="" 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="46.0" y="10.0"/>
     </Button>
     <Button id="IDC_MULTIWINDOW_BUTTON" parent="IDC_FOOTER_PANEL">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_toolbar_icon_windows_manager_empty.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_controlbar_icon_multiview.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="60" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="104" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="144" x="144" y="10"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_NEW_WINDOW" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="256" x="256" y="10"/>
+        <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="EditBackground.png" normalBitmapPath="I01_toolbar_icon_windows_manager_empty.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_controlbar_icon_multiview.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="60.0" verticalAlign="ALIGN_MIDDLE"/>
+        <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="119.0" y="25.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="112.0" x="211.0" y="10.0"/>
+    </Button>
+    <EditField id="IDC_URL_EDIT_FIELD" parent="IDC_FOOTER_PANEL">
+        <property accessibilityHint="" commandButtonVisible="true" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="false" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="" 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="300.0" x="212.0" y="25.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="534.0" x="376.0" y="10.0"/>
+    </EditField>
+    <Button id="IDC_PAGEFORWARD_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="EditBackground.png" normalBitmapPath="I01_toolbar_icon_forward_web.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_toolbar_icon_forward_press_web.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
+        <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="635.0" y="25.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="112.0" x="1129.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="65.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="74.0" x="807.0" y="15.0"/>
+    </Button>
+    <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"/>
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="12.0" horizontalFitPolicy="FIT_POLICY_PARENT" 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="720.0" x="0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="12.0" horizontalFitPolicy="FIT_POLICY_FIXED" 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="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="82.0"/>
+    </Label>
+    <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="65.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="74.0" x="807.0" y="15.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="65.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="74.0" x="807.0" y="15.0"/>
     </Button>
     <Panel id="IDC_FIND_ON_PAGE_PANEL" parent="IDL_FORM">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="82" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="82" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDL_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="0" x="0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="82.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="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="82.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="IDL_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="0.0"/>
     </Panel>
 </Scene>
index e7ddd2a..df35232 100644 (file)
@@ -19,7 +19,6 @@
  *@brief:      This class defines common behaviour of Addressbar control.
  *
  */
-
 #include "IntAddressbar.h"
 #include "IntCommonLib.h"
 #include "IntTypes.h"
@@ -49,7 +48,7 @@ const int Addressbar::IDA_CLEAR_URL = 107;
 
 Addressbar::Addressbar(void)
 {
-       __currentAddMode = ADDRESSBAR_MODE_LOADING_COMPLETE;
+       //__currentAddMode = ADDRESSBAR_MODE_LOADING_COMPLETE;
        __displayUrl = L"";
        __editTextUrl = L"";
        __isLoadingData = false;
@@ -57,23 +56,26 @@ Addressbar::Addressbar(void)
        __progressPercentage = 0;
        __pAddressbarBg = null;
        __pBgPanel = null;
-       __pCancelBtn = null;
+       //__pCancelBtn = null;
        __pClearBtn = null;
        __pFavIcon = FaviconManager::GetInstance()->GetDefaultFaviconN();
        __pFaviconLabel = null;
-       __pGoBackBtn = null;
-       __pGoForwardBtn = null;
+       //__pGoBackBtn = null;
+       //__pGoForwardBtn = null;
        __pLabelPrivateOn = null;
        __pListener = null;
        __pPrivateIconLabel = null;
        __pProgressbarLabel = null;
        __pPrivateIconLabel = null ;
-       __pReaderBtn = null;
-       __pRefreshBtn = null;
+       //__pReaderBtn = null;
+       //__pRefreshBtn = null;
        __pStopBtn = null;
        __pClearBtn = null ;
        __pSearchLabel = null;
-       __pUrlField = null;
+       __pAddressbarUrlField = null;
+       __pToolBarLabel = null;
+       __pAddressbarURLLabel = null;
+       __pAddressBackBtn = null;
 }
 
 Addressbar::~Addressbar(void)
@@ -110,14 +112,14 @@ Addressbar::Initialize(const Rectangle& rect)
                return E_INVALID_KEY;
        }
 
-       __pLabelPrivateOn = static_cast<Label*> (GetControl(L"IDC_LABEL_PRIVATE_ON",true));
+       /*__pLabelPrivateOn = static_cast<Label*> (GetControl(L"IDC_LABEL_PRIVATE_ON",true));
 
        if (__pLabelPrivateOn == NULL)
        {
                AppLogDebug("Control not found returning E_INVALID_KEY");
                return E_INVALID_KEY;
        }
-       __pLabelPrivateOn->SetShowState(false);
+       __pLabelPrivateOn->SetShowState(false);*/
 
        __pAddressbarBg = static_cast<Label*> (GetControl(L"IDC_ADDRESSBAR_BG_LABEL",true));
        if (__pAddressbarBg == NULL)
@@ -143,7 +145,7 @@ Addressbar::Initialize(const Rectangle& rect)
        __pProgressbarLabel->SetShowState(false);
 
        //Add the go Back Button
-       __pGoBackBtn = static_cast<Button*> (GetControl(L"IDC_BACKWARD_BUTTON",true));
+       /*__pGoBackBtn = static_cast<Button*> (GetControl(L"IDC_BACKWARD_BUTTON",true));
        if (__pGoBackBtn == NULL)
        {
                AppLogDebug("Control not found returning E_INVALID_KEY");
@@ -162,31 +164,31 @@ Addressbar::Initialize(const Rectangle& rect)
        }
        __pGoForwardBtn->SetActionId(IDA_GO_FORWARD);
        __pGoForwardBtn->AddActionEventListener(*this);
-       __pGoForwardBtn->SetEnabled(false);
+       __pGoForwardBtn->SetEnabled(false);*/
 
 
        //Add the favicon
-       __pFaviconLabel = static_cast<Label*> (GetControl(L"IDC_FAVICON_BUTTON",true));
+       /*__pFaviconLabel = static_cast<Label*> (GetControl(L"IDC_FAVICON_BUTTON",true));
        if (__pFaviconLabel == NULL)
        {
                AppLogDebug("Control not found returning E_INVALID_KEY");
                return E_INVALID_KEY;
        }
 
-       __pFaviconLabel->SetShowState(false);
+       __pFaviconLabel->SetShowState(false);*/
 
        //Add the search icon
-       __pSearchLabel = static_cast<Label*> (GetControl(L"IDC_SEARCH_BUTTON",true));
+       /*__pSearchLabel = static_cast<Label*> (GetControl(L"IDC_SEARCH_BUTTON",true));
        if (__pSearchLabel == NULL)
        {
                AppLogDebug("Control not found returning E_INVALID_KEY");
                return E_INVALID_KEY;
        }
 
-       __pSearchLabel->SetShowState(true);
+       __pSearchLabel->SetShowState(true);*/
 
        //Add the refresh button
-       __pRefreshBtn = static_cast<Button*> (GetControl(L"IDC_REFRESH_BUTTON",true));
+       /*__pRefreshBtn = static_cast<Button*> (GetControl(L"IDC_REFRESH_BUTTON",true));
        if (__pRefreshBtn == NULL)
        {
                AppLogDebug("Control not found returning E_INVALID_KEY");
@@ -195,7 +197,7 @@ Addressbar::Initialize(const Rectangle& rect)
 
        __pRefreshBtn->SetActionId(IDA_REFRESH_BTN_CLICKED);
        __pRefreshBtn->AddActionEventListener(*this);
-       __pRefreshBtn->SetShowState(true);
+       __pRefreshBtn->SetShowState(true);*/
 
 
        //Add the stop button
@@ -211,7 +213,7 @@ Addressbar::Initialize(const Rectangle& rect)
 
 
        //Add the reader button
-       __pReaderBtn = static_cast<Button*> (GetControl(L"IDC_READER_BUTTON",true));
+       /*__pReaderBtn = static_cast<Button*> (GetControl(L"IDC_READER_BUTTON",true));
        if (__pReaderBtn == NULL)
        {
                AppLogDebug("Control not found returning E_INVALID_KEY");
@@ -221,6 +223,7 @@ Addressbar::Initialize(const Rectangle& rect)
        __pReaderBtn->SetActionId(IDA_READER_BTN_CLICKED);
        __pReaderBtn->AddActionEventListener(*this);
        __pReaderBtn->SetShowState(false);
+*/
 
        __pClearBtn = static_cast<Button*> (GetControl(L"IDC_CLEAR_BUTTON",true));
        if (__pClearBtn == NULL)
@@ -230,22 +233,48 @@ Addressbar::Initialize(const Rectangle& rect)
        }
        __pClearBtn->SetActionId(IDA_CLEAR_URL);
        __pClearBtn->AddActionEventListener(*this);
-       __pClearBtn->SetShowState(false);
+       __pClearBtn->SetShowState(true);
 
        //Add the editfield for url
-       __pUrlField =  static_cast<EditField*> (GetControl(L"IDC_URL_EDITFIELD",true));
-       if (__pUrlField == NULL)
+       __pAddressbarUrlField =  static_cast<EditField*> (GetControl(L"IDC_URL_EDITFIELD",true));
+       if (__pAddressbarUrlField == NULL)
        {
                AppLogDebug("Control not found returning E_INVALID_KEY");
                return E_INVALID_KEY;
        }
 
-       __pUrlField->SetOverlayKeypadCommandButtonVisible(false);
-       __pUrlField->SetKeypadAction(KEYPAD_ACTION_GO);
-       __pUrlField->AddFocusEventListener(*this);
+       __pAddressbarUrlField->SetOverlayKeypadCommandButtonVisible(false);
+       __pAddressbarUrlField->SetKeypadAction(KEYPAD_ACTION_GO);
+       __pAddressbarUrlField->AddFocusEventListener(*this);
 
+       __pToolBarLabel = static_cast<Label*> (GetControl(L"IDC_TOOLBAR_LABEL",true));
+       if (__pToolBarLabel == NULL)
+       {
+               AppLogDebug("Control not found returning E_INVALID_KEY");
+               return E_INVALID_KEY;
+       }
+       __pToolBarLabel->SetShowState(true);
 
-       //Add the Cancel Button
+       __pAddressbarURLLabel = static_cast<Label*> (GetControl(L"IDC_URL_LABEL",true));
+       if (__pAddressbarURLLabel == NULL)
+       {
+               AppLogDebug("__pURLLabel Control not found returning E_INVALID_KEY");
+               return E_INVALID_KEY;
+       }
+       __pAddressbarURLLabel->SetShowState(true);
+
+       __pAddressBackBtn = static_cast<Button*> (GetControl(L"IDC_ADDRESS_BACK_BUTTON",true));
+       if (__pAddressBackBtn == NULL)
+       {
+               AppLogDebug("__pAddressBackBtn Control not found returning E_INVALID_KEY");
+               return E_INVALID_KEY;
+       }
+       __pAddressBackBtn->SetActionId(IDA_CANCEL);
+       __pAddressBackBtn->AddActionEventListener(*this);
+       __pAddressBackBtn->SetShowState(true);
+       //IDC_ADDRESS_BACK_BUTTON
+
+       /*//Add the Cancel Button
        __pCancelBtn = static_cast<Button*> (GetControl(L"IDC_CANCEL_BUTTON",true));
        if (__pCancelBtn == NULL)
        {
@@ -254,23 +283,23 @@ Addressbar::Initialize(const Rectangle& rect)
        }
        __pCancelBtn->SetActionId(IDA_CANCEL);
        __pCancelBtn->AddActionEventListener(*this);
-       __pCancelBtn->SetShowState(false);
+       __pCancelBtn->SetShowState(false);*/
        // Added to get the favorite url if not set then address bar is about blank
 
        if (SettingPresentationModel::GetInstance()->GetHomepage().CompareTo((L"IDS_BR_BODY_MOST_VISITED_SITES")) == 0)
        {
-               __pUrlField->SetGuideText(CommonUtil::GetString(L"IDS_BR_BODY_SEARCH_OR_ENTER_URL"));
+               __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)
        {
-               __pUrlField->SetGuideText(CommonUtil::GetString(L"IDS_BR_BODY_ABOUT_C_BLANK"));
+               __pAddressbarUrlField->SetGuideText(CommonUtil::GetString(L"IDS_BR_BODY_ABOUT_C_BLANK"));
        }
        else
        {
                //__pUrlField->SetText(SettingPresentationModel::GetInstance()->GetFavoriteURL());
-               __pUrlField->SetGuideText(CommonUtil::GetString(L"IDS_BR_BODY_SEARCH_OR_ENTER_URL"));
+               __pAddressbarUrlField->SetGuideText(CommonUtil::GetString(L"IDS_BR_BODY_SEARCH_OR_ENTER_URL"));
        }
-       __pUrlField->AddKeypadEventListener(*this);
+       __pAddressbarUrlField->AddKeypadEventListener(*this);
 
        AppLogDebug("Addressbar::Initialize exit");
        return r;
@@ -361,20 +390,20 @@ Addressbar::SetUrl(const String& url)
        String updatedDisplayUrl;
        updatedDisplayUrl.Clear();
 
-       if (__pUrlField != NULL)
+       if (__pAddressbarUrlField != NULL)
        {
                String removedHttpUrl = RemoveHttpTextFromDisplayURL();
                if (removedHttpUrl.IsEmpty() == false)
                {
-                       __pUrlField->SetText(removedHttpUrl);
+                       __pAddressbarUrlField->SetText(removedHttpUrl);
                }
                else
                {
-                       __pUrlField->SetText(__displayUrl);
+                       __pAddressbarUrlField->SetText(__displayUrl);
                }
 
-               __pUrlField->Invalidate(false);
-               __pUrlField->SetCursorPosition(0);
+               __pAddressbarUrlField->Invalidate(false);
+               __pAddressbarUrlField->SetCursorPosition(0);
        }
 }
 
@@ -384,13 +413,13 @@ Addressbar::GetUrl(void)
        return __displayUrl;
 }
 
-AddressBarMode
+/*AddressBarMode
 Addressbar::GetAddressbarMode(void)
 {
        return __currentAddMode;
-}
+}*/
 
-void
+/*void
 Addressbar::SetAddressbarMode(AddressBarMode addMode)
 {
        AppLogDebug("AddressBar::setAddressbarMode to %d",addMode);
@@ -406,108 +435,105 @@ Addressbar::SetAddressbarMode(AddressBarMode addMode)
        break;
        case ADDRESSBAR_MODE_READER:
        {
-               __pBgPanel->SetPosition(__pGoBackBtn->GetPosition().x + 2* __pGoBackBtn->GetWidth() + 13,__pBgPanel->GetPosition().y);
-               __pSearchLabel->SetShowState(false);
-               __pFaviconLabel->SetShowState(true);
-               __pCancelBtn->SetShowState(false);
-               __pRefreshBtn->SetShowState(false);
+       //      __pBgPanel->SetPosition(__pGoBackBtn->GetPosition().x + 2* __pGoBackBtn->GetWidth() + 13,__pBgPanel->GetPosition().y);
+       //      __pSearchLabel->SetShowState(false);
+       //      __pFaviconLabel->SetShowState(true);
+       //      __pCancelBtn->SetShowState(false);
+       //      __pRefreshBtn->SetShowState(false);
                __pStopBtn->SetShowState(false);
-               __pReaderBtn->SetShowState(true);
-               __pReaderBtn->Invalidate(true);
-               __pGoForwardBtn->SetShowState(true);
-               __pGoBackBtn->SetShowState(true);
+       //      __pReaderBtn->SetShowState(true);
+       //      __pReaderBtn->Invalidate(true);
+       //      __pGoForwardBtn->SetShowState(true);
+       //      __pGoBackBtn->SetShowState(true);
                __pClearBtn->SetShowState(false);
-
        }
        break;
-
        case ADDRESSBAR_MODE_LOADING:
        {
-               __pBgPanel->SetPosition(__pGoBackBtn->GetPosition().x + 2* __pGoBackBtn->GetWidth() + 13,__pBgPanel->GetPosition().y);
-               __pSearchLabel->SetShowState(false);
-               __pFaviconLabel->SetShowState(true);
-               __pCancelBtn->SetShowState(false);
-               __pRefreshBtn->SetShowState(false);
+       //      __pBgPanel->SetPosition(__pGoBackBtn->GetPosition().x + 2* __pGoBackBtn->GetWidth() + 13,__pBgPanel->GetPosition().y);
+       //      __pSearchLabel->SetShowState(false);
+       //      __pFaviconLabel->SetShowState(true);
+       //      __pCancelBtn->SetShowState(false);
+       //      __pRefreshBtn->SetShowState(false);
                __pStopBtn->SetShowState(true);
-               __pReaderBtn->SetShowState(false);
-               __pGoForwardBtn->SetShowState(true);
-               __pGoBackBtn->SetShowState(true);
+       //      __pReaderBtn->SetShowState(false);
+       //      __pGoForwardBtn->SetShowState(true);
+       //      __pGoBackBtn->SetShowState(true);
                __pClearBtn->SetShowState(false);
-
        }
        break;
 
        case ADDRESSBAR_MODE_LOADING_COMPLETE:
        {
-               __pBgPanel->SetPosition(__pGoBackBtn->GetPosition().x + 2* __pGoBackBtn->GetWidth() + 13,__pBgPanel->GetPosition().y);
-               __pCancelBtn->SetShowState(false);
+       //      __pBgPanel->SetPosition(__pGoBackBtn->GetPosition().x + 2* __pGoBackBtn->GetWidth() + 13,__pBgPanel->GetPosition().y);
+       //      __pCancelBtn->SetShowState(false);
 
-               if (__pUrlField && __pUrlField->GetText().IsEmpty() == false)
+               if (__pAddressbarUrlField && __pAddressbarUrlField->GetText().IsEmpty() == false)
                {
-
-                       __pSearchLabel->SetShowState(false);
-                       __pFaviconLabel->SetShowState(true);
+               //      __pSearchLabel->SetShowState(false);
+               //      __pFaviconLabel->SetShowState(true);
                }
                else
                {
-                       __pSearchLabel->SetShowState(true);
-                       __pFaviconLabel->SetShowState(false);
+               //      __pSearchLabel->SetShowState(true);
+               //      __pFaviconLabel->SetShowState(false);
                }
 
-               if (__pUrlField != NULL)
+               if (__pAddressbarUrlField != NULL)
                {
-                       __pUrlField->SetText(__displayUrl);
-                       __pUrlField->HideKeypad();
+                       __pAddressbarUrlField->SetText(__displayUrl);
+                       __pAddressbarUrlField->HideKeypad();
                }
 
-               __pRefreshBtn->SetShowState(true);
+       //      __pRefreshBtn->SetShowState(true);
                __pStopBtn->SetShowState(false);
-               __pReaderBtn->SetShowState(false);
-               __pGoForwardBtn->SetShowState(true);
-               __pGoBackBtn->SetShowState(true);
+       //      __pReaderBtn->SetShowState(false);
+       //      __pGoForwardBtn->SetShowState(true);
+       //      __pGoBackBtn->SetShowState(true);
                __pClearBtn->SetShowState(false);
        }
        break;
        case ADDRESSBAR_MODE_EDIT:
        {
                Form *pForm = static_cast<Form*>(GetParent());
-               if(pForm!= null && (pForm->GetOrientationStatus() == ORIENTATION_STATUS_PORTRAIT ||pForm->GetOrientationStatus() == ORIENTATION_STATUS_PORTRAIT_REVERSE ))
+               if (pForm!= null && (pForm->GetOrientationStatus() == ORIENTATION_STATUS_PORTRAIT ||pForm->GetOrientationStatus() == ORIENTATION_STATUS_PORTRAIT_REVERSE ))
                {
-                       __pBgPanel->SetBounds(__pBgPanel->GetX(),__pBgPanel->GetY(),static_cast<Form*>(GetParent())->GetClientAreaBounds().width - __pCancelBtn->GetWidth() - 30,__pBgPanel->GetHeight());
-                       __pAddressbarBg->SetBounds(__pAddressbarBg->GetX(),__pAddressbarBg->GetY(),static_cast<Form*>(GetParent())->GetClientAreaBounds().width - __pCancelBtn->GetWidth() - 30,__pAddressbarBg->GetHeight());
+               //      __pBgPanel->SetBounds(__pBgPanel->GetX(),__pBgPanel->GetY(),static_cast<Form*>(GetParent())->GetClientAreaBounds().width - __pCancelBtn->GetWidth() - 30,__pBgPanel->GetHeight());
+               //      __pAddressbarBg->SetBounds(__pAddressbarBg->GetX(),__pAddressbarBg->GetY(),static_cast<Form*>(GetParent())->GetClientAreaBounds().width - __pCancelBtn->GetWidth() - 30,__pAddressbarBg->GetHeight());
                        __pClearBtn->SetBounds(__pBgPanel->GetWidth() - __pClearBtn->GetWidth(),__pClearBtn->GetY(),__pClearBtn->GetWidth(),__pClearBtn->GetHeight());
                }
                else
                {
-                       __pBgPanel->SetBounds(__pBgPanel->GetX(),__pBgPanel->GetY(),static_cast<Form*>(GetParent())->GetClientAreaBounds().width - __pCancelBtn->GetWidth() - 48,__pBgPanel->GetHeight());
-                       __pAddressbarBg->SetBounds(__pAddressbarBg->GetX(),__pAddressbarBg->GetY(),static_cast<Form*>(GetParent())->GetClientAreaBounds().width - __pCancelBtn->GetWidth() - 48,__pAddressbarBg->GetHeight());
+               //      __pBgPanel->SetBounds(__pBgPanel->GetX(),__pBgPanel->GetY(),static_cast<Form*>(GetParent())->GetClientAreaBounds().width - __pCancelBtn->GetWidth() - 48,__pBgPanel->GetHeight());
+               //      __pAddressbarBg->SetBounds(__pAddressbarBg->GetX(),__pAddressbarBg->GetY(),static_cast<Form*>(GetParent())->GetClientAreaBounds().width - __pCancelBtn->GetWidth() - 48,__pAddressbarBg->GetHeight());
                        __pClearBtn->SetBounds(__pBgPanel->GetWidth() - __pClearBtn->GetWidth(),__pClearBtn->GetY(),__pClearBtn->GetWidth(),__pClearBtn->GetHeight());
-
                }
-               __pBgPanel->SetPosition(__pGoBackBtn->GetPosition().x,__pBgPanel->GetPosition().y);
-               __pCancelBtn->SetShowState(true);
-               __pRefreshBtn->SetShowState(false);
+
+       //      __pBgPanel->SetPosition(__pGoBackBtn->GetPosition().x,__pBgPanel->GetPosition().y);
+       //      __pCancelBtn->SetShowState(true);
+       //      __pRefreshBtn->SetShowState(false);
                __pStopBtn->SetShowState(false);
-               __pReaderBtn->SetShowState(false);
-               __pGoForwardBtn->SetShowState(false);
-               __pGoBackBtn->SetShowState(false);
+       //      __pReaderBtn->SetShowState(false);
+       //      __pGoForwardBtn->SetShowState(false);
+       //      __pGoBackBtn->SetShowState(false);
                __pClearBtn->SetShowState(true);
 
+
 //             __pCancelBtn->SetBounds(__pBgPanel->GetWidth(), __pCancelBtn->GetY(), GetWidth() - 48 - __pBgPanel->GetWidth(), __pCancelBtn->GetHeight());
 
-               if (__pUrlField && __pUrlField->GetText().IsEmpty() == true)
+               if (__pAddressbarUrlField && __pAddressbarUrlField->GetText().IsEmpty() == true)
                {
-                       __pSearchLabel->SetShowState(true);
-                       __pFaviconLabel->SetShowState(false);
+               //      __pSearchLabel->SetShowState(true);
+               //      __pFaviconLabel->SetShowState(false);
                }
                else
                {
-                       __pSearchLabel->SetShowState(false);
-                       __pFaviconLabel->SetShowState(true);
+               //      __pSearchLabel->SetShowState(false);
+               //      __pFaviconLabel->SetShowState(true);
                }
-               if (__pUrlField != NULL)
+               if (__pAddressbarUrlField != NULL)
                {
-                       __pUrlField->SetCursorPosition(__pUrlField->GetTextLength());
+                       __pAddressbarUrlField->SetCursorPosition(__pAddressbarUrlField->GetTextLength());
                }
 
        }
@@ -531,13 +557,13 @@ Addressbar::SetAddressbarMode(AddressBarMode addMode)
        {
                __pListener->OnAddressBarModeChanged(*this);
        }
-}
+}*/
 
 void
 Addressbar::SetFaviconBitmap(const Tizen::Graphics::Bitmap& favicon)
 {
 
-       String url =__pUrlField->GetText();
+       String url =__pAddressbarUrlField->GetText();
        String secureSiteText = "https://";
        bool flag = false;
        flag = url.StartsWith(secureSiteText,0);
@@ -556,36 +582,36 @@ Addressbar::SetFaviconBitmap(const Tizen::Graphics::Bitmap& favicon)
 
                if (pButtonImage != null)
                {
-                       __pFaviconLabel->SetBackgroundBitmap(*pButtonImage);
-                       __pFaviconLabel->Invalidate(true);
+               //      __pFaviconLabel->SetBackgroundBitmap(*pButtonImage);
+               //      __pFaviconLabel->Invalidate(true);
                        delete pButtonImage;
                }
        }
        else
        {
-               if (__pFaviconLabel != null)
+               /*if (__pFaviconLabel != null)
                {
                        __pFaviconLabel->SetBackgroundBitmap(*__pFavIcon);
                        __pFaviconLabel->Invalidate(true);
-               }
+               }*/
        }
 }
 
 void Addressbar::SaveAddressbarEditText()
 {
-       __editTextUrl = __pUrlField->GetText();
+       __editTextUrl = __pAddressbarUrlField->GetText();
 }
 
 void
 Addressbar::UpdateFaviconBitmap(bool isPrivateOn)
 {
 
-       String url =__pUrlField->GetText();
+       String url =__pAddressbarUrlField->GetText();
        String secureSiteText = "https://";
        bool flag = false;
        flag = url.StartsWith(secureSiteText,0);
 
-       if (isPrivateOn == true)
+       /*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);
@@ -595,7 +621,7 @@ Addressbar::UpdateFaviconBitmap(bool isPrivateOn)
        {
                __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)
@@ -604,18 +630,18 @@ Addressbar::UpdateFaviconBitmap(bool isPrivateOn)
 
                        if (pButtonImage != null)
                        {
-                               __pFaviconLabel->SetBackgroundBitmap(*pButtonImage);
-                               __pFaviconLabel->Invalidate(true);
+                       //      __pFaviconLabel->SetBackgroundBitmap(*pButtonImage);
+                       //      __pFaviconLabel->Invalidate(true);
                                delete pButtonImage;
                        }
                }
                else
                {
-                       if (__pFaviconLabel != null)
+                       /*if (__pFaviconLabel != null)
                        {
                                __pFaviconLabel->SetBackgroundBitmap(*__pFavIcon);
                                __pFaviconLabel->Invalidate(true);
-                       }
+                       }*/
                }
 
 
@@ -625,15 +651,15 @@ Addressbar::UpdateFaviconBitmap(bool isPrivateOn)
 void
 Addressbar::SetForwardButtonEnabled(bool isEnabled)
 {
-       __pGoForwardBtn->SetEnabled(isEnabled);
-       __pGoBackBtn->Invalidate(true);
+//     __pGoForwardBtn->SetEnabled(isEnabled);
+//     __pGoBackBtn->Invalidate(true);
 }
 
 void
 Addressbar::SetBackButtonEnabled(bool isEnabled)
 {
-       __pGoBackBtn->SetEnabled(isEnabled);
-       __pGoBackBtn->Invalidate(true);
+//     __pGoBackBtn->SetEnabled(isEnabled);
+//     __pGoBackBtn->Invalidate(true);
 }
 
 void
@@ -683,13 +709,13 @@ Addressbar::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                __isLoadingCompleted = false;
                __isLoadingData = true;
                __progressPercentage = 0;
-               __pUrlField->HideKeypad();
-               __displayUrl = __pUrlField->GetText();
+               __pAddressbarUrlField->HideKeypad();
+               __displayUrl = __pAddressbarUrlField->GetText();
 
-               if (__pListener != NULL)
+               /*if (__pListener != NULL)
                {
                        __pListener->OnUrlSubmitted(*this);
-               }
+               }*/
 
                UpdateProgressBitmap();
                break;
@@ -698,8 +724,8 @@ Addressbar::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                __isLoadingCompleted = false;
                __isLoadingData = false;
                __progressPercentage = 0;
-               __pUrlField->HideKeypad();
-               __displayUrl = __pUrlField->GetText();
+               __pAddressbarUrlField->HideKeypad();
+               __displayUrl = __pAddressbarUrlField->GetText();
 
                if (__pListener != NULL)
                {
@@ -709,8 +735,8 @@ Addressbar::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                UpdateProgressBitmap();
                break;
        case IDA_READER_BTN_CLICKED:
-               __pUrlField->HideKeypad();
-               __displayUrl = __pUrlField->GetText();
+               __pAddressbarUrlField->HideKeypad();
+               __displayUrl = __pAddressbarUrlField->GetText();
 
                if (__pListener != NULL)
                {
@@ -719,7 +745,7 @@ Addressbar::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
                break;
 
-       case IDA_GO_BACK:
+       /*case IDA_GO_BACK:
        {
                if (__pListener != NULL)
                {
@@ -734,25 +760,25 @@ Addressbar::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                if (__pListener != NULL )
                        __pListener->OnForwardClicked(*this);
        }
-       break;
+       break;*/
 
        case IDA_CANCEL:
        {
                __pListener->OnAddressCancelledClicked(*this);
-               __pUrlField->SetText(__displayUrl);
+               __pAddressbarUrlField->SetText(__displayUrl);
                __editTextUrl = L"";
-               __pUrlField->HideKeypad();
-               SetAddressbarMode(ADDRESSBAR_MODE_LOADING_COMPLETE);
+               __pAddressbarUrlField->HideKeypad();
+               //SetAddressbarMode(ADDRESSBAR_MODE_LOADING_COMPLETE);
        }
        break;
 
        case IDA_CLEAR_URL:
        {
-               if (__pUrlField->GetText().IsEmpty() == false)
+               if (__pAddressbarUrlField->GetText().IsEmpty() == false)
                {
                        //__displayUrl = __pUrlField->GetText();
-                       __pUrlField->Clear();
-                       __pUrlField->Invalidate(true);
+                       __pAddressbarUrlField->Clear();
+                       __pAddressbarUrlField->Invalidate(true);
                }
        }
        break;
@@ -771,22 +797,21 @@ Addressbar::OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui::Keypa
        case KEYPAD_ACTION_ENTER:
        case KEYPAD_ACTION_SEND:
        {
-               if (__pUrlField->GetText().IsEmpty() == false)
+               if (__pAddressbarUrlField->GetText().IsEmpty() == false)
                {
-                       SetAddressbarMode(ADDRESSBAR_MODE_LOADING);
-                       __displayUrl = __pUrlField->GetText();
+                       //SetAddressbarMode(ADDRESSBAR_MODE_LOADING);
+                       __displayUrl = __pAddressbarUrlField->GetText();
 
                        __isLoadingCompleted = false;
                        __isLoadingData = true;
                        __progressPercentage = 0;
-                       __pUrlField->HideKeypad();
+                       __pAddressbarUrlField->HideKeypad();
 
                        if (__pListener != NULL)
                        {
                                __pListener->OnUrlSubmitted(*this);
                        }
-                       UpdateProgressBitmap();
-
+                       //UpdateProgressBitmap();
                }
        }
        break;
@@ -812,13 +837,14 @@ Addressbar::OnKeypadOpened(Tizen::Ui::Control& source)
 void
 Addressbar::OnKeypadWillOpen(Tizen::Ui::Control& source)
 {
-       SetAddressbarMode(ADDRESSBAR_MODE_EDIT);
+       //SetAddressbarMode(ADDRESSBAR_MODE_EDIT);
        //      SetAddressbarMode(__prevAddMode);
        if(__pListener != null)
        {
                __pListener->OnAddressBarKeypadWillOpen(*this);
        }
 }
+
 void
 Addressbar::OrientationChanged(void)
 {
@@ -872,13 +898,23 @@ Addressbar::GetLockedImageN(void)
 void
 Addressbar::OnFocusGained(const Tizen::Ui::Control& source)
 {
-       SetAddressbarMode(ADDRESSBAR_MODE_EDIT);
+       //SetAddressbarMode(ADDRESSBAR_MODE_EDIT);
        //      SetAddressbarMode(__prevAddMode);
-       if(__pListener != null)
+       if (__pListener != null)
        {
                __pListener->OnAddressBarKeypadWillOpen(*this);
                __pListener->OnAddressBarKeypadOpened(*this);
        }
 }
 
+void
+Addressbar::SetAddressbarURLFocus()
+{
+       __pAddressbarUrlField->SetFocus();
+}
 
+String
+Addressbar::GetAddressbarURL()
+{
+       return __pAddressbarUrlField->GetText();
+}
index 9c3e043..643faea 100644 (file)
@@ -52,6 +52,7 @@ using namespace Tizen::System;
 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_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";
@@ -67,6 +68,8 @@ static const wchar_t* IDB_ICON_BOOKMARK_OFF_TEMP = L"I01_icon_bookmark_off_temp.
 static const wchar_t* IDB_ICON_BOOKMARK_ON_TEMP = L"I01_icon_bookmark_on_temp.png";
 static const wchar_t* IDS_TIZEN_SERVICE = L"tizen-service";
 static const wchar_t* IDS_APPID = L"AppID";
+static const wchar_t* IDB_TITLE_PROGRESS_BAR_BG = L"I01_title_progress_bar_bg.png";
+static const wchar_t* IDB_TITLE_PROGRESS_BAR = L"I01_title_progress_bar.png";
 
 const int IDA_BACKBTN_CLICKED = 101;
 const int IDA_BOOKMARKBTN_CLICKED = 102;
@@ -83,6 +86,13 @@ const int IDA_READER_CLOSE_CLICKED = 112;
 const int IDA_SMALLFONT_BTN_CLICKED = 113;
 const int IDA_LARGEFONT_BTN_CLICKED = 114;
 const int IDA_BRIGHTNESS_BTN_CLICKED = 115;
+const int IDA_HISTORY_CLICKED = 116;
+const int IDA_ADD_TO_BOOKMARKBTN_CLICKED = 117;
+const int IDA_ADD_TO_HOME_CLICKED = 118;
+const int IDA_SAVED_PAGES_CLICKED = 119;
+const int IDA_DESKTOP_VIEW_CLICKED = 120;
+const int IDA_SAVE_CLICKED = 121;
+
 const int IDA_FINDWORD_SEARCH_CLICKED = 201;
 const int IDA_FINDWORD_NEXT_CLICKED = 202;
 const int IDA_FINDWORD_PREV_CLICKED = 203;
@@ -98,6 +108,13 @@ const int IDA_COPY_TEXT_CLICKED = 210;
 const int IDA_PASTE_TEXT_CLICKED = 211;
 const int IDA_FIND_TEXT__CLICKED = 212;
 const int IDA_SHARE_TEXT_CLICKED = 213;
+
+const int IDA_GO_BACK = 214;
+const int IDA_GO_FORWARD = 215;
+const int IDA_REFRESH_BTN_CLICKED = 216;
+const int IDA_STOP_BTN_CLICKED = 217;
+const int IDA_CLEAR_URL = 218;
+
 const int DEFAULT_PROGRESS_PERCENTAGE = 10;
 
 const int MainForm::IDA_FORMAT_BITMAP = 500;
@@ -131,6 +148,9 @@ MainForm::MainForm(void)
        __pFindWordPrev = null;
        __previousZoomLevel = 1.0;
        __pSaveImage = null;
+       __currentAddMode = ADDRESSBAR_MODE_LOADING_COMPLETE;
+       __displayUrl = L"";
+       __editTextUrl = L"";
        __currentSearchStr = L"";
        __currentSelectedStr = L"";
        __maxOccurrances = 0;
@@ -138,6 +158,9 @@ MainForm::MainForm(void)
        __distanceMoved = 0;
        __isLoaded = false;
        __inputEventToBeSupressed = false;
+       __isLoadingData = false;
+       __isLoadingCompleted = false;
+       __progressPercentage = 0;
        __touchPoint1 = Point(-1,-1);
        __touchPoint2 = Point(-1,-1);
        __pWebReader = null;
@@ -145,7 +168,7 @@ MainForm::MainForm(void)
        __pReaderData = null;
        __pPopUp = null;
        __pReaderCloseBtn = null;
-       __pNewWindowButton = null;
+       //__pNewWindowButton = null;
        __pMoreButton = null;
        __pMultiWindowButton = null;
        __pArticleReaderPanel = null;
@@ -155,6 +178,14 @@ MainForm::MainForm(void)
        __prevAddressBarMode = ADDRESSBAR_MODE_INVALID;
        __curAddressBarMode = ADDRESSBAR_MODE_INVALID;
        __pMostVisitedSites = null;
+       __pFooterUrlField = null;
+       __pGoBackBtn = null;
+       __pGoForwardBtn = null;
+       __pRefreshBtn = null;
+       __pProgressbarLabel = null;
+       __pFooterLabel = null;
+       __pStopBtn = null;
+       __pClearBtn = null;
 }
 
 MainForm::~MainForm(void)
@@ -204,6 +235,8 @@ MainForm::Initialize(void)
 result
 MainForm::OnInitializing(void)
 {
+       AppLog("get client area width = %d",GetClientAreaBounds().width);
+       AppLog("get client area height = %d",GetClientAreaBounds().height);
        const int WIDTH_CONTEXT_MENU_BUTTON = 336;
        const int HEIGHT_CONTEXT_MENU_BUTTON = 72;
 
@@ -377,7 +410,7 @@ MainForm::InitWebControl()
                return E_FAILURE;
 
        const int Y_WEBCONTROL_POSITION = __pAddressbar->GetY() + __pAddressbar->GetHeight() - 12;
-       __webControlHeight = GetClientAreaBounds().height - __pFooterPanel->GetHeight() - Y_WEBCONTROL_POSITION;
+       __webControlHeight = GetClientAreaBounds().height - __pFooterPanel->GetHeight();
        if (__pMostVisitedListView)
        {
                __pMostVisitedListView->SetShowState(false);
@@ -474,6 +507,19 @@ MainForm::InitFooter(void)
 
        SetControlAlwaysOnTop(*__pFooterPanel, true);
 
+       __pFooterLabel = static_cast< Label* >(GetControl(L"IDC_FOOTER_LABEL", true));
+       if ( __pFooterLabel == NULL )
+       {
+               return E_FAILURE;
+       }
+       //__pFooterPanel->SetBackgroundColor(CUSTOM_COLOR_TRANSPARENT);
+       Bitmap *pBitmap = CommonUtil::GetNinepatchedBitmapN(IDB_SEARCH_INPUT_FIELD_BG, __pFooterLabel->GetWidth(), __pFooterLabel->GetHeight());
+       if (pBitmap != null)
+       {
+               __pFooterLabel->SetBackgroundBitmap(*pBitmap);
+               delete pBitmap;
+       }
+
        __pMultiWindowButton = static_cast< Button* >(GetControl(L"IDC_MULTIWINDOW_BUTTON", true));
 
        if ( __pMultiWindowButton == NULL )
@@ -481,7 +527,7 @@ MainForm::InitFooter(void)
                return E_FAILURE;
        }
 
-       pBackButton = static_cast< Button* >(GetControl(L"IDC_PAGEBACK_BUTTON", true));
+       /*pBackButton = static_cast< Button* >(GetControl(L"IDC_PAGEBACK_BUTTON", true));
 
        if ( pBackButton == NULL )
        {
@@ -493,7 +539,7 @@ MainForm::InitFooter(void)
        if ( pBookmarkButton == NULL )
        {
                return E_FAILURE;
-       }
+       }*/
 
        __pMoreButton = static_cast<Button*>(GetControl(L"IDC_MORE_BUTTON",true));
 
@@ -502,12 +548,12 @@ MainForm::InitFooter(void)
                return E_FAILURE;
        }
 
-       __pNewWindowButton = static_cast< Button* >(GetControl(L"IDC_NEW_WINDOW",true));
+       /*__pNewWindowButton = static_cast< Button* >(GetControl(L"IDC_NEW_WINDOW",true));
 
        if ( __pNewWindowButton == NULL )
        {
                return E_FAILURE;
-       }
+       }*/
 
        if (__pMultiWindowButton != null)
        {
@@ -543,7 +589,7 @@ MainForm::InitFooter(void)
        }
 
 
-       if (pBackButton)
+       /*if (pBackButton)
        {
                Bitmap* pBitmap = AppResource::GetInstance()->GetBitmapN(IDB_BTN_BACK);
                Bitmap* pPressedBitmap = AppResource::GetInstance()->GetBitmapN(IDB_BTN_BACK_PRESS);
@@ -559,9 +605,9 @@ MainForm::InitFooter(void)
                }
                pBackButton->AddActionEventListener(*this);
                pBackButton->SetActionId(IDA_BACKBTN_CLICKED);
-       }
+       }*/
 
-       if (pBookmarkButton)
+       /*if (pBookmarkButton)
        {
                Bitmap* pBitmap = AppResource::GetInstance()->GetBitmapN(IDB_CONTRLBAR_ICON_BOOKMARK);
                Bitmap* pPressedBitmap = AppResource::GetInstance()->GetBitmapN(IDB_CONTRLBAR_ICON_BOOKMARK_PRESS);
@@ -574,7 +620,7 @@ MainForm::InitFooter(void)
                }
                pBookmarkButton->AddActionEventListener(*this);
                pBookmarkButton->SetActionId(IDA_BOOKMARKBTN_CLICKED);
-       }
+       }*/
 
        if (__pMoreButton)
        {
@@ -590,11 +636,22 @@ MainForm::InitFooter(void)
                }
                __pMoreButton->AddActionEventListener(*this);
                __pMoreButton->SetActionId(IDA_MOREBTN_CLICKED);
-
        }
 
+       //Add the editfield for url
+               __pFooterUrlField =  static_cast<EditField*> (GetControl(L"IDC_URL_EDIT_FIELD",true));
+               if (__pFooterUrlField == NULL)
+               {
+                       AppLogDebug("__pFooterUrlField Control not found returning E_INVALID_KEY");
+                       return E_INVALID_KEY;
+               }
+
+               __pFooterUrlField->SetOverlayKeypadCommandButtonVisible(false);
+               __pFooterUrlField->SetKeypadAction(KEYPAD_ACTION_GO);
+               //__pFooterUrlField->AddFocusEventListener(*this);
+               __pFooterUrlField->AddKeypadEventListener(*this);
 
-       if (__pNewWindowButton)
+       /*if (__pNewWindowButton)
        {
                Bitmap* pBitmap = AppResource::GetInstance()->GetBitmapN(IDB_CONTRLBAR_ICON_NEW_WINDOW);
                Bitmap* pPressedBitmap = AppResource::GetInstance()->GetBitmapN(IDB_CONTRLBAR_ICON_NEW_WINDOW_PRESS);
@@ -609,11 +666,11 @@ MainForm::InitFooter(void)
                __pNewWindowButton->SetActionId(IDA_NEWWINDOWBTN_CLICKED);
                __pNewWindowButton->SetEnabled(true);
                //              __pNewWindowButton->Invalidate(true);
-       }
+       }*/
 
        AppLog("checkingwindow count %d",MultipleWindowPresentationModel::GetInstance()->GetAllWindowArrayList()->GetCount());
 
-       if (__pNewWindowButton != null && MultipleWindowPresentationModel::GetInstance()->GetAllWindowArrayList()->GetCount() >= 9)
+       /*if (__pNewWindowButton != null && MultipleWindowPresentationModel::GetInstance()->GetAllWindowArrayList()->GetCount() >= 9)
        {
                Bitmap* pBitmap = AppResource::GetInstance()->GetBitmapN(IDB_CONTROLBAR_ICON_CREATE_DISABLE);
                if (pBitmap != null)
@@ -623,8 +680,69 @@ MainForm::InitFooter(void)
                        delete pBitmap;
                }
                __pNewWindowButton->SetEnabled(false);
+       }*/
+
+       //Add the go Back Button
+       __pGoBackBtn = static_cast<Button*> (GetControl(L"IDC_PAGEBACK_BUTTON",true));
+       if (__pGoBackBtn == NULL)
+       {
+               AppLogDebug("__pGoBackBtn Control not found returning E_INVALID_KEY");
+               return E_INVALID_KEY;
+       }
+       __pGoBackBtn->SetActionId(IDA_GO_BACK);
+       __pGoBackBtn->AddActionEventListener(*this);
+
+       //Add the go forward Button
+       __pGoForwardBtn = static_cast<Button*> (GetControl(L"IDC_PAGEFORWARD_BUTTON",true));
+       if (__pGoForwardBtn == NULL)
+       {
+               AppLogDebug("Control not found returning E_INVALID_KEY");
+               return E_INVALID_KEY;
+       }
+       __pGoForwardBtn->SetActionId(IDA_GO_FORWARD);
+       __pGoForwardBtn->AddActionEventListener(*this);
+       __pGoForwardBtn->SetEnabled(false);
+
+       __pRefreshBtn = static_cast<Button*> (GetControl(L"IDC_REFRESH_BUTTON",true));
+       if (__pRefreshBtn == NULL)
+       {
+               AppLogDebug("Control not found returning E_INVALID_KEY");
+               return E_INVALID_KEY;
        }
 
+       __pRefreshBtn->SetActionId(IDA_REFRESH_BTN_CLICKED);
+       __pRefreshBtn->AddActionEventListener(*this);
+       __pRefreshBtn->SetShowState(true);
+
+       //Add the backround label for displaying progressbar
+       __pProgressbarLabel = static_cast<Label*> (GetControl(L"IDC_PROGRESS_BAR_LABEL",true));
+       if (__pProgressbarLabel == NULL)
+       {
+               AppLogDebug("__pProgressbarLabel Control not found returning E_INVALID_KEY");
+               return E_INVALID_KEY;
+       }
+       __pProgressbarLabel->SetShowState(false);
+
+       __pStopBtn = static_cast<Button*> (GetControl(L"IDC_STOP_BUTTON",true));
+       if (__pStopBtn == NULL)
+       {
+               AppLogDebug("Control not found returning E_INVALID_KEY");
+               return E_INVALID_KEY;
+       }
+       __pStopBtn->SetActionId(IDA_STOP_BTN_CLICKED);
+       __pStopBtn->AddActionEventListener(*this);
+       __pStopBtn->SetShowState(false);
+
+       __pClearBtn = static_cast<Button*> (GetControl(L"IDC_CLEAR_BUTTON",true));
+       if (__pClearBtn == NULL)
+       {
+               AppLogDebug("Control not found returning E_INVALID_KEY");
+               return E_INVALID_KEY;
+       }
+       __pClearBtn->SetActionId(IDA_CLEAR_URL);
+       __pClearBtn->AddActionEventListener(*this);
+       __pClearBtn->SetShowState(false);
+
        //      __pFooterPanel->Invalidate(true);
        AppLogDebug("MainForm::InitFooter exit");
        return E_SUCCESS;
@@ -661,14 +779,21 @@ MainForm::InitContextMenu(Point& p)
                pBitmap  = AppResource::GetInstance()->GetBitmapN(IDB_BUTTON_OFF);
        }
 
+       r = __pMenu->AddItem(CommonUtil::GetString(L"IDS_BR_OPT_BOOKMARK"), IDA_BOOKMARKBTN_CLICKED);
+
        if ( pBitmap != NULL)
        {
                __pMenu->AddItem(CommonUtil::GetString(L"IDS_BR_BODY_PRIVACY"), IDA_PRIVATEON_CLICKED,*pBitmap);
                delete pBitmap;
        }
+       r = __pMenu->AddItem(L"Desktop view"/*CommonUtil::GetString(L"IDS_BR_OPT_BOOKMARK")*/, IDA_DESKTOP_VIEW_CLICKED);
+       r = __pMenu->AddItem(L"Saved Pages"/*CommonUtil::GetString(L"IDS_BR_OPT_BOOKMARK")*/, IDA_SAVED_PAGES_CLICKED);
+       r = __pMenu->AddItem(L"History"/*CommonUtil::GetString(L"IDS_BR_OPT_BOOKMARK")*/, IDA_HISTORY_CLICKED);
        r = __pMenu->AddItem(CommonUtil::GetString(L"IDS_COM_OPT_BRIGHTNESS"), IDA_BRIGHTNESS_BTN_CLICKED);
        r = __pMenu->AddItem(CommonUtil::GetString(L"IDS_COM_BODY_SETTINGS"), IDA_SETTINGS_CLICKED);
-       __pMenu->SetMaxVisibleItemsCount(3);
+
+
+       __pMenu->SetMaxVisibleItemsCount(6);
        __pMenu->SetShowState(false);
        __pMenu->AddActionEventListener(*this);
        SetControlAlwaysOnTop(*__pMenu, true);
@@ -1108,16 +1233,16 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                __pMenu->SetShowState(false);
                __pMenu->Invalidate(false);
 
-               __adressPanelPosition.y = 0;
+               /*__adressPanelPosition.y = 0 ;
 
                if (__pAddressbar != null && __pWebViewer != NULL)
                {
-                       __webControlPosition.y = __pAddressbar->GetHeight() - 12;
-                       __pAddressbar->SetBounds(0,__adressPanelPosition.y,GetClientAreaBounds().width,__pAddressbar->GetHeight());
-                       __pAddressbar->Invalidate(true);
+                       __webControlPosition.y = __pAddressbar->GetHeight();
+                       //__pAddressbar->SetBounds(0,__adressPanelPosition.y,GetClientAreaBounds().width,__pAddressbar->GetHeight());
+                       //__pAddressbar->Invalidate(true);
                        __pWebViewer->SetBounds(Rectangle(0,__webControlPosition.y,GetClientAreaBounds().width,__webControlHeight));
                        __pWebViewer->Invalidate(true);
-               }
+               }*/
                if (__pWebViewer != null)
                {
                        // releasing the set block
@@ -1265,7 +1390,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        }
                        if (pBitmap != null)
                        {
-                               r = __pMenu->SetItemAt(0,CommonUtil::GetString(L"IDS_BR_OPT_BOOKMARK"), IDA_ADDTOBOOKMARK_CLICKED,*pBitmap);
+                               r = __pMenu->SetItemAt(0,L"Add to Bookmarks"/*CommonUtil::GetString(L"IDS_BR_OPT_BOOKMARK")*/, IDA_ADDTOBOOKMARK_CLICKED,*pBitmap);
                                delete pBitmap;
                        }
                }
@@ -1296,18 +1421,23 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        }
        break;
        case IDA_BOOKMARKBTN_CLICKED:
-
+       {
                AppLogDebug("ONACTION_PERFORMED:IDA_BOOKMARKBTN_CLICKED");
                SceneManager::GetInstance()->GoForward(ForwardSceneTransition(IDSCN_BOOKMARK_VIEW, SCENE_TRANSITION_ANIMATION_TYPE_NONE));
+       }
                break;
+       case IDA_ADD_TO_BOOKMARKBTN_CLICKED:
+       {
 
+       }
+       break;
        case IDA_MOREBTN_CLICKED:
        {
                AppLogDebug("ONACTION_PERFORMED:IDA_MOREBTN_CLICKED 1");
                Point p = Point(__pMoreButton->GetX() + __pMoreButton->GetWidth() / 2, GetClientAreaBounds().y + GetClientAreaBounds().height - __pMoreButton->GetHeight());
                AppLog("Anchot pos: %d %d", p.x, p.y);
                InitContextMenu(p);
-               if (__pWindowInfo != NULL && __pWindowInfo->pageUrl != NULL)
+               if (__pWindowInfo != NULL && __pWindowInfo->pageUrl != NULL && __pWebViewer->GetShowState() == true)
                {
                        AppLogDebug("ONACTION_PERFORMED:IDA_MOREBTN_CLICKED 2");
                        int bookmarkCount=0;
@@ -1333,13 +1463,13 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        }
                        AppLogDebug("ONACTION_PERFORMED:IDA_MOREBTN_CLICKED 3");
 
-                       if (__pMenu->GetItemCount() == 6)
+                       if (__pMenu->GetItemCount() == 12)
                        {
-                               r = __pMenu->SetItemAt(0,CommonUtil::GetString(L"IDS_BR_OPT_BOOKMARK"), IDA_ADDTOBOOKMARK_CLICKED,*pBitmap);
+                               r = __pMenu->SetItemAt(1,L"Add to Bookmarks"/*CommonUtil::GetString(L"IDS_BR_OPT_BOOKMARK")*/, IDA_ADDTOBOOKMARK_CLICKED,*pBitmap);
                        }
                        else
                        {
-                               r = __pMenu->InsertItemAt(0,CommonUtil::GetString(L"IDS_BR_OPT_BOOKMARK"), IDA_ADDTOBOOKMARK_CLICKED,*pBitmap);
+                               r = __pMenu->InsertItemAt(1,L"Add to Bookmarks"/*CommonUtil::GetString(L"IDS_BR_OPT_BOOKMARK")*/, IDA_ADDTOBOOKMARK_CLICKED,*pBitmap);
                        }
 
                        if (IsFailed(r))
@@ -1349,10 +1479,14 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                return ;
                        }
                        AppLogDebug("ONACTION_PERFORMED:IDA_MOREBTN_CLICKED 4");
-                       if (__pMenu->GetItemCount() != 6)
+                       if (__pMenu->GetItemCount() != 12)
                        {
-                               __pMenu->InsertItemAt(1,CommonUtil::GetString(L"IDS_BR_OPT_SHARE"), IDA_SHARE_CLICKED);
-                               __pMenu->InsertItemAt(2,CommonUtil::GetString(L"IDS_BR_OPT_FIND_ON_PAGE_ABB"), IDA_FINDONPAGE_CLICKED);
+                               __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(7,L"Save"/*CommonUtil::GetString(L"IDS_BR_OPT_FIND_ON_PAGE_ABB")*/, IDA_SAVE_CLICKED);
                                __pMenu->SetMaxVisibleItemsCount(6);
                        }
                        if( GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE || GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE)
@@ -1374,9 +1508,28 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                __pMenu->Invalidate(true);
                __pMenu->Show();
        }
+       break;
+       case IDA_HISTORY_CLICKED:
+       {
+               AppLogDebug("ONACTION_PERFORMED:IDA_HISTORYBTN_CLICKED");
+               SceneManager::GetInstance()->GoForward(ForwardSceneTransition(IDSCN_HISTORY_LIST, SCENE_TRANSITION_ANIMATION_TYPE_NONE));
+       }
+       break;
+       case IDA_SAVED_PAGES_CLICKED:
+       {
 
+       }
        break;
+       case IDA_DESKTOP_VIEW_CLICKED:
+       {
 
+       }
+       break;
+       case IDA_SAVE_CLICKED:
+       {
+
+       }
+       break;
        case IDA_MULTIWINDOWBTN_CLICKED:
        {
                result r = SceneManager::GetInstance()->GoForward(ForwardSceneTransition(IDSCN_MULTIPLE_WINDOW, SCENE_TRANSITION_ANIMATION_TYPE_NONE));
@@ -1445,8 +1598,9 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        __pBlankPanel = null;
                        __pArticleReaderLabel = null;
                }
-               if (__pAddressbar)
-                       __pAddressbar->SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING_COMPLETE);
+               //if (__pAddressbar)
+               //      __pAddressbar->SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING_COMPLETE);
+               SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING_COMPLETE);
        }
        break;
        case IDA_FINDWORD_CANCEL_CLICKED:
@@ -1724,13 +1878,27 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                if (pString != null)
                {
                        String idElement = __pHitElementResult->GetAttributeValue(L"id");
+                       String nameElement = __pHitElementResult->GetAttributeValue(L"name");
                        AppLog("MainForm::IDA_PASTE_TEXT_CLICKED id is %ls",idElement.GetPointer());
-                       String script = L"function insertAtCursor(myField, myValue) {   if (document.selection) {               myField.focus();                sel = document.selection.createRange();                 sel.text = myValue;     }               else if (myField.selectionStart || myField.selectionStart == '0'){              var startPos = myField.selectionStart;          var endPos = myField.selectionEnd;              myField.value = myField.value.substring(0, startPos)+ myValue + myField.value.substring(endPos, myField.value.length);          } else {                        myField.value += myValue;               }       } insertAtCursor(";
-                       script.Append(idElement);
-                       script.Append(",");
-                       script.Append("\"");
-                       script.Append(*pString);
-                       script.Append("\");");
+                       String script = L"function insertAtCursor(myField, myValue) {   if (document.selection) {               myField.focus();                sel = document.selection.createRange();                 sel.text = myValue;     }               else if (myField.selectionStart || myField.selectionStart == '0'){              var startPos = myField.selectionStart;          var endPos = myField.selectionEnd;              myField.value = myField.value.substring(0, startPos)+ myValue + myField.value.substring(endPos, myField.value.length);          } else {                        myField.value += myValue;               }       } ";
+                       if(idElement.GetLength() != 0)
+                       {
+                               script.Append("insertAtCursor(");
+                               script.Append(idElement);
+                               script.Append(",");
+                               script.Append("\"");
+                               script.Append(*pString);
+                               script.Append("\");");
+                       }
+                       else if (nameElement.GetLength() != 0)
+                       {
+                               script.Append("insertAtCursor(document.getElementsByName('");
+                               script.Append(nameElement);
+                               script.Append("')[0],");
+                               script.Append("\"");
+                               script.Append(*pString);
+                               script.Append("\");");
+                       }
                        AppLog("MainForm::OnTouchLongPressed script is %ls",script.GetPointer());
                        String* pStr = __pWebViewer->EvaluateJavascriptN(script);
                        delete pStr;
@@ -1738,6 +1906,59 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                delete pItem;
        }
        break;
+       case IDA_GO_BACK:
+       {
+               OnBackClicked();
+       }
+       break;
+       case IDA_GO_FORWARD:
+       {
+               OnForwardClicked();
+       }
+       break;
+       case IDA_REFRESH_BTN_CLICKED:
+       {
+               __isLoadingCompleted = false;
+               __isLoadingData = true;
+               __progressPercentage = 0;
+               __displayUrl = __pFooterUrlField->GetText();
+
+               String url = __pFooterUrlField->GetText();
+               AppLog("MainForm::OnUrlSubmitted url is %ls", url.GetPointer());
+               LoadUrl(url);
+
+               //OnUrlSubmitted();
+               UpdateProgressBitmap();
+       }
+       break;
+       case IDA_STOP_BTN_CLICKED:
+       {
+               __isLoadingCompleted = false;
+               __isLoadingData = false;
+               __progressPercentage = 0;
+               __pFooterUrlField->HideKeypad();
+               __displayUrl = __pFooterUrlField->GetText();
+
+               if (__pWebViewer)
+               {
+                       //__pAddressbar->SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING_COMPLETE);
+                       SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING_COMPLETE);
+                       __pWebViewer->StopLoading();
+                       RequestRedraw(true);
+               }
+
+               UpdateProgressBitmap();
+       }
+       break;
+       case IDA_CLEAR_URL:
+       {
+               if (__pFooterUrlField->GetText().IsEmpty() == false)
+               {
+                       //__displayUrl = __pUrlField->GetText();
+                       __pFooterUrlField->Clear();
+               }
+       }
+       break;
        default:
                break;
        }
@@ -1797,6 +2018,9 @@ MainForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
        InitFooter();
        InitAddressbar();
 
+       // hiding the address bar
+       __pAddressbar->SetBounds(__pAddressbar->GetX(), __pAddressbar->GetY() - __pAddressbar->GetHeight(), __pAddressbar->GetWidth(), __pAddressbar->GetHeight());
+       __pAddressbar->SetShowState(false);
        if(__pWebViewer != null)
        {
                __pWebViewer->Resume();
@@ -1834,7 +2058,8 @@ MainForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                if (pBookmarkUrl == null)
                        return;
                AppLogDebug("bookmarkUrl = %ls",pBookmarkUrl->GetPointer());
-               __pAddressbar->SetUrl(*pBookmarkUrl);
+               //__pAddressbar->SetUrl(*pBookmarkUrl);
+               SetUrl(*pBookmarkUrl);
 
                if (__pWebViewer != null && homePage.CompareTo((L"IDS_BR_BODY_BLANK_PAGE")) != 0)
                        __pWebViewer->LoadUrl(*pBookmarkUrl);
@@ -1854,7 +2079,7 @@ MainForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
 
                if (__pAddressbar != null)
                {
-                       __pAddressbar->UpdateFaviconBitmap(true);
+               //      __pAddressbar->UpdateFaviconBitmap(true);
                }
 
        }
@@ -1869,7 +2094,7 @@ MainForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
 
                if (__pAddressbar != null)
                {
-                       __pAddressbar->UpdateFaviconBitmap(false);
+               //      __pAddressbar->UpdateFaviconBitmap(false);
                }
        }
 
@@ -2024,11 +2249,13 @@ MainForm::OnLoadingStarted(void)
                MoveUiControls();
        }
 
-       __pAddressbar->SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING);
+       //__pAddressbar->SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING);
+       SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING);
        if (__pWebViewer)
        {
                AppLog("MainForm::OnLoadingStarted __pWebViewer->GetUrl() %ls",__pWebViewer->GetUrl().GetPointer());
-               __pAddressbar->SetUrl(__pWebViewer->GetUrl());
+               //__pAddressbar->SetUrl(__pWebViewer->GetUrl());
+               SetUrl(__pWebViewer->GetUrl());
                if (__pWindowInfo != NULL)
                {
                        __pWindowInfo->pageUrl = __pWebViewer->GetUrl();
@@ -2048,15 +2275,20 @@ MainForm::OnLoadingCanceled(void)
 void
 MainForm::OnKeypadWillOpen(Tizen::Ui::Control& source)
 {
-       if(__pAddressbar != null)
+       AppLog("MainForm::OnKeypadWillOpen");
+       if (__pAddressbar != null)
        {
                OnAddressBarKeypadOpened(*__pAddressbar);
        }
+
+       //__pAddressbar->SetAddressbarURLFocus();
+
 }
 
 void
-MainForm::OnKeypadClosed(Tizen::Ui::Control& source){
-       if(__pAddressbar != null)
+MainForm::OnKeypadClosed(Tizen::Ui::Control& source)
+{
+       if (__pAddressbar != null)
        {
                OnAddressBarKeypadClosed(*__pAddressbar);
        }
@@ -2086,26 +2318,27 @@ MainForm::OnLoadingCompleted(void)
        }
        if (__pWebViewer->CanGoForward())
        {
-               __pAddressbar->SetForwardButtonEnabled(true);
+               //__pAddressbar->SetForwardButtonEnabled(true);
+               SetForwardButtonEnabled(true);
        }
        else
        {
-               __pAddressbar->SetForwardButtonEnabled(false);
+               //__pAddressbar->SetForwardButtonEnabled(false);
+               SetForwardButtonEnabled(false);
        }
 
-       if (__pWebViewer->CanGoBack())
-       {
-               __pAddressbar->SetBackButtonEnabled(true);
-       }
-       else
-       {
-               __pAddressbar->SetBackButtonEnabled(false);
-       }
-       if (__pAddressbar->GetAddressbarMode() != ADDRESSBAR_MODE_EDIT)
+       /*if (__pAddressbar->GetAddressbarMode() != ADDRESSBAR_MODE_EDIT)
        {
                __pAddressbar->SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING_COMPLETE);
 
-               __pAddressbar->UpdateProgress(0);
+               //__pAddressbar->UpdateProgress(0);
+               UpdateProgress(0);
+       }*/
+
+       if(GetAddressbarMode() != ADDRESSBAR_MODE_EDIT)
+       {
+               SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING_COMPLETE);
+               UpdateProgress(0);
        }
 
        AppLog("PrivateBrowsing %d",__pWebViewer->IsPrivateBrowsingEnabled());
@@ -2156,14 +2389,18 @@ MainForm::OnEstimatedProgress(int progress)
        AppLogDebug("MainForm::OnEstimatedProgress entered");
        if (progress < DEFAULT_PROGRESS_PERCENTAGE)
                progress = DEFAULT_PROGRESS_PERCENTAGE;
-       if(__pAddressbar)
-               __pAddressbar->UpdateProgress(progress);
+       //if(__pAddressbar)
+       //      __pAddressbar->UpdateProgress(progress);
+       UpdateProgress(progress);
 }
 
 void
 MainForm::OnUrlSubmitted(Addressbar& addBar)
 {
+       AppLog("MainForm::OnUrlSubmitted");
        String url = addBar.GetUrl();
+       AppLog("MainForm::OnUrlSubmitted url is %ls", url.GetPointer());
+
        LoadUrl(url);
        __pFooterPanel->SetShowState(true);
        __pFooterPanel->Invalidate(true);
@@ -2175,6 +2412,12 @@ MainForm::LoadUrl(String& url)
 {
        AppLogDebug("MainForm::LoadUrl enter");
 
+       if (__pWebViewer != null)
+       {
+               __pWebViewer->SetShowState(true);
+               __pWebViewer->Invalidate(true);
+       }
+
        if (url.CompareTo(L"") == 0)
        {
                return;
@@ -2222,7 +2465,8 @@ MainForm::LoadUrl(String& url)
        }
        if (__pAddressbar != null)
        {
-               __pAddressbar->SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING);
+               //__pAddressbar->SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING);
+               SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING);
        }
 
        AppLogDebug("MainForm::LoadUrl exit");
@@ -2237,7 +2481,8 @@ MainForm::OnStopClicked(Addressbar& addBar)
        AppLogDebug("MainForm::OnStopClicked called");
        if (__pWebViewer)
        {
-               __pAddressbar->SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING_COMPLETE);
+               //__pAddressbar->SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING_COMPLETE);
+               SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING_COMPLETE);
                __pWebViewer->StopLoading();
                RequestRedraw(true);
        }
@@ -2325,21 +2570,34 @@ MainForm::OnReaderClicked(const Addressbar& addBar)
 }
 
 void
-MainForm::OnBackClicked(const Addressbar& addBar)
+MainForm::OnBackClicked(/*const Addressbar& addBar*/)
 {
-       if (__pWebViewer == null)
-               return;
+       AppLog("MainForm::OnBackClicked");
+       result r = E_FAILURE;
 
-       if (__pWebViewer->CanGoBack())
+       if (__pWebViewer != null && __pWebViewer->CanGoBack())
        {
                __pWebViewer->GoBack();
        }
-
+       else
+       {
+               UiApp* pApp = null;
+               pApp = UiApp::GetInstance();
+               if(pApp != null)
+               {
+                       r = pApp->Terminate();
+                       if (IsFailed(r))
+                       {
+                               return;
+                       }
+               }
+       }
 }
 
 void
-MainForm::OnForwardClicked(const Addressbar& addBar)
+MainForm::OnForwardClicked(/*const Addressbar& addBar*/)
 {
+       AppLog("MainForm::OnForwardClicked");
        if (__pWebViewer == null)
                return;
 
@@ -2352,18 +2610,57 @@ MainForm::OnForwardClicked(const Addressbar& addBar)
 void
 MainForm::OnAddressCancelledClicked(const Addressbar& addBar)
 {
+       result r = E_SUCCESS;
+       // hiding the address bar
+       __pAddressbar->SetBounds(__pAddressbar->GetX(), __pAddressbar->GetY() - __pAddressbar->GetHeight(), __pAddressbar->GetWidth(), __pAddressbar->GetHeight());
+       __pAddressbar->SetShowState(false);
+
+       if (__pMostVisitedListView != null && __pMostVisitedListView->GetShowState() == true)
+       {
+               AppLog("MainForm::OnAddressCancelledClicked 1");
+               if (__pMostVisitedListView != null && __pAddressbar != null && __pFooterPanel != null)
+                       __pMostVisitedListView->SetBounds(Tizen::Graphics::Rectangle(0,__pAddressbar->GetBounds().y + __pAddressbar->GetHeight()-12 , GetClientAreaBounds().width, __pMostVisitedListView->GetHeight()/*GetClientAreaBounds().height - __pAddressbar->GetHeight() - __pFooterPanel->GetHeight() + 14*/));
+
+               if (__pMostVisitedListView != null)
+                       __pMostVisitedListView->Invalidate(true);
+       }
+       /*else if (__pWebViewer != null && __pWebViewer->GetShowState() == true)
+       {
+               if (__pWebViewer != null && __pAddressbar != null && __pFooterPanel != null)
+               {
+                       AppLog("MainForm::OnAddressCancelledClicked 2");
+                       r = __pWebViewer->SetBounds(Rectangle(0,0__pAddressbar->GetBounds().y + __pAddressbar->GetHeight()-12 , GetClientAreaBounds().width, __webControlHeightGetClientAreaBounds().height - __pAddressbar->GetHeight() - __pFooterPanel->GetHeight() + 14));
+                       if (r == E_SUCCESS)
+                       {
+                               AppLog("MainForm::OnAddressCancelledClicked success");
+                       }
+                       else
+                       {
+                               AppLog("MainForm::OnAddressCancelledClicked failure");
+                       }
+               }
+
+               int yOfWebViewer = __pWebViewer->GetY();
+               int heightOfWebViewer = __pWebViewer->GetHeight();
+               AppLog("MainForm::OnAddressCancelledClicked yOfWebViewer is %d",yOfWebViewer);
+               AppLog("MainForm::OnAddressCancelledClicked heightOfWebViewer is %d",heightOfWebViewer);
+
+               __pWebViewer->Invalidate(true);
+       }*/
+
        __pFooterPanel->SetShowState(true);
        __pFooterPanel->Invalidate(false);
 }
 
 void
-MainForm::OnAddressBarModeChanged(const Addressbar& addBar)
+MainForm::OnAddressBarModeChanged(/*const Addressbar& addBar*/)
 {
        __prevAddressBarMode = __curAddressBarMode;
 
        if (__pAddressbar != null)
        {
-               __curAddressBarMode = __pAddressbar->GetAddressbarMode();
+               //__curAddressBarMode = __pAddressbar->GetAddressbarMode();
+               __curAddressBarMode = GetAddressbarMode();
        }
 
        if (__curAddressBarMode == ADDRESSBAR_MODE_EDIT)
@@ -2378,9 +2675,18 @@ MainForm::OnAddressBarModeChanged(const Addressbar& addBar)
                if (__pWebViewer != null)
                {
                        __pWebViewer->StopLoading();
-
                }
+       }
+       else if(__curAddressBarMode == ADDRESSBAR_MODE_LOADING)
+       {
+               __adressPanelPosition.y = 0;
+               if (__pAddressbar != null)
+               {
 
+                       __webControlPosition.y = 0;//__pAddressbar->GetHeight() - 12;
+                       __pAddressbar->SetBounds(Rectangle(0,__pAddressbar->GetY() - __pAddressbar->GetHeight(),GetClientAreaBounds().width,__pAddressbar->GetHeight()));
+                       __pAddressbar->Invalidate(true);
+               }
        }
        if (__pWebViewer != null)
        {
@@ -2414,10 +2720,10 @@ MainForm::OnAddressBarKeypadClosed(const Addressbar& addBar)
        if (__pWebViewer != null && __pFooterPanel != null)
        {
                AppLog("MainForm::OnAddressBarKeypadClosed GetClientAreaBounds().height %d ", GetClientAreaBounds().height);
-               __webControlHeight = GetClientAreaBounds().height - __pFooterPanel->GetHeight() -  (__pAddressbar->GetY() + __pAddressbar->GetHeight() - 12);
+               __webControlHeight = GetClientAreaBounds().height - __pFooterPanel->GetHeight();
 
                if(__pFooterPanel->GetShowState() == false)
-                       __pWebViewer->SetBounds(Rectangle(0,__webControlPosition.y,GetClientAreaBounds().width, GetClientAreaBounds().height - ( __pAddressbar->GetY() + __pAddressbar->GetHeight() - 12)));
+                       __pWebViewer->SetBounds(Rectangle(0,__webControlPosition.y,GetClientAreaBounds().width, GetClientAreaBounds().height));
                else
                        __pWebViewer->SetBounds(Rectangle(0,__webControlPosition.y,GetClientAreaBounds().width, __webControlHeight));
                __pWebViewer->Invalidate(false);
@@ -2431,8 +2737,67 @@ MainForm::OnAddressBarKeypadClosed(const Addressbar& addBar)
 void
 MainForm::OnAddressBarKeypadOpened(const Addressbar& addBar)
 {
+       AppLog("MainForm::OnAddressBarKeypadOpened");
+
+       if (__pFindWordPanel && __pFindWordPanel->GetShowState() == true)
+       {
+               __pAddressbar->SetShowState(false);
+               __pAddressbar->Invalidate(true);
+       }
+       else
+       {
+               if (__pAddressbar != null && __pAddressbar->GetShowState() == false)
+               {
+               __pAddressbar->SetShowState(true);
+               __pAddressbar->Invalidate(true);
+               __pAddressbar->SetBounds(Rectangle(0,0,GetClientAreaBounds().width,__pAddressbar->GetHeight()));
+               __pAddressbar->SetAddressbarURLFocus();
+               }
+       }
+
+       // setting the
+       //__pAddressbar->SetBounds(__pAddressbar->GetX(), 0, __pAddressbar->GetWidth(), __pAddressbar->GetHeight());
+
+
+       if (__pMostVisitedListView && __pMostVisitedListView->GetShowState() == true)
+       {
+               AppLog("MainForm::OnAddressBarKeypadOpened 1");
+               if (__pMostVisitedListView != null && __pAddressbar != null && __pFooterPanel != null)
+                       __pMostVisitedListView->SetBounds(Tizen::Graphics::Rectangle(0,__pAddressbar->GetBounds().y + __pAddressbar->GetHeight()-12 , GetClientAreaBounds().width, /*__pMostVisitedListView->GetHeight()*/GetClientAreaBounds().height - __pAddressbar->GetHeight() - __pFooterPanel->GetHeight() + 14));
+
+               if(__pMostVisitedListView != null)
+               __pMostVisitedListView->Invalidate(true);
+       }
+       else if (__pWebViewer != null && __pWebViewer->GetShowState() == true)
+       {
+               AppLog("MainForm::OnAddressBarKeypadOpened 2");
+               if (__pWebViewer != null && __pAddressbar != null && __pFooterPanel != null)
+                       __pWebViewer->SetBounds(Tizen::Graphics::Rectangle(0,__pAddressbar->GetBounds().y + __pAddressbar->GetHeight()-12 , GetClientAreaBounds().width, /*__pWebViewer->GetHeight()*/GetClientAreaBounds().height - __pAddressbar->GetHeight() - __pFooterPanel->GetHeight() + 14));
+
+               if(__pWebViewer != null)
+               __pWebViewer->Invalidate(true);
+       }
+
+       /*else
+               {
+                       if (__pWebViewer != null)
+                       {
+                               __pWebViewer->SetShowState(false);
+                               __pWebViewer->Invalidate(true);
+                       }
+
+                       __pMostVisitedListView->SetShowState(true);
+                       if (__pMostVisitedListView != null && __pAddressbar != null && __pFooterPanel != null)
+                               __pMostVisitedListView->SetBounds(Tizen::Graphics::Rectangle(0,__pAddressbar->GetBounds().y + __pAddressbar->GetHeight()-12 , GetClientAreaBounds().width, __pMostVisitedListView->GetHeight()GetClientAreaBounds().height - __pAddressbar->GetHeight() - __pFooterPanel->GetHeight() + 14));
+
+                       if(__pMostVisitedListView != null)
+                               __pMostVisitedListView->Invalidate(true);
+
+               }*/
+
+
        __pFooterPanel->SetShowState(false);
-       __pFooterPanel->Invalidate(false);
+       __pFooterPanel->Invalidate(true);
 }
 
 void
@@ -2455,8 +2820,9 @@ MainForm::OnPageTitleReceived(const Tizen::Base::String& title)
        }
        if (__pAddressbar != null && __pWebViewer != null)
        {
-               __pAddressbar->SetUrl(__pWebViewer->GetUrl());
-               __pAddressbar->UpdateFaviconBitmap(SettingPresentationModel::GetInstance()->GetPrivateOn());
+               SetUrl(__pWebViewer->GetUrl());
+               //__pAddressbar->SetUrl(__pWebViewer->GetUrl());
+               //__pAddressbar->UpdateFaviconBitmap(SettingPresentationModel::GetInstance()->GetPrivateOn());
                __pAddressbar->Invalidate(true);
        }
 
@@ -2539,6 +2905,10 @@ MainForm::OnLoadingRequested(const Tizen::Base::String& url,
 {
        // when load new page if find word panel is open its show state is false
        ShowFindWordPanel(false);
+       AppLog("__pAddressbar->GetAddressbarURL() is %ls",__pAddressbar->GetAddressbarURL().GetPointer());
+
+        __pFooterUrlField->SetText(__pAddressbar->GetAddressbarURL());
+        __pFooterPanel->Invalidate(true);
 
        Uri uriInfo;
        uriInfo.SetUri(url);
@@ -2603,7 +2973,8 @@ MainForm::OnLoadingRequested(const Tizen::Base::String& url,
 
        if (__pWebViewer && __pAddressbar)
        {
-               AppLog("__pWebViewer->GetUrl() %ls",__pWebViewer->GetUrl().GetPointer());
+               __pAddressbar->SetShowState(false);
+               /*AppLog("__pWebViewer->GetUrl() %ls",__pWebViewer->GetUrl().GetPointer());
                __pAddressbar->SetUrl(__pWebViewer->GetUrl());
                __pAddressbar->UpdateProgress(DEFAULT_PROGRESS_PERCENTAGE);
 
@@ -2621,7 +2992,7 @@ MainForm::OnLoadingRequested(const Tizen::Base::String& url,
                        }
                        __pWindowInfo->pFavicon = FaviconManager::GetInstance()->GetDefaultFaviconN();
 
-               }
+               }*/
 
                __pAddressbar->Invalidate(true);
        }
@@ -2771,14 +3142,16 @@ void MainForm::ShowFindWordPanel(bool show , bool isTouchPressed)
                __pFindWordEditField->SetText(__currentSearchStr);
                //__pFindWordCountLabel->SetText(L"");
                __pFindWordCountLabel->SetText(L"0/0");
-
        }
 
        AppLog("MainForm::ShowFindWordPanel %d",show);
        if (show && !isTouchPressed)
        {
                if (__pFindWordEditField)
+               {
+                       __pFindWordEditField->SetFocus();
                        __pFindWordEditField->ShowKeypad();
+               }
        }
        else
        {
@@ -2788,7 +3161,8 @@ void MainForm::ShowFindWordPanel(bool show , bool isTouchPressed)
 
        if (__pAddressbar != null)
        {
-               __pAddressbar->SetShowState(!show);
+               __pAddressbar->SetBounds(__pAddressbar->GetX(), 0 - __pAddressbar->GetHeight(), __pAddressbar->GetWidth(), __pAddressbar->GetHeight());
+               __pAddressbar->SetShowState(false);
                __pAddressbar->Invalidate(true);
        }
        if (__pFindWordPanel != null)
@@ -2933,6 +3307,7 @@ MainForm::FindNextWord(bool next)
 void
 MainForm::OnWebKeypadWillOpen(Tizen::Web::Controls::Web& source)
 {
+       AppLog("MainForm::OnWebKeypadWillOpen");
        OnAddressBarKeypadOpened(*__pAddressbar);
 }
 
@@ -2943,10 +3318,10 @@ MainForm::OnWebKeypadOpened(Tizen::Web::Controls::Web& source)
        if (__pWebViewer != null && __pFooterPanel != null)
        {
                AppLog("MainForm::OnOrientationChanged GetClientAreaBounds().height %d ", GetClientAreaBounds().height);
-               __webControlHeight = GetClientAreaBounds().height - __pFooterPanel->GetHeight() - ( __pAddressbar->GetY() + __pAddressbar->GetHeight() - 12);
+               __webControlHeight = GetClientAreaBounds().height - __pFooterPanel->GetHeight();
 
-               if(__pFooterPanel->GetShowState() == false)
-                       __pWebViewer->SetBounds(Rectangle(0,__webControlPosition.y,GetClientAreaBounds().width, GetClientAreaBounds().height - ( __pAddressbar->GetY() + __pAddressbar->GetHeight() - 12)));
+               if (__pFooterPanel->GetShowState() == false)
+                       __pWebViewer->SetBounds(Rectangle(0,__webControlPosition.y,GetClientAreaBounds().width, GetClientAreaBounds().height));
                else
                        __pWebViewer->SetBounds(Rectangle(0,__webControlPosition.y,GetClientAreaBounds().width, __webControlHeight));
 
@@ -3024,7 +3399,8 @@ MainForm::OnTouchDoublePressed(const Control& source, const Point& currentPositi
                AppLogDebug("evaluateJavascript result %s , __pReaderData %ls",GetErrorMessage(GetLastResult()),__pReaderData->GetPointer());
                if (__pReaderData->CompareTo(L"undefined") != 0 && __pReaderData->CompareTo(L"") != 0)
                {
-                       __pAddressbar->SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_READER);
+                       //__pAddressbar->SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_READER);
+                       SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_READER);
                }
                delete[] pScript;
        }
@@ -3156,10 +3532,10 @@ MainForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen::Ui::Ori
        if (__pWebViewer != null && __pFooterPanel != null)
        {
                AppLog("MainForm::OnOrientationChanged GetClientAreaBounds().height %d ", GetClientAreaBounds().height);
-               __webControlHeight = GetClientAreaBounds().height - __pFooterPanel->GetHeight() - ( __pAddressbar->GetY() + __pAddressbar->GetHeight() - 12);
+               __webControlHeight = GetClientAreaBounds().height - __pFooterPanel->GetHeight();
 
                if(__pFooterPanel->GetShowState() == false)
-                       __pWebViewer->SetBounds(Rectangle(0,__webControlPosition.y,GetClientAreaBounds().width, GetClientAreaBounds().height - ( __pAddressbar->GetY() + __pAddressbar->GetHeight() - 12)));
+                       __pWebViewer->SetBounds(Rectangle(0,__webControlPosition.y,GetClientAreaBounds().width, GetClientAreaBounds().height));
                else
                        __pWebViewer->SetBounds(Rectangle(0,__webControlPosition.y,GetClientAreaBounds().width, __webControlHeight));
                __pWebViewer->Invalidate(true);
@@ -3168,9 +3544,18 @@ MainForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen::Ui::Ori
        }
        if (__pAddressbar != null)
        {
-               __pAddressbar->SetBounds(Rectangle(0,0,GetClientAreaBounds().width,__pAddressbar->GetHeight()));
-               __pAddressbar->SetAddressbarMode(__pAddressbar->GetAddressbarMode());
-               __pAddressbar->UpdateFaviconBitmap(SettingPresentationModel::GetInstance()->GetPrivateOn());
+               if(__pAddressbar->GetShowState() == false)
+               {
+                       __pAddressbar->SetBounds(__pAddressbar->GetX(), 0 - __pAddressbar->GetHeight(), __pAddressbar->GetWidth(), __pAddressbar->GetHeight());
+               }
+               else
+               {
+                       __pAddressbar->SetBounds(__pAddressbar->GetX(), 0, __pAddressbar->GetWidth(), __pAddressbar->GetHeight());
+               }
+               //__pAddressbar->SetBounds(Rectangle(0,0,GetClientAreaBounds().width,__pAddressbar->GetHeight()));
+               //__pAddressbar->SetAddressbarMode(__pAddressbar->GetAddressbarMode());
+               SetAddressbarMode(GetAddressbarMode());
+       //      __pAddressbar->UpdateFaviconBitmap(SettingPresentationModel::GetInstance()->GetPrivateOn());
        }
        if (__pFindWordBgLabel != null)
        {
@@ -3208,10 +3593,15 @@ MainForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen::Ui::Ori
 
        if(__pMostVisitedListView != null && __pAddressbar != null && __pFooterPanel != null)
        {
-               __pMostVisitedListView->SetBounds(__pAddressbar->GetX(),__pAddressbar->GetY()+__pAddressbar->GetHeight(),GetClientAreaBounds().width,GetClientAreaBounds().height - __pAddressbar->GetHeight()- __pFooterPanel->GetHeight());
+               if(__pAddressbar != null && __pAddressbar->GetShowState() == true)
+               {
+                       __pMostVisitedListView->SetBounds(__pAddressbar->GetX(),__pAddressbar->GetY()+__pAddressbar->GetHeight(),GetClientAreaBounds().width,GetClientAreaBounds().height - __pAddressbar->GetHeight()- __pFooterPanel->GetHeight());
+               }
+               else if(__pAddressbar != null && __pAddressbar->GetShowState() == false)
+               {
+                       __pMostVisitedListView->SetBounds(__pAddressbar->GetX(),__pAddressbar->GetY()+__pAddressbar->GetHeight(),GetClientAreaBounds().width,GetClientAreaBounds().height - __pFooterPanel->GetHeight());
+               }
        }
-
-       AppLog("OnOrientationChanged 0");
        if (__pArticleReaderPanel != null)
        {
                if (__pArticleReaderPanel->GetShowState() == true)
@@ -3420,7 +3810,7 @@ MainForm::OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphics
                        TouchInfo* pTouchInfo = static_cast<TouchInfo*>(pList->GetAt(0));
                        __touchPoint1 = pTouchInfo->position;
 
-                       if (__pAddressbar != null)
+                       /*if (__pAddressbar != null)
                        {
                                if (__pAddressbar->GetAddressbarMode() != ADDRESSBAR_MODE_LOADING_COMPLETE && __pAddressbar->GetAddressbarMode() != ADDRESSBAR_MODE_LOADING)
                                {
@@ -3432,6 +3822,14 @@ MainForm::OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphics
                                }
 
                                __pAddressbar->Invalidate(true);
+                       }*/
+                       if (GetAddressbarMode() != ADDRESSBAR_MODE_LOADING_COMPLETE && GetAddressbarMode() != ADDRESSBAR_MODE_LOADING)
+                       {
+                               if (GetAddressbarMode() == ADDRESSBAR_MODE_EDIT)
+                               {
+                                       //__pAddressbar->SaveAddressbarEditText();
+                               }
+                               SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING_COMPLETE);
                        }
                }
                else if (count == 2)
@@ -3468,7 +3866,11 @@ MainForm::OnTouchMoved(const Tizen::Ui::Control& source, const Tizen::Graphics::
                __pFindWordEditField->HideKeypad();
        }
 
-       if (__pAddressbar->GetAddressbarMode() == ADDRESSBAR_MODE_EDIT)
+       /*if (__pAddressbar->GetAddressbarMode() == ADDRESSBAR_MODE_EDIT)
+       {
+               return;
+       }*/
+       if (GetAddressbarMode() == ADDRESSBAR_MODE_EDIT)
        {
                return;
        }
@@ -3554,12 +3956,11 @@ MainForm::OnTouchMoved(const Tizen::Ui::Control& source, const Tizen::Graphics::
 void
 MainForm::MoveUiControls()
 {
-       __adressPanelPosition.y =  __adressPanelPosition.y + __distanceMoved;
-       if(__pAddressbar == NULL)
+       if(__pAddressbar == NULL || __pAddressbar->GetShowState() == false)
        {
                return;
        }
-
+       __adressPanelPosition.y =  __adressPanelPosition.y + __distanceMoved;
        if (__adressPanelPosition.y > 0)
        {
                __adressPanelPosition.y = 0;
@@ -3583,9 +3984,9 @@ MainForm::MoveUiControls()
        if (__pWebViewer != NULL)
        {
                if(__pFooterPanel->GetShowState() == true)
-                       __webControlHeight = GetClientAreaBounds().height - __pFooterPanel->GetHeight() - ( __pAddressbar->GetY() + __pAddressbar->GetHeight() - 12);
+                       __webControlHeight = GetClientAreaBounds().height - __pFooterPanel->GetHeight();
                else
-                       __webControlHeight = GetClientAreaBounds().height - ( __pAddressbar->GetY() + __pAddressbar->GetHeight() - 12);
+                       __webControlHeight = GetClientAreaBounds().height;
                __pWebViewer->SetBounds(Rectangle(0,__webControlPosition.y,GetClientAreaBounds().width, __webControlHeight));
                __pWebViewer->Invalidate(false);
        }
@@ -3650,7 +4051,7 @@ MainForm::InitMostVisitedSitesView(Tizen::Ui::OrientationStatus orientationStatu
 
        HistoryPresentationModel::GetInstance()->GetMostVisitedSites(*__pMostVisitedSites);
 
-       __webControlHeight = GetClientAreaBounds().height - __pFooterPanel->GetHeight() - ( __pAddressbar->GetY() + __pAddressbar->GetHeight() - 12);
+       __webControlHeight = GetClientAreaBounds().height - __pFooterPanel->GetHeight();
        __pMostVisitedListView = new(std::nothrow) ListView();
        if(__pFooterPanel->GetShowState() == false)
        {
@@ -3741,3 +4142,254 @@ void MainForm::UpdateImageContent(ByteBuffer* aBuffer, String imageName)
        contentId = contentManager.CreateContent(*aBuffer, contentPath);
        AppLog("Content manager update content result %s" ,GetErrorMessage(GetLastResult()));
 }
+
+void
+MainForm::SetForwardButtonEnabled(bool isEnabled)
+{
+       __pGoForwardBtn->SetEnabled(isEnabled);
+       __pGoBackBtn->Invalidate(true);
+}
+
+void
+MainForm::SetBackButtonEnabled(bool isEnabled)
+{
+       __pGoBackBtn->SetEnabled(isEnabled);
+       __pGoBackBtn->Invalidate(true);
+}
+
+void
+MainForm::UpdateProgress(int percentage)
+{
+       __progressPercentage = percentage;
+       if (percentage == 0 || percentage == 100)
+       {
+               __isLoadingData = false;
+               if (percentage == 100)
+               {
+                       __isLoadingCompleted = true;
+                       __progressPercentage = 0;
+               }
+               else
+               {
+                       __isLoadingCompleted = false;
+               }
+       }
+       else
+       {
+               __isLoadingData = true;
+       }
+       UpdateProgressBitmap();
+}
+
+int
+MainForm::GetProgress(void)
+{
+       return __progressPercentage;
+}
+
+void
+MainForm::UpdateProgressBitmap(void)
+{
+       result r = E_SUCCESS;
+       if (__pProgressbarLabel == null)
+               return;
+       int w = __pProgressbarLabel->GetWidth();
+       int h = __pProgressbarLabel->GetHeight();
+       Canvas canvas;
+       int progressWidth = 0;
+       Bitmap* pRetBitmap = null;
+
+       if (__progressPercentage == 0 || __progressPercentage == 100)
+       {
+               __pProgressbarLabel->SetShowState(false);
+               __pProgressbarLabel->Invalidate(false);
+               return;
+       }
+       else
+       {
+               __pProgressbarLabel->SetShowState(true);
+               __pProgressbarLabel->Invalidate(false);
+       }
+
+       r = canvas.Construct(Rectangle(0, 0, w, h));
+
+       if (r != E_SUCCESS)
+       {
+               AppLogException("Canvas construction failed with %s", GetErrorMessage(r));
+               return;
+       }
+
+       canvas.Clear();
+       Bitmap *pBgBmp = AppResource::GetInstance()->GetBitmapN(IDB_TITLE_PROGRESS_BAR_BG);
+
+       if (pBgBmp != null)
+       {
+               pBgBmp->Scale(Dimension(w, h));
+               canvas.DrawBitmap(Point(0,0), *pBgBmp);
+               delete pBgBmp;
+       }
+
+       progressWidth = (double) (w) * __progressPercentage / 100;
+       AppLogDebug("progressWidth: %d", progressWidth);
+       Bitmap *pProgressBmp = AppResource::GetInstance()->GetBitmapN(IDB_TITLE_PROGRESS_BAR);
+
+       if (pProgressBmp != null)
+       {
+               pProgressBmp->Scale(Dimension(progressWidth, h));
+               canvas.DrawBitmap(Point(0,0), *pProgressBmp);
+               delete pProgressBmp;
+       }
+
+       pRetBitmap = new (std::nothrow) Bitmap();
+
+       if (pRetBitmap == null)
+       {
+               AppLogException("Bitmap creation failed with %s", GetErrorMessage(r));
+               return;
+       }
+
+       pRetBitmap->Construct(canvas, canvas.GetBounds());
+
+       if (__pProgressbarLabel != null && pRetBitmap != null)
+       {
+               __pProgressbarLabel->SetBackgroundBitmap(*pRetBitmap);
+               __pProgressbarLabel->Invalidate(false);
+       }
+
+       if (pRetBitmap != null)
+       {
+               delete pRetBitmap;
+               pRetBitmap = null;
+       }
+       return;
+}
+
+void MainForm::SetAddressbarMode(AddressBarMode addMode)
+{
+       AppLogDebug("AddressBar::setAddressbarMode to %d",addMode);
+
+       __currentAddMode = addMode;
+
+       switch(addMode)
+       {
+       case ADDRESSBAR_MODE_INVALID:
+       {
+               // do nothing
+       }
+       break;
+       case ADDRESSBAR_MODE_READER:
+       {
+               //      __pBgPanel->SetPosition(__pGoBackBtn->GetPosition().x + 2* __pGoBackBtn->GetWidth() + 13,__pBgPanel->GetPosition().y);
+               //      __pSearchLabel->SetShowState(false);
+               //      __pFaviconLabel->SetShowState(true);
+               //      __pCancelBtn->SetShowState(false);
+               //      __pRefreshBtn->SetShowState(false);
+               __pStopBtn->SetShowState(false);
+               //      __pReaderBtn->SetShowState(true);
+               //      __pReaderBtn->Invalidate(true);
+               //      __pGoForwardBtn->SetShowState(true);
+               //      __pGoBackBtn->SetShowState(true);
+               __pClearBtn->SetShowState(false);
+       }
+       break;
+       case ADDRESSBAR_MODE_LOADING:
+       {
+               //      __pBgPanel->SetPosition(__pGoBackBtn->GetPosition().x + 2* __pGoBackBtn->GetWidth() + 13,__pBgPanel->GetPosition().y);
+               //      __pSearchLabel->SetShowState(false);
+               //      __pFaviconLabel->SetShowState(true);
+               //      __pCancelBtn->SetShowState(false);
+               __pRefreshBtn->SetShowState(false);
+               __pStopBtn->SetShowState(true);
+               //      __pReaderBtn->SetShowState(false);
+               //      __pGoForwardBtn->SetShowState(true);
+               //      __pGoBackBtn->SetShowState(true);
+               __pClearBtn->SetShowState(false);
+       }
+       break;
+       case ADDRESSBAR_MODE_LOADING_COMPLETE:
+       {
+               //      __pBgPanel->SetPosition(__pGoBackBtn->GetPosition().x + 2* __pGoBackBtn->GetWidth() + 13,__pBgPanel->GetPosition().y);
+               //      __pCancelBtn->SetShowState(false);
+
+               if (__pFooterUrlField && __pFooterUrlField->GetText().IsEmpty() == false)
+               {
+                       //      __pSearchLabel->SetShowState(false);
+                       //      __pFaviconLabel->SetShowState(true);
+               }
+               else
+               {
+                       //      __pSearchLabel->SetShowState(true);
+                       //      __pFaviconLabel->SetShowState(false);
+               }
+
+               if (__pFooterUrlField != NULL)
+               {
+                       __pFooterUrlField->SetText(__displayUrl);
+                       __pFooterUrlField->HideKeypad();
+               }
+
+               __pRefreshBtn->SetShowState(true);
+               __pStopBtn->SetShowState(false);
+               //      __pReaderBtn->SetShowState(false);
+               //      __pGoForwardBtn->SetShowState(true);
+               //      __pGoBackBtn->SetShowState(true);
+               __pClearBtn->SetShowState(false);
+       }
+       break;
+       case ADDRESSBAR_MODE_EDIT:
+       {
+               __pRefreshBtn->SetShowState(false);
+               __pStopBtn->SetShowState(false);
+               __pClearBtn->SetShowState(true);
+       }
+       break;
+       }
+
+       Invalidate(true);
+
+       OnAddressBarModeChanged();
+}
+
+AddressBarMode MainForm::GetAddressbarMode(void)
+{
+       return __currentAddMode;
+}
+
+void MainForm::SetUrl(const String& url)
+{
+
+       __displayUrl = url;
+       String updatedDisplayUrl;
+       updatedDisplayUrl.Clear();
+
+       if (__pFooterUrlField != NULL)
+       {
+               String removedHttpUrl = RemoveHttpTextFromDisplayURL();
+               if (removedHttpUrl.IsEmpty() == false)
+               {
+                       __pFooterUrlField->SetText(removedHttpUrl);
+               }
+               else
+               {
+                       __pFooterUrlField->SetText(__displayUrl);
+               }
+
+               __pFooterUrlField->Invalidate(false);
+               __pFooterUrlField->SetCursorPosition(0);
+       }
+
+}
+
+String
+MainForm::RemoveHttpTextFromDisplayURL(void)
+{
+       bool isHttpText = __displayUrl.Contains(L"http://");
+       String updatedDisplayUrl;
+       updatedDisplayUrl.Clear();
+
+       if (isHttpText == true)
+       {
+               __displayUrl.SubString(7,updatedDisplayUrl);
+       }
+       return updatedDisplayUrl;
+}