Fixed Nabi Issues
authorVinay Sachdeva <v.sachdeva@samsung.com>
Thu, 23 May 2013 15:00:04 +0000 (20:30 +0530)
committerVinay Sachdeva <v.sachdeva@samsung.com>
Thu, 23 May 2013 15:00:04 +0000 (20:30 +0530)
Change-Id: I63ded45c7a56d910eb1bc2c906d0394e2c33d8b9
Signed-off-by: Vinay Sachdeva <v.sachdeva@samsung.com>
24 files changed:
inc/IntAddressbar.h
inc/IntArticleReaderForm.h [new file with mode: 0644]
inc/IntIAddressbarEventListener.h
inc/IntMainForm.h
inc/IntPresentationModelBase.h
res/eng-GB.xml
res/screen-density-xhigh/I01_font_button_left.png [new file with mode: 0644]
res/screen-density-xhigh/I01_font_button_left_dim.png [new file with mode: 0644]
res/screen-density-xhigh/I01_font_button_left_press.png [new file with mode: 0644]
res/screen-density-xhigh/I01_font_button_right.png [new file with mode: 0644]
res/screen-density-xhigh/I01_font_button_right_dim.png [new file with mode: 0644]
res/screen-density-xhigh/I01_font_button_right_press.png [new file with mode: 0644]
res/screen-density-xhigh/I01_title_font_bg.png [new file with mode: 0644]
res/screen-size-normal/IDL_ADD_BOOKMARK.xml
res/screen-size-normal/IDL_ARTICLE_READER_FORM.xml [new file with mode: 0644]
res/screen-size-normal/IDL_FIND_ON_PAGE.xml
res/screen-size-normal/IDL_FORM.xml
src/IntAddressbar.cpp
src/IntArticleReaderForm.cpp [new file with mode: 0644]
src/IntBookmarkListForm.cpp
src/IntFormFactory.cpp
src/IntMainForm.cpp
src/IntPresentationModelBase.cpp
src/IntSceneRegister.cpp

index cf87ed0..d98a54c 100644 (file)
@@ -184,7 +184,7 @@ class Addressbar
        static const int IDA_CLEAR_URL;
 
   private:
-       //AddressBarMode __currentAddMode;
+
        Tizen::Base::String __displayUrl;
        Tizen::Base::String __editTextUrl;
 
@@ -192,24 +192,17 @@ class Addressbar
        bool __isLoadingCompleted;
        bool __isClipboardOpen;
        bool __isKeyboardConnected;
-       bool __isCancelledClicked;
        int __progressPercentage;
 
        Tizen::Ui::Controls::Label* __pAddressbarBg;
        Tizen::Ui::Controls::Panel* __pBgPanel;
-       //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::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* __pStopBtn;
        Tizen::Ui::Controls::Label* __pSearchLabel;
        Tizen::Ui::Controls::EditField* __pAddressbarUrlField;
        Tizen::Ui::Controls::Label* __pToolBarLabel;
diff --git a/inc/IntArticleReaderForm.h b/inc/IntArticleReaderForm.h
new file mode 100644 (file)
index 0000000..3f35175
--- /dev/null
@@ -0,0 +1,154 @@
+//
+
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.1 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// !Internet
+/*@file:    IntArticleReaderForm.h
+ *@brief:      This header file contains the declarations of the ArticleReaderForm class.
+ *
+ */
+
+#ifndef _INT_ARTICLE_READER_FORM_H_
+#define _INT_ARTICLE_READER_FORM_H_
+
+#include <FBase.h>
+#include <FUi.h>
+#include <FWeb.h>
+
+#include "IntSharePopup.h"
+
+
+class ArticleReaderForm
+  : public Tizen::Ui::Controls::Form
+  , public Tizen::Ui::IActionEventListener
+  , public Tizen::Ui::IKeypadEventListener
+  , public Tizen::Ui::IOrientationEventListener
+  , public Tizen::Ui::ITextEventListener
+  , public Tizen::Ui::ITouchEventListener
+  , public Tizen::Ui::Scenes::ISceneEventListener
+  , public Tizen::Web::Controls::ITextSearchListener
+  , public Tizen::Web::Controls::IWebUiEventListener
+
+
+  {
+  public:
+       /**
+        * @brief The Default Constructor
+        */
+       ArticleReaderForm(void);
+
+       /**
+        * @brief               The Default Destructor
+        */
+       virtual ~ArticleReaderForm(void);
+
+       /**
+        * @brief               Initializes this instance of ArticleReaderForm.
+        */
+       bool Initialize(void);
+
+       // Initializes the controls of the UI for ArticleReaderForm.
+       virtual result OnInitializing(void);
+
+       virtual result OnTerminating(void);
+
+       //IActionEventListener
+       virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
+
+       //IKeypadEventListener
+       virtual void OnKeypadWillOpen(Tizen::Ui::Control& source){}
+       virtual void OnKeypadOpened(Tizen::Ui::Control& source);
+       virtual void OnKeypadClosed(Tizen::Ui::Control& source);
+       virtual void OnKeypadBoundsChanged (Tizen::Ui::Control &source){}
+       virtual void OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui::KeypadAction keypadAction){}
+
+       //IOrientationEventListener
+       virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
+
+       //ITextEventListener
+       virtual void  OnTextValueChangeCanceled (const Tizen::Ui::Control &source){}
+       virtual void  OnTextValueChanged (const Tizen::Ui::Control &source);
+
+       //ITouchEventListener
+       virtual void OnTouchDoublePressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo){}
+       virtual void OnTouchFocusIn(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo){}
+       virtual void OnTouchFocusOut(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo){}
+       virtual void OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
+       virtual void OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo){}
+       virtual void OnTouchMoved(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo){}
+       virtual void OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo){}
+
+       //ISceneEventListener
+       virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs);
+       virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId);
+
+       //ITextSearchListener
+       virtual void OnTextFound(int totalCount, int currentOrdinal);
+
+       //IWebUiEventListener
+       virtual void OnWebPageBlockSelected(Tizen::Web::Controls::Web& source, Tizen::Graphics::Point& startPoint, Tizen::Graphics::Point& endPoint);
+       virtual void OnWebPageShowRequested(Tizen::Web::Controls::Web& source){}
+       virtual Tizen::Web::Controls::Web* OnWebWindowCreateRequested(void){}
+       virtual void OnWebWindowCloseRequested(Tizen::Web::Controls::Web& source) {}
+
+       result InitSelectTextContextMenu(Tizen::Graphics::Point p);
+       result InitFindWordPanel(void);
+       void StartWordSearch(void);
+
+       void RelayoutControls(void);
+
+       static const int IDA_MORE_BUTTON;
+       static const int IDA_BACK_BUTTON;
+       static const int IDA_SMALL_FONT_BUTTON;
+       static const int IDA_LARGE_FONT_BUTTON;
+       static const int IDA_SAVE_CLICKED;
+       static const int IDA_SHARE_CLICKED;
+       static const int IDA_PRINT_CLICKED;
+
+       static const int IDA_COPY_TEXT_CLICKED;
+       static const int IDA_FIND_TEXT_CLICKED;
+       static const int IDA_SHARE_TEXT_CLICKED;
+
+       static const int IDA_FINDWORD_CANCEL_CLICKED;
+       static const int IDA_FINDWORD_CLEAR_CLICKED;
+       static const int IDA_FINDWORD_NEXT_CLICKED;
+       static const int IDA_FINDWORD_PREV_CLICKED;
+
+  private:
+       Tizen::Web::Controls::Web* __pWebReader;
+       Tizen::Ui::Controls::Panel* __pFooterPanel;
+       Tizen::Ui::Controls::Button* __pMoreBtn;
+       Tizen::Ui::Controls::Button* __pBackBtn;
+       Tizen::Ui::Controls::Button* __pSmallFontBtn;
+       Tizen::Ui::Controls::Button* __pLargeFontBtn;
+       Tizen::Ui::Controls::ContextMenu* __pMoreMenu;
+       Tizen::Web::Controls::HitElementResult* __pHitElementResult;
+       Tizen::Ui::Controls::ContextMenu* __pSelectionMenu;
+
+       Tizen::Ui::Controls::Label *    __pFindWordBgLabel;
+       Tizen::Ui::Controls::Button*    __pFindWordClear;
+       Tizen::Ui::Controls::Label*     __pFindWordCountLabel;
+       Tizen::Ui::Controls::Panel*     __pFindWordControl;
+       Tizen::Ui::Controls::EditField* __pFindWordEditField;
+       Tizen::Ui::Controls::Button*    __pFindWordNext;
+       Tizen::Ui::Controls::Button*    __pFindWordPrev;
+
+//     Tizen::Base::String __currentSelectedStr;
+       SharePopup*     __pPopUp;
+
+  };
+
+#endif /* _INT_ARTICLE_READER_FORM_H_ */
index 530ef0e..f0844b2 100644 (file)
@@ -39,6 +39,8 @@ class IAddressbarEventListener
 {
 public:
        virtual ~IAddressbarEventListener(void) {};
+       virtual void OnAddressBarFocusGained(const Addressbar&) = 0;
+       virtual void OnAddressBarFocusLost(const Addressbar&) = 0;
        virtual void OnAddressBarKeypadClosed(const Addressbar&, bool footerState = true ) = 0;
        virtual void OnAddressBarKeypadOpened(const Addressbar&) = 0;
        virtual void OnAddressBarKeypadWillOpen(const Addressbar&) = 0;
@@ -48,7 +50,7 @@ public:
        virtual void OnClipboardClosed(const Addressbar&) = 0;
        //virtual void OnBackClicked(const Addressbar&) = 0;
        //virtual void OnForwardClicked(const Addressbar&) = 0;
-       virtual void OnReaderClicked(const Addressbar&) = 0;
+//     virtual void OnReaderClicked(const Addressbar&) = 0;
        virtual void OnRefreshClicked(const Addressbar&) = 0;
        virtual void OnStopClicked(Addressbar&) = 0;
        virtual void OnUrlValueChanged(Addressbar&) = 0;
index eeeb523..8b41563 100644 (file)
@@ -103,6 +103,10 @@ public:
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
 
        //IAddressbarEventListener
+       void OnAddressBarFocusGained(const Addressbar& addBar);
+
+       void OnAddressBarFocusLost(const Addressbar& addBar);
+
        void OnAddressCancelledClicked(const Addressbar&);
 
        void OnAddressBarKeypadClosed(const Addressbar&, bool footerState = true);
@@ -121,8 +125,6 @@ public:
 
        void OnForwardClicked(/*const Addressbar&*/);
 
-       void OnReaderClicked(const Addressbar&);
-
        void OnRefreshClicked(const Addressbar&){}
 
        void OnSearchClicked(const Addressbar&){}
@@ -261,6 +263,7 @@ public:
        void UpdateProgress(int percentage);
        int GetProgress(void);
        void UpdateProgressBitmap(void);
+       void ReaderClicked();
 
        /**
         * @brief        Sets the current addressbar Mode.
@@ -273,6 +276,7 @@ public:
 
        virtual void OnUserEventReceivedN (RequestId requestId, Tizen::Base::Collection::IList *pArgs);
 
+       void AddressBarCancelledClicked(const Addressbar& addBar);
 private:
        double findDistance(int x1,int y1,int x2, int y2);
        void FindNextWord(bool next = true);
@@ -312,7 +316,7 @@ private:
        int     __maxOccurrances;
        int     __currentWordIndex;
        bool __isLoaded;
-       bool __inputEventToBeSupressed;
+       //bool __inputEventToBeSupressed;
 
        bool __isLoadingData;
        bool __isLoadingCompleted;
@@ -370,6 +374,7 @@ private:
        Tizen::Ui::Controls::Label* __pFooterLabel;
        Tizen::Ui::Controls::Button* __pStopBtn;
        Tizen::Ui::Controls::Button* __pClearBtn;
+       Tizen::Ui::Controls::Button* __pReaderBtn;
 
 };
 
index 4562ab1..c347982 100644 (file)
@@ -131,6 +131,7 @@ public:
 
        static bool GetCurrentDateTime(Tizen::Base::DateTime& dt);
 
+       Tizen::Base::String GetStringFromDate(Tizen::Base::DateTime& date);
        /**
         * This function gives the last inserted row id
         *
index 913c120..c606d48 100644 (file)
     <text id="IDS_COM_FAILED_TO_SAVE_IMAGE">Failed to save Image</text>
        <text id="IDS_BR_POP_EMPTY_FORM_DATA_BNO">Delete all saved form data?</text>
        <text id="IDS_BR_POP_EMPTY_PASSWORDS_BNO">Delete all saved passwords?</text>
-    
+
+       <text id="IDS_COM_SK_PRINT">Print</text>    
 </string_table>
diff --git a/res/screen-density-xhigh/I01_font_button_left.png b/res/screen-density-xhigh/I01_font_button_left.png
new file mode 100644 (file)
index 0000000..966b341
Binary files /dev/null and b/res/screen-density-xhigh/I01_font_button_left.png differ
diff --git a/res/screen-density-xhigh/I01_font_button_left_dim.png b/res/screen-density-xhigh/I01_font_button_left_dim.png
new file mode 100644 (file)
index 0000000..322780e
Binary files /dev/null and b/res/screen-density-xhigh/I01_font_button_left_dim.png differ
diff --git a/res/screen-density-xhigh/I01_font_button_left_press.png b/res/screen-density-xhigh/I01_font_button_left_press.png
new file mode 100644 (file)
index 0000000..ab5a1f5
Binary files /dev/null and b/res/screen-density-xhigh/I01_font_button_left_press.png differ
diff --git a/res/screen-density-xhigh/I01_font_button_right.png b/res/screen-density-xhigh/I01_font_button_right.png
new file mode 100644 (file)
index 0000000..723eeed
Binary files /dev/null and b/res/screen-density-xhigh/I01_font_button_right.png differ
diff --git a/res/screen-density-xhigh/I01_font_button_right_dim.png b/res/screen-density-xhigh/I01_font_button_right_dim.png
new file mode 100644 (file)
index 0000000..1bb3b7d
Binary files /dev/null and b/res/screen-density-xhigh/I01_font_button_right_dim.png differ
diff --git a/res/screen-density-xhigh/I01_font_button_right_press.png b/res/screen-density-xhigh/I01_font_button_right_press.png
new file mode 100644 (file)
index 0000000..89ef5cb
Binary files /dev/null and b/res/screen-density-xhigh/I01_font_button_right_press.png differ
diff --git a/res/screen-density-xhigh/I01_title_font_bg.png b/res/screen-density-xhigh/I01_title_font_bg.png
new file mode 100644 (file)
index 0000000..2dcabf2
Binary files /dev/null and b/res/screen-density-xhigh/I01_title_font_bg.png differ
index fef83e2..be3f375 100644 (file)
@@ -3,7 +3,8 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="2.0.0.201304110859" Dversion="20120315">
+
+<Scene Bversion="2.0.0.201305162056" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_ADD_BOOKMARK">
         <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"/>
@@ -11,7 +12,7 @@
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/>
     </Form>
     <Header>
-        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="Add Bookmarks" titleTextColor=""/>
+        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="false" titleIconPath="" titleText="Add Bookmarks" titleTextColor=""/>
         <itemSet>
             <buttonItem accessibilityHint="" actionId="102" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_LEFT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_COM_SK_SAVE" type="left"/>
             <buttonItem accessibilityHint="" actionId="103" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_RIGHT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_CANCEL" type="right"/>
         <property autoResizingEnabled="true" backgroundColor="" backgroundColorOpacity="0" clientAreaHeight="0" clientAreaWidth="0" pageScrollEnabled="true" scrollBarVisible="true" scrollDirection="SCROLL_PANEL_SCROLL_DIRECTION_VERTICAL" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION"/>
         <panelLayout height="1123.0" mode="Portrait" width="720.0"/>
         <panelLayout height="563.0" mode="Landscape" width="1200.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="1029.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="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_PARENT" width="720.0" x="0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="1109.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="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_PARENT" width="720.0" x="0" y="0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="569.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1200.0" x="0" y="0.0"/>
     </ScrollPanel>
     <Label id="IDC_LABEL2" parent="IDC_SCROLLPANEL2">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#F8F6EF" backgroundColorOpacity="100" 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="256.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="20.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="243.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="20.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="266.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="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1200.0" x="0.0" y="20.0"/>
     </Label>
+    <Label id="IDC_LABEL8" parent="IDC_SCROLLPANEL2">
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#8E9AA3" backgroundColorOpacity="100" 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="2.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="23.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_EDITFIELD1" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="674.0" x="23.0" y="140.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="1.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="1200.0" x="38.0" y="148.0"/>
+    </Label>
+    <Label id="IDC_LABEL6" parent="IDC_SCROLLPANEL2">
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#F8F6EF" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="::IDS_BR_BODY_URL" textColor="#7C7C7C" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_BOTTOM"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="0.0" marginTop="2.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL8" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="708.0" x="12.0" y="144.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48.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="1200.0" x="26.0" y="148.0"/>
+    </Label>
     <EditField id="IDC_EDITFIELD2" parent="IDC_SCROLLPANEL2">
         <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="true" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="#000000" horizontalMargin="16.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="700000" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="" normalColor="#F8F6EF" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="40.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="76.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="16.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="692.0" x="0" y="182.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="76.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="16.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="IDC_LABEL6" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="692.0" x="0" y="186.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="16.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1158.0" x="26.0" y="196.0"/>
     </EditField>
     <Label id="IDC_LABEL4" parent="IDC_SCROLLPANEL2">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#8E9AA3" backgroundColorOpacity="100" 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="1.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="23.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="674.0" x="23.0" y="258.0"/>
+        <layout bottomRelation="IDC_LABEL2" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="1.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="23.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_EDITFIELD2" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="674.0" x="23.0" y="262.0"/>
         <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="1.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_EDITFIELD2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_EDITFIELD2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1158.0" x="26.0" y="286.0"/>
     </Label>
     <ListView id="IDC_LISTVIEW1" parent="IDC_SCROLLPANEL2">
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="#FFFFFF" fastScroll="false" itemDivider="true" itemDividerColor="#8E9AA3" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sweepEnabled="false" textOfEmptyList=""/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="140.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="2.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL4" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="261.0"/>
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="#FFFFFF" itemDivider="true" itemDividerColor="#8E9AA3" listScrollStyle="SCROLL_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sweepEnabled="false" textOfEmptyList=""/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="140.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="2.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL4" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="265.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="false" height="260.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="16.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1168.0" x="16.0" y="293.0"/>
     </ListView>
+    <Label id="IDC_LABEL7" parent="IDC_SCROLLPANEL2">
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#8E9AA3" backgroundColorOpacity="100" 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="2.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_LABEL2" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="674.0" x="23.0" y="20.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="1.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="1200.0" x="38.0" y="20.0"/>
+    </Label>
     <Label id="IDC_LABEL3" parent="IDC_SCROLLPANEL2">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#F8F6EF" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="::IDS_BR_BODY_TITLE" textColor="#7C7C7C" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_BOTTOM"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="708.0" x="12.0" y="20.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL7" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="708.0" x="12.0" y="22.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48.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="1200.0" x="26.0" y="20.0"/>
     </Label>
     <EditField id="IDC_EDITFIELD1" parent="IDC_SCROLLPANEL2">
         <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="true" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="#000000" horizontalMargin="16.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="700000" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="" normalColor="#F8F6EF" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="40.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="76.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="16.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="IDC_LABEL3" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="692.0" x="0" y="62.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="76.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="16.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="IDC_LABEL3" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="692.0" x="0" y="64.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="80.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="16.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1158.0" x="26.0" y="68.0"/>
     </EditField>
-    <Label id="IDC_LABEL6" parent="IDC_SCROLLPANEL2">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#F8F6EF" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="::IDS_BR_BODY_URL" textColor="#7C7C7C" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_BOTTOM"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="12.0" marginRight="0.0" marginTop="2.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_EDITFIELD1" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="708.0" x="12.0" y="140.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48.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="1200.0" x="26.0" y="148.0"/>
-    </Label>
-    <Label id="IDC_LABEL7" parent="IDC_SCROLLPANEL2">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#8E9AA3" backgroundColorOpacity="100" 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="1.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="674.0" x="23.0" y="20.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="1.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="1200.0" x="38.0" y="20.0"/>
-    </Label>
-    <Label id="IDC_LABEL8" parent="IDC_SCROLLPANEL2">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#8E9AA3" backgroundColorOpacity="100" 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="1.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="23.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_EDITFIELD1" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="674.0" x="23.0" y="138.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="1.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="1200.0" x="38.0" y="148.0"/>
-    </Label>
 </Scene>
diff --git a/res/screen-size-normal/IDL_ARTICLE_READER_FORM.xml b/res/screen-size-normal/IDL_ARTICLE_READER_FORM.xml
new file mode 100644 (file)
index 0000000..04fc5a4
--- /dev/null
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+       This XML file was automatically generated by UiBuilder - do not modify by hand.
+-->
+<!DOCTYPE Scene SYSTEM "UIForm.dtd">
+
+<Scene Bversion="2.0.0.201305162056" Dversion="20120315">
+    <LogicalCoordinate>720</LogicalCoordinate>
+    <Form id="IDL_ARTICLE_READER_FORM">
+        <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <layout mode="Portrait" style="FORM_STYLE_INDICATOR" type="LAYOUT_RELATIVE"/>
+        <layout mode="Landscape" style="FORM_STYLE_INDICATOR" type="LAYOUT_RELATIVE"/>
+    </Form>
+    <Panel id="IDC_PANEL1" parent="IDL_ARTICLE_READER_FORM">
+        <property backgroundColor="#E8E8E8" backgroundColorOpacity="100" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
+        <layout bottomRelation="IDL_ARTICLE_READER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="98.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_ARTICLE_READER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_ARTICLE_READER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="1122.0"/>
+        <layout bottomRelation="IDL_ARTICLE_READER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="98.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_ARTICLE_READER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_ARTICLE_READER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="601.0"/>
+    </Panel>
+    <Button id="IDC_MORE_BUTTON" parent="IDC_PANEL1">
+        <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_icon_more.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="I01_icon_more_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="IDC_PANEL1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="60.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="19.0" marginLeft="20.0" marginRight="0.0" marginTop="19.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_PANEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="60.0" x="20.0" y="19.0"/>
+        <layout bottomRelation="IDC_PANEL1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="60.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="19.0" marginLeft="0.0" marginRight="0.0" marginTop="19.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_PANEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="60.0" x="0.0" y="19.0"/>
+    </Button>
+    <Button id="IDC_BACK_BUTTON" parent="IDC_PANEL1">
+        <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_icon_Back.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="I01_icon_Back_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="IDC_PANEL1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="60.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="19.0" marginLeft="0.0" marginRight="20.0" marginTop="19.0" mode="Portrait" rightRelation="IDC_PANEL1" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_PANEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="60.0" x="640.0" y="19.0"/>
+        <layout bottomRelation="IDC_PANEL1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="60.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="19.0" marginLeft="0.0" marginRight="0.0" marginTop="19.0" mode="Landscape" rightRelation="IDC_PANEL1" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_PANEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="60.0" x="1220.0" y="19.0"/>
+    </Button>
+    <Button id="IDC_SMALL_FONT_BUTTON" parent="IDC_PANEL1">
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="I01_font_button_left_press.png" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="I01_font_button_left.png" normalBitmapPath="" normalColor="#1A1A1A" normalColorOpacity="0" normalTextColor="" pressedBGBitmapPath="I01_font_button_left_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="98.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="79.0" x="281.0" y="0.0"/>
+        <layout bottomRelation="IDC_PANEL1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="98.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_PANEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="79.0" x="561.0" y="0.0"/>
+    </Button>
+    <Button id="IDC_LARGE_FONT_BUTTON" parent="IDC_PANEL1">
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="I01_font_button_right_press.png" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="I01_font_button_right.png" normalBitmapPath="" normalColor="#1A1A1A" normalColorOpacity="0" normalTextColor="" pressedBGBitmapPath="I01_font_button_right_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="IDC_PANEL1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="98.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="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_PANEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="79.0" x="360.0" y="0.0"/>
+        <layout bottomRelation="IDC_PANEL1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="98.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SMALL_FONT_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_PANEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="79.0" x="640.0" y="0.0"/>
+    </Button>
+</Scene>
index 37a20d3..a4b5825 100644 (file)
@@ -3,7 +3,8 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">
-<ScenePanel Bversion="2.0.0.201305071547" Dversion="20120315">
+
+<ScenePanel Bversion="2.0.0.201305162056" Dversion="20120315">
     <Panel id="IDL_FIND_ON_PAGE">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
         <layout height="82.0" mode="Portrait" type="LAYOUT_RELATIVE" width="720.0" x="3.0" y="27.0"/>
@@ -50,7 +51,7 @@
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_FIND_CLEAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="180.0" x="671.0" y="0.0"/>
     </Label>
     <EditField id="IDC_FIND_WORD_EDITFIELD" parent="IDC_PANEL1">
-        <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="false" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="100" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="EditBackground.png" normalColor="" normalColorOpacity="100" normalTextColor="#4E4945" pressedBGBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="32.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>
+        <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="false" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="2048" 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="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_FIND_COUNT_LABEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_PARENT" width="174.0" x="0.0" y="0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_FIND_COUNT_LABEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="EDIT_FIELD_STYLE_NORMAL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="671.0" x="0.0" y="0.0"/>
     </EditField>
index e051efb..220e140 100644 (file)
@@ -4,7 +4,7 @@
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
 
-<Scene Bversion="2.0.0.201305071547" Dversion="20120315">
+<Scene Bversion="2.0.0.201305162056" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_FORM">
         <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
@@ -37,7 +37,7 @@
         <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="IDC_FOOTER_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="112.0" x="1168.0" y="10.0"/>
     </Button>
     <Button id="IDC_PAGEBACK_BUTTON" parent="IDC_FOOTER_PANEL">
-        <property DisabledBitmapX="20.0" DisabledBitmapY="20.0" NormalBitmapX="20.0" NormalBitmapY="20.0" PressedBitmapX="20.0" PressedBitmapY="20.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="EditBackground.png" disabledBitmapPath="I01_toolbar_icon_back_web_disabled.png" 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"/>
+        <property DisabledBitmapX="20.0" DisabledBitmapY="20.0" NormalBitmapX="20.0" NormalBitmapY="20.0" PressedBitmapX="20.0" PressedBitmapY="20.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="EditBackground.png" disabledBitmapPath="I01_toolbar_icon_back_web_disabled.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="20.0" highlightedBitmapY="20.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="IDC_PAGEFORWARD_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="112.0" x="1056.0" y="10.0"/>
     </Button>
         <layout bottomRelation="IDC_STOP_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="43.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_STOP_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_STOP_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_STOP_BUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="42.0" x="454.0" y="40.0"/>
         <layout bottomRelation="IDC_STOP_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="55.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_STOP_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_STOP_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_STOP_BUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="54.0" x="982.0" y="35.0"/>
     </Button>
+    <Button id="IDC_READER_BUTTON" parent="IDC_FOOTER_PANEL">
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="I01_search_icon_refresh.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="IDC_STOP_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="43.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_URL_EDIT_FIELD" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_STOP_BUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="42.0" x="212.0" y="40.0"/>
+        <layout bottomRelation="IDC_STOP_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="55.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_STOP_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_STOP_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_STOP_BUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="54.0" x="982.0" y="35.0"/>
+    </Button>
     <Panel id="IDC_FIND_ON_PAGE_PANEL" parent="IDL_FORM">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
         <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"/>
index b201e55..f424a00 100644 (file)
@@ -39,8 +39,7 @@ static const wchar_t* IDB_TITLE_PROGRESS_BAR = L"I01_title_progress_bar.png";
 static const wchar_t* IDB_ICON_PRIVATE = L"I01_icon_private.png";
 
 //Action IDs
-const int Addressbar::IDA_REFRESH_BTN_CLICKED = 101;
-const int Addressbar::IDA_READER_BTN_CLICKED = 102;
+
 const int Addressbar::IDA_STOP_BTN_CLICKED = 103;
 const int Addressbar::IDA_GO_BACK = 104;
 const int Addressbar::IDA_GO_FORWARD = 105;
@@ -51,26 +50,20 @@ Addressbar::Addressbar(void)
 {
        //__currentAddMode = ADDRESSBAR_MODE_LOADING_COMPLETE;
        __displayUrl = L"";
-       __editTextUrl = L"";
+//     __editTextUrl = L"";
        __isLoadingData = false;
        __isLoadingCompleted = false;
        __progressPercentage = 0;
        __pAddressbarBg = null;
        __pBgPanel = null;
-       //__pCancelBtn = null;
        __pClearBtn = null;
        __pFavIcon = FaviconManager::GetInstance()->GetDefaultFaviconN();
        __pFaviconLabel = null;
-       //__pGoBackBtn = null;
-       //__pGoForwardBtn = null;
        __pLabelPrivateOn = null;
        __pListener = null;
        __pPrivateIconLabel = null;
        __pProgressbarLabel = null;
        __pPrivateIconLabel = null ;
-       //__pReaderBtn = null;
-       //__pRefreshBtn = null;
-       __pStopBtn = null;
        __pClearBtn = null ;
        __pSearchLabel = null;
        __pAddressbarUrlField = null;
@@ -79,7 +72,6 @@ Addressbar::Addressbar(void)
        __pAddressBackBtn = null;
        __isClipboardOpen = false;
        __isKeyboardConnected = false;
-       __isCancelledClicked = false;
 }
 
 Addressbar::~Addressbar(void)
@@ -130,27 +122,6 @@ Addressbar::Initialize(const Rectangle& rect)
                delete pBitmap;
        }
 
-       //Add the backround label for displaying progressbar
-       /*__pProgressbarLabel = static_cast<Label*> (GetControl(L"IDC_PROGRESS_BAR_LABEL",true));
-       if (__pProgressbarLabel == NULL)
-       {
-               AppLogDebug("Control not found returning E_INVALID_KEY");
-               return E_INVALID_KEY;
-       }
-       __pProgressbarLabel->SetShowState(false);*/
-
-       //Add the stop button
-       __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)
        {
@@ -361,152 +332,6 @@ Addressbar::GetUrl(void)
        return __displayUrl;
 }
 
-/*AddressBarMode
-Addressbar::GetAddressbarMode(void)
-{
-       return __currentAddMode;
-}*/
-
-/*void
-Addressbar::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 (__pAddressbarUrlField && __pAddressbarUrlField->GetText().IsEmpty() == false)
-               {
-               //      __pSearchLabel->SetShowState(false);
-               //      __pFaviconLabel->SetShowState(true);
-               }
-               else
-               {
-               //      __pSearchLabel->SetShowState(true);
-               //      __pFaviconLabel->SetShowState(false);
-               }
-
-               if (__pAddressbarUrlField != NULL)
-               {
-                       __pAddressbarUrlField->SetText(__displayUrl);
-                       __pAddressbarUrlField->HideKeypad();
-               }
-
-       //      __pRefreshBtn->SetShowState(true);
-               __pStopBtn->SetShowState(false);
-       //      __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 ))
-               {
-               //      __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());
-                       __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);
-               __pStopBtn->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 (__pAddressbarUrlField && __pAddressbarUrlField->GetText().IsEmpty() == true)
-               {
-               //      __pSearchLabel->SetShowState(true);
-               //      __pFaviconLabel->SetShowState(false);
-               }
-               else
-               {
-               //      __pSearchLabel->SetShowState(false);
-               //      __pFaviconLabel->SetShowState(true);
-               }
-               if (__pAddressbarUrlField != NULL)
-               {
-                       __pAddressbarUrlField->SetCursorPosition(__pAddressbarUrlField->GetTextLength());
-               }
-
-       }
-       break;
-       }
-
-       if (__pAddressbarBg->GetWidth() != __pBgPanel->GetWidth())
-       {
-               __pAddressbarBg->SetBounds(Rectangle(0, 0, __pBgPanel->GetWidth(), __pBgPanel->GetHeight()));
-               Bitmap *pBitmap = CommonUtil::GetNinepatchedBitmapN(L"I01_search_input_field_bg.9.png", __pAddressbarBg->GetWidth(), __pAddressbarBg->GetHeight());
-               if (pBitmap != null)
-               {
-                       __pAddressbarBg->SetBackgroundBitmap(*pBitmap);
-                       delete pBitmap;
-               }
-       }
-
-       Invalidate(true);
-
-       if (__pListener != null)
-       {
-               __pListener->OnAddressBarModeChanged(*this);
-       }
-}*/
-
 void
 Addressbar::SetFaviconBitmap(const Tizen::Graphics::Bitmap& favicon)
 {
@@ -527,7 +352,7 @@ Addressbar::SetFaviconBitmap(const Tizen::Graphics::Bitmap& favicon)
 
 void Addressbar::SaveAddressbarEditText()
 {
-       __editTextUrl = __pAddressbarUrlField->GetText();
+//     __editTextUrl = __pAddressbarUrlField->GetText();
 }
 
 void
@@ -545,15 +370,11 @@ Addressbar::UpdateFaviconBitmap(bool isPrivateOn)
 void
 Addressbar::SetForwardButtonEnabled(bool isEnabled)
 {
-//     __pGoForwardBtn->SetEnabled(isEnabled);
-//     __pGoBackBtn->Invalidate(true);
 }
 
 void
 Addressbar::SetBackButtonEnabled(bool isEnabled)
 {
-//     __pGoBackBtn->SetEnabled(isEnabled);
-//     __pGoBackBtn->Invalidate(true);
 }
 
 void
@@ -599,68 +420,10 @@ Addressbar::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
        switch (actionId)
        {
-       case IDA_REFRESH_BTN_CLICKED:
-               __isLoadingCompleted = false;
-               __isLoadingData = true;
-               __progressPercentage = 0;
-               __pAddressbarUrlField->HideKeypad();
-               __displayUrl = __pAddressbarUrlField->GetText();
-
-               /*if (__pListener != NULL)
-               {
-                       __pListener->OnUrlSubmitted(*this);
-               }*/
-
-               UpdateProgressBitmap();
-               break;
-
-       case IDA_STOP_BTN_CLICKED:
-               __isLoadingCompleted = false;
-               __isLoadingData = false;
-               __progressPercentage = 0;
-               __pAddressbarUrlField->HideKeypad();
-               __displayUrl = __pAddressbarUrlField->GetText();
-
-               if (__pListener != NULL)
-               {
-                       __pListener->OnStopClicked(*this);
-               }
-
-               UpdateProgressBitmap();
-               break;
-       case IDA_READER_BTN_CLICKED:
-               __pAddressbarUrlField->HideKeypad();
-               __displayUrl = __pAddressbarUrlField->GetText();
-
-               if (__pListener != NULL)
-               {
-                       __pListener->OnReaderClicked(*this);
-               }
-
-               break;
-
-       /*case IDA_GO_BACK:
-       {
-               if (__pListener != NULL)
-               {
-                       __pListener->OnBackClicked(*this);
-
-               }
-       }
-       break;
-
-       case IDA_GO_FORWARD:
-       {
-               if (__pListener != NULL )
-                       __pListener->OnForwardClicked(*this);
-       }
-       break;*/
-
        case IDA_CANCEL:
        {
-               __pAddressbarUrlField->HideKeypad();
+//             __pAddressbarUrlField->HideKeypad();
                __pListener->OnAddressCancelledClicked(*this);
-               __isCancelledClicked = true;
                //SetAddressbarMode(ADDRESSBAR_MODE_LOADING_COMPLETE);
        }
        break;
@@ -719,9 +482,6 @@ Addressbar::OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui::Keypa
 void
 Addressbar::OnKeypadClosed(Tizen::Ui::Control& source)
 {
-//     String state = L"";
-//     result r  = DeviceManager::GetState(DEVICE_TYPE_KEYBOARD,state);
-//     AppLog("Device State %S error %s",state.GetPointer(),GetErrorMessage(r));
        AppLog("XYZ::Addressbar::OnKeypadClosed");
        if(__isKeyboardConnected == true)
        {
@@ -734,51 +494,44 @@ Addressbar::OnKeypadClosed(Tizen::Ui::Control& source)
                return;
        }
 
-//     if(__isCancelledClicked == true)
-       {
-               if(__pAddressbarUrlField)
-               {
-                       String removedHttpUrl = RemoveHttpTextFromDisplayURL();
-                       if (removedHttpUrl.IsEmpty() == false)
-                       {
-                               __pAddressbarUrlField->SetText(removedHttpUrl);
-                       }
-                       else
-                       {
-                               __pAddressbarUrlField->SetText(__displayUrl);
-                       }
-               }
+
+//     if(__pAddressbarUrlField)
+//     {
+//             String removedHttpUrl = RemoveHttpTextFromDisplayURL();
+//             if (removedHttpUrl.IsEmpty() == false)
+//             {
+//                     __pAddressbarUrlField->SetText(removedHttpUrl);
+//             }
+//             else
+//             {
 //                     __pAddressbarUrlField->SetText(__displayUrl);
-               __editTextUrl = L"";
-               SetShowState(false);
-               if(__pListener != null)
-               {
-                       __pListener->OnAddressBarKeypadClosed(*this,true);
-               }
+//             }
+//     }
+//     __editTextUrl = L"";
+       if(__pListener != null)
+       {
+               __pListener->OnAddressBarKeypadClosed(*this,true);
        }
-       __isCancelledClicked = false;
 }
 
 void
 Addressbar::OnKeypadOpened(Tizen::Ui::Control& source)
 {
        AppLog("XYZ::Addressbar::OnKeypadOpened");
-//     String state = L"";
-//     result r = DeviceManager::GetState(DEVICE_TYPE_KEYBOARD,state);
-//     AppLog("Device State %S error %s",state.GetPointer(),GetErrorMessage(r));
        AppLog("Addressbar::OnKeypadOpened %d",Clipboard::GetInstance()->IsPopupVisible());
        __isClipboardOpen = Clipboard::GetInstance()->IsPopupVisible();
 
+       if(__pListener != null)
+       {
+               __pListener->OnAddressBarKeypadOpened(*this);
+       }
 }
 
 void
 Addressbar::OnKeypadWillOpen(Tizen::Ui::Control& source)
 {
        AppLog("XYZ::Addressbar::OnKeypadWillOpen");
-       if(__pListener != null)
-       {
-               __pListener->OnAddressBarKeypadWillOpen(*this);
-       }
+
 }
 
 void
@@ -797,9 +550,7 @@ Addressbar::OrientationChanged( int& width)
        int gap = 10;
        __pBgPanel->SetBounds(__pBgPanel->GetX(),__pBgPanel->GetY(), width - __pAddressBackBtn->GetWidth() - gap -__pBgPanel->GetX() ,__pBgPanel->GetHeight());
        __pAddressBackBtn->SetBounds(width - __pAddressBackBtn->GetWidth() - 6,__pAddressBackBtn->GetY(),__pAddressBackBtn->GetWidth(),__pAddressBackBtn->GetHeight());
-       __pStopBtn->SetBounds(__pBgPanel->GetWidth() - __pStopBtn->GetWidth(),__pStopBtn->GetY(),__pStopBtn->GetWidth(),__pStopBtn->GetHeight());
        __pClearBtn->SetBounds(__pBgPanel->GetWidth() - __pClearBtn->GetWidth() ,__pClearBtn->GetY(),__pClearBtn->GetWidth(),__pClearBtn->GetHeight());
-//     __pAddressbarUrlField->SetBounds(__pToolBarLabel->GetWidth(),__pAddressbarUrlField->GetY(),__pBgPanel->GetWidth() - __pStopBtn->GetWidth()- __pToolBarLabel->GetWidth() ,__pAddressbarUrlField->GetHeight());
 
        Bitmap *pBitmap = CommonUtil::GetNinepatchedBitmapN(IDB_SEARCH_INPUT_FIELD_BG, __pAddressbarBg->GetWidth(), __pAddressbarBg->GetHeight());
        if (pBitmap != null)
@@ -857,8 +608,6 @@ Addressbar::GetLockedImageN(void)
 void
 Addressbar::OnFocusGained(const Control& source)
 {
-       //SetAddressbarMode(ADDRESSBAR_MODE_EDIT);
-       //      SetAddressbarMode(__prevAddMode);
        AppLog("XYZ::Addressbar::OnFocusGained");
        if(__pAddressbarUrlField != null)
        {
@@ -874,8 +623,7 @@ Addressbar::OnFocusGained(const Control& source)
        }
        if (__pListener != null)
        {
-               __pListener->OnAddressBarKeypadWillOpen(*this);
-               __pListener->OnAddressBarKeypadOpened(*this);
+               __pListener->OnAddressBarFocusGained(*this);
        }
 }
 
@@ -895,12 +643,10 @@ Addressbar::OnFocusLost(const Tizen::Ui::Control& source)
                        __pAddressbarUrlField->SetText(__displayUrl);
                }
        }
-       //              __pAddressbarUrlField->SetText(__displayUrl);
-       __editTextUrl = L"";
-       SetShowState(false);
+//     __editTextUrl = L"";
        if(__pListener != null)
        {
-               __pListener->OnAddressBarKeypadClosed(*this,false);
+               __pListener->OnAddressBarFocusLost(*this);
        }
 }
 
diff --git a/src/IntArticleReaderForm.cpp b/src/IntArticleReaderForm.cpp
new file mode 100644 (file)
index 0000000..657d02b
--- /dev/null
@@ -0,0 +1,845 @@
+//
+
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.1 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// !Internet
+/*@file:    ArticleReaderForm.cpp
+ *@brief:      This header file contains the definitions of the ArticleReaderForm class.
+ *
+ */
+
+#include <FApp.h>
+#include <FBase.h>
+#include "IntArticleReaderForm.h"
+#include "IntCommonLib.h"
+#include "IntSceneRegister.h"
+
+using namespace Tizen::App;
+using namespace Tizen::Base;
+using namespace Tizen::Base::Collection;
+using namespace Tizen::Graphics;
+using namespace Tizen::Ui;
+using namespace Tizen::Ui::Controls;
+using namespace Tizen::Ui::Scenes;
+using namespace Tizen::Web::Controls;
+
+static const wchar_t* IDB_SMALL_FONT = L"I01_font_button_left.png";
+static const wchar_t* IDB_LARGE_FONT = L"I01_font_button_right.png";
+static const wchar_t* IDB_FINDWORD_INPUT_FIELD_BG = L"I01_toolbar_input_field_findword.9.png";
+
+const int ArticleReaderForm::IDA_MORE_BUTTON = 101;
+const int ArticleReaderForm::IDA_BACK_BUTTON = 102;
+const int ArticleReaderForm::IDA_SMALL_FONT_BUTTON = 103;
+const int ArticleReaderForm::IDA_LARGE_FONT_BUTTON = 104;
+const int ArticleReaderForm::IDA_SAVE_CLICKED = 105;
+const int ArticleReaderForm::IDA_SHARE_CLICKED = 106;
+const int ArticleReaderForm::IDA_PRINT_CLICKED = 107;
+const int ArticleReaderForm::IDA_COPY_TEXT_CLICKED = 108;
+const int ArticleReaderForm::IDA_FIND_TEXT_CLICKED = 109;
+const int ArticleReaderForm::IDA_SHARE_TEXT_CLICKED = 110;
+const int ArticleReaderForm::IDA_FINDWORD_CANCEL_CLICKED = 111;
+const int ArticleReaderForm::IDA_FINDWORD_CLEAR_CLICKED = 112;
+const int ArticleReaderForm::IDA_FINDWORD_NEXT_CLICKED = 113;
+const int ArticleReaderForm::IDA_FINDWORD_PREV_CLICKED =114;
+
+ArticleReaderForm::ArticleReaderForm(void):
+       __pWebReader(null)
+       ,__pFooterPanel(null)
+       ,__pMoreBtn(null)
+       ,__pBackBtn(null)
+       ,__pSmallFontBtn(null)
+       ,__pLargeFontBtn(null)
+       ,__pMoreMenu(null)
+       ,__pHitElementResult(null)
+       ,__pSelectionMenu(null)
+       ,__pPopUp(null)
+       ,__pFindWordBgLabel(null)
+       ,__pFindWordClear(null)
+       ,__pFindWordCountLabel(null)
+       ,__pFindWordControl(null)
+       ,__pFindWordEditField(null)
+       ,__pFindWordNext(null)
+       ,__pFindWordPrev(null)
+{
+
+}
+
+ArticleReaderForm::~ArticleReaderForm(void)
+{
+       //      RemoveAllControls();
+}
+
+bool
+ArticleReaderForm::Initialize(void)
+{
+       AppLog("ArticleReaderForm::Initialize entered");
+       Construct(L"IDL_ARTICLE_READER_FORM");
+       return true;
+}
+
+result
+ArticleReaderForm::OnInitializing(void)
+{
+       AppLog("ArticleReaderForm::OnInitializing entered");
+       result r = E_SUCCESS;
+       WebSetting settings;
+
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       if (pSceneManager == null)
+       {
+               return E_FAILURE;
+       }
+       pSceneManager->AddSceneEventListener(IDSCN_ARTICLE_READER, *this);
+
+       __pFooterPanel = static_cast<Panel*>(GetControl("IDC_PANEL1",true));
+       if(__pFooterPanel == null)
+       {
+               AppLog("GetControl failed for FooterPanel button");
+               return E_FAILURE;
+       }
+
+       __pWebReader = new (std::nothrow) Web();
+       __pWebReader->Construct(Rectangle(0,0, GetClientAreaBounds().width,GetClientAreaBounds().height - __pFooterPanel->GetHeight()));
+
+       settings.SetInputStyle(INPUT_STYLE_OVERLAY);
+       settings.SetFontSize(24/*SettingPresentationModel::GetInstance()->GetReaderFontSize()*/);
+
+       r = __pWebReader->SetSetting(settings);
+       AddControl(__pWebReader);
+       SetControlAlwaysAtBottom(*__pWebReader,true);
+       __pWebReader->LoadUrl("http://google.com");//temporary only for testing
+       if (IsFailed(r))
+               AppLogDebug("Web setting add failed with %s", GetErrorMessage(r));
+
+       __pWebReader->AddTouchEventListener(*this);
+       __pWebReader->SetWebUiEventListener(this);
+       __pWebReader->SetTextSearchListener(this);
+       __pMoreBtn = static_cast<Button*>(GetControl("IDC_MORE_BUTTON",true));
+       if(__pMoreBtn == null)
+       {
+               AppLog("GetControl failed for more button");
+               return E_FAILURE;
+       }
+       __pMoreBtn->AddActionEventListener(*this);
+       __pMoreBtn->SetActionId(IDA_MORE_BUTTON);
+
+
+       __pBackBtn = static_cast<Button*>(GetControl("IDC_BACK_BUTTON",true));
+       if(__pBackBtn == null)
+       {
+               AppLog("GetControl failed for back button");
+               return E_FAILURE;
+       }
+       __pBackBtn->AddActionEventListener(*this);
+       __pBackBtn->SetActionId(IDA_BACK_BUTTON);
+
+
+       __pSmallFontBtn = static_cast<Button*>(GetControl("IDC_SMALL_FONT_BUTTON",true));
+       if(__pSmallFontBtn == null)
+       {
+               AppLog("GetControl failed for small font button");
+               return E_FAILURE;
+       }
+       __pSmallFontBtn->AddActionEventListener(*this);
+       __pSmallFontBtn->SetActionId(IDA_SMALL_FONT_BUTTON);
+       __pSmallFontBtn->SetEnabled(false);
+
+
+       __pLargeFontBtn = static_cast<Button*>(GetControl("IDC_LARGE_FONT_BUTTON",true));
+       if(__pLargeFontBtn == null)
+       {
+               AppLog("GetControl failed for large font button");
+               return E_FAILURE;
+       }
+       __pLargeFontBtn->AddActionEventListener(*this);
+       __pLargeFontBtn->SetActionId(IDA_LARGE_FONT_BUTTON);
+
+       AddOrientationEventListener(*this);
+
+       return r;
+}
+
+result
+ArticleReaderForm::OnTerminating(void)
+{
+       AppLog("ArticleReaderForm::OnTerminating entered");
+       result r = E_SUCCESS;
+       return r;
+}
+
+void
+ArticleReaderForm::OnActionPerformed(const Control& source, int actionId)
+{
+       AppLog("ArticleReaderForm::OnActionPerformed entered actionId %d",actionId);
+
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       result r = E_SUCCESS;
+
+       if (pSceneManager == null)
+       {
+               return ;
+       }
+
+       switch (actionId)
+       {
+       case IDA_MORE_BUTTON:
+       {
+               if(__pMoreMenu != null)
+               {
+                       delete __pMoreMenu;
+                       __pMoreMenu = null;
+               }
+               __pMoreMenu = new(std::nothrow) ContextMenu();
+               r = __pMoreMenu->Construct(Point(50,GetClientAreaBounds().height),CONTEXT_MENU_STYLE_LIST,CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
+
+               TryCatch(!IsFailed(r),,"Contextmenu creation failed with%s",GetErrorMessage(r));
+
+               __pMoreMenu->AddItem(CommonUtil::GetString(L"IDS_COM_SK_SAVE"),IDA_SAVE_CLICKED);
+               __pMoreMenu->AddItem(CommonUtil::GetString(L"IDS_BR_OPT_SHARE"),IDA_SHARE_CLICKED);
+               __pMoreMenu->AddItem(CommonUtil::GetString(L"IDS_COM_SK_PRINT"),IDA_PRINT_CLICKED);
+               __pMoreMenu->SetMaxVisibleItemsCount(3);
+               __pMoreMenu->SetShowState(true);
+               __pMoreMenu->Show();
+               __pMoreMenu->Invalidate(true);
+               __pMoreMenu->AddActionEventListener(*this);
+               SetControlAlwaysOnTop(*__pMoreMenu, true);
+       }
+       break;
+
+       case IDA_BACK_BUTTON:
+       {
+               SceneManager::GetInstance()->GoBackward(BackwardSceneTransition());
+       }
+       break;
+       case IDA_SMALL_FONT_BUTTON:
+       {
+               WebSetting setting = __pWebReader->GetSetting();
+               setting.SetFontSize(24);
+
+               __pWebReader->SetSetting(setting);
+               __pSmallFontBtn->SetEnabled(false);
+               __pSmallFontBtn->Invalidate(true);
+
+               __pLargeFontBtn->SetEnabled(true);
+               __pLargeFontBtn->Invalidate(true);
+       }
+       break;
+       case IDA_LARGE_FONT_BUTTON:
+       {
+               WebSetting setting = __pWebReader->GetSetting();
+               setting.SetFontSize(32);
+               __pWebReader->SetSetting(setting);
+
+               __pLargeFontBtn->SetEnabled(false);
+               __pLargeFontBtn->Invalidate(true);
+
+               __pSmallFontBtn->SetEnabled(true);
+               __pSmallFontBtn->Invalidate(true);
+
+       }
+       break;
+       case IDA_SAVE_CLICKED:
+       {
+               if(__pWebReader !=null)
+               {
+                       r = __pWebReader->SavePageAsPdf(UiApp::GetInstance()->GetAppRootPath()+"//data//test.pdf");
+                       AppLog("SavePageAsPdf result %s",GetErrorMessage(r));
+
+                       int __modalMsgBoxResult;
+                       MessageBox* pMsgBox = new MessageBox();
+                       pMsgBox->Construct("Saved","Saved at "+UiApp::GetInstance()->GetAppRootPath()+"//data//test.pdf",MSGBOX_STYLE_OK,3000);
+                       pMsgBox->ShowAndWait(__modalMsgBoxResult);
+                       delete pMsgBox;
+                       pMsgBox = null;
+                       __modalMsgBoxResult = 0;
+               }
+
+       }
+       break;
+       case IDA_SHARE_CLICKED:
+       {
+               if(__pPopUp != null)
+               {
+                       delete __pPopUp;
+                       __pPopUp = null;
+               }
+               __pPopUp = new(std::nothrow) SharePopup();
+               __pPopUp->Initialize();
+
+               ShareInfo* pShareInfo = new(std::nothrow) ShareInfo();
+               pShareInfo->SetPageTitle(L"Google");//temporary only for testing
+               pShareInfo->SetPageUrl(L"http://www.google.com");//temporary only for testing
+               pShareInfo->SetImageAttached(false);
+               __pPopUp->RemoveAllShareInfo();
+               __pPopUp->AddShareInfo(pShareInfo);
+
+               __pPopUp->SetShowState(true);
+               __pPopUp->Show();
+       }
+       break;
+       case IDA_PRINT_CLICKED:
+       {
+               r = __pWebReader->SavePageAsPdf(UiApp::GetInstance()->GetAppRootPath()+"//data//test.pdf");
+               AppLog("SavePageAsPdf result %s",GetErrorMessage(r));
+
+               AppLog("RequestPrint called!");
+               AppControl* pAc = Tizen::App::AppManager::FindAppControlN(L"org.tizen.mobileprint", L"http://tizen.org/appcontrol/operation/print");
+               result nResult = E_FAILURE;
+               if (pAc)
+               {
+                       AppLog("TestPrint if (pAc) == true");
+
+                       HashMap map;
+                       map.Construct();
+
+                       String fileType = L"service_print_files_type";
+                       String typeVal = L"DOC";
+
+                       String fileCount = L"service_print_files_count";
+                       String countVal = L"1";
+                       String fileFolder= L"service_print_files_folder_name";
+                       String folderVal = UiApp::GetInstance()->GetAppRootPath()+"//data";
+
+                       map.Add(&fileCount, &countVal);
+                       map.Add(&fileFolder, &folderVal);
+                       map.Add(&fileType, &typeVal);
+
+                       String fileName = L"service_print_files_files_name";
+
+                       ArrayList fileNameList;
+                       fileNameList.Construct();
+                       String file1 = L"test.pdf";
+
+                       fileNameList.Add(&file1);
+                       map.Add(&fileName, &fileNameList);
+
+                       nResult = pAc->Start(NULL, NULL, &map, NULL);
+
+                       if (nResult == E_SUCCESS) AppLog("TestPrint ret == E_SUCCESS");
+                       else if (nResult == E_MAX_EXCEEDED)
+                               AppLog("TestPrint ret == E_MAX_EXCEEDED");
+                       else if (nResult == E_OBJ_NOT_FOUND)
+                               AppLog("TestPrint ret == E_OBJ_NOT_FOUND");
+                       else if (nResult == E_IN_PROGRESS)
+                               AppLog("TestPrint ret == E_IN_PROGRESS");
+                       else if (nResult == E_PRIVILEGE_DENIED)
+                               AppLog("TestPrint ret == E_PRIVILEGE_DENIED");
+                       else if(nResult == E_SYSTEM)
+                               AppLog("TestPrint ret == E_SYSTEM");
+
+                       delete pAc;
+               }
+               else
+               {
+                       int __modalMsgBoxResult;
+                       MessageBox* pMsgBox = new MessageBox();
+                       pMsgBox->Construct("Not Supported","Not Supported",MSGBOX_STYLE_OK,3000);
+                       pMsgBox->ShowAndWait(__modalMsgBoxResult);
+                       delete pMsgBox;
+                       pMsgBox = null;
+                       __modalMsgBoxResult = 0;
+               }
+       }
+       break;
+       case IDA_COPY_TEXT_CLICKED:
+       {
+               __pWebReader->ReleaseBlock();
+               // Sets data to a clip board item
+               ClipboardItem item;
+               String resourcePath = App::GetInstance()->GetAppResourcePath();
+               item.Construct(CLIPBOARD_DATA_TYPE_TEXT, __pWebReader->GetTextFromBlock());
+
+               // copying the item to clipboard
+               Clipboard* pClipboard = Clipboard::GetInstance();
+               if (pClipboard != null)
+               {
+                       pClipboard->CopyItem(item);
+               }
+       }
+       break;
+       case IDA_FIND_TEXT_CLICKED:
+       {
+               InitFindWordPanel();
+               __pWebReader->SetBounds(0,__pFindWordControl->GetHeight(),GetClientAreaBounds().width,GetClientAreaBounds().height - __pFooterPanel->GetHeight() - __pFindWordControl->GetHeight());
+       }
+       break;
+       case IDA_SHARE_TEXT_CLICKED:
+       {
+               AppLogDebug("IDA_SHARE_TEXT_CLICKED");
+               if(__pPopUp != null)
+               {
+                       delete __pPopUp;
+                       __pPopUp = null;
+               }
+               __pPopUp = new(std::nothrow) SharePopup();
+               __pPopUp->Initialize();
+               if (__pHitElementResult != null)
+               {
+                       ShareInfo* pShareInfo = new(std::nothrow) ShareInfo();
+                       pShareInfo->SetPageTitle(L"");
+                       pShareInfo->SetPageUrl(__pWebReader->GetTextFromBlock());
+                       pShareInfo->SetImageAttached(false);
+                       __pPopUp->RemoveAllShareInfo();
+                       __pPopUp->AddShareInfo(pShareInfo);
+                       __pPopUp->SetShowState(true);
+                       __pPopUp->Show();
+               }
+       }
+       break;
+
+       case IDA_FINDWORD_CANCEL_CLICKED:
+       {
+//             __currentSearchStr = L"";
+//             __currentWordIndex = 0;
+//             __maxOccurrances = 0;
+               __pFindWordEditField->SetText(L"");
+               __pFindWordNext->SetEnabled(false);
+               __pFindWordPrev->SetEnabled(false);
+               __pFindWordCountLabel->SetText(L"0/0");
+               __pWebReader->SearchText(L"aaaabbbbcccc",true);
+               __pFooterPanel->SetShowState(true);
+               __pFindWordControl->SetShowState(false);
+               RelayoutControls();
+
+       }
+       break;
+       case IDA_FINDWORD_CLEAR_CLICKED:
+       {
+
+       }
+       break;
+       case IDA_FINDWORD_NEXT_CLICKED:
+       {
+
+       }
+       break;
+       case IDA_FINDWORD_PREV_CLICKED:
+       {
+
+       }
+       break;
+       default:
+               break;
+       }
+
+       CATCH: return;
+}
+
+void
+ArticleReaderForm::OnKeypadOpened(Tizen::Ui::Control& source)
+{
+       __pFooterPanel->SetShowState(false);
+}
+
+void
+ArticleReaderForm::OnKeypadClosed(Tizen::Ui::Control& source)
+{
+       __pFooterPanel->SetShowState(true);
+       RelayoutControls();
+}
+
+void
+ArticleReaderForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
+{
+       AppLog("ArticleReaderForm::OnTouchLongPressed %d, %d" ,currentPosition.x,currentPosition.y);
+
+       if (__pHitElementResult != null)
+       {
+               delete __pHitElementResult;
+               __pHitElementResult = null;
+       }
+
+       if (__pWebReader != null)
+       {
+               AppLog("ArticleReaderForm::OnTouchLongPressed web not null");
+               __pHitElementResult = __pWebReader->GetElementByPointN(currentPosition);
+       }
+
+       if (__pHitElementResult == null)
+       {
+               return;
+       }
+
+       if (__pHitElementResult->HasImage() == true)
+       {
+
+       }
+       else if(__pHitElementResult->HasUrl() == true)
+       {
+
+       }
+       else
+       {
+               String tagName = __pHitElementResult->GetTagName();
+               String type = __pHitElementResult->GetAttributeValue("type");
+               String value = __pHitElementResult->GetAttributeValue(L"value");
+               String innerHtml = __pHitElementResult->GetAttributeValue(L"innerHTML");
+
+               result r =__pWebReader->SetBlockSelectionPosition(currentPosition);
+               AppLog("setselectionselectedornot %s",GetErrorMessage(r));
+
+       }
+//     __inputEventToBeSupressed = true;
+}
+
+void
+ArticleReaderForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId& currentSceneId, IList* pArgs)
+{
+       AppLog("ArticleReaderForm::OnSceneActivatedN entered");
+}
+
+void
+ArticleReaderForm::OnSceneDeactivated(const SceneId& currentSceneId, const SceneId& nextSceneId)
+{
+       AppLog("ArticleReaderForm::OnSceneDeactivated entered");
+}
+
+void
+ArticleReaderForm::OnTextFound(int totalCount, int currentOrdinal)
+{
+       AppLog("ArticleReaderForm::OnTextFound totalCount %d",totalCount);
+       AppLog("ArticleReaderForm::OnTextFound currentOrdinal %d",currentOrdinal);
+
+       if(totalCount == -1 || totalCount == 0)
+       {
+               __pFindWordCountLabel->SetBounds(__pFindWordCountLabel->GetX(),__pFindWordCountLabel->GetY(),84,__pFindWordCountLabel->GetHeight());
+               __pFindWordEditField->SetBounds(__pFindWordEditField->GetX(),__pFindWordEditField->GetY(),214+80,__pFindWordEditField->GetHeight());
+       }
+       else if(totalCount > 100)
+       {
+               __pFindWordCountLabel->SetBounds(__pFindWordCountLabel->GetX(),__pFindWordCountLabel->GetY(),124,__pFindWordCountLabel->GetHeight());
+               __pFindWordEditField->SetBounds(__pFindWordEditField->GetX(),__pFindWordEditField->GetY(),174,__pFindWordEditField->GetHeight());
+       }
+       else
+       {
+               __pFindWordCountLabel->SetBounds(__pFindWordCountLabel->GetX(),__pFindWordCountLabel->GetY(),124,__pFindWordCountLabel->GetHeight());
+               __pFindWordEditField->SetBounds(__pFindWordEditField->GetX(),__pFindWordEditField->GetY(),174,__pFindWordEditField->GetHeight());
+       }
+
+       if (totalCount <= 0)
+       {
+               __pFindWordNext->SetEnabled(false);
+       }
+       else
+       {
+               __pFindWordNext->SetEnabled(true);
+       }
+
+       String countStr = L"";
+       countStr.Append(currentOrdinal);
+       countStr.Append(L"/");
+       countStr.Append(totalCount);
+       __pFindWordCountLabel->SetText(countStr);
+       __pFindWordCountLabel->Invalidate(false);
+
+       //FindNextWord(true);
+       //Update the controls
+       __pFindWordNext->Invalidate(false);
+}
+
+void
+ArticleReaderForm::OnWebPageBlockSelected(Tizen::Web::Controls::Web& source, Tizen::Graphics::Point& startPoint, Tizen::Graphics::Point& endPoint)
+{
+       AppLog("ArticleReaderForm::OnWebPageBlockSelected");
+       if (__pHitElementResult != null)
+       {
+               delete __pHitElementResult;
+               __pHitElementResult = null;
+       }
+
+       if (__pWebReader != null)
+       {
+               AppLog("ArticleReaderForm::OnWebPageBlockSelected web not null");
+               __pHitElementResult = __pWebReader->GetElementByPointN(startPoint);
+               if(GetLastResult() == E_INVALID_ARG)
+               {
+                       __pHitElementResult = __pWebReader->GetElementByPointN(endPoint);
+               }
+       }
+
+       if (__pHitElementResult == null)
+       {
+               return;
+       }
+
+       if (__pHitElementResult->HasImage() != true)
+       {
+               String tagName = __pHitElementResult->GetTagName();
+               String type = __pHitElementResult->GetAttributeValue("type");
+
+
+               if (((tagName.CompareTo(L"INPUT") == 0)  || tagName.CompareTo(L"TEXTAREA") == 0))
+               {
+
+               }
+               else
+               {
+                       AppLog("ArticleReaderForm::OnWebPageBlockSelected no paste option");
+
+                       if(__pHitElementResult->GetUrl().GetLength() > 0)
+                       {
+                       }
+                       InitSelectTextContextMenu(endPoint);
+                       __pSelectionMenu->SetShowState(true);
+                       __pSelectionMenu->Show();
+                       __pSelectionMenu->Invalidate(true);
+               }
+
+               AppLog("ArticleReaderForm::OnWebPageBlockSelected tag name is %ls",tagName.GetPointer());
+               AppLog("ArticleReaderForm::OnWebPageBlockSelected type name is %ls",type.GetPointer());
+       }
+
+}
+
+void
+ArticleReaderForm::OnOrientationChanged(const Control& source, OrientationStatus orientationStatus)
+{
+       AppLog("ArticleReaderForm::OnOrientationChanged entered");
+       if(__pFindWordControl)
+       {
+               if (__pFindWordBgLabel != null)
+               {
+                       Bitmap *pBitmap = CommonUtil::GetNinepatchedBitmapN(IDB_FINDWORD_INPUT_FIELD_BG, __pFindWordBgLabel->GetWidth(), __pFindWordBgLabel->GetHeight());
+                       if (pBitmap != null)
+                       {
+                               __pFindWordBgLabel->SetBackgroundBitmap(*pBitmap);
+                               delete pBitmap;
+                       }
+               }
+
+               __pFindWordControl->SetBounds(0,0, __pFindWordControl->GetWidth(), __pFindWordControl->GetHeight());
+       }
+       RelayoutControls();
+}
+
+
+void
+ArticleReaderForm::OnTextValueChanged (const Tizen::Ui::Control &source)
+{
+
+       if (__pFindWordEditField != null)
+       {
+               __pFindWordNext->SetEnabled(false);
+               __pFindWordPrev->SetEnabled(false);
+               __pFindWordNext->Invalidate(true);
+               __pFindWordPrev->Invalidate(true);
+               __pFindWordCountLabel->SetText(L"0/0");
+               __pFindWordCountLabel->Invalidate(true);
+       }
+       if (__pFindWordEditField->GetText().GetLength() > 0)
+       {
+               StartWordSearch();
+       }
+       else
+       {
+               __pFindWordPrev->SetEnabled(false);
+               __pWebReader->SearchText(L"aaaaaaaabbbbbbbccccccc");
+       }
+
+//     else
+//     {
+////           __currentSearchStr = L"aaaaaaaabbbbbbbccccccc";
+//             StartWordSearch();
+////           __currentSearchStr = L"";
+//             AppLogDebug("Enter something");
+//     }
+}
+
+result
+ArticleReaderForm::InitSelectTextContextMenu(Tizen::Graphics::Point p)
+{
+       result r = E_SUCCESS;
+       ContextMenuAnchorDirection direction = CONTEXT_MENU_ANCHOR_DIRECTION_AUTO;
+
+       AppLog("ArticleReaderForm::InitSelectTextContextMenu clicked on text");
+       if (__pSelectionMenu != null)
+       {
+               delete __pSelectionMenu;
+               __pSelectionMenu = null;
+       }
+
+       if(p.y < 150)
+       {
+               p.y = p.y + 50;
+               direction = CONTEXT_MENU_ANCHOR_DIRECTION_DOWNWARD;
+       }
+       else
+       {
+               direction = CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD;
+       }
+       __pSelectionMenu = new (std::nothrow) ContextMenu();
+       r = __pSelectionMenu->Construct(p, CONTEXT_MENU_STYLE_GRID, direction);
+       TryCatch(!IsFailed(r),, "Context image menu creation failed with%s",GetErrorMessage(r));
+
+       r = __pSelectionMenu->AddItem(CommonUtil::GetString(L"IDS_COM_OPT_COPY"),IDA_COPY_TEXT_CLICKED);
+       r = __pSelectionMenu->AddItem(CommonUtil::GetString(L"IDS_BR_OPT_FIND_ON_PAGE_ABB"),IDA_FIND_TEXT_CLICKED);
+       r = __pSelectionMenu->AddItem(CommonUtil::GetString(L"IDS_BR_OPT_SHARE"),IDA_SHARE_TEXT_CLICKED);
+
+       __pSelectionMenu->SetMaxVisibleItemsCount(3);
+       __pSelectionMenu->AddActionEventListener(*this);
+       SetControlAlwaysOnTop(*__pSelectionMenu, true);
+
+       CATCH: return r;
+
+}
+
+result
+ArticleReaderForm::InitFindWordPanel(void)
+{
+       result r = E_SUCCESS;
+       Bitmap *pIconBitmap = null;
+
+       if (__pFindWordControl != null)
+       {
+               __pFindWordControl->SetBounds(0,0, __pFindWordControl->GetWidth(), __pFindWordControl->GetHeight());
+               __pFindWordControl->SetShowState(true);
+               __pFindWordEditField->SetText(__pWebReader->GetTextFromBlock());
+
+
+               __pFindWordEditField->SetFocus();
+
+               if (__pFindWordEditField->GetText().GetLength() > 0)
+               {
+                       StartWordSearch();
+               }
+               return r;
+       }
+
+       __pFindWordControl = new (std::nothrow) Panel();
+       r = __pFindWordControl->Construct(L"IDL_FIND_ON_PAGE");
+       if (IsFailed(r))
+       {
+               AppLogException("There is some problem in the xml file. Please check.");
+               return E_FAILURE;
+       }
+       AddControl(__pFindWordControl);
+       __pFindWordControl->SetBounds(0,0, __pFindWordControl->GetWidth(), __pFindWordControl->GetHeight());
+       SetControlAlwaysOnTop(*__pFindWordControl,true);
+       __pFindWordControl->SetShowState(true);
+       __pFindWordControl->Invalidate(false);
+
+       __pFindWordBgLabel = static_cast<Label*>(__pFindWordControl->GetControl(L"IDC_LABEL1", true));
+       if (__pFindWordBgLabel != null)
+       {
+               Panel* pPanel1 = static_cast<Panel*>(__pFindWordControl->GetControl(L"IDC_PANEL1", true));
+               Rectangle pRect = pPanel1->GetBounds();
+               pRect.x = pRect.y = 0;
+               __pFindWordBgLabel->SetBounds(pRect);
+               Bitmap *pBitmap = CommonUtil::GetNinepatchedBitmapN(L"I01_search_input_field_bg.9.png", __pFindWordBgLabel->GetWidth(), __pFindWordBgLabel->GetHeight());
+               if (pBitmap != null)
+               {
+                       AppLogDebug("InitFindWordPanel: Coming here");
+                       __pFindWordBgLabel->SetBackgroundBitmap(*pBitmap);
+                       delete pBitmap;
+               }
+               else
+               {
+                       AppLogDebug("InitFindWordPanel: shouldn't Come here");
+               }
+       }
+
+       Button* pfindWordCancel = null;
+       pfindWordCancel = static_cast<Button*>(__pFindWordControl->GetControl(L"IDC_FIND_CANCEL", true));
+       if (pfindWordCancel == null)
+       {
+               AppLogException("There is some problem in the xml file. Please check.");
+               return E_FAILURE;
+       }
+       pfindWordCancel->SetActionId(IDA_FINDWORD_CANCEL_CLICKED);
+       pfindWordCancel->AddActionEventListener(*this);
+
+       __pFindWordClear = static_cast<Button*>(__pFindWordControl->GetControl(L"IDC_FIND_CLEAR", true));
+       if (__pFindWordClear == null)
+       {
+               AppLogException("There is some problem in the xml file. Please check.");
+               return E_FAILURE;
+       }
+
+       __pFindWordClear->SetActionId(IDA_FINDWORD_CLEAR_CLICKED);
+       __pFindWordClear->AddActionEventListener(*this);
+
+       __pFindWordNext = static_cast<Button*>(__pFindWordControl->GetControl(L"IDC_FIND_NEXT", true));
+       if (__pFindWordNext == null)
+       {
+               AppLogException("There is some problem in the xml file. Please check.");
+               return E_FAILURE;
+       }
+
+       __pFindWordNext->SetActionId(IDA_FINDWORD_NEXT_CLICKED);
+       __pFindWordNext->AddActionEventListener(*this);
+
+       __pFindWordPrev = static_cast<Button*>(__pFindWordControl->GetControl(L"IDC_FIND_PREV", true));
+       if (__pFindWordPrev == null)
+       {
+               AppLogException("There is some problem in the xml file. Please check.");
+               return E_FAILURE;
+       }
+
+       __pFindWordPrev->SetActionId(IDA_FINDWORD_PREV_CLICKED);
+       __pFindWordPrev->AddActionEventListener(*this);
+
+       __pFindWordNext->SetEnabled(false);
+       __pFindWordPrev->SetEnabled(false);
+
+       __pFindWordCountLabel = static_cast<Label*>(__pFindWordControl->GetControl(L"IDC_FIND_COUNT_LABEL", true));
+       if (__pFindWordCountLabel == null)
+       {
+               AppLogException("There is some problem in the xml file. Please check.");
+               return E_FAILURE;
+       }
+
+       __pFindWordEditField = static_cast<EditField*>(__pFindWordControl->GetControl(L"IDC_FIND_WORD_EDITFIELD", true));
+       if (__pFindWordEditField == null)
+       {
+               AppLogException("There is some problem in the xml file. Please check.");
+               return E_FAILURE;
+       }
+       __pFindWordEditField->SetText(__pWebReader->GetTextFromBlock());
+       __pFindWordEditField->AddTextEventListener(*this);
+       __pFindWordEditField->AddKeypadEventListener(*this);
+       __pFindWordEditField->SetOverlayKeypadCommandButtonVisible(false);
+
+       __pFindWordEditField->SetFocus();
+//     __pFindWordEditField->ShowKeypad();
+       if (__pFindWordEditField->GetText().GetLength() > 0)
+       {
+               StartWordSearch();
+       }
+       return r;
+}
+
+void
+ArticleReaderForm::StartWordSearch()
+{
+       __pFindWordPrev->SetEnabled(false);
+       __pWebReader->SearchTextAllAsync(__pFindWordEditField->GetText(), false);
+
+}
+
+void
+ArticleReaderForm::RelayoutControls()
+{
+       if( __pFindWordControl && __pFindWordControl->GetShowState() == true)
+       {
+               __pFindWordControl->SetBounds(0,0, __pFindWordControl->GetWidth(), __pFindWordControl->GetHeight());
+               __pWebReader->SetBounds(0,__pFindWordControl->GetHeight(),GetClientAreaBounds().width, GetClientAreaBounds().height - __pFooterPanel->GetHeight() - __pFindWordControl->GetHeight());
+       }
+       else
+       {
+               if(__pWebReader)
+                       __pWebReader->SetBounds(0,0,GetClientAreaBounds().width, GetClientAreaBounds().height - __pFooterPanel->GetHeight());
+       }
+}
index f8c7475..c85a1bd 100644 (file)
@@ -1031,7 +1031,7 @@ BookmarkListForm::OnSearchBarModeChanged(Tizen::Ui::Controls::SearchBar& source,
 
                if(__pSearchBar)
                {
-                       __pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), __pSearchListView->GetHeight()));
+                       __pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight()));
                        __pSearchBar->SetText(L"");
                }
                AppLog("OnSearchBarModeChanged SetContentAreaSize heihgt %d",__pSearchListView->GetHeight());
@@ -1047,16 +1047,18 @@ BookmarkListForm::OnKeypadWillOpen(Tizen::Ui::Control& source)
 
        __pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), GetClientAreaBounds().width, GetClientAreaBounds().height - __pSearchBar->GetHeight());
        __pSearchListView->SetEnabled(false);
-       __pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), __pSearchListView->GetHeight()));
+       __pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight()));
        Invalidate(true);
 }
 
 void
 BookmarkListForm::OnKeypadOpened(Tizen::Ui::Control& source)
 {
+       AppLog("ABCD::BookmarkListForm::OnKeypadOpened");
        GetFooter()->SetShowState(false);
        AppLog("ABCD::BookmarkListForm::OnKeypadOpened");
        __pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), __pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight());
+       __pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight()));
        Invalidate(true);
 }
 
@@ -1157,7 +1159,8 @@ void
 BookmarkListForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen::Ui::OrientationStatus orientationStatus)
 {
        AppLog("BookmarkListForm::OnOrientationChanged start");
-
+       __pListview->SetBackgroundColor(GetBackgroundColor());
+       __pSearchListView->SetBackgroundColor(GetBackgroundColor());
        if (__pListview)
        {
                if(__pSearchBar->GetShowState())
@@ -1188,9 +1191,20 @@ BookmarkListForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen:
                        __pSearchBar->Invalidate(true);
                }
 
-               __pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), GetClientAreaBounds().height));
+               __pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight()));
        }
 
+//
+//
+//
+//     FloatRectangle clientRect;
+//     clientRect = GetClientAreaBoundsF();
+//
+//     __pSearchBar->SetContentAreaSize(FloatDimension(clientRect.width, clientRect.height - __pSearchBar->GetHeightF()));
+//     __pListview->SetSize(FloatDimension(clientRect.width, clientRect.height - __pSearchBar->GetHeightF()));
+//     __pSearchListView->SetSize(FloatDimension(clientRect.width, clientRect.height - __pSearchBar->GetHeightF()));
+//     Invalidate(true);
+//
 
        Invalidate(true);
 }
index 0fcb3bb..5ee2843 100644 (file)
@@ -22,6 +22,7 @@
  */
 
 #include "IntAddBookmarkForm.h"
+#include "IntArticleReaderForm.h"
 #include "IntBookmarkListForm.h"
 #include "IntBrightnessForm.h"
 #include "IntCreateBookmarkFolderForm.h"
@@ -35,6 +36,7 @@
 #include "IntFormFactory.h"
 #include "IntSettingForm.h"
 
+
 using namespace Tizen::Base;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
@@ -55,6 +57,7 @@ const wchar_t* IDL_FORM_FONT_SIZE_SCENE = L"FontSize";
 const wchar_t* IDL_FORM_EDIT_HOME_PAGE_SCENE = L"EditHomePage";
 const wchar_t* IDL_FORM_BRIGHTNESS_SCENE = L"Brightness";
 
+
 FormFactory::FormFactory(void)
 {
 
@@ -150,7 +153,16 @@ FormFactory::CreateFormN(const String& formId, const SceneId& sceneId)
                pForm->Initialize();
                pNewForm = pForm;
        }
-
+       else if (formId == IDL_FORM_ARTICLE_READER_SCENE)
+       {
+               ArticleReaderForm* pForm = new(std::nothrow) ArticleReaderForm();
+               if (pForm == null)
+               {
+                       return null;
+               }
+               pForm->Initialize();
+               pNewForm = pForm;
+       }
        else if (formId == IDL_FORM_EDIT_BOOKMARK_LIST_SCENE)
        {
                EditBookmarkListForm* pForm = new(std::nothrow) EditBookmarkListForm();
index 15ae441..fba060f 100644 (file)
@@ -116,9 +116,11 @@ 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 IDA_READER_BTN_CLICKED = 219;
 
-const int IDA_HYPERLINK_OPEN_CLICKED = 219;
-const int IDA_HYPERLINK_COPY_LINK_CLICKED = 220;
+
+const int IDA_HYPERLINK_OPEN_CLICKED = 220;
+const int IDA_HYPERLINK_COPY_LINK_CLICKED = 221;
 const int IDA_HYPERLINK_SAVE_IMAGE_CLICKED = 222;
 const int IDA_HYPERLINK_SHARE_IMAGE_CLICKED = 223;
 
@@ -166,7 +168,7 @@ MainForm::MainForm(void)
        __currentWordIndex = 0;
        __distanceMoved = 0;
        __isLoaded = false;
-       __inputEventToBeSupressed = false;
+       //__inputEventToBeSupressed = false;
        __isLoadingData = false;
        __isLoadingCompleted = false;
        __progressPercentage = 0;
@@ -195,6 +197,7 @@ MainForm::MainForm(void)
        __pFooterLabel = null;
        __pStopBtn = null;
        __pClearBtn = null;
+       __pReaderBtn = null;
        __isWebKeypadOpened = false;
 }
 
@@ -645,9 +648,7 @@ MainForm::InitFooter(void)
 
        __pFooterUrlField->SetOverlayKeypadCommandButtonVisible(false);
        __pFooterUrlField->SetKeypadAction(KEYPAD_ACTION_GO);
-       //__pFooterUrlField->AddFocusEventListener(*this);
        __pFooterUrlField->AddKeypadEventListener(*this);
-       //__pFooterUrlField->AddFocusEventListener(*this);
        __pFooterUrlField->SetPropagatedTouchEventListener(this);
 
        if (SettingPresentationModel::GetInstance()->GetHomepage().CompareTo((L"IDS_BR_BODY_MOST_VISITED_SITES")) == 0)
@@ -684,15 +685,12 @@ MainForm::InitFooter(void)
        }
        __pGoForwardBtn->SetActionId(IDA_GO_FORWARD);
        __pGoForwardBtn->AddActionEventListener(*this);
-//     __pGoForwardBtn->SetEnabled(false);
        if (__pWebViewer && __pWebViewer->CanGoForward())
        {
-               //__pAddressbar->SetForwardButtonEnabled(true);
                SetForwardButtonEnabled(true);
        }
        else
        {
-               //__pAddressbar->SetForwardButtonEnabled(false);
                SetForwardButtonEnabled(false);
        }
 
@@ -736,6 +734,16 @@ MainForm::InitFooter(void)
        __pClearBtn->AddActionEventListener(*this);
        __pClearBtn->SetShowState(false);
 
+       __pReaderBtn = static_cast<Button*> (GetControl(L"IDC_READER_BUTTON",true));
+       if (__pReaderBtn == NULL)
+       {
+               AppLogDebug("Control not found returning E_INVALID_KEY");
+               return E_INVALID_KEY;
+       }
+       __pReaderBtn->SetActionId(IDA_READER_BTN_CLICKED);
+       __pReaderBtn->AddActionEventListener(*this);
+       __pReaderBtn->SetShowState(false);
+
        //      __pFooterPanel->Invalidate(true);
        AppLogDebug("MainForm::InitFooter exit");
        return E_SUCCESS;
@@ -805,16 +813,6 @@ result MainForm::InitImageContextMenu(Tizen::Graphics::Point p)
                __pImageMenu = null;
        }
 
-//     p.y = p.y + __pAddressbar->GetHeight() + 12;
-//     AppLog("vinaypy %d",p.y);
-//     if(p.y < 100)
-//     {
-//             direction = CONTEXT_MENU_ANCHOR_DIRECTION_DOWNWARD;
-//     }
-//     else
-//     {
-//             direction = CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD;
-//     }
        __pImageMenu = new (std::nothrow) ContextMenu();
        r = __pImageMenu->Construct(p, CONTEXT_MENU_STYLE_LIST, direction);
        TryCatch(!IsFailed(r),, "Context image menu creation failed with%s",GetErrorMessage(r));
@@ -845,14 +843,7 @@ MainForm::InitImageLinkContextMenu(Tizen::Graphics::Point p)
 
        if(__pAddressbar->GetShowState() == true)
                p.y = p.y + __pAddressbar->GetHeight();
-//     if (p.y < 100)
-//     {
-//             direction = CONTEXT_MENU_ANCHOR_DIRECTION_DOWNWARD;
-//     }
-//     else
-//     {
-//             direction = CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD;
-//     }
+
        __pImageMenu = new (std::nothrow) ContextMenu();
        r = __pImageMenu->Construct(p, CONTEXT_MENU_STYLE_LIST, direction);
        TryCatch(!IsFailed(r),, "Context image menu creation failed with%s",GetErrorMessage(r));
@@ -882,7 +873,6 @@ MainForm::InitSelectTextContextMenu(Tizen::Graphics::Point p, bool pasteOption,
                delete __pImageMenu;
                __pImageMenu = null;
        }
-//     p.y = p.y + __pAddressbar->GetHeight() + 12;
 
        if(p.y < 150)
        {
@@ -891,7 +881,6 @@ MainForm::InitSelectTextContextMenu(Tizen::Graphics::Point p, bool pasteOption,
        }
        else
        {
-//             p.y = p.y - 100;
                direction = CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD;
        }
        __pImageMenu = new (std::nothrow) ContextMenu();
@@ -1238,38 +1227,39 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        AppLogDebug("Clicked : %d", actionId);
        switch (actionId)
        {
-//     case IDA_BACKBTN_CLICKED:
-//     {
-//             if (__pWebViewer && __pWebViewer->CanGoBack())
-//             {
-//                     __pWebViewer->GoBack();
-//             }
-//             else
-//             {
-//                     UiApp* pApp = null;
-//                     pApp = UiApp::GetInstance();
-//                     if (pApp != null)
-//                     {
-//                             r = pApp->Terminate();
-//                             if (IsFailed(r))
-//                             {
-//                                     AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
-//                                     return;
-//                             }
-//                     }
-//             }
-//     }
-//     break;
-
        case IDA_BACKBTN_CLICKED:
+       {
+               if (__pWebViewer && __pWebViewer->CanGoBack())
                {
-                       if (__pWebViewer && __pWebViewer->CanGoBack())
+                       __pWebViewer->GoBack();
+               }
+               else if(__pWindowInfo->isJavascriptInitiated == false)
+               {
+                       UiApp* pApp = null;
+                       pApp = UiApp::GetInstance();
+                       if (pApp != null)
                        {
-                               __pWebViewer->GoBack();
+                               r = pApp->Terminate();
+                               if (IsFailed(r))
+                               {
+                                       AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
+                                       return;
+                               }
+                       }
+               }
+               else
+               {
+                       UiApp* pApp = null;
+                       WindowInfo* pWindowInfo = null;
+                       int totalCount = 0;
+                       SceneManager* pSceneManager = SceneManager::GetInstance();
+                       if (pSceneManager == null)
+                       {
+                               return;
                        }
-                       else if(__pWindowInfo->isJavascriptInitiated == false)
+                       ArrayList* pAllWindowList = MultipleWindowPresentationModel::GetInstance()->GetAllWindowArrayList();
+                       if (pAllWindowList == NULL)
                        {
-                               UiApp* pApp = null;
                                pApp = UiApp::GetInstance();
                                if (pApp != null)
                                {
@@ -1281,18 +1271,14 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                        }
                                }
                        }
-                       else
+                       if (pAllWindowList != null)
                        {
-                               UiApp* pApp = null;
-                               WindowInfo* pWindowInfo = null;
-                               int totalCount = 0;
-                               SceneManager* pSceneManager = SceneManager::GetInstance();
-                               if (pSceneManager == null)
-                               {
-                                       return;
-                               }
-                               ArrayList* pAllWindowList = MultipleWindowPresentationModel::GetInstance()->GetAllWindowArrayList();
-                               if (pAllWindowList == NULL)
+                               totalCount = pAllWindowList->GetCount();
+                       }
+                       for (int count = 0; count < totalCount; count++)
+                       {
+                               pWindowInfo = dynamic_cast< WindowInfo* >(pAllWindowList->GetAt(count));
+                               if (pWindowInfo == null)
                                {
                                        pApp = UiApp::GetInstance();
                                        if (pApp != null)
@@ -1305,75 +1291,55 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                                }
                                        }
                                }
-                               if (pAllWindowList != null)
-                               {
-                                       totalCount = pAllWindowList->GetCount();
-                               }
-                               for (int count = 0; count < totalCount; count++)
+                               else
                                {
-                                       pWindowInfo = dynamic_cast< WindowInfo* >(pAllWindowList->GetAt(count));
-                                       if (pWindowInfo == null)
+                                       if (pSceneManager->GetCurrentSceneId() == pWindowInfo->sceneID && pWindowInfo->isJavascriptInitiated == true)
                                        {
-                                               pApp = UiApp::GetInstance();
-                                               if (pApp != null)
+                                               r = SceneRegister::DestroyAndUnRegisterScene(pWindowInfo->sceneID);
+                                               if (IsFailed(r))
                                                {
-                                                       r = pApp->Terminate();
-                                                       if (IsFailed(r))
-                                                       {
-                                                               AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
-                                                               return;
-                                                       }
+                                                       AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
+                                                       return;
                                                }
-                                       }
-                                       else
-                                       {
-                                               if (pSceneManager->GetCurrentSceneId() == pWindowInfo->sceneID && pWindowInfo->isJavascriptInitiated == true)
+                                               r = pAllWindowList->RemoveAt(count, true);
+                                               __pWindowInfo = null;
+                                               if (IsFailed(r))
                                                {
-                                                       r = SceneRegister::DestroyAndUnRegisterScene(pWindowInfo->sceneID);
-                                                       if (IsFailed(r))
+                                                       AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
+                                                       return;
+                                               }
+                                               if(count > 0)
+                                               {
+                                                       pWindowInfo = dynamic_cast< WindowInfo* >(pAllWindowList->GetAt(count - 1));
+                                               }
+                                               else
+                                               {
+                                                       pWindowInfo = dynamic_cast< WindowInfo* >(pAllWindowList->GetAt(pAllWindowList->GetCount() - 1));
+                                               }
+                                               if (pWindowInfo == null)
+                                               {
+                                                       pApp = UiApp::GetInstance();
+                                                       if (pApp != null)
                                                        {
-                                                               AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
+                                                               r = pApp->Terminate();
                                                                return;
                                                        }
-                                                       r = pAllWindowList->RemoveAt(count, true);
-                                                       __pWindowInfo = null;
+                                               }
+                                               else
+                                               {
+                                                       r = pSceneManager->GoBackward(BackwardSceneTransition(pWindowInfo->sceneID ,SCENE_TRANSITION_ANIMATION_TYPE_NONE));
                                                        if (IsFailed(r))
                                                        {
                                                                AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
                                                                return;
                                                        }
-                                                       if(count > 0)
-                                                       {
-                                                               pWindowInfo = dynamic_cast< WindowInfo* >(pAllWindowList->GetAt(count - 1));
-                                                       }
-                                                       else
-                                                       {
-                                                               pWindowInfo = dynamic_cast< WindowInfo* >(pAllWindowList->GetAt(pAllWindowList->GetCount() - 1));
-                                                       }
-                                                       if (pWindowInfo == null)
-                                                       {
-                                                               pApp = UiApp::GetInstance();
-                                                               if (pApp != null)
-                                                               {
-                                                                       r = pApp->Terminate();
-                                                                       return;
-                                                               }
-                                                       }
-                                                       else
-                                                       {
-                                                               r = pSceneManager->GoBackward(BackwardSceneTransition(pWindowInfo->sceneID ,SCENE_TRANSITION_ANIMATION_TYPE_NONE));
-                                                               if (IsFailed(r))
-                                                               {
-                                                                       AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
-                                                                       return;
-                                                               }
-                                                       }
-                                                       break;
                                                }
+                                               break;
                                        }
                                }
                        }
                }
+       }
                break;
 
        case IDA_FORWARD_CLICKED:
@@ -1398,13 +1364,6 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                __pMenu->Invalidate(false);
 
                __pFindWordEditField->SetFocus();
-               /*
-               if (__pWebViewer != null)
-               {
-                       // releasing the set block
-                       __pWebViewer->ReleaseBlock();
-               }
-               */
                ShowFindWordPanel(true);
        }
        break;
@@ -1566,7 +1525,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                AppLog("SavePageAsPdf result %s",GetErrorMessage(r));
 
                AppLog("RequestPrint called!");
-               Tizen::App::AppControl* pAc = Tizen::App::AppManager::FindAppControlN(L"org.tizen.mobileprint", L"http://tizen.org/appcontrol/operation/print");
+               AppControl* pAc = Tizen::App::AppManager::FindAppControlN(L"org.tizen.mobileprint", L"http://tizen.org/appcontrol/operation/print");
                result nResult = E_FAILURE;
                if (pAc)
                {
@@ -1584,7 +1543,6 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        String folderVal = UiApp::GetInstance()->GetAppRootPath()+"//data";
 
                        map.Add(&fileCount, &countVal);
-//                     map.Add(&fileIndex, &indexVal);
                        map.Add(&fileFolder, &folderVal);
                        map.Add(&fileType, &typeVal);
 
@@ -1709,7 +1667,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        if (__pMenu->GetItemCount() != 9)
                        {
                                __pMenu->InsertItemAt(1,CommonUtil::GetString(L"IDS_BR_OPT_ADDTOBOOKMARKS"), IDA_ADDTOBOOKMARK_CLICKED);
-                               __pMenu->InsertItemAt(2,"Print", IDA_PRINT_CLICKED);
+                               __pMenu->InsertItemAt(2,CommonUtil::GetString(L"IDS_COM_SK_PRINT"), IDA_PRINT_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);
@@ -1816,16 +1774,11 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        {
                if (__pArticleReaderPanel != null && __pBlankPanel != null)
                {
-                       //__pArticleReaderPanel->SetShowState(false);
-                       //__pArticleReaderPanel->Show();
                        RemoveControl(__pBlankPanel);
-                       //RemoveControl(*__pArticleReaderPanel);
                        __pArticleReaderPanel = null;
                        __pBlankPanel = null;
                        __pArticleReaderLabel = null;
                }
-               //if (__pAddressbar)
-               //      __pAddressbar->SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING_COMPLETE);
                SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING_COMPLETE);
        }
        break;
@@ -1839,6 +1792,8 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                __pFindWordPrev->SetEnabled(false);
                __pFindWordCountLabel->SetText(L"0/0");
                __pWebViewer->SearchText(L"aaaabbbbcccc",true);
+               AppLog("akjshdasd 1");
+               __pFooterPanel->SetShowState(true);
                ShowFindWordPanel(false);
        }
        break;
@@ -2098,7 +2053,8 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        break;
        case IDA_FIND_TEXT__CLICKED:
        {
-               OnAddressCancelledClicked(*__pAddressbar);
+//             AddressBarCancelledClicked(*__pAddressbar);
+               RelayoutControls(false);
 //             __pFooterPanel->SetShowState(false);
                AppLogDebug("MainForm::OnActionPerformed find word clicked");
                __currentSearchStr.Clear();
@@ -2116,15 +2072,12 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                if (__pAddressbar != null && __pWebViewer != NULL)
                {
                        __webControlPosition.y = __pAddressbar->GetHeight() - 12;
-                       //__pAddressbar->SetBounds(0,__adressPanelPosition.y,GetClientAreaBounds().width,__pAddressbar->GetHeight());
-                       //__pAddressbar->Invalidate(true);
                        __webControlHeight = GetClientAreaBounds().height - __pFooterPanel->GetHeight() - ( /*__pAddressbar->GetY() +*/ __pAddressbar->GetHeight() - 12);
 
                        if (__pFooterPanel->GetShowState() == false)
                                __pWebViewer->SetBounds(Rectangle(0,__webControlPosition.y,GetClientAreaBounds().width, GetClientAreaBounds().height - ( /*__pAddressbar->GetY() +*/ __pAddressbar->GetHeight() - 12)));
                        else
                                __pWebViewer->SetBounds(Rectangle(0,__webControlPosition.y,GetClientAreaBounds().width, __webControlHeight));
-                       //                      __pWebViewer->SetBounds(Rectangle(0,__webControlPosition.y,GetClientAreaBounds().width,__webControlHeight));
                        __pWebViewer->Invalidate(true);
                }
 
@@ -2294,6 +2247,11 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                }
        }
        break;
+       case IDA_READER_BTN_CLICKED:
+       {
+               ReaderClicked();
+       }
+       break;
        default:
                break;
        }
@@ -2526,6 +2484,17 @@ MainForm::OnLoadingStarted(void)
        {
                return;
        }
+       // this is added in case if menu is opened and user load the page
+       if(__pMenu != null && __pMenu->GetShowState() == true)
+       {
+               __pMenu->SetShowState(false);
+               __pMenu->Invalidate(true);
+       }
+       if(__pImageMenu != null && __pImageMenu->GetShowState() == true)
+       {
+               __pImageMenu->SetShowState(false);
+               __pImageMenu->Invalidate(true);
+       }
        String url = __pWebViewer->GetUrl();
        if(url.Contains(IDS_TIZEN_SERVICE))
        {
@@ -2586,7 +2555,7 @@ MainForm::OnLoadingStarted(void)
        if ( __pAddressbar != null && __pAddressbar->GetShowState() == true)
        {
                __pAddressbar->SetShowState(false);
-               OnAddressCancelledClicked(*__pAddressbar);
+               AddressBarCancelledClicked(*__pAddressbar);
                __pAddressbar->Invalidate(true);
        }
        Bitmap* pBitmap = FaviconManager::GetInstance()->GetDefaultFaviconN();
@@ -2612,6 +2581,8 @@ MainForm::OnLoadingStarted(void)
                SetUrl(__pWebViewer->GetUrl());
                if (__pWindowInfo != NULL)
                {
+                       // resetting the page title to blank, it will be received in OnPageTitleReceived()
+                       __pWindowInfo->pageTitle = L"";
                        __pWindowInfo->pageUrl = __pWebViewer->GetUrl();
                }
                __pAddressbar->Invalidate(true);
@@ -2630,10 +2601,6 @@ void
 MainForm::OnKeypadWillOpen(Tizen::Ui::Control& source)
 {
        AppLog("XYZ::MainForm::OnKeypadWillOpen");
-       if (__pAddressbar != null)
-       {
-               OnAddressBarKeypadWillOpen(*__pAddressbar);
-       }
 
 }
 
@@ -2641,22 +2608,14 @@ void
 MainForm::OnKeypadOpened(Tizen::Ui::Control& source)
 {
        AppLog("XYZ::MainForm::OnKeypadOpened");
-       if(__pAddressbar != null)
-       {
-               OnAddressBarKeypadOpened(*__pAddressbar);
-       }
-}
 
+}
 
 void
 MainForm::OnKeypadClosed(Tizen::Ui::Control& source)
 {
        AppLog("XYZ::MainForm::OnKeypadClosed");
-
-       if (__pAddressbar != null)
-       {
-               OnAddressBarKeypadClosed(*__pAddressbar);
-       }
+       RelayoutControls(true);
 }
 
 void
@@ -2777,6 +2736,70 @@ MainForm::OnLoadingCompleted(void)
                // temperary fixed (webpage can be not loaded)
                UpdateFavicon();
        }
+
+       bool isReaderEnabled = SettingPresentationModel::GetInstance()->IsRunReaderEnabled();
+       if (isReaderEnabled == true)
+       {
+               if (__pReaderData)
+               {
+                       delete __pReaderData;
+                       __pReaderData = null;
+               }
+               String filePath = Tizen::App::UiApp::GetInstance()->GetAppRootPath();
+               filePath.Append(L"data/reader.js");
+               File file;
+               char buffer[10];
+               char buffer2[5];
+               int i;
+               int readCnt;
+               result r = E_SUCCESS;
+               FileAttributes attr;
+
+               File::GetAttributes(filePath,attr);
+               // Creates file
+               r = file.Construct(filePath, L"r+");
+               if (IsFailed(r))
+               {
+                       AppLogDebug("File construct failed with %s", GetErrorMessage(r));
+                       return;
+               }
+               char* pScript = new(std::nothrow) char[attr.GetFileSize()+1];
+               if(pScript == null)
+               {
+                       AppLogDebug("Memory allocation for file failed %s", GetErrorMessage(r));
+                       return;
+               }
+//             file.Read(pScript,attr.GetFileSize());
+//
+//             AppLogDebug("scipt length %d",strlen(pScript));
+               String strScript = L"";
+//             strScript.Append(pScript);
+//             for(int i=0; i<25; i++)
+               {
+                       file.Read(pScript,attr.GetFileSize());
+//                     AppLog("xyzz tell %d",file.Tell());
+//                     r = strScript.Append(pScript);
+//                     AppLog("xyzz append result %s",GetErrorMessage(r));
+//                     AppLog("xyzz strScript length %d",strScript.GetLength());
+               }
+//             AppLog("xyzz final strScript length %d",strScript.GetLength());
+
+               __pReaderData = __pWebViewer->EvaluateJavascriptN(pScript);
+               if (__pReaderData == null)
+               {
+                       AppLog("MainScene::data is null Error :%s",GetErrorMessage(GetLastResult()));
+                       return;
+               }
+               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);
+                       SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_READER);
+               }
+               delete[] pScript;
+       }
+
+
        AppLog("MainForm::OnLoadingCompleted done");
 }
 
@@ -2813,12 +2836,9 @@ MainForm::OnUrlSubmitted(Addressbar& addBar)
        String url = addBar.GetUrl();
        AppLog("MainForm::OnUrlSubmitted url is %ls", url.GetPointer());
 
-//     __pFooterPanel->SetShowState(true);
        if(__pFooterUrlField)
                __pFooterUrlField->SetCursorPosition(__pFooterUrlField->GetTextLength());
-       OnAddressCancelledClicked(*__pAddressbar);
-//     __pAddressbar->SetShowState(false);
-//     RelayoutControls(false);
+       AddressBarCancelledClicked(*__pAddressbar);
        LoadUrl(url);
 }
 
@@ -2909,87 +2929,6 @@ MainForm::OnStopClicked(Addressbar& addBar)
 }
 
 void
-MainForm::OnReaderClicked(const Addressbar& addBar)
-{
-       int bodyWidth = ((double)(GetClientAreaBounds().width))*0.73;
-
-       CreateReaderPanel();
-       AppLogDebug("MainScene::OnReaderClicked entered");
-
-
-       /*if (__pArticleReaderPanel)
-       {
-               AppLogDebug("showstate true for reader panel");
-               __pArticleReaderPanel->SetShowState(true);
-               __pArticleReaderPanel->Show();
-       }*/
-       int xPos = __pArticleReaderPanel->GetX();
-       int yPos = __pArticleReaderPanel->GetY();
-       AppLog("OnReaderClicked() xPos = %d",xPos);
-       AppLog("OnReaderClicked() yPos = %d",yPos);
-
-       if (__pReaderData == null)
-       {
-               return;
-       }
-
-       String loadData = L"<html>\
-                                       <head>\
-                                       <meta name='viewport' content='width=device-width*0.73,minimum-scale=1.0, maximum-scale=1.0, user-scalable=no'>\
-                                       <style>\
-                                       h1\
-                                       {\
-                                       font-weight:bold;\
-                                       background-color: transparent;\
-                                       }\
-                                       div\
-                                       {\
-                                       display: block;\
-                                       }\
-                                       p\
-                                       {\
-                                       display: block; \
-                                       }\
-                                       img\
-                                       {\
-                                       margin-left:auto;\
-                                       margin-right:auto;\
-                                       }\
-                                       \
-                                       \
-                                       </style>\
-                                       </head>\
-                                       <body style='width:'";
-       loadData.Append(bodyWidth);
-       loadData.Append(L"px'>");
-       AppLogDebug("data->GetLength %d",__pReaderData->GetLength());
-       loadData.Append(*__pReaderData);
-       loadData.Append(L"</body></html>");
-
-       ByteBuffer buf ;
-       buf.Construct(loadData.GetLength());
-       AppLogDebug("data->GetLength %d",loadData.GetLength());
-       for (int z=0;z<loadData.GetLength();z++)
-       {
-               mchar b;
-               loadData.GetCharAt(z,b);
-               buf.SetByte((byte)b);
-       }
-
-       buf.Flip();
-       if (__pWebReader != null)
-       {
-               __pWebReader->LoadData(L"",buf,L"text/html");
-               AppLogDebug("LoadData result %s",GetErrorMessage(GetLastResult()));
-       }
-       else
-       {
-               AppLogDebug("cannot LoadData __pWebReader is null");
-       }
-
-}
-
-void
 MainForm::OnBackClicked(/*const Addressbar& addBar*/)
 {
 //     AppLog("MainForm::OnBackClicked");
@@ -3121,25 +3060,43 @@ MainForm::OnForwardClicked(/*const Addressbar& addBar*/)
 }
 
 void
-MainForm::OnAddressCancelledClicked(const Addressbar& addBar)
+MainForm::OnAddressBarFocusGained(const Addressbar& addBar)
 {
-       result r = E_SUCCESS;
+       AppLog("XYZ::MainForm::OnAddressBarFocusGained");
+       if(__pFooterPanel != null)
+       {
+               __pFooterPanel->SetShowState(false);
+       }
 
-       __pFooterPanel->SetShowState(true);
-       __pFooterUrlField->SetFocusable(true);
+       if (__pAddressbar != null && __pAddressbar->GetShowState() == false)
+       {
+               __pAddressbar->SetShowState(true);
+               __pAddressbar->SetBounds(Rectangle(0,0,GetClientAreaBounds().width,__pAddressbar->GetHeight()));
+       }
 
-       if(__pWebViewer)
-               __pWebViewer->SetFocus();
-       else if(__pMostVisitedListView)
-               __pMostVisitedListView->SetFocus();
-       else if(__pMultiWindowButton)
-               __pMultiWindowButton->SetFocus();
-       __pMoreButton->SetFocus();
+       RelayoutControls(false);
+}
 
-       __pAddressbar->SetShowState(false);
+void
+MainForm::OnAddressBarFocusLost(const Addressbar& addBar)
+{
+       AppLog("XYZ::MainForm::OnAddressBarFocusLost");
 
-       RelayoutControls(false,false);
+       if(__pAddressbar)
+               __pAddressbar->SetShowState(false);
+       if(__pFooterPanel)
+       {
+               AppLog("akjshdasd 3");
+               __pFooterPanel->SetShowState(true);
+       }
 
+       RelayoutControls(false);
+}
+
+void
+MainForm::OnAddressCancelledClicked(const Addressbar& addBar)
+{
+       AddressBarCancelledClicked(addBar);
 }
 
 void
@@ -3187,42 +3144,12 @@ MainForm::OnClipboardClosed(const Addressbar& addBar)
 void
 MainForm::OnAddressBarKeypadClosed(const Addressbar& addBar, bool footerState)
 {
-       if(__pAddressbar)
-               __pAddressbar->SetShowState(false);
-       if(__pFooterPanel)
-       {
-               __pFooterPanel->SetShowState(true);
-
-               __pFooterPanel->Invalidate(false);
-       }
-//     if(__pWebViewer)
-//             __pWebViewer->SetFocus();
-//     if(__pMoreButton)
-//     __pMoreButton->SetFocus();
-       if(__pFooterUrlField)
-       {
-               __pFooterUrlField->SetFocusable(true);
-       }
        RelayoutControls(false,footerState);
 }
 
 void
 MainForm::OnAddressBarKeypadOpened(const Addressbar& addBar)
 {
-       if (__pFindWordControl && __pFindWordControl->GetShowState() == true)
-       {
-               __pAddressbar->SetShowState(false);
-       }
-       else
-       {
-               if (__pAddressbar != null && __pAddressbar->GetShowState() == false)
-               {
-                       __pAddressbar->SetShowState(true);
-                       __pAddressbar->SetBounds(Rectangle(0,0,GetClientAreaBounds().width,__pAddressbar->GetHeight()));
-                       __pAddressbar->SetAddressbarURLFocus();
-               }
-       }
-
        RelayoutControls(false);
 }
 
@@ -3346,12 +3273,12 @@ MainForm::OnLoadingRequested(const Tizen::Base::String& url,
                __pFindWordNext->SetEnabled(false);
                __pFindWordPrev->SetEnabled(false);
                __pFindWordCountLabel->SetText(L"0/0");
-//             __pWebViewer->SearchText(L"aaaabbbbcccc",true);
                __pFindWordControl->SetShowState(false);
                __pFindWordEditField->HideKeypad();
+               RelayoutControls(false);
        }
 
-//     ShowFindWordPanel(false);
+
 
        __pFooterPanel->Invalidate(true);
 
@@ -3756,14 +3683,16 @@ MainForm::FindNextWord(bool next)
 void
 MainForm::OnWebKeypadWillOpen(Tizen::Web::Controls::Web& source)
 {
-       AppLog("MainForm::OnWebKeypadWillOpen");
+       AppLog("xyz::MainForm::OnWebKeypadWillOpen");
        __isWebKeypadOpened = true;
+       __pFooterPanel->SetShowState(false);
        //      OnAddressBarKeypadOpened(*__pAddressbar);
 }
 
 void
 MainForm::OnWebKeypadOpened(Tizen::Web::Controls::Web& source)
 {
+       AppLog("xyz::MainForm::OnWebKeypadOpened");
 
        if(__pFindWordControl && __pFindWordControl->GetShowState() == true)
        {
@@ -3805,8 +3734,11 @@ MainForm::OnWebKeypadOpened(Tizen::Web::Controls::Web& source)
 void
 MainForm::OnWebKeypadClosed(Tizen::Web::Controls::Web& source)
 {
+       AppLog("xyz::MainForm::OnWebKeypadClosed");
+       AppLog("akjshdasd 4");
        __pFooterPanel->SetShowState(true);
-       OnAddressBarKeypadClosed(*__pAddressbar);
+//     OnAddressBarKeypadClosed(*__pAddressbar);
+       RelayoutControls(false);
        __isWebKeypadOpened = false;
 }
 
@@ -3828,57 +3760,7 @@ MainForm::OnTouchDoublePressed(const Control& source, const Point& currentPositi
 
 
        AppLog("MainScene::OnTouchDoublePressed");
-       bool isReaderEnabled = SettingPresentationModel::GetInstance()->IsRunReaderEnabled();
-       if (isReaderEnabled == true)
-       {
-               if (__pReaderData)
-               {
-                       delete __pReaderData;
-                       __pReaderData = null;
-               }
-               String filePath = Tizen::App::UiApp::GetInstance()->GetAppRootPath();
-               filePath.Append(L"data/reader.js");
-               File file;
-               char buffer[10];
-               char buffer2[5];
-               int i;
-               int readCnt;
-               result r = E_SUCCESS;
-               FileAttributes attr;
 
-               File::GetAttributes(filePath,attr);
-               // Creates file
-               r = file.Construct(filePath, L"r+");
-               if (IsFailed(r))
-               {
-                       AppLogDebug("File construct failed with %s", GetErrorMessage(r));
-                       return;
-               }
-               char* pScript = new(std::nothrow) char[attr.GetFileSize()+1];
-               if(pScript == null)
-               {
-                       AppLogDebug("Memory allocation for file failed %s", GetErrorMessage(r));
-                       return;
-               }
-               file.Read(pScript,attr.GetFileSize());
-
-               AppLogDebug("scipt length %d",strlen(pScript));
-               String strScript = L"";
-               strScript.Append(pScript);
-               __pReaderData = __pWebViewer->EvaluateJavascriptN(strScript);
-               if (!__pReaderData)
-               {
-                       AppLog("MainScene::data is null Error :%s",GetErrorMessage(GetLastResult()));
-                       return;
-               }
-               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);
-                       SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_READER);
-               }
-               delete[] pScript;
-       }
 }
 
 void MainForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
@@ -3958,7 +3840,7 @@ void MainForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen:
                AppLog("setselectionselectedornot %s",GetErrorMessage(r));
 
        }
-       __inputEventToBeSupressed = true;
+//     __inputEventToBeSupressed = true;
 }
 
 void
@@ -3966,7 +3848,8 @@ MainForm::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graphic
 {
        AppLog("MainForm::OnTouchReleased");
 
-       HitElementResult* pHitElement = __pWebViewer->GetElementByPointN(currentPosition);
+       // Not reuired now.
+       /*HitElementResult* pHitElement = __pWebViewer->GetElementByPointN(currentPosition);
        if(pHitElement != null && pHitElement->HasUrl() == true && __inputEventToBeSupressed == true)
        {
                __pWebViewer->ConsumeInputEvent();
@@ -3975,7 +3858,7 @@ MainForm::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graphic
        {
                delete pHitElement;
        }
-       __inputEventToBeSupressed = false;
+       __inputEventToBeSupressed = false;*/
 }
 
 bool
@@ -4003,9 +3886,7 @@ MainForm::OnTouchReleased(Tizen::Ui::Control& source, const Tizen::Ui::TouchEven
        }
        if(__pAddressbar->GetShowState() == false)
        {
-               __pAddressbar->SetShowState(true);
                __pAddressbar->SetAddressbarURLFocus();
-               __pFooterUrlField->SetFocusable(false);
                __pFooterPanel->SetShowState(false);
        }
 
@@ -4704,6 +4585,91 @@ MainForm::UpdateProgressBitmap(void)
        return;
 }
 
+void
+MainForm::ReaderClicked()
+{
+       SceneManager::GetInstance()->GoForward(ForwardSceneTransition(IDSCN_ARTICLE_READER, SCENE_TRANSITION_ANIMATION_TYPE_NONE));
+       return;
+
+
+       int bodyWidth = ((double)(GetClientAreaBounds().width))*0.73;
+
+       CreateReaderPanel();
+       AppLogDebug("MainScene::ReaderClicked entered");
+
+
+       /*if (__pArticleReaderPanel)
+       {
+               AppLogDebug("showstate true for reader panel");
+               __pArticleReaderPanel->SetShowState(true);
+               __pArticleReaderPanel->Show();
+       }*/
+       int xPos = __pArticleReaderPanel->GetX();
+       int yPos = __pArticleReaderPanel->GetY();
+       AppLog("ReaderClicked() xPos = %d",xPos);
+       AppLog("ReaderClicked() yPos = %d",yPos);
+
+       if (__pReaderData == null)
+       {
+               return;
+       }
+
+       String loadData = L"<html>\
+                                       <head>\
+                                       <meta name='viewport' content='width=device-width*0.73,minimum-scale=1.0, maximum-scale=1.0, user-scalable=no'>\
+                                       <style>\
+                                       h1\
+                                       {\
+                                       font-weight:bold;\
+                                       background-color: transparent;\
+                                       }\
+                                       div\
+                                       {\
+                                       display: block;\
+                                       }\
+                                       p\
+                                       {\
+                                       display: block; \
+                                       }\
+                                       img\
+                                       {\
+                                       margin-left:auto;\
+                                       margin-right:auto;\
+                                       }\
+                                       \
+                                       \
+                                       </style>\
+                                       </head>\
+                                       <body style='width:'";
+       loadData.Append(bodyWidth);
+       loadData.Append(L"px'>");
+       AppLogDebug("data->GetLength %d",__pReaderData->GetLength());
+       loadData.Append(*__pReaderData);
+       loadData.Append(L"</body></html>");
+
+       ByteBuffer buf ;
+       buf.Construct(loadData.GetLength());
+       AppLogDebug("data->GetLength %d",loadData.GetLength());
+       for (int z=0;z<loadData.GetLength();z++)
+       {
+               mchar b;
+               loadData.GetCharAt(z,b);
+               buf.SetByte((byte)b);
+       }
+
+       buf.Flip();
+       if (__pWebReader != null)
+       {
+               __pWebReader->LoadData(L"",buf,L"text/html");
+               AppLogDebug("LoadData result %s",GetErrorMessage(GetLastResult()));
+       }
+       else
+       {
+               AppLogDebug("cannot LoadData __pWebReader is null");
+       }
+
+}
+
 void MainForm::SetAddressbarMode(AddressBarMode addMode)
 {
        AppLogDebug("AddressBar::setAddressbarMode to %d",addMode);
@@ -4720,7 +4686,9 @@ void MainForm::SetAddressbarMode(AddressBarMode addMode)
        case ADDRESSBAR_MODE_READER:
        {
                __pStopBtn->SetShowState(false);
+               __pRefreshBtn->SetShowState(false);
                __pClearBtn->SetShowState(false);
+               __pReaderBtn->SetShowState(false);
        }
        break;
        case ADDRESSBAR_MODE_LOADING:
@@ -4728,6 +4696,7 @@ void MainForm::SetAddressbarMode(AddressBarMode addMode)
                __pRefreshBtn->SetShowState(false);
                __pStopBtn->SetShowState(true);
                __pClearBtn->SetShowState(false);
+               __pReaderBtn->SetShowState(false);
        }
        break;
        case ADDRESSBAR_MODE_LOADING_COMPLETE:
@@ -4737,12 +4706,14 @@ void MainForm::SetAddressbarMode(AddressBarMode addMode)
                __pRefreshBtn->SetShowState(true);
                __pStopBtn->SetShowState(false);
                __pClearBtn->SetShowState(false);
+               __pReaderBtn->SetShowState(false);
        }
        break;
        case ADDRESSBAR_MODE_EDIT:
        {
                __pRefreshBtn->SetShowState(false);
                __pStopBtn->SetShowState(false);
+               __pReaderBtn->SetShowState(false);
                __pClearBtn->SetShowState(true);
        }
        break;
@@ -4822,3 +4793,23 @@ void MainForm::OnUserEventReceivedN (RequestId requestId, Tizen::Base::Collectio
                }
        }
 }
+
+void
+MainForm::AddressBarCancelledClicked(const Addressbar& addBar)
+{
+       result r = E_SUCCESS;
+       AppLog("akjshdasd 5");
+       __pFooterPanel->SetShowState(true);
+
+       if(__pWebViewer)
+               __pWebViewer->SetFocus();
+       else if(__pMostVisitedListView)
+               __pMostVisitedListView->SetFocus();
+       else if(__pMultiWindowButton)
+               __pMultiWindowButton->SetFocus();
+       __pMoreButton->SetFocus();
+
+       __pAddressbar->SetShowState(false);
+
+       RelayoutControls(false);
+}
index b727c24..8155f5b 100644 (file)
@@ -574,12 +574,14 @@ PresentationModelBase::ExecuteHistoryQuery(const Tizen::Base::String& formatQuer
                                }
                                __pDbStatement->BindString(0,historyUrl);
                                __pDbStatement->BindString(1,historyTitle);
-                               DateTimeFormatter *pFormatter = DateTimeFormatter::CreateDateFormatterN(DATE_TIME_STYLE_DEFAULT);
+
+                               String visitedTime = GetStringFromDate(date);
+                               /*DateTimeFormatter *pFormatter = DateTimeFormatter::CreateDateFormatterN(DATE_TIME_STYLE_DEFAULT);
                                pFormatter->ApplyPattern(L"YYYY-MM-dd hh:mm:ss");
                                String dateStr;
                                pFormatter->Format(date, dateStr);
-                               AppLog("DateStr: %ls", dateStr.GetPointer());
-                               __pDbStatement->BindString(2, dateStr);
+                               AppLog("DateStr: %ls", dateStr.GetPointer());*/
+                               __pDbStatement->BindString(2, visitedTime);
                                if(history.GetFavIconBuffer() != null)
                                {
                                        __pDbStatement->BindBlob(3,*(history.GetFavIconBuffer()));
@@ -1004,4 +1006,40 @@ PresentationModelBase::GetCurrentDateTime(DateTime& dt)
        return true;
 }
 
-
+String
+PresentationModelBase::GetStringFromDate(DateTime& date)
+{
+       String dateFormat = L"";
+       dateFormat.Append(date.GetYear());
+       dateFormat.Append('-');
+       if(date.GetMonth() < 10)
+       {
+               dateFormat.Append('0');
+       }
+       dateFormat.Append(date.GetMonth());
+       dateFormat.Append('-');
+       if(date.GetDay() < 10)
+       {
+               dateFormat.Append('0');
+       }
+       dateFormat.Append(date.GetDay());
+       dateFormat.Append(' ');
+       if(date.GetHour() < 10)
+       {
+               dateFormat.Append('0');
+       }
+       dateFormat.Append(date.GetHour());
+       dateFormat.Append(':');
+       if(date.GetMinute() < 10)
+       {
+               dateFormat.Append('0');
+       }
+       dateFormat.Append(date.GetMinute());
+       dateFormat.Append(':');
+       if(date.GetSecond() < 10)
+       {
+               dateFormat.Append('0');
+       }
+       dateFormat.Append(date.GetSecond());
+       return dateFormat;
+}
index 7b778d5..bd0dab1 100644 (file)
@@ -84,6 +84,7 @@ SceneRegister::RegisterAllScenes(void)
        pSceneManager->RegisterScene(IDSCN_FONT_SIZE, IDL_FORM_FONT_SIZE_SCENE, PANEL_BLANK);
        pSceneManager->RegisterScene(IDSCN_EDIT_HOMEPAGE_VIEW, IDL_FORM_EDIT_HOME_PAGE_SCENE, PANEL_BLANK);
        pSceneManager->RegisterScene(IDSCN_BRIGHTNESS, IDL_FORM_BRIGHTNESS_SCENE, PANEL_BLANK);
+
 }
 
 result